summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src
diff options
context:
space:
mode:
authorlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2009-11-11 23:07:53 +0000
committerlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2009-11-11 23:07:53 +0000
commit89d72264d0af4c65c9bf0b7a6f823f13d69162aa (patch)
treef6a4ea43b576d56a43adf10ccbed4cd75a9eb827 /branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src
parent6a3ca6736c808c1647854e405ef379b609f276db (diff)
Moving 1.x branches
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835127 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src')
-rw-r--r--branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/AService.java37
-rw-r--r--branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BService.java35
-rw-r--r--branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP.java35
-rw-r--r--branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP11.java35
-rw-r--r--branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP12.java35
-rw-r--r--branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/CService.java37
-rw-r--r--branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/DService.java45
-rw-r--r--branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/AServiceImpl.java51
-rw-r--r--branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceImpl.java44
-rw-r--r--branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP11Impl.java44
-rw-r--r--branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP12Impl.java44
-rw-r--r--branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAPImpl.java44
-rw-r--r--branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/CServiceImpl.java48
-rw-r--r--branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/DServiceImpl.java70
-rw-r--r--branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/resources/nowsdlpromoted.composite246
-rw-r--r--branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted1TestCase.java85
-rw-r--r--branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted2TestCase.java118
17 files changed, 0 insertions, 1053 deletions
diff --git a/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/AService.java b/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/AService.java
deleted file mode 100644
index 6ab6fbb8f5..0000000000
--- a/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/AService.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * The interface for AService.
- */
-@Remotable
-public interface AService {
-
- public String getName();
-
- public String getB1String(String aString);
-
- public String getB1String2(String aString, String bString);
-
- public int getB1Int(int i);
-
-}
diff --git a/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BService.java b/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BService.java
deleted file mode 100644
index f3c42008aa..0000000000
--- a/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BService.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Service used by another service
- */
-@Remotable
-public interface BService {
-
- public String getString(String aString);
-
- public String getString2(String aString, String bString);
-
- public int getInt(int i);
-
-}
diff --git a/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP.java b/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP.java
deleted file mode 100644
index 1215d9d41f..0000000000
--- a/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Service used by another service
- */
-@Remotable
-public interface BServiceSOAP {
-
- public String getString(String aString);
-
- public String getString2(String aString, String bString);
-
- public int getInt(int i);
-
-}
diff --git a/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP11.java b/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP11.java
deleted file mode 100644
index 774b68bf6d..0000000000
--- a/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP11.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Service used by another service
- */
-@Remotable
-public interface BServiceSOAP11 {
-
- public String getString(String aString);
-
- public String getString2(String aString, String bString);
-
- public int getInt(int i);
-
-}
diff --git a/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP12.java b/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP12.java
deleted file mode 100644
index 952df7ccfe..0000000000
--- a/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/BServiceSOAP12.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Service used by another service
- */
-@Remotable
-public interface BServiceSOAP12 {
-
- public String getString(String aString);
-
- public String getString2(String aString, String bString);
-
- public int getInt(int i);
-
-}
diff --git a/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/CService.java b/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/CService.java
deleted file mode 100644
index 9111b5c3a9..0000000000
--- a/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/CService.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * Simple Service used by another service
- */
-@Remotable
-public interface CService {
-
- public String getString(String aString);
-
- public String getString2(String aString, String bString);
-
- public Integer getInteger(Integer i);
-
- public float getFloat(float f);
-
-}
diff --git a/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/DService.java b/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/DService.java
deleted file mode 100644
index 5aa508d8f1..0000000000
--- a/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/DService.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * The interface for DService.
- */
-@Remotable
-public interface DService {
-
- public String getName();
-
- public String getB1String(String aString);
-
- public String getB1String2(String aString, String bString);
-
- public int getB1Int(int i);
-
- public String getC1String(String aString);
-
- public String getC1String2(String aString, String bString);
-
- public Integer getC1Integer(Integer i);
-
- public float getC1Float(float f);
-
-}
diff --git a/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/AServiceImpl.java b/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/AServiceImpl.java
deleted file mode 100644
index 055283bfad..0000000000
--- a/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/AServiceImpl.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.AService;
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BService;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * This class implements AService.
- */
-@Service(AService.class)
-public class AServiceImpl implements AService {
-
- @Reference
- public BService b1;
-
- public String getName() {
- return "AService";
- }
-
- public String getB1String(String aString) {
- return b1.getString(aString);
- }
-
- public String getB1String2(String aString, String bString) {
- return b1.getString2(aString, bString);
- }
-
- public int getB1Int(int i) {
- return b1.getInt(i);
- }
-
-} \ No newline at end of file
diff --git a/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceImpl.java b/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceImpl.java
deleted file mode 100644
index 8f776672de..0000000000
--- a/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceImpl.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BService;
-import org.osoa.sca.annotations.Service;
-
-@Service(BService.class)
-public class BServiceImpl implements BService {
-
- public String getName() {
- return "BService";
- }
-
- public String getString(String aString) {
- return aString;
- }
-
- public String getString2(String aString, String bString) {
- return aString + bString;
- }
-
- public int getInt(int i) {
- return i;
- }
-
-}
diff --git a/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP11Impl.java b/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP11Impl.java
deleted file mode 100644
index 7a5d91d762..0000000000
--- a/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP11Impl.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP11;
-import org.osoa.sca.annotations.Service;
-
-@Service(BServiceSOAP11.class)
-public class BServiceSOAP11Impl implements BServiceSOAP11 {
-
- public String getName() {
- return "BServiceSOAP11";
- }
-
- public String getString(String aString) {
- return aString;
- }
-
- public String getString2(String aString, String bString) {
- return aString + bString;
- }
-
- public int getInt(int i) {
- return i;
- }
-
-}
diff --git a/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP12Impl.java b/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP12Impl.java
deleted file mode 100644
index 121de12d3c..0000000000
--- a/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAP12Impl.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP12;
-import org.osoa.sca.annotations.Service;
-
-@Service(BServiceSOAP12.class)
-public class BServiceSOAP12Impl implements BServiceSOAP12 {
-
- public String getName() {
- return "BServiceSOAP12";
- }
-
- public String getString(String aString) {
- return aString;
- }
-
- public String getString2(String aString, String bString) {
- return aString + bString;
- }
-
- public int getInt(int i) {
- return i;
- }
-
-}
diff --git a/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAPImpl.java b/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAPImpl.java
deleted file mode 100644
index f05c8852f6..0000000000
--- a/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/BServiceSOAPImpl.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP;
-import org.osoa.sca.annotations.Service;
-
-@Service(BServiceSOAP.class)
-public class BServiceSOAPImpl implements BServiceSOAP {
-
- public String getName() {
- return "BServiceSOAP";
- }
-
- public String getString(String aString) {
- return aString;
- }
-
- public String getString2(String aString, String bString) {
- return aString + bString;
- }
-
- public int getInt(int i) {
- return i;
- }
-
-}
diff --git a/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/CServiceImpl.java b/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/CServiceImpl.java
deleted file mode 100644
index 746b0a357f..0000000000
--- a/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/CServiceImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.CService;
-import org.osoa.sca.annotations.Service;
-
-@Service(CService.class)
-public class CServiceImpl implements CService {
-
- public String getName() {
- return "CService";
- }
-
- public String getString(String aString) {
- return aString;
- }
-
- public String getString2(String aString, String bString) {
- return aString + bString;
- }
-
- public Integer getInteger(Integer i) {
- return i;
- }
-
- public float getFloat(float f) {
- return f;
- }
-
-}
diff --git a/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/DServiceImpl.java b/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/DServiceImpl.java
deleted file mode 100644
index 5be411b286..0000000000
--- a/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/impl/DServiceImpl.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl;
-
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BService;
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.CService;
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.DService;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * This class implements AService.
- */
-@Service(DService.class)
-public class DServiceImpl implements DService {
-
- @Reference
- public BService b1;
-
- @Reference
- public CService c1;
-
- public String getName() {
- return "DService";
- }
-
- public String getB1String(String aString) {
- return b1.getString(aString);
- }
-
- public String getB1String2(String aString, String bString) {
- return b1.getString2(aString, bString);
- }
-
- public int getB1Int(int i) {
- return b1.getInt(i);
- }
-
- public String getC1String(String aString) {
- return c1.getString(aString);
- }
-
- public String getC1String2(String aString, String bString) {
- return c1.getString2(aString, bString);
- }
-
- public Integer getC1Integer(Integer i) {
- return c1.getInteger(i);
- }
-
- public float getC1Float(float f) {
- return c1.getFloat(f);
- }
-} \ No newline at end of file
diff --git a/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/resources/nowsdlpromoted.composite b/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/resources/nowsdlpromoted.composite
deleted file mode 100644
index cf47c072a7..0000000000
--- a/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/main/resources/nowsdlpromoted.composite
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://vtest.wsbinding.nowsdl.promoted"
- xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"
- name="nowsdl.promoted">
-
- <service name="BService" promote="BComponent">
- <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BService"/>
- <binding.ws/>
- </service>
-
- <service name="BServiceSOAP" promote="BComponentSOAP">
- <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP"/>
- <binding.ws requires="soap"/>
- </service>
-
- <service name="BServiceSOAP11" promote="BComponentSOAP11">
- <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP11"/>
- <binding.ws requires="soap.1_1"/>
- </service>
-
- <service name="BServiceSOAP12" promote="BComponentSOAP12">
- <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP12"/>
- <binding.ws requires="soap.1_2"/>
- </service>
-
- <service name="CService" promote="CComponent">
- <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.CService"/>
- <binding.ws requires="soap.1_2"/>
- </service>
-
- <component name="BComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.BServiceImpl"/>
- </component>
-
- <component name="BComponentSOAP">
- <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.BServiceSOAPImpl"/>
- </component>
-
- <component name="BComponentSOAP11">
- <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.BServiceSOAP11Impl"/>
- </component>
-
- <component name="BComponentSOAP12">
- <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.BServiceSOAP12Impl"/>
- </component>
-
- <component name="CComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.CServiceImpl"/>
- </component>
-
- <reference name="AComponent1B1" promote="AComponent1/b1">
- <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BService"/>
- <binding.ws uri="http://localhost:8080/BService"/>
- </reference>
-
- <reference name="AComponent2B1" promote="AComponent2/b1">
- <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BService"/>
- <binding.ws requires="soap" uri="http://localhost:8080/BService"/>
- </reference>
-
- <reference name="AComponent3B1" promote="AComponent3/b1">
- <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BService"/>
- <binding.ws requires="soap.1_1" uri="http://localhost:8080/BService"/>
- </reference>
-
- <reference name="AComponent4B1" promote="AComponent4/b1">
- <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BService"/>
- <binding.ws requires="soap.1_2" uri="http://localhost:8080/BService"/>
- </reference>
-
- <reference name="AComponent5B1" promote="AComponent5/b1">
- <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP"/>
- <binding.ws uri="http://localhost:8080/BServiceSOAP"/>
- </reference>
-
- <reference name="AComponent6B1" promote="AComponent6/b1">
- <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP"/>
- <binding.ws requires="soap" uri="http://localhost:8080/BServiceSOAP"/>
- </reference>
-
- <reference name="AComponent7B1" promote="AComponent7/b1">
- <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP"/>
- <binding.ws requires="soap.1_1" uri="http://localhost:8080/BServiceSOAP"/>
- </reference>
-
- <reference name="AComponent8B1" promote="AComponent8/b1">
- <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP"/>
- <binding.ws requires="soap.1_2" uri="http://localhost:8080/BServiceSOAP"/>
- </reference>
-
- <reference name="AComponent9B1" promote="AComponent9/b1">
- <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP11"/>
- <binding.ws uri="http://localhost:8080/BServiceSOAP11"/>
- </reference>
-
- <reference name="AComponent10B1" promote="AComponent10/b1">
- <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP11"/>
- <binding.ws requires="soap" uri="http://localhost:8080/BServiceSOAP11"/>
- </reference>
-
- <reference name="AComponent11B1" promote="AComponent11/b1">
- <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP11"/>
- <binding.ws requires="soap.1_1" uri="http://localhost:8080/BServiceSOAP11"/>
- </reference>
-
- <reference name="AComponent12B1" promote="AComponent12/b1">
- <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP11"/>
- <binding.ws requires="soap.1_2" uri="http://localhost:8080/BServiceSOAP11"/>
- </reference>
-
- <reference name="AComponent13B1" promote="AComponent13/b1">
- <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP12"/>
- <binding.ws uri="http://localhost:8080/BServiceSOAP12"/>
- </reference>
-
- <reference name="AComponent14B1" promote="AComponent14/b1">
- <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP12"/>
- <binding.ws requires="soap" uri="http://localhost:8080/BServiceSOAP12"/>
- </reference>
-
- <reference name="AComponent15B1" promote="AComponent15/b1">
- <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP12"/>
- <binding.ws requires="soap.1_1" uri="http://localhost:8080/BServiceSOAP12"/>
- </reference>
-
- <reference name="AComponent16B1" promote="AComponent16/b1">
- <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP12"/>
- <binding.ws requires="soap.1_2" uri="http://localhost:8080/BServiceSOAP12"/>
- </reference>
-
- <reference name="DComponentB1" promote="DComponent/b1">
- <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.BServiceSOAP11"/>
- <binding.ws requires="soap.1_1" uri="http://localhost:8080/BServiceSOAP11"/>
- </reference>
-
- <reference name="DComponentC1" promote="DComponent/c1">
- <interface.java interface="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.CService"/>
- <binding.ws requires="soap.1_2" uri="http://localhost:8080/CService"/>
- </reference>
-
- <component name="AComponent1">
- <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.AServiceImpl"/>
- <reference name="b1"/>
- </component>
-
- <component name="AComponent2">
- <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.AServiceImpl"/>
- <reference name="b1"/>
- </component>
-
- <component name="AComponent3">
- <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.AServiceImpl"/>
- <reference name="b1"/>
- </component>
-
- <component name="AComponent4">
- <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.AServiceImpl"/>
- <reference name="b1"/>
- </component>
-
- <component name="AComponent5">
- <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.AServiceImpl"/>
- <reference name="b1"/>
- </component>
-
- <component name="AComponent6">
- <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.AServiceImpl"/>
- <reference name="b1"/>
- </component>
-
- <component name="AComponent7">
- <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.AServiceImpl"/>
- <reference name="b1"/>
- </component>
-
- <component name="AComponent8">
- <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.AServiceImpl"/>
- <reference name="b1"/>
- </component>
-
- <component name="AComponent9">
- <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.AServiceImpl"/>
- <reference name="b1"/>
- </component>
-
- <component name="AComponent10">
- <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.AServiceImpl"/>
- <reference name="b1"/>
- </component>
-
- <component name="AComponent11">
- <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.AServiceImpl"/>
- <reference name="b1"/>
- </component>
-
- <component name="AComponent12">
- <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.AServiceImpl"/>
- <reference name="b1"/>
- </component>
-
- <component name="AComponent13">
- <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.AServiceImpl"/>
- <reference name="b1"/>
- </component>
-
- <component name="AComponent14">
- <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.AServiceImpl"/>
- <reference name="b1"/>
- </component>
-
- <component name="AComponent15">
- <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.AServiceImpl"/>
- <reference name="b1"/>
- </component>
-
- <component name="AComponent16">
- <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.AServiceImpl"/>
- <reference name="b1"/>
- </component>
-
- <component name="DComponent">
- <implementation.java class="org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.impl.DServiceImpl"/>
- <reference name="b1"/>
- <reference name="c1"/>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted1TestCase.java b/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted1TestCase.java
deleted file mode 100644
index ae7dafa46e..0000000000
--- a/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted1TestCase.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted;
-
-import junit.framework.Assert;
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.AService;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Tests the simplest form of the binding element without WSDL document
- * described in section section 2.3.1 and 2.3.3.1 of SCA Web Services Binding
- * V1.00
- */
-public class NoWsdlPromoted1TestCase {
-
- protected static ServiceFinder serviceFinder;
- protected static String compositeName = "nowsdlpromoted.composite";
-
- @BeforeClass
- public static void init() throws Exception {
- try {
- System.out.println("Setting up");
- ServiceFinder.init(compositeName);
- } catch (Exception ex) {
- ex.printStackTrace();
- }
- }
-
- /**
- * Lines 251-253, 287-291:<br>
- * <li>soap</li>
- * This indicates that a SOAP binding is required. The SOAP binding may be
- * of any SOAP version, including multiple versions.<br>
- * <br>
- * 2.3.3.1 SOAP versions<br>
- * Where a web service binding requires a specific SOAP version, then a
- * single WSDL port and SOAP binding of the appropriate version is
- * generated. Where no specific SOAP version is required, then one or more
- * WSDL ports with associated SOAP bindings may be generated, depending on
- * the level(s) supported in the target runtime.<br>
- * <p>
- * Tests promoted services and references<br>
- */
- @Test
- public void testSoapVersion1() throws Exception {
-
- for (int i = 0; i < 8; i++) {
- AService a = ServiceFinder.getService(AService.class, "AComponent" + (i+1));
- String aName = a.getName();
- String b1Str1 = a.getB1String("string1");
- String b1Str2 = a.getB1String2("string2", "string3");
- int b1Int = a.getB1Int(i * 1000 + 1000);
- System.out.println(i + " - " + aName + ": " + b1Str1 + ", " + b1Str2 + ", " + b1Int);
- Assert.assertEquals("AService", aName);
- Assert.assertEquals("string1", b1Str1);
- Assert.assertEquals("string2string3", b1Str2);
- Assert.assertEquals(i * 1000 + 1000, b1Int);
- }
- }
-
- @AfterClass
- public static void destroy() throws Exception {
- System.out.println("Cleaning up");
- ServiceFinder.cleanup();
- }
-}
diff --git a/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted2TestCase.java b/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted2TestCase.java
deleted file mode 100644
index a4744b9007..0000000000
--- a/branches/sca-java-1.3/vtest/wsbinding/nowsdl/promoted/src/test/java/org/apache/tuscany/sca/vtest/wsbinding/nowsdl/promoted/NoWsdlPromoted2TestCase.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted;
-
-import junit.framework.Assert;
-import org.apache.tuscany.sca.vtest.utilities.ServiceFinder;
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.AService;
-import org.apache.tuscany.sca.vtest.wsbinding.nowsdl.promoted.DService;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Tests the simplest form of the binding element without WSDL document
- * described in section section 2.3.1 and 2.3.3.1 of SCA Web Services Binding
- * V1.00
- */
-public class NoWsdlPromoted2TestCase {
-
- protected static ServiceFinder serviceFinder;
- protected static String compositeName = "nowsdlpromoted.composite";
- protected static DService d;
-
- @BeforeClass
- public static void init() throws Exception {
- try {
- System.out.println("Setting up");
- ServiceFinder.init(compositeName);
- d = ServiceFinder.getService(DService.class, "DComponent");
- } catch (Exception ex) {
- ex.printStackTrace();
- }
- }
-
- /**
- * Lines 254-257, 287-291:<br>
- * <li>soap.1_1</li><br>
- * A SOAP 1.1 binding only is required.<br>
- * <li>soap.1_2</li><br>
- * A SOAP 1.2 binding only is required.<br>
- * <br>
- * 2.3.3.1 SOAP versions<br>
- * Where a web service binding requires a specific SOAP version, then a
- * single WSDL port and SOAP binding of the appropriate version is
- * generated. Where no specific SOAP version is required, then one or more
- * WSDL ports with associated SOAP bindings may be generated, depending on
- * the level(s) supported in the target runtime.<br>
- * <p>
- * Tests promoted services and references<br>
- */
- @Test
- public void testSoapVersion2() throws Exception {
-
- for (int i = 8; i < 16; i++) {
- AService a = ServiceFinder.getService(AService.class, "AComponent" + (i+1));
- String aName = a.getName();
- String b1Str1 = a.getB1String("string1");
- String b1Str2 = a.getB1String2("string2", "string3");
- int b1Int = a.getB1Int(i * 1000 + 1000);
- System.out.println(i + " - " + aName + ": " + b1Str1 + ", " + b1Str2 + ", " + b1Int);
- Assert.assertEquals("AService", aName);
- Assert.assertEquals("string1", b1Str1);
- Assert.assertEquals("string2string3", b1Str2);
- Assert.assertEquals(i * 1000 + 1000, b1Int);
- }
- }
-
- /**
- * Lines 254-257, 287-291:<br>
- * Test two references using binding.ws with 2 different SOAP versions
- * and without WSDL document.<br>
- */
- @Test
- public void testSoapVersion3() throws Exception {
- String dName = d.getName();
- String b1Str1 = d.getB1String("string1");
- String b1Str2 = d.getB1String2("string2", "string3");
- String c1Str1 = d.getC1String("string5");
- String c1Str2 = d.getC1String2("string6", "string7");
-
- int b1Int = d.getB1Int(4000);
- float c1Float = d.getC1Float((float) 8.8);
-
- Integer c1Integer = d.getC1Integer(new Integer(9000));
-
- System.out.println(dName + ": " + b1Str1 + ", " + b1Str2 + ", " + b1Int + ", " + c1Str1 + ", " + c1Str2 + ", " + c1Float + ", " + c1Integer);
- Assert.assertEquals("DService", dName);
- Assert.assertEquals("string1", b1Str1);
- Assert.assertEquals("string2string3", b1Str2);
- Assert.assertEquals(4000, b1Int);
- Assert.assertEquals("string5", c1Str1);
- Assert.assertEquals("string6string7", c1Str2);
- Assert.assertEquals((float) 8.8, c1Float);
- Assert.assertEquals(new Integer(9000), c1Integer);
- }
-
- @AfterClass
- public static void destroy() throws Exception {
- System.out.println("Cleaning up");
- ServiceFinder.cleanup();
- }
-}