diff options
| author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2010-10-06 14:35:56 +0000 |
|---|---|---|
| committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2010-10-06 14:35:56 +0000 |
| commit | cac430949436218c139f5790daadf4ec5d6ee5ee (patch) | |
| tree | 56124aece308f62131068fcd72028d28233be499 /sca-java-2.x | |
| parent | 6071f17763f89f716cd5d1f25a9973d91a293fbf (diff) | |
Delete itests folder as its now in testing folder
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1005062 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x')
1692 files changed, 0 insertions, 100926 deletions
diff --git a/sca-java-2.x/trunk/itest/T3558/pom.xml b/sca-java-2.x/trunk/itest/T3558/pom.xml deleted file mode 100644 index 5940901bf7..0000000000 --- a/sca-java-2.x/trunk/itest/T3558/pom.xml +++ /dev/null @@ -1,45 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-t3558</artifactId>
- <name>Apache Tuscany SCA iTest T3558</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-data-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/sca-java-2.x/trunk/itest/T3558/src/test/java/org/apache/tuscany/sca/itest/t3558/T3558TestCase.java b/sca-java-2.x/trunk/itest/T3558/src/test/java/org/apache/tuscany/sca/itest/t3558/T3558TestCase.java deleted file mode 100644 index 5bb860ef89..0000000000 --- a/sca-java-2.x/trunk/itest/T3558/src/test/java/org/apache/tuscany/sca/itest/t3558/T3558TestCase.java +++ /dev/null @@ -1,72 +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.itest.t3558;
-
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.Test;
-
-public class T3558TestCase {
-
- @Test
- public void testAllJar() throws Exception {
- Node node = NodeFactory.newInstance().createNode((String)null, new String[]{"src/test/resources/sample-store-all.jar"});
- node.start();
- }
-
- @Test
- public void testOneNode() throws Exception {
- Node node = NodeFactory.newInstance().createNode((String)null, new String[]{"src/test/resources/sample-store.jar","src/test/resources/sample-store-client.jar"});
- node.start();
- }
-
- @Test
- public void testTwoNodes() throws Exception {
- Node node2 = NodeFactory.newInstance().createNode((String)null, new String[]{"src/test/resources/sample-store.jar"});
- node2.start();
- Node node1 = NodeFactory.newInstance().createNode((String)null, new String[]{"src/test/resources/sample-store-client.jar"});
- node1.start();
- }
-
- @Test
- public void testTwoNodesJIRACode1() throws Exception {
- String storeLocation = "src/test/resources/sample-store.jar";
- String storeClientLocation = "src/test/resources/sample-store-client.jar";
-
- Node node1 = NodeFactory.newInstance().createNode(new Contribution("store",storeLocation));
- node1.start();
- // The dependent contributions need to be added in the Node and need to be following the main contribution
- Node node2 = NodeFactory.newInstance().createNode("store-client.composite",new Contribution("storeClient", storeClientLocation),new Contribution("store", storeLocation));
- node2.start();
- }
-
- @Test
- public void testTwoNodesJIRACode2() throws Exception {
- String storeLocation = "src/test/resources/sample-store.jar";
- String storeClientLocation = "src/test/resources/sample-store-client.jar";
-
- Node node1 = NodeFactory.newInstance().createNode(new Contribution("store",storeLocation));
- node1.start();
-
- Node node2 = NodeFactory.newInstance().createNode("store-client.composite",new Contribution("storeClient", storeClientLocation));
- node2.start();
- }
-}
diff --git a/sca-java-2.x/trunk/itest/T3558/src/test/resources/sample-store-all.jar b/sca-java-2.x/trunk/itest/T3558/src/test/resources/sample-store-all.jar Binary files differdeleted file mode 100644 index 6f3649ff23..0000000000 --- a/sca-java-2.x/trunk/itest/T3558/src/test/resources/sample-store-all.jar +++ /dev/null diff --git a/sca-java-2.x/trunk/itest/T3558/src/test/resources/sample-store-client.jar b/sca-java-2.x/trunk/itest/T3558/src/test/resources/sample-store-client.jar Binary files differdeleted file mode 100644 index 5dfecda310..0000000000 --- a/sca-java-2.x/trunk/itest/T3558/src/test/resources/sample-store-client.jar +++ /dev/null diff --git a/sca-java-2.x/trunk/itest/T3558/src/test/resources/sample-store.jar b/sca-java-2.x/trunk/itest/T3558/src/test/resources/sample-store.jar Binary files differdeleted file mode 100644 index 98e1f6ebb4..0000000000 --- a/sca-java-2.x/trunk/itest/T3558/src/test/resources/sample-store.jar +++ /dev/null diff --git a/sca-java-2.x/trunk/itest/async-interactions/pom.xml b/sca-java-2.x/trunk/itest/async-interactions/pom.xml deleted file mode 100644 index 5802b7705c..0000000000 --- a/sca-java-2.x/trunk/itest/async-interactions/pom.xml +++ /dev/null @@ -1,164 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-async-integrations</artifactId>
- <name>Apache Tuscany Async Integration Tests</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jms-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.2.0</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.5</version>
- <executions>
- <execution>
- <id>add-jaxws</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${project.build.directory}/jaxws-source</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxws-maven-plugin</artifactId>
- <version>1.12</version>
- <!-- Explicitly add the transitive dependencies for jaxws-api http://jira.codehaus.org/browse/MEV-498 -->
- <dependencies>
- <dependency>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- <version>1.0-MR1</version>
- </dependency>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>wsimport-client</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>wsimport</goal>
- </goals>
- <configuration>
- <wsdlDirectory>${basedir}/src/main/resources/wsdl</wsdlDirectory>
- <wsdlFiles>
- <wsdlFile>creditcard.wsdl</wsdlFile>
- </wsdlFiles>
- <bindingDirectory>${basedir}/src/main/resources/wsdl</bindingDirectory>
- <bindingFiles>
- <bindingFile>creditcard-client.xml</bindingFile>
- </bindingFiles>
- <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
- <!-- Configure the stale file so that two executions will work -->
- <staleFile>${project.build.directory}/wsimport-client.stale</staleFile>
- <verbose>false</verbose>
- <xnocompile>true</xnocompile>
-
- <xjcArgs>
- <xjcArg>-p</xjcArg>
- <xjcArg>com.example.test.jaxb.client</xjcArg>
- </xjcArgs>
-
- </configuration>
- </execution>
- <execution>
- <id>wsimport-server</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>wsimport</goal>
- </goals>
- <configuration>
- <wsdlDirectory>${basedir}/src/main/resources/wsdl</wsdlDirectory>
- <wsdlFiles>
- <wsdlFile>creditcard.wsdl</wsdlFile>
- </wsdlFiles>
- <bindingDirectory>${basedir}/src/main/resources/wsdl</bindingDirectory>
- <bindingFiles>
- <bindingFile>creditcard-server.xml</bindingFile>
- </bindingFiles>
- <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
- <staleFile>${project.build.directory}/wsimport-server.stale</staleFile>
- <verbose>false</verbose>
- <xnocompile>true</xnocompile>
-
- <xjcArgs>
- <xjcArg>-p</xjcArg>
- <xjcArg>com.example.test.jaxb.server</xjcArg>
- </xjcArgs>
-
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/async-interactions/src/main/java/test/client/CreditCardClient.java b/sca-java-2.x/trunk/itest/async-interactions/src/main/java/test/client/CreditCardClient.java deleted file mode 100644 index 6142f815af..0000000000 --- a/sca-java-2.x/trunk/itest/async-interactions/src/main/java/test/client/CreditCardClient.java +++ /dev/null @@ -1,60 +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 test.client; - -/** - * A client interface to invoke the CreditCardPayment using different interaction patterns - */ -public interface CreditCardClient { - /** - * Invoke the service synchronously - * @param creditCardNumber - * @param holder - * @param amount - * @return - */ - String authorize(String creditCardNumber, String holder, float amount); - - /** - * Invoke the service asynchronously and poll for the result - * @param creditCardNumber - * @param holder - * @param amount - * @return - */ - String authorizeAsync(String creditCardNumber, String holder, float amount); - - /** - * Invoke the service asynchronously and get the result from a callback - * @param creditCardNumber - * @param holder - * @param amount - * @return - */ - String authorizeAsyncWithCallback(String creditCardNumber, String holder, float amount); - - /** - * Invoke the service using oneway (fire-and-forget) and the target component will make a callback upon the request has been processed - * @param creditCardNumber - * @param holder - * @param amount - * @return - */ - String authorizeSCAAsyncWithCallback(String creditCardNumber, String holder, float amount); -} diff --git a/sca-java-2.x/trunk/itest/async-interactions/src/main/java/test/client/CreditCardPaymentCallback.java b/sca-java-2.x/trunk/itest/async-interactions/src/main/java/test/client/CreditCardPaymentCallback.java deleted file mode 100644 index 18cd13e671..0000000000 --- a/sca-java-2.x/trunk/itest/async-interactions/src/main/java/test/client/CreditCardPaymentCallback.java +++ /dev/null @@ -1,29 +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 test.client; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * The callback interface - */ -@Remotable -public interface CreditCardPaymentCallback { - void authorizeResponse(String creditCardNumber, String status); -} diff --git a/sca-java-2.x/trunk/itest/async-interactions/src/main/java/test/client/CreditCardPaymentClientImpl.java b/sca-java-2.x/trunk/itest/async-interactions/src/main/java/test/client/CreditCardPaymentClientImpl.java deleted file mode 100644 index 0ff4dcce4b..0000000000 --- a/sca-java-2.x/trunk/itest/async-interactions/src/main/java/test/client/CreditCardPaymentClientImpl.java +++ /dev/null @@ -1,153 +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 test.client; - -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.Future; - -import javax.xml.ws.AsyncHandler; -import javax.xml.ws.Response; - -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Service; - -import com.example.test.jaxb.client.AuthorizeResponse; -import com.example.test.jaxb.client.CreditCardDetailsType; -import com.example.test.jaxb.client.ObjectFactory; -import com.example.test.jaxb.client.PayerType; -import com.example.test.jaxws.client.AuthorizeFault; -import com.example.test.jaxws.client.CreditCardPayment; - -/** - * Mocked implementation of CreditCardPaymentClient - */ -@Service(CreditCardClient.class) -public class CreditCardPaymentClientImpl implements CreditCardClient, CreditCardPaymentCallback { - - @Reference - private CreditCardPayment proxy; - - @Reference - private CreditCardPaymentRequestClient asyncProxy; - - @Override - public String authorize(String creditCardNumber, String holder, float amount) { - CreditCardDetailsType creditCard = createCreditCard(creditCardNumber, holder); - - try { - return proxy.authorize(creditCard, amount); - } catch (AuthorizeFault e) { - return "FAIL: " + e.getFaultInfo().getErrorCode(); - } - - } - - private CreditCardDetailsType createCreditCard(String creditCardNumber, String holder) { - ObjectFactory factory = new ObjectFactory(); - CreditCardDetailsType creditCard = factory.createCreditCardDetailsType(); - creditCard.setCreditCardNumber(creditCardNumber); - PayerType payer = factory.createPayerType(); - payer.setName(holder); - creditCard.setCardOwner(payer); - return creditCard; - } - - public String authorizeAsync(String creditCardNumber, String holder, float amount) { - CreditCardDetailsType creditCard = createCreditCard(creditCardNumber, holder); - - Response<AuthorizeResponse> respone = proxy.authorizeAsync(creditCard, amount); - try { - return respone.get().getStatus(); - } catch (Exception e) { - e.printStackTrace(); - return "FAIL: " + e.getMessage(); - } - - } - - public String authorizeAsyncWithCallback(String creditCardNumber, String holder, float amount) { - CreditCardDetailsType creditCard = createCreditCard(creditCardNumber, holder); - - Future<?> respone = proxy.authorizeAsync(creditCard, amount, new AsyncHandler<AuthorizeResponse>() { - - @Override - public void handleResponse(Response<AuthorizeResponse> res) { - try { - System.out.println(Thread.currentThread() + " Response has arrived: " + res.get().getStatus()); - } catch (Exception e) { - e.printStackTrace(); - } - } - }); - - while (!(respone.isDone() || respone.isCancelled())) { - try { - Thread.sleep(1000); - } catch (InterruptedException e) { - e.printStackTrace(); - return "FAIL: " + e.getMessage(); - } - } - - System.out.println(Thread.currentThread() + " The task is done"); - try { - return ((AuthorizeResponse)respone.get()).getStatus(); - } catch (Exception e) { - e.printStackTrace(); - return "FAIL: " + e.getMessage(); - } - } - - /** - * A map that host the result for a given credit card - */ - private static Map<String, String> statusMap = new HashMap<String, String>(); - - public String authorizeSCAAsyncWithCallback(String creditCardNumber, String holder, float amount) { - CreditCardDetailsType creditCard = createCreditCard(creditCardNumber, holder); - asyncProxy.authorizeRequest(creditCard, amount); - while (true) { - synchronized (statusMap) { - String status = statusMap.remove(creditCardNumber); - if (status != null) { - System.out.println("Response found for " + creditCardNumber + " :" + status); - return status; - } else { - try { - statusMap.wait(); - } catch (InterruptedException e) { - e.printStackTrace(); - return "FAIL: " + e.getMessage(); - } - } - } - } - } - - @Override - public void authorizeResponse(String creditCardNumber, String status) { - System.out.println("SCA Callback: CreditCard: " + creditCardNumber + " Status: " + status); - synchronized (statusMap) { - statusMap.put(creditCardNumber, status); - statusMap.notifyAll(); - } - } - -} diff --git a/sca-java-2.x/trunk/itest/async-interactions/src/main/java/test/client/CreditCardPaymentRequestClient.java b/sca-java-2.x/trunk/itest/async-interactions/src/main/java/test/client/CreditCardPaymentRequestClient.java deleted file mode 100644 index 1a1395a252..0000000000 --- a/sca-java-2.x/trunk/itest/async-interactions/src/main/java/test/client/CreditCardPaymentRequestClient.java +++ /dev/null @@ -1,36 +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 test.client; - -import org.oasisopen.sca.annotation.Callback; -import org.oasisopen.sca.annotation.OneWay; -import org.oasisopen.sca.annotation.Remotable; - -import com.example.test.jaxb.client.CreditCardDetailsType; - -/** - * The bi-direction interface - */ -@Remotable -@Callback(CreditCardPaymentCallback.class) -public interface CreditCardPaymentRequestClient { - @OneWay - void authorizeRequest(CreditCardDetailsType creditCard, float amount); -} diff --git a/sca-java-2.x/trunk/itest/async-interactions/src/main/java/test/server/CreditCardPaymentImpl.java b/sca-java-2.x/trunk/itest/async-interactions/src/main/java/test/server/CreditCardPaymentImpl.java deleted file mode 100644 index 07d0e03ecb..0000000000 --- a/sca-java-2.x/trunk/itest/async-interactions/src/main/java/test/server/CreditCardPaymentImpl.java +++ /dev/null @@ -1,65 +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 test.server; - -import org.oasisopen.sca.annotation.Callback; -import org.oasisopen.sca.annotation.Service; - -import test.client.CreditCardPaymentCallback; - -import com.example.test.jaxb.server.CreditCardDetailsType; -import com.example.test.jaxws.server.AuthorizeFault; -import com.example.test.jaxws.server.CreditCardPayment; - -/** - * Mocked implementation of CreditCardPayment - */ -@Service({CreditCardPayment.class, CreditCardPaymentRequestServer.class}) -public class CreditCardPaymentImpl implements CreditCardPayment, CreditCardPaymentRequestServer { - @Callback - protected CreditCardPaymentCallback callback; - - @Override - public void authorizeRequest(CreditCardDetailsType creditCard, float amount) { - String status; - try { - status = authorize(creditCard, amount); - } catch (AuthorizeFault e) { - status = "FAIL: " + e.getFaultInfo().getErrorCode(); - } - callback.authorizeResponse(creditCard.getCreditCardNumber(), status); - } - - @Override - public String authorize(CreditCardDetailsType creditCard, float amount) throws AuthorizeFault { - if (creditCard != null) { - System.out.println("Checking card: name = " + creditCard.getCardOwner().getName() - + " number = " - + creditCard.getCreditCardNumber() - + " for amount " - + amount); - } else { - System.out.println("Checking card is null"); - } - - return "OK"; - } - -} diff --git a/sca-java-2.x/trunk/itest/async-interactions/src/main/java/test/server/CreditCardPaymentRequestServer.java b/sca-java-2.x/trunk/itest/async-interactions/src/main/java/test/server/CreditCardPaymentRequestServer.java deleted file mode 100644 index 4741c6b8e7..0000000000 --- a/sca-java-2.x/trunk/itest/async-interactions/src/main/java/test/server/CreditCardPaymentRequestServer.java +++ /dev/null @@ -1,38 +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 test.server; - -import org.oasisopen.sca.annotation.Callback; -import org.oasisopen.sca.annotation.OneWay; -import org.oasisopen.sca.annotation.Remotable; - -import test.client.CreditCardPaymentCallback; - -import com.example.test.jaxb.server.CreditCardDetailsType; - -/** - * The bi-direction interface - */ -@Remotable -@Callback(CreditCardPaymentCallback.class) -public interface CreditCardPaymentRequestServer { - @OneWay - void authorizeRequest(CreditCardDetailsType creditCard, float amount); -} diff --git a/sca-java-2.x/trunk/itest/async-interactions/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/async-interactions/src/main/resources/jndi.properties deleted file mode 100644 index 324132604b..0000000000 --- a/sca-java-2.x/trunk/itest/async-interactions/src/main/resources/jndi.properties +++ /dev/null @@ -1,39 +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. -java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory - -# use the following property to configure the default connector -java.naming.provider.url = vm://localhost?broker.persistent=false - -# use the following property to specify the JNDI name the connection factory -# should appear as. -#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry -connectionFactoryNames = ConnectionFactory - -# register some queues in JNDI using the form -# queue.[jndiName] = [physicalName] -queue.RequestQueue = RequestQueue -queue.ResponseQueue = ResponseQueue - -queue.CreditCardPayment = CreditCardPaymentQueue -queue.CreditCardPaymentRequestServer = CreditCardPaymentRequestServerQueue - -# register some topics in JNDI using the form -# topic.[jndiName] = [physicalName] -#topic.MyTopic = example.MyTopic - -# END SNIPPET: jndi diff --git a/sca-java-2.x/trunk/itest/async-interactions/src/main/resources/test/client/creditcard-client.composite b/sca-java-2.x/trunk/itest/async-interactions/src/main/resources/test/client/creditcard-client.composite deleted file mode 100644 index 48fe1894be..0000000000 --- a/sca-java-2.x/trunk/itest/async-interactions/src/main/resources/test/client/creditcard-client.composite +++ /dev/null @@ -1,46 +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://docs.oasis-open.org/ns/opencsa/sca/200912" targetNamespace="http://www.example.com" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" name="CreditCardComposite"> - - <component name="CreditCardPaymentComponent"> - <implementation.java class="test.server.CreditCardPaymentImpl" /> - <service name="CreditCardPayment"> - <binding.jms> - <tuscany:wireFormat.jmsTextXML /> - <destination jndiName="CreditCardPayment" /> - </binding.jms> - </service> - - <service name="CreditCardPaymentRequestServer"> - <binding.jms> - <tuscany:wireFormat.jmsTextXML /> - <destination jndiName="CreditCardPaymentRequestServer" /> - </binding.jms> - </service> - </component> - - <component name="CreditCardClientComponent"> - <implementation.java class="test.client.CreditCardPaymentClientImpl" /> - <reference name="proxy" target="CreditCardPaymentComponent/CreditCardPayment" /> - <reference name="asyncProxy" target="CreditCardPaymentComponent/CreditCardPaymentRequestServer" /> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/async-interactions/src/main/resources/wsdl/creditcard-client.xml b/sca-java-2.x/trunk/itest/async-interactions/src/main/resources/wsdl/creditcard-client.xml deleted file mode 100644 index edf8f375bc..0000000000 --- a/sca-java-2.x/trunk/itest/async-interactions/src/main/resources/wsdl/creditcard-client.xml +++ /dev/null @@ -1,29 +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. ---> -<bindings - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - wsdlLocation="creditcard.wsdl" - xmlns="http://java.sun.com/xml/ns/jaxws"> - <bindings node="wsdl:definitions"> - <package name="com.example.test.jaxws.client"/> - <enableAsyncMapping>true</enableAsyncMapping> - </bindings> -</bindings>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/async-interactions/src/main/resources/wsdl/creditcard-server.xml b/sca-java-2.x/trunk/itest/async-interactions/src/main/resources/wsdl/creditcard-server.xml deleted file mode 100644 index 9f39e164b2..0000000000 --- a/sca-java-2.x/trunk/itest/async-interactions/src/main/resources/wsdl/creditcard-server.xml +++ /dev/null @@ -1,29 +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. ---> -<bindings - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - wsdlLocation="creditcard.wsdl" - xmlns="http://java.sun.com/xml/ns/jaxws"> - <bindings node="wsdl:definitions"> - <package name="com.example.test.jaxws.server"/> - <enableAsyncMapping>false</enableAsyncMapping> - </bindings> -</bindings>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/async-interactions/src/main/resources/wsdl/creditcard.wsdl b/sca-java-2.x/trunk/itest/async-interactions/src/main/resources/wsdl/creditcard.wsdl deleted file mode 100644 index 93988329cb..0000000000 --- a/sca-java-2.x/trunk/itest/async-interactions/src/main/resources/wsdl/creditcard.wsdl +++ /dev/null @@ -1,125 +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. ---> -<wsdl:definitions name="CreditCardPayment" targetNamespace="http://www.example.com/CreditCardPayment/" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://www.example.com/CreditCardPayment/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> - <wsdl:types> - <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com/CreditCardPayment/" - xmlns:tns="http://www.example.com/CreditCardPayment/"> - - <!-- https://jaxb.dev.java.net/issues/show_bug.cgi?id=518 --> - <!-- I have to change the complex types to be annoymous --> - <xsd:element name="authorize"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="CreditCard" type="tns:CreditCardDetailsType"></xsd:element> - <xsd:element name="Amount" type="xsd:float"></xsd:element> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - - <xsd:element name="authorizeResponse"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="Status" type="xsd:string"></xsd:element> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - - <xsd:complexType name="CreditCardDetailsType"> - <xsd:sequence> - <xsd:element name="CreditCardType" type="tns:CreditCardTypeType" minOccurs="0" /> - <xsd:element name="CreditCardNumber" type="xsd:string" minOccurs="0" /> - <xsd:element name="ExpMonth" type="xsd:int" minOccurs="0" /> - <xsd:element name="ExpYear" type="xsd:int" minOccurs="0" /> - <xsd:element name="CardOwner" type="tns:PayerType" minOccurs="0" /> - <xsd:element name="CVV2" type="xsd:string" minOccurs="0" /> - </xsd:sequence> - </xsd:complexType> - <xsd:simpleType name="CreditCardTypeType"> - <xsd:restriction base="xsd:token"> - <xsd:enumeration value="Visa" /> - <xsd:enumeration value="MasterCard" /> - <xsd:enumeration value="Discover" /> - <xsd:enumeration value="Amex" /> - </xsd:restriction> - </xsd:simpleType> - <xsd:complexType name="PayerType"> - <xsd:sequence> - <xsd:element name="Name" type="xsd:string" /> - <xsd:element name="Address" type="tns:AddressType" /> - </xsd:sequence> - </xsd:complexType> - <xsd:complexType name="AddressType"> - <xsd:sequence> - <xsd:element name="Street" type="xsd:string" /> - <xsd:element name="City" type="xsd:string" /> - <xsd:element name="State" type="xsd:string" /> - <xsd:element name="ZipCode" type="xsd:string" /> - <xsd:element name="HomePhone" type="xsd:string" /> - </xsd:sequence> - </xsd:complexType> - <xsd:element name="authorizeFault"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="errorCode" type="xsd:string"></xsd:element> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - </xsd:schema> - </wsdl:types> - <wsdl:message name="AuthorizeRequest"> - <wsdl:part name="parameters" element="tns:authorize"></wsdl:part> - </wsdl:message> - <wsdl:message name="AuthorizeResponse"> - <wsdl:part name="parameters" element="tns:authorizeResponse"></wsdl:part> - </wsdl:message> - <wsdl:message name="AuthorizeFault"> - <wsdl:part name="parameters" element="tns:authorizeFault"></wsdl:part> - </wsdl:message> - <wsdl:portType name="CreditCardPayment"> - <wsdl:operation name="authorize"> - <wsdl:input message="tns:AuthorizeRequest"></wsdl:input> - <wsdl:output message="tns:AuthorizeResponse"></wsdl:output> - <wsdl:fault name="authorizationFailure" message="tns:AuthorizeFault"></wsdl:fault> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="CreditCardPaymentBinding" type="tns:CreditCardPayment"> - <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" /> - <wsdl:operation name="authorize"> - <soap:operation soapAction="http://www.example.com/CreditCardPayment/authorize" /> - <wsdl:input> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output> - <soap:body use="literal" /> - </wsdl:output> - <wsdl:fault name="authorizationFailure"> - <soap:fault name="authorizationFailure" use="literal" /> - </wsdl:fault> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="CreditCardPaymentService"> - <wsdl:port name="CreditCardPaymentPort" binding="tns:CreditCardPaymentBinding"> - <soap:address location="http://localhost:8080/CreditCardPayment" /> - </wsdl:port> - </wsdl:service> - -</wsdl:definitions>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/async-interactions/src/test/java/itest/CreditCardTestCase.java b/sca-java-2.x/trunk/itest/async-interactions/src/test/java/itest/CreditCardTestCase.java deleted file mode 100644 index c4a01bf144..0000000000 --- a/sca-java-2.x/trunk/itest/async-interactions/src/test/java/itest/CreditCardTestCase.java +++ /dev/null @@ -1,83 +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 itest; - -import java.util.concurrent.ExecutionException; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; - -import test.client.CreditCardClient; - -/** - * A test case for two SCA components exchange data via binding.jms - */ -public class CreditCardTestCase { - - private static Node node; - private static CreditCardClient client; - - @BeforeClass - public static void init() throws Exception { - String contribution = ContributionLocationHelper.getContributionLocation(CreditCardClient.class); - node = - NodeFactory.newInstance().createNode("test/client/creditcard-client.composite", - new Contribution("cc", contribution)); - node.start(); - - client = node.getService(CreditCardClient.class, "CreditCardClientComponent/CreditCardClient"); - } - - @AfterClass - public static void destroy() throws Exception { - if (node != null) { - node.stop(); - } - } - - @Test - public void testCreditCard() { - String status = client.authorize("123", "John", 100.0f); - Assert.assertEquals("OK", status); - } - - @Test - public void testCreditCardAsync() throws InterruptedException, ExecutionException { - String result = client.authorizeAsync("456", "Mary", 120.0f); - Assert.assertEquals("OK", result); - } - - @Test - public void testCreditCardAsyncWithCallback() throws InterruptedException, ExecutionException { - String result = client.authorizeAsyncWithCallback("789", "Smith", 180.0f); - Assert.assertEquals("OK", result); - } - - @Test - public void testCreditCardSCAAsyncWithCallback() throws InterruptedException, ExecutionException { - String result = client.authorizeSCAAsyncWithCallback("888", "Jane", 110.0f); - Assert.assertEquals("OK", result); - } -} diff --git a/sca-java-2.x/trunk/itest/base/dependencies/pom.xml b/sca-java-2.x/trunk/itest/base/dependencies/pom.xml deleted file mode 100644 index ad407a10f7..0000000000 --- a/sca-java-2.x/trunk/itest/base/dependencies/pom.xml +++ /dev/null @@ -1,59 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-base-dependencies</artifactId>
- <name>Apache Tuscany SCA iTest Base Dependencies</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <!-- Copy all the dependencies so the test can verify only the expected ones get dragged in -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy</id>
- <phase>compile</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/sca-java-2.x/trunk/itest/base/dependencies/src/test/java/org/apache/tuscany/sca/itest/base/dependencies/ValidateDependenciesTestCase.java b/sca-java-2.x/trunk/itest/base/dependencies/src/test/java/org/apache/tuscany/sca/itest/base/dependencies/ValidateDependenciesTestCase.java deleted file mode 100644 index e9691cb3fe..0000000000 --- a/sca-java-2.x/trunk/itest/base/dependencies/src/test/java/org/apache/tuscany/sca/itest/base/dependencies/ValidateDependenciesTestCase.java +++ /dev/null @@ -1,58 +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.itest.base.dependencies;
-
-import java.io.File;
-
-import junit.framework.Assert;
-
-import org.junit.Test;
-
-/**
- * Test case for verifying the expected dependencies of the base jar
- * (Uses maven-dependency-plugin config in the pom.xml to generate the dependency list)
- *
- * *** NOTE: this is an API! If the dependencies change the API is changed and users will be broken.
- * Don't just change the list without thinking about the consequencies
- *
- * Current required jars are:
- * asm-3.1.jar
- * cglib-2.2.jar
- * hazelcast-1.8.3.jar
- * hazelcast-client-1.8.3.jar
- * tuscany-base-2.0-SNAPSHOT.jar
- * wsdl4j-1.6.2.jar
- * XmlSchema-1.4.3.jar
- *
- * junit-4.8.1.jar (only from this testcase)
- *
- */
-public class ValidateDependenciesTestCase {
-
- @Test
- public void countDependencies() {
-
- File dependenciesDir = new File("target/dependency");
- Assert.assertTrue(dependenciesDir.exists());
-
- File[] dependencyFiles = dependenciesDir.listFiles();
- Assert.assertEquals(8, dependencyFiles.length);
- }
-}
diff --git a/sca-java-2.x/trunk/itest/base/pom.xml b/sca-java-2.x/trunk/itest/base/pom.xml deleted file mode 100644 index 930f119cd9..0000000000 --- a/sca-java-2.x/trunk/itest/base/pom.xml +++ /dev/null @@ -1,36 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <packaging>pom</packaging>
- <artifactId>itest-base</artifactId>
- <name>Apache Tuscany SCA iTest Base</name>
-
- <modules>
- <module>dependencies</module>
- </modules>
-
-</project>
diff --git a/sca-java-2.x/trunk/itest/bpel/helloworld-reference/pom.xml b/sca-java-2.x/trunk/itest/bpel/helloworld-reference/pom.xml deleted file mode 100644 index 75856a4c74..0000000000 --- a/sca-java-2.x/trunk/itest/bpel/helloworld-reference/pom.xml +++ /dev/null @@ -1,286 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-bpel</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - <artifactId>itest-bpel-helloworld-reference</artifactId> - <name>Apache Tuscany SCA iTest BPEL HelloWorld Reference</name> - - <repositories> - <repository> - <id>apache.incubator</id> - <url>http://people.apache.org/repo/m2-incubating-repository</url> - </repository> - </repositories> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-jetty</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-bpel-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.ode</groupId> - <artifactId>ode-dao-jpa-ojpa-derby</artifactId> - <version>1.1</version> - <type>zip</type> - </dependency> - - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.8.0</version> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - </dependencies> - - <build> - <finalName>${artifactId}</finalName> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <!-- http://jira.codehaus.org/browse/SUREFIRE-322 --> - <version>2.3.1</version> - <configuration> - <useFile>false</useFile> - <trimStackTrace>false</trimStackTrace> - <useSystemClassLoader>true</useSystemClassLoader> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>unpack</id> - <phase>generate-sources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.apache.ode</groupId> - <artifactId>ode-dao-jpa-ojpa-derby</artifactId> - <version>1.1</version> - <type>zip</type> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/test-classes/</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>-Djava.endorsed.dirs=target/endorsed</argLine> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy</id> - <phase>generate-sources</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>javax.xml.ws</groupId> - <artifactId>jaxws-api</artifactId> - <version>2.1</version> - <type>jar</type> - </artifactItem> - <artifactItem> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>2.1</version> - <type>jar</type> - </artifactItem> - </artifactItems> - <outputDirectory>${project.build.directory}/endorsed</outputDirectory> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>true</overWriteSnapshots> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.0</version> - <executions> - <execution> - <id>add-test-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-test-source</goal> - </goals> - <configuration> - <sources> - <source>target/jaxws-source</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jaxws-maven-plugin</artifactId> - <version>1.12</version> - <!-- - Explicitly add the transitive dependencies for jaxws-api - http://jira.codehaus.org/browse/MEV-498 - --> - <dependencies> - <dependency> - <groupId>javax.jws</groupId> - <artifactId>jsr181-api</artifactId> - <version>1.0-MR1</version> - </dependency> - <dependency> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - <version>1.0</version> - </dependency> - </dependencies> - <executions> - <execution> - <id>wsimport</id> - <phase>generate-test-sources</phase> - <goals> - <goal>wsimport</goal> - </goals> - <configuration> - <packageName>org.apache.tuscany.implementation.bpel.example.helloworld</packageName> - <wsdlDirectory>${basedir}/src/test/resources/helloworld/</wsdlDirectory> - <wsdlFiles> - <wsdlFile>helloworld.wsdl</wsdlFile> - </wsdlFiles> - <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir> - <verbose>false</verbose> - <xnocompile>true</xnocompile> - </configuration> - </execution> - - <!-- - <execution> - <id>wsgen</id> - <phase>process-test-classes</phase> - <goals> - <goal>wsgen-test</goal> - </goals> - <configuration> - <sei>org.apache.tuscany.sca.interfacedef.java.jaxws.MyServiceImpl</sei> - <genWsdl>true</genWsdl> - <keep>true</keep> - <resourceDestDir>${project.build.directory}/jaxws-source</resourceDestDir> - <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir> - </configuration> - </execution> - --> - </executions> - - </plugin> - - <!-- - wsimport cannot handle WSDL files without a service/binding element. - CXF wsdl2java plugin does support that. I had to override the default - value of wsdlRoot/testWsdlRoot to a non-existent file to avoid NPE --> - <!-- - <plugin> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-codegen-plugin</artifactId> - <version>2.1</version> - <executions> - <execution> - <id>generate-sources</id> - <phase>generate-sources</phase> - - <configuration> - <sourceRoot>${basedir}/target/jaxws-source</sourceRoot> - <wsdlRoot>NONE</wsdlRoot> - <testWsdlRoot>NONE</testWsdlRoot> - <wsdlOptions> - <wsdlOption> - <wsdl>${basedir}/src/test/resources/wsdl/Stock.wsdl</wsdl> - <outputDir>${basedir}/target/jaxws-source</outputDir> - <packagenames> - <packagename>com.example.stock.cxf</packagename> - </packagenames> - </wsdlOption> - </wsdlOptions> - </configuration> - <goals> - <goal>wsdl2java</goal> - </goals> - </execution> - </executions> - </plugin> - --> - </plugins> - </build> - -</project> diff --git a/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java b/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java deleted file mode 100644 index d7dff093f9..0000000000 --- a/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsService.java +++ /dev/null @@ -1,31 +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 greetings; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * This is the business interface of the HelloWorld greetings service. - */ -@Remotable -public interface GreetingsService { - - public String getGreetings(String name); -} - diff --git a/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java b/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java deleted file mode 100644 index 5ecf5494be..0000000000 --- a/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsServiceImpl.java +++ /dev/null @@ -1,33 +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 greetings; - -import org.oasisopen.sca.annotation.Service; - -/** - * This class implements the HelloWorld service. - */ -@Service(GreetingsService.class) -public class GreetingsServiceImpl implements GreetingsService { - - public String getGreetings(String name) { - return "Hello " + name; - } - -} diff --git a/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java b/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java deleted file mode 100644 index 24ab0a4181..0000000000 --- a/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/java/greetings/GreetingsTestCase.java +++ /dev/null @@ -1,65 +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 greetings; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * Tests the Greetings service - * - * @version $Rev$ $Date$ - */ -public class GreetingsTestCase { - - private static Node node; - - /** - * @throws java.lang.Exception - */ - @BeforeClass - public static void setUp() throws Exception { - String location = ContributionLocationHelper.getContributionLocation("greetings/greetings.composite"); - node = NodeFactory.newInstance().createNode("greetings/greetings.composite", new Contribution("c1", location)); - node.start(); - } - - /** - * @throws java.lang.Exception - */ - @AfterClass - public static void tearDown() throws Exception { - node.stop(); - } - - @Test - public void testInvoke() { - GreetingsService greetingsService = node.getService(GreetingsService.class, "GreetingsServiceComponent"); - String response = greetingsService.getGreetings("Luciano"); - Assert.assertEquals("Hello Luciano", response); - } -} diff --git a/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java deleted file mode 100644 index f46893481b..0000000000 --- a/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldService.java +++ /dev/null @@ -1,29 +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 helloworld; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * The interface for the helloworld service - */ -@Remotable -public interface HelloWorldService { - public String hello(String name); -} diff --git a/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java deleted file mode 100644 index a687534bb2..0000000000 --- a/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldServiceImpl.java +++ /dev/null @@ -1,47 +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 helloworld; - -import greetings.GreetingsService; - -import org.oasisopen.sca.annotation.Reference; - -/** - * The HelloWorld service implementation - */ -public class HelloWorldServiceImpl implements HelloWorldService { - - protected GreetingsService greetingsService; - - public GreetingsService getGreetingsService() { - System.out.println("Got Injected greetingsService"); - return greetingsService; - } - - @Reference - public void setGreetingsService(GreetingsService greetingsService) { - System.out.println("Injected greetingsService"); - this.greetingsService = greetingsService; - } - - public String hello(String name) { - System.out.println("Calling greeting services getGreetings"); - return greetingsService.getGreetings(name); - } -}
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java deleted file mode 100644 index a9268ac1b5..0000000000 --- a/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/java/helloworld/HelloWorldTestCase.java +++ /dev/null @@ -1,64 +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 helloworld; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * Tests the BPEL Helloworld Service - * - * @version $Rev$ $Date$ - */ -public class HelloWorldTestCase { - private static Node node; - - /** - * @throws java.lang.Exception - */ - @BeforeClass - public static void setUp() throws Exception { - String location = ContributionLocationHelper.getContributionLocation("helloworld/helloworld.composite"); - node = NodeFactory.newInstance().createNode("helloworld/helloworld.composite", new Contribution("c1", location)); - node.start(); - } - - /** - * @throws java.lang.Exception - */ - @AfterClass - public static void tearDown() throws Exception { - node.stop(); - } - - @Test - public void testServiceInvocation() { - HelloWorldService bpelService = node.getService(HelloWorldService.class, "HelloWorldService"); - String response = bpelService.hello("Luciano"); - Assert.assertEquals("Hello Luciano", response); - } -} diff --git a/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite b/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite deleted file mode 100644 index d3cfb80547..0000000000 --- a/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.composite +++ /dev/null @@ -1,32 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://greetings" - xmlns:hw="http://greetings" - name="greetings"> - - <component name="GreetingsServiceComponent"> - <implementation.java class="greetings.GreetingsServiceImpl" /> - <service name="GreetingsService"> - <interface.wsdl interface="http://greetings#wsdl.interface(Greetings)" /> - </service> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl b/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl deleted file mode 100644 index b976a53970..0000000000 --- a/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/resources/greetings/greetings.wsdl +++ /dev/null @@ -1,87 +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. ---> -<wsdl:definitions name="greetings" - targetNamespace="http://greetings" - xmlns:tns="http://greetings" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/"> - - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://greetings" xmlns="http://www.w3.org/2001/XMLSchema"> - - <element name="greetings"> - <complexType> - <sequence> - <element name="greetings" type="xsd:string"/> - </sequence> - </complexType> - </element> - - <element name="greetingsResponse"> - <complexType> - <sequence> - <element name="greetingsResponse" type="xsd:string"/> - </sequence> - </complexType> - </element> - - </schema> - </wsdl:types> - - <wsdl:message name="GreetingsRequest"> - <wsdl:part element="tns:greetings" name="request"/> - </wsdl:message> - - <wsdl:message name="GreetingsResponse"> - <wsdl:part element="tns:greetingsResponse" name="response"/> - </wsdl:message> - - <wsdl:portType name="Greetings"> - <wsdl:operation name="getGreetings"> - <wsdl:input message="tns:GreetingsRequest" name="GreetingsRequest"/> - <wsdl:output message="tns:GreetingsResponse" name="GreetingsResponse"/> - </wsdl:operation> - </wsdl:portType> - - <wsdl:binding name="GreetingsSoapBinding" type="tns:Greetings"> - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="getGreetings"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="GreetingsRequest"> - <wsdlsoap:body use="literal"/> - </wsdl:input> - <wsdl:output name="GreetingsResponse"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - - <wsdl:service name="GreetingsService"> - <wsdl:port name="GreetingsSoapPort" binding="tns:GreetingsSoapBinding"> - <wsdlsoap:address location="http://localhost:8085/ode/processes/greetings"/> - </wsdl:port> - </wsdl:service> - - <plnk:partnerLinkType name="GreetingsPartnerLinkType"> - <plnk:role name="Provider" portType="tns:Greetings"/> - </plnk:partnerLinkType> -</wsdl:definitions> diff --git a/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel b/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel deleted file mode 100644 index c0317687df..0000000000 --- a/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.bpel +++ /dev/null @@ -1,84 +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. - --> -<process name="HelloWorld" - targetNamespace="http://helloworld" - xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
- xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/" - xmlns:tns="http://helloworld" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:helloworld="http://helloworld"
- xmlns:greetings="http://greetings" - queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0" - expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0" xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> - - <import location="helloworld.wsdl" importType="http://schemas.xmlsoap.org/wsdl/" - namespace="http://helloworld"/> -
- <import location="../greetings/greetings.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"
- namespace="http://greetings"/>
- - <partnerLinks> - <partnerLink name="helloPartnerLink" partnerLinkType="helloworld:HelloPartnerLinkType" myRole="me" />
- <partnerLink name="greetingsPartnerLink" partnerLinkType="greetings:GreetingsPartnerLinkType" partnerRole="Provider" initializePartnerRole="yes" /> - </partnerLinks> - - <variables> - <variable name="helloMessage" messageType="helloworld:HelloMessage"/>
- <variable name="helloMessageResponse" messageType="helloworld:HelloMessageResponse"/>
- <variable name="greetingsRequest" messageType="greetings:GreetingsRequest"/>
- <variable name="greetingsResponse" messageType="greetings:GreetingsResponse"/>
- </variables> - - <sequence> - <receive - name="start"
- createInstance="yes" - operation="hello"
- variable="helloMessage"
- partnerLink="helloPartnerLink" - portType="helloworld:HelloWorld" /> -
- <assign name="assignToGreetingsRequest">
- <copy>
- <from>$helloMessage.TestPart</from>
- <to>$greetingsRequest.request</to>
- </copy>
- </assign>
- - <invoke name="invokeGreetings"
- operation="getGreetings"
- inputVariable="greetingsRequest"
- outputVariable="greetingsResponse"
- partnerLink="greetingsPartnerLink"
- portType="greetings:Greetings" />
-
- <assign name="assignToHelloResponse">
- <copy>
- <from>$greetingsResponse.parameters/greetings:GreetingsResponse</from>
- <to>$helloMessageResponse.TestPart</to>
- </copy>
- </assign>
-
- <reply name="end"
- operation="hello" - partnerLink="helloPartnerLink" - portType="helloworld:HelloWorld" - variable="helloMessageResponse"/> - </sequence> -</process> diff --git a/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite b/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite deleted file mode 100644 index ef66d28bb9..0000000000 --- a/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.composite +++ /dev/null @@ -1,36 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://bpel" - xmlns:hns="http://helloworld" - name="helloworld"> - - <component name="HelloWorldService"> - <implementation.bpel process="hns:HelloWorld"/> - <reference name="greetingsPartnerLink" target="GreetingsServiceComponent"/> - </component> - - <component name="GreetingsServiceComponent"> - <implementation.java class="greetings.GreetingsServiceImpl" /> - <service name="GreetingsService"> - <interface.wsdl interface="http://greetings#wsdl.interface(Greetings)" /> - </service> - </component> -</composite> diff --git a/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl b/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl deleted file mode 100644 index 541a713112..0000000000 --- a/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/resources/helloworld/helloworld.wsdl +++ /dev/null @@ -1,94 +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. - --> - -<wsdl:definitions name="helloworld" - targetNamespace="http://helloworld" - xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:tns="http://helloworld" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/" - xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/"> - - <wsdl:types> - <schema elementFormDefault="qualified" - targetNamespace="http://helloworld" - xmlns="http://www.w3.org/2001/XMLSchema"> - - <element name="hello"> - <complexType> - <sequence> - <element name="message" type="xsd:string"/> - </sequence> - </complexType> - </element> - - <element name="helloResponse"> - <complexType> - <sequence> - <element name="messageResponse" type="xsd:string"/> - </sequence> - </complexType> - </element> - </schema> - </wsdl:types> - - <wsdl:message name="HelloMessage"> - <wsdl:part element="tns:hello" name="TestPart"/> - </wsdl:message> - - <wsdl:message name="HelloMessageResponse"> - <wsdl:part element="tns:helloResponse" name="TestResponse"/> - </wsdl:message> - - <wsdl:portType name="HelloWorld"> - <wsdl:operation name="hello"> - <wsdl:input message="tns:HelloMessage" name="TestIn"/> - <wsdl:output message="tns:HelloMessageResponse" name="TestOut"/> - </wsdl:operation> - </wsdl:portType> - - - <wsdl:binding name="HelloSoapBinding" type="tns:HelloWorld"> - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="hello"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="TestIn"> - <wsdlsoap:body use="literal"/> - </wsdl:input> - <wsdl:output name="TestOut"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - - <wsdl:service name="HelloWorldService"> - <wsdl:port name="HelloSoapPort" binding="tns:HelloSoapBinding"> - <soap:address location="http://localhost:8085/ode/processes/helloWorld"/> - </wsdl:port> - </wsdl:service> - - <plnk:partnerLinkType name="HelloPartnerLinkType"> - <plnk:role name="me" portType="tns:HelloWorld"/> - <plnk:role name="you" portType="tns:HelloWorld"/> - </plnk:partnerLinkType> -</wsdl:definitions>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/resources/log4j.properties b/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/resources/log4j.properties deleted file mode 100644 index 4e13380e0b..0000000000 --- a/sca-java-2.x/trunk/itest/bpel/helloworld-reference/src/test/resources/log4j.properties +++ /dev/null @@ -1,36 +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. -# - -# Set root logger level to WARN and its only appender to CONSOLE -log4j.rootLogger=OFF, CONSOLE - -# log4j properties to work with commandline tools. -log4j.category.org.mortbay=OFF -log4j.category.org.hibernate.type=OFF -log4j.category.org.objectweb=OFF -log4j.category.org.apache.ode.axis2=OFF -log4j.category.org.apache.ode.bpel.engine=OFF -log4j.category.org.apache.ode.daohib.bpel.CorrelatorDaoImpl=OFF -log4j.category.org.apache.ode.bpel.epr=OFF -log4j.category.org.apache.tuscany.sca.implementation.bpel=DEBUG -log4j.category.org.apache.tuscany.sca.implementation.bpel.ode=DEBUG -log4j.category.org.apache.tuscany.sca.implementation.bpel.provider=DEBUG - -# Console appender -log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender -log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout -log4j.appender.CONSOLE.layout.ConversionPattern=[%p] - %C{1}.%M(%L) | %m%n diff --git a/sca-java-2.x/trunk/itest/bpel/helloworld-ws/pom.xml b/sca-java-2.x/trunk/itest/bpel/helloworld-ws/pom.xml deleted file mode 100644 index dffbb4f9a9..0000000000 --- a/sca-java-2.x/trunk/itest/bpel/helloworld-ws/pom.xml +++ /dev/null @@ -1,175 +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. - --> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-bpel</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - <artifactId>itest-bpel-helloworld-ws - </artifactId> - <name>Apache Tuscany SCA iTest BPEL HelloWorld Over Web Services</name> - - <repositories> - <repository> - <id>apache.incubator</id> - <url>http://people.apache.org/repo/m2-incubating-repository - </url> - </repository> - </repositories> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-bpel-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.8.1</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-jetty</artifactId> - <version>1.6-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - </dependencies> - - <build> - <finalName>${artifactId}</finalName> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <!-- http://jira.codehaus.org/browse/SUREFIRE-322 --> - <version>2.3.1</version> - <configuration> - <useFile>false</useFile> - <trimStackTrace>false</trimStackTrace> - <useSystemClassLoader>true</useSystemClassLoader> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin - </artifactId> - <executions> - <execution> - <id>unpack</id> - <phase>test-compile</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.apache.ode</groupId> - <artifactId>ode-dao-jpa-ojpa-derby - </artifactId> - <version>1.1</version> - <type>zip</type> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/test-classes/ - </outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.tuscany.sdo</groupId> - <artifactId>tuscany-sdo-plugin</artifactId> - <version>1.1.1</version> - <executions> - <execution> - <id>generate-bpel-helloworld</id> - <phase>generate-sources</phase> - <configuration> - <schemaFile> - ${basedir}/src/test/resources/helloworld/helloworld.wsdl - </schemaFile> - <targetDirectory>${basedir}/target/wsdl2java-source - </targetDirectory> - <prefix>HelloWorld</prefix> - <noNotification>true</noNotification> - <noContainer>true</noContainer> - <noUnsettable>true</noUnsettable> - </configuration> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-maven-wsdl2java - </artifactId> - <version>1.6-SNAPSHOT</version> - <executions> - <execution> - <configuration> - <wsdlFiles> - <wsdlFile> - <fileName> - ${basedir}/src/test/resources/helloworld/helloworld.wsdl - </fileName> - </wsdlFile> - </wsdlFiles> - </configuration> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</project> diff --git a/sca-java-2.x/trunk/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java b/sca-java-2.x/trunk/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.java deleted file mode 100644 index 0999e97065..0000000000 --- a/sca-java-2.x/trunk/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorld.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 helloworld; - -import org.apache.tuscany.implementation.bpel.example.helloworld.HelloPortType; -import org.oasisopen.sca.annotation.Reference; - -/** - * @version $Rev$ $Date$ - */ -public class HelloWorld { - private HelloPortType helloService; - - public HelloWorld() { - super(); - } - - @Reference - public void setHelloService(HelloPortType helloService){ - this.helloService = helloService; - } - - public String hello(String hello) throws java.rmi.RemoteException { - System.out.println(">>> Invoking helloService.hello with : " + hello); - return this.helloService.hello(hello); - } - -} diff --git a/sca-java-2.x/trunk/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-2.x/trunk/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java deleted file mode 100644 index 315591fb98..0000000000 --- a/sca-java-2.x/trunk/itest/bpel/helloworld-ws/src/test/java/helloworld/HelloWorldTestCase.java +++ /dev/null @@ -1,71 +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 helloworld; - -import java.io.IOException; -import java.net.Socket; - -import junit.framework.Assert; - -import org.apache.tuscany.implementation.bpel.example.helloworld.HelloPortType; -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; - -/** - * Tests the BPEL Helloworld Service - * - * @version $Rev$ $Date$ - */ -public class HelloWorldTestCase { - - private Node node; - - /** - * @throws java.lang.Exception - */ - @BeforeClass - protected void setUp() throws Exception { - String location = ContributionLocationHelper.getContributionLocation("helloworld/helloworld.composite"); - node = NodeFactory.newInstance().createNode("CallBackApiTest.composite", new Contribution("c1", location)); - node.start(); - } - - /** - * @throws java.lang.Exception - */ - @AfterClass - protected void tearDown() throws Exception { - node.stop(); - } - - public void testPing() throws IOException { - new Socket("127.0.0.1", 8085); - } - - public void testServiceInvocation() throws Exception { - HelloPortType bpelService = node.getService(HelloPortType.class, "BPELHelloWorldServiceComponent"); - String response = bpelService.hello("Hello"); - Assert.assertEquals("Hello World", response); - } -} diff --git a/sca-java-2.x/trunk/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel b/sca-java-2.x/trunk/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel deleted file mode 100644 index 8cf91adc2c..0000000000 --- a/sca-java-2.x/trunk/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.bpel +++ /dev/null @@ -1,66 +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. - --> -<process name="HelloWorld" - targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld" - xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
- xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/" - xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:test="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl" - queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0" - expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"> - - <import location="helloworld.wsdl" importType="http://schemas.xmlsoap.org/wsdl/" - namespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"/> - - <partnerLinks> - <partnerLink name="helloPartnerLink" partnerLinkType="test:HelloPartnerLinkType" myRole="me" /> - </partnerLinks> - - <variables> - <variable name="helloMessage" messageType="test:HelloMessage"/> - <variable name="tmpVar" type="xsd:string"/> - </variables> - - <sequence> - <receive - name="start" - partnerLink="helloPartnerLink" - portType="test:HelloPortType" - operation="hello" - variable="helloMessage" - createInstance="yes"/> - - <assign name="assign1"> - <copy> - <from variable="helloMessage" part="TestPart"/> - <to variable="tmpVar"/> - </copy> - <copy> - <from>concat($tmpVar,' World')</from> - <to variable="helloMessage" part="TestPart"/> - </copy> - </assign> - <reply name="end" - partnerLink="helloPartnerLink" - portType="test:HelloPortType" - operation="hello" - variable="helloMessage"/> - </sequence> -</process> diff --git a/sca-java-2.x/trunk/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite b/sca-java-2.x/trunk/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite deleted file mode 100644 index e606e6dd52..0000000000 --- a/sca-java-2.x/trunk/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.composite +++ /dev/null @@ -1,32 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://bpel" - xmlns:hns="http://tuscany.apache.org/implementation/bpel/example/helloworld" - name="helloworld"> - - <component name="BPELHelloWorldServiceComponent"> - <implementation.bpel process="hns:HelloWorld"/> - <service name="helloPartnerLink"> - <interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl#wsdl.interface(HelloPortType)" /> - <binding.ws uri="http://localhost:8085/HelloPartnerLink" wsdlElement="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl#wsdl.service(HelloService)"/> - </service> - </component> -</composite> diff --git a/sca-java-2.x/trunk/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl b/sca-java-2.x/trunk/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl deleted file mode 100644 index 610bda3cc4..0000000000 --- a/sca-java-2.x/trunk/itest/bpel/helloworld-ws/src/test/resources/helloworld/helloworld.wsdl +++ /dev/null @@ -1,82 +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. - --> - -<wsdl:definitions name="helloworld" - targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl" - xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/" - xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/"> - - <wsdl:types> - <schema elementFormDefault="qualified" - targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl" - xmlns="http://www.w3.org/2001/XMLSchema"> - - <element name="hello"> - <complexType> - <sequence> - <element name="message" type="xsd:string"/> - </sequence> - </complexType> - </element> - </schema> - </wsdl:types> - - <wsdl:message name="HelloMessage"> - <wsdl:part element="tns:hello" name="TestPart"/> - </wsdl:message> - - <wsdl:portType name="HelloPortType"> - <wsdl:operation name="hello"> - <wsdl:input message="tns:HelloMessage" name="TestIn"/> - <wsdl:output message="tns:HelloMessage" name="TestOut"/> - </wsdl:operation> - </wsdl:portType> - - - <wsdl:binding name="HelloSoapBinding" type="tns:HelloPortType"> - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="hello"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="TestIn"> - <wsdlsoap:body use="literal"/> - </wsdl:input> - <wsdl:output name="TestOut"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - - <wsdl:service name="HelloService"> - <wsdl:port name="HelloPort" binding="tns:HelloSoapBinding"> - <soap:address location="http://localhost:8085/ode/processes/helloWorld"/> - </wsdl:port> - </wsdl:service> - - <plnk:partnerLinkType name="HelloPartnerLinkType"> - <plnk:role name="me" portType="tns:HelloPortType"/> - <plnk:role name="you" portType="tns:HelloPortType"/> - </plnk:partnerLinkType> -</wsdl:definitions>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/bpel/helloworld-ws/src/test/resources/log4j.properties b/sca-java-2.x/trunk/itest/bpel/helloworld-ws/src/test/resources/log4j.properties deleted file mode 100644 index 37f66e4189..0000000000 --- a/sca-java-2.x/trunk/itest/bpel/helloworld-ws/src/test/resources/log4j.properties +++ /dev/null @@ -1,36 +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. -# - -# Set root logger level to WARN and its only appender to CONSOLE
-log4j.rootLogger=OFF, CONSOLE
-
-# log4j properties to work with commandline tools.
-log4j.category.org.mortbay=OFF
-log4j.category.org.hibernate.type=OFF
-log4j.category.org.objectweb=OFF
-log4j.category.org.apache.ode.axis2=OFF
-log4j.category.org.apache.ode.bpel.engine=OFF
-log4j.category.org.apache.ode.daohib.bpel.CorrelatorDaoImpl=OFF
-log4j.category.org.apache.ode.bpel.epr=OFF -log4j.category.org.apache.tuscany.sca.implementation.bpel=DEBUG -log4j.category.org.apache.tuscany.sca.implementation.bpel.ode=DEBUG -log4j.category.org.apache.tuscany.sca.implementation.bpel.provider=DEBUG
-
-# Console appender
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=[%p] - %C{1}.%M(%L) | %m%n
diff --git a/sca-java-2.x/trunk/itest/bpel/helloworld/pom.xml b/sca-java-2.x/trunk/itest/bpel/helloworld/pom.xml deleted file mode 100644 index 2e01bee7c2..0000000000 --- a/sca-java-2.x/trunk/itest/bpel/helloworld/pom.xml +++ /dev/null @@ -1,270 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-bpel</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - <artifactId>itest-bpel-helloworld</artifactId> - <name>Apache Tuscany SCA iTest BPEL HelloWorld</name> - - <repositories> - <repository> - <id>apache.incubator</id> - <url>http://people.apache.org/repo/m2-incubating-repository - </url> - </repository> - </repositories> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-bpel-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-wsdlgen</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.8.1</version> - </dependency> - - </dependencies> - - <build> - <finalName>${artifactId}</finalName> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <!-- http://jira.codehaus.org/browse/SUREFIRE-322 --> - <version>2.3.1</version> - <configuration> - <useFile>false</useFile> - <trimStackTrace>false</trimStackTrace> - <useSystemClassLoader>true</useSystemClassLoader> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>unpack</id> - <phase>test-compile</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.apache.ode</groupId> - <artifactId>ode-dao-jpa-ojpa-derby</artifactId> - <version>1.1</version> - <type>zip</type> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/test-classes/</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>-Djava.endorsed.dirs=target/endorsed</argLine> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy</id> - <phase>generate-sources</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>javax.xml.ws</groupId> - <artifactId>jaxws-api</artifactId> - <version>2.1</version> - <type>jar</type> - </artifactItem> - <artifactItem> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>2.1</version> - <type>jar</type> - </artifactItem> - </artifactItems> - <outputDirectory>${project.build.directory}/endorsed</outputDirectory> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>true</overWriteSnapshots> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.0</version> - <executions> - <execution> - <id>add-test-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-test-source</goal> - </goals> - <configuration> - <sources> - <source>target/jaxws-source</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jaxws-maven-plugin</artifactId> - <version>1.12</version> - <!-- - Explicitly add the transitive dependencies for jaxws-api - http://jira.codehaus.org/browse/MEV-498 - --> - <dependencies> - <dependency> - <groupId>javax.jws</groupId> - <artifactId>jsr181-api</artifactId> - <version>1.0-MR1</version> - </dependency> - <dependency> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - <version>1.0</version> - </dependency> - </dependencies> - <executions> - <execution> - <id>wsimport</id> - <phase>generate-test-sources</phase> - <goals> - <goal>wsimport</goal> - </goals> - <configuration> - <packageName>org.apache.tuscany.implementation.bpel.example.helloworld</packageName> - <wsdlDirectory>${basedir}/src/test/resources/helloworld/</wsdlDirectory> - <wsdlFiles> - <wsdlFile>helloworld.wsdl</wsdlFile> - </wsdlFiles> - <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir> - <verbose>false</verbose> - <xnocompile>true</xnocompile> - </configuration> - </execution> - - <!-- - <execution> - <id>wsgen</id> - <phase>process-test-classes</phase> - <goals> - <goal>wsgen-test</goal> - </goals> - <configuration> - <sei>org.apache.tuscany.sca.interfacedef.java.jaxws.MyServiceImpl</sei> - <genWsdl>true</genWsdl> - <keep>true</keep> - <resourceDestDir>${project.build.directory}/jaxws-source</resourceDestDir> - <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir> - </configuration> - </execution> - --> - </executions> - - </plugin> - - <!-- - wsimport cannot handle WSDL files without a service/binding element. - CXF wsdl2java plugin does support that. I had to override the default - value of wsdlRoot/testWsdlRoot to a non-existent file to avoid NPE --> - <!-- - <plugin> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-codegen-plugin</artifactId> - <version>2.1</version> - <executions> - <execution> - <id>generate-sources</id> - <phase>generate-sources</phase> - - <configuration> - <sourceRoot>${basedir}/target/jaxws-source</sourceRoot> - <wsdlRoot>NONE</wsdlRoot> - <testWsdlRoot>NONE</testWsdlRoot> - <wsdlOptions> - <wsdlOption> - <wsdl>${basedir}/src/test/resources/wsdl/Stock.wsdl</wsdl> - <outputDir>${basedir}/target/jaxws-source</outputDir> - <packagenames> - <packagename>com.example.stock.cxf</packagename> - </packagenames> - </wsdlOption> - </wsdlOptions> - </configuration> - <goals> - <goal>wsdl2java</goal> - </goals> - </execution> - </executions> - </plugin> - --> - - </plugins> - </build> - -</project> diff --git a/sca-java-2.x/trunk/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java b/sca-java-2.x/trunk/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.java deleted file mode 100644 index 0999e97065..0000000000 --- a/sca-java-2.x/trunk/itest/bpel/helloworld/src/test/java/helloworld/HelloWorld.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 helloworld; - -import org.apache.tuscany.implementation.bpel.example.helloworld.HelloPortType; -import org.oasisopen.sca.annotation.Reference; - -/** - * @version $Rev$ $Date$ - */ -public class HelloWorld { - private HelloPortType helloService; - - public HelloWorld() { - super(); - } - - @Reference - public void setHelloService(HelloPortType helloService){ - this.helloService = helloService; - } - - public String hello(String hello) throws java.rmi.RemoteException { - System.out.println(">>> Invoking helloService.hello with : " + hello); - return this.helloService.hello(hello); - } - -} diff --git a/sca-java-2.x/trunk/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java b/sca-java-2.x/trunk/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java deleted file mode 100644 index cbed39c295..0000000000 --- a/sca-java-2.x/trunk/itest/bpel/helloworld/src/test/java/helloworld/HelloWorldTestCase.java +++ /dev/null @@ -1,75 +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 helloworld; - -import junit.framework.Assert; - -import org.apache.tuscany.implementation.bpel.example.helloworld.HelloPortType; -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; - -/** - * Tests the BPEL Helloworld Service - * - * @version $Rev$ $Date$ - */ -@Ignore -public class HelloWorldTestCase { - - private static Node node; - - /** - * @throws java.lang.Exception - */ - @BeforeClass - public static void setUp() throws Exception { - String location = ContributionLocationHelper.getContributionLocation("helloworld/helloworld.composite"); - node = NodeFactory.newInstance().createNode("helloworld/helloworld.composite", new Contribution("c1", location)); - node.start(); - } - - /** - * @throws java.lang.Exception - */ - @AfterClass - public static void tearDown() throws Exception { - node.stop(); - } - - @Test - public void testServiceInvocation() throws Exception { - HelloPortType bpelService = node.getService(HelloPortType.class, "BPELHelloWorldService"); - String response = bpelService.hello("Hello"); - Assert.assertEquals("Hello World", response); - } - - @Test - public void testReferenceInvocation() throws Exception { - HelloWorld bpelService = node.getService(HelloWorld.class, "BPELHelloWorld"); - String response = bpelService.hello("Hello"); - Assert.assertEquals("Hello World", response); - } -} diff --git a/sca-java-2.x/trunk/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel b/sca-java-2.x/trunk/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel deleted file mode 100644 index 156e32e9ee..0000000000 --- a/sca-java-2.x/trunk/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.bpel +++ /dev/null @@ -1,78 +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. - --> -<process name="HelloWorld" - targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld" - xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
- xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/" - xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:test="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl" - queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0" - expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0" xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable"> - - <import location="helloworld.wsdl" importType="http://schemas.xmlsoap.org/wsdl/" - namespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"/> - - <partnerLinks> - <partnerLink name="helloPartnerLink" partnerLinkType="test:HelloPartnerLinkType" myRole="me" /> - </partnerLinks> - - <variables> - <variable name="helloMessage" messageType="test:HelloMessage"/> - <variable name="helloMessageResponse" messageType="test:HelloMessageResponse"/> - <variable name="tmpVar" type="xsd:string"/> - </variables> - - <sequence> - <receive - name="start" - partnerLink="helloPartnerLink" - portType="test:HelloPortType" - operation="hello" - variable="helloMessage" - createInstance="yes"/> - - <assign name="assign1"> - <copy> - <from>concat($helloMessage.TestPart/test:message/text(), ' World')</from> - <to variable="tmpVar"/> - </copy> - <!-- Initialize the response --> - <copy> - <from> - <literal> - <test:helloResponse> - <test:messageResponse>Dummy</test:messageResponse> - </test:helloResponse> - </literal> - </from> - <to variable="helloMessageResponse" part="TestResponse"/> - </copy> - <copy> - <from variable="tmpVar"/> - <to>$helloMessageResponse.TestResponse/test:messageResponse</to> - </copy> - </assign> - <reply name="end" - partnerLink="helloPartnerLink" - portType="test:HelloPortType" - operation="hello" - variable="helloMessageResponse"/> - </sequence> -</process> diff --git a/sca-java-2.x/trunk/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite b/sca-java-2.x/trunk/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite deleted file mode 100644 index 96ec8b24b7..0000000000 --- a/sca-java-2.x/trunk/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.composite +++ /dev/null @@ -1,36 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://bpel" - xmlns:hns="http://tuscany.apache.org/implementation/bpel/example/helloworld" - name="helloworld"> - - <component name="BPELHelloWorld"> - <implementation.java class="helloworld.HelloWorld"/> - <reference name="helloService" target="BPELHelloWorldService"> - <!-- Workaround for databinding issue --> - <!-- interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl#wsdl.interface(HelloPortType)" / --> - </reference> - </component> - - <component name="BPELHelloWorldService"> - <implementation.bpel process="hns:HelloWorld"/> - </component> -</composite> diff --git a/sca-java-2.x/trunk/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl b/sca-java-2.x/trunk/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl deleted file mode 100644 index c77318e8fd..0000000000 --- a/sca-java-2.x/trunk/itest/bpel/helloworld/src/test/resources/helloworld/helloworld.wsdl +++ /dev/null @@ -1,94 +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. - --> - -<wsdl:definitions name="helloworld" - targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl" - xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/" - xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/"> - - <wsdl:types> - <schema elementFormDefault="qualified" - targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl" - xmlns="http://www.w3.org/2001/XMLSchema"> - - <element name="hello"> - <complexType> - <sequence> - <element name="message" type="xsd:string"/> - </sequence> - </complexType> - </element> - - <element name="helloResponse"> - <complexType> - <sequence> - <element name="messageResponse" type="xsd:string"/> - </sequence> - </complexType> - </element> - </schema> - </wsdl:types> - - <wsdl:message name="HelloMessage"> - <wsdl:part element="tns:hello" name="TestPart"/> - </wsdl:message> - - <wsdl:message name="HelloMessageResponse"> - <wsdl:part element="tns:helloResponse" name="TestResponse"/> - </wsdl:message> - - <wsdl:portType name="HelloPortType"> - <wsdl:operation name="hello"> - <wsdl:input message="tns:HelloMessage" name="TestIn"/> - <wsdl:output message="tns:HelloMessageResponse" name="TestOut"/> - </wsdl:operation> - </wsdl:portType> - - - <wsdl:binding name="HelloSoapBinding" type="tns:HelloPortType"> - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="hello"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="TestIn"> - <wsdlsoap:body use="literal"/> - </wsdl:input> - <wsdl:output name="TestOut"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - - <wsdl:service name="HelloService"> - <wsdl:port name="HelloPort" binding="tns:HelloSoapBinding"> - <soap:address location="http://localhost:8085/ode/processes/helloWorld"/> - </wsdl:port> - </wsdl:service> - - <plnk:partnerLinkType name="HelloPartnerLinkType"> - <plnk:role name="me" portType="tns:HelloPortType"/> - <plnk:role name="you" portType="tns:HelloPortType"/> - </plnk:partnerLinkType> -</wsdl:definitions>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/bpel/helloworld/src/test/resources/log4j.properties b/sca-java-2.x/trunk/itest/bpel/helloworld/src/test/resources/log4j.properties deleted file mode 100644 index 37f66e4189..0000000000 --- a/sca-java-2.x/trunk/itest/bpel/helloworld/src/test/resources/log4j.properties +++ /dev/null @@ -1,36 +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. -# - -# Set root logger level to WARN and its only appender to CONSOLE
-log4j.rootLogger=OFF, CONSOLE
-
-# log4j properties to work with commandline tools.
-log4j.category.org.mortbay=OFF
-log4j.category.org.hibernate.type=OFF
-log4j.category.org.objectweb=OFF
-log4j.category.org.apache.ode.axis2=OFF
-log4j.category.org.apache.ode.bpel.engine=OFF
-log4j.category.org.apache.ode.daohib.bpel.CorrelatorDaoImpl=OFF
-log4j.category.org.apache.ode.bpel.epr=OFF -log4j.category.org.apache.tuscany.sca.implementation.bpel=DEBUG -log4j.category.org.apache.tuscany.sca.implementation.bpel.ode=DEBUG -log4j.category.org.apache.tuscany.sca.implementation.bpel.provider=DEBUG
-
-# Console appender
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=[%p] - %C{1}.%M(%L) | %m%n
diff --git a/sca-java-2.x/trunk/itest/bpel/pom.xml b/sca-java-2.x/trunk/itest/bpel/pom.xml deleted file mode 100644 index 10cc5e27fe..0000000000 --- a/sca-java-2.x/trunk/itest/bpel/pom.xml +++ /dev/null @@ -1,39 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-bpel</artifactId> - <packaging>pom</packaging> - <name>Apache Tuscany SCA iTest BPEL Integration Tests</name> - - <modules> - <module>helloworld</module> - <!-- - <module>helloworld-reference</module> - <module>helloworld-ws</module> - --> - </modules> -</project> diff --git a/sca-java-2.x/trunk/itest/builder/pom.xml b/sca-java-2.x/trunk/itest/builder/pom.xml deleted file mode 100644 index 390716452d..0000000000 --- a/sca-java-2.x/trunk/itest/builder/pom.xml +++ /dev/null @@ -1,112 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-builder</artifactId> - <name>Apache Tuscany SCA iTest Builder</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-sca-api</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-monitor</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-sca-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-assembly</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-core-databinding</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-jetty</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.8.1</version> - <scope>test</scope> - </dependency> - - </dependencies> - - <build> - <finalName>${artifactId}</finalName> - </build> -</project> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java b/sca-java-2.x/trunk/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java deleted file mode 100644 index b0dc7a6389..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDImpl.java +++ /dev/null @@ -1,43 +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.itest.builder; - -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Service; - -/** - * Implementation class for ComponentD. - * - * @version $Rev$ $Date$ - */ -@Service({Service3.class, Service3a.class}) -public class ComponentDImpl implements Service3, Service3a { - - @Reference - protected Service3a reference3; - - public String getGreetings(String name) { - return "Hello, " + name + "!"; - } - - public String getGreetings2(String name) { - return "Goodbye, " + name + "!"; - } - -} diff --git a/sca-java-2.x/trunk/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java b/sca-java-2.x/trunk/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.java deleted file mode 100644 index bf73a64027..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentDReferenceMultiplicityImpl.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.itest.builder; - -import java.util.List; - -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Service; - -/** - * Implementation class for ComponentD. - * - * @version $Rev$ $Date$ - */ -@Service({Service3.class, Service3a.class}) -public class ComponentDReferenceMultiplicityImpl implements Service3, Service3a { - - @Reference - protected Service3a reference3; - - @Reference - protected List<Service3> reference3a; - - public String getGreetings(String name) { - return "Hello, " + name + "!"; - } - - public String getGreetings2(String name) { - return "Goodbye, " + name + "!"; - } - -} diff --git a/sca-java-2.x/trunk/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java b/sca-java-2.x/trunk/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java deleted file mode 100644 index 6f36b1c55a..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentEImpl.java +++ /dev/null @@ -1,36 +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.itest.builder; - -import org.oasisopen.sca.annotation.Service; - - -/** - * Implementation class for ComponentD. - * - * @version $Rev$ $Date$ - */ -@Service({Service3.class}) -public class ComponentEImpl implements Service3 { - - - public String getGreetings(String name) { - return "Hello, " + name + " from ComponentE"; - } -} diff --git a/sca-java-2.x/trunk/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java b/sca-java-2.x/trunk/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java deleted file mode 100644 index 8c5c5de208..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/ComponentFImpl.java +++ /dev/null @@ -1,36 +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.itest.builder; - -import org.oasisopen.sca.annotation.Service; - - -/** - * Implementation class for ComponentD. - * - * @version $Rev$ $Date$ - */ -@Service({Service3.class}) -public class ComponentFImpl implements Service3 { - - - public String getGreetings(String name) { - return "Hello, " + name + " from ComponentF"; - } -} diff --git a/sca-java-2.x/trunk/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java b/sca-java-2.x/trunk/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java deleted file mode 100644 index f4b8d2cf39..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3.java +++ /dev/null @@ -1,34 +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.itest.builder; - -import org.oasisopen.sca.annotation.Remotable; - - -/** - * Interface for Service3 in ComponentD. - * - * @version $Rev$ $Date$ - */ -@Remotable -public interface Service3 { - - String getGreetings(String name); - -} diff --git a/sca-java-2.x/trunk/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java b/sca-java-2.x/trunk/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java deleted file mode 100644 index 299f7606e3..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/java/org/apache/tuscany/sca/itest/builder/Service3a.java +++ /dev/null @@ -1,34 +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.itest.builder; - -import org.oasisopen.sca.annotation.Remotable; - - -/** - * Interface for Service3a in ComponentD. - * - * @version $Rev$ $Date$ - */ -@Remotable -public interface Service3a { - - String getGreetings2(String name); - -} diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml deleted file mode 100644 index 7fabed9436..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario1/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:ns1="http://scenario1"> - <deployable composite="ns1:CompositeA" /> -</contribution> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario1/scenario1.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario1/scenario1.composite deleted file mode 100644 index 286e53539f..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario1/scenario1.composite +++ /dev/null @@ -1,45 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://scenario1" - xmlns:tns="http://scenario1" - name="CompositeA"> - - <service name="Service1" promote="ComponentB/Service2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - <binding.ws /> - </service> - <reference name="reference1" promote="ComponentB/reference2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - - <component name="ComponentB"> - <implementation.composite name="tns:CompositeC" /> - <service name="Service2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <service name="Service2a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - </component> -</composite> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario1/scenario1a.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario1/scenario1a.composite deleted file mode 100644 index 2bdfc19c3c..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario1/scenario1a.composite +++ /dev/null @@ -1,47 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://scenario1" - xmlns:tns="http://scenario1" - name="CompositeC"> - - <service name="Service2" promote="ComponentD/Service3"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <service name="Service2a" promote="ComponentD/Service3a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference2" promote="ComponentD/reference3" multiplicity="1..1"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - - <component name="ComponentD"> - <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/> - <service name="Service3"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <service name="Service3a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference3"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - </component> -</composite> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml deleted file mode 100644 index ac01b3c687..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario10/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +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. ---> -<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://scenario10" - xmlns:ns10="http://scenario10"> - <deployable composite="ns10:CompositeA" /> -</contribution> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario10/scenario10.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario10/scenario10.composite deleted file mode 100644 index 2d127a7bec..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario10/scenario10.composite +++ /dev/null @@ -1,62 +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://scenario10" - xmlns:tns="http://scenario10" - name="CompositeA"> - - <service name="Service1" promote="ComponentB/Service2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference1" promote="ComponentB/reference2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - <reference name="reference1a" promote="ComponentB/reference2a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - - <component name="ComponentB"> - <implementation.composite name="tns:CompositeC" /> - <service name="Service2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <service name="Service2a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - <binding.ws uri="http://foo.com/bar" /> - </service> - <reference name="reference2" target="ComponentB/Service2a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - <binding.ws /> - </reference> - <reference name="reference2a" target="ComponentF"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - <interface.wsdl interface="http://scenarios#wsdl.interface(Service3)" /> - <binding.ws /> - </reference> - </component> - - <component name="ComponentF"> - <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/> - <service name="Service3"> - <binding.sca /> - <binding.ws /> - </service> - </component> -</composite> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario10/scenario10a.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario10/scenario10a.composite deleted file mode 100644 index 0fda11482b..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario10/scenario10a.composite +++ /dev/null @@ -1,61 +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://scenario10" - xmlns:tns="http://scenario10" - name="CompositeC"> - - <service name="Service2" promote="ComponentD/Service3"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <service name="Service2a" promote="ComponentD/Service3a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference2" promote="ComponentD/reference3" multiplicity="1..1"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - <reference name="reference2a" promote="ComponentD/reference3a" multiplicity="1..1"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - - <component name="ComponentD"> - <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDReferenceMultiplicityImpl"/> - <service name="Service3"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <service name="Service3a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference3" target="ComponentD/Service3a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - <reference name="reference3a" target="ComponentE"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - </component> - - <component name="ComponentE"> - <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/> - <service name="Service3"> - <binding.sca /> - <binding.ws /> - </service> - </component> -</composite> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario10/service3.wsdl b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario10/service3.wsdl deleted file mode 100644 index 2477e23dc6..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario10/service3.wsdl +++ /dev/null @@ -1,63 +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. ---> -<wsdl:definitions name="Service3Service" - targetNamespace="http://scenarios" - xmlns:tns="http://scenarios" - xmlns:xs="http://www.w3.org/2001/XMLSchema" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - - <wsdl:types> - <xs:schema attributeFormDefault="qualified" - elementFormDefault="unqualified" - targetNamespace="http://scenarios" - xmlns:xs="http://www.w3.org/2001/XMLSchema"> - <xs:element name="getGreetings"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="arg0" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="getGreetingsResponse"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - </xs:element> - </xs:schema> - </wsdl:types> - - <wsdl:message name="getGreetings"> - <wsdl:part name="getGreetings" element="tns:getGreetings" /> - </wsdl:message> - - <wsdl:message name="getGreetingsResponse"> - <wsdl:part name="getGreetingsResponse" element="tns:getGreetingsResponse" /> - </wsdl:message> - - <wsdl:portType name="Service3"> - <wsdl:operation name="getGreetings"> - <wsdl:input message="tns:getGreetings" /> - <wsdl:output message="tns:getGreetingsResponse" /> - </wsdl:operation> - </wsdl:portType> - -</wsdl:definitions> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml deleted file mode 100644 index 8b82b43c68..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario11/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +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. ---> -<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://scenario11" - xmlns:ns11="http://scenario11"> - <deployable composite="ns11:CompositeA" /> -</contribution> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario11/scenario11.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario11/scenario11.composite deleted file mode 100644 index 2f5ca96d07..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario11/scenario11.composite +++ /dev/null @@ -1,59 +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://scenario11" - xmlns:tns="http://scenario11" - name="CompositeA"> - - <service name="Service1" promote="ComponentB/Service2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference1" promote="ComponentB/reference2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - <reference name="reference1a" promote="ComponentB/reference2a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - - <component name="ComponentB"> - <implementation.composite name="tns:CompositeC" /> - <service name="Service2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <service name="Service2a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - <binding.ws uri="http://foo.com/bar" /> - </service> - <reference name="reference2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - <reference name="reference2a" target="ComponentF"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - </component> - - <component name="ComponentF"> - <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/> - <service name="Service3"> - <binding.sca /> - <binding.ws /> - </service> - </component> -</composite> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario11/scenario11a.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario11/scenario11a.composite deleted file mode 100644 index 1831d97ea7..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario11/scenario11a.composite +++ /dev/null @@ -1,64 +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://scenario11" - xmlns:tns="http://scenario11" - name="CompositeC"> - - <service name="Service2" promote="ComponentD/Service3"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <service name="Service2a" promote="ComponentD/Service3a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference2" promote="ComponentD/reference3" target="ComponentB/Service2a" multiplicity="1..1"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - <binding.ws /> - </reference> - <reference name="reference2a" promote="ComponentD/reference3a" multiplicity="1..1"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - <interface.wsdl interface="http://scenarios#wsdl.interface(Service3)" /> - <binding.ws /> - </reference> - - <component name="ComponentD"> - <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDReferenceMultiplicityImpl"/> - <service name="Service3"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <service name="Service3a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference3" target="ComponentD/Service3a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - <reference name="reference3a" target="ComponentE"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - </component> - - <component name="ComponentE"> - <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/> - <service name="Service3"> - <binding.sca /> - <binding.ws /> - </service> - </component> -</composite> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario11/service3.wsdl b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario11/service3.wsdl deleted file mode 100644 index 2477e23dc6..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario11/service3.wsdl +++ /dev/null @@ -1,63 +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. ---> -<wsdl:definitions name="Service3Service" - targetNamespace="http://scenarios" - xmlns:tns="http://scenarios" - xmlns:xs="http://www.w3.org/2001/XMLSchema" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - - <wsdl:types> - <xs:schema attributeFormDefault="qualified" - elementFormDefault="unqualified" - targetNamespace="http://scenarios" - xmlns:xs="http://www.w3.org/2001/XMLSchema"> - <xs:element name="getGreetings"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="arg0" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="getGreetingsResponse"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - </xs:element> - </xs:schema> - </wsdl:types> - - <wsdl:message name="getGreetings"> - <wsdl:part name="getGreetings" element="tns:getGreetings" /> - </wsdl:message> - - <wsdl:message name="getGreetingsResponse"> - <wsdl:part name="getGreetingsResponse" element="tns:getGreetingsResponse" /> - </wsdl:message> - - <wsdl:portType name="Service3"> - <wsdl:operation name="getGreetings"> - <wsdl:input message="tns:getGreetings" /> - <wsdl:output message="tns:getGreetingsResponse" /> - </wsdl:operation> - </wsdl:portType> - -</wsdl:definitions> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml deleted file mode 100644 index 4028098023..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario12/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +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. ---> -<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://scenario12" - xmlns:ns12="http://scenario12"> - <deployable composite="ns12:CompositeA" /> -</contribution> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario12/scenario12.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario12/scenario12.composite deleted file mode 100644 index 23799f8487..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario12/scenario12.composite +++ /dev/null @@ -1,58 +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://scenario12" - xmlns:tns="http://scenario12" - name="CompositeA"> - - <service name="Service1" promote="ComponentB/Service2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference1" promote="ComponentB/reference2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - <reference name="reference1a" promote="ComponentB/reference2a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - - <component name="ComponentB"> - <implementation.composite name="tns:CompositeC" /> - <service name="Service2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <service name="Service2a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - <reference name="reference2a" target="ComponentF"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - </component> - - <component name="ComponentF"> - <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/> - <service name="Service3"> - <binding.sca /> - <binding.ws /> - </service> - </component> -</composite> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario12/scenario12a.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario12/scenario12a.composite deleted file mode 100644 index 7982a9b2d7..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario12/scenario12a.composite +++ /dev/null @@ -1,64 +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://scenario12" - xmlns:tns="http://scenario12" - name="CompositeC"> - - <service name="Service2" promote="ComponentD/Service3"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <service name="Service2a" promote="ComponentD/Service3a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference2" promote="ComponentD/reference3" multiplicity="1..1"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - <reference name="reference2a" promote="ComponentD/reference3a" multiplicity="1..1"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - - <component name="ComponentD"> - <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDReferenceMultiplicityImpl"/> - <service name="Service3"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <service name="Service3a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - <binding.ws uri="http://foo.com/bar" /> - </service> - <reference name="reference3" target="ComponentD/Service3a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - <binding.ws/> - </reference> - <reference name="reference3a" target="ComponentE"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - <binding.ws /> - </reference> - </component> - - <component name="ComponentE"> - <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/> - <service name="Service3"> - <binding.sca /> - <binding.ws /> - </service> - </component> -</composite> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml deleted file mode 100644 index 1da59d5f04..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario13/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +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. ---> -<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://scenario13" - xmlns:ns13="http://scenario13"> - <deployable composite="ns13:CompositeA" /> -</contribution> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario13/scenario13.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario13/scenario13.composite deleted file mode 100644 index 631e38855f..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario13/scenario13.composite +++ /dev/null @@ -1,58 +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://scenario13" - xmlns:tns="http://scenario13" - name="CompositeA"> - - <service name="Service1" promote="ComponentB/Service2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference1" promote="ComponentB/reference2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - <reference name="reference1a" promote="ComponentB/reference2a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - - <component name="ComponentB"> - <implementation.composite name="tns:CompositeC" /> - <service name="Service2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <service name="Service2a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - <reference name="reference2a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - </component> - - <component name="ComponentF"> - <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/> - <service name="Service3"> - <binding.sca /> - <binding.ws /> - </service> - </component> -</composite> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario13/scenario13a.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario13/scenario13a.composite deleted file mode 100644 index a6e31ea5e2..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario13/scenario13a.composite +++ /dev/null @@ -1,64 +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://scenario13" - xmlns:tns="http://scenario13" - name="CompositeC"> - - <service name="Service2" promote="ComponentD/Service3"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <service name="Service2a" promote="ComponentD/Service3a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference2" promote="ComponentD/reference3" multiplicity="1..1"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - <reference name="reference2a" promote="ComponentD/reference3a" multiplicity="1..1"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - - <component name="ComponentD"> - <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDReferenceMultiplicityImpl"/> - <service name="Service3"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <service name="Service3a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - <binding.ws uri="http://foo.com/bar" /> - </service> - <reference name="reference3" target="ComponentD/Service3a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - <binding.ws/> - </reference> - <reference name="reference3a" target="ComponentE"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - <binding.ws /> - </reference> - </component> - - <component name="ComponentE"> - <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/> - <service name="Service3"> - <binding.sca /> - <binding.ws /> - </service> - </component> -</composite> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml deleted file mode 100644 index b51ef11b05..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario2/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:ns2="http://scenario2"> - <deployable composite="ns2:CompositeA" /> -</contribution> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario2/scenario2.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario2/scenario2.composite deleted file mode 100644 index 2fa559e1ed..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario2/scenario2.composite +++ /dev/null @@ -1,45 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://scenario2" - xmlns:tns="http://scenario2" - name="CompositeA"> - - <service name="Service1" promote="ComponentB/Service2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference1" promote="ComponentB/reference2" multiplicity="1..1"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - - <component name="ComponentB"> - <implementation.composite name="tns:CompositeC" /> - <service name="Service2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - <binding.ws /> - </service> - <service name="Service2a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - </component> -</composite> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario2/scenario2a.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario2/scenario2a.composite deleted file mode 100644 index 9fd3df07e8..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario2/scenario2a.composite +++ /dev/null @@ -1,47 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://scenario2" - xmlns:tns="http://scenario2" - name="CompositeC"> - - <service name="Service2" promote="ComponentD/Service3"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <service name="Service2a" promote="ComponentD/Service3a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference2" promote="ComponentD/reference3" multiplicity="1..1"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - - <component name="ComponentD"> - <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/> - <service name="Service3"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <service name="Service3a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference3" > - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - </component> -</composite> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml deleted file mode 100644 index 22950dfe03..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario3/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +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. ---> -<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://scenario3" - xmlns:ns3="http://scenario3"> - <deployable composite="ns3:CompositeA" /> -</contribution> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario3/scenario3.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario3/scenario3.composite deleted file mode 100644 index 84f42c60fc..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario3/scenario3.composite +++ /dev/null @@ -1,44 +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://scenario3" - xmlns:tns="http://scenario3" - name="CompositeA"> - - <service name="Service1" promote="ComponentB/Service2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference1" promote="ComponentB/reference2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - - <component name="ComponentB"> - <implementation.composite name="tns:CompositeC" /> - <service name="Service2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <service name="Service2a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - </component> -</composite> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario3/scenario3a.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario3/scenario3a.composite deleted file mode 100644 index 89fa0619e4..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario3/scenario3a.composite +++ /dev/null @@ -1,48 +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://scenario3" - xmlns:tns="http://scenario3" - name="CompositeC"> - - <service name="Service2" promote="ComponentD/Service3"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - <binding.ws /> - </service> - <service name="Service2a" promote="ComponentD/Service3a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference2" promote="ComponentD/reference3" multiplicity="1..1"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - - <component name="ComponentD"> - <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/> - <service name="Service3"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <service name="Service3a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference3"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - </component> -</composite> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml deleted file mode 100644 index a17e27c9d8..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario4/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +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. ---> -<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://scenario4" - xmlns:ns4="http://scenario4"> - <deployable composite="ns4:CompositeA" /> -</contribution> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario4/scenario4.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario4/scenario4.composite deleted file mode 100644 index a0bdb0197d..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario4/scenario4.composite +++ /dev/null @@ -1,44 +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://scenario4" - xmlns:tns="http://scenario4" - name="CompositeA"> - - <service name="Service1" promote="ComponentB/Service2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference1" promote="ComponentB/reference2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - - <component name="ComponentB"> - <implementation.composite name="tns:CompositeC" /> - <service name="Service2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <service name="Service2a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - </component> -</composite> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario4/scenario4a.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario4/scenario4a.composite deleted file mode 100644 index fbf1b1a893..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario4/scenario4a.composite +++ /dev/null @@ -1,48 +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://scenario4" - xmlns:tns="http://scenario4" - name="CompositeC"> - - <service name="Service2" promote="ComponentD/Service3"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <service name="Service2a" promote="ComponentD/Service3a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference2" promote="ComponentD/reference3" multiplicity="1..1"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - - <component name="ComponentD"> - <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/> - <service name="Service3"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - <binding.ws /> - </service> - <service name="Service3a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference3"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - </component> -</composite> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml deleted file mode 100644 index 83a232db6e..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario5/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +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. ---> -<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://scenario5" - xmlns:ns5="http://scenario5"> - <deployable composite="ns5:CompositeA" /> -</contribution> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario5/scenario5.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario5/scenario5.composite deleted file mode 100644 index 2326afd2f2..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario5/scenario5.composite +++ /dev/null @@ -1,46 +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://scenario5" - xmlns:tns="http://scenario5" - name="CompositeA"> - - <service name="Service1" promote="ComponentB/Service2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference1" promote="ComponentB/reference2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - <interface.wsdl interface="http://scenarios#wsdl.interface(Service3a)" /> - <binding.ws uri="http://foo.com/bar" /> - </reference> - - <component name="ComponentB"> - <implementation.composite name="tns:CompositeC" /> - <service name="Service2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <service name="Service2a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - </component> -</composite> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario5/scenario5a.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario5/scenario5a.composite deleted file mode 100644 index 802d82b0f3..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario5/scenario5a.composite +++ /dev/null @@ -1,47 +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://scenario5" - xmlns:tns="http://scenario5" - name="CompositeC"> - - <service name="Service2" promote="ComponentD/Service3"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <service name="Service2a" promote="ComponentD/Service3a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference2" promote="ComponentD/reference3" multiplicity="1..1"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - - <component name="ComponentD"> - <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/> - <service name="Service3"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <service name="Service3a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference3"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - </component> -</composite> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario5/scenarios.wsdl b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario5/scenarios.wsdl deleted file mode 100644 index 5cda7327dd..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario5/scenarios.wsdl +++ /dev/null @@ -1,63 +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. ---> -<wsdl:definitions name="Service3Service" - targetNamespace="http://scenarios" - xmlns:tns="http://scenarios" - xmlns:xs="http://www.w3.org/2001/XMLSchema" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - - <wsdl:types> - <xs:schema attributeFormDefault="qualified" - elementFormDefault="unqualified" - targetNamespace="http://scenarios" - xmlns:xs="http://www.w3.org/2001/XMLSchema"> - <xs:element name="getGreetings2"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="arg0" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="getGreetings2Response"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - </xs:element> - </xs:schema> - </wsdl:types> - - <wsdl:message name="getGreetings2"> - <wsdl:part name="getGreetings2" element="tns:getGreetings2" /> - </wsdl:message> - - <wsdl:message name="getGreetings2Response"> - <wsdl:part name="getGreetings2Response" element="tns:getGreetings2Response" /> - </wsdl:message> - - <wsdl:portType name="Service3a"> - <wsdl:operation name="getGreetings2"> - <wsdl:input message="tns:getGreetings2" /> - <wsdl:output message="tns:getGreetings2Response" /> - </wsdl:operation> - </wsdl:portType> - -</wsdl:definitions> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml deleted file mode 100644 index fb477d3e62..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario6/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://scenario6" - xmlns:ns6="http://scenario6"> - <deployable composite="ns6:CompositeA" /> -</contribution> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario6/scenario6.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario6/scenario6.composite deleted file mode 100644 index dadfc7eb82..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario6/scenario6.composite +++ /dev/null @@ -1,47 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://scenario6" - xmlns:tns="http://scenario6" - name="CompositeA"> - - <service name="Service1" promote="ComponentB/Service2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference1" promote="ComponentB/reference2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - - <component name="ComponentB"> - <implementation.composite name="tns:CompositeC" /> - <service name="Service2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <service name="Service2a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - <binding.ws uri="http://foo.com/bar" /> - </service> - <reference name="reference2" target="ComponentB/Service2a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - <interface.wsdl interface="http://scenarios#wsdl.interface(Service3a)" /> - <binding.ws /> - </reference> - </component> -</composite> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario6/scenario6a.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario6/scenario6a.composite deleted file mode 100644 index 0c94b2bf06..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario6/scenario6a.composite +++ /dev/null @@ -1,47 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://scenario6" - xmlns:tns="http://scenario6" - name="CompositeC"> - - <service name="Service2" promote="ComponentD/Service3"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <service name="Service2a" promote="ComponentD/Service3a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference2" promote="ComponentD/reference3" multiplicity="1..1"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - - <component name="ComponentD"> - <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/> - <service name="Service3"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <service name="Service3a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference3"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - </component> -</composite> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario6/scenarios.wsdl b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario6/scenarios.wsdl deleted file mode 100644 index 5cda7327dd..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario6/scenarios.wsdl +++ /dev/null @@ -1,63 +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. ---> -<wsdl:definitions name="Service3Service" - targetNamespace="http://scenarios" - xmlns:tns="http://scenarios" - xmlns:xs="http://www.w3.org/2001/XMLSchema" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - - <wsdl:types> - <xs:schema attributeFormDefault="qualified" - elementFormDefault="unqualified" - targetNamespace="http://scenarios" - xmlns:xs="http://www.w3.org/2001/XMLSchema"> - <xs:element name="getGreetings2"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="arg0" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="getGreetings2Response"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - </xs:element> - </xs:schema> - </wsdl:types> - - <wsdl:message name="getGreetings2"> - <wsdl:part name="getGreetings2" element="tns:getGreetings2" /> - </wsdl:message> - - <wsdl:message name="getGreetings2Response"> - <wsdl:part name="getGreetings2Response" element="tns:getGreetings2Response" /> - </wsdl:message> - - <wsdl:portType name="Service3a"> - <wsdl:operation name="getGreetings2"> - <wsdl:input message="tns:getGreetings2" /> - <wsdl:output message="tns:getGreetings2Response" /> - </wsdl:operation> - </wsdl:portType> - -</wsdl:definitions> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml deleted file mode 100644 index ede31d6bee..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario7/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +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. ---> -<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://scenario7" - xmlns:ns7="http://scenario7"> - <deployable composite="ns7:CompositeA" /> -</contribution> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario7/scenario7.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario7/scenario7.composite deleted file mode 100644 index e1d2e0cefe..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario7/scenario7.composite +++ /dev/null @@ -1,45 +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://scenario7" - xmlns:tns="http://scenario7" - name="CompositeA"> - - <service name="Service1" promote="ComponentB/Service2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference1" promote="ComponentB/reference2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - - <component name="ComponentB"> - <implementation.composite name="tns:CompositeC" /> - <service name="Service2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <service name="Service2a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - <binding.ws uri="http://foo.com/bar" /> - </service> - <reference name="reference2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - </component> -</composite> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario7/scenario7a.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario7/scenario7a.composite deleted file mode 100644 index 76892f1515..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario7/scenario7a.composite +++ /dev/null @@ -1,49 +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://scenario7" - xmlns:tns="http://scenario7" - name="CompositeC"> - - <service name="Service2" promote="ComponentD/Service3"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <service name="Service2a" promote="ComponentD/Service3a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference2" promote="ComponentD/reference3" target="ComponentB/Service2a" multiplicity="1..1"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - <interface.wsdl interface="http://scenarios#wsdl.interface(Service3a)" /> - <binding.ws /> - </reference> - - <component name="ComponentD"> - <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/> - <service name="Service3"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <service name="Service3a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference3"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - </component> -</composite> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario7/scenarios.wsdl b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario7/scenarios.wsdl deleted file mode 100644 index 5cda7327dd..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario7/scenarios.wsdl +++ /dev/null @@ -1,63 +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. ---> -<wsdl:definitions name="Service3Service" - targetNamespace="http://scenarios" - xmlns:tns="http://scenarios" - xmlns:xs="http://www.w3.org/2001/XMLSchema" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - - <wsdl:types> - <xs:schema attributeFormDefault="qualified" - elementFormDefault="unqualified" - targetNamespace="http://scenarios" - xmlns:xs="http://www.w3.org/2001/XMLSchema"> - <xs:element name="getGreetings2"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="arg0" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="getGreetings2Response"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - </xs:element> - </xs:schema> - </wsdl:types> - - <wsdl:message name="getGreetings2"> - <wsdl:part name="getGreetings2" element="tns:getGreetings2" /> - </wsdl:message> - - <wsdl:message name="getGreetings2Response"> - <wsdl:part name="getGreetings2Response" element="tns:getGreetings2Response" /> - </wsdl:message> - - <wsdl:portType name="Service3a"> - <wsdl:operation name="getGreetings2"> - <wsdl:input message="tns:getGreetings2" /> - <wsdl:output message="tns:getGreetings2Response" /> - </wsdl:operation> - </wsdl:portType> - -</wsdl:definitions> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml deleted file mode 100644 index 7bb9e694a3..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario8/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +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. ---> -<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://scenario8" - xmlns:ns8="http://scenario8"> - <deployable composite="ns8:CompositeA" /> -</contribution> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario8/scenario8.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario8/scenario8.composite deleted file mode 100644 index 467b7f57fa..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario8/scenario8.composite +++ /dev/null @@ -1,44 +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://scenario8" - xmlns:tns="http://scenario8" - name="CompositeA"> - - <service name="Service1" promote="ComponentB/Service2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference1" promote="ComponentB/reference2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - - <component name="ComponentB"> - <implementation.composite name="tns:CompositeC" /> - <service name="Service2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <service name="Service2a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - </component> -</composite> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario8/scenario8a.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario8/scenario8a.composite deleted file mode 100644 index 86cf093f94..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario8/scenario8a.composite +++ /dev/null @@ -1,50 +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://scenario8" - xmlns:tns="http://scenario8" - name="CompositeC"> - - <service name="Service2" promote="ComponentD/Service3"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <service name="Service2a" promote="ComponentD/Service3a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference2" promote="ComponentD/reference3" multiplicity="1..1"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - - <component name="ComponentD"> - <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDImpl"/> - <service name="Service3"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <service name="Service3a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - <binding.ws uri="http://foo.com/bar" /> - </service> - <reference name="reference3" target="ComponentD/Service3a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - <interface.wsdl interface="http://scenarios#wsdl.interface(Service3a)" /> - <binding.ws /> - </reference> - </component> -</composite> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario8/scenarios.wsdl b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario8/scenarios.wsdl deleted file mode 100644 index 5cda7327dd..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario8/scenarios.wsdl +++ /dev/null @@ -1,63 +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. ---> -<wsdl:definitions name="Service3Service" - targetNamespace="http://scenarios" - xmlns:tns="http://scenarios" - xmlns:xs="http://www.w3.org/2001/XMLSchema" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - - <wsdl:types> - <xs:schema attributeFormDefault="qualified" - elementFormDefault="unqualified" - targetNamespace="http://scenarios" - xmlns:xs="http://www.w3.org/2001/XMLSchema"> - <xs:element name="getGreetings2"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="arg0" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="getGreetings2Response"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/> - </xs:sequence> - </xs:complexType> - </xs:element> - </xs:schema> - </wsdl:types> - - <wsdl:message name="getGreetings2"> - <wsdl:part name="getGreetings2" element="tns:getGreetings2" /> - </wsdl:message> - - <wsdl:message name="getGreetings2Response"> - <wsdl:part name="getGreetings2Response" element="tns:getGreetings2Response" /> - </wsdl:message> - - <wsdl:portType name="Service3a"> - <wsdl:operation name="getGreetings2"> - <wsdl:input message="tns:getGreetings2" /> - <wsdl:output message="tns:getGreetings2Response" /> - </wsdl:operation> - </wsdl:portType> - -</wsdl:definitions> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml deleted file mode 100644 index b6ec160506..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario9/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +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. ---> -<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://scenario9" - xmlns:ns9="http://scenario9"> - <deployable composite="ns9:CompositeA" /> -</contribution> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario9/scenario9.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario9/scenario9.composite deleted file mode 100644 index 83584ed482..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario9/scenario9.composite +++ /dev/null @@ -1,60 +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://scenario9" - xmlns:tns="http://scenario9" - name="CompositeA"> - - <service name="Service1" promote="ComponentB/Service2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference1" promote="ComponentB/reference2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - <binding.ws uri="http://foo.com/bar"/> - </reference> - <reference name="reference1a" promote="ComponentB/reference2a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - <binding.ws uri="http://foo.com/bar"/> - </reference> - - <component name="ComponentB"> - <implementation.composite name="tns:CompositeC" /> - <service name="Service2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <service name="Service2a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference2"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - <reference name="reference2a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - </component> - - <component name="ComponentF"> - <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/> - <service name="Service3"> - <binding.sca /> - <binding.ws /> - </service> - </component> -</composite> diff --git a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario9/scenario9a.composite b/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario9/scenario9a.composite deleted file mode 100644 index 2861974c98..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/main/resources/scenario9/scenario9a.composite +++ /dev/null @@ -1,61 +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://scenario9" - xmlns:tns="http://scenario9" - name="CompositeC"> - - <service name="Service2" promote="ComponentD/Service3"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <service name="Service2a" promote="ComponentD/Service3a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference2" promote="ComponentD/reference3" multiplicity="1..1"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - <reference name="reference2a" promote="ComponentD/reference3a" multiplicity="1..1"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - - <component name="ComponentD"> - <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentDReferenceMultiplicityImpl"/> - <service name="Service3"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <service name="Service3a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </service> - <reference name="reference3" target="ComponentD/Service3a"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - <reference name="reference3a" target="ComponentE"> - <!-- bindings and/or interfaces may or may not be specified explicitly here --> - </reference> - </component> - - <component name="ComponentE"> - <implementation.java class="org.apache.tuscany.sca.itest.builder.ComponentEImpl"/> - <service name="Service3"> - <binding.sca /> - <binding.ws /> - </service> - </component> -</composite> diff --git a/sca-java-2.x/trunk/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java b/sca-java-2.x/trunk/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java deleted file mode 100644 index e2fda0e0ec..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/BuilderTestCase.java +++ /dev/null @@ -1,814 +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.itest.builder; - -import javax.wsdl.Definition; -import javax.wsdl.Port; -import javax.xml.namespace.QName; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.assembly.Component; -import org.apache.tuscany.sca.assembly.ComponentService; -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.binding.ws.WebServiceBinding; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -/** - * Load and build some composites and inspect the results. - * - * @version $Rev$ $Date$ - */ -public class BuilderTestCase { - private CustomCompositeBuilder customBuilder; - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - /* OASIS doesn't take notice of top level composite services - * - // Scenario 1: <binding.ws> on outer composite service CompositeA/Service1 - @Ignore - @Test - public void testScenario1() throws Exception { - System.out.println("====>Running testScenario1"); - customBuilder = new CustomCompositeBuilder(false); - customBuilder.loadContribution("scenario1.composite", "TestContribution", "src/main/resources/scenario1/"); - //TestUtils.printResults(customBuilder); - TestUtils.checkProblems(customBuilder); - checkScenario1Results(false); - } - - @Ignore - @Test - public void testScenario1NonWiring() throws Exception { - System.out.println("====>Running testScenario1NonWiring"); - customBuilder = new CustomCompositeBuilder(true); - customBuilder.loadContribution("scenario1.composite", "TestContribution", "src/main/resources/scenario1/"); - //TestUtils.printResults(customBuilder); - TestUtils.checkProblems(customBuilder); - checkScenario1Results(true); - } - - private void checkScenario1Results(boolean nonWiring) { - Composite domainComposite = customBuilder.getDomainComposite(); - - Component componentD = TestUtils.getComponent(domainComposite, "ComponentD"); - if (!nonWiring) { - // Should create component service $promoted$Service1 on innermost component - // ComponentD, with <binding.ws> and uri="/Service1" - // No other services on ComponentD should have <binding.ws> - WebServiceBinding wsBinding = null; - for (ComponentService service : componentD.getServices()) { - WebServiceBinding wsb = service.getBinding(WebServiceBinding.class); - if ("$promoted$Service1".equals(service.getName())) { - wsBinding = wsb; - } else { - assert wsb == null; - } - } - assert "/Service1".equals(wsBinding.getURI()); - - // Should create WSDL document for ComponentD/$promoted$Service1 with endpoint uri="/Service1" - Definition def = wsBinding.getWSDLDocument(); - javax.wsdl.Service svc = def.getService(new QName("http://builder.itest.sca.tuscany.apache.org/", "Service3Service")); - Port port = svc.getPort("Service3Port"); - assert "/Service1".equals(TestUtils.getPortAddress(port)); - } else { - // Should not create component service $promoted$Service1 on innermost component ComponentD - // No component services on ComponentD should have <binding.ws> - for (ComponentService service : componentD.getServices()) { - assert !"$promoted$Service1".equals(service.getName()); - assert service.getBinding(WebServiceBinding.class) == null; - } - } - - // No services on ComponentB should have <binding.ws> - Component componentB = TestUtils.getComponent(domainComposite, "ComponentB"); - for (ComponentService service : componentB.getServices()) { - assert service.getBinding(WebServiceBinding.class) == null; - } - - // No services on CompositeC should have <binding.ws> - Composite compositeC = TestUtils.getComposite(domainComposite, new QName("http://scenario1", "CompositeC")); - for (Service service : compositeC.getServices()) { - assert service.getBinding(WebServiceBinding.class) == null; - } - - if (nonWiring) { - // Should not add a WSDL document to domain composite service Service1 - WebServiceBinding wsBinding = null; - for (Service service : domainComposite.getServices()) { - if ("Service1".equals(service.getName())) { - wsBinding = service.getBinding(WebServiceBinding.class); - } - } - assert wsBinding.getWSDLDocument() == null; - } - - String expectedEndpoints = "Component - ComponentB\n" + - "Service - Service2\n" + - "Endpoint - Service2\n" + - "Service - Service2a\n" + - "Endpoint - Service2a\n" + - "Reference - reference2\n" + - "Component - ComponentB has composite impl\n" + - " Component - ComponentD\n" + - " Service - Service3\n" + - " Endpoint - Service3\n" + - " Service - Service3a\n" + - " Endpoint - Service3a\n" + - " Reference - reference3"; - - String actualEndpoints = TestUtils.printEndpoints(domainComposite); - System.out.println(actualEndpoints); - - Assert.assertEquals(expectedEndpoints, actualEndpoints); - } -*/ - - // Scenario 2: <binding.ws> on outer component service ComponentB/Service2 - @Test - public void testScenario2() throws Exception { - System.out.println("====>Running testScenario2"); - customBuilder = new CustomCompositeBuilder(false); - customBuilder.loadContribution("scenario2.composite", "TestContribution", "src/main/resources/scenario2/"); - //TestUtils.printResults(customBuilder); - TestUtils.checkProblems(customBuilder); - checkScenario2and3Results("http://scenario2", false); - } - - public void testScenario2NonWiring() throws Exception { - System.out.println("====>Running testScenario2NonWiring"); - customBuilder = new CustomCompositeBuilder(true); - customBuilder.loadContribution("scenario2.composite", "TestContribution", "src/main/resources/scenario2/"); - //TestUtils.printResults(customBuilder); - TestUtils.checkProblems(customBuilder); - checkScenario2and3Results("http://scenario2", true); - } - - private void checkScenario2and3Results(String namespace, boolean nonWiring) { - Composite domainComposite = customBuilder.getDomainComposite(); - - // Test that endpoint structure matches expected - String structure = TestUtils.printStructure(domainComposite, ""); - System.out.println(structure); - - String expectedStructure = "Component URI - ComponentB\n" + - " Component URI - ComponentB/ComponentD\n" + - " Endpoint: URI = ComponentB/ComponentD#service-binding(Service3/Service3) org.apache.tuscany.sca.assembly.impl.SCABindingImpl\n" + - " Endpoint: URI = ComponentB/ComponentD#service-binding(Service3a/Service3a) org.apache.tuscany.sca.assembly.impl.SCABindingImpl\n" + - "Endpoint: URI = ComponentB#service-binding(Service2/Service2) org.apache.tuscany.sca.binding.ws.impl.WebServiceBindingImpl\n" + - "Endpoint: URI = ComponentB#service-binding(Service2a/Service3a) org.apache.tuscany.sca.assembly.impl.SCABindingImpl\n"; - - Assert.assertEquals(expectedStructure, structure); - - // Test that generated WSDL matches expected - // Should create WSDL document for ComponentB/Service2 with endpoint uri="/ComponentB/Service2" - // No other services on ComponentB should have <binding.ws> - Component componentB = TestUtils.getComponent(domainComposite, "ComponentB"); - WebServiceBinding wsBinding = null; - - for (ComponentService service : componentB.getServices()) { - WebServiceBinding wsb = service.getBinding(WebServiceBinding.class); - if ("Service2".equals(service.getName())) { - wsBinding = wsb; - } else { - assert wsb == null; - } - } - - Definition def = wsBinding.getGeneratedWSDLDocument(); - TestUtils.writeWSDL(def); - - javax.wsdl.Service svc = def.getService(new QName("http://builder.itest.sca.tuscany.apache.org/", "Service3Service")); - Port port = svc.getPort("Service3Port"); - Assert.assertEquals("/ComponentB/Service2",TestUtils.getPortAddress(port)); - - } -/* - // Scenario 3: <binding.ws> on inner composite service CompositeC/Service2 - public void testScenario3() throws Exception { - System.out.println("====>Running testScenario3"); - customBuilder = new CustomCompositeBuilder(false); - customBuilder.loadContribution("scenario3.composite", "TestContribution", "src/main/resources/scenario3/"); - //TestUtils.printResults(customBuilder); - TestUtils.checkProblems(customBuilder); - checkScenario2and3Results("http://scenario3", false); - } - - public void testScenario3NonWiring() throws Exception { - System.out.println("====>Running testScenario3NonWiring"); - customBuilder = new CustomCompositeBuilder(true); - customBuilder.loadContribution("scenario3.composite", "TestContribution", "src/main/resources/scenario3/"); - //TestUtils.printResults(customBuilder); - TestUtils.checkProblems(customBuilder); - checkScenario2and3Results("http://scenario3", true); - } - - // Scenario 4: <binding.ws> on inner component service ComponentD/Service3 - public void testScenario4() throws Exception { - System.out.println("====>Running testScenario4"); - customBuilder = new CustomCompositeBuilder(false); - customBuilder.loadContribution("scenario4.composite", "TestContribution", "src/main/resources/scenario4/"); - //TestUtils.printResults(customBuilder); - TestUtils.checkProblems(customBuilder); - checkScenario4Results(false); - } - - public void testScenario4NonWiring() throws Exception { - System.out.println("====>Running testScenario4NonWiring"); - customBuilder = new CustomCompositeBuilder(true); - customBuilder.loadContribution("scenario4.composite", "TestContribution", "src/main/resources/scenario4/"); - //TestUtils.printResults(customBuilder); - TestUtils.checkProblems(customBuilder); - checkScenario4Results(true); - } - - private void checkScenario4Results(boolean nonWiring) { - Composite domainComposite = customBuilder.getDomainComposite(); - - // Should create WSDL document for ComponentD/Service3 with endpoint uri="/ComponentD/Service3" - Component componentD = TestUtils.getComponent(domainComposite, "ComponentD"); - WebServiceBinding wsBinding = null; - for (ComponentService service : componentD.getServices()) { - if ("Service3".equals(service.getName())) { - wsBinding = service.getBinding(WebServiceBinding.class); - } - } - Definition def = wsBinding.getWSDLDocument(); - javax.wsdl.Service svc = def.getService(new QName("http://builder.itest.sca.tuscany.apache.org/", "Service3Service")); - Port port = svc.getPort("Service3Port"); - assert "/ComponentB/ComponentD/Service3".equals(TestUtils.getPortAddress(port)); - - // Should add <binding.ws> to inner composite service CompositeC/Service2 - // No other services on CompositeC should have <binding.ws> - Composite compositeC = TestUtils.getComposite(domainComposite, new QName("http://scenario4", "CompositeC")); - wsBinding = null; - for (Service service : compositeC.getServices()) { - WebServiceBinding wsb = service.getBinding(WebServiceBinding.class); - if ("Service2".equals(service.getName())) { - wsBinding = wsb; - } else { - assert wsb == null; - } - } - assert "/ComponentB/Service2".equals(wsBinding.getURI()); - - // Should add <binding.ws> to outer component service ComponentB/Service2 - // Should create WSDL document for ComponentB/Service2 with endpoint uri="/ComponentB/Service2" - // No other services on ComponentB should have <binding.ws> - Component componentB = TestUtils.getComponent(domainComposite, "ComponentB"); - wsBinding = null; - for (ComponentService service : componentB.getServices()) { - WebServiceBinding wsb = service.getBinding(WebServiceBinding.class); - if ("Service2".equals(service.getName())) { - wsBinding = wsb; - } else { - assert wsb == null; - } - } - assert "/ComponentB/Service2".equals(wsBinding.getURI()); - def = wsBinding.getWSDLDocument(); - svc = def.getService(new QName("http://builder.itest.sca.tuscany.apache.org/", "Service3Service")); - port = svc.getPort("Service3Port"); - assert "/ComponentB/Service2".equals(TestUtils.getPortAddress(port)); - - if (!nonWiring) { - // Should create component service $promoted$ComponentB$slash$Service2 on innermost component - // ComponentD, with <binding.ws> and uri="/ComponentB/Service2" - wsBinding = null; - for (ComponentService service : componentD.getServices()) { - if ("$promoted$ComponentB$slash$Service2".equals(service.getName())) { - wsBinding = service.getBinding(WebServiceBinding.class); - } - } - assert "/ComponentB/Service2".equals(wsBinding.getURI()); - - // Should create WSDL document for ComponentD/$promoted$ComponentB$slash$Service2 with endpoint uri="/ComponentB/Service2" - def = wsBinding.getWSDLDocument(); - svc = def.getService(new QName("http://builder.itest.sca.tuscany.apache.org/", "Service3Service")); - port = svc.getPort("Service3Port"); - assert "/ComponentB/Service2".equals(TestUtils.getPortAddress(port)); - } else { - // Should not create component service $promoted$ComponentB$slash$Service2 on innermost component ComponentD - for (ComponentService service : componentD.getServices()) { - assert !"$promoted$ComponentB$slash$Service2".equals(service.getName()); - } - } - - // Should add <binding.ws> to outer composite service CompositeA/Service1 - wsBinding = null; - for (Service service : domainComposite.getServices()) { - if ("Service1".equals(service.getName())) { - wsBinding = service.getBinding(WebServiceBinding.class); - } - } - assert wsBinding != null; - if (nonWiring) { - // Should not add a WSDL document to domain composite service Service1 - assert wsBinding.getWSDLDocument() == null; - } - - if (!nonWiring) { - // Should create component service $promoted$Service1 on innermost component - // ComponentD, with <binding.ws> and uri="/Service1" - wsBinding = null; - for (ComponentService service : componentD.getServices()) { - if ("$promoted$Service1".equals(service.getName())) { - wsBinding = service.getBinding(WebServiceBinding.class); - } - } - assert "/Service1".equals(wsBinding.getURI()); - - // Should create WSDL document for ComponentD/$promoted$Service1 with endpoint uri="/Service1" - def = wsBinding.getWSDLDocument(); - svc = def.getService(new QName("http://builder.itest.sca.tuscany.apache.org/", "Service3Service")); - port = svc.getPort("Service3Port"); - assert "/Service1".equals(TestUtils.getPortAddress(port)); - } else { - // Should not create component service $promoted$.Service1 on innermost component ComponentD - for (ComponentService service : componentD.getServices()) { - assert !"$promoted$Service1".equals(service.getName()); - } - } - - // No services on ComponentD should have <binding.ws>, except for Service3, - // $promoted$.Service1 and $promoted$.ComponentB.Service2 - for (ComponentService service : componentD.getServices()) { - if (!"Service3".equals(service.getName()) && - !"$promoted$Service1".equals(service.getName()) && - !"$promoted$ComponentB$slash$Service2".equals(service.getName())) { - assert service.getBinding(WebServiceBinding.class) == null; - } - } - } - - // Scenario 5: <binding.ws> and <interface.wsdl> on outer composite reference CompositeA/reference1 - @Test - public void testScenario5() throws Exception { - System.out.println("====>Running testScenario5"); - customBuilder = new CustomCompositeBuilder(false); - customBuilder.loadContribution("scenario5.composite", "TestContribution", "src/main/resources/scenario5/"); - //TestUtils.printResults(customBuilder); - TestUtils.checkProblems(customBuilder); - checkScenario5Results(false); - } - - @Test - public void testScenario5NonWiring() throws Exception { - System.out.println("====>Running testScenario5NonWiring"); - customBuilder = new CustomCompositeBuilder(true); - customBuilder.loadContribution("scenario5.composite", "TestContribution", "src/main/resources/scenario5/"); - //TestUtils.printResults(customBuilder); - TestUtils.checkProblems(customBuilder); - checkScenario5Results(true); - } - - private void checkScenario5Results(boolean nonWiring) { - Composite domainComposite = customBuilder.getDomainComposite(); - - // Should not add <binding.ws> to any outer component references - Component componentB = TestUtils.getComponent(domainComposite, "ComponentB"); - for (ComponentReference reference : componentB.getReferences()) { - assert reference.getBinding(WebServiceBinding.class) == null; - } - - Definition def; - javax.wsdl.Service svc; - Port port; - WebServiceBinding wsBinding; - Component componentD = TestUtils.getComponent(domainComposite, "ComponentD"); - if (!nonWiring) { - // Should add <binding.ws> to inner component reference ComponentD/reference3 with uri="http://foo.com/bar" - // Should set <interface.wsdl> on inner component reference ComponentD/reference3 - wsBinding = null; - for (ComponentReference reference : componentD.getReferences()) { - if ("reference3".equals(reference.getName())) { - wsBinding = reference.getBinding(WebServiceBinding.class); - assert reference.getInterfaceContract(wsBinding) instanceof WSDLInterfaceContract; - } - } - assert "http://foo.com/bar".equals(wsBinding.getURI()); - - // Should create WSDL document for ComponentD/reference3 with endpoint uri="http://foo.com/bar" - def = wsBinding.getWSDLDocument(); - svc = def.getService(new QName("http://scenarios/ComponentD/reference3", "Service3aService")); - port = svc.getPort("Service3aPort"); - assert "http://foo.com/bar".equals(TestUtils.getPortAddress(port)); - } else { - // Should not add <binding.ws> to any inner component references - for (ComponentReference reference : componentD.getReferences()) { - assert reference.getBinding(WebServiceBinding.class) == null; - } - } - - // Should not add <binding.ws> or <interface.wsdl> to inner composite reference CompositeC/reference2 - Composite compositeC = TestUtils.getComposite(domainComposite, new QName("http://scenario5", "CompositeC")); - for (Reference reference : compositeC.getReferences()) { - assert reference.getBinding(WebServiceBinding.class) == null; - assert reference.getInterfaceContract() instanceof JavaInterfaceContract; - } - - String expectedEndpoints = "Component - ComponentB\n" + - "Service - Service2\n" + - "Endpoint - Service2\n" + - "Service - Service2a\n" + - "Endpoint - Service2a\n" + - "Reference - reference2\n" + - "Component - ComponentB has composite impl\n" + - " Component - ComponentD\n" + - " Service - Service3\n" + - " Endpoint - Service3\n" + - " Service - Service3a\n" + - " Endpoint - Service3a\n" + - " Reference - reference3"; - - String actualEndpoints = TestUtils.printEndpoints(domainComposite); - System.out.println(actualEndpoints); - - Assert.assertEquals(expectedEndpoints, actualEndpoints); - } - - - // Scenario 6: <binding.ws> and <interface.wsdl> on outer component reference ComponentB/reference2 - @Ignore - @Test - public void testScenario6() throws Exception { - System.out.println("====>Running testScenario6"); - customBuilder = new CustomCompositeBuilder(false); - customBuilder.loadContribution("scenario6.composite", "TestContribution", "src/main/resources/scenario6/"); - //TestUtils.printResults(customBuilder); - TestUtils.checkProblems(customBuilder); - checkScenario6and7Results("http://scenario6", false); - } - - @Ignore - @Test - public void testScenario6NonWiring() throws Exception { - System.out.println("====>Running testScenario6NonWiring"); - customBuilder = new CustomCompositeBuilder(true); - customBuilder.loadContribution("scenario6.composite", "TestContribution", "src/main/resources/scenario6/"); - //TestUtils.printResults(customBuilder); - TestUtils.checkProblems(customBuilder); - checkScenario6and7Results("http://scenario6", true); - } - - private void checkScenario6and7Results(String namespace, boolean nonWiring) { - Composite domainComposite = customBuilder.getDomainComposite(); - - // Should remove target= on ComponentB/reference2 (for Scenario 6) or - // CompositeC/reference2 (for Scenario 7), and add uri="http://foo.com/bar" - // to the <binding.ws> element on ComponentB/reference2 - // For nonWiring, ComponentB/reference2 should have target= - // and no uri= should be added - Component componentB = TestUtils.getComponent(domainComposite, "ComponentB"); - WebServiceBinding wsBinding = null; - for (ComponentReference reference : componentB.getReferences()) { - if ("reference2".equals(reference.getName())) { - if (!nonWiring) { - assert reference.getTargets().size() == 0; - } else { - assert reference.getTargets().size() == 1; - } - wsBinding = reference.getBinding(WebServiceBinding.class); - } - } - if (!nonWiring) { - assert "http://foo.com/bar".equals(wsBinding.getURI()); - } else { - assert wsBinding.getURI() == null; - } - - Definition def; - javax.wsdl.Service svc; - Port port; - if (!nonWiring) { - // Should create WSDL document for ComponentB/reference2 with endpoint uri="http://foo.com/bar" - def = wsBinding.getWSDLDocument(); - svc = def.getService(new QName("http://scenarios/ComponentB/reference2", "Service3aService")); - port = svc.getPort("Service3aPort"); - assert "http://foo.com/bar".equals(TestUtils.getPortAddress(port)); - } - - Component componentD = TestUtils.getComponent(domainComposite, "ComponentD"); - if (!nonWiring) { - // Should add <binding.ws> to inner component reference ComponentD/reference3 with uri="http://foo.com/bar" - // Should set <interface.wsdl> on inner component reference ComponentD/reference3 - wsBinding = null; - for (ComponentReference reference : componentD.getReferences()) { - if ("reference3".equals(reference.getName())) { - wsBinding = reference.getBinding(WebServiceBinding.class); - assert reference.getBindings().size() == 1; - assert reference.getInterfaceContract(wsBinding) instanceof WSDLInterfaceContract; - } - } - assert "http://foo.com/bar".equals(wsBinding.getURI()); - - // Should create WSDL document for ComponentD/reference3 with endpoint uri="http://foo.com/bar" - def = wsBinding.getWSDLDocument(); - svc = def.getService(new QName("http://scenarios/ComponentB/reference2", "Service3aService")); - port = svc.getPort("Service3aPort"); - assert "http://foo.com/bar".equals(TestUtils.getPortAddress(port)); - } else { - // Should not add <binding.ws> to any inner component references - for (ComponentReference reference : componentD.getReferences()) { - assert reference.getBinding(WebServiceBinding.class) == null; - } - } - - // No references on CompositeC should have <binding.ws> or <interface.wsdl>, except for - // reference2 in Scenario 7 - Composite compositeC = TestUtils.getComposite(domainComposite, new QName(namespace, "CompositeC")); - for (Reference reference : compositeC.getReferences()) { - if ("http://scenario7".equals(namespace) && "reference2".equals(reference.getName())) { - assert reference.getBinding(WebServiceBinding.class)!= null; - assert reference.getInterfaceContract() instanceof WSDLInterfaceContract; - } else { - assert reference.getBinding(WebServiceBinding.class) == null; - assert reference.getInterfaceContract() instanceof JavaInterfaceContract; - } - } - - // Should add <binding.ws> and <interface.wsdl> to outer composite reference CompositeA/reference1 - wsBinding = null; - for (Reference reference : domainComposite.getReferences()) { - if ("reference1".equals(reference.getName())) { - wsBinding = reference.getBinding(WebServiceBinding.class); - assert reference.getInterfaceContract() instanceof WSDLInterfaceContract; - } - } - assert wsBinding.getURI() == null; - - // Should not add a WSDL document to domain composite reference reference1 - assert wsBinding.getWSDLDocument() == null; - - String expectedEndpoints = "Component - ComponentB\n" + - "Service - Service2\n" + - "Endpoint - Service2\n" + - "Service - Service2a\n" + - "Endpoint - Service2a\n" + - "Reference - reference2\n" + - "Component - ComponentB has composite impl\n" + - " Component - ComponentD\n" + - " Service - Service3\n" + - " Endpoint - Service3\n" + - " Service - Service3a\n" + - " Endpoint - Service3a\n" + - " Reference - reference3"; - - String actualEndpoints = TestUtils.printEndpoints(domainComposite); - System.out.println(actualEndpoints); - - Assert.assertEquals(expectedEndpoints, actualEndpoints); - } - - // Scenario 7: <binding.ws> and <interface.wsdl> on inner composite reference CompositeC/reference2 - public void testScenario7() throws Exception { - System.out.println("====>Running testScenario7"); - customBuilder = new CustomCompositeBuilder(false); - customBuilder.loadContribution("scenario7.composite", "TestContribution", "src/main/resources/scenario7/"); - //TestUtils.printResults(customBuilder); - TestUtils.checkProblems(customBuilder); - checkScenario6and7Results("http://scenario7", false); - } - - public void testScenario7NonWiring() throws Exception { - System.out.println("====>Running testScenario7NonWiring"); - customBuilder = new CustomCompositeBuilder(true); - customBuilder.loadContribution("scenario7.composite", "TestContribution", "src/main/resources/scenario7/"); - //TestUtils.printResults(customBuilder); - TestUtils.checkProblems(customBuilder); - checkScenario6and7Results("http://scenario7", true); - } - - // Scenario 8: <binding.ws> and <interface.wsdl> on inner component reference ComponentD/reference3 - public void testScenario8() throws Exception { - System.out.println("====>Running testScenario8"); - customBuilder = new CustomCompositeBuilder(false); - customBuilder.loadContribution("scenario8.composite", "TestContribution", "src/main/resources/scenario8/"); - //TestUtils.printResults(customBuilder); - TestUtils.checkProblems(customBuilder); - checkScenario8Results(false); - } - - public void testScenario8NonWiring() throws Exception { - System.out.println("====>Running testScenario8NonWiring"); - customBuilder = new CustomCompositeBuilder(true); - customBuilder.loadContribution("scenario8.composite", "TestContribution", "src/main/resources/scenario8/"); - //TestUtils.printResults(customBuilder); - TestUtils.checkProblems(customBuilder); - checkScenario8Results(true); - } - - private void checkScenario8Results(boolean nonWiring) { - Composite domainComposite = customBuilder.getDomainComposite(); - - // Should replace target= on ComponentD/reference3 by uri="http://foo.com/bar" on <binding.ws> - // For nonWiring, the original target= is preserved and there is no uri= - Component componentD = TestUtils.getComponent(domainComposite, "ComponentD"); - WebServiceBinding wsBinding = null; - for (ComponentReference reference : componentD.getReferences()) { - if ("reference3".equals(reference.getName())) { - if (!nonWiring) { - assert reference.getTargets().size() == 0; - } else { - assert reference.getTargets().size() == 1; - } - wsBinding = reference.getBinding(WebServiceBinding.class); - } - } - if (!nonWiring) { - assert "http://foo.com/bar".equals(wsBinding.getURI()); - } else { - assert wsBinding.getURI() == null; - } - - Definition def; - javax.wsdl.Service svc; - Port port; - if (!nonWiring) { - // Should create WSDL document for ComponentD/reference3 with endpoint uri="http://foo.com/bar" - def = wsBinding.getWSDLDocument(); - svc = def.getService(new QName("http://scenarios/ComponentD/reference3", "Service3aService")); - port = svc.getPort("Service3aPort"); - assert "http://foo.com/bar".equals(TestUtils.getPortAddress(port)); - } - - // Should add <binding.ws> and <interface.wsdl> to inner composite reference CompositeC/reference2 - Composite compositeC = TestUtils.getComposite(domainComposite, new QName("http://scenario8", "CompositeC")); - wsBinding = null; - for (Reference reference : compositeC.getReferences()) { - if ("reference2".equals(reference.getName())) { - wsBinding = reference.getBinding(WebServiceBinding.class); - assert reference.getInterfaceContract() instanceof WSDLInterfaceContract; - } - } - assert wsBinding.getURI() == null; - - // Should add <binding.ws> and <interface.wsdl> to outer component reference ComponentB/reference2 - Component componentB = TestUtils.getComponent(domainComposite, "ComponentB"); - wsBinding = null; - for (ComponentReference reference : componentB.getReferences()) { - if ("reference2".equals(reference.getName())) { - wsBinding = reference.getBinding(WebServiceBinding.class); - assert reference.getInterfaceContract() instanceof WSDLInterfaceContract; - } - } - assert wsBinding.getURI() == null; - - // Should add <binding.ws> and <interface.wsdl> to outer composite reference CompositeA/reference1 - wsBinding = null; - for (Reference reference : domainComposite.getReferences()) { - if ("reference1".equals(reference.getName())) { - wsBinding = reference.getBinding(WebServiceBinding.class); - assert reference.getInterfaceContract() instanceof WSDLInterfaceContract; - } - } - assert wsBinding.getURI() == null; - - // Should not add a WSDL document to domain composite reference reference1 - assert wsBinding.getWSDLDocument() == null; - } - - // Scenario 9: target in reference CDR3A and binding.ws uri= at CAR1A - public void testScenario9() throws Exception { - System.out.println("====>Running testScenario9"); - customBuilder = new CustomCompositeBuilder(false); - customBuilder.loadContribution("scenario9.composite", "TestContribution", "src/main/resources/scenario9/"); - //TestUtils.printResults(customBuilder); - TestUtils.checkProblems(customBuilder); - checkScenario9Results(); - } - - private void checkScenario9Results() { - Composite domainComposite = customBuilder.getDomainComposite(); - - Component componentD = TestUtils.getComponent(domainComposite, "ComponentD"); - ComponentReference componentRef = null; - for (ComponentReference reference : componentD.getReferences()) { - if ("reference3a".equals(reference.getName())) { - componentRef = reference; - assertTrue(reference.getBindings().size() == 2); - assertTrue(reference.getBindings().get(0) instanceof SCABinding); - assertTrue(reference.getBindings().get(1) instanceof WebServiceBinding); - } - } - assertTrue(componentRef != null); - } - - // Scenario 10: targets in references CBR2A and CDR3A and binding.ws at CBR2A - public void testScenario10() throws Exception { - System.out.println("====>Running testScenario10"); - customBuilder = new CustomCompositeBuilder(false); - customBuilder.loadContribution("scenario10.composite", "TestContribution", "src/main/resources/scenario10/"); - //TestUtils.printResults(customBuilder); - TestUtils.checkProblems(customBuilder); - checkScenario10And11Results(); - } - - // Scenario 11: targets in references CBR2A and CDR3A and binding.ws at CCR2A - public void testScenario11() throws Exception { - System.out.println("====>Running testScenario11"); - customBuilder = new CustomCompositeBuilder(false); - customBuilder.loadContribution("scenario11.composite", "TestContribution", "src/main/resources/scenario11/"); - //TestUtils.printResults(customBuilder); - TestUtils.checkProblems(customBuilder); - checkScenario10And11Results(); - } - - private void checkScenario10And11Results() { - Composite domainComposite = customBuilder.getDomainComposite(); - - Component componentD = TestUtils.getComponent(domainComposite, "ComponentD"); - ComponentReference componentRef = null; - for (ComponentReference reference : componentD.getReferences()) { - if ("reference3a".equals(reference.getName())) { - componentRef = reference; - assertTrue(reference.getBindings().size() == 2); - Binding binding1 = reference.getBindings().get(0); - assertTrue(binding1 instanceof SCABinding); - assertTrue(reference.getInterfaceContract(binding1) instanceof JavaInterfaceContract); - Binding binding2 = reference.getBindings().get(1); - assertTrue(binding2 instanceof WebServiceBinding); - assertTrue(reference.getInterfaceContract(binding2) instanceof WSDLInterfaceContract); - } - } - assertTrue(componentRef != null); - } - - // Scenario 12: targets in references CBR2A and CDR3A and binding.ws at CDR3A - public void testScenario12() throws Exception { - System.out.println("====>Running testScenario12"); - customBuilder = new CustomCompositeBuilder(false); - customBuilder.loadContribution("scenario12.composite", "TestContribution", "src/main/resources/scenario12/"); - //TestUtils.printResults(customBuilder); - TestUtils.checkProblems(customBuilder); - checkScenario12Results(); - } - - private void checkScenario12Results() { - Composite domainComposite = customBuilder.getDomainComposite(); - - Component componentD = TestUtils.getComponent(domainComposite, "ComponentD"); - ComponentReference componentRef = null; - for (ComponentReference reference : componentD.getReferences()) { - if ("reference3a".equals(reference.getName())) { - componentRef = reference; - assertTrue(reference.getBindings().size() == 2); - assertTrue(reference.getBindings().get(0) instanceof WebServiceBinding); - assertTrue(reference.getBindings().get(1) instanceof WebServiceBinding); - } - } - assertTrue(componentRef != null); - } - - // Scenario 13: target in reference CDR3A - public void testScenario13() throws Exception { - System.out.println("====>Running testScenario13"); - customBuilder = new CustomCompositeBuilder(false); - customBuilder.loadContribution("scenario13.composite", "TestContribution", "src/main/resources/scenario13/"); - //TestUtils.printResults(customBuilder); - TestUtils.checkProblems(customBuilder); - checkScenario13Results(); - } - - private void checkScenario13Results() { - Composite domainComposite = customBuilder.getDomainComposite(); - - Component componentD = TestUtils.getComponent(domainComposite, "ComponentD"); - ComponentReference componentRef = null; - for (ComponentReference reference : componentD.getReferences()) { - if ("reference3a".equals(reference.getName())) { - componentRef = reference; - assertTrue(reference.getBindings().size() == 1); - assertTrue(reference.getBindings().get(0) instanceof WebServiceBinding); - } - } - assertTrue(componentRef != null); - } -*/ -} diff --git a/sca-java-2.x/trunk/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java b/sca-java-2.x/trunk/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java deleted file mode 100644 index 897cd21e8a..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/CustomCompositeBuilder.java +++ /dev/null @@ -1,99 +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.itest.builder; - -import javax.xml.stream.XMLOutputFactory; - -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.UtilityExtensionPoint; -import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.monitor.MonitorFactory; -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.apache.tuscany.sca.node.impl.NodeImpl; -import org.apache.tuscany.sca.runtime.CompositeActivator; - - -public class CustomCompositeBuilder { - - private boolean nonWiring; - private Node node; - private ExtensionPointRegistry extensionPoints; - private Monitor monitor; - private StAXArtifactProcessor<Composite> compositeProcessor; - - public CustomCompositeBuilder(boolean nonWiring) { - this.nonWiring = nonWiring; - } - - public void loadContribution(String compositeURL, String sourceURI, String sourceURL) throws Exception { - NodeFactory nodeFactory = NodeFactory.newInstance(); - node = nodeFactory.createNode(compositeURL, new Contribution(sourceURI, sourceURL)); - node.start(); - - // get some things out of the extension registry - extensionPoints = ((NodeImpl)node).getExtensionPointRegistry(); - - UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class); - MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class); - monitor = monitorFactory.createMonitor(); - - StAXArtifactProcessorExtensionPoint xmlProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class); - compositeProcessor = xmlProcessors.getProcessor(Composite.class); - - CompositeActivator compositeActivator = utilities.getUtility(CompositeActivator.class); - } - - /** - * Returns the delegating model processor. - * @return the delegating model processor - */ - public StAXArtifactProcessor<Object> getModelProcessor() { - return null;//compositeProcessor; - } - - /** - * Returns the XML output factory. - * @return the XML output factory - */ - public XMLOutputFactory getOutputFactory() { - return null; //outputFactory; - } - - /** - * Returns the domain composite. - * @return the domain composite model object - */ - public Composite getDomainComposite() { - return (Composite) ((NodeImpl)node).getDomainComposite(); - } - - /** - * Returns the monitor. - * @return the monitor instance - */ - public Monitor getMonitor() { - return monitor; - } - -} diff --git a/sca-java-2.x/trunk/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java b/sca-java-2.x/trunk/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java deleted file mode 100644 index 9a5aa5582d..0000000000 --- a/sca-java-2.x/trunk/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java +++ /dev/null @@ -1,319 +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.itest.builder; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; - -import javax.wsdl.Definition; -import javax.wsdl.Port; -import javax.wsdl.WSDLException; -import javax.wsdl.extensions.soap.SOAPAddress; -import javax.wsdl.extensions.soap12.SOAP12Address; -import javax.wsdl.factory.WSDLFactory; -import javax.wsdl.xml.WSDLWriter; -import javax.xml.namespace.QName; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.stream.XMLStreamWriter; - -import org.apache.tuscany.sca.assembly.Binding; -import org.apache.tuscany.sca.assembly.Component; -import org.apache.tuscany.sca.assembly.ComponentReference; -import org.apache.tuscany.sca.assembly.ComponentService; -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.assembly.Contract; -import org.apache.tuscany.sca.assembly.Endpoint; -import org.apache.tuscany.sca.assembly.EndpointReference; -import org.apache.tuscany.sca.assembly.Implementation; -import org.apache.tuscany.sca.assembly.Reference; -import org.apache.tuscany.sca.assembly.Service; -import org.apache.tuscany.sca.assembly.impl.EndpointImpl; -import org.apache.tuscany.sca.assembly.impl.EndpointReferenceImpl; -import org.apache.tuscany.sca.binding.ws.WebServiceBinding; -import org.apache.tuscany.sca.contribution.processor.ProcessorContext; -import org.apache.tuscany.sca.monitor.Problem; -import org.apache.xml.serialize.OutputFormat; -import org.apache.xml.serialize.XMLSerializer; -import org.w3c.dom.Document; - -/** - * Static utility methods for use by test cases. - * - * @version $Rev$ $Date$ - */ -public class TestUtils { - - protected static void checkProblems(CustomCompositeBuilder customBuilder) throws Exception { - boolean problems = false; - for (Problem problem : customBuilder.getMonitor().getProblems()) { - if (problem.getCause() != null) { - problem.getCause().printStackTrace(); - } - if (problem.getSeverity() == Problem.Severity.ERROR){ - problems = true; - } - } - assert !problems; - } - - protected static String getPortAddress(Port port) { - Object ext = port.getExtensibilityElements().get(0); - String returnAddress = null; - if (ext instanceof SOAPAddress) { - returnAddress = ((SOAPAddress)ext).getLocationURI(); - } - if (ext instanceof SOAP12Address) { - returnAddress = ((SOAP12Address)ext).getLocationURI(); - } - - returnAddress = returnAddress.substring(returnAddress.indexOf("//") + 2); - returnAddress = returnAddress.substring(returnAddress.indexOf("/")); - - return returnAddress; - } - - protected static Component getComponent(Composite composite, String name) { - for (Component component : composite.getComponents()) { - if (name.equals(component.getName())) { - return component; - } - // process implementation composites recursively - Implementation impl = component.getImplementation(); - if (impl instanceof Composite) { - Component comp = getComponent((Composite)impl, name); - if (comp != null) { - return comp; - } - } - } - return null; - } - - protected static Composite getComposite(Composite composite, QName name) { - if (name.equals(composite.getName())) { - return composite; - } - for (Component component : composite.getComponents()) { - // process implementation composites recursively - Implementation impl = component.getImplementation(); - if (impl instanceof Composite) { - Composite comp = getComposite((Composite)impl, name); - if (comp != null) { - return comp; - } - } - } - return null; - } - - protected static void printResults(CustomCompositeBuilder customBuilder) throws Exception { - for (Problem problem : customBuilder.getMonitor().getProblems()) { - if (problem.getCause() != null) { - problem.getCause().printStackTrace(); - } - } - Composite domainComposite = customBuilder.getDomainComposite(); - printComposite(domainComposite, customBuilder); - } - - private static void printComposite(Composite composite, CustomCompositeBuilder customBuilder) throws Exception { - // process implementation composites recursively - for (Component component : composite.getComponents()) { - Implementation implementation = component.getImplementation(); - if (implementation instanceof Composite) { - printComposite((Composite)implementation, customBuilder); - } - } - - // write out the SCDL - writeSCDL(composite, customBuilder); - - // find all the component service and reference bindings - for (Component component : composite.getComponents()) { - for (ComponentService componentService : component.getServices()) { - for (Binding binding : componentService.getBindings()) { - if (binding instanceof WebServiceBinding) { - writeWSDL(component, componentService, ((WebServiceBinding)binding).getGeneratedWSDLDocument()); - } - } - } - for (ComponentReference componentReference : component.getReferences()) { - for (Binding binding : componentReference.getBindings()) { - if (binding instanceof WebServiceBinding) { - writeWSDL(component, componentReference, ((WebServiceBinding)binding).getGeneratedWSDLDocument()); - } - } - } - } - - // find all the composite service and reference bindings - for (Service service : composite.getServices()) { - for (Binding binding : service.getBindings()) { - if (binding instanceof WebServiceBinding) { - writeWSDL(null, service, ((WebServiceBinding)binding).getGeneratedWSDLDocument()); - } - } - } - for (Reference reference : composite.getReferences()) { - for (Binding binding : reference.getBindings()) { - if (binding instanceof WebServiceBinding) { - writeWSDL(null, reference, ((WebServiceBinding)binding).getGeneratedWSDLDocument()); - } - } - } - } - - private static void writeSCDL(Composite composite, CustomCompositeBuilder customBuilder) throws Exception { - // Print out a composite - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - XMLStreamWriter writer = customBuilder.getOutputFactory().createXMLStreamWriter(bos); - customBuilder.getModelProcessor().write(composite, writer, new ProcessorContext()); - - // Parse and write again to pretty format it - DocumentBuilder documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder(); - Document document = documentBuilder.parse(new ByteArrayInputStream(bos.toByteArray())); - OutputFormat format = new OutputFormat(); - format.setIndenting(true); - format.setIndent(2); - XMLSerializer serializer = new XMLSerializer(System.out, format); - System.out.println("-->Runtime SCDL model for composite " + composite.getName()); - serializer.serialize(document); - } - - private static void writeWSDL(Component component, Contract contract, Definition definition) { - if (definition == null) { - System.out.println("-->No generated WSDL for " + (component != null ? component.getName() : "") + "/" + contract.getName()); - } else { - try { - System.out.println("-->Generated WSDL for " + (component != null ? component.getName() : "") + "/" + contract.getName()); - WSDLWriter writer = WSDLFactory.newInstance().newWSDLWriter(); - writer.writeWSDL(definition, System.out); - } catch (WSDLException e) { - // ignore - } - } - } - - protected static void writeWSDL(Definition definition) { - try { - WSDLWriter writer = WSDLFactory.newInstance().newWSDLWriter(); - writer.writeWSDL(definition, System.out); - } catch (WSDLException e) { - // ignore - } - } - - protected static String printStructure(Composite composite, String indent){ - String structure = ""; - for (Component component : composite.getComponents()){ - structure += indent + "Component URI - " + component.getURI() + "\n"; - - // recurse for composite implementations - Implementation implementation = component.getImplementation(); - if (implementation instanceof Composite) { - structure += printStructure((Composite)implementation, indent + " "); - } - - for (Service service : component.getServices()){ - for (Endpoint endpoint : service.getEndpoints()){ - structure += indent + ((EndpointImpl)endpoint).toStringWithoutHash() + " " + endpoint.getBinding().getClass().getName() + "\n"; - } - } - for (Reference reference : component.getReferences()){ - for (EndpointReference endpointReference : reference.getEndpointReferences()){ - structure += indent + ((EndpointReferenceImpl)endpointReference).toStringWithoutHash() + " " + endpointReference.getBinding().getClass().getName() + "\n"; - } - } - } - return structure; - } -/* - protected static String printEndpoints(Composite composite){ - return printEndpoints(composite, ""); - } - - protected static String printEndpoints(Composite composite, String indent){ - - String buffer = ""; - - for (Component component : composite.getComponents()) { - buffer += indent + "Component - " + component.getName() + "\n"; - - // print component service endpoints - for (ComponentService componentService : component.getServices()) { - buffer += indent + "Service - " + componentService.getName() + "\n"; - for (Endpoint endpoint : componentService.getEndpoints()) { - if (endpoint.getBinding() != null){ - buffer += printEndpoint(endpoint, indent); - } - } - } - - for (ComponentReference componentReference : component.getReferences()) { - buffer += indent + "Reference - " + componentReference.getName() + "\n"; - for (EndpointReference endpointReference : componentReference.getEndpointReferences()) { - buffer += printEndpointReference(endpointReference, indent); - } - } - - // process implementation composites recursively - Implementation implementation = component.getImplementation(); - if (implementation instanceof Composite) { - buffer += indent + "Component - " + component.getName() + " has composite impl" + "\n"; - buffer += printEndpoints((Composite)implementation, indent + " "); - } - } - - return buffer; - } - - protected static String printEndpoint(Endpoint endpoint, String indent){ - String buffer = ""; - - buffer += indent + " Endpoint - Component: " + endpoint.getComponent().getName() +"\n"; - buffer += indent + " Service: " + endpoint.getService().getName() +"\n"; - buffer += indent + " Binding: " + endpoint.getBinding().getName() +"\n"; - - return buffer; - } - - protected static String printEndpointReference(EndpointReference endpointReference, String indent){ - String buffer = ""; - - buffer += indent + " EndpointReference - Component: " + endpointReference.getComponent().getName() +"\n"; - buffer += indent + " Reference: " + endpointReference.getReference().getName() +"\n"; - if (endpointReference.getTargetEndpoint() != null){ - buffer += indent + " Wired: " +"\n"; - buffer += indent + " Target: " + endpointReference.getTargetEndpoint().getComponent().getName()+"\n"; - if (endpointReference.getTargetEndpoint() != null && - endpointReference.getTargetEndpoint().isUnresolved() == false){ - buffer += indent + " Binding: " + endpointReference.getBinding().getName() +"\n"; - buffer += indent + " TargetEndpoint: " + endpointReference.getTargetEndpoint().getBinding().getName()+"\n"; - } else { - buffer += indent + " Unresolved: " +"\n"; - } - } else { - buffer += indent + " NonWired: " +"\n"; - } - - return buffer; - } -*/ -} diff --git a/sca-java-2.x/trunk/itest/callback-api/pom.xml b/sca-java-2.x/trunk/itest/callback-api/pom.xml deleted file mode 100644 index 87ca4b67a0..0000000000 --- a/sca-java-2.x/trunk/itest/callback-api/pom.xml +++ /dev/null @@ -1,58 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-callback-api</artifactId> - <name>Apache Tuscany SCA iTest Callback API</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - </dependencies> - - <properties> - <was.ant.script>${basedir}/../build-was-integration.xml</was.ant.script> - <was.python.script>${basedir}/../wasAdmin.py</was.python.script> - </properties> -</project> diff --git a/sca-java-2.x/trunk/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java b/sca-java-2.x/trunk/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java deleted file mode 100644 index b013462f9f..0000000000 --- a/sca-java-2.x/trunk/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java +++ /dev/null @@ -1,38 +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.test; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -/** - * - */ -public interface CallBackApiCallBack { - /** - * This function is defined in CallBackApiClientImpl - */ - void callBackMessage(String aString); - - /** - * This function is defined in CallBackApiClientImpl - */ - void callBackIncrement(String aString); - -} diff --git a/sca-java-2.x/trunk/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java b/sca-java-2.x/trunk/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java deleted file mode 100644 index 252e4dc45f..0000000000 --- a/sca-java-2.x/trunk/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java +++ /dev/null @@ -1,30 +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.test; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface CallBackApiClient { - /** - * This function is defined in CallBackApiClientImpl - */ - void run(); - -} diff --git a/sca-java-2.x/trunk/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java b/sca-java-2.x/trunk/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java deleted file mode 100644 index d883dc2d6f..0000000000 --- a/sca-java-2.x/trunk/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java +++ /dev/null @@ -1,201 +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.test; - -import org.junit.Assert; -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Service; - -@Service(CallBackApiClient.class) -public class CallBackApiClientImpl implements CallBackApiClient, CallBackApiCallBack { - - @Reference - protected CallBackApiService aCallBackService; - - private static String returnMessage = null; - private static int callBackCount = 0; - private static Object monitor = new Object(); - - /** - * This test calls function test 3a,3a1,3b,3c - */ - public void run() { - - // This tests basic callback patterns. - - // Test3a is the basic callback where the target calls back prior to - // returning to the client. - test3a(); - - test3a1(); - - // Test3b is where the target does not call back to the client. - test3b(); - - // Test3c is where the target calls back multiple times to the client. - test3c(); - } - - /** - * This test is the basic callback where the target calls back prior to returning to the client. - */ - - private void test3a() { - aCallBackService.knockKnock("Knock Knock"); - int count = 0; - - // - // If we can't get a response in 30 seconds consider this a failure - // - - synchronized (monitor) { - while (returnMessage == null && count++ < 30) { - try { - monitor.wait(1000L); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - - Assert.assertEquals("CallBackApiITest - test3a", "Who's There", this.getReturnMessage()); - - } - - /** - * This test is the basic callback where the target calls back prior to returning to the client. - */ - private void test3a1() { - aCallBackService.knockKnockByRef("Knock Knock"); - int count = 0; - - // - // If we can't get a response in 30 seconds consider this a failure - // - - synchronized (monitor) { - while (returnMessage == null && count++ < 30) { - try { - monitor.wait(1000L); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - - Assert.assertEquals("CallBackApiITest - test3a", "Who's There", this.getReturnMessage()); - - } - - /** - * This test is the basic callback where the target does not call back to the client - */ - private void test3b() { - aCallBackService.noCallBack("No Reply Desired"); - Assert.assertEquals("CallBackApiITest - test3b", 1, 1); - } - - /** - * This test is the basic callback where the target calls back multiple times to the client - */ - - private void test3c() { - aCallBackService.multiCallBack("Call me back 3 times"); - int count = 0; - - // - // If we can't get a response in 30 seconds consider this a failure - // - - synchronized (monitor) { - while (this.getCallBackCount() < 3 && count++ < 30) { - try { - monitor.wait(1000L); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - - Assert.assertEquals("CallBackApiITest - test3c", 3, this.getCallBackCount()); - } - - /** - * This function returns a string - * - * @param void - * @return String result string - */ - - public String getReturnMessage() { - return returnMessage; - } - - /** - * This function set the returnMessage string - * - * @param String - */ - public void setReturnMessage(String aReturnMessage) { - returnMessage = aReturnMessage; - } - - /** - * This function returns the callBackCount variable - * - * @return Integer callBackCount variable - */ - public int getCallBackCount() { - return callBackCount; - } - - /** - * This function increments callBackCount variable by 1 - */ - public void incrementCallBackCount() { - callBackCount++; - } - - /** - * This function prints a message synched with setReturnMessage function - * - * @param String - */ - public void callBackMessage(String aString) { - System.out.println("Entering callback callBackMessage: " + aString); - synchronized (monitor) { - this.setReturnMessage(aString); - monitor.notify(); - } - } - - /** - * This function prints a message synched with incrementCallBackCount function - * - * @param String - */ - public void callBackIncrement(String aString) { - System.out.println("Entering callback increment: " + aString); - synchronized (monitor) { - this.incrementCallBackCount(); - monitor.notify(); - } - } - -} diff --git a/sca-java-2.x/trunk/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java b/sca-java-2.x/trunk/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java deleted file mode 100644 index afb7c45e2c..0000000000 --- a/sca-java-2.x/trunk/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java +++ /dev/null @@ -1,50 +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.test; - -import org.oasisopen.sca.annotation.Callback; -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -@Callback(CallBackApiCallBack.class) -/** - * - */ -public interface CallBackApiService { - /** - * This function is defined in CallBackApiServiceImpl - */ - void knockKnock(String aString); - - /** - * This function is defined in CallBackApiServiceImpl - */ - void knockKnockByRef(String aString); - - /** - * This function is defined in CallBackApiServiceImpl - */ - void noCallBack(String aString); - - /** - * This function is defined in CallBackApiServiceImpl - */ - void multiCallBack(String aString); - -} diff --git a/sca-java-2.x/trunk/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java b/sca-java-2.x/trunk/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java deleted file mode 100644 index 44f57b4316..0000000000 --- a/sca-java-2.x/trunk/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java +++ /dev/null @@ -1,113 +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.test; - -import org.oasisopen.sca.ComponentContext; -import org.oasisopen.sca.RequestContext; -import org.oasisopen.sca.ServiceReference; -import org.oasisopen.sca.annotation.Callback; -import org.oasisopen.sca.annotation.Context; -import org.oasisopen.sca.annotation.Service; - -@Service(CallBackApiService.class) -public class CallBackApiServiceImpl implements CallBackApiService { - - @Context - protected ComponentContext componentContext; - /** - * Object of CallBackApiCallBack class - */ - private CallBackApiCallBack callback; - - @Callback - protected ServiceReference<CallBackApiCallBack> callbackRef; - - /** - * This function get an object of CallBackApiServiceImpl by calling getCallBackInterface function and calls the - * callBackMessage function. - * - * @param aString String passed by a function call - */ - - public void knockKnock(String aString) { - - System.out.println("CallBackApiServiceImpl message received: " + aString); - callback = this.getCallBackInterface(); - callback.callBackMessage("Who's There"); - System.out.println("CallBackApiServiceImpl response sent"); - } - - /** - * This function calls the callBackMessage function. <br> - * The reference to this function is received from Call back reference to the class CallBackApiService. - * - * @param aString String passed by a function call - */ - public void knockKnockByRef(String aString) { - - System.out.println("CallBackApiServiceImpl message received: " + aString); - callbackRef.getService().callBackMessage("Who's There"); - System.out.println("CallBackApiServiceImpl response sent"); - } - - /** - * This function get an object of CallBackApiServiceImpl by calling getCallBackInterface function. <br> - * This function then places multiple callBack using the callbackIncrement function defined in - * callBack.ApiServiceImpl - * - * @param aString String passed by a function call - */ - public void multiCallBack(String aString) { - - callback = this.getCallBackInterface(); - - System.out.println("CallBackApiServiceImpl message received: " + aString); - callback.callBackIncrement("Who's There 1"); - System.out.println("CallBackApiServiceImpl response sent"); - callback.callBackIncrement("Who's There 2"); - System.out.println("CallBackApiServiceImpl response sent"); - callback.callBackIncrement("Who's There 3"); - System.out.println("CallBackApiServiceImpl response sent"); - } - - /** - * This function does not callBack any function. - * - * @param aString String passed by a function call - */ - public void noCallBack(String aString) { - System.out.println("CallBackApiServiceImpl message received: " + aString); - } - - /** - * This function get an object of CallBackApiServiceImpl from the present componentContext - * - * @param void - */ - private CallBackApiCallBack getCallBackInterface() { - System.out.println("CallBackApiServiceImpl getting request context"); - RequestContext rc = componentContext.getRequestContext(); - System.out.println("CallBackApiServiceImpl getting callback from request context"); - callback = rc.getCallback(); - System.out.println("CallBackApiServiceImpl returning callback"); - return callback; - - } - -} diff --git a/sca-java-2.x/trunk/itest/callback-api/src/main/resources/CallBackApiTest.composite b/sca-java-2.x/trunk/itest/callback-api/src/main/resources/CallBackApiTest.composite deleted file mode 100644 index a67233665c..0000000000 --- a/sca-java-2.x/trunk/itest/callback-api/src/main/resources/CallBackApiTest.composite +++ /dev/null @@ -1,33 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://callback" - name="CallBackApiTest"> - - <component name="CallBackApiClient"> - <implementation.java class="org.apache.tuscany.sca.test.CallBackApiClientImpl"/> - <reference name="aCallBackService" target="CallBackApiService"/> - </component> - - <component name="CallBackApiService"> - <implementation.java class="org.apache.tuscany.sca.test.CallBackApiServiceImpl"/> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index b1a01e9f7b..0000000000 --- a/sca-java-2.x/trunk/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:t="http://callback"> - <deployable composite="t:CallBackApiTest" /> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java b/sca-java-2.x/trunk/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java deleted file mode 100644 index 75fab95efb..0000000000 --- a/sca-java-2.x/trunk/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.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.test; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -public class CallBackApiTestCase { - - private static Node node; - private CallBackApiClient aCallBackClient; - - /** - * This function uses the Instance of CallBackApiClient.class <br> - * This function calls the run function defined in the CallBackApiClinet Interface <br> - * which in turn executes the following test cases. <br> - * 1. Basic callback patterns <br> - * 2. Test in which the target does not call back to the client <br> - * 3. Test in which the target calls back multiple times to the client. - */ - @Test - public void testCallBackBasic() { - aCallBackClient = node.getService(CallBackApiClient.class, "CallBackApiClient"); - aCallBackClient.run(); - } - - /** - * This function creates the Node instance and gets an Instance of CallBackApiClient.class - */ - - @BeforeClass - public static void setUp() throws Exception { - if (node == null) { - String location = ContributionLocationHelper.getContributionLocation("CallBackApiTest.composite"); - node = NodeFactory.newInstance().createNode("CallBackApiTest.composite", new Contribution("c1", location)); - node.start(); - } - } - - /** - * This function destroys the Node instance that was created in setUp() - */ - - @AfterClass - public static void tearDown() throws Exception { - node.stop(); - } - -} diff --git a/sca-java-2.x/trunk/itest/callback-basic/pom.xml b/sca-java-2.x/trunk/itest/callback-basic/pom.xml deleted file mode 100644 index 029bb56247..0000000000 --- a/sca-java-2.x/trunk/itest/callback-basic/pom.xml +++ /dev/null @@ -1,58 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-callback-basic</artifactId> - <name>Apache Tuscany SCA iTest Callback Basic</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - </dependencies> - - <properties> - <was.ant.script>${basedir}/../build-was-integration.xml</was.ant.script> - <was.python.script>${basedir}/../wasAdmin.py</was.python.script> - </properties> -</project> diff --git a/sca-java-2.x/trunk/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java b/sca-java-2.x/trunk/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java deleted file mode 100644 index 291a72b9d6..0000000000 --- a/sca-java-2.x/trunk/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java +++ /dev/null @@ -1,33 +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.test; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -/** - * - */ -public interface CallBackBasicCallBack { - - void callBackMessage(String aString); - - void callBackIncrement(String aString); - -} diff --git a/sca-java-2.x/trunk/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java b/sca-java-2.x/trunk/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java deleted file mode 100644 index 19f366c423..0000000000 --- a/sca-java-2.x/trunk/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java +++ /dev/null @@ -1,28 +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.test; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface CallBackBasicClient { - - void run(); - -} diff --git a/sca-java-2.x/trunk/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java b/sca-java-2.x/trunk/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java deleted file mode 100644 index 4bb6b29a8d..0000000000 --- a/sca-java-2.x/trunk/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java +++ /dev/null @@ -1,129 +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.test; - -import org.junit.Assert; -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Service; - -@Service(CallBackBasicClient.class) -public class CallBackBasicClientImpl implements CallBackBasicClient, CallBackBasicCallBack { - - @Reference - protected CallBackBasicService aCallBackService; - private static String returnMessage = null; - private static int callBackCount = 0; - private static Object monitor = new Object(); - - public void run() { - - // This tests basic callback patterns. - - // Test1 is the basic callback where the target calls back prior to - // returning to the client. - test1a(); - - // Test2 is where the target does not call back to the client. - test1b(); - - // Test3 is where the target calls back multiple times to the client. - test1c(); - } - - private void test1a() { - aCallBackService.knockKnock("Knock Knock"); - int count = 0; - - // - // If we can't get a response in 30 seconds consider this a failure - // - - synchronized (monitor) { - while (returnMessage == null && count++ < 30) { - try { - monitor.wait(1000L); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - - Assert.assertEquals("CallBackBasicITest - test1a", "Who's There", this.getReturnMessage()); - - } - - private void test1b() { - aCallBackService.noCallBack("No Reply Desired"); - Assert.assertEquals("CallBackBasicITest - test1b", 1, 1); - } - - private void test1c() { - aCallBackService.multiCallBack("Call me back 3 times"); - int count = 0; - - // - // If we can't get a response in 30 seconds consider this a failure - // - - synchronized (monitor) { - while (this.getCallBackCount() < 3 && count++ < 30) { - try { - monitor.wait(1000L); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - - Assert.assertEquals("CallBackBasicITest - test1c", 3, this.getCallBackCount()); - } - - public String getReturnMessage() { - return returnMessage; - } - - public void setReturnMessage(String aReturnMessage) { - returnMessage = aReturnMessage; - } - - public int getCallBackCount() { - return callBackCount; - } - - public void incrementCallBackCount() { - callBackCount++; - } - - public void callBackMessage(String aString) { - System.out.println("Entering callback callBackMessage: " + aString); - synchronized (monitor) { - this.setReturnMessage(aString); - monitor.notify(); - } - } - - public void callBackIncrement(String aString) { - System.out.println("Entering callback increment: " + aString); - synchronized (monitor) { - this.incrementCallBackCount(); - monitor.notify(); - } - } - -} diff --git a/sca-java-2.x/trunk/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java b/sca-java-2.x/trunk/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java deleted file mode 100644 index 5396879e83..0000000000 --- a/sca-java-2.x/trunk/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.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.test; - -import org.oasisopen.sca.annotation.Callback; -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -@Callback(CallBackBasicCallBack.class) -/** - * - */ -public interface CallBackBasicService { - - void knockKnock(String aString); - - void noCallBack(String aString); - - void multiCallBack(String aString); - -} diff --git a/sca-java-2.x/trunk/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java b/sca-java-2.x/trunk/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java deleted file mode 100644 index 07010f61e1..0000000000 --- a/sca-java-2.x/trunk/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java +++ /dev/null @@ -1,56 +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.test; - -import org.oasisopen.sca.annotation.Callback; -import org.oasisopen.sca.annotation.Service; - -@Service(CallBackBasicService.class) -public class CallBackBasicServiceImpl implements CallBackBasicService { - - @Callback - protected CallBackBasicCallBack callback; - - public void knockKnock(String aString) { - - System.out.println("CallBackBasicServiceImpl message received: " + aString); - callback.callBackMessage("Who's There"); - System.out.println("CallBackBasicServiceImpl response sent"); - - } - - public void multiCallBack(String aString) { - - System.out.println("CallBackBasicServiceImpl message received: " + aString); - callback.callBackIncrement("Who's There 1"); - System.out.println("CallBackBasicServiceImpl response sent"); - callback.callBackIncrement("Who's There 2"); - System.out.println("CallBackBasicServiceImpl response sent"); - callback.callBackIncrement("Who's There 3"); - System.out.println("CallBackBasicServiceImpl response sent"); - - } - - public void noCallBack(String aString) { - - System.out.println("CallBackBasicServiceImpl message received: " + aString); - // System.out.println("CallBackBasicServiceImpl No response desired"); - - } -} diff --git a/sca-java-2.x/trunk/itest/callback-basic/src/main/resources/CallBackBasicTest.composite b/sca-java-2.x/trunk/itest/callback-basic/src/main/resources/CallBackBasicTest.composite deleted file mode 100644 index 5339e9952e..0000000000 --- a/sca-java-2.x/trunk/itest/callback-basic/src/main/resources/CallBackBasicTest.composite +++ /dev/null @@ -1,33 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://callback" - name="CallBackBasicTest"> - - <component name="CallBackBasicClient"> - <implementation.java class="org.apache.tuscany.sca.test.CallBackBasicClientImpl"/> - <reference name="aCallBackService" target="CallBackBasicService"/> - </component> - - <component name="CallBackBasicService"> - <implementation.java class="org.apache.tuscany.sca.test.CallBackBasicServiceImpl"/> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index d36d7478e2..0000000000 --- a/sca-java-2.x/trunk/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:t="http://callback"> - <deployable composite="t:CallBackBasicTest" /> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java b/sca-java-2.x/trunk/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java deleted file mode 100644 index 43b812faed..0000000000 --- a/sca-java-2.x/trunk/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java +++ /dev/null @@ -1,56 +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.test; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -public class CallBackBasicTestCase { - - private static Node node; - private CallBackBasicClient aCallBackClient; - - @Test - public void testCallBackBasic() { - aCallBackClient.run(); - } - - @Before - public void setUp() throws Exception { - if (node == null) { - String location = ContributionLocationHelper.getContributionLocation("CallBackBasicTest.composite"); - node = NodeFactory.newInstance().createNode("CallBackBasicTest.composite", new Contribution("c1", location)); - node.start(); - } - - aCallBackClient = node.getService(CallBackBasicClient.class, "CallBackBasicClient"); - } - - @After - public void tearDown() throws Exception { - node.stop(); - } - -} diff --git a/sca-java-2.x/trunk/itest/callback-complex-type/pom.xml b/sca-java-2.x/trunk/itest/callback-complex-type/pom.xml deleted file mode 100644 index 726465f2b9..0000000000 --- a/sca-java-2.x/trunk/itest/callback-complex-type/pom.xml +++ /dev/null @@ -1,53 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-callback-complex-type</artifactId> - <name>Apache Tuscany SCA iTest Callback Complex Type</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - </dependencies> -</project> diff --git a/sca-java-2.x/trunk/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java b/sca-java-2.x/trunk/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java deleted file mode 100644 index 627d37e27d..0000000000 --- a/sca-java-2.x/trunk/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java +++ /dev/null @@ -1,33 +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.test; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -/** - * - */ -public interface CallBackCTypeCallBack { - - void callBackMessage(String aString); - - void callBackIncrement(String aString); - -} diff --git a/sca-java-2.x/trunk/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java b/sca-java-2.x/trunk/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java deleted file mode 100644 index 966ad17b9a..0000000000 --- a/sca-java-2.x/trunk/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java +++ /dev/null @@ -1,28 +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.test; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface CallBackCTypeClient { - - void run(); - -} diff --git a/sca-java-2.x/trunk/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java b/sca-java-2.x/trunk/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java deleted file mode 100644 index d2dc0add75..0000000000 --- a/sca-java-2.x/trunk/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java +++ /dev/null @@ -1,138 +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.test; - -import org.junit.Assert; -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Service; - -@Service(CallBackCTypeClient.class) -public class CallBackCTypeClientImpl implements CallBackCTypeClient, CallBackCTypeCallBack { - - @Reference - protected CallBackCTypeService aCallBackService; - private static String returnMessage = null; - private static int callBackCount = 0; - private static Object monitor = new Object(); - - public CallBackCTypeClientImpl() { - } - - public void run() { - - // This test is the same as the Basic Callback except it uses a - // componentType side file. - // This test currently fails because the integration test environment - // does not properly copy - // the componentType files to the target folder. This is documented in - // Tuscany-967. - - // Test12a is the basic callback where the target calls back prior to - // returning to the client. - test12a(); - - // Test12b is where the target does not call back to the client. - test12b(); - - // Test12c is where the target calls back multiple times to the client. - test12c(); - - } - - private void test12a() { - aCallBackService.knockKnock("Knock Knock"); - int count = 0; - - // - // If we can't get a response in 30 seconds consider this a failure - // - - synchronized (monitor) { - while (returnMessage == null && count++ < 30) { - try { - monitor.wait(1000L); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - - Assert.assertEquals("CallBackBasicITest - test12a -", "Who's There", this.getReturnMessage()); - - } - - private void test12b() { - aCallBackService.noCallBack("No Reply Desired"); - Assert.assertEquals("CallBackBasicITest - test12b -", 1, 1); - } - - private void test12c() { - aCallBackService.multiCallBack("Call me back 3 times"); - int count = 0; - - // - // If we can't get a response in 30 seconds consider this a failure - // - - synchronized (monitor) { - while (this.getCallBackCount() < 3 && count++ < 30) { - try { - monitor.wait(1000L); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - - Assert.assertEquals("CallBackBasicITest - test12c -", 3, this.getCallBackCount()); - } - - public String getReturnMessage() { - return returnMessage; - } - - public void setReturnMessage(String aReturnMessage) { - returnMessage = aReturnMessage; - } - - public int getCallBackCount() { - return callBackCount; - } - - public void incrementCallBackCount() { - callBackCount++; - } - - public void callBackMessage(String aString) { - System.out.println("Entering callback callBackMessage: " + aString); - synchronized (monitor) { - this.setReturnMessage(aString); - monitor.notify(); - } - } - - public void callBackIncrement(String aString) { - System.out.println("Entering callback increment: " + aString); - synchronized (monitor) { - this.incrementCallBackCount(); - monitor.notify(); - } - } - -} diff --git a/sca-java-2.x/trunk/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java b/sca-java-2.x/trunk/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java deleted file mode 100644 index 32ab1bdd3e..0000000000 --- a/sca-java-2.x/trunk/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.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.test; - -import org.oasisopen.sca.annotation.Callback; -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -@Callback(CallBackCTypeCallBack.class) -/** - * - */ -public interface CallBackCTypeService { - - void knockKnock(String aString); - - void noCallBack(String aString); - - void multiCallBack(String aString); - -} diff --git a/sca-java-2.x/trunk/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java b/sca-java-2.x/trunk/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java deleted file mode 100644 index f7a1a195ed..0000000000 --- a/sca-java-2.x/trunk/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java +++ /dev/null @@ -1,59 +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.test; - -import org.oasisopen.sca.annotation.Callback; -import org.oasisopen.sca.annotation.Service; - -@Service(CallBackCTypeService.class) -public class CallBackCTypeServiceImpl implements CallBackCTypeService { - - @Callback - protected CallBackCTypeCallBack callback; - - public CallBackCTypeServiceImpl() { - } - - public void knockKnock(String aString) { - - System.out.println("CallBackCTypeServiceImpl message received: " + aString); - callback.callBackMessage("Who's There"); - System.out.println("CallBackCTypeServiceImpl response sent"); - - } - - public void multiCallBack(String aString) { - - System.out.println("CallBackCTypeServiceImpl message received: " + aString); - callback.callBackIncrement("Who's There 1"); - System.out.println("CallBackCTypeServiceImpl response sent"); - callback.callBackIncrement("Who's There 2"); - System.out.println("CallBackCTypeServiceImpl response sent"); - callback.callBackIncrement("Who's There 3"); - System.out.println("CallBackCTypeServiceImpl response sent"); - - } - - public void noCallBack(String aString) { - - System.out.println("CallBackCTypeServiceImpl message received: " + aString); - System.out.println("CallBackCTypeServiceImpl No response desired"); - - } -} diff --git a/sca-java-2.x/trunk/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite b/sca-java-2.x/trunk/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite deleted file mode 100644 index 9730c294d6..0000000000 --- a/sca-java-2.x/trunk/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite +++ /dev/null @@ -1,33 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://callback" - name="CallBackCTypeTest"> - - <component name="CallBackCTypeClient"> - <implementation.java class="org.apache.tuscany.sca.test.CallBackCTypeClientImpl"/> - <reference name="aCallBackService" target="CallBackCTypeService"/> - </component> - - <component name="CallBackCTypeService"> - <implementation.java class="org.apache.tuscany.sca.test.CallBackCTypeServiceImpl"/> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType b/sca-java-2.x/trunk/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType deleted file mode 100644 index 11e748675d..0000000000 --- a/sca-java-2.x/trunk/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.
--->
-<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" > -
- <service name="CallBackCTypeService">
- <interface.java interface="org.apache.tuscany.sca.test.CallBackCTypeService"
- callbackInterface="org.apache.tuscany.sca.test.CallBackCTypeCallBack"/>
- </service>
- -</componentType>
-
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCase.java b/sca-java-2.x/trunk/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCase.java deleted file mode 100644 index dde489d766..0000000000 --- a/sca-java-2.x/trunk/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCase.java +++ /dev/null @@ -1,54 +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.test; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -public class CallBackCTypeTestCase { - - private Node node; - private CallBackCTypeClient aCallBackClient; - - @Test - public void testCallBackBasic() { - aCallBackClient.run(); - } - - @Before - public void setUp() throws Exception { - String location = ContributionLocationHelper.getContributionLocation("CallBackCTypeClient.composite"); - node = - NodeFactory.newInstance().createNode("CallBackCTypeClient.composite", new Contribution("c1", location)) - .start(); - - aCallBackClient = node.getService(CallBackCTypeClient.class, "CallBackCTypeClient"); - } - - @After - public void tearDown() throws Exception { - node.stop(); - } - -} diff --git a/sca-java-2.x/trunk/itest/callback-multiple-wires/pom.xml b/sca-java-2.x/trunk/itest/callback-multiple-wires/pom.xml deleted file mode 100644 index b29900c6ef..0000000000 --- a/sca-java-2.x/trunk/itest/callback-multiple-wires/pom.xml +++ /dev/null @@ -1,53 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-callback-multiple-wires</artifactId> - <name>Apache Tuscany SCA iTest Callback With Mutiple Wires</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - </dependencies> -</project> diff --git a/sca-java-2.x/trunk/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java b/sca-java-2.x/trunk/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java deleted file mode 100644 index 7c80d222fc..0000000000 --- a/sca-java-2.x/trunk/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java +++ /dev/null @@ -1,27 +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.test.callback; - -/** - * The client interface - */ -public interface MyClient { - - void aClientMethod(); -} diff --git a/sca-java-2.x/trunk/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java b/sca-java-2.x/trunk/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java deleted file mode 100644 index c3ea6c3032..0000000000 --- a/sca-java-2.x/trunk/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java +++ /dev/null @@ -1,49 +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.test.callback; - -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Scope; -import org.oasisopen.sca.annotation.Service; - -/** - * Demonstrates a component-to-component callback invocation - */ -@Service(MyClient.class) -@Scope("COMPOSITE") -public class MyClientImpl1 implements MyClient, MyServiceCallback { - - private MyService myService; - static String result; - - @Reference - public void setMyService(MyService myService) { - this.myService = myService; - } - - public void aClientMethod() { - myService.someMethod("-> someMethod1"); - } - - public void receiveResult(String result) { - System.out.println("Work thread " + Thread.currentThread()); - System.out.println("Result in client1: " + result); - MyClientImpl1.result = result; - } -} diff --git a/sca-java-2.x/trunk/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java b/sca-java-2.x/trunk/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java deleted file mode 100644 index 84ca158c97..0000000000 --- a/sca-java-2.x/trunk/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java +++ /dev/null @@ -1,49 +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.test.callback; - -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Scope; -import org.oasisopen.sca.annotation.Service; - -/** - * Demonstrates a component-to-component callback invocation - */ -@Service(MyClient.class) -@Scope("COMPOSITE") -public class MyClientImpl2 implements MyClient, MyServiceCallback { - - private MyService myService; - static String result; - - @Reference - public void setMyService(MyService myService) { - this.myService = myService; - } - - public void aClientMethod() { - myService.someMethod("-> someMethod2"); - } - - public void receiveResult(String result) { - System.out.println("Work thread " + Thread.currentThread()); - System.out.println("Result in client2: " + result); - MyClientImpl2.result = result; - } -} diff --git a/sca-java-2.x/trunk/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java b/sca-java-2.x/trunk/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java deleted file mode 100644 index 66758a1e73..0000000000 --- a/sca-java-2.x/trunk/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java +++ /dev/null @@ -1,32 +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.test.callback; - -import org.oasisopen.sca.annotation.Callback; -import org.oasisopen.sca.annotation.OneWay; - -/** - * This service that will be invoked in a non-blocking fashion - */ -@Callback(MyServiceCallback.class) -public interface MyService { - - @OneWay - void someMethod(String arg); -} diff --git a/sca-java-2.x/trunk/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java b/sca-java-2.x/trunk/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java deleted file mode 100644 index f198efae51..0000000000 --- a/sca-java-2.x/trunk/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java +++ /dev/null @@ -1,27 +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.test.callback; - -/** - * The callback interface for {@link MyService}. - */ -public interface MyServiceCallback { - - void receiveResult(String result); -} diff --git a/sca-java-2.x/trunk/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java b/sca-java-2.x/trunk/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java deleted file mode 100644 index 2b484293c7..0000000000 --- a/sca-java-2.x/trunk/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java +++ /dev/null @@ -1,50 +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.test.callback; - -import org.oasisopen.sca.RequestContext; -import org.oasisopen.sca.annotation.Context; -import org.oasisopen.sca.annotation.Scope; -import org.oasisopen.sca.annotation.Service; - -/** - * This class implements MyService and uses a callback. - * - * In this scenario, we exlore using the RequestContext to retrieve the callBack reference - * as @Callback injection is not performed for composite-scoped implementations (see JavaCAA Section 7.2.5) - * - * Changing the service implementation to be @Scope("STATELESS") would make plain @Callback injection work - */ -@Service(MyService.class) -@Scope("COMPOSITE") -public class MyServiceImpl implements MyService { - - @Context - protected RequestContext requestContext; - - public void someMethod(String arg) { - // invoke the callback - try { - MyServiceCallback myServiceCallback = requestContext.getCallback(); - myServiceCallback.receiveResult(arg + " -> receiveResult"); - } catch (RuntimeException e) { - System.out.println("RuntimeException invoking receiveResult: " + e.toString()); - } - } -} diff --git a/sca-java-2.x/trunk/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite b/sca-java-2.x/trunk/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite deleted file mode 100644 index 9fe62ac671..0000000000 --- a/sca-java-2.x/trunk/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite +++ /dev/null @@ -1,38 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://callback" - name="CallbackMultiWireTest"> - - <component name="MyClientComponent1"> - <implementation.java class="org.apache.tuscany.sca.test.callback.MyClientImpl1"/> - <reference name="myService" target="MyServiceComponent"/> - </component> - - <component name="MyClientComponent2"> - <implementation.java class="org.apache.tuscany.sca.test.callback.MyClientImpl2"/> - <reference name="myService" target="MyServiceComponent"/> - </component> - - <component name="MyServiceComponent"> - <implementation.java class="org.apache.tuscany.sca.test.callback.MyServiceImpl"/> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java b/sca-java-2.x/trunk/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java deleted file mode 100644 index bd3cce74b4..0000000000 --- a/sca-java-2.x/trunk/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java +++ /dev/null @@ -1,64 +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.test.callback; - -import static org.junit.Assert.assertEquals; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -/** - * A TestCase that demonstrates resolving the client service and initiating the callback sequence - */ -public class CallbackMultiWireTestCase { - - private Node node; - private MyClient myClient1; - private MyClient myClient2; - - @Before - public void setUp() throws Exception { - String location = ContributionLocationHelper.getContributionLocation("CallbackMultiWireTest.composite"); - node = NodeFactory.newInstance().createNode("CallbackMultiWireTest.composite", new Contribution("c1", location)); - node.start(); - myClient1 = node.getService(MyClient.class, "MyClientComponent1"); - myClient2 = node.getService(MyClient.class, "MyClientComponent2"); - } - - @After - public void tearDown() throws Exception { - node.stop(); - } - - @Test - public void test() throws Exception { - System.out.println("Main thread " + Thread.currentThread()); - myClient1.aClientMethod(); - myClient2.aClientMethod(); - System.out.println("Sleeping ..."); - Thread.sleep(300); - assertEquals("-> someMethod1 -> receiveResult", MyClientImpl1.result); - assertEquals("-> someMethod2 -> receiveResult", MyClientImpl2.result); - } -} diff --git a/sca-java-2.x/trunk/itest/callback-separatethread/pom.xml b/sca-java-2.x/trunk/itest/callback-separatethread/pom.xml deleted file mode 100644 index 99ecf2e312..0000000000 --- a/sca-java-2.x/trunk/itest/callback-separatethread/pom.xml +++ /dev/null @@ -1,53 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-callback-separatethread</artifactId> - <name>Apache Tuscany SCA iTest Callback Using Separate Thread</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - </dependencies> -</project> diff --git a/sca-java-2.x/trunk/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java b/sca-java-2.x/trunk/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java deleted file mode 100644 index dc66003604..0000000000 --- a/sca-java-2.x/trunk/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java +++ /dev/null @@ -1,34 +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.itest; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * This is the client interface for the call backs in a separate thread tests - */ -@Remotable -public interface CallBackSeparateThreadClient { - - /** - * This tests call back patterns using separate threads. - */ - void runTests(); -} diff --git a/sca-java-2.x/trunk/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java b/sca-java-2.x/trunk/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java deleted file mode 100644 index f03144db8a..0000000000 --- a/sca-java-2.x/trunk/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java +++ /dev/null @@ -1,186 +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.itest; - -import java.util.concurrent.atomic.AtomicInteger; - -import org.junit.Assert; -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Service; - -/** - * This is the client implementation for the call backs in a separate thread tests - */ -@Service(CallBackSeparateThreadClient.class) -public class CallBackSeparateThreadClientImpl implements CallBackSeparateThreadClient, EventProcessorCallBack { - /** - * Max time to wait to receive events. If not all the events are received then timeout. - */ - private static final int TIMEOUT = 30 * 1000; - - /** - * Counts the number of fast call backs. - */ - private static final AtomicInteger FAST_CALLBACK_COUNT = new AtomicInteger(); - - /** - * Counts the number of slow call backs. - */ - private static final AtomicInteger SLOW_CALLBACK_COUNT = new AtomicInteger(); - - /** - * This is our injected reference to the EventProcessorService - */ - @Reference - protected EventProcessorService aCallBackService; - - /** - * This tests call back patterns using separate threads. - */ - public void runTests() { - try { - // Register for fast call back - registerForFastCallback(); - - // Wait for a few fast call backs - System.out.println("Waiting for some fast call backs"); - waitForSomeFastCallbacks(); - - try { - // Register for slow call back - registerForSlowCallback(); - - // Wait for a few fast call backs - System.out.println("Waiting for some fast calls"); - waitForSomeFastCallbacks(); - - // Wait for a few slow call backs - System.out.println("Waiting for some slow calls"); - waitForSomeSlowCallbacks(); - } finally { - unregisterForSlowCallback(); - } - - System.out.println("Done"); - } finally { - unregisterForFastCallback(); - } - } - - /** - * Waits for some fast call backs to be fired - */ - private void waitForSomeFastCallbacks() { - // Reset the fast call back count - FAST_CALLBACK_COUNT.set(0); - - // Wait until we have 10 fast call backs or timeout occurs - final long start = System.currentTimeMillis(); - do { - if (FAST_CALLBACK_COUNT.get() >= 10) { - System.out.println("Received enough fast notifications"); - return; - } - - try { - Thread.sleep(5); - } catch (InterruptedException e) { - Assert.fail("Unexpeceted exception " + e); - } - } while (System.currentTimeMillis() - start < TIMEOUT); - - // If we get to here then we did not receive enough events - Assert.fail("Did not receive enough fast events"); - } - - /** - * Waits for some slow call backs to be fired - */ - private void waitForSomeSlowCallbacks() { - // Reset the slow call back count - SLOW_CALLBACK_COUNT.set(0); - - // Wait until we have 4 slow call backs or timeout - final long start = System.currentTimeMillis(); - do { - if (SLOW_CALLBACK_COUNT.get() >= 4) { - System.out.println("Received enough slow notifications"); - return; - } - - try { - Thread.sleep(5); - } catch (InterruptedException e) { - Assert.fail("Unexpeceted exception " + e); - } - } while (System.currentTimeMillis() - start < TIMEOUT); - - // If we get to here then we did not receive enough events - Assert.fail("Did not receive enough slow events"); - } - - /** - * Register to receive fast call backs - */ - private void registerForFastCallback() { - aCallBackService.registerForEvent("FAST"); - } - - /** - * Register to receive slow call backs - */ - private void registerForSlowCallback() { - aCallBackService.registerForEvent("SLOW"); - } - - /** - * Unregister to receive fast call backs - */ - private void unregisterForFastCallback() { - aCallBackService.unregisterForEvent("FAST"); - } - - /** - * Unregister to receive slow call backs - */ - private void unregisterForSlowCallback() { - aCallBackService.unregisterForEvent("SLOW"); - } - - /** - * Method that is called when an Event is delivered. - * - * @param aEventName The name of the Event - * @param aEventData The Event data - */ - public void eventNotification(String aEventName, Object aEventData) { - // System.out.println("Received Event : " + aEventName + " " + aEventData); - - if (aEventName.equals("FAST")) { - final int newValue = FAST_CALLBACK_COUNT.incrementAndGet(); - //System.out.println("Received total of " + newValue + " fast call backs"); - } else if (aEventName.equals("SLOW")) { - final int newValue = SLOW_CALLBACK_COUNT.incrementAndGet(); - //System.out.println("Received total of " + newValue + " slow call backs"); - } else { - System.out.println("Unknown event type of " + aEventName); - } - } -} diff --git a/sca-java-2.x/trunk/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java b/sca-java-2.x/trunk/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java deleted file mode 100644 index 137ea6a658..0000000000 --- a/sca-java-2.x/trunk/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.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.itest; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * The call back interface for the EventProcessorService that is implemented - * by the client to receive event notifications - */ -@Remotable -public interface EventProcessorCallBack { - /** - * Call back notifying client of an Event - * - * @param aEventName The name of the Event - * @param aEventData The data for the Event - */ - void eventNotification(String aEventName, Object aEventData); -} diff --git a/sca-java-2.x/trunk/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java b/sca-java-2.x/trunk/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java deleted file mode 100644 index 4bf05fc925..0000000000 --- a/sca-java-2.x/trunk/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.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.itest; - -import org.oasisopen.sca.annotation.Callback; -import org.oasisopen.sca.annotation.Remotable; - -/** - * Sample Event Processor Service - */ -@Callback(EventProcessorCallBack.class) -@Remotable -public interface EventProcessorService { - - /** - * Registers the client to receive notifications for the specified event - * - * @param aEventName The name of the Event to register - */ - void registerForEvent(String aEventName); - - /** - * Unregisters the client so it no longer receives notifications for the specified event - * - * @param aEventName The name of the Event to unregister - */ - void unregisterForEvent(String aEventName); -} diff --git a/sca-java-2.x/trunk/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java b/sca-java-2.x/trunk/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java deleted file mode 100644 index bec98a49c9..0000000000 --- a/sca-java-2.x/trunk/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java +++ /dev/null @@ -1,195 +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.itest; - -import java.util.Map; -import java.util.Timer; -import java.util.TimerTask; -import java.util.UUID; -import java.util.concurrent.ConcurrentHashMap; - -import org.oasisopen.sca.ServiceReference; -import org.oasisopen.sca.annotation.Callback; -import org.oasisopen.sca.annotation.Destroy; -import org.oasisopen.sca.annotation.Scope; -import org.oasisopen.sca.annotation.Service; - -/** - * Sample Event Processor Service Implementation - */ -@Service(EventProcessorService.class) -@Scope("COMPOSITE") -public class EventProcessorServiceImpl implements EventProcessorService { - - /** - * Reference to the call back - */ - @Callback - protected ServiceReference<EventProcessorCallBack> clientCallback; - - /** - * This map contains the call backs for each of the registered Event names - */ - private final Map<String, ServiceReference<EventProcessorCallBack>> eventListeners; - - /** - * The list of all Event Generators we create - */ - private final EventGenerator[] allEventGenerators; - - /** - * Constructor. Starts the Event Generators - */ - public EventProcessorServiceImpl() { - eventListeners = new ConcurrentHashMap<String, ServiceReference<EventProcessorCallBack>>(); - - // We will simulate an Event generator - allEventGenerators = new EventGenerator[2]; - allEventGenerators[0] = new EventGenerator("FAST", 10); // Generate the FAST event every 10ms - allEventGenerators[1] = new EventGenerator("SLOW", 50); // Generate the SLOW event every 50ms - } - - /** - * Registers the client to receive notifications for the specified event - * - * @param aEventName The name of the Event to register - */ - public void registerForEvent(String aEventName) { - // Register for the Event - eventListeners.put(aEventName, clientCallback); - - // Send the "register" started event to the client - receiveEvent(aEventName, "SameThread: Registered to receive notifications for " + aEventName); - } - - /** - * Unregisters the client so it no longer receives notifications for the specified event - * - * @param aEventName The name of the Event to unregister - */ - public void unregisterForEvent(String aEventName) { - // Send the "register" started event to the client - receiveEvent(aEventName, "SameThread: Unregister from receiving notifications for " + aEventName); - - eventListeners.remove(aEventName); - } - - /** - * This method is called whenever the EventProcessorService receives an Event - * - * @param aEventName The name of the Event received - * @param aEventData The Event data - */ - private void receiveEvent(String aEventName, Object aEventData) { - // Get the listener for the Event - final ServiceReference<EventProcessorCallBack> callback = eventListeners.get(aEventName); - if (callback == null) { - //System.out.println("No registered listeners for " + aEventName); - return; - } - - // Trigger the call back - // System.out.println("Notifying " + callback + " of event " + aEventName); - callback.getService().eventNotification(aEventName, aEventData); - // System.out.println("Done notify " + callback + " of event " + aEventName); - } - - /** - * Shuts down the Event Processor - */ - @Destroy - public void shutdown() { - System.out.println("Shutting down the EventProcessor"); - - // Clear list of call back locations as we don't want to send any more notifications - eventListeners.clear(); - - // Stop the Event Generators - for (EventGenerator generator : allEventGenerators) { - generator.stop(); - } - } - - /** - * Utility class for generating Events - */ - private final class EventGenerator { - /** - * The Timer we are using to generate the events - */ - private final Timer timer = new Timer(); - - /** - * Lock object to ensure that we can cancel the timer cleanly. - */ - private final Object lock = new Object(); - - /** - * Constructor - * - * @param aEventName The name of the Event to generate - * @param frequencyInMilliseconds How frequently we should generate the Events - */ - private EventGenerator(String aEventName, int frequencyInMilliseconds) { - timer.schedule(new EventGeneratorTimerTask(aEventName), - frequencyInMilliseconds, - frequencyInMilliseconds); - } - - /** - * Stop this Event Generator - */ - private void stop() { - synchronized (lock) { - timer.cancel(); - } - } - - /** - * The TimerTask that is invoked by the Timer for the EventGenerator - */ - private final class EventGeneratorTimerTask extends TimerTask { - /** - * The name of the Event we should generate - */ - private final String eventName; - - /** - * Constructor - * - * @param aEventName The name of the Event we should generate - */ - private EventGeneratorTimerTask(String aEventName) { - eventName = aEventName; - } - - /** - * Timer calls this method and it will generate an Event - */ - - public void run() { - synchronized(lock) { - // System.out.println("Generating new event " + eventName); - receiveEvent(eventName, "Separate Thread Notification: " + UUID.randomUUID().toString()); - } - } - } - } -} diff --git a/sca-java-2.x/trunk/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite b/sca-java-2.x/trunk/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite deleted file mode 100644 index b10f3bc771..0000000000 --- a/sca-java-2.x/trunk/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite +++ /dev/null @@ -1,31 +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://docs.oasis-open.org/ns/opencsa/sca/200912" targetNamespace="http://callback" name="CallBackSeparateThreadTest"> - - <component name="CallBackSeparateThreadClient"> - <implementation.java class="org.apache.tuscany.sca.itest.CallBackSeparateThreadClientImpl"/> - <reference name="aCallBackService" target="EventProcessorService"/> - </component> - - <component name="EventProcessorService"> - <implementation.java class="org.apache.tuscany.sca.itest.EventProcessorServiceImpl"/> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java b/sca-java-2.x/trunk/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java deleted file mode 100644 index c216cab1be..0000000000 --- a/sca-java-2.x/trunk/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java +++ /dev/null @@ -1,73 +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.itest; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -/** - * This test case will attempt to trigger a call back using a separate thread - */ -public class CallBackSeparateThreadTestCase { - - /** - * The Node we are using - */ - private Node node; - - /** - * The client the tests should use - */ - private CallBackSeparateThreadClient aCallBackClient; - - /** - * Run the call back in separate thread tests - */ - @Test - public void testCallBackSeparateThread() { - aCallBackClient.runTests(); - } - - /** - * Load the Call back in separate thread composite and look up the client. - */ - - @Before - public void setUp() throws Exception { - String location = ContributionLocationHelper.getContributionLocation("CallBackSeparateThreadTest.composite"); - node = NodeFactory.newInstance().createNode("CallBackSeparateThreadTest.composite", new Contribution("c1", location)); - node.start(); - aCallBackClient = node.getService(CallBackSeparateThreadClient.class, "CallBackSeparateThreadClient"); - } - - /** - * Shutdown the SCA node - */ - - @After - public void tearDown() throws Exception { - node.stop(); - } -} diff --git a/sca-java-2.x/trunk/itest/callback-two-composites/pom.xml b/sca-java-2.x/trunk/itest/callback-two-composites/pom.xml deleted file mode 100644 index 339b2179a5..0000000000 --- a/sca-java-2.x/trunk/itest/callback-two-composites/pom.xml +++ /dev/null @@ -1,79 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-callback-two-composites</artifactId> - <name>Apache Tuscany SCA iTest Callback Two Composites</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-http</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-jetty</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - </dependencies> - - <properties> - <was.ant.script>${basedir}/../build-was-integration.xml</was.ant.script> - <was.python.script>${basedir}/../wasAdmin.py</was.python.script> - </properties> -</project> diff --git a/sca-java-2.x/trunk/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java b/sca-java-2.x/trunk/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java deleted file mode 100644 index 291a72b9d6..0000000000 --- a/sca-java-2.x/trunk/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java +++ /dev/null @@ -1,33 +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.test; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -/** - * - */ -public interface CallBackBasicCallBack { - - void callBackMessage(String aString); - - void callBackIncrement(String aString); - -} diff --git a/sca-java-2.x/trunk/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java b/sca-java-2.x/trunk/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java deleted file mode 100644 index 19f366c423..0000000000 --- a/sca-java-2.x/trunk/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java +++ /dev/null @@ -1,28 +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.test; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface CallBackBasicClient { - - void run(); - -} diff --git a/sca-java-2.x/trunk/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java b/sca-java-2.x/trunk/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java deleted file mode 100644 index 4bb6b29a8d..0000000000 --- a/sca-java-2.x/trunk/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java +++ /dev/null @@ -1,129 +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.test; - -import org.junit.Assert; -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Service; - -@Service(CallBackBasicClient.class) -public class CallBackBasicClientImpl implements CallBackBasicClient, CallBackBasicCallBack { - - @Reference - protected CallBackBasicService aCallBackService; - private static String returnMessage = null; - private static int callBackCount = 0; - private static Object monitor = new Object(); - - public void run() { - - // This tests basic callback patterns. - - // Test1 is the basic callback where the target calls back prior to - // returning to the client. - test1a(); - - // Test2 is where the target does not call back to the client. - test1b(); - - // Test3 is where the target calls back multiple times to the client. - test1c(); - } - - private void test1a() { - aCallBackService.knockKnock("Knock Knock"); - int count = 0; - - // - // If we can't get a response in 30 seconds consider this a failure - // - - synchronized (monitor) { - while (returnMessage == null && count++ < 30) { - try { - monitor.wait(1000L); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - - Assert.assertEquals("CallBackBasicITest - test1a", "Who's There", this.getReturnMessage()); - - } - - private void test1b() { - aCallBackService.noCallBack("No Reply Desired"); - Assert.assertEquals("CallBackBasicITest - test1b", 1, 1); - } - - private void test1c() { - aCallBackService.multiCallBack("Call me back 3 times"); - int count = 0; - - // - // If we can't get a response in 30 seconds consider this a failure - // - - synchronized (monitor) { - while (this.getCallBackCount() < 3 && count++ < 30) { - try { - monitor.wait(1000L); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - - Assert.assertEquals("CallBackBasicITest - test1c", 3, this.getCallBackCount()); - } - - public String getReturnMessage() { - return returnMessage; - } - - public void setReturnMessage(String aReturnMessage) { - returnMessage = aReturnMessage; - } - - public int getCallBackCount() { - return callBackCount; - } - - public void incrementCallBackCount() { - callBackCount++; - } - - public void callBackMessage(String aString) { - System.out.println("Entering callback callBackMessage: " + aString); - synchronized (monitor) { - this.setReturnMessage(aString); - monitor.notify(); - } - } - - public void callBackIncrement(String aString) { - System.out.println("Entering callback increment: " + aString); - synchronized (monitor) { - this.incrementCallBackCount(); - monitor.notify(); - } - } - -} diff --git a/sca-java-2.x/trunk/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java b/sca-java-2.x/trunk/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java deleted file mode 100644 index 5396879e83..0000000000 --- a/sca-java-2.x/trunk/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.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.test; - -import org.oasisopen.sca.annotation.Callback; -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -@Callback(CallBackBasicCallBack.class) -/** - * - */ -public interface CallBackBasicService { - - void knockKnock(String aString); - - void noCallBack(String aString); - - void multiCallBack(String aString); - -} diff --git a/sca-java-2.x/trunk/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java b/sca-java-2.x/trunk/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java deleted file mode 100644 index 07010f61e1..0000000000 --- a/sca-java-2.x/trunk/itest/callback-two-composites/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java +++ /dev/null @@ -1,56 +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.test; - -import org.oasisopen.sca.annotation.Callback; -import org.oasisopen.sca.annotation.Service; - -@Service(CallBackBasicService.class) -public class CallBackBasicServiceImpl implements CallBackBasicService { - - @Callback - protected CallBackBasicCallBack callback; - - public void knockKnock(String aString) { - - System.out.println("CallBackBasicServiceImpl message received: " + aString); - callback.callBackMessage("Who's There"); - System.out.println("CallBackBasicServiceImpl response sent"); - - } - - public void multiCallBack(String aString) { - - System.out.println("CallBackBasicServiceImpl message received: " + aString); - callback.callBackIncrement("Who's There 1"); - System.out.println("CallBackBasicServiceImpl response sent"); - callback.callBackIncrement("Who's There 2"); - System.out.println("CallBackBasicServiceImpl response sent"); - callback.callBackIncrement("Who's There 3"); - System.out.println("CallBackBasicServiceImpl response sent"); - - } - - public void noCallBack(String aString) { - - System.out.println("CallBackBasicServiceImpl message received: " + aString); - // System.out.println("CallBackBasicServiceImpl No response desired"); - - } -} diff --git a/sca-java-2.x/trunk/itest/callback-two-composites/src/main/resources/CallBackReference.composite b/sca-java-2.x/trunk/itest/callback-two-composites/src/main/resources/CallBackReference.composite deleted file mode 100644 index 477ef7391f..0000000000 --- a/sca-java-2.x/trunk/itest/callback-two-composites/src/main/resources/CallBackReference.composite +++ /dev/null @@ -1,33 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://callback" - name="CallBackReferenceTest"> - - <component name="CallBackBasicClient"> - <implementation.java class="org.apache.tuscany.sca.test.CallBackBasicClientImpl"/> - <reference name="aCallBackService" target="CallBackBasicService"> - <callback> - <binding.ws uri="http://localhost:8084/aCallBackService"/> - </callback> - </reference> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/callback-two-composites/src/main/resources/CallBackService.composite b/sca-java-2.x/trunk/itest/callback-two-composites/src/main/resources/CallBackService.composite deleted file mode 100644 index c3f0f5bc81..0000000000 --- a/sca-java-2.x/trunk/itest/callback-two-composites/src/main/resources/CallBackService.composite +++ /dev/null @@ -1,31 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://callback" - name="CallBackServiceTest"> - - <component name="CallBackBasicService"> - <implementation.java class="org.apache.tuscany.sca.test.CallBackBasicServiceImpl"/> - <service name="CallBackBasicService"> - <binding.ws uri="http://localhost:8085/CallBackBasicService"/> - </service> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/callback-two-composites/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/callback-two-composites/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 11d737e701..0000000000 --- a/sca-java-2.x/trunk/itest/callback-two-composites/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:t="http://callback"> - <deployable composite="t:CallBackReferenceTest" /> - <deployable composite="t:CallBackServiceTest" /> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/callback-two-composites/src/test/java/org/apache/tuscany/sca/test/CallBackTwoCompositesTestCase.java b/sca-java-2.x/trunk/itest/callback-two-composites/src/test/java/org/apache/tuscany/sca/test/CallBackTwoCompositesTestCase.java deleted file mode 100644 index 92fc8f4bef..0000000000 --- a/sca-java-2.x/trunk/itest/callback-two-composites/src/test/java/org/apache/tuscany/sca/test/CallBackTwoCompositesTestCase.java +++ /dev/null @@ -1,56 +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.test; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -public class CallBackTwoCompositesTestCase { - - private static Node node; - private CallBackBasicClient aCallBackClient; - - @Before - public void setUp() throws Exception { - try { - node = NodeFactory.newInstance().createNode(new Contribution("c1", "./target/classes")); - node.start(); - - aCallBackClient = node.getService(CallBackBasicClient.class, "CallBackBasicClient"); - } catch (Exception ex){ - ex.printStackTrace(); - } - } - - @Test - public void testCallBackBasic() { - aCallBackClient.run(); - } - - @After - public void tearDown() throws Exception { - node.stop(); - } - -} diff --git a/sca-java-2.x/trunk/itest/callback-two-nodes/pom.xml b/sca-java-2.x/trunk/itest/callback-two-nodes/pom.xml deleted file mode 100644 index bacd95d894..0000000000 --- a/sca-java-2.x/trunk/itest/callback-two-nodes/pom.xml +++ /dev/null @@ -1,86 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-callback-two-nodes</artifactId> - <name>Apache Tuscany SCA iTest Callback Two Nodes</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-http</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-jetty</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-endpoint-hazelcast</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - </dependencies> - - <properties> - <was.ant.script>${basedir}/../build-was-integration.xml</was.ant.script> - <was.python.script>${basedir}/../wasAdmin.py</was.python.script> - </properties> -</project> diff --git a/sca-java-2.x/trunk/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java b/sca-java-2.x/trunk/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java deleted file mode 100644 index 291a72b9d6..0000000000 --- a/sca-java-2.x/trunk/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java +++ /dev/null @@ -1,33 +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.test; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -/** - * - */ -public interface CallBackBasicCallBack { - - void callBackMessage(String aString); - - void callBackIncrement(String aString); - -} diff --git a/sca-java-2.x/trunk/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java b/sca-java-2.x/trunk/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java deleted file mode 100644 index 19f366c423..0000000000 --- a/sca-java-2.x/trunk/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java +++ /dev/null @@ -1,28 +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.test; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface CallBackBasicClient { - - void run(); - -} diff --git a/sca-java-2.x/trunk/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java b/sca-java-2.x/trunk/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java deleted file mode 100644 index 4bb6b29a8d..0000000000 --- a/sca-java-2.x/trunk/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java +++ /dev/null @@ -1,129 +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.test; - -import org.junit.Assert; -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Service; - -@Service(CallBackBasicClient.class) -public class CallBackBasicClientImpl implements CallBackBasicClient, CallBackBasicCallBack { - - @Reference - protected CallBackBasicService aCallBackService; - private static String returnMessage = null; - private static int callBackCount = 0; - private static Object monitor = new Object(); - - public void run() { - - // This tests basic callback patterns. - - // Test1 is the basic callback where the target calls back prior to - // returning to the client. - test1a(); - - // Test2 is where the target does not call back to the client. - test1b(); - - // Test3 is where the target calls back multiple times to the client. - test1c(); - } - - private void test1a() { - aCallBackService.knockKnock("Knock Knock"); - int count = 0; - - // - // If we can't get a response in 30 seconds consider this a failure - // - - synchronized (monitor) { - while (returnMessage == null && count++ < 30) { - try { - monitor.wait(1000L); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - - Assert.assertEquals("CallBackBasicITest - test1a", "Who's There", this.getReturnMessage()); - - } - - private void test1b() { - aCallBackService.noCallBack("No Reply Desired"); - Assert.assertEquals("CallBackBasicITest - test1b", 1, 1); - } - - private void test1c() { - aCallBackService.multiCallBack("Call me back 3 times"); - int count = 0; - - // - // If we can't get a response in 30 seconds consider this a failure - // - - synchronized (monitor) { - while (this.getCallBackCount() < 3 && count++ < 30) { - try { - monitor.wait(1000L); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - - Assert.assertEquals("CallBackBasicITest - test1c", 3, this.getCallBackCount()); - } - - public String getReturnMessage() { - return returnMessage; - } - - public void setReturnMessage(String aReturnMessage) { - returnMessage = aReturnMessage; - } - - public int getCallBackCount() { - return callBackCount; - } - - public void incrementCallBackCount() { - callBackCount++; - } - - public void callBackMessage(String aString) { - System.out.println("Entering callback callBackMessage: " + aString); - synchronized (monitor) { - this.setReturnMessage(aString); - monitor.notify(); - } - } - - public void callBackIncrement(String aString) { - System.out.println("Entering callback increment: " + aString); - synchronized (monitor) { - this.incrementCallBackCount(); - monitor.notify(); - } - } - -} diff --git a/sca-java-2.x/trunk/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java b/sca-java-2.x/trunk/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java deleted file mode 100644 index 5396879e83..0000000000 --- a/sca-java-2.x/trunk/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.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.test; - -import org.oasisopen.sca.annotation.Callback; -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -@Callback(CallBackBasicCallBack.class) -/** - * - */ -public interface CallBackBasicService { - - void knockKnock(String aString); - - void noCallBack(String aString); - - void multiCallBack(String aString); - -} diff --git a/sca-java-2.x/trunk/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java b/sca-java-2.x/trunk/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java deleted file mode 100644 index 07010f61e1..0000000000 --- a/sca-java-2.x/trunk/itest/callback-two-nodes/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java +++ /dev/null @@ -1,56 +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.test; - -import org.oasisopen.sca.annotation.Callback; -import org.oasisopen.sca.annotation.Service; - -@Service(CallBackBasicService.class) -public class CallBackBasicServiceImpl implements CallBackBasicService { - - @Callback - protected CallBackBasicCallBack callback; - - public void knockKnock(String aString) { - - System.out.println("CallBackBasicServiceImpl message received: " + aString); - callback.callBackMessage("Who's There"); - System.out.println("CallBackBasicServiceImpl response sent"); - - } - - public void multiCallBack(String aString) { - - System.out.println("CallBackBasicServiceImpl message received: " + aString); - callback.callBackIncrement("Who's There 1"); - System.out.println("CallBackBasicServiceImpl response sent"); - callback.callBackIncrement("Who's There 2"); - System.out.println("CallBackBasicServiceImpl response sent"); - callback.callBackIncrement("Who's There 3"); - System.out.println("CallBackBasicServiceImpl response sent"); - - } - - public void noCallBack(String aString) { - - System.out.println("CallBackBasicServiceImpl message received: " + aString); - // System.out.println("CallBackBasicServiceImpl No response desired"); - - } -} diff --git a/sca-java-2.x/trunk/itest/callback-two-nodes/src/main/resources/CallBackReference.composite b/sca-java-2.x/trunk/itest/callback-two-nodes/src/main/resources/CallBackReference.composite deleted file mode 100644 index 477ef7391f..0000000000 --- a/sca-java-2.x/trunk/itest/callback-two-nodes/src/main/resources/CallBackReference.composite +++ /dev/null @@ -1,33 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://callback" - name="CallBackReferenceTest"> - - <component name="CallBackBasicClient"> - <implementation.java class="org.apache.tuscany.sca.test.CallBackBasicClientImpl"/> - <reference name="aCallBackService" target="CallBackBasicService"> - <callback> - <binding.ws uri="http://localhost:8084/aCallBackService"/> - </callback> - </reference> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/callback-two-nodes/src/main/resources/CallBackService.composite b/sca-java-2.x/trunk/itest/callback-two-nodes/src/main/resources/CallBackService.composite deleted file mode 100644 index c3f0f5bc81..0000000000 --- a/sca-java-2.x/trunk/itest/callback-two-nodes/src/main/resources/CallBackService.composite +++ /dev/null @@ -1,31 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://callback" - name="CallBackServiceTest"> - - <component name="CallBackBasicService"> - <implementation.java class="org.apache.tuscany.sca.test.CallBackBasicServiceImpl"/> - <service name="CallBackBasicService"> - <binding.ws uri="http://localhost:8085/CallBackBasicService"/> - </service> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/callback-two-nodes/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/callback-two-nodes/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index efef032b8f..0000000000 --- a/sca-java-2.x/trunk/itest/callback-two-nodes/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:t="http://callback"> - <deployable composite="t:CallBackTwoNodesReferenceTest" /> - <deployable composite="t:CallBackTwoNodesServiceTest" /> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesTestCase.java b/sca-java-2.x/trunk/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesTestCase.java deleted file mode 100644 index 19e818b68f..0000000000 --- a/sca-java-2.x/trunk/itest/callback-two-nodes/src/test/java/org/apache/tuscany/sca/test/CallBackTwoNodesTestCase.java +++ /dev/null @@ -1,78 +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.test; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.apache.tuscany.sca.node.configuration.NodeConfiguration; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -public class CallBackTwoNodesTestCase { - - private static Node node1; - private static Node node2; - private CallBackBasicClient aCallBackClient; - - @Before - public void setUp() throws Exception { - try { - NodeFactory factory = NodeFactory.getInstance(); - - NodeConfiguration configuration = factory.createNodeConfiguration(); - configuration.setDomainURI("tuscany:default"); - configuration.setURI("node1"); - configuration.addContribution("c1", "./target/classes"); - configuration.addDeploymentComposite("c1","CallBackService.composite"); - - //node1 = factory.createNode("CallBackService.composite", new Contribution("c1", "./target/classes")); - node1 = factory.createNode(configuration); - node1.start(); - - configuration = factory.createNodeConfiguration(); - configuration.setDomainURI("tuscany:default"); - configuration.setURI("node2"); - configuration.addContribution("c1", "./target/classes"); - configuration.addDeploymentComposite("c1","CallBackReference.composite"); - - //node2 = factory.newInstance().createNode("CallBackReference.composite", new Contribution("c1", "./target/classes")); - node2 = factory.createNode(configuration); - node2.start(); - - aCallBackClient = node2.getService(CallBackBasicClient.class, "CallBackBasicClient"); - } catch (Exception ex){ - ex.printStackTrace(); - } - } - - @Test - public void testCallBackTwoNodes() { - aCallBackClient.run(); - } - - @After - public void tearDown() throws Exception { - node2.stop(); - node1.stop(); - } - -} diff --git a/sca-java-2.x/trunk/itest/component-type/pom.xml b/sca-java-2.x/trunk/itest/component-type/pom.xml deleted file mode 100644 index 4dc05305af..0000000000 --- a/sca-java-2.x/trunk/itest/component-type/pom.xml +++ /dev/null @@ -1,53 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-component-type</artifactId> - <name>Apache Tuscany SCA iTest Component Type</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - </dependencies> -</project> - diff --git a/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/AddService.java deleted file mode 100644 index 188451ebac..0000000000 --- a/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/AddService.java +++ /dev/null @@ -1,28 +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 calculator; - -/** - * The Add service interface - */ -public interface AddService { - - double add(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/AddServiceImpl.java deleted file mode 100644 index 8b6fe066a6..0000000000 --- a/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/AddServiceImpl.java +++ /dev/null @@ -1,30 +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 calculator; - -/** - * An implementation of the Add service - */ -public class AddServiceImpl implements AddService { - - public double add(double n1, double n2) { - return n1 + n2; - } - -} diff --git a/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/CalculatorClient.java deleted file mode 100644 index 6f978bd9be..0000000000 --- a/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/CalculatorClient.java +++ /dev/null @@ -1,49 +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 calculator; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; - -/** - * This client program shows how to create an SCA runtime, start it, - * and locate and invoke a SCA component - */ -public class CalculatorClient { - public static void main(String[] args) throws Exception { - - String location = ContributionLocationHelper.getContributionLocation("Calculator.composite"); - Node node = NodeFactory.newInstance().createNode("Calculator.composite", new Contribution("c1", location)); - node.start(); - - CalculatorService calculatorService = - node.getService(CalculatorService.class, "CalculatorServiceComponent/CalculatorService"); - - // Calculate - System.out.println("3 + 2=" + calculatorService.add(3, 2)); - System.out.println("3 - 2=" + calculatorService.subtract(3, 2)); - System.out.println("3 * 2=" + calculatorService.multiply(3, 2)); - System.out.println("3 / 2=" + calculatorService.divide(3, 2)); - - node.stop(); - } -} diff --git a/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/CalculatorService.java deleted file mode 100644 index c89043276e..0000000000 --- a/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/CalculatorService.java +++ /dev/null @@ -1,34 +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 calculator; - -/** - * The Calculator service interface. - */ -public interface CalculatorService { - - double add(double n1, double n2); - - double subtract(double n1, double n2); - - double multiply(double n1, double n2); - - double divide(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java deleted file mode 100644 index 1209ac128a..0000000000 --- a/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java +++ /dev/null @@ -1,63 +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 calculator; - -/** - * An implementation of the Calculator service. - */ -public class CalculatorServiceImpl implements CalculatorService { - - private AddService addService; - private SubtractService subtractService; - private MultiplyService multiplyService; - private DivideService divideService; - - public void setAddService(AddService addService) { - this.addService = addService; - } - - public void setSubtractService(SubtractService subtractService) { - this.subtractService = subtractService; - } - - public void setDivideService(DivideService divideService) { - this.divideService = divideService; - } - - public void setMultiplyService(MultiplyService multiplyService) { - this.multiplyService = multiplyService; - } - - public double add(double n1, double n2) { - return addService.add(n1, n2); - } - - public double subtract(double n1, double n2) { - return subtractService.subtract(n1, n2); - } - - public double multiply(double n1, double n2) { - return multiplyService.multiply(n1, n2); - } - - public double divide(double n1, double n2) { - return divideService.divide(n1, n2); - } - -} diff --git a/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/DivideService.java deleted file mode 100644 index 30d248208b..0000000000 --- a/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/DivideService.java +++ /dev/null @@ -1,28 +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 calculator; - -/** - * The divide service interface - */ -public interface DivideService { - - double divide(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/DivideServiceImpl.java deleted file mode 100644 index f7ac0b7287..0000000000 --- a/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/DivideServiceImpl.java +++ /dev/null @@ -1,30 +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 calculator; - -/** - * An implementation of the Divide service. - */ -public class DivideServiceImpl implements DivideService { - - public double divide(double n1, double n2) { - return n1 / n2; - } - -} diff --git a/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/MultiplyService.java deleted file mode 100644 index 5290605938..0000000000 --- a/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/MultiplyService.java +++ /dev/null @@ -1,28 +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 calculator; - -/** - * The interface for the multiply service - */ -public interface MultiplyService { - - double multiply(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java deleted file mode 100644 index b7dca792b2..0000000000 --- a/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java +++ /dev/null @@ -1,30 +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 calculator; - -/** - * An implementation of the Multiply service. - */ -public class MultiplyServiceImpl implements MultiplyService { - - public double multiply(double n1, double n2) { - return n1 * n2; - } - -} diff --git a/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/SubtractService.java deleted file mode 100644 index bf0d1882b6..0000000000 --- a/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/SubtractService.java +++ /dev/null @@ -1,28 +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 calculator; - -/** - * The interface for the multiply service - */ -public interface SubtractService { - - double subtract(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java deleted file mode 100644 index 77b128ab8d..0000000000 --- a/sca-java-2.x/trunk/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java +++ /dev/null @@ -1,30 +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 calculator; - -/** - * An implementation of the subtract service. - */ -public class SubtractServiceImpl implements SubtractService { - - public double subtract(double n1, double n2) { - return n1 - n2; - } - -} diff --git a/sca-java-2.x/trunk/itest/component-type/src/main/resources/Calculator.composite b/sca-java-2.x/trunk/itest/component-type/src/main/resources/Calculator.composite deleted file mode 100644 index fc08333544..0000000000 --- a/sca-java-2.x/trunk/itest/component-type/src/main/resources/Calculator.composite +++ /dev/null @@ -1,49 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://sample" - xmlns:sample="http://sample" - name="Calculator"> - - <component name="CalculatorServiceComponent"> - <implementation.java class="calculator.CalculatorServiceImpl"/> - <reference name="addService" target="AddServiceComponent/AddService"/> - <reference name="subtractService" target="SubtractServiceComponent/SubtractService"/> - <reference name="multiplyService" target="MultiplyServiceComponent/MultiplyService"/> - <reference name="divideService" target="DivideServiceComponent/DivideService"/> - </component> - - <component name="AddServiceComponent"> - <implementation.java class="calculator.AddServiceImpl"/> - </component> - - <component name="SubtractServiceComponent"> - <implementation.java class="calculator.SubtractServiceImpl"/> - </component> - - <component name="MultiplyServiceComponent"> - <implementation.java class="calculator.MultiplyServiceImpl"/> - </component> - - <component name="DivideServiceComponent"> - <implementation.java class="calculator.DivideServiceImpl"/> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType b/sca-java-2.x/trunk/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType deleted file mode 100644 index a6babbfc2f..0000000000 --- a/sca-java-2.x/trunk/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.
--->
-<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
- - <service name="AddService">
- <interface.java interface="calculator.AddService"/>
- </service>
- -</componentType>
-
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType b/sca-java-2.x/trunk/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType deleted file mode 100644 index b3a4ac83e9..0000000000 --- a/sca-java-2.x/trunk/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.
--->
-<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
- - <service name="CalculatorService">
- <interface.java interface="calculator.CalculatorService"/>
- </service>
-
- <reference name="addService">
- <interface.java interface="calculator.AddService"/>
- </reference>
-
- <reference name="subtractService">
- <interface.java interface="calculator.SubtractService"/>
- </reference>
-
- <reference name="multiplyService">
- <interface.java interface="calculator.MultiplyService"/>
- </reference>
-
- <reference name="divideService">
- <interface.java interface="calculator.DivideService"/>
- </reference>
- -</componentType>
-
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType b/sca-java-2.x/trunk/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType deleted file mode 100644 index 9238359f76..0000000000 --- a/sca-java-2.x/trunk/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.
--->
-<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
- - <service name="DivideService">
- <interface.java interface="calculator.DivideService"/>
- </service>
- -</componentType>
-
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType b/sca-java-2.x/trunk/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType deleted file mode 100644 index 2fadb54bf1..0000000000 --- a/sca-java-2.x/trunk/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.
--->
-<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
- - <service name="MultiplyService">
- <interface.java interface="calculator.MultiplyService"/>
- </service>
- -</componentType>
-
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType b/sca-java-2.x/trunk/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType deleted file mode 100644 index 6ca2df2928..0000000000 --- a/sca-java-2.x/trunk/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.
--->
-<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
- - <service name="SubtractService">
- <interface.java interface="calculator.SubtractService"/>
- </service>
- -</componentType>
-
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/component-type/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/trunk/itest/component-type/src/test/java/calculator/CalculatorTestCase.java deleted file mode 100644 index ac3ccc3d08..0000000000 --- a/sca-java-2.x/trunk/itest/component-type/src/test/java/calculator/CalculatorTestCase.java +++ /dev/null @@ -1,60 +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 calculator; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -/** - * This shows how to test the Calculator service component. - */ -public class CalculatorTestCase { - - private CalculatorService calculatorService; - private Node node; - - @Before - public void setUp() throws Exception { - String location = ContributionLocationHelper.getContributionLocation("Calculator.composite"); - node = NodeFactory.newInstance().createNode("Calculator.composite", new Contribution("c1", location)); - node.start(); - calculatorService = node.getService(CalculatorService.class, "CalculatorServiceComponent/CalculatorService"); - } - - @After - public void tearDown() throws Exception { - node.stop(); - } - - @Test - public void testCalculator() throws Exception { - // Calculate - /* - assertEquals(calculatorService.add(3, 2), 5.0, 0.0); - assertEquals(calculatorService.subtract(3, 2), 1.0, 0.0); - assertEquals(calculatorService.multiply(3, 2), 6.0, 0.0); - assertEquals(calculatorService.divide(3, 2), 1.5, 0.0); - */ - } -} diff --git a/sca-java-2.x/trunk/itest/contribution-folder/pom.xml b/sca-java-2.x/trunk/itest/contribution-folder/pom.xml deleted file mode 100644 index 35e7bb03ae..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-folder/pom.xml +++ /dev/null @@ -1,46 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-contribution-folder</artifactId> - <name>Apache Tuscany SCA iTest Contribution Folder</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - </dependencies> -</project> diff --git a/sca-java-2.x/trunk/itest/contribution-folder/src/test/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/itest/contribution-folder/src/test/java/calculator/CalculatorService.java deleted file mode 100644 index b4c677b371..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-folder/src/test/java/calculator/CalculatorService.java +++ /dev/null @@ -1,31 +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 calculator; - -public interface CalculatorService { - double add(double n1, double n2); - - double subtract(double n1, double n2); - - double multiply(double n1, double n2); - - double divide(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/itest/contribution-folder/src/test/java/test/ContributionFolderTestCase.java b/sca-java-2.x/trunk/itest/contribution-folder/src/test/java/test/ContributionFolderTestCase.java deleted file mode 100644 index ef2a43c766..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-folder/src/test/java/test/ContributionFolderTestCase.java +++ /dev/null @@ -1,55 +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 test; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; - -import calculator.CalculatorService; - -/** - * Test SCADomain.newInstance and invocation of a service. - * - * @version $Rev$ $Date$ - */ -public class ContributionFolderTestCase extends TestCase { - - private Node node; - - @Override - protected void setUp() throws Exception { - node = NodeFactory.newInstance().createNode(new Contribution("foo", "src/test/resources/repository")); - node.start(); - } - - public void testInvoke() throws Exception { - CalculatorService service = node.getService(CalculatorService.class, "CalculatorServiceComponent"); - assertEquals(3.0, service.add(1, 2)); - } - - @Override - protected void tearDown() throws Exception { - node.stop(); - } - -} diff --git a/sca-java-2.x/trunk/itest/contribution-folder/src/test/resources/repository/folderWithJars/Calculator.composite b/sca-java-2.x/trunk/itest/contribution-folder/src/test/resources/repository/folderWithJars/Calculator.composite deleted file mode 100644 index 05bea57944..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-folder/src/test/resources/repository/folderWithJars/Calculator.composite +++ /dev/null @@ -1,49 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://sample" - xmlns:sample="http://sample" - name="Calculator"> - - <component name="CalculatorServiceComponent"> - <implementation.java class="calculator.CalculatorServiceImpl"/> - <reference name="addService" target="AddServiceComponent" /> - <reference name="subtractService" target="SubtractServiceComponent" /> - <reference name="multiplyService" target="MultiplyServiceComponent" /> - <reference name="divideService" target="DivideServiceComponent" /> - </component> - - <component name="AddServiceComponent"> - <implementation.java class="calculator.AddServiceImpl"/> - </component> - - <component name="SubtractServiceComponent"> - <implementation.java class="calculator.SubtractServiceImpl"/> - </component> - - <component name="MultiplyServiceComponent"> - <implementation.java class="calculator.MultiplyServiceImpl"/> - </component> - - <component name="DivideServiceComponent"> - <implementation.java class="calculator.DivideServiceImpl"/> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/contribution-folder/src/test/resources/repository/folderWithJars/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/contribution-folder/src/test/resources/repository/folderWithJars/META-INF/sca-contribution.xml deleted file mode 100644 index 8d6012e5c4..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-folder/src/test/resources/repository/folderWithJars/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sample="http://sample"> - <deployable composite="sample:Calculator"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/contribution-folder/src/test/resources/repository/folderWithJars/service.jar b/sca-java-2.x/trunk/itest/contribution-folder/src/test/resources/repository/folderWithJars/service.jar Binary files differdeleted file mode 100644 index fe264693fe..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-folder/src/test/resources/repository/folderWithJars/service.jar +++ /dev/null diff --git a/sca-java-2.x/trunk/itest/contribution-folder/src/test/resources/repository/folderWithJars/serviceImpl.jar b/sca-java-2.x/trunk/itest/contribution-folder/src/test/resources/repository/folderWithJars/serviceImpl.jar Binary files differdeleted file mode 100644 index d5dfb647d3..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-folder/src/test/resources/repository/folderWithJars/serviceImpl.jar +++ /dev/null diff --git a/sca-java-2.x/trunk/itest/contribution-folder/src/test/resources/repository3/contribution.zip b/sca-java-2.x/trunk/itest/contribution-folder/src/test/resources/repository3/contribution.zip Binary files differdeleted file mode 100644 index b293aa4bcc..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-folder/src/test/resources/repository3/contribution.zip +++ /dev/null diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/export-composite/pom.xml b/sca-java-2.x/trunk/itest/contribution-import-export/export-composite/pom.xml deleted file mode 100644 index 842a7ca47a..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-import-export/export-composite/pom.xml +++ /dev/null @@ -1,67 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>1.6-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-contribution-export-composite</artifactId> - <name>Apache Tuscany SCA iTest Contribution Export</name> - -<dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> - <version>1.6-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>1.6-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> - <version>1.6-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-tomcat</artifactId> - <version>1.6-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.1</version> - <scope>test</scope> - </dependency> - - </dependencies> -</project> diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java b/sca-java-2.x/trunk/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java deleted file mode 100644 index 669821261c..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java +++ /dev/null @@ -1,30 +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 hello; - -import org.osoa.sca.annotations.Remotable; - -/** - * This is the business interface of the Hello service. - */ -@Remotable -public interface Hello { - - public String getGreetings(String name); -} diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java b/sca-java-2.x/trunk/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java deleted file mode 100644 index ff9f6e75f3..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java +++ /dev/null @@ -1,33 +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 hello; - -import org.osoa.sca.annotations.Service; - -/** - * This class implements the HelloWorld service. - */ -@Service(Hello.class) -public class HelloImpl implements Hello { - - public String getGreetings(String name) { - return "Hello " + name; - } - -} diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index bea6f39932..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,25 +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. ---> -<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://hello" - xmlns:hello="http://hello"> - <deployable composite="hello:hello"/> - <export namespace="http://hello"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/export-composite/src/main/resources/hello.composite b/sca-java-2.x/trunk/itest/contribution-import-export/export-composite/src/main/resources/hello.composite deleted file mode 100644 index aeeab337fa..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-import-export/export-composite/src/main/resources/hello.composite +++ /dev/null @@ -1,31 +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://hello" - xmlns:hello="http://hello" - name="hello"> - - <service name="HelloService" promote="HelloServiceComponent"/> - - <component name="HelloServiceComponent"> - <implementation.java class="hello.HelloImpl" /> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java b/sca-java-2.x/trunk/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java deleted file mode 100644 index 44614f243a..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java +++ /dev/null @@ -1,91 +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.test.contribution; - -import hello.Hello; - -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.service.ContributionService; -import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; - -/** - * Tests that the helloworld server is available - */ -public class HelloTestCase extends TestCase { - private ClassLoader cl; - private EmbeddedSCADomain domain; - - @Override - protected void setUp() throws Exception { - // Create a test embedded SCA domain - cl = getClass().getClassLoader(); - domain = new EmbeddedSCADomain(cl, "http://localhost"); - - // Start the domain - domain.start(); - - // Contribute the SCA contribution - ContributionService contributionService = domain.getContributionService(); - - URL helloURL = getContributionURL(Hello.class); - - // File helloContrib = new File("./target/classes/"); - // URL helloURL = helloContrib.toURL(); - Contribution consumerContribution = - contributionService.contribute("http://import-export/hello", helloURL, false); - Composite consumerComposite = consumerContribution.getDeployables().get(0); - domain.getDomainComposite().getIncludes().add(consumerComposite); - domain.buildComposite(consumerComposite); - - // Start Components from my composite - domain.getCompositeActivator().activate(consumerComposite); - domain.getCompositeActivator().start(consumerComposite); - } - - private URL getContributionURL(Class<?> cls) throws MalformedURLException { - String flag = "/" + cls.getName().replace('.', '/') + ".class"; - URL url = cls.getResource(flag); - String root = url.toExternalForm(); - root = root.substring(0, root.length() - flag.length() + 1); - if (root.startsWith("jar:") && root.endsWith("!/")) { - root = root.substring(4, root.length() - 2); - } - url = new URL(root); - return url; - } - - public void testHello() throws IOException { - Hello hello = domain.getService(Hello.class, "HelloServiceComponent"); - assertNotNull(hello); - assertEquals(hello.getGreetings("lresende"), "Hello lresende"); - } - - @Override - public void tearDown() throws Exception { - domain.close(); - } - -} diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/export-java/pom.xml b/sca-java-2.x/trunk/itest/contribution-import-export/export-java/pom.xml deleted file mode 100644 index a863a7843f..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-import-export/export-java/pom.xml +++ /dev/null @@ -1,67 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>1.6-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-contribution-export-java</artifactId> - <name>Apache Tuscany SCA iTest Contribution Java Export</name> - -<dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> - <version>1.6-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>1.6-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> - <version>1.6-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-tomcat</artifactId> - <version>1.6-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.1</version> - <scope>test</scope> - </dependency> - - </dependencies> -</project> diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java deleted file mode 100644 index 268d90e910..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java +++ /dev/null @@ -1,30 +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 helloworld; - -import org.osoa.sca.annotations.Remotable; - -/** - * This is the business interface of the HelloWorld greetings service. - */ -@Remotable -public interface HelloWorldService { - - public String getGreetings(String name); -} diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 7e11adcec7..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +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. ---> -<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://helloworld" - xmlns:helloworld="http://helloworld"> - <export.java package="helloworld"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType b/sca-java-2.x/trunk/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType deleted file mode 100644 index 5a14b41650..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?> -<!-- - * 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. ---> -<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - - <service name="HelloWorldService"> - <interface.java interface="helloworld.HelloWorldService" /> - </service> - -</componentType> -
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/export-resource/pom.xml b/sca-java-2.x/trunk/itest/contribution-import-export/export-resource/pom.xml deleted file mode 100644 index d8133c4acc..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-import-export/export-resource/pom.xml +++ /dev/null @@ -1,31 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>1.6-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-contribution-export-resource</artifactId> - <name>Apache Tuscany SCA iTest Contribution Resource Export</name> - -</project> diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index f11eacb416..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +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. ---> -<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://store" - xmlns:helloworld="http://store"> - <export.resource uri="ufservices/store.html"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html b/sca-java-2.x/trunk/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html deleted file mode 100644 index 1ff281373a..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html +++ /dev/null @@ -1,27 +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. ---> -<html> -<head> -<title>Store</TITLE> -</head> - -<body> -<h1>Sample Store Page</h1> -</body> -</html> diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/export-wsdl/pom.xml b/sca-java-2.x/trunk/itest/contribution-import-export/export-wsdl/pom.xml deleted file mode 100644 index 7c504aee50..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-import-export/export-wsdl/pom.xml +++ /dev/null @@ -1,31 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>1.6-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-contribution-export-wsdl</artifactId> - <name>Apache Tuscany SCA iTest Contribution WSDL Export</name> - -</project> diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 8254b667f2..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +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. ---> -<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://helloworld" - xmlns:helloworld="http://helloworld"> - <export namespace="http://helloworld"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl b/sca-java-2.x/trunk/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl deleted file mode 100644 index 0172fb2c7c..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl +++ /dev/null @@ -1,76 +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. ---> - -<wsdl:definitions targetNamespace="http://helloworld" - xmlns:tns="http://helloworld" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - name="helloworld"> - - <wsdl:types> - <schema xmlns="http://www.w3.org/2001/XMLSchema" - xmlns:tns2="http://helloworld2" - targetNamespace="http://helloworld" - elementFormDefault="qualified"> - - <xsd:import namespace="http://helloworld2" schemaLocation="helloworld.xsd" /> - - <element name="getGreetings" type="tns2:getGreetingsType"/> - <element name="getGreetingsResponse" type="tns2:getGreetingsResponseType"/> - - </schema> - </wsdl:types> - - <wsdl:message name="getGreetingsRequest"> - <wsdl:part element="tns:getGreetings" name="parameters"/> - </wsdl:message> - - <wsdl:message name="getGreetingsResponse"> - <wsdl:part element="tns:getGreetingsResponse" name="parameters"/> - </wsdl:message> - - <wsdl:portType name="HelloWorld"> - <wsdl:operation name="getGreetings"> - <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/> - <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/> - </wsdl:operation> - </wsdl:portType> - - <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld"> - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="getGreetings"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="getGreetingsRequest"> - <wsdlsoap:body use="literal"/> - </wsdl:input> - <wsdl:output name="getGreetingsResponse"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - - <wsdl:service name="HelloWorldService"> - <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort"> - <wsdlsoap:address location="http://localhost:8085/HelloWorldServiceComponent"/> - </wsdl:port> - </wsdl:service> - -</wsdl:definitions> diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd b/sca-java-2.x/trunk/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd deleted file mode 100644 index d49e2ead99..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd +++ /dev/null @@ -1,35 +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. ---> -<schema targetNamespace="http://helloworld2" - xmlns="http://www.w3.org/2001/XMLSchema" - xmlns:ns="http://helloworld2"> - - <complexType name="getGreetingsType"> - <sequence> - <element name="name" type="string"/> - </sequence> - </complexType> - - <complexType name="getGreetingsResponseType"> - <sequence> - <element name="getGreetingsReturn" type="string"/> - </sequence> - </complexType> -</schema>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/pom.xml b/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/pom.xml deleted file mode 100644 index 7fdc6b68e4..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/pom.xml +++ /dev/null @@ -1,73 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>1.6-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-contribution-import-composite</artifactId> - <name>Apache Tuscany SCA iTest Contribution Import</name> - -<dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-contribution-export-composite</artifactId> - <version>1.6-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> - <version>1.6-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>1.6-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> - <version>1.6-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-tomcat</artifactId> - <version>1.6-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.1</version> - <scope>test</scope> - </dependency> - - </dependencies> -</project> diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java deleted file mode 100644 index c062afaed0..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java +++ /dev/null @@ -1,38 +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 helloworld; - -import hello.Hello; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -/** - * This class implements the HelloWorld service. - */ -@Service(HelloWorldService.class) -public class HelloWorldImpl implements HelloWorldService { - @Reference - protected Hello helloServiceRef; - - public String getGreetings(String name) { - return helloServiceRef.getGreetings(name); - } - -} diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java b/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java deleted file mode 100644 index e03ed4dc25..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java +++ /dev/null @@ -1,46 +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 helloworld; - -import java.io.IOException; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -/** - * This server program shows how to create an SCA runtime, and start it which - * activates the helloworld Web service endpoint. - */ -public class HelloWorldServer { - - public static void main(String[] args) { - - SCADomain scaDomain = SCADomain.newInstance("helloworldws.composite"); - - try { - System.out.println("HelloWorld server started (press enter to shutdown)"); - System.in.read(); - } catch (IOException e) { - e.printStackTrace(); - } - - scaDomain.close(); - System.out.println("HelloWorld server stopped"); - } - -} diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java deleted file mode 100644 index 268d90e910..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java +++ /dev/null @@ -1,30 +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 helloworld; - -import org.osoa.sca.annotations.Remotable; - -/** - * This is the business interface of the HelloWorld greetings service. - */ -@Remotable -public interface HelloWorldService { - - public String getGreetings(String name); -} diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 130aa91093..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,27 +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. ---> -<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://helloworld" - xmlns:helloworld="http://helloworld" - xmlns:hello="http://hello"> - <deployable composite="helloworld:helloworldws"/> - <import namespace="http://hello"/> - <!-- import namespace="http://hello" location="http://import-export/contrib-composite"/ --> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl b/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl deleted file mode 100644 index 0172fb2c7c..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl +++ /dev/null @@ -1,76 +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. ---> - -<wsdl:definitions targetNamespace="http://helloworld" - xmlns:tns="http://helloworld" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - name="helloworld"> - - <wsdl:types> - <schema xmlns="http://www.w3.org/2001/XMLSchema" - xmlns:tns2="http://helloworld2" - targetNamespace="http://helloworld" - elementFormDefault="qualified"> - - <xsd:import namespace="http://helloworld2" schemaLocation="helloworld.xsd" /> - - <element name="getGreetings" type="tns2:getGreetingsType"/> - <element name="getGreetingsResponse" type="tns2:getGreetingsResponseType"/> - - </schema> - </wsdl:types> - - <wsdl:message name="getGreetingsRequest"> - <wsdl:part element="tns:getGreetings" name="parameters"/> - </wsdl:message> - - <wsdl:message name="getGreetingsResponse"> - <wsdl:part element="tns:getGreetingsResponse" name="parameters"/> - </wsdl:message> - - <wsdl:portType name="HelloWorld"> - <wsdl:operation name="getGreetings"> - <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/> - <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/> - </wsdl:operation> - </wsdl:portType> - - <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld"> - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="getGreetings"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="getGreetingsRequest"> - <wsdlsoap:body use="literal"/> - </wsdl:input> - <wsdl:output name="getGreetingsResponse"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - - <wsdl:service name="HelloWorldService"> - <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort"> - <wsdlsoap:address location="http://localhost:8085/HelloWorldServiceComponent"/> - </wsdl:port> - </wsdl:service> - -</wsdl:definitions> diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd b/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd deleted file mode 100644 index d49e2ead99..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd +++ /dev/null @@ -1,35 +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. ---> -<schema targetNamespace="http://helloworld2" - xmlns="http://www.w3.org/2001/XMLSchema" - xmlns:ns="http://helloworld2"> - - <complexType name="getGreetingsType"> - <sequence> - <element name="name" type="string"/> - </sequence> - </complexType> - - <complexType name="getGreetingsResponseType"> - <sequence> - <element name="getGreetingsReturn" type="string"/> - </sequence> - </complexType> -</schema>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite b/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite deleted file mode 100644 index 44ceba1240..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite +++ /dev/null @@ -1,39 +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://helloworld" - xmlns:helloworld="http://helloworld" - xmlns:hello="http://hello" - name="helloworldws"> - - <component name="SourceHelloServiceComponent"> - <implementation.composite name="hello:hello"/> - </component> - - <component name="HelloWorldServiceComponent"> - <service name="HelloWorldService"> - <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" /> - <binding.ws uri="http://localhost:8085/HelloWorldService"/> - </service> - <implementation.java class="helloworld.HelloWorldImpl" /> - <reference name="helloServiceRef" target="SourceHelloServiceComponent/HelloService"/> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java b/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java deleted file mode 100644 index 3cc6784eca..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java +++ /dev/null @@ -1,126 +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.test.contribution; - -import hello.Hello; -import helloworld.HelloWorldService; - -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.Socket; -import java.net.URL; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.service.ContributionService; -import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; - -/** - * Tests that the helloworld server is available - */ -public class HelloWorldServerTestCase extends TestCase { - private ClassLoader cl; - private EmbeddedSCADomain domain; - private Contribution helloWorldContribution; - private Contribution compositeContribution; - - @Override - protected void setUp() throws Exception { - //Create a test embedded SCA domain - cl = getClass().getClassLoader(); - domain = new EmbeddedSCADomain(cl, "http://localhost"); - - //Start the domain - domain.start(); - - // Contribute the SCA contribution - ContributionService contributionService = domain.getContributionService(); - - // File compositeContribLocation = new File("../export-composite/target/classes"); - // URL compositeContribURL = compositeContribLocation.toURL(); - URL compositeContribURL = getContributionURL(Hello.class); - compositeContribution = - contributionService.contribute("http://import-export/export-composite", compositeContribURL, false); - for (Composite deployable : compositeContribution.getDeployables()) { - domain.getDomainComposite().getIncludes().add(deployable); - domain.buildComposite(deployable); - } - -// File helloWorldContribLocation = new File("./target/classes/"); -// URL helloWorldContribURL = helloWorldContribLocation.toURL(); - URL helloWorldContribURL = getContributionURL(HelloWorldService.class); - helloWorldContribution = - contributionService.contribute("http://import-export/helloworld", helloWorldContribURL, false); - for (Composite deployable : helloWorldContribution.getDeployables()) { - domain.getDomainComposite().getIncludes().add(deployable); - domain.buildComposite(deployable); - } - - // Start Components from my composite - for (Composite deployable : helloWorldContribution.getDeployables()) { - domain.getCompositeActivator().activate(deployable); - domain.getCompositeActivator().start(deployable); - } - } - - private URL getContributionURL(Class<?> cls) throws MalformedURLException { - String flag = "/" + cls.getName().replace('.', '/') + ".class"; - URL url = cls.getResource(flag); - String root = url.toExternalForm(); - root = root.substring(0, root.length() - flag.length() + 1); - if (root.startsWith("jar:") && root.endsWith("!/")) { - root = root.substring(4, root.length() - 2); - } - url = new URL(root); - return url; - } - - public void testPing() throws IOException { - new Socket("127.0.0.1", 8085); - } - - public void testServiceCall() throws IOException { - HelloWorldService helloWorldService = - domain.getService(HelloWorldService.class, "HelloWorldServiceComponent/HelloWorldService"); - assertNotNull(helloWorldService); - - assertEquals("Hello Smith", helloWorldService.getGreetings("Smith")); - } - - @Override - public void tearDown() throws Exception { - ContributionService contributionService = domain.getContributionService(); - - // Remove the contribution from the in-memory repository - contributionService.remove("http://import-export/helloworld"); - contributionService.remove("http://import-export/export-composite"); - - //Stop Components from my composite - for (Composite deployable : helloWorldContribution.getDeployables()) { - domain.getCompositeActivator().stop(deployable); - domain.getCompositeActivator().deactivate(deployable); - } - - domain.stop(); - domain.close(); - } - -} diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/import-java/pom.xml b/sca-java-2.x/trunk/itest/contribution-import-export/import-java/pom.xml deleted file mode 100644 index a0fac8b806..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-import-export/import-java/pom.xml +++ /dev/null @@ -1,73 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>1.6-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-contribution-import-java</artifactId> - <name>Apache Tuscany SCA iTest Contribution Java Import</name> - -<dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-contribution-export-java</artifactId> - <version>1.6-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> - <version>1.6-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>1.6-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> - <version>1.6-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-tomcat</artifactId> - <version>1.6-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.1</version> - <scope>test</scope> - </dependency> - - </dependencies> -</project> diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/trunk/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java deleted file mode 100644 index 0de3c70303..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java +++ /dev/null @@ -1,33 +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 helloworld; - -import org.osoa.sca.annotations.Service; - -/** - * This class implements the HelloWorld service. - */ -@Service(HelloWorldService.class) -public class HelloWorldImpl implements HelloWorldService { - - public String getGreetings(String name) { - return "Hello " + name; - } - -} diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 224e2c4d79..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,25 +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.
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://helloworld"
- xmlns:helloworld="http://helloworld">
- <deployable composite="helloworld:helloworldws"/>
- <import.java package="helloworld"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite b/sca-java-2.x/trunk/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite deleted file mode 100644 index a53117e72f..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite +++ /dev/null @@ -1,29 +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://helloworld" - xmlns:helloworld="http://helloworld" - name="helloworldws"> - - <component name="HelloWorldServiceComponent"> - <implementation.java class="helloworld.HelloWorldImpl" /> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java b/sca-java-2.x/trunk/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java deleted file mode 100644 index 9bc94525e0..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java +++ /dev/null @@ -1,127 +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.test.contribution; - -import helloworld.HelloWorldImpl; -import helloworld.HelloWorldService; - -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.service.ContributionService; -import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; - -/** - * Tests that the helloworld server is available - */ -public class HelloWorldServerTestCase extends TestCase { - private ClassLoader cl; - private EmbeddedSCADomain domain; - private Contribution helloWorldContribution; - private Contribution javaContribution; - - @Override - protected void setUp() throws Exception { - //Create a test embedded SCA domain - cl = getClass().getClassLoader(); - domain = new EmbeddedSCADomain(cl, "http://localhost"); - - //Start the domain - domain.start(); - - // Contribute the SCA contribution - ContributionService contributionService = domain.getContributionService(); - - //File javaContribLocation = new File("../export-java/target/classes"); - //URL javaContribURL = javaContribLocation.toURL(); - URL javaContribURL = getContributionURL(HelloWorldService.class); - javaContribution = contributionService.contribute("http://import-export/export-java", javaContribURL, false); - for (Composite deployable : javaContribution.getDeployables()) { - domain.getDomainComposite().getIncludes().add(deployable); - domain.buildComposite(deployable); - } - - //File helloWorldContribLocation = new File("./target/classes/"); - //URL helloWorldContribURL = helloWorldContribLocation.toURL(); - URL helloWorldContribURL = getContributionURL(HelloWorldImpl.class); - helloWorldContribution = contributionService.contribute("http://import-export/helloworld", helloWorldContribURL, false); - for (Composite deployable : helloWorldContribution.getDeployables()) { - domain.getDomainComposite().getIncludes().add(deployable); - domain.buildComposite(deployable); - } - - // Start Components from my composite - for (Composite deployable : helloWorldContribution.getDeployables()) { - domain.getCompositeActivator().activate(deployable); - domain.getCompositeActivator().start(deployable); - } - } - - private URL getContributionURL(Class<?> cls) throws MalformedURLException { - String flag = "/" + cls.getName().replace('.', '/') + ".class"; - URL url = cls.getResource(flag); - String root = url.toExternalForm(); - root = root.substring(0, root.length() - flag.length() + 1); - if (root.startsWith("jar:") && root.endsWith("!/")) { - root = root.substring(4, root.length() - 2); - } - url = new URL(root); - return url; - } - - public void testPing() throws IOException { - HelloWorldService helloWorldService = - domain.getService(HelloWorldService.class, "HelloWorldServiceComponent/HelloWorldService"); - assertNotNull(helloWorldService); - assertEquals("Hello test", helloWorldService.getGreetings("test")); - } - - public void testServiceCall() throws IOException { - HelloWorldService helloWorldService = - domain.getService(HelloWorldService.class, "HelloWorldServiceComponent/HelloWorldService"); - assertNotNull(helloWorldService); - - assertEquals("Hello Smith", helloWorldService.getGreetings("Smith")); - } - - @Override - public void tearDown() throws Exception { - ContributionService contributionService = domain.getContributionService(); - - // Remove the contribution from the in-memory repository - contributionService.remove("http://import-export/helloworld"); - contributionService.remove("http://import-export/export-java"); - - // Stop Components from my composite - for (Composite deployable : helloWorldContribution.getDeployables()) { - domain.getCompositeActivator().stop(deployable); - domain.getCompositeActivator().deactivate(deployable); - } - - domain.stop(); - - domain.close(); - } - -} diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/import-resource/pom.xml b/sca-java-2.x/trunk/itest/contribution-import-export/import-resource/pom.xml deleted file mode 100644 index 2cf8245ccb..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-import-export/import-resource/pom.xml +++ /dev/null @@ -1,102 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>1.6-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-contribution-import-resource</artifactId> - <name>Apache Tuscany SCA iTest Contribution Resource Import</name> - -<dependencies> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-contribution-export-resource</artifactId> - <version>1.6-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> - <version>1.6-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>1.6-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-http</artifactId> - <version>1.6-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-http-runtime</artifactId> - <version>1.6-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-resource-runtime</artifactId> - <version>1.6-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-contribution-resource</artifactId> - <version>1.6-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-tomcat</artifactId> - <version>1.6-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.1</version> - <scope>test</scope> - </dependency> - - </dependencies> -</project> diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index ac6d7becb3..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,25 +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. ---> -<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://store" - xmlns:store="http://store"> - <deployable composite="store:store"/> - <import.resource uri="ufservices/store.html"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/import-resource/src/main/resources/store.composite b/sca-java-2.x/trunk/itest/contribution-import-export/import-resource/src/main/resources/store.composite deleted file mode 100644 index bb5a7b764f..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-import-export/import-resource/src/main/resources/store.composite +++ /dev/null @@ -1,33 +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" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0" - targetNamespace="http://store" - xmlns:helloworld="http://store" - name="store"> - - <component name="store"> - <tuscany:implementation.resource location="ufservices/store.html"/> - <service name="Resource"> - <tuscany:binding.http uri="http://127.0.0.1:8085"/> - </service> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java b/sca-java-2.x/trunk/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java deleted file mode 100644 index 1b7542b7d9..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java +++ /dev/null @@ -1,129 +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.test.contribution; - -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.Socket; -import java.net.URL; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.service.ContributionService; -import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; - -/** - * Tests that the helloworld server is available - */ -public class StoreTestCase extends TestCase { - private ClassLoader cl; - private EmbeddedSCADomain domain; - private Contribution storeContribution; - private Contribution resourceContribution; - - @Override - protected void setUp() throws Exception { - //Create a test embedded SCA domain - cl = getClass().getClassLoader(); - domain = new EmbeddedSCADomain(cl, "http://localhost"); - - //Start the domain - domain.start(); - - // Contribute the SCA contribution - ContributionService contributionService = domain.getContributionService(); - - URL javaContribURL = getContributionURL(cl, "ufservices/store.html"); - resourceContribution = contributionService.contribute("http://import-export/export-resource", javaContribURL, false); - for (Composite deployable : resourceContribution.getDeployables()) { - domain.getDomainComposite().getIncludes().add(deployable); - domain.buildComposite(deployable); - } - - URL storeContributionURL = getContributionURL(cl, "store.composite"); - - storeContribution = - contributionService.contribute("http://import-export/store", storeContributionURL, false); - for (Composite deployable : storeContribution.getDeployables()) { - domain.getDomainComposite().getIncludes().add(deployable); - domain.buildComposite(deployable); - } - - // Start Components from my composite - for (Composite deployable : storeContribution.getDeployables()) { - domain.getCompositeActivator().activate(deployable); - domain.getCompositeActivator().start(deployable); - } - } - - public void testPing() throws IOException { - new Socket("127.0.0.1", 8085); - } - - - @Override - public void tearDown() throws Exception { - ContributionService contributionService = domain.getContributionService(); - - // Remove the contribution from the in-memory repository - contributionService.remove("http://import-export/store"); - contributionService.remove("http://import-export/export-resource"); - - // Stop Components from my composite - for (Composite deployable : storeContribution.getDeployables()) { - domain.getCompositeActivator().stop(deployable); - domain.getCompositeActivator().deactivate(deployable); - } - - domain.stop(); - - domain.close(); - } - - - /** - * Utility methods - */ - - - private URL getContributionURL(ClassLoader cl, Class<?> cls) throws MalformedURLException { - String flag = "/" + cls.getName().replace('.', '/') + ".class"; - URL url = cl.getResource(flag); - String root = url.toExternalForm(); - root = root.substring(0, root.length() - flag.length() + 1); - if (root.startsWith("jar:") && root.endsWith("!/")) { - root = root.substring(4, root.length() - 2); - } - url = new URL(root); - return url; - } - - private URL getContributionURL(ClassLoader cl, String uri) throws MalformedURLException { - URL url = cl.getResource(uri); - String root = url.toExternalForm(); - root = root.substring(0, root.length() - uri.length()); - if (root.startsWith("jar:") && root.endsWith("!/")) { - root = root.substring(4, root.length() - 2); - } - url = new URL(root); - return url; - } -} diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/pom.xml b/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/pom.xml deleted file mode 100644 index a0d1b7d215..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/pom.xml +++ /dev/null @@ -1,73 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>1.6-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-contribution-import-wsdl</artifactId> - <name>Apache Tuscany SCA iTest Contribution WSDL Import</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-contribution-export-wsdl</artifactId> - <version>1.6-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> - <version>1.6-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>1.6-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> - <version>1.6-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-tomcat</artifactId> - <version>1.6-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.1</version> - <scope>test</scope> - </dependency> - - </dependencies> -</project> diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java deleted file mode 100644 index 0de3c70303..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java +++ /dev/null @@ -1,33 +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 helloworld; - -import org.osoa.sca.annotations.Service; - -/** - * This class implements the HelloWorld service. - */ -@Service(HelloWorldService.class) -public class HelloWorldImpl implements HelloWorldService { - - public String getGreetings(String name) { - return "Hello " + name; - } - -} diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java b/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java deleted file mode 100644 index e03ed4dc25..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java +++ /dev/null @@ -1,46 +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 helloworld; - -import java.io.IOException; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -/** - * This server program shows how to create an SCA runtime, and start it which - * activates the helloworld Web service endpoint. - */ -public class HelloWorldServer { - - public static void main(String[] args) { - - SCADomain scaDomain = SCADomain.newInstance("helloworldws.composite"); - - try { - System.out.println("HelloWorld server started (press enter to shutdown)"); - System.in.read(); - } catch (IOException e) { - e.printStackTrace(); - } - - scaDomain.close(); - System.out.println("HelloWorld server stopped"); - } - -} diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java deleted file mode 100644 index 268d90e910..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java +++ /dev/null @@ -1,30 +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 helloworld; - -import org.osoa.sca.annotations.Remotable; - -/** - * This is the business interface of the HelloWorld greetings service. - */ -@Remotable -public interface HelloWorldService { - - public String getGreetings(String name); -} diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index a47b9a71e9..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,25 +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. ---> -<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://helloworld" - xmlns:helloworld="http://helloworld"> - <deployable composite="helloworld:helloworldws"/> - <import namespace="http://helloworld" location="http://import-export/export-wsdl"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite b/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite deleted file mode 100644 index 76ccf71fb8..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite +++ /dev/null @@ -1,33 +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://helloworld" - xmlns:hw="http://helloworld" - name="helloworldws"> - - <component name="HelloWorldServiceComponent"> - <service name="HelloWorldService"> - <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" /> - <binding.ws uri="http://localhost:8085/HelloWorldService"/> - </service> - <implementation.java class="helloworld.HelloWorldImpl" /> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java b/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java deleted file mode 100644 index 66227eacaa..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java +++ /dev/null @@ -1,137 +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.test.contribution; - -import helloworld.HelloWorldService; - -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.Socket; -import java.net.URL; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.service.ContributionService; -import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain; - -/** - * Tests that the helloworld server is available - */ -public class HelloWorldServerTestCase extends TestCase { - private ClassLoader cl; - private EmbeddedSCADomain domain; - private Contribution wsdlContribution; - private Contribution consumerContribution; - - @Override - protected void setUp() throws Exception { - // Create a test embedded SCA domain - cl = getClass().getClassLoader(); - domain = new EmbeddedSCADomain(cl, "http://localhost"); - - //Start the domain - domain.start(); - - // Contribute the SCA contribution - ContributionService contributionService = domain.getContributionService(); - - // File wsdlContribLocation = new File("../export-wsdl/target/classes"); - // URL wsdlContribURL = wsdlContribLocation.toURL(); - URL wsdlContribURL = getContributionURL(getClass().getClassLoader(), "helloworld.wsdl"); - wsdlContribution = contributionService.contribute("http://import-export/export-wsdl", wsdlContribURL, false); - for (Composite deployable : wsdlContribution.getDeployables()) { - domain.getDomainComposite().getIncludes().add(deployable); - domain.buildComposite(deployable); - } - - // File helloWorldContribLocation = new File("./target/classes/"); - // URL helloWorldContribURL = helloWorldContribLocation.toURL(); - URL helloWorldContribURL = getContributionURL(HelloWorldService.class); - consumerContribution = - contributionService.contribute("http://import-export/helloworld", helloWorldContribURL, false); - for (Composite deployable : consumerContribution.getDeployables()) { - domain.getDomainComposite().getIncludes().add(deployable); - domain.buildComposite(deployable); - } - - // Start Components from my composite - for (Composite deployable : consumerContribution.getDeployables()) { - domain.getCompositeActivator().activate(deployable); - domain.getCompositeActivator().start(deployable); - } - } - - public void testPing() throws IOException { - new Socket("127.0.0.1", 8085); - } - - private URL getContributionURL(Class<?> cls) throws MalformedURLException { - String flag = "/" + cls.getName().replace('.', '/') + ".class"; - URL url = cls.getResource(flag); - String root = url.toExternalForm(); - root = root.substring(0, root.length() - flag.length() + 1); - if (root.startsWith("jar:") && root.endsWith("!/")) { - root = root.substring(4, root.length() - 2); - } - url = new URL(root); - return url; - } - - private URL getContributionURL(ClassLoader cl, String flag) throws MalformedURLException { - URL url = cl.getResource(flag); - String root = url.toExternalForm(); - root = root.substring(0, root.length() - flag.length()); - if (root.startsWith("jar:") && root.endsWith("!/")) { - root = root.substring(4, root.length() - 2); - } - url = new URL(root); - // System.out.println(url); - return url; - } - - public void testServiceCall() throws IOException { - HelloWorldService helloWorldService = - domain.getService(HelloWorldService.class, "HelloWorldServiceComponent/HelloWorldService"); - assertNotNull(helloWorldService); - - assertEquals("Hello Smith", helloWorldService.getGreetings("Smith")); - } - - @Override - public void tearDown() throws Exception { - ContributionService contributionService = domain.getContributionService(); - - // Remove the contribution from the in-memory repository - contributionService.remove("http://import-export/helloworld"); - contributionService.remove("http://import-export/export-wsdl"); - - // Stop Components from my composite - for (Composite deployable : consumerContribution.getDeployables()) { - domain.getCompositeActivator().stop(deployable); - domain.getCompositeActivator().deactivate(deployable); - } - - domain.stop(); - - domain.close(); - } - -} diff --git a/sca-java-2.x/trunk/itest/contribution-import-export/pom.xml b/sca-java-2.x/trunk/itest/contribution-import-export/pom.xml deleted file mode 100644 index e64ff002e1..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-import-export/pom.xml +++ /dev/null @@ -1,56 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>1.6-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-contribution-import-export</artifactId> - <packaging>pom</packaging> - <name>Apache Tuscany SCA Contribution Import/Export Integration Tests</name> - - <modules> - <module>export-composite</module> - <module>export-java</module> - <module>export-resource</module> - <module>export-wsdl</module> - <module>import-composite</module> - <module>import-java</module> - <module>import-resource</module> - <module>import-wsdl</module> - </modules> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> - <version>1.6-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-contribution-impl</artifactId> - <version>1.6-SNAPSHOT</version> - </dependency> - </dependencies> -</project> diff --git a/sca-java-2.x/trunk/itest/contribution-zip/pom.xml b/sca-java-2.x/trunk/itest/contribution-zip/pom.xml deleted file mode 100644 index ecffbc155a..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-zip/pom.xml +++ /dev/null @@ -1,45 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-contribution-zip</artifactId> - <name>Apache Tuscany SCA iTest Contribution ZIP</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - </dependencies> -</project> diff --git a/sca-java-2.x/trunk/itest/contribution-zip/src/test/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/itest/contribution-zip/src/test/java/calculator/CalculatorService.java deleted file mode 100644 index b4c677b371..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-zip/src/test/java/calculator/CalculatorService.java +++ /dev/null @@ -1,31 +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 calculator; - -public interface CalculatorService { - double add(double n1, double n2); - - double subtract(double n1, double n2); - - double multiply(double n1, double n2); - - double divide(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/itest/contribution-zip/src/test/java/org/apache/tuscany/sca/contribution/zip/ContributionZIPTestCase.java b/sca-java-2.x/trunk/itest/contribution-zip/src/test/java/org/apache/tuscany/sca/contribution/zip/ContributionZIPTestCase.java deleted file mode 100644 index 303e2a6d9a..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-zip/src/test/java/org/apache/tuscany/sca/contribution/zip/ContributionZIPTestCase.java +++ /dev/null @@ -1,56 +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.contribution.zip; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; - -import calculator.CalculatorService; - -/** - * Test SCADomain.newInstance and invocation of a service. - * - * @version $Rev$ $Date$ - */ -public class ContributionZIPTestCase extends TestCase { - - private Node node; - - @Override - protected void setUp() throws Exception { - node = - NodeFactory.newInstance().createNode(new Contribution("foo", - "src/test/resources/repository/contribution.zip")); - node.start(); - } - - public void testInvoke() throws Exception { - CalculatorService service = node.getService(CalculatorService.class, "CalculatorServiceComponent"); - assertEquals(3.0, service.add(1, 2)); - } - - @Override - protected void tearDown() throws Exception { - node.stop(); - } - -} diff --git a/sca-java-2.x/trunk/itest/contribution-zip/src/test/resources/repository/contribution.zip b/sca-java-2.x/trunk/itest/contribution-zip/src/test/resources/repository/contribution.zip Binary files differdeleted file mode 100644 index 25476c2206..0000000000 --- a/sca-java-2.x/trunk/itest/contribution-zip/src/test/resources/repository/contribution.zip +++ /dev/null diff --git a/sca-java-2.x/trunk/itest/corba/pom.xml b/sca-java-2.x/trunk/itest/corba/pom.xml deleted file mode 100644 index b6f8655924..0000000000 --- a/sca-java-2.x/trunk/itest/corba/pom.xml +++ /dev/null @@ -1,144 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-corba-binding</artifactId> - <name>Apache Tuscany SCA CORBA Binding Integration Tests</name> - <dependencies> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-corba-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-corba-jse</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-corba-jse-tns</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-sca-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-axiom</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-sdo</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.5</version> - <scope>compile</scope> - </dependency> - - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.0</version> - <executions> - <execution> - <id>add-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-test-source</goal> - </goals> - <configuration> - <sources> - <source>target/sdo-source</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.tuscany.sdo</groupId> - <artifactId>tuscany-sdo-plugin</artifactId> - <version>1.1.1</version> - <executions> - <execution> - <id>generate-scenariofour-sdo</id> - <phase>generate-sources</phase> - <configuration> - <schemaFile> - ${basedir}/src/test/resources/scenariofour.xsd - </schemaFile> - <javaPackage> - org.apache.tuscany.sca.test.corba.scenariofour - </javaPackage> - <prefix>ScenarioFour</prefix> - <noNotification>true</noNotification> - <noContainer>true</noContainer> - <noUnsettable>true</noUnsettable> - </configuration> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java deleted file mode 100644 index 6c362b0062..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFiveTestCase.java +++ /dev/null @@ -1,53 +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.test.corba; - -import static org.junit.Assert.fail; - -import org.apache.tuscany.sca.host.corba.jse.tns.TnsDefaultCorbaHost; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.apache.tuscany.sca.test.corba.types.ScenarioFive; -import org.apache.tuscany.sca.test.corba.types.ScenarioFiveComponent; -import org.junit.Test; - -/** - * @version $Rev$ $Date$ - * Tests usage of TNS JSE Corba host - */ -public class ScenarioFiveTestCase { - - @Test - public void test_providedNameServer() { - TestCorbaHost.setCorbaHost(new TnsDefaultCorbaHost()); - try { - // just make sure we can obtain and use the reference with success - Node node = NodeFactory.getInstance().createNode("ScenarioFive.composite", getClass().getClassLoader()).start(); - ScenarioFive scenarioFive = - node.getService(ScenarioFiveComponent.class, "ScenarioFive").getScenarioFive(); - scenarioFive.doNothing(); - node.stop(); - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java deleted file mode 100644 index da4644057e..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java +++ /dev/null @@ -1,153 +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.test.corba; - -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import junit.framework.Assert; - -import org.apache.tuscany.sca.host.corba.jse.DefaultCorbaHost; -import org.apache.tuscany.sca.host.corba.naming.TransientNameServer; -import org.apache.tuscany.sca.host.corba.naming.TransientNameService; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.apache.tuscany.sca.test.corba.scenariofour.ScenarioFourFactory; -import org.apache.tuscany.sca.test.corba.scenariofour.ScenarioFourSdo; -import org.apache.tuscany.sca.test.corba.types.ScenarioFour; -import org.apache.tuscany.sca.test.corba.types.ScenarioFourComponent; -import org.apache.tuscany.sca.test.corba.types.ScenarioFourException; -import org.apache.tuscany.sca.test.corba.types.ScenarioFourStruct; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * @version $Rev$ $Date$ - * Tests SCA default binding over CORBA binding - */ -public class ScenarioFourTestCase { - - // note that those values are also used in resources/*.composite file - private static Node node; - private static ScenarioFourComponent scenarioFourComponent; - private static ScenarioFour scenarioFour; - private static TransientNameServer server; - private static final int ORB_INITIAL_PORT = 5080; - - /** - * Initial configuration - */ - @BeforeClass - public static void setUp() { - System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding", "{http://tuscany.apache.org/xmlns/sca/1.1}binding.corba"); - TestCorbaHost.setCorbaHost(new DefaultCorbaHost()); - try { - server = new TransientNameServer("localhost", ORB_INITIAL_PORT, TransientNameService.DEFAULT_SERVICE_NAME); - Thread t = server.start(); - if (t == null) { - Assert.fail("The naming server cannot be started"); - } - // obtain node - node = NodeFactory.getInstance().createNode("ScenarioFour.composite", TestCorbaHost.class.getClassLoader()).start(); - scenarioFourComponent = node.getService(ScenarioFourComponent.class, "ScenarioFour"); - scenarioFour = scenarioFourComponent.getScenarioFour(); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Test cleanup - */ - @AfterClass - public static void tearDown() { - server.stop(); - node.stop(); - System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding"); - } - - /** - * General tests for passing JAXB objects - */ - @Test - public void test_generalJAXB() { - try { - ScenarioFourStruct input = new ScenarioFourStruct(); - input.field1 = "Test"; - input.field2 = 1; - input.field3 = new double[1]; - ScenarioFourStruct output = scenarioFour.setStruct(input); - assertTrue(input.equals(output)); - } catch (Exception e) { - e.printStackTrace(); - Assert.fail(e.getMessage()); - } - } - - /** - * Test for JAXB exceptions - */ - @Test - public void test_exceptionsJAXB() { - try { - scenarioFour.exceptionTest(); - fail(); - } catch (ScenarioFourException e) { - assertTrue(ScenarioFourException.DEFAULT_CONTENT.equals(e.getContent())); - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - } - - /** - * General test for passing SDO objects - */ - @Test - public void test_generalSDO() { - try { - ScenarioFourSdo scenarioFourSdo = ScenarioFourFactory.INSTANCE.createScenarioFourSdo(); - scenarioFourSdo.setMessage("Test1"); - scenarioFourSdo.setSymbol("Test2"); - ScenarioFourSdo result = scenarioFour.passScenarioFourStruct(scenarioFourSdo); - assertTrue(scenarioFourSdo.getMessage().equals(result.getMessage()) && scenarioFourSdo.getSymbol() - .equals(result.getSymbol())); - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - } - - /** - * Tests reusing local name server with multiple bindings - */ - @Test - public void test_nameServerReuse() { - try { - ScenarioFour scenarioFour = - node.getService(ScenarioFourComponent.class, "ScenarioFourReuse").getScenarioFour(); - ScenarioFourStruct struct = new ScenarioFourStruct(); - scenarioFour.setStruct(struct); - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - } -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java deleted file mode 100644 index 4b58fab1f0..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioOneTestCase.java +++ /dev/null @@ -1,373 +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.test.corba; - -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import junit.framework.Assert; - -import org.apache.tuscany.sca.host.corba.jse.DefaultCorbaHost; -import org.apache.tuscany.sca.host.corba.naming.TransientNameServer; -import org.apache.tuscany.sca.host.corba.naming.TransientNameService; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.apache.tuscany.sca.test.corba.generated.Color; -import org.apache.tuscany.sca.test.corba.generated.InnerStruct; -import org.apache.tuscany.sca.test.corba.generated.RichStruct; -import org.apache.tuscany.sca.test.corba.generated.ScenarioOne; -import org.apache.tuscany.sca.test.corba.generated.ScenarioOneHelper; -import org.apache.tuscany.sca.test.corba.generated.ScenarioOneOperations; -import org.apache.tuscany.sca.test.corba.generated.UnexpectedException; -import org.apache.tuscany.sca.test.corba.generated.WrongColor; -import org.apache.tuscany.sca.test.corba.types.ScenarioOneServant; -import org.apache.tuscany.sca.test.corba.types.TColor; -import org.apache.tuscany.sca.test.corba.types.TInnerStruct; -import org.apache.tuscany.sca.test.corba.types.TRichStruct; -import org.apache.tuscany.sca.test.corba.types.TScenarioOne; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.omg.CORBA.ORB; -import org.omg.CosNaming.NameComponent; -import org.omg.CosNaming.NamingContext; -import org.omg.CosNaming.NamingContextHelper; - -/** - * @version $Rev$ $Date$ - * This test class contains three main tests:<br> - * 1. Tuscany is being used as a consumer of some non-Tuscany CORBA service<br> - * 2. Tuscany is being used as a service provider, which will be consumed by - * non-Tuscany CORBA client<br> - * 3. Tuscany is being used as a service provider, which will be consumed by - * Tuscany client<br> - * But that's not all, there are some other variations. Tuscany CORBA binding - * supports using Java interface generated by IDLJ, also it supports interfaces - * provided by user - I combined those cases in each test.<br> - */ -public class ScenarioOneTestCase { - - // note that those values are also used in resources/*.composite file - private static int ORB_INITIAL_PORT = 5060; - private static String SERVICE_NAME = "ScenarioOne"; - - private static Node node; - - private static TransientNameServer server; - private static ORB orb; - - /** - * Sets up name service, creates and registers traditional CORBA service, - * obtains SCADomain - */ - @BeforeClass - public static void setUp() { - TestCorbaHost.setCorbaHost(new DefaultCorbaHost()); - try { - try { - server = - new TransientNameServer("localhost", ORB_INITIAL_PORT, TransientNameService.DEFAULT_SERVICE_NAME); - Thread t = server.start(); - if (t == null) { - Assert.fail("The naming server cannot be started"); - } - orb = server.getORB(); - } catch (Throwable e) { - e.printStackTrace(); - Assert.fail(e.getMessage()); - } - org.omg.CORBA.Object objRef = orb.resolve_initial_references("NameService"); - NamingContext ncRef = NamingContextHelper.narrow(objRef); - NameComponent nc = new NameComponent(SERVICE_NAME, ""); - NameComponent path[] = {nc}; - ScenarioOne scenarioOne = new ScenarioOneServant(); - ncRef.rebind(path, scenarioOne); - // obtain node - node = NodeFactory.getInstance().createNode("ScenarioOne.composite", TestCorbaHost.class.getClassLoader()).start(); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Kills previously spawned name service. - */ - @AfterClass - public static void tearDown() { - server.stop(); - node.stop(); - } - - /** - * Creates nicely filled structure for user provided interface. - * - * @return - */ - private static TRichStruct getTRichStruct() { - int[][] intArr = new int[][] { {1, 2}, {3, 4}}; - TInnerStruct innerStruct = new TInnerStruct(intArr, "Test", TColor.green); - String[] strSeq = {"i", "Test"}; - return new TRichStruct(innerStruct, strSeq, 1); - - } - - /** - * Creates nicely filled structure for generated interface. - * - * @return - */ - private static RichStruct getRichStruct() { - int[][] intArr = new int[][] { {1, 2}, {3, 4}}; - InnerStruct innerStruct2 = new InnerStruct(intArr, "Test", Color.green); - String[] strSeq = {"i", "Test"}; - return new RichStruct(innerStruct2, strSeq, 1); - } - - /** - * Compares String arrays - * - * @param arg1 - * @param arg2 - * @return - */ - private boolean areSrringArraysEqual(String[] arg1, String[] arg2) { - try { - for (int i = 0; i < arg1.length; i++) { - if (!arg1[i].equals(arg2[i])) { - return false; - } - } - } catch (Exception e) { - return false; - } - return true; - } - - /** - * Compares two dimensional int arrays - * - * @param arg1 - * @param arg2 - * @return - */ - private boolean areTwoDimIntArraysEqual(int[][] arg1, int[][] arg2) { - try { - for (int i = 0; i < arg1.length; i++) { - for (int j = 0; j < arg1[i].length; j++) { - if (arg1[i][j] != arg2[i][j]) { - return false; - } - } - } - } catch (Exception e) { - return false; - } - return true; - } - - private boolean equalTo(TInnerStruct arg1, TInnerStruct arg2) { - return (arg1.color.value() == arg2.color.value() && arg1.stringField.equals(arg2.stringField) && areTwoDimIntArraysEqual(arg1.twoDimLongSequence, - arg2.twoDimLongSequence)); - } - - private boolean equalTo(InnerStruct arg1, InnerStruct arg2) { - return (arg1.color.value() == arg2.color.value() && arg1.stringField.equals(arg2.stringField) && areTwoDimIntArraysEqual(arg1.twoDimLongSequence, - arg2.twoDimLongSequence)); - } - - private boolean equalTo(TRichStruct arg1, TRichStruct arg2) { - return (equalTo(arg1.innerStruct, arg2.innerStruct) && arg2.longField == arg1.longField && areSrringArraysEqual(arg1.stringSequence, - arg2.stringSequence)); - } - - private boolean equalTo(RichStruct arg1, RichStruct arg2) { - return (equalTo(arg1.innerStruct, arg2.innerStruct) && arg2.longField == arg1.longField && areSrringArraysEqual(arg1.stringSequence, - arg2.stringSequence)); - } - - /** - * Helper method used several times for various components. Executes several - * tests using Tuscany reference binding. This helper uses generated Java - * interface. - * - * @param componentName - */ - private void testClientUsingGeneratedInterface(String componentName) { - ScenarioOneOperations component = node.getService(ScenarioOneOperations.class, componentName); - RichStruct richStruct = getRichStruct(); - - try { - RichStruct result = component.setRichStruct(richStruct); - assertTrue(equalTo(result, richStruct)); - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - - try { - richStruct.longField = 0; - component.setRichStruct(richStruct); - fail(); - } catch (Exception e) { - assertTrue(e instanceof UnexpectedException); - } - - try { - richStruct.longField = 1; - richStruct.innerStruct.color = Color.red; - component.setRichStruct(richStruct); - } catch (Exception e) { - assertTrue(e instanceof WrongColor); - } - } - - /** - * Helper method used several times for various components. Executes several - * tests using Tuscany reference binding. This helper uses user provided - * Java interface. - * - * @param componentName - */ - private void testClientUsingUserProvidedInterface(String componentName) { - TScenarioOne component = node.getService(TScenarioOne.class, componentName); - TRichStruct tRichStruct = getTRichStruct(); - - try { - TRichStruct result = component.setRichStruct(tRichStruct); - assertTrue(equalTo(result, tRichStruct)); - } catch (Exception e) { - fail(); - } - - try { - tRichStruct.longField = 0; - component.setRichStruct(tRichStruct); - fail(); - } catch (Exception e) { - assertTrue(e instanceof UnexpectedException); - } - - try { - tRichStruct.longField = 1; - tRichStruct.innerStruct.color = TColor.red; - component.setRichStruct(tRichStruct); - } catch (Exception e) { - assertTrue(e instanceof WrongColor); - } - } - - public void testServiceUsingGeneratedClient(String serviceName) { - try { - org.omg.CORBA.Object objRef = orb.resolve_initial_references("NameService"); - NamingContext ncRef = NamingContextHelper.narrow(objRef); - NameComponent nc = new NameComponent(serviceName, ""); - NameComponent path[] = {nc}; - ScenarioOne so = ScenarioOneHelper.narrow(ncRef.resolve(path)); - - RichStruct richStruct = getRichStruct(); - RichStruct result = so.setRichStruct(richStruct); - assertTrue(equalTo(result, richStruct)); - - try { - richStruct.innerStruct.color = Color.red; - result = so.setRichStruct(richStruct); - fail(); - } catch (Exception e) { - assertTrue(e instanceof WrongColor); - } - - try { - richStruct.innerStruct.color = Color.green; - richStruct.longField = 0; - result = so.setRichStruct(richStruct); - fail(); - } catch (Exception e) { - assertTrue(e instanceof UnexpectedException); - } - - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - } - - /** - * Service is exposed in traditional way (using CORBA API from JDK). - * Reference is obtained from Tuscany. - */ - @Test - public void test_TraditionalService_TuscanyClient() { - - // Client is using user provided interface - testClientUsingUserProvidedInterface("ScenarioOne"); - - // Client is using generated interface - testClientUsingGeneratedInterface("ScenarioOneGenerated"); - } - - /** - * Service is exposed by Tuscany. Reference is obtained in traditional way. - * (using CORBA API from JDK) - * - * @throws Exception - */ - @Test - public void test_TuscanyService_TraditionalClient() throws Exception { - - // tests service which uses user provided interface - testServiceUsingGeneratedClient("ScenarioOneTuscany"); - - // tests service which uses generated interface - testServiceUsingGeneratedClient("ScenarioOneTuscanyGenerated"); - } - - /** - * Service is exposed by Tuscany. Reference is obtained from Tuscany. There - * are 4 combinations (basing on if we are using generated or user provided - * interfaces, both on service and reference side). - */ - @Test - public void test_TuscanyService_TuscanyClient() { - - // Client is using user provided interface, service is using user - // provided interface. - testClientUsingUserProvidedInterface("TU2TS1"); - - // Client is using user provided interface, service is using generated - // interface. - testClientUsingUserProvidedInterface("TU2TS2"); - - // Client is using generated interface, service is using user provided - // interface. - testClientUsingGeneratedInterface("TG2TS1"); - - // Client is using generated interface, service is using generated - // interface. - testClientUsingGeneratedInterface("TG2TS2"); - } - - /** - * Tests using reference obtained by corbaname URI - */ - @Test - public void test_serviceAndReferenceByURI() { - testClientUsingUserProvidedInterface("UriBinding"); - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java deleted file mode 100644 index 3d3efb9c29..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioSixTestCase.java +++ /dev/null @@ -1,230 +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.test.corba; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import junit.framework.Assert; - -import org.apache.tuscany.sca.host.corba.jse.DefaultCorbaHost; -import org.apache.tuscany.sca.host.corba.naming.TransientNameServer; -import org.apache.tuscany.sca.host.corba.naming.TransientNameService; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct; -import org.apache.tuscany.sca.test.corba.generated.InnerUnion; -import org.apache.tuscany.sca.test.corba.generated.RichUnion; -import org.apache.tuscany.sca.test.corba.generated.ScenarioSix; -import org.apache.tuscany.sca.test.corba.generated.ScenarioSixHelper; -import org.apache.tuscany.sca.test.corba.types.ScenarioSixServant; -import org.apache.tuscany.sca.test.corba.types.TAnnotatedStruct; -import org.apache.tuscany.sca.test.corba.types.TInnerUnion; -import org.apache.tuscany.sca.test.corba.types.TRichUnion; -import org.apache.tuscany.sca.test.corba.types.TScenarioSix; -import org.apache.tuscany.sca.test.corba.types.TScenarioSixComponent; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.omg.CORBA.ORB; -import org.omg.CosNaming.NameComponent; -import org.omg.CosNaming.NamingContext; -import org.omg.CosNaming.NamingContextHelper; - -/** - * Tests using enhanced Java interfaces (annotations) - * - * @version $Rev$ $Date$ - */ -public class ScenarioSixTestCase { - - // note that those values are also used in resources/*.composite file - private static int ORB_INITIAL_PORT = 5050; - private static String SERVICE_NAME = "ScenarioSix"; - private static String TUSCANY_SERVICE_NAME = "ScenarioSixTuscany"; - - private static Node node; - - private static TransientNameServer server; - private static ORB orb; - - /** - * Sets up name service, creates and registers traditional CORBA service, - * obtains SCADomain - */ - @BeforeClass - public static void setUp() { - TestCorbaHost.setCorbaHost(new DefaultCorbaHost()); - try { - try { - server = - new TransientNameServer("localhost", ORB_INITIAL_PORT, TransientNameService.DEFAULT_SERVICE_NAME); - Thread t = server.start(); - if (t == null) { - Assert.fail("The naming server cannot be started"); - } - orb = server.getORB(); - } catch (Throwable e) { - e.printStackTrace(); - Assert.fail(e.getMessage()); - } - org.omg.CORBA.Object objRef = orb.resolve_initial_references("NameService"); - NamingContext ncRef = NamingContextHelper.narrow(objRef); - NameComponent nc = new NameComponent(SERVICE_NAME, ""); - NameComponent path[] = {nc}; - ScenarioSix scenarioSix = new ScenarioSixServant(); - ncRef.rebind(path, scenarioSix); - // obtain node - node = NodeFactory.getInstance().createNode("ScenarioSix.composite", TestCorbaHost.class.getClassLoader()).start(); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Kills previously spawned name service. - */ - @AfterClass - public static void tearDown() { - server.stop(); - node.stop(); - } - - private boolean areArraysEqual(String[][] arr1, String[][] arr2) { - for (int i = 0; i < arr1.length; i++) { - for (int j = 0; j < arr1[i].length; j++) { - if (!arr1[i][j].equals(arr2[i][j])) { - return false; - } - } - } - return true; - } - - private String[][] getStringArray() { - String[][] result = { {"Hello", "World"}, {"Hi", "Again"}}; - return result; - } - - /** - * Tests passing arrays. Tuscany acts as a client, servant object is served - * in a traditional way - */ - @Test - public void test_arraysPassing_tuscanyAsClient() { - try { - TScenarioSix ref = node.getService(TScenarioSixComponent.class, "ScenarioSix").getScenarioSix(); - String[][] arrayArg = getStringArray(); - String[][] arrayRes = ref.passStringArray(arrayArg); - assertTrue(areArraysEqual(arrayArg, arrayRes)); - TAnnotatedStruct structArg = new TAnnotatedStruct(); - structArg.stringArray = getStringArray(); - TAnnotatedStruct structRes = ref.passAnnotatedStruct(structArg); - assertTrue(areArraysEqual(structArg.stringArray, structRes.stringArray)); - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - } - - /** - * Tests passing arrays. Servant object is served by Tuscany and it is - * accessed by traditional Corba client - */ - @Test - public void test_arraysPassing_tuscanyAsService() { - try { - org.omg.CORBA.Object objRef = orb.resolve_initial_references("NameService"); - NamingContext ncRef = NamingContextHelper.narrow(objRef); - NameComponent nc = new NameComponent(TUSCANY_SERVICE_NAME, ""); - NameComponent path[] = {nc}; - ScenarioSix ref = ScenarioSixHelper.narrow(ncRef.resolve(path)); - String[][] stringArg = getStringArray(); - String[][] stringRes = ref.passStringArray(stringArg); - assertTrue(areArraysEqual(stringArg, stringRes)); - AnnotatedStruct structArg = new AnnotatedStruct(); - structArg.stringArray = getStringArray(); - AnnotatedStruct structRes = ref.passAnnotatedStruct(structArg); - assertTrue(areArraysEqual(structArg.stringArray, structRes.stringArray)); - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - } - - /** - * Tests passing unions. Tuscany acts as a client, servant object is served - * in a traditional way - */ - @Test - public void test_unionsPassing_tuscanyAsClient() { - try { - TScenarioSix ref = node.getService(TScenarioSixComponent.class, "ScenarioSix").getScenarioSix(); - TRichUnion arg = new TRichUnion(); - TInnerUnion inner = new TInnerUnion(); - inner.setY(10f); - arg.setIu(inner); - TRichUnion result = ref.passRichUnion(arg); - assertEquals(arg.getIu().getY(), result.getIu().getY(), 0.0f); - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - try { - TScenarioSix ref = node.getService(TScenarioSixComponent.class, "ScenarioSix").getScenarioSix(); - TRichUnion arg = new TRichUnion(); - arg.setY(15f); - TRichUnion result = ref.passRichUnion(arg); - assertEquals(arg.getY(), result.getY(), 0.0f); - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - } - - /** - * Tests passing unions. Servant object is served by Tuscany and it is - * accessed by traditional Corba client - */ - @Test - public void test_unionsPassing_tuscanyAsService() { - try { - org.omg.CORBA.Object objRef = orb.resolve_initial_references("NameService"); - NamingContext ncRef = NamingContextHelper.narrow(objRef); - NameComponent nc = new NameComponent(TUSCANY_SERVICE_NAME, ""); - NameComponent path[] = {nc}; - ScenarioSix ref = ScenarioSixHelper.narrow(ncRef.resolve(path)); - RichUnion arg = new RichUnion(); - InnerUnion inner = new InnerUnion(); - inner.y(20f); - arg.iu(inner); - RichUnion result = ref.passRichUnion(arg); - assertEquals(arg.iu().y(), result.iu().y(), 0.0f); - arg = new RichUnion(); - arg.y(15f); - result = ref.passRichUnion(arg); - assertEquals(arg.y(), result.y(), 0.0f); - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java deleted file mode 100644 index 0190df2d1c..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioThreeTestCase.java +++ /dev/null @@ -1,132 +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.test.corba; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; -import junit.framework.Assert; - -import org.apache.tuscany.sca.host.corba.jse.DefaultCorbaHost; -import org.apache.tuscany.sca.host.corba.naming.TransientNameServer; -import org.apache.tuscany.sca.host.corba.naming.TransientNameService; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.apache.tuscany.sca.test.corba.types.TScenarioThree; -import org.apache.tuscany.sca.test.corba.types.TScenarioThreeComponent; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * @version $Rev$ $Date$ - * Tests various mapping scenarios. - */ -public class ScenarioThreeTestCase { - - // note that those values are also used in resources/*.composite file - private static int ORB_INITIAL_PORT = 5060; - private static Node node; - private static TransientNameServer server; - - /** - * Sets up name service, creates and registers traditional CORBA service, - * obtains SCADomain - */ - @BeforeClass - public static void setUp() { - TestCorbaHost.setCorbaHost(new DefaultCorbaHost()); - try { - try { - server = - new TransientNameServer("localhost", ORB_INITIAL_PORT, TransientNameService.DEFAULT_SERVICE_NAME); - Thread t = server.start(); - if (t == null) { - Assert.fail("The naming server cannot be started"); - } - } catch (Throwable e) { - e.printStackTrace(); - Assert.fail(e.getMessage()); - } - // obtain node - node = NodeFactory.getInstance().createNode("ScenarioThree.composite", TestCorbaHost.class.getClassLoader()).start(); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Kills previously spawned name service. - */ - @AfterClass - public static void tearDown() { - server.stop(); - node.stop(); - } - - /** - * Tests mapping for getters and setters - */ - @Test - public void test_getterSetter() { - try { - TScenarioThree ref = - node.getService(TScenarioThreeComponent.class, "ScenarioThreeReference").getScenarioThree(); - ref.getIntField(); - ref.setIntField(1); - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - } - - /** - * Tests mapping the same operation names but with different cases - */ - @Test - public void test_nameCase() { - try { - TScenarioThree ref = - node.getService(TScenarioThreeComponent.class, "ScenarioThreeReference").getScenarioThree(); - assertEquals(0, ref.caseDifferent()); - assertEquals(1, ref.CaseDifferent()); - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - } - - /** - * Tests mappings for operations with overloaded names - */ - @Test - public void test_overloadedNames() { - try { - TScenarioThree ref = - node.getService(TScenarioThreeComponent.class, "ScenarioThreeReference").getScenarioThree(); - ref.overloadedName(); - ref.overloadedName(""); - ref.overloadedName("", 0); - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java deleted file mode 100644 index af2c9ea711..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioTwoTestCase.java +++ /dev/null @@ -1,141 +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.test.corba; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; -import junit.framework.Assert; - -import org.apache.tuscany.sca.host.corba.jse.DefaultCorbaHost; -import org.apache.tuscany.sca.host.corba.naming.TransientNameServer; -import org.apache.tuscany.sca.host.corba.naming.TransientNameService; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.apache.tuscany.sca.test.corba.generated.ScenarioTwo; -import org.apache.tuscany.sca.test.corba.generated.ScenarioTwoHelper; -import org.apache.tuscany.sca.test.corba.types.ScenarioTwoServant; -import org.apache.tuscany.sca.test.corba.types.TScenarioTwo; -import org.apache.tuscany.sca.test.corba.types.TScenarioTwoComponent; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.omg.CORBA.ORB; -import org.omg.CosNaming.NameComponent; -import org.omg.CosNaming.NamingContext; -import org.omg.CosNaming.NamingContextHelper; - -/** - * @version $Rev$ $Date$ - * Tests attribute get/set mapping using cooperation between traditional CORBA - * and Tuscany CORBA - */ -public class ScenarioTwoTestCase { - - // note that those values are also used in resources/*.composite file - private static int ORB_INITIAL_PORT = 5060; - - private static Node node; - - private static TransientNameServer server; - private static ORB orb; - private static String TUSCANY_SERVICE_NAME = "ScenarioTwo"; - private static String GENERATED_SERVICE_NAME = "ScenarioTwoGenerated"; - - /** - * Sets up name service, creates and registers traditional CORBA service, - * obtains SCADomain - */ - @BeforeClass - public static void setUp() { - TestCorbaHost.setCorbaHost(new DefaultCorbaHost()); - try { - try { - server = - new TransientNameServer("localhost", ORB_INITIAL_PORT, TransientNameService.DEFAULT_SERVICE_NAME); - Thread t = server.start(); - if (t == null) { - Assert.fail("The naming server cannot be started"); - } - orb = server.getORB(); - org.omg.CORBA.Object objRef = orb.resolve_initial_references("NameService"); - NamingContext ncRef = NamingContextHelper.narrow(objRef); - NameComponent nc = new NameComponent(GENERATED_SERVICE_NAME, ""); - NameComponent path[] = {nc}; - ScenarioTwo scenarioTwo = new ScenarioTwoServant(); - ncRef.rebind(path, scenarioTwo); - } catch (Throwable e) { - e.printStackTrace(); - Assert.fail(e.getMessage()); - } - // obtain node - node = NodeFactory.getInstance().createNode("ScenarioTwo.composite", TestCorbaHost.class.getClassLoader()).start(); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Kills previously spawned name service. - */ - @AfterClass - public static void tearDown() { - server.stop(); - node.stop(); - } - - /** - * Tests using objects attribute (which is server in traditional way) by - * Tuscany CORBA binding - */ - @Test - public void test_tuscanyGetSetAttribute() { - try { - TScenarioTwo ref = node.getService(TScenarioTwoComponent.class, "ScenarioTwo").getScenarioTwo(); - String strVal = "Whatever"; - ref.setStringField(strVal); - assertEquals(strVal, ref.getStringField()); - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - } - - /** - * Tests using objects attribute (which is served by Tuscany) in traditional - * way (by idlj generated code) - */ - @Test - public void test_getneratedGetSetAttribute() { - try { - orb = server.getORB(); - org.omg.CORBA.Object objRef = orb.resolve_initial_references("NameService"); - NamingContext ncRef = NamingContextHelper.narrow(objRef); - NameComponent nc = new NameComponent(TUSCANY_SERVICE_NAME, ""); - NameComponent path[] = {nc}; - ScenarioTwo st = ScenarioTwoHelper.narrow(ncRef.resolve(path)); - st.stringField(""); - assertEquals("", st.stringField()); - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java deleted file mode 100644 index bd1ce8cb49..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHost.java +++ /dev/null @@ -1,56 +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.test.corba; - -import org.apache.tuscany.sca.host.corba.CorbaHost; -import org.apache.tuscany.sca.host.corba.CorbaHostException; -import org.apache.tuscany.sca.host.corba.jse.DefaultCorbaHost; -import org.omg.CORBA.Object; - -/** - * @version $Rev$ $Date$ - * Mock Corba host which proxies to configured Corba host - */ -public class TestCorbaHost implements CorbaHost { - - private static CorbaHost corbaHost = new DefaultCorbaHost(); - - /** - * Configures environment to use given Corba host - * - * @param corbaHost Corba host to use - */ - public static void setCorbaHost(CorbaHost corbaHost) { - TestCorbaHost.corbaHost = corbaHost; - } - - public Object lookup(String arg0) throws CorbaHostException { - return TestCorbaHost.corbaHost.lookup(arg0); - } - - public void registerServant(String arg0, Object arg1) throws CorbaHostException { - TestCorbaHost.corbaHost.registerServant(arg0, arg1); - } - - public void unregisterServant(String arg0) throws CorbaHostException { - TestCorbaHost.corbaHost.unregisterServant(arg0); - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java deleted file mode 100644 index 3639ba812d..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/TestCorbaHostModuleActivator.java +++ /dev/null @@ -1,50 +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.test.corba; - -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.ModuleActivator; -import org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint; - -/** - * @version $Rev$ $Date$ - * Registers TestCorbaHost as a Corba host extension. - */ -public class TestCorbaHostModuleActivator implements ModuleActivator { - private ExtensionPointRegistry registry; - - /** - * - */ - public TestCorbaHostModuleActivator(ExtensionPointRegistry registry) { - super(); - this.registry = registry; - } - - public void start() { - CorbaHostExtensionPoint chep = registry.getExtensionPoint(CorbaHostExtensionPoint.class); - chep.getCorbaHosts().add(0, new TestCorbaHost()); - } - - public void stop() { - - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java deleted file mode 100644 index abcec43d0e..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java +++ /dev/null @@ -1,43 +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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* sobota, 16 sierpieñ 2008 15:31:35 CEST -*/ - -public final class AnnotatedStruct implements org.omg.CORBA.portable.IDLEntity -{ - public String stringArray[][] = null; - - public AnnotatedStruct () - { - } // ctor - - public AnnotatedStruct (String[][] _stringArray) - { - stringArray = _stringArray; - } // ctor - -} // class AnnotatedStruct diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java deleted file mode 100644 index 171a7919a2..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java +++ /dev/null @@ -1,97 +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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHelper.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* sobota, 16 sierpieñ 2008 15:31:35 CEST -*/ - -abstract public class AnnotatedStructHelper -{ - private static String _id = "IDL:org/apache/tuscany/sca/test/corba/generated/AnnotatedStruct/AnnotatedStruct:1.0"; - - public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct that) - { - org.omg.CORBA.portable.OutputStream out = a.create_output_stream (); - a.type (type ()); - write (out, that); - a.read_value (out.create_input_stream (), type ()); - } - - public static org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct extract (org.omg.CORBA.Any a) - { - return read (a.create_input_stream ()); - } - - private static org.omg.CORBA.TypeCode __typeCode = null; - private static boolean __active = false; - synchronized public static org.omg.CORBA.TypeCode type () - { - if (__typeCode == null) - { - synchronized (org.omg.CORBA.TypeCode.class) - { - if (__typeCode == null) - { - if (__active) - { - return org.omg.CORBA.ORB.init().create_recursive_tc ( _id ); - } - __active = true; - org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember [1]; - org.omg.CORBA.TypeCode _tcOf_members0 = null; - _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0); - _tcOf_members0 = org.omg.CORBA.ORB.init ().create_array_tc (2, _tcOf_members0 ); - _tcOf_members0 = org.omg.CORBA.ORB.init ().create_array_tc (2, _tcOf_members0 ); - _tcOf_members0 = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.id (), "StringArray", _tcOf_members0); - _members0[0] = new org.omg.CORBA.StructMember ( - "stringArray", - _tcOf_members0, - null); - __typeCode = org.omg.CORBA.ORB.init ().create_struct_tc (org.apache.tuscany.sca.test.corba.generated.AnnotatedStructHelper.id (), "AnnotatedStruct", _members0); - __active = false; - } - } - } - return __typeCode; - } - - public static String id () - { - return _id; - } - - public static org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct read (org.omg.CORBA.portable.InputStream istream) - { - org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct value = new org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct (); - value.stringArray = org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.read (istream); - return value; - } - - public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct value) - { - org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.write (ostream, value.stringArray); - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java deleted file mode 100644 index 5f2dc56033..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java +++ /dev/null @@ -1,57 +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.test.corba.generated; - -/** -* org/apache/tuscany/sca/test/corba/generated/AnnotatedStructHolder.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* sobota, 16 sierpieñ 2008 15:31:35 CEST -*/ - -public final class AnnotatedStructHolder implements org.omg.CORBA.portable.Streamable -{ - public org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct value = null; - - public AnnotatedStructHolder () - { - } - - public AnnotatedStructHolder (org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct initialValue) - { - value = initialValue; - } - - public void _read (org.omg.CORBA.portable.InputStream i) - { - value = org.apache.tuscany.sca.test.corba.generated.AnnotatedStructHelper.read (i); - } - - public void _write (org.omg.CORBA.portable.OutputStream o) - { - org.apache.tuscany.sca.test.corba.generated.AnnotatedStructHelper.write (o, value); - } - - public org.omg.CORBA.TypeCode _type () - { - return org.apache.tuscany.sca.test.corba.generated.AnnotatedStructHelper.type (); - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java deleted file mode 100644 index 24a628d406..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/Color.java +++ /dev/null @@ -1,61 +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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/Color.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pi±tek, 27 czerwiec 2008 20:40:03 CEST -*/ - -public class Color implements org.omg.CORBA.portable.IDLEntity -{ - private int __value; - private static int __size = 3; - private static org.apache.tuscany.sca.test.corba.generated.Color[] __array = new org.apache.tuscany.sca.test.corba.generated.Color [__size]; - - public static final int _red = 0; - public static final org.apache.tuscany.sca.test.corba.generated.Color red = new org.apache.tuscany.sca.test.corba.generated.Color(_red); - public static final int _yellow = 1; - public static final org.apache.tuscany.sca.test.corba.generated.Color yellow = new org.apache.tuscany.sca.test.corba.generated.Color(_yellow); - public static final int _green = 2; - public static final org.apache.tuscany.sca.test.corba.generated.Color green = new org.apache.tuscany.sca.test.corba.generated.Color(_green); - - public int value () - { - return __value; - } - - public static org.apache.tuscany.sca.test.corba.generated.Color from_int (int value) - { - if (value >= 0 && value < __size) - return __array[value]; - else - throw new org.omg.CORBA.BAD_PARAM (); - } - - protected Color (int value) - { - __value = value; - __array[__value] = this; - } -} // class Color diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java deleted file mode 100644 index da37f28e39..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHelper.java +++ /dev/null @@ -1,72 +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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/ColorHelper.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pi±tek, 27 czerwiec 2008 20:40:03 CEST -*/ - -abstract public class ColorHelper -{ - private static String _id = "IDL:org/apache/tuscany/sca/test/corba/generated/Color:1.0"; - - public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.Color that) - { - org.omg.CORBA.portable.OutputStream out = a.create_output_stream (); - a.type (type ()); - write (out, that); - a.read_value (out.create_input_stream (), type ()); - } - - public static org.apache.tuscany.sca.test.corba.generated.Color extract (org.omg.CORBA.Any a) - { - return read (a.create_input_stream ()); - } - - private static org.omg.CORBA.TypeCode __typeCode = null; - synchronized public static org.omg.CORBA.TypeCode type () - { - if (__typeCode == null) - { - __typeCode = org.omg.CORBA.ORB.init ().create_enum_tc (org.apache.tuscany.sca.test.corba.generated.ColorHelper.id (), "Color", new String[] { "red", "yellow", "green"} ); - } - return __typeCode; - } - - public static String id () - { - return _id; - } - - public static org.apache.tuscany.sca.test.corba.generated.Color read (org.omg.CORBA.portable.InputStream istream) - { - return org.apache.tuscany.sca.test.corba.generated.Color.from_int (istream.read_long ()); - } - - public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.Color value) - { - ostream.write_long (value.value ()); - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java deleted file mode 100644 index 7b2466f791..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ColorHolder.java +++ /dev/null @@ -1,57 +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.test.corba.generated; - -/** -* org/apache/tuscany/sca/test/corba/generated/ColorHolder.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pi±tek, 27 czerwiec 2008 20:40:03 CEST -*/ - -public final class ColorHolder implements org.omg.CORBA.portable.Streamable -{ - public org.apache.tuscany.sca.test.corba.generated.Color value = null; - - public ColorHolder () - { - } - - public ColorHolder (org.apache.tuscany.sca.test.corba.generated.Color initialValue) - { - value = initialValue; - } - - public void _read (org.omg.CORBA.portable.InputStream i) - { - value = org.apache.tuscany.sca.test.corba.generated.ColorHelper.read (i); - } - - public void _write (org.omg.CORBA.portable.OutputStream o) - { - org.apache.tuscany.sca.test.corba.generated.ColorHelper.write (o, value); - } - - public org.omg.CORBA.TypeCode _type () - { - return org.apache.tuscany.sca.test.corba.generated.ColorHelper.type (); - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java deleted file mode 100644 index 27052a1549..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStruct.java +++ /dev/null @@ -1,47 +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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/InnerStruct.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pi±tek, 27 czerwiec 2008 20:40:03 CEST -*/ - -public final class InnerStruct implements org.omg.CORBA.portable.IDLEntity -{ - public int twoDimLongSequence[][] = null; - public String stringField = null; - public org.apache.tuscany.sca.test.corba.generated.Color color = null; - - public InnerStruct () - { - } // ctor - - public InnerStruct (int[][] _twoDimLongSequence, String _stringField, org.apache.tuscany.sca.test.corba.generated.Color _color) - { - twoDimLongSequence = _twoDimLongSequence; - stringField = _stringField; - color = _color; - } // ctor - -} // class InnerStruct diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java deleted file mode 100644 index 57daa51f42..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java +++ /dev/null @@ -1,112 +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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/InnerStructHelper.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pi±tek, 27 czerwiec 2008 20:40:03 CEST -*/ - -abstract public class InnerStructHelper -{ - private static String _id = "IDL:org/apache/tuscany/sca/test/corba/generated/InnerStruct/InnerStruct:1.0"; - - public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.InnerStruct that) - { - org.omg.CORBA.portable.OutputStream out = a.create_output_stream (); - a.type (type ()); - write (out, that); - a.read_value (out.create_input_stream (), type ()); - } - - public static org.apache.tuscany.sca.test.corba.generated.InnerStruct extract (org.omg.CORBA.Any a) - { - return read (a.create_input_stream ()); - } - - private static org.omg.CORBA.TypeCode __typeCode = null; - private static boolean __active = false; - synchronized public static org.omg.CORBA.TypeCode type () - { - if (__typeCode == null) - { - synchronized (org.omg.CORBA.TypeCode.class) - { - if (__typeCode == null) - { - if (__active) - { - return org.omg.CORBA.ORB.init().create_recursive_tc ( _id ); - } - __active = true; - org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember [3]; - org.omg.CORBA.TypeCode _tcOf_members0 = null; - _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long); - _tcOf_members0 = org.omg.CORBA.ORB.init ().create_sequence_tc (0, _tcOf_members0); - _tcOf_members0 = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.LongSequenceHelper.id (), "LongSequence", _tcOf_members0); - _tcOf_members0 = org.omg.CORBA.ORB.init ().create_sequence_tc (0, _tcOf_members0); - _tcOf_members0 = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.TwoDimLongSequenceHelper.id (), "TwoDimLongSequence", _tcOf_members0); - _members0[0] = new org.omg.CORBA.StructMember ( - "twoDimLongSequence", - _tcOf_members0, - null); - _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0); - _members0[1] = new org.omg.CORBA.StructMember ( - "stringField", - _tcOf_members0, - null); - _tcOf_members0 = org.apache.tuscany.sca.test.corba.generated.ColorHelper.type (); - _members0[2] = new org.omg.CORBA.StructMember ( - "color", - _tcOf_members0, - null); - __typeCode = org.omg.CORBA.ORB.init ().create_struct_tc (org.apache.tuscany.sca.test.corba.generated.InnerStructHelper.id (), "InnerStruct", _members0); - __active = false; - } - } - } - return __typeCode; - } - - public static String id () - { - return _id; - } - - public static org.apache.tuscany.sca.test.corba.generated.InnerStruct read (org.omg.CORBA.portable.InputStream istream) - { - org.apache.tuscany.sca.test.corba.generated.InnerStruct value = new org.apache.tuscany.sca.test.corba.generated.InnerStruct (); - value.twoDimLongSequence = org.apache.tuscany.sca.test.corba.generated.TwoDimLongSequenceHelper.read (istream); - value.stringField = istream.read_string (); - value.color = org.apache.tuscany.sca.test.corba.generated.ColorHelper.read (istream); - return value; - } - - public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.InnerStruct value) - { - org.apache.tuscany.sca.test.corba.generated.TwoDimLongSequenceHelper.write (ostream, value.twoDimLongSequence); - ostream.write_string (value.stringField); - org.apache.tuscany.sca.test.corba.generated.ColorHelper.write (ostream, value.color); - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java deleted file mode 100644 index 88fef0b4fb..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java +++ /dev/null @@ -1,57 +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.test.corba.generated; - -/** -* org/apache/tuscany/sca/test/corba/generated/InnerStructHolder.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pi±tek, 27 czerwiec 2008 20:40:03 CEST -*/ - -public final class InnerStructHolder implements org.omg.CORBA.portable.Streamable -{ - public org.apache.tuscany.sca.test.corba.generated.InnerStruct value = null; - - public InnerStructHolder () - { - } - - public InnerStructHolder (org.apache.tuscany.sca.test.corba.generated.InnerStruct initialValue) - { - value = initialValue; - } - - public void _read (org.omg.CORBA.portable.InputStream i) - { - value = org.apache.tuscany.sca.test.corba.generated.InnerStructHelper.read (i); - } - - public void _write (org.omg.CORBA.portable.OutputStream o) - { - org.apache.tuscany.sca.test.corba.generated.InnerStructHelper.write (o, value); - } - - public org.omg.CORBA.TypeCode _type () - { - return org.apache.tuscany.sca.test.corba.generated.InnerStructHelper.type (); - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java deleted file mode 100644 index c5d2aab203..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnion.java +++ /dev/null @@ -1,130 +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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/InnerUnion.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* niedziela, 17 sierpieñ 2008 19:07:14 CEST -*/ - -public final class InnerUnion implements org.omg.CORBA.portable.IDLEntity -{ - private int ___x; - private float ___y; - private int __discriminator; - private boolean __uninitialized = true; - - public InnerUnion () - { - } - - public int discriminator () - { - if (__uninitialized) - throw new org.omg.CORBA.BAD_OPERATION (); - return __discriminator; - } - - public int x () - { - if (__uninitialized) - throw new org.omg.CORBA.BAD_OPERATION (); - verifyx (__discriminator); - return ___x; - } - - public void x (int value) - { - __discriminator = 1; - ___x = value; - __uninitialized = false; - } - - public void x (int discriminator, int value) - { - verifyx (discriminator); - __discriminator = discriminator; - ___x = value; - __uninitialized = false; - } - - private void verifyx (int discriminator) - { - if (discriminator != 1) - throw new org.omg.CORBA.BAD_OPERATION (); - } - - public float y () - { - if (__uninitialized) - throw new org.omg.CORBA.BAD_OPERATION (); - verifyy (__discriminator); - return ___y; - } - - public void y (float value) - { - __discriminator = 2; - ___y = value; - __uninitialized = false; - } - - public void y (int discriminator, float value) - { - verifyy (discriminator); - __discriminator = discriminator; - ___y = value; - __uninitialized = false; - } - - private void verifyy (int discriminator) - { - if (discriminator != 2) - throw new org.omg.CORBA.BAD_OPERATION (); - } - - public void _default () - { - __discriminator = -2147483648; - __uninitialized = false; - } - - public void _default (int discriminator) - { - verifyDefault( discriminator ) ; - __discriminator = discriminator ; - __uninitialized = false; - } - - private void verifyDefault( int value ) - { - switch (value) { - case 1: - case 2: - throw new org.omg.CORBA.BAD_OPERATION() ; - - default: - return; - } - } - -} // class InnerUnion diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java deleted file mode 100644 index db57fc5cba..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java +++ /dev/null @@ -1,124 +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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/InnerUnionHelper.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* niedziela, 17 sierpieñ 2008 19:07:14 CEST -*/ - -abstract public class InnerUnionHelper -{ - private static String _id = "IDL:org/apache/tuscany/sca/test/corba/generated/InnerUnion/InnerUnion:1.0"; - - public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.InnerUnion that) - { - org.omg.CORBA.portable.OutputStream out = a.create_output_stream (); - a.type (type ()); - write (out, that); - a.read_value (out.create_input_stream (), type ()); - } - - public static org.apache.tuscany.sca.test.corba.generated.InnerUnion extract (org.omg.CORBA.Any a) - { - return read (a.create_input_stream ()); - } - - private static org.omg.CORBA.TypeCode __typeCode = null; - synchronized public static org.omg.CORBA.TypeCode type () - { - if (__typeCode == null) - { - org.omg.CORBA.TypeCode _disTypeCode0; - _disTypeCode0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long); - org.omg.CORBA.UnionMember[] _members0 = new org.omg.CORBA.UnionMember [2]; - org.omg.CORBA.TypeCode _tcOf_members0; - org.omg.CORBA.Any _anyOf_members0; - - // Branch for x (case label 1) - _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any (); - _anyOf_members0.insert_long ((int)1); - _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long); - _members0[0] = new org.omg.CORBA.UnionMember ( - "x", - _anyOf_members0, - _tcOf_members0, - null); - - // Branch for y (case label 2) - _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any (); - _anyOf_members0.insert_long ((int)2); - _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_float); - _members0[1] = new org.omg.CORBA.UnionMember ( - "y", - _anyOf_members0, - _tcOf_members0, - null); - __typeCode = org.omg.CORBA.ORB.init ().create_union_tc (org.apache.tuscany.sca.test.corba.generated.InnerUnionHelper.id (), "InnerUnion", _disTypeCode0, _members0); - } - return __typeCode; - } - - public static String id () - { - return _id; - } - - public static org.apache.tuscany.sca.test.corba.generated.InnerUnion read (org.omg.CORBA.portable.InputStream istream) - { - org.apache.tuscany.sca.test.corba.generated.InnerUnion value = new org.apache.tuscany.sca.test.corba.generated.InnerUnion (); - int _dis0 = (int)0; - _dis0 = istream.read_long (); - switch (_dis0) - { - case 1: - int _x = (int)0; - _x = istream.read_long (); - value.x (_x); - break; - case 2: - float _y = (float)0; - _y = istream.read_float (); - value.y (_y); - break; - default: - value._default( _dis0 ) ; - break; - } - return value; - } - - public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.InnerUnion value) - { - ostream.write_long (value.discriminator ()); - switch (value.discriminator ()) - { - case 1: - ostream.write_long (value.x ()); - break; - case 2: - ostream.write_float (value.y ()); - break; - } - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java deleted file mode 100644 index ec25e703c5..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java +++ /dev/null @@ -1,56 +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.test.corba.generated; - -/** -* org/apache/tuscany/sca/test/corba/generated/InnerUnionHolder.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* niedziela, 17 sierpieñ 2008 19:07:14 CEST -*/ - -public final class InnerUnionHolder implements org.omg.CORBA.portable.Streamable -{ - public org.apache.tuscany.sca.test.corba.generated.InnerUnion value = null; - - public InnerUnionHolder () - { - } - - public InnerUnionHolder (org.apache.tuscany.sca.test.corba.generated.InnerUnion initialValue) - { - value = initialValue; - } - - public void _read (org.omg.CORBA.portable.InputStream i) - { - value = org.apache.tuscany.sca.test.corba.generated.InnerUnionHelper.read (i); - } - - public void _write (org.omg.CORBA.portable.OutputStream o) - { - org.apache.tuscany.sca.test.corba.generated.InnerUnionHelper.write (o, value); - } - - public org.omg.CORBA.TypeCode _type () - { - return org.apache.tuscany.sca.test.corba.generated.InnerUnionHelper.type (); - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java deleted file mode 100644 index 940b391499..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java +++ /dev/null @@ -1,79 +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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/LongSequenceHelper.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pi±tek, 27 czerwiec 2008 20:40:03 CEST -*/ - -abstract public class LongSequenceHelper -{ - private static String _id = "IDL:org/apache/tuscany/sca/test/corba/generated/LongSequence:1.0"; - - public static void insert (org.omg.CORBA.Any a, int[] that) - { - org.omg.CORBA.portable.OutputStream out = a.create_output_stream (); - a.type (type ()); - write (out, that); - a.read_value (out.create_input_stream (), type ()); - } - - public static int[] extract (org.omg.CORBA.Any a) - { - return read (a.create_input_stream ()); - } - - private static org.omg.CORBA.TypeCode __typeCode = null; - synchronized public static org.omg.CORBA.TypeCode type () - { - if (__typeCode == null) - { - __typeCode = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long); - __typeCode = org.omg.CORBA.ORB.init ().create_sequence_tc (0, __typeCode); - __typeCode = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.LongSequenceHelper.id (), "LongSequence", __typeCode); - } - return __typeCode; - } - - public static String id () - { - return _id; - } - - public static int[] read (org.omg.CORBA.portable.InputStream istream) - { - int value[] = null; - int _len0 = istream.read_long (); - value = new int[_len0]; - istream.read_long_array (value, 0, _len0); - return value; - } - - public static void write (org.omg.CORBA.portable.OutputStream ostream, int[] value) - { - ostream.write_long (value.length); - ostream.write_long_array (value, 0, value.length); - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java deleted file mode 100644 index 63a11dc56a..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java +++ /dev/null @@ -1,58 +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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/LongSequenceHolder.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pi±tek, 27 czerwiec 2008 20:40:03 CEST -*/ - -public final class LongSequenceHolder implements org.omg.CORBA.portable.Streamable -{ - public int value[] = null; - - public LongSequenceHolder () - { - } - - public LongSequenceHolder (int[] initialValue) - { - value = initialValue; - } - - public void _read (org.omg.CORBA.portable.InputStream i) - { - value = org.apache.tuscany.sca.test.corba.generated.LongSequenceHelper.read (i); - } - - public void _write (org.omg.CORBA.portable.OutputStream o) - { - org.apache.tuscany.sca.test.corba.generated.LongSequenceHelper.write (o, value); - } - - public org.omg.CORBA.TypeCode _type () - { - return org.apache.tuscany.sca.test.corba.generated.LongSequenceHelper.type (); - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java deleted file mode 100644 index 8c0bfc9e39..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStruct.java +++ /dev/null @@ -1,47 +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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/RichStruct.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pi±tek, 27 czerwiec 2008 20:40:03 CEST -*/ - -public final class RichStruct implements org.omg.CORBA.portable.IDLEntity -{ - public org.apache.tuscany.sca.test.corba.generated.InnerStruct innerStruct = null; - public String stringSequence[] = null; - public int longField = (int)0; - - public RichStruct () - { - } // ctor - - public RichStruct (org.apache.tuscany.sca.test.corba.generated.InnerStruct _innerStruct, String[] _stringSequence, int _longField) - { - innerStruct = _innerStruct; - stringSequence = _stringSequence; - longField = _longField; - } // ctor - -} // class RichStruct diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java deleted file mode 100644 index 72ff55a711..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java +++ /dev/null @@ -1,110 +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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/RichStructHelper.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pi±tek, 27 czerwiec 2008 20:40:03 CEST -*/ - -abstract public class RichStructHelper -{ - private static String _id = "IDL:org/apache/tuscany/sca/test/corba/generated/RichStruct/RichStruct:1.0"; - - public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.RichStruct that) - { - org.omg.CORBA.portable.OutputStream out = a.create_output_stream (); - a.type (type ()); - write (out, that); - a.read_value (out.create_input_stream (), type ()); - } - - public static org.apache.tuscany.sca.test.corba.generated.RichStruct extract (org.omg.CORBA.Any a) - { - return read (a.create_input_stream ()); - } - - private static org.omg.CORBA.TypeCode __typeCode = null; - private static boolean __active = false; - synchronized public static org.omg.CORBA.TypeCode type () - { - if (__typeCode == null) - { - synchronized (org.omg.CORBA.TypeCode.class) - { - if (__typeCode == null) - { - if (__active) - { - return org.omg.CORBA.ORB.init().create_recursive_tc ( _id ); - } - __active = true; - org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember [3]; - org.omg.CORBA.TypeCode _tcOf_members0 = null; - _tcOf_members0 = org.apache.tuscany.sca.test.corba.generated.InnerStructHelper.type (); - _members0[0] = new org.omg.CORBA.StructMember ( - "innerStruct", - _tcOf_members0, - null); - _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0); - _tcOf_members0 = org.omg.CORBA.ORB.init ().create_sequence_tc (0, _tcOf_members0); - _tcOf_members0 = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.StringSequenceHelper.id (), "StringSequence", _tcOf_members0); - _members0[1] = new org.omg.CORBA.StructMember ( - "stringSequence", - _tcOf_members0, - null); - _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long); - _members0[2] = new org.omg.CORBA.StructMember ( - "longField", - _tcOf_members0, - null); - __typeCode = org.omg.CORBA.ORB.init ().create_struct_tc (org.apache.tuscany.sca.test.corba.generated.RichStructHelper.id (), "RichStruct", _members0); - __active = false; - } - } - } - return __typeCode; - } - - public static String id () - { - return _id; - } - - public static org.apache.tuscany.sca.test.corba.generated.RichStruct read (org.omg.CORBA.portable.InputStream istream) - { - org.apache.tuscany.sca.test.corba.generated.RichStruct value = new org.apache.tuscany.sca.test.corba.generated.RichStruct (); - value.innerStruct = org.apache.tuscany.sca.test.corba.generated.InnerStructHelper.read (istream); - value.stringSequence = org.apache.tuscany.sca.test.corba.generated.StringSequenceHelper.read (istream); - value.longField = istream.read_long (); - return value; - } - - public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.RichStruct value) - { - org.apache.tuscany.sca.test.corba.generated.InnerStructHelper.write (ostream, value.innerStruct); - org.apache.tuscany.sca.test.corba.generated.StringSequenceHelper.write (ostream, value.stringSequence); - ostream.write_long (value.longField); - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java deleted file mode 100644 index 8a063b8b9d..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java +++ /dev/null @@ -1,57 +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.test.corba.generated; - -/** -* org/apache/tuscany/sca/test/corba/generated/RichStructHolder.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pi±tek, 27 czerwiec 2008 20:40:03 CEST -*/ - -public final class RichStructHolder implements org.omg.CORBA.portable.Streamable -{ - public org.apache.tuscany.sca.test.corba.generated.RichStruct value = null; - - public RichStructHolder () - { - } - - public RichStructHolder (org.apache.tuscany.sca.test.corba.generated.RichStruct initialValue) - { - value = initialValue; - } - - public void _read (org.omg.CORBA.portable.InputStream i) - { - value = org.apache.tuscany.sca.test.corba.generated.RichStructHelper.read (i); - } - - public void _write (org.omg.CORBA.portable.OutputStream o) - { - org.apache.tuscany.sca.test.corba.generated.RichStructHelper.write (o, value); - } - - public org.omg.CORBA.TypeCode _type () - { - return org.apache.tuscany.sca.test.corba.generated.RichStructHelper.type (); - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java deleted file mode 100644 index bc42d57ac3..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnion.java +++ /dev/null @@ -1,195 +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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/RichUnion.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* niedziela, 17 sierpieñ 2008 19:07:14 CEST -*/ - -public final class RichUnion implements org.omg.CORBA.portable.IDLEntity -{ - private int ___x; - private float ___y; - private String ___z; - private org.apache.tuscany.sca.test.corba.generated.InnerUnion ___iu; - private boolean ___a; - private int __discriminator; - private boolean __uninitialized = true; - - public RichUnion () - { - } - - public int discriminator () - { - if (__uninitialized) - throw new org.omg.CORBA.BAD_OPERATION (); - return __discriminator; - } - - public int x () - { - if (__uninitialized) - throw new org.omg.CORBA.BAD_OPERATION (); - verifyx (__discriminator); - return ___x; - } - - public void x (int value) - { - __discriminator = 1; - ___x = value; - __uninitialized = false; - } - - public void x (int discriminator, int value) - { - verifyx (discriminator); - __discriminator = discriminator; - ___x = value; - __uninitialized = false; - } - - private void verifyx (int discriminator) - { - if (discriminator != 1) - throw new org.omg.CORBA.BAD_OPERATION (); - } - - public float y () - { - if (__uninitialized) - throw new org.omg.CORBA.BAD_OPERATION (); - verifyy (__discriminator); - return ___y; - } - - public void y (float value) - { - __discriminator = 2; - ___y = value; - __uninitialized = false; - } - - public void y (int discriminator, float value) - { - verifyy (discriminator); - __discriminator = discriminator; - ___y = value; - __uninitialized = false; - } - - private void verifyy (int discriminator) - { - if (discriminator != 2) - throw new org.omg.CORBA.BAD_OPERATION (); - } - - public String z () - { - if (__uninitialized) - throw new org.omg.CORBA.BAD_OPERATION (); - verifyz (__discriminator); - return ___z; - } - - public void z (String value) - { - __discriminator = 3; - ___z = value; - __uninitialized = false; - } - - public void z (int discriminator, String value) - { - verifyz (discriminator); - __discriminator = discriminator; - ___z = value; - __uninitialized = false; - } - - private void verifyz (int discriminator) - { - if (discriminator != 3) - throw new org.omg.CORBA.BAD_OPERATION (); - } - - public org.apache.tuscany.sca.test.corba.generated.InnerUnion iu () - { - if (__uninitialized) - throw new org.omg.CORBA.BAD_OPERATION (); - verifyiu (__discriminator); - return ___iu; - } - - public void iu (org.apache.tuscany.sca.test.corba.generated.InnerUnion value) - { - __discriminator = 4; - ___iu = value; - __uninitialized = false; - } - - public void iu (int discriminator, org.apache.tuscany.sca.test.corba.generated.InnerUnion value) - { - verifyiu (discriminator); - __discriminator = discriminator; - ___iu = value; - __uninitialized = false; - } - - private void verifyiu (int discriminator) - { - if (discriminator != 4) - throw new org.omg.CORBA.BAD_OPERATION (); - } - - public boolean a () - { - if (__uninitialized) - throw new org.omg.CORBA.BAD_OPERATION (); - verifya (__discriminator); - return ___a; - } - - public void a (boolean value) - { - __discriminator = -2147483648; - ___a = value; - __uninitialized = false; - } - - public void a (int discriminator, boolean value) - { - verifya (discriminator); - __discriminator = discriminator; - ___a = value; - __uninitialized = false; - } - - private void verifya (int discriminator) - { - if (discriminator == 1 || discriminator == 2 || discriminator == 3 || discriminator == 4) - throw new org.omg.CORBA.BAD_OPERATION (); - } - -} // class RichUnion diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java deleted file mode 100644 index 1cb1ed295e..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java +++ /dev/null @@ -1,175 +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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/RichUnionHelper.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* niedziela, 17 sierpieñ 2008 19:07:14 CEST -*/ - -abstract public class RichUnionHelper -{ - private static String _id = "IDL:org/apache/tuscany/sca/test/corba/generated/RichUnion/RichUnion:1.0"; - - public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.RichUnion that) - { - org.omg.CORBA.portable.OutputStream out = a.create_output_stream (); - a.type (type ()); - write (out, that); - a.read_value (out.create_input_stream (), type ()); - } - - public static org.apache.tuscany.sca.test.corba.generated.RichUnion extract (org.omg.CORBA.Any a) - { - return read (a.create_input_stream ()); - } - - private static org.omg.CORBA.TypeCode __typeCode = null; - synchronized public static org.omg.CORBA.TypeCode type () - { - if (__typeCode == null) - { - org.omg.CORBA.TypeCode _disTypeCode0; - _disTypeCode0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long); - org.omg.CORBA.UnionMember[] _members0 = new org.omg.CORBA.UnionMember [5]; - org.omg.CORBA.TypeCode _tcOf_members0; - org.omg.CORBA.Any _anyOf_members0; - - // Branch for x (case label 1) - _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any (); - _anyOf_members0.insert_long ((int)1); - _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long); - _members0[0] = new org.omg.CORBA.UnionMember ( - "x", - _anyOf_members0, - _tcOf_members0, - null); - - // Branch for y (case label 2) - _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any (); - _anyOf_members0.insert_long ((int)2); - _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_float); - _members0[1] = new org.omg.CORBA.UnionMember ( - "y", - _anyOf_members0, - _tcOf_members0, - null); - - // Branch for z (case label 3) - _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any (); - _anyOf_members0.insert_long ((int)3); - _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0); - _members0[2] = new org.omg.CORBA.UnionMember ( - "z", - _anyOf_members0, - _tcOf_members0, - null); - - // Branch for iu (case label 4) - _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any (); - _anyOf_members0.insert_long ((int)4); - _tcOf_members0 = org.apache.tuscany.sca.test.corba.generated.InnerUnionHelper.type (); - _members0[3] = new org.omg.CORBA.UnionMember ( - "iu", - _anyOf_members0, - _tcOf_members0, - null); - - // Branch for a (Default case) - _anyOf_members0 = org.omg.CORBA.ORB.init ().create_any (); - _anyOf_members0.insert_octet ((byte)0); // default member label - _tcOf_members0 = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_boolean); - _members0[4] = new org.omg.CORBA.UnionMember ( - "a", - _anyOf_members0, - _tcOf_members0, - null); - __typeCode = org.omg.CORBA.ORB.init ().create_union_tc (org.apache.tuscany.sca.test.corba.generated.RichUnionHelper.id (), "RichUnion", _disTypeCode0, _members0); - } - return __typeCode; - } - - public static String id () - { - return _id; - } - - public static org.apache.tuscany.sca.test.corba.generated.RichUnion read (org.omg.CORBA.portable.InputStream istream) - { - org.apache.tuscany.sca.test.corba.generated.RichUnion value = new org.apache.tuscany.sca.test.corba.generated.RichUnion (); - int _dis0 = (int)0; - _dis0 = istream.read_long (); - switch (_dis0) - { - case 1: - int _x = (int)0; - _x = istream.read_long (); - value.x (_x); - break; - case 2: - float _y = (float)0; - _y = istream.read_float (); - value.y (_y); - break; - case 3: - String _z = null; - _z = istream.read_string (); - value.z (_z); - break; - case 4: - org.apache.tuscany.sca.test.corba.generated.InnerUnion _iu = null; - _iu = org.apache.tuscany.sca.test.corba.generated.InnerUnionHelper.read (istream); - value.iu (_iu); - break; - default: - boolean _a = false; - _a = istream.read_boolean (); - value.a (_dis0, _a); - break; - } - return value; - } - - public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.RichUnion value) - { - ostream.write_long (value.discriminator ()); - switch (value.discriminator ()) - { - case 1: - ostream.write_long (value.x ()); - break; - case 2: - ostream.write_float (value.y ()); - break; - case 3: - ostream.write_string (value.z ()); - break; - case 4: - org.apache.tuscany.sca.test.corba.generated.InnerUnionHelper.write (ostream, value.iu ()); - break; - default: - ostream.write_boolean (value.a ()); - break; - } - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java deleted file mode 100644 index e2221541c5..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java +++ /dev/null @@ -1,56 +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.test.corba.generated; - -/** -* org/apache/tuscany/sca/test/corba/generated/RichUnionHolder.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* niedziela, 17 sierpieñ 2008 19:07:14 CEST -*/ - -public final class RichUnionHolder implements org.omg.CORBA.portable.Streamable -{ - public org.apache.tuscany.sca.test.corba.generated.RichUnion value = null; - - public RichUnionHolder () - { - } - - public RichUnionHolder (org.apache.tuscany.sca.test.corba.generated.RichUnion initialValue) - { - value = initialValue; - } - - public void _read (org.omg.CORBA.portable.InputStream i) - { - value = org.apache.tuscany.sca.test.corba.generated.RichUnionHelper.read (i); - } - - public void _write (org.omg.CORBA.portable.OutputStream o) - { - org.apache.tuscany.sca.test.corba.generated.RichUnionHelper.write (o, value); - } - - public org.omg.CORBA.TypeCode _type () - { - return org.apache.tuscany.sca.test.corba.generated.RichUnionHelper.type (); - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java deleted file mode 100644 index 13f294b871..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java +++ /dev/null @@ -1,32 +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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/ScenarioOne.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pi±tek, 27 czerwiec 2008 20:40:03 CEST -*/ - -public interface ScenarioOne extends ScenarioOneOperations, org.omg.CORBA.Object, org.omg.CORBA.portable.IDLEntity -{ -} // interface ScenarioOne diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java deleted file mode 100644 index 66cc1d1e82..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java +++ /dev/null @@ -1,104 +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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/ScenarioOneHelper.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pi±tek, 27 czerwiec 2008 20:40:03 CEST -*/ - -abstract public class ScenarioOneHelper -{ - private static String _id = "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioOne:1.0"; - - public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.ScenarioOne that) - { - org.omg.CORBA.portable.OutputStream out = a.create_output_stream (); - a.type (type ()); - write (out, that); - a.read_value (out.create_input_stream (), type ()); - } - - public static org.apache.tuscany.sca.test.corba.generated.ScenarioOne extract (org.omg.CORBA.Any a) - { - return read (a.create_input_stream ()); - } - - private static org.omg.CORBA.TypeCode __typeCode = null; - synchronized public static org.omg.CORBA.TypeCode type () - { - if (__typeCode == null) - { - __typeCode = org.omg.CORBA.ORB.init ().create_interface_tc (org.apache.tuscany.sca.test.corba.generated.ScenarioOneHelper.id (), "ScenarioOne"); - } - return __typeCode; - } - - public static String id () - { - return _id; - } - - public static org.apache.tuscany.sca.test.corba.generated.ScenarioOne read (org.omg.CORBA.portable.InputStream istream) - { - return narrow (istream.read_Object (_ScenarioOneStub.class)); - } - - public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.ScenarioOne value) - { - ostream.write_Object ((org.omg.CORBA.Object) value); - } - - public static org.apache.tuscany.sca.test.corba.generated.ScenarioOne narrow (org.omg.CORBA.Object obj) - { - if (obj == null) - return null; - else if (obj instanceof org.apache.tuscany.sca.test.corba.generated.ScenarioOne) - return (org.apache.tuscany.sca.test.corba.generated.ScenarioOne)obj; - else if (!obj._is_a (id ())) - throw new org.omg.CORBA.BAD_PARAM (); - else - { - org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate (); - org.apache.tuscany.sca.test.corba.generated._ScenarioOneStub stub = new org.apache.tuscany.sca.test.corba.generated._ScenarioOneStub (); - stub._set_delegate(delegate); - return stub; - } - } - - public static org.apache.tuscany.sca.test.corba.generated.ScenarioOne unchecked_narrow (org.omg.CORBA.Object obj) - { - if (obj == null) - return null; - else if (obj instanceof org.apache.tuscany.sca.test.corba.generated.ScenarioOne) - return (org.apache.tuscany.sca.test.corba.generated.ScenarioOne)obj; - else - { - org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate (); - org.apache.tuscany.sca.test.corba.generated._ScenarioOneStub stub = new org.apache.tuscany.sca.test.corba.generated._ScenarioOneStub (); - stub._set_delegate(delegate); - return stub; - } - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java deleted file mode 100644 index f14394b400..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java +++ /dev/null @@ -1,57 +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.test.corba.generated; - -/** -* org/apache/tuscany/sca/test/corba/generated/ScenarioOneHolder.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pi±tek, 27 czerwiec 2008 20:40:03 CEST -*/ - -public final class ScenarioOneHolder implements org.omg.CORBA.portable.Streamable -{ - public org.apache.tuscany.sca.test.corba.generated.ScenarioOne value = null; - - public ScenarioOneHolder () - { - } - - public ScenarioOneHolder (org.apache.tuscany.sca.test.corba.generated.ScenarioOne initialValue) - { - value = initialValue; - } - - public void _read (org.omg.CORBA.portable.InputStream i) - { - value = org.apache.tuscany.sca.test.corba.generated.ScenarioOneHelper.read (i); - } - - public void _write (org.omg.CORBA.portable.OutputStream o) - { - org.apache.tuscany.sca.test.corba.generated.ScenarioOneHelper.write (o, value); - } - - public org.omg.CORBA.TypeCode _type () - { - return org.apache.tuscany.sca.test.corba.generated.ScenarioOneHelper.type (); - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java deleted file mode 100644 index 56388624d7..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java +++ /dev/null @@ -1,33 +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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/ScenarioOneOperations.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pi±tek, 27 czerwiec 2008 20:40:03 CEST -*/ - -public interface ScenarioOneOperations -{ - org.apache.tuscany.sca.test.corba.generated.RichStruct setRichStruct (org.apache.tuscany.sca.test.corba.generated.RichStruct richStruct) throws org.apache.tuscany.sca.test.corba.generated.WrongColor, org.apache.tuscany.sca.test.corba.generated.UnexpectedException; -} // interface ScenarioOneOperations diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java deleted file mode 100644 index 1897d0682c..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java +++ /dev/null @@ -1,32 +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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/ScenarioSix.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* sobota, 16 sierpieñ 2008 15:31:35 CEST -*/ - -public interface ScenarioSix extends ScenarioSixOperations, org.omg.CORBA.Object, org.omg.CORBA.portable.IDLEntity -{ -} // interface ScenarioSix diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java deleted file mode 100644 index c8c88ef91d..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java +++ /dev/null @@ -1,104 +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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/ScenarioSixHelper.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* sobota, 16 sierpieñ 2008 15:31:35 CEST -*/ - -abstract public class ScenarioSixHelper -{ - private static String _id = "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioSix:1.0"; - - public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.ScenarioSix that) - { - org.omg.CORBA.portable.OutputStream out = a.create_output_stream (); - a.type (type ()); - write (out, that); - a.read_value (out.create_input_stream (), type ()); - } - - public static org.apache.tuscany.sca.test.corba.generated.ScenarioSix extract (org.omg.CORBA.Any a) - { - return read (a.create_input_stream ()); - } - - private static org.omg.CORBA.TypeCode __typeCode = null; - synchronized public static org.omg.CORBA.TypeCode type () - { - if (__typeCode == null) - { - __typeCode = org.omg.CORBA.ORB.init ().create_interface_tc (org.apache.tuscany.sca.test.corba.generated.ScenarioSixHelper.id (), "ScenarioSix"); - } - return __typeCode; - } - - public static String id () - { - return _id; - } - - public static org.apache.tuscany.sca.test.corba.generated.ScenarioSix read (org.omg.CORBA.portable.InputStream istream) - { - return narrow (istream.read_Object (_ScenarioSixStub.class)); - } - - public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.ScenarioSix value) - { - ostream.write_Object ((org.omg.CORBA.Object) value); - } - - public static org.apache.tuscany.sca.test.corba.generated.ScenarioSix narrow (org.omg.CORBA.Object obj) - { - if (obj == null) - return null; - else if (obj instanceof org.apache.tuscany.sca.test.corba.generated.ScenarioSix) - return (org.apache.tuscany.sca.test.corba.generated.ScenarioSix)obj; - else if (!obj._is_a (id ())) - throw new org.omg.CORBA.BAD_PARAM (); - else - { - org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate (); - org.apache.tuscany.sca.test.corba.generated._ScenarioSixStub stub = new org.apache.tuscany.sca.test.corba.generated._ScenarioSixStub (); - stub._set_delegate(delegate); - return stub; - } - } - - public static org.apache.tuscany.sca.test.corba.generated.ScenarioSix unchecked_narrow (org.omg.CORBA.Object obj) - { - if (obj == null) - return null; - else if (obj instanceof org.apache.tuscany.sca.test.corba.generated.ScenarioSix) - return (org.apache.tuscany.sca.test.corba.generated.ScenarioSix)obj; - else - { - org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate (); - org.apache.tuscany.sca.test.corba.generated._ScenarioSixStub stub = new org.apache.tuscany.sca.test.corba.generated._ScenarioSixStub (); - stub._set_delegate(delegate); - return stub; - } - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java deleted file mode 100644 index 5540b98c21..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java +++ /dev/null @@ -1,57 +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.test.corba.generated; - -/** -* org/apache/tuscany/sca/test/corba/generated/ScenarioSixHolder.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* sobota, 16 sierpieñ 2008 15:31:35 CEST -*/ - -public final class ScenarioSixHolder implements org.omg.CORBA.portable.Streamable -{ - public org.apache.tuscany.sca.test.corba.generated.ScenarioSix value = null; - - public ScenarioSixHolder () - { - } - - public ScenarioSixHolder (org.apache.tuscany.sca.test.corba.generated.ScenarioSix initialValue) - { - value = initialValue; - } - - public void _read (org.omg.CORBA.portable.InputStream i) - { - value = org.apache.tuscany.sca.test.corba.generated.ScenarioSixHelper.read (i); - } - - public void _write (org.omg.CORBA.portable.OutputStream o) - { - org.apache.tuscany.sca.test.corba.generated.ScenarioSixHelper.write (o, value); - } - - public org.omg.CORBA.TypeCode _type () - { - return org.apache.tuscany.sca.test.corba.generated.ScenarioSixHelper.type (); - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java deleted file mode 100644 index 648144299c..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/ScenarioSixOperations.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* niedziela, 17 sierpieñ 2008 19:07:14 CEST -*/ - -public interface ScenarioSixOperations -{ - String[][] passStringArray (String[][] arg); - org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct passAnnotatedStruct (org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct arg); - org.apache.tuscany.sca.test.corba.generated.RichUnion passRichUnion (org.apache.tuscany.sca.test.corba.generated.RichUnion arg); -} // interface ScenarioSixOperations diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java deleted file mode 100644 index b57e098a56..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java +++ /dev/null @@ -1,34 +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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/ScenarioTwo.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* wtorek, 15 lipiec 2008 13:36:31 CEST -*/ - - -// objects for ScenarioTwo -public interface ScenarioTwo extends ScenarioTwoOperations, org.omg.CORBA.Object, org.omg.CORBA.portable.IDLEntity -{ -} // interface ScenarioTwo diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java deleted file mode 100644 index 8ddfa10575..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java +++ /dev/null @@ -1,106 +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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHelper.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* wtorek, 15 lipiec 2008 13:36:31 CEST -*/ - - -// objects for ScenarioTwo -abstract public class ScenarioTwoHelper -{ - private static String _id = "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioTwo:1.0"; - - public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.ScenarioTwo that) - { - org.omg.CORBA.portable.OutputStream out = a.create_output_stream (); - a.type (type ()); - write (out, that); - a.read_value (out.create_input_stream (), type ()); - } - - public static org.apache.tuscany.sca.test.corba.generated.ScenarioTwo extract (org.omg.CORBA.Any a) - { - return read (a.create_input_stream ()); - } - - private static org.omg.CORBA.TypeCode __typeCode = null; - synchronized public static org.omg.CORBA.TypeCode type () - { - if (__typeCode == null) - { - __typeCode = org.omg.CORBA.ORB.init ().create_interface_tc (org.apache.tuscany.sca.test.corba.generated.ScenarioTwoHelper.id (), "ScenarioTwo"); - } - return __typeCode; - } - - public static String id () - { - return _id; - } - - public static org.apache.tuscany.sca.test.corba.generated.ScenarioTwo read (org.omg.CORBA.portable.InputStream istream) - { - return narrow (istream.read_Object (_ScenarioTwoStub.class)); - } - - public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.ScenarioTwo value) - { - ostream.write_Object ((org.omg.CORBA.Object) value); - } - - public static org.apache.tuscany.sca.test.corba.generated.ScenarioTwo narrow (org.omg.CORBA.Object obj) - { - if (obj == null) - return null; - else if (obj instanceof org.apache.tuscany.sca.test.corba.generated.ScenarioTwo) - return (org.apache.tuscany.sca.test.corba.generated.ScenarioTwo)obj; - else if (!obj._is_a (id ())) - throw new org.omg.CORBA.BAD_PARAM (); - else - { - org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate (); - org.apache.tuscany.sca.test.corba.generated._ScenarioTwoStub stub = new org.apache.tuscany.sca.test.corba.generated._ScenarioTwoStub (); - stub._set_delegate(delegate); - return stub; - } - } - - public static org.apache.tuscany.sca.test.corba.generated.ScenarioTwo unchecked_narrow (org.omg.CORBA.Object obj) - { - if (obj == null) - return null; - else if (obj instanceof org.apache.tuscany.sca.test.corba.generated.ScenarioTwo) - return (org.apache.tuscany.sca.test.corba.generated.ScenarioTwo)obj; - else - { - org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl)obj)._get_delegate (); - org.apache.tuscany.sca.test.corba.generated._ScenarioTwoStub stub = new org.apache.tuscany.sca.test.corba.generated._ScenarioTwoStub (); - stub._set_delegate(delegate); - return stub; - } - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java deleted file mode 100644 index 9717629711..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java +++ /dev/null @@ -1,59 +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.test.corba.generated; - -/** -* org/apache/tuscany/sca/test/corba/generated/ScenarioTwoHolder.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* wtorek, 15 lipiec 2008 13:36:31 CEST -*/ - - -// objects for ScenarioTwo -public final class ScenarioTwoHolder implements org.omg.CORBA.portable.Streamable -{ - public org.apache.tuscany.sca.test.corba.generated.ScenarioTwo value = null; - - public ScenarioTwoHolder () - { - } - - public ScenarioTwoHolder (org.apache.tuscany.sca.test.corba.generated.ScenarioTwo initialValue) - { - value = initialValue; - } - - public void _read (org.omg.CORBA.portable.InputStream i) - { - value = org.apache.tuscany.sca.test.corba.generated.ScenarioTwoHelper.read (i); - } - - public void _write (org.omg.CORBA.portable.OutputStream o) - { - org.apache.tuscany.sca.test.corba.generated.ScenarioTwoHelper.write (o, value); - } - - public org.omg.CORBA.TypeCode _type () - { - return org.apache.tuscany.sca.test.corba.generated.ScenarioTwoHelper.type (); - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java deleted file mode 100644 index 1247b4618d..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java +++ /dev/null @@ -1,36 +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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/ScenarioTwoOperations.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* wtorek, 15 lipiec 2008 13:36:31 CEST -*/ - - -// objects for ScenarioTwo -public interface ScenarioTwoOperations -{ - String stringField (); - void stringField (String newStringField); -} // interface ScenarioTwoOperations diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java deleted file mode 100644 index f2cc3adad5..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java +++ /dev/null @@ -1,95 +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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/StringArrayHelper.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* sobota, 16 sierpieñ 2008 15:31:35 CEST -*/ - -abstract public class StringArrayHelper -{ - private static String _id = "IDL:org/apache/tuscany/sca/test/corba/generated/StringArray:1.0"; - - public static void insert (org.omg.CORBA.Any a, String[][] that) - { - org.omg.CORBA.portable.OutputStream out = a.create_output_stream (); - a.type (type ()); - write (out, that); - a.read_value (out.create_input_stream (), type ()); - } - - public static String[][] extract (org.omg.CORBA.Any a) - { - return read (a.create_input_stream ()); - } - - private static org.omg.CORBA.TypeCode __typeCode = null; - synchronized public static org.omg.CORBA.TypeCode type () - { - if (__typeCode == null) - { - __typeCode = org.omg.CORBA.ORB.init ().create_string_tc (0); - __typeCode = org.omg.CORBA.ORB.init ().create_array_tc (2, __typeCode ); - __typeCode = org.omg.CORBA.ORB.init ().create_array_tc (2, __typeCode ); - __typeCode = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.id (), "StringArray", __typeCode); - } - return __typeCode; - } - - public static String id () - { - return _id; - } - - public static String[][] read (org.omg.CORBA.portable.InputStream istream) - { - String value[][] = null; - value = new String[2][]; - for (int _o0 = 0;_o0 < (2); ++_o0) - { - value[_o0] = new String[2]; - for (int _o1 = 0;_o1 < (2); ++_o1) - { - value[_o0][_o1] = istream.read_string (); - } - } - return value; - } - - public static void write (org.omg.CORBA.portable.OutputStream ostream, String[][] value) - { - if (value.length != (2)) - throw new org.omg.CORBA.MARSHAL (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE); - for (int _i0 = 0;_i0 < (2); ++_i0) - { - if (value[_i0].length != (2)) - throw new org.omg.CORBA.MARSHAL (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE); - for (int _i1 = 0;_i1 < (2); ++_i1) - { - ostream.write_string (value[_i0][_i1]); - } - } - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java deleted file mode 100644 index dbad550222..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java +++ /dev/null @@ -1,58 +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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/StringArrayHolder.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* sobota, 16 sierpieñ 2008 15:31:35 CEST -*/ - -public final class StringArrayHolder implements org.omg.CORBA.portable.Streamable -{ - public String value[][] = null; - - public StringArrayHolder () - { - } - - public StringArrayHolder (String[][] initialValue) - { - value = initialValue; - } - - public void _read (org.omg.CORBA.portable.InputStream i) - { - value = org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.read (i); - } - - public void _write (org.omg.CORBA.portable.OutputStream o) - { - org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.write (o, value); - } - - public org.omg.CORBA.TypeCode _type () - { - return org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.type (); - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java deleted file mode 100644 index d29129236c..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java +++ /dev/null @@ -1,81 +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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/StringSequenceHelper.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pi±tek, 27 czerwiec 2008 20:40:03 CEST -*/ - -abstract public class StringSequenceHelper -{ - private static String _id = "IDL:org/apache/tuscany/sca/test/corba/generated/StringSequence:1.0"; - - public static void insert (org.omg.CORBA.Any a, String[] that) - { - org.omg.CORBA.portable.OutputStream out = a.create_output_stream (); - a.type (type ()); - write (out, that); - a.read_value (out.create_input_stream (), type ()); - } - - public static String[] extract (org.omg.CORBA.Any a) - { - return read (a.create_input_stream ()); - } - - private static org.omg.CORBA.TypeCode __typeCode = null; - synchronized public static org.omg.CORBA.TypeCode type () - { - if (__typeCode == null) - { - __typeCode = org.omg.CORBA.ORB.init ().create_string_tc (0); - __typeCode = org.omg.CORBA.ORB.init ().create_sequence_tc (0, __typeCode); - __typeCode = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.StringSequenceHelper.id (), "StringSequence", __typeCode); - } - return __typeCode; - } - - public static String id () - { - return _id; - } - - public static String[] read (org.omg.CORBA.portable.InputStream istream) - { - String value[] = null; - int _len0 = istream.read_long (); - value = new String[_len0]; - for (int _o1 = 0;_o1 < value.length; ++_o1) - value[_o1] = istream.read_string (); - return value; - } - - public static void write (org.omg.CORBA.portable.OutputStream ostream, String[] value) - { - ostream.write_long (value.length); - for (int _i0 = 0;_i0 < value.length; ++_i0) - ostream.write_string (value[_i0]); - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java deleted file mode 100644 index 837ba04cea..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java +++ /dev/null @@ -1,58 +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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/StringSequenceHolder.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pi±tek, 27 czerwiec 2008 20:40:03 CEST -*/ - -public final class StringSequenceHolder implements org.omg.CORBA.portable.Streamable -{ - public String value[] = null; - - public StringSequenceHolder () - { - } - - public StringSequenceHolder (String[] initialValue) - { - value = initialValue; - } - - public void _read (org.omg.CORBA.portable.InputStream i) - { - value = org.apache.tuscany.sca.test.corba.generated.StringSequenceHelper.read (i); - } - - public void _write (org.omg.CORBA.portable.OutputStream o) - { - org.apache.tuscany.sca.test.corba.generated.StringSequenceHelper.write (o, value); - } - - public org.omg.CORBA.TypeCode _type () - { - return org.apache.tuscany.sca.test.corba.generated.StringSequenceHelper.type (); - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java deleted file mode 100644 index 0b24056642..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java +++ /dev/null @@ -1,83 +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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHelper.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pi±tek, 27 czerwiec 2008 20:40:03 CEST -*/ - -abstract public class TwoDimLongSequenceHelper -{ - private static String _id = "IDL:org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequence:1.0"; - - public static void insert (org.omg.CORBA.Any a, int[][] that) - { - org.omg.CORBA.portable.OutputStream out = a.create_output_stream (); - a.type (type ()); - write (out, that); - a.read_value (out.create_input_stream (), type ()); - } - - public static int[][] extract (org.omg.CORBA.Any a) - { - return read (a.create_input_stream ()); - } - - private static org.omg.CORBA.TypeCode __typeCode = null; - synchronized public static org.omg.CORBA.TypeCode type () - { - if (__typeCode == null) - { - __typeCode = org.omg.CORBA.ORB.init ().get_primitive_tc (org.omg.CORBA.TCKind.tk_long); - __typeCode = org.omg.CORBA.ORB.init ().create_sequence_tc (0, __typeCode); - __typeCode = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.LongSequenceHelper.id (), "LongSequence", __typeCode); - __typeCode = org.omg.CORBA.ORB.init ().create_sequence_tc (0, __typeCode); - __typeCode = org.omg.CORBA.ORB.init ().create_alias_tc (org.apache.tuscany.sca.test.corba.generated.TwoDimLongSequenceHelper.id (), "TwoDimLongSequence", __typeCode); - } - return __typeCode; - } - - public static String id () - { - return _id; - } - - public static int[][] read (org.omg.CORBA.portable.InputStream istream) - { - int value[][] = null; - int _len0 = istream.read_long (); - value = new int[_len0][]; - for (int _o1 = 0;_o1 < value.length; ++_o1) - value[_o1] = org.apache.tuscany.sca.test.corba.generated.LongSequenceHelper.read (istream); - return value; - } - - public static void write (org.omg.CORBA.portable.OutputStream ostream, int[][] value) - { - ostream.write_long (value.length); - for (int _i0 = 0;_i0 < value.length; ++_i0) - org.apache.tuscany.sca.test.corba.generated.LongSequenceHelper.write (ostream, value[_i0]); - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java deleted file mode 100644 index e2ed1ab037..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java +++ /dev/null @@ -1,58 +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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/TwoDimLongSequenceHolder.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pi±tek, 27 czerwiec 2008 20:40:03 CEST -*/ - -public final class TwoDimLongSequenceHolder implements org.omg.CORBA.portable.Streamable -{ - public int value[][] = null; - - public TwoDimLongSequenceHolder () - { - } - - public TwoDimLongSequenceHolder (int[][] initialValue) - { - value = initialValue; - } - - public void _read (org.omg.CORBA.portable.InputStream i) - { - value = org.apache.tuscany.sca.test.corba.generated.TwoDimLongSequenceHelper.read (i); - } - - public void _write (org.omg.CORBA.portable.OutputStream o) - { - org.apache.tuscany.sca.test.corba.generated.TwoDimLongSequenceHelper.write (o, value); - } - - public org.omg.CORBA.TypeCode _type () - { - return org.apache.tuscany.sca.test.corba.generated.TwoDimLongSequenceHelper.type (); - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java deleted file mode 100644 index 46888399ed..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java +++ /dev/null @@ -1,52 +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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/UnexpectedException.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pi±tek, 27 czerwiec 2008 20:40:03 CEST -*/ - -public final class UnexpectedException extends org.omg.CORBA.UserException -{ - public String info = null; - - public UnexpectedException () - { - super(UnexpectedExceptionHelper.id()); - } // ctor - - public UnexpectedException (String _info) - { - super(UnexpectedExceptionHelper.id()); - info = _info; - } // ctor - - - public UnexpectedException (String $reason, String _info) - { - super(UnexpectedExceptionHelper.id() + " " + $reason); - info = _info; - } // ctor - -} // class UnexpectedException diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java deleted file mode 100644 index c276038050..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java +++ /dev/null @@ -1,98 +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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHelper.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pi±tek, 27 czerwiec 2008 20:40:03 CEST -*/ - -abstract public class UnexpectedExceptionHelper -{ - private static String _id = "IDL:org/apache/tuscany/sca/test/corba/generated/UnexpectedException:1.0"; - - public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.UnexpectedException that) - { - org.omg.CORBA.portable.OutputStream out = a.create_output_stream (); - a.type (type ()); - write (out, that); - a.read_value (out.create_input_stream (), type ()); - } - - public static org.apache.tuscany.sca.test.corba.generated.UnexpectedException extract (org.omg.CORBA.Any a) - { - return read (a.create_input_stream ()); - } - - private static org.omg.CORBA.TypeCode __typeCode = null; - private static boolean __active = false; - synchronized public static org.omg.CORBA.TypeCode type () - { - if (__typeCode == null) - { - synchronized (org.omg.CORBA.TypeCode.class) - { - if (__typeCode == null) - { - if (__active) - { - return org.omg.CORBA.ORB.init().create_recursive_tc ( _id ); - } - __active = true; - org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember [1]; - org.omg.CORBA.TypeCode _tcOf_members0 = null; - _tcOf_members0 = org.omg.CORBA.ORB.init ().create_string_tc (0); - _members0[0] = new org.omg.CORBA.StructMember ( - "info", - _tcOf_members0, - null); - __typeCode = org.omg.CORBA.ORB.init ().create_exception_tc (org.apache.tuscany.sca.test.corba.generated.UnexpectedExceptionHelper.id (), "UnexpectedException", _members0); - __active = false; - } - } - } - return __typeCode; - } - - public static String id () - { - return _id; - } - - public static org.apache.tuscany.sca.test.corba.generated.UnexpectedException read (org.omg.CORBA.portable.InputStream istream) - { - org.apache.tuscany.sca.test.corba.generated.UnexpectedException value = new org.apache.tuscany.sca.test.corba.generated.UnexpectedException (); - // read and discard the repository ID - istream.read_string (); - value.info = istream.read_string (); - return value; - } - - public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.UnexpectedException value) - { - // write the repository ID - ostream.write_string (id ()); - ostream.write_string (value.info); - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java deleted file mode 100644 index 079a56b446..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java +++ /dev/null @@ -1,57 +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.test.corba.generated; - -/** -* org/apache/tuscany/sca/test/corba/generated/UnexpectedExceptionHolder.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pi±tek, 27 czerwiec 2008 20:40:03 CEST -*/ - -public final class UnexpectedExceptionHolder implements org.omg.CORBA.portable.Streamable -{ - public org.apache.tuscany.sca.test.corba.generated.UnexpectedException value = null; - - public UnexpectedExceptionHolder () - { - } - - public UnexpectedExceptionHolder (org.apache.tuscany.sca.test.corba.generated.UnexpectedException initialValue) - { - value = initialValue; - } - - public void _read (org.omg.CORBA.portable.InputStream i) - { - value = org.apache.tuscany.sca.test.corba.generated.UnexpectedExceptionHelper.read (i); - } - - public void _write (org.omg.CORBA.portable.OutputStream o) - { - org.apache.tuscany.sca.test.corba.generated.UnexpectedExceptionHelper.write (o, value); - } - - public org.omg.CORBA.TypeCode _type () - { - return org.apache.tuscany.sca.test.corba.generated.UnexpectedExceptionHelper.type (); - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.java deleted file mode 100644 index 0407184598..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColor.java +++ /dev/null @@ -1,55 +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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/WrongColor.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pi±tek, 27 czerwiec 2008 20:40:03 CEST -*/ - -public final class WrongColor extends org.omg.CORBA.UserException -{ - public org.apache.tuscany.sca.test.corba.generated.Color givenColor = null; - public org.apache.tuscany.sca.test.corba.generated.Color correctColor = null; - - public WrongColor () - { - super(WrongColorHelper.id()); - } // ctor - - public WrongColor (org.apache.tuscany.sca.test.corba.generated.Color _givenColor, org.apache.tuscany.sca.test.corba.generated.Color _correctColor) - { - super(WrongColorHelper.id()); - givenColor = _givenColor; - correctColor = _correctColor; - } // ctor - - - public WrongColor (String $reason, org.apache.tuscany.sca.test.corba.generated.Color _givenColor, org.apache.tuscany.sca.test.corba.generated.Color _correctColor) - { - super(WrongColorHelper.id() + " " + $reason); - givenColor = _givenColor; - correctColor = _correctColor; - } // ctor - -} // class WrongColor diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java deleted file mode 100644 index 16e099cfa3..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java +++ /dev/null @@ -1,105 +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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/WrongColorHelper.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pi±tek, 27 czerwiec 2008 20:40:03 CEST -*/ - -abstract public class WrongColorHelper -{ - private static String _id = "IDL:org/apache/tuscany/sca/test/corba/generated/WrongColor:1.0"; - - public static void insert (org.omg.CORBA.Any a, org.apache.tuscany.sca.test.corba.generated.WrongColor that) - { - org.omg.CORBA.portable.OutputStream out = a.create_output_stream (); - a.type (type ()); - write (out, that); - a.read_value (out.create_input_stream (), type ()); - } - - public static org.apache.tuscany.sca.test.corba.generated.WrongColor extract (org.omg.CORBA.Any a) - { - return read (a.create_input_stream ()); - } - - private static org.omg.CORBA.TypeCode __typeCode = null; - private static boolean __active = false; - synchronized public static org.omg.CORBA.TypeCode type () - { - if (__typeCode == null) - { - synchronized (org.omg.CORBA.TypeCode.class) - { - if (__typeCode == null) - { - if (__active) - { - return org.omg.CORBA.ORB.init().create_recursive_tc ( _id ); - } - __active = true; - org.omg.CORBA.StructMember[] _members0 = new org.omg.CORBA.StructMember [2]; - org.omg.CORBA.TypeCode _tcOf_members0 = null; - _tcOf_members0 = org.apache.tuscany.sca.test.corba.generated.ColorHelper.type (); - _members0[0] = new org.omg.CORBA.StructMember ( - "givenColor", - _tcOf_members0, - null); - _tcOf_members0 = org.apache.tuscany.sca.test.corba.generated.ColorHelper.type (); - _members0[1] = new org.omg.CORBA.StructMember ( - "correctColor", - _tcOf_members0, - null); - __typeCode = org.omg.CORBA.ORB.init ().create_exception_tc (org.apache.tuscany.sca.test.corba.generated.WrongColorHelper.id (), "WrongColor", _members0); - __active = false; - } - } - } - return __typeCode; - } - - public static String id () - { - return _id; - } - - public static org.apache.tuscany.sca.test.corba.generated.WrongColor read (org.omg.CORBA.portable.InputStream istream) - { - org.apache.tuscany.sca.test.corba.generated.WrongColor value = new org.apache.tuscany.sca.test.corba.generated.WrongColor (); - // read and discard the repository ID - istream.read_string (); - value.givenColor = org.apache.tuscany.sca.test.corba.generated.ColorHelper.read (istream); - value.correctColor = org.apache.tuscany.sca.test.corba.generated.ColorHelper.read (istream); - return value; - } - - public static void write (org.omg.CORBA.portable.OutputStream ostream, org.apache.tuscany.sca.test.corba.generated.WrongColor value) - { - // write the repository ID - ostream.write_string (id ()); - org.apache.tuscany.sca.test.corba.generated.ColorHelper.write (ostream, value.givenColor); - org.apache.tuscany.sca.test.corba.generated.ColorHelper.write (ostream, value.correctColor); - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java deleted file mode 100644 index b4883cb35c..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java +++ /dev/null @@ -1,57 +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.test.corba.generated; - -/** -* org/apache/tuscany/sca/test/corba/generated/WrongColorHolder.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pi±tek, 27 czerwiec 2008 20:40:03 CEST -*/ - -public final class WrongColorHolder implements org.omg.CORBA.portable.Streamable -{ - public org.apache.tuscany.sca.test.corba.generated.WrongColor value = null; - - public WrongColorHolder () - { - } - - public WrongColorHolder (org.apache.tuscany.sca.test.corba.generated.WrongColor initialValue) - { - value = initialValue; - } - - public void _read (org.omg.CORBA.portable.InputStream i) - { - value = org.apache.tuscany.sca.test.corba.generated.WrongColorHelper.read (i); - } - - public void _write (org.omg.CORBA.portable.OutputStream o) - { - org.apache.tuscany.sca.test.corba.generated.WrongColorHelper.write (o, value); - } - - public org.omg.CORBA.TypeCode _type () - { - return org.apache.tuscany.sca.test.corba.generated.WrongColorHelper.type (); - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java deleted file mode 100644 index c96fb61204..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java +++ /dev/null @@ -1,91 +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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/_ScenarioOneImplBase.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pi±tek, 27 czerwiec 2008 20:40:03 CEST -*/ - -public abstract class _ScenarioOneImplBase extends org.omg.CORBA.portable.ObjectImpl - implements org.apache.tuscany.sca.test.corba.generated.ScenarioOne, org.omg.CORBA.portable.InvokeHandler -{ - - // Constructors - public _ScenarioOneImplBase () - { - } - - private static java.util.Hashtable _methods = new java.util.Hashtable (); - static - { - _methods.put ("setRichStruct", new java.lang.Integer (0)); - } - - public org.omg.CORBA.portable.OutputStream _invoke (String $method, - org.omg.CORBA.portable.InputStream in, - org.omg.CORBA.portable.ResponseHandler $rh) - { - org.omg.CORBA.portable.OutputStream out = null; - java.lang.Integer __method = (java.lang.Integer)_methods.get ($method); - if (__method == null) - throw new org.omg.CORBA.BAD_OPERATION (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE); - - switch (__method.intValue ()) - { - case 0: // org/apache/tuscany/sca/test/corba/generated/ScenarioOne/setRichStruct - { - try { - org.apache.tuscany.sca.test.corba.generated.RichStruct richStruct = org.apache.tuscany.sca.test.corba.generated.RichStructHelper.read (in); - org.apache.tuscany.sca.test.corba.generated.RichStruct $result = null; - $result = this.setRichStruct (richStruct); - out = $rh.createReply(); - org.apache.tuscany.sca.test.corba.generated.RichStructHelper.write (out, $result); - } catch (org.apache.tuscany.sca.test.corba.generated.WrongColor $ex) { - out = $rh.createExceptionReply (); - org.apache.tuscany.sca.test.corba.generated.WrongColorHelper.write (out, $ex); - } catch (org.apache.tuscany.sca.test.corba.generated.UnexpectedException $ex) { - out = $rh.createExceptionReply (); - org.apache.tuscany.sca.test.corba.generated.UnexpectedExceptionHelper.write (out, $ex); - } - break; - } - - default: - throw new org.omg.CORBA.BAD_OPERATION (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE); - } - - return out; - } // _invoke - - // Type-specific CORBA::Object operations - private static String[] __ids = { - "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioOne:1.0"}; - - public String[] _ids () - { - return (String[])__ids.clone (); - } - - -} // class _ScenarioOneImplBase diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java deleted file mode 100644 index 3427c127ec..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java +++ /dev/null @@ -1,84 +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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/_ScenarioOneStub.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* pi±tek, 27 czerwiec 2008 20:40:03 CEST -*/ - -public class _ScenarioOneStub extends org.omg.CORBA.portable.ObjectImpl implements org.apache.tuscany.sca.test.corba.generated.ScenarioOne -{ - - public org.apache.tuscany.sca.test.corba.generated.RichStruct setRichStruct (org.apache.tuscany.sca.test.corba.generated.RichStruct richStruct) throws org.apache.tuscany.sca.test.corba.generated.WrongColor, org.apache.tuscany.sca.test.corba.generated.UnexpectedException - { - org.omg.CORBA.portable.InputStream $in = null; - try { - org.omg.CORBA.portable.OutputStream $out = _request ("setRichStruct", true); - org.apache.tuscany.sca.test.corba.generated.RichStructHelper.write ($out, richStruct); - $in = _invoke ($out); - org.apache.tuscany.sca.test.corba.generated.RichStruct $result = org.apache.tuscany.sca.test.corba.generated.RichStructHelper.read ($in); - return $result; - } catch (org.omg.CORBA.portable.ApplicationException $ex) { - $in = $ex.getInputStream (); - String _id = $ex.getId (); - if (_id.equals ("IDL:org/apache/tuscany/sca/test/corba/generated/WrongColor:1.0")) - throw org.apache.tuscany.sca.test.corba.generated.WrongColorHelper.read ($in); - else if (_id.equals ("IDL:org/apache/tuscany/sca/test/corba/generated/UnexpectedException:1.0")) - throw org.apache.tuscany.sca.test.corba.generated.UnexpectedExceptionHelper.read ($in); - else - throw new org.omg.CORBA.MARSHAL (_id); - } catch (org.omg.CORBA.portable.RemarshalException $rm) { - return setRichStruct (richStruct ); - } finally { - _releaseReply ($in); - } - } // setRichStruct - - // Type-specific CORBA::Object operations - private static String[] __ids = { - "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioOne:1.0"}; - - public String[] _ids () - { - return (String[])__ids.clone (); - } - - private void readObject (java.io.ObjectInputStream s) throws java.io.IOException - { - String str = s.readUTF (); - String[] args = null; - java.util.Properties props = null; - org.omg.CORBA.Object obj = org.omg.CORBA.ORB.init (args, props).string_to_object (str); - org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl) obj)._get_delegate (); - _set_delegate (delegate); - } - - private void writeObject (java.io.ObjectOutputStream s) throws java.io.IOException - { - String[] args = null; - java.util.Properties props = null; - String str = org.omg.CORBA.ORB.init (args, props).object_to_string (this); - s.writeUTF (str); - } -} // class _ScenarioOneStub diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java deleted file mode 100644 index 78464fe40d..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java +++ /dev/null @@ -1,105 +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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/_ScenarioSixImplBase.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* niedziela, 17 sierpieñ 2008 23:35:36 CEST -*/ - -public abstract class _ScenarioSixImplBase extends org.omg.CORBA.portable.ObjectImpl - implements org.apache.tuscany.sca.test.corba.generated.ScenarioSix, org.omg.CORBA.portable.InvokeHandler -{ - - // Constructors - public _ScenarioSixImplBase () - { - } - - private static java.util.Hashtable _methods = new java.util.Hashtable (); - static - { - _methods.put ("passStringArray", new java.lang.Integer (0)); - _methods.put ("passAnnotatedStruct", new java.lang.Integer (1)); - _methods.put ("passRichUnion", new java.lang.Integer (2)); - } - - public org.omg.CORBA.portable.OutputStream _invoke (String $method, - org.omg.CORBA.portable.InputStream in, - org.omg.CORBA.portable.ResponseHandler $rh) - { - org.omg.CORBA.portable.OutputStream out = null; - java.lang.Integer __method = (java.lang.Integer)_methods.get ($method); - if (__method == null) - throw new org.omg.CORBA.BAD_OPERATION (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE); - - switch (__method.intValue ()) - { - case 0: // org/apache/tuscany/sca/test/corba/generated/ScenarioSix/passStringArray - { - String arg[][] = org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.read (in); - String $result[][] = null; - $result = this.passStringArray (arg); - out = $rh.createReply(); - org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.write (out, $result); - break; - } - - case 1: // org/apache/tuscany/sca/test/corba/generated/ScenarioSix/passAnnotatedStruct - { - org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct arg = org.apache.tuscany.sca.test.corba.generated.AnnotatedStructHelper.read (in); - org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct $result = null; - $result = this.passAnnotatedStruct (arg); - out = $rh.createReply(); - org.apache.tuscany.sca.test.corba.generated.AnnotatedStructHelper.write (out, $result); - break; - } - - case 2: // org/apache/tuscany/sca/test/corba/generated/ScenarioSix/passRichUnion - { - org.apache.tuscany.sca.test.corba.generated.RichUnion arg = org.apache.tuscany.sca.test.corba.generated.RichUnionHelper.read (in); - org.apache.tuscany.sca.test.corba.generated.RichUnion $result = null; - $result = this.passRichUnion (arg); - out = $rh.createReply(); - org.apache.tuscany.sca.test.corba.generated.RichUnionHelper.write (out, $result); - break; - } - - default: - throw new org.omg.CORBA.BAD_OPERATION (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE); - } - - return out; - } // _invoke - - // Type-specific CORBA::Object operations - private static String[] __ids = { - "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioSix:1.0"}; - - public String[] _ids () - { - return (String[])__ids.clone (); - } - - -} // class _ScenarioSixImplBase diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java deleted file mode 100644 index faff36c2a4..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java +++ /dev/null @@ -1,119 +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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/_ScenarioSixStub.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* niedziela, 17 sierpieñ 2008 19:07:14 CEST -*/ - -public class _ScenarioSixStub extends org.omg.CORBA.portable.ObjectImpl implements org.apache.tuscany.sca.test.corba.generated.ScenarioSix -{ - - public String[][] passStringArray (String[][] arg) - { - org.omg.CORBA.portable.InputStream $in = null; - try { - org.omg.CORBA.portable.OutputStream $out = _request ("passStringArray", true); - org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.write ($out, arg); - $in = _invoke ($out); - String $result[][] = org.apache.tuscany.sca.test.corba.generated.StringArrayHelper.read ($in); - return $result; - } catch (org.omg.CORBA.portable.ApplicationException $ex) { - $in = $ex.getInputStream (); - String _id = $ex.getId (); - throw new org.omg.CORBA.MARSHAL (_id); - } catch (org.omg.CORBA.portable.RemarshalException $rm) { - return passStringArray (arg ); - } finally { - _releaseReply ($in); - } - } // passStringArray - - public org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct passAnnotatedStruct (org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct arg) - { - org.omg.CORBA.portable.InputStream $in = null; - try { - org.omg.CORBA.portable.OutputStream $out = _request ("passAnnotatedStruct", true); - org.apache.tuscany.sca.test.corba.generated.AnnotatedStructHelper.write ($out, arg); - $in = _invoke ($out); - org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct $result = org.apache.tuscany.sca.test.corba.generated.AnnotatedStructHelper.read ($in); - return $result; - } catch (org.omg.CORBA.portable.ApplicationException $ex) { - $in = $ex.getInputStream (); - String _id = $ex.getId (); - throw new org.omg.CORBA.MARSHAL (_id); - } catch (org.omg.CORBA.portable.RemarshalException $rm) { - return passAnnotatedStruct (arg ); - } finally { - _releaseReply ($in); - } - } // passAnnotatedStruct - - public org.apache.tuscany.sca.test.corba.generated.RichUnion passRichUnion (org.apache.tuscany.sca.test.corba.generated.RichUnion arg) - { - org.omg.CORBA.portable.InputStream $in = null; - try { - org.omg.CORBA.portable.OutputStream $out = _request ("passRichUnion", true); - org.apache.tuscany.sca.test.corba.generated.RichUnionHelper.write ($out, arg); - $in = _invoke ($out); - org.apache.tuscany.sca.test.corba.generated.RichUnion $result = org.apache.tuscany.sca.test.corba.generated.RichUnionHelper.read ($in); - return $result; - } catch (org.omg.CORBA.portable.ApplicationException $ex) { - $in = $ex.getInputStream (); - String _id = $ex.getId (); - throw new org.omg.CORBA.MARSHAL (_id); - } catch (org.omg.CORBA.portable.RemarshalException $rm) { - return passRichUnion (arg ); - } finally { - _releaseReply ($in); - } - } // passRichUnion - - // Type-specific CORBA::Object operations - private static String[] __ids = { - "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioSix:1.0"}; - - public String[] _ids () - { - return (String[])__ids.clone (); - } - - private void readObject (java.io.ObjectInputStream s) throws java.io.IOException - { - String str = s.readUTF (); - String[] args = null; - java.util.Properties props = null; - org.omg.CORBA.Object obj = org.omg.CORBA.ORB.init (args, props).string_to_object (str); - org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl) obj)._get_delegate (); - _set_delegate (delegate); - } - - private void writeObject (java.io.ObjectOutputStream s) throws java.io.IOException - { - String[] args = null; - java.util.Properties props = null; - String str = org.omg.CORBA.ORB.init (args, props).object_to_string (this); - s.writeUTF (str); - } -} // class _ScenarioSixStub diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java deleted file mode 100644 index 750006cec6..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java +++ /dev/null @@ -1,93 +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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoImplBase.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* wtorek, 15 lipiec 2008 13:36:31 CEST -*/ - - -// objects for ScenarioTwo -public abstract class _ScenarioTwoImplBase extends org.omg.CORBA.portable.ObjectImpl - implements org.apache.tuscany.sca.test.corba.generated.ScenarioTwo, org.omg.CORBA.portable.InvokeHandler -{ - - // Constructors - public _ScenarioTwoImplBase () - { - } - - private static java.util.Hashtable _methods = new java.util.Hashtable (); - static - { - _methods.put ("_get_stringField", new java.lang.Integer (0)); - _methods.put ("_set_stringField", new java.lang.Integer (1)); - } - - public org.omg.CORBA.portable.OutputStream _invoke (String $method, - org.omg.CORBA.portable.InputStream in, - org.omg.CORBA.portable.ResponseHandler $rh) - { - org.omg.CORBA.portable.OutputStream out = null; - java.lang.Integer __method = (java.lang.Integer)_methods.get ($method); - if (__method == null) - throw new org.omg.CORBA.BAD_OPERATION (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE); - - switch (__method.intValue ()) - { - case 0: // org/apache/tuscany/sca/test/corba/generated/ScenarioTwo/_get_stringField - { - String $result = null; - $result = this.stringField (); - out = $rh.createReply(); - out.write_string ($result); - break; - } - - case 1: // org/apache/tuscany/sca/test/corba/generated/ScenarioTwo/_set_stringField - { - String newStringField = in.read_string (); - this.stringField (newStringField); - out = $rh.createReply(); - break; - } - - default: - throw new org.omg.CORBA.BAD_OPERATION (0, org.omg.CORBA.CompletionStatus.COMPLETED_MAYBE); - } - - return out; - } // _invoke - - // Type-specific CORBA::Object operations - private static String[] __ids = { - "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioTwo:1.0"}; - - public String[] _ids () - { - return (String[])__ids.clone (); - } - - -} // class _ScenarioTwoImplBase diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java deleted file mode 100644 index ef9f561d1b..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java +++ /dev/null @@ -1,99 +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.test.corba.generated; - - -/** -* org/apache/tuscany/sca/test/corba/generated/_ScenarioTwoStub.java . -* Generated by the IDL-to-Java compiler (portable), version "3.2" -* from itest_scenario.idl -* wtorek, 15 lipiec 2008 13:36:31 CEST -*/ - - -// objects for ScenarioTwo -public class _ScenarioTwoStub extends org.omg.CORBA.portable.ObjectImpl implements org.apache.tuscany.sca.test.corba.generated.ScenarioTwo -{ - - public String stringField () - { - org.omg.CORBA.portable.InputStream $in = null; - try { - org.omg.CORBA.portable.OutputStream $out = _request ("_get_stringField", true); - $in = _invoke ($out); - String $result = $in.read_string (); - return $result; - } catch (org.omg.CORBA.portable.ApplicationException $ex) { - $in = $ex.getInputStream (); - String _id = $ex.getId (); - throw new org.omg.CORBA.MARSHAL (_id); - } catch (org.omg.CORBA.portable.RemarshalException $rm) { - return stringField ( ); - } finally { - _releaseReply ($in); - } - } // stringField - - public void stringField (String newStringField) - { - org.omg.CORBA.portable.InputStream $in = null; - try { - org.omg.CORBA.portable.OutputStream $out = _request ("_set_stringField", true); - $out.write_string (newStringField); - $in = _invoke ($out); - return; - } catch (org.omg.CORBA.portable.ApplicationException $ex) { - $in = $ex.getInputStream (); - String _id = $ex.getId (); - throw new org.omg.CORBA.MARSHAL (_id); - } catch (org.omg.CORBA.portable.RemarshalException $rm) { - stringField (newStringField ); - } finally { - _releaseReply ($in); - } - } // stringField - - // Type-specific CORBA::Object operations - private static String[] __ids = { - "IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioTwo:1.0"}; - - public String[] _ids () - { - return (String[])__ids.clone (); - } - - private void readObject (java.io.ObjectInputStream s) throws java.io.IOException - { - String str = s.readUTF (); - String[] args = null; - java.util.Properties props = null; - org.omg.CORBA.Object obj = org.omg.CORBA.ORB.init (args, props).string_to_object (str); - org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl) obj)._get_delegate (); - _set_delegate (delegate); - } - - private void writeObject (java.io.ObjectOutputStream s) throws java.io.IOException - { - String[] args = null; - java.util.Properties props = null; - String str = org.omg.CORBA.ORB.init (args, props).object_to_string (this); - s.writeUTF (str); - } -} // class _ScenarioTwoStub diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java deleted file mode 100644 index 1bc2156183..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFive.java +++ /dev/null @@ -1,33 +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.test.corba.types; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * @version $Rev$ $Date$ - * Operations for scenario five - */ -@Remotable -public interface ScenarioFive { - - void doNothing(); - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java deleted file mode 100644 index a198eaf646..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveComponent.java +++ /dev/null @@ -1,41 +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.test.corba.types; - -import org.oasisopen.sca.annotation.Reference; - -/** - * @version $Rev$ $Date$ - * Component for obtaining ScenarioFive reference - */ -public class ScenarioFiveComponent { - - private ScenarioFive scenarioFive; - - @Reference - public void setScenarioFive(ScenarioFive scenarioFive) { - this.scenarioFive = scenarioFive; - } - - public ScenarioFive getScenarioFive() { - return scenarioFive; - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.java deleted file mode 100644 index dc752a2aea..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFiveImpl.java +++ /dev/null @@ -1,32 +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.test.corba.types; - -/** - * @version $Rev$ $Date$ - * Implementation of ScenarioFive service - */ -public class ScenarioFiveImpl implements ScenarioFive { - - public void doNothing() { - // does nothing - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java deleted file mode 100644 index aa2f06909b..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java +++ /dev/null @@ -1,38 +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.test.corba.types; - -import org.apache.tuscany.sca.test.corba.scenariofour.ScenarioFourSdo; -import org.oasisopen.sca.annotation.Remotable; - -/** - * @version $Rev$ $Date$ - * Operations for ScenarioFour - */ -@Remotable -public interface ScenarioFour { - - ScenarioFourStruct setStruct(ScenarioFourStruct struct); - - void exceptionTest() throws ScenarioFourException; - - ScenarioFourSdo passScenarioFourStruct(ScenarioFourSdo scenarioFourSdo); - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java deleted file mode 100644 index c7569720f0..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourComponent.java +++ /dev/null @@ -1,41 +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.test.corba.types; - -import org.oasisopen.sca.annotation.Reference; - -/** - * @version $Rev$ $Date$ - * Component for obtaining ScenarioFour reference - */ -public class ScenarioFourComponent { - - private ScenarioFour scenarioFour; - - @Reference - public void setScenarioFour(ScenarioFour scenarioFour) { - this.scenarioFour = scenarioFour; - } - - public ScenarioFour getScenarioFour() { - return scenarioFour; - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java deleted file mode 100644 index bc76373633..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java +++ /dev/null @@ -1,41 +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.test.corba.types; - -/** - * @version $Rev$ $Date$ - * Exception for ScenarioFour tests - */ -public class ScenarioFourException extends Exception { - - public static final String DEFAULT_CONTENT = "Test"; - - private static final long serialVersionUID = 1L; - private String content; - - public String getContent() { - return content; - } - - public void setContent(String content) { - this.content = content; - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java deleted file mode 100644 index 2f10177bd0..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.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.test.corba.types; - -import org.apache.tuscany.sca.test.corba.scenariofour.ScenarioFourSdo; - -/** - * @version $Rev$ $Date$ - * Implementation of ScenarioFour service - */ -public class ScenarioFourImpl implements ScenarioFour { - - public ScenarioFourStruct setStruct(ScenarioFourStruct struct) { - return struct; - } - - public void exceptionTest() throws ScenarioFourException { - ScenarioFourException exception = new ScenarioFourException(); - exception.setContent(ScenarioFourException.DEFAULT_CONTENT); - throw exception; - } - - public ScenarioFourSdo passScenarioFourStruct(ScenarioFourSdo scenarioFourSdo) { - return scenarioFourSdo; - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java deleted file mode 100644 index de8624455f..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourStruct.java +++ /dev/null @@ -1,40 +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.test.corba.types; - -/** - * @version $Rev$ $Date$ - * Type for ScenarioFour test - */ -public class ScenarioFourStruct { - - public String field1; - public int field2; - public double[] field3; - - public boolean equals(ScenarioFourStruct arg) { - return (field1 != null && arg.field1 != null - && field1.equals(arg.field1) - && field2 == arg.field2 - && field3 != null - && arg.field3 != null && field3.length == arg.field3.length); - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java deleted file mode 100644 index 1813de4e67..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneComponent.java +++ /dev/null @@ -1,46 +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.test.corba.types; - -import org.apache.tuscany.sca.test.corba.generated.RichStruct; -import org.apache.tuscany.sca.test.corba.generated.ScenarioOne; -import org.apache.tuscany.sca.test.corba.generated.ScenarioOneOperations; -import org.apache.tuscany.sca.test.corba.generated.UnexpectedException; -import org.apache.tuscany.sca.test.corba.generated.WrongColor; -import org.oasisopen.sca.annotation.Reference; - -/** - * @version $Rev$ $Date$ - * Component for reference using generated interface. - */ -public class ScenarioOneComponent implements ScenarioOneOperations { - - private ScenarioOne scenarionOne; - - @Reference - public void setScenarioOne(ScenarioOne scenarioOne) { - this.scenarionOne = scenarioOne; - } - - public RichStruct setRichStruct(RichStruct richStruct) throws WrongColor, UnexpectedException { - return scenarionOne.setRichStruct(richStruct); - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.java deleted file mode 100644 index 9b49adbfbb..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioOneServant.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.test.corba.types; - -import org.apache.tuscany.sca.test.corba.generated.Color; -import org.apache.tuscany.sca.test.corba.generated.RichStruct; -import org.apache.tuscany.sca.test.corba.generated.UnexpectedException; -import org.apache.tuscany.sca.test.corba.generated.WrongColor; -import org.apache.tuscany.sca.test.corba.generated._ScenarioOneImplBase; - -/** - * @version $Rev$ $Date$ - * Servant for generated interface. Uses generated classes. - */ -public class ScenarioOneServant extends _ScenarioOneImplBase { - - private static final long serialVersionUID = 1L; - - public RichStruct setRichStruct(RichStruct richStruct) throws WrongColor, UnexpectedException { - if (richStruct.innerStruct.color.value() == Color.red.value()) { - throw new WrongColor(richStruct.innerStruct.color, Color.green); - } else if (richStruct.longField == 0) { - throw new UnexpectedException("Expected richStruct.longField != 0"); - } - return richStruct; - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java deleted file mode 100644 index 7889a80bf1..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioSixServant.java +++ /dev/null @@ -1,46 +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.test.corba.types; - -import org.apache.tuscany.sca.test.corba.generated.AnnotatedStruct; -import org.apache.tuscany.sca.test.corba.generated.RichUnion; -import org.apache.tuscany.sca.test.corba.generated._ScenarioSixImplBase; - -/** - * @version $Rev$ $Date$ - * Scenario six servant for generated interface. - */ -public class ScenarioSixServant extends _ScenarioSixImplBase { - - private static final long serialVersionUID = 1L; - - public String[][] passStringArray(String[][] arg) { - return arg; - } - - public AnnotatedStruct passAnnotatedStruct(AnnotatedStruct arg) { - return arg; - } - - public RichUnion passRichUnion(RichUnion arg) { - return arg; - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java deleted file mode 100644 index cdd49904d3..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioTwoServant.java +++ /dev/null @@ -1,42 +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.test.corba.types; - -import org.apache.tuscany.sca.test.corba.generated._ScenarioTwoImplBase; - -/** - * @version $Rev$ $Date$ - * Servant for generated interface. - */ -public class ScenarioTwoServant extends _ScenarioTwoImplBase { - - private static final long serialVersionUID = 1L; - - private String stringField = ""; - - public String stringField() { - return stringField; - } - - public void stringField(String newStringField) { - this.stringField = newStringField; - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java deleted file mode 100644 index 6f0ef584da..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TAnnotatedStruct.java +++ /dev/null @@ -1,40 +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.test.corba.types; - -import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaArray; - -/** - * @version $Rev$ $Date$ Scenario six structure used by Tuscany. - */ -public final class TAnnotatedStruct { - - @CorbaArray( {2, 2}) - public String[][] stringArray; - - public TAnnotatedStruct() { - - } - - public TAnnotatedStruct(String[][] stringArray) { - this.stringArray = stringArray; - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java deleted file mode 100644 index 71003d008f..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TColor.java +++ /dev/null @@ -1,62 +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.test.corba.types; - -/** - * @version $Rev$ $Date$ - * User provided enum representation for Color type. - */ -public class TColor { - - private int value; - - public static final int _red = 0; - public static final int _yellow = 1; - public static final int _green = 2; - - public static final TColor red = new TColor(_red); - public static final TColor yellow = new TColor(_yellow); - public static final TColor green = new TColor(_green); - - public int value() { - return value; - } - - public static TColor from_int(int value) { - switch (value) { - case 0: - return red; - case 1: - return yellow; - case 2: - return green; - } - return green; - } - - protected TColor(int value) { - this.value = value; - } - - public TColor() { - - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java deleted file mode 100644 index 271f1e669b..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerStruct.java +++ /dev/null @@ -1,42 +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.test.corba.types; - -/** - * @version $Rev$ $Date$ - * User provided interface representation for InnerStruct type. - */ -public final class TInnerStruct { - - public int[][] twoDimLongSequence; - public String stringField; - public TColor color; - - public TInnerStruct() { - - } - - public TInnerStruct(int[][] a1, String a2, TColor a3) { - twoDimLongSequence = a1; - stringField = a2; - color = a3; - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java deleted file mode 100644 index f2baffce9a..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TInnerUnion.java +++ /dev/null @@ -1,59 +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.test.corba.types; - -import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaUnionElement; -import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaUnionElementType; - -/** - * @version $Rev$ $Date$ - * User provided interface representation for CORBA InnerUnion type. - */ -public final class TInnerUnion { - - @CorbaUnionElement(type = CorbaUnionElementType.option, optionNumber = 1) - private int x; - - @CorbaUnionElement(type = CorbaUnionElementType.option, optionNumber = 2) - private float y; - - @CorbaUnionElement(type = CorbaUnionElementType.discriminator) - @SuppressWarnings("unused") - private int discriminator; - - public int getX() { - return x; - } - - public void setX(int x) { - discriminator = 1; - this.x = x; - } - - public float getY() { - return y; - } - - public void setY(float y) { - discriminator = 2; - this.y = y; - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java deleted file mode 100644 index 1b44da9752..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichStruct.java +++ /dev/null @@ -1,42 +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.test.corba.types; - -/** - * @version $Rev$ $Date$ - * User provided interface representation for RichStruct type. - */ -public final class TRichStruct { - - public TInnerStruct innerStruct; - public String[] stringSequence; - public int longField; - - public TRichStruct() { - - } - - public TRichStruct(TInnerStruct a1, String[] a2, int a3) { - innerStruct = a1; - stringSequence = a2; - longField = a3; - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java deleted file mode 100644 index 8270ba1a8c..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TRichUnion.java +++ /dev/null @@ -1,95 +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.test.corba.types; - -import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaUnionElement; -import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaUnionElementType; - -/** - * @version $Rev$ $Date$ - * User provided interface representation for CORBA RichUnion type. - */ -public final class TRichUnion { - - @CorbaUnionElement(type = CorbaUnionElementType.option, optionNumber = 1) - private int x; - - @CorbaUnionElement(type = CorbaUnionElementType.option, optionNumber = 2) - private float y; - - @CorbaUnionElement(type = CorbaUnionElementType.option, optionNumber = 3) - private String z; - - @CorbaUnionElement(type = CorbaUnionElementType.option, optionNumber = 4) - private TInnerUnion iu; - - @CorbaUnionElement(type = CorbaUnionElementType.defaultOption) - private boolean def; - - @CorbaUnionElement(type = CorbaUnionElementType.discriminator) - @SuppressWarnings("unused") - private int discriminator = -1; - - public int getX() { - return x; - } - - public void setX(int x) { - this.discriminator = 1; - this.x = x; - } - - public float getY() { - return y; - } - - public void setY(float y) { - this.discriminator = 2; - this.y = y; - } - - public String getZ() { - return z; - } - - public void setZ(String z) { - this.discriminator = 3; - this.z = z; - } - - public boolean isDef() { - return def; - } - - public void setDef(boolean def) { - this.discriminator = -1; - this.def = def; - } - - public TInnerUnion getIu() { - return iu; - } - - public void setIu(TInnerUnion iu) { - this.discriminator = 4; - this.iu = iu; - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java deleted file mode 100644 index 922759cd8d..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOne.java +++ /dev/null @@ -1,33 +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.test.corba.types; - -import org.apache.tuscany.sca.test.corba.generated.UnexpectedException; -import org.apache.tuscany.sca.test.corba.generated.WrongColor; - -/** - * @version $Rev$ $Date$ - * User provided CORBA service interface. - */ -public interface TScenarioOne { - - TRichStruct setRichStruct(TRichStruct richStruct) throws WrongColor, UnexpectedException; - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java deleted file mode 100644 index ac7b0af175..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneComponent.java +++ /dev/null @@ -1,43 +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.test.corba.types; - -import org.apache.tuscany.sca.test.corba.generated.UnexpectedException; -import org.apache.tuscany.sca.test.corba.generated.WrongColor; -import org.oasisopen.sca.annotation.Reference; - -/** - * @version $Rev$ $Date$ - * Component for reference using user provided interface. - */ -public class TScenarioOneComponent implements TScenarioOne { - - private TScenarioOne scenarionOne; - - @Reference - public void setScenarioOne(TScenarioOne scenarioOne) { - this.scenarionOne = scenarioOne; - } - - public TRichStruct setRichStruct(TRichStruct richStruct) throws WrongColor, UnexpectedException { - return scenarionOne.setRichStruct(richStruct); - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.java deleted file mode 100644 index 47f0775c16..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioOneServant.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.test.corba.types; - -import org.apache.tuscany.sca.test.corba.generated.Color; -import org.apache.tuscany.sca.test.corba.generated.UnexpectedException; -import org.apache.tuscany.sca.test.corba.generated.WrongColor; - -/** - * @version $Rev$ $Date$ - * Servant for user provided interface. Uses T* classes. - */ -public class TScenarioOneServant implements TScenarioOne { - - private static final long serialVersionUID = 1L; - - public TRichStruct setRichStruct(TRichStruct richStruct) throws WrongColor, UnexpectedException { - if (richStruct.innerStruct.color.value() == Color.red.value()) { - Color translatedColor = Color.from_int(richStruct.innerStruct.color.value()); - throw new WrongColor(translatedColor, Color.green); - } else if (richStruct.longField == 0) { - throw new UnexpectedException("Expected richStruct.longField != 0"); - } - return richStruct; - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.java deleted file mode 100644 index 0e894cb7ea..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSix.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.test.corba.types; - -import org.apache.tuscany.sca.binding.corba.provider.meta.CorbaArray; - -/** - * @version $Rev$ $Date$ - * Operations for scenario six. - */ -public interface TScenarioSix { - - @CorbaArray( {2, 2}) - public String[][] passStringArray(@CorbaArray( {2, 2})String[][] arg); - - public TAnnotatedStruct passAnnotatedStruct(TAnnotatedStruct arg); - - public TRichUnion passRichUnion(TRichUnion arg); - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java deleted file mode 100644 index 13bc1d499e..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixComponent.java +++ /dev/null @@ -1,41 +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.test.corba.types; - -import org.oasisopen.sca.annotation.Reference; - -/** - * @version $Rev$ $Date$ - * Component for obtaining ScenartioSix reference. - */ -public class TScenarioSixComponent { - - private TScenarioSix scenarioSix; - - @Reference - public void setScenarioSix(TScenarioSix scenarioSix) { - this.scenarioSix = scenarioSix; - } - - public TScenarioSix getScenarioSix() { - return scenarioSix; - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java deleted file mode 100644 index 8e76958e31..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioSixServant.java +++ /dev/null @@ -1,42 +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.test.corba.types; - -/** - * @version $Rev$ $Date$ - * Tuscany scenario six servant. - */ -public class TScenarioSixServant implements TScenarioSix { - - private static final long serialVersionUID = 1L; - - public String[][] passStringArray(String[][] arg) { - return arg; - } - - public TAnnotatedStruct passAnnotatedStruct(TAnnotatedStruct arg) { - return arg; - } - - public TRichUnion passRichUnion(TRichUnion arg) { - return arg; - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java deleted file mode 100644 index 1e4264256b..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThree.java +++ /dev/null @@ -1,42 +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.test.corba.types; - -/** - * @version $Rev$ $Date$ - * Operations for ScenarioThree. - */ -public interface TScenarioThree { - - int getIntField(); - - void setIntField(int intField); - - void overloadedName(); - - void overloadedName(String arg1); - - void overloadedName(String arg1, int arg2); - - int caseDifferent(); - - int CaseDifferent(); - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java deleted file mode 100644 index 12b0f404ae..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeComponent.java +++ /dev/null @@ -1,41 +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.test.corba.types; - -import org.oasisopen.sca.annotation.Reference; - -/** - * @version $Rev$ $Date$ - * Component for obtaining ScenartioThree reference. - */ -public class TScenarioThreeComponent { - - private TScenarioThree scenarionThree; - - @Reference - public void setScenarioThree(TScenarioThree scenarioThree) { - this.scenarionThree = scenarioThree; - } - - public TScenarioThree getScenarioThree() { - return scenarionThree; - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.java deleted file mode 100644 index b679214c6c..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioThreeServant.java +++ /dev/null @@ -1,52 +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.test.corba.types; - -/** - * @version $Rev$ $Date$ - * Servant for user provided interface. - */ -public class TScenarioThreeServant implements TScenarioThree { - - public int getIntField() { - return 0; - } - - public void overloadedName() { - } - - public void overloadedName(String arg1) { - } - - public void overloadedName(String arg1, int arg2) { - } - - public void setIntField(int intField) { - } - - public int CaseDifferent() { - return 1; - } - - public int caseDifferent() { - return 0; - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.java deleted file mode 100644 index 415634c80f..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwo.java +++ /dev/null @@ -1,32 +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.test.corba.types; - -/** - * @version $Rev$ $Date$ - * Operations for ScenarioTwo. - */ -public interface TScenarioTwo { - - String getStringField(); - - void setStringField(String stringField); - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java deleted file mode 100644 index 937d82b33e..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoComponent.java +++ /dev/null @@ -1,41 +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.test.corba.types; - -import org.oasisopen.sca.annotation.Reference; - -/** - * @version $Rev$ $Date$ - * Component for obtaining ScenartioTwo reference. - */ -public class TScenarioTwoComponent { - - private TScenarioTwo scenarioTwo; - - @Reference - public void setScenarioTwo(TScenarioTwo scenarioTwo) { - this.scenarioTwo = scenarioTwo; - } - - public TScenarioTwo getScenarioTwo() { - return scenarioTwo; - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java b/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java deleted file mode 100644 index cb868d18a0..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/TScenarioTwoServant.java +++ /dev/null @@ -1,38 +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.test.corba.types; - -/** - * @version $Rev$ $Date$ - * Servant for user provided interface. - */ -public class TScenarioTwoServant implements TScenarioTwo { - - private static String stringField = ""; - - public String getStringField() { - return stringField; - } - - public void setStringField(String stringField) { - TScenarioTwoServant.stringField = stringField; - } - -} diff --git a/sca-java-2.x/trunk/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-2.x/trunk/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator deleted file mode 100644 index 3e77527d73..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator +++ /dev/null @@ -1,18 +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.
-
-org.apache.tuscany.sca.test.corba.TestCorbaHostModuleActivator
diff --git a/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioFive.composite b/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioFive.composite deleted file mode 100644 index b3675a0194..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioFive.composite +++ /dev/null @@ -1,41 +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.
--->
-
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="Corba5">
-
- <component name="ScenarioFiveService">
- <implementation.java class="org.apache.tuscany.sca.test.corba.types.ScenarioFiveImpl" />
- </component>
- <service name="ScenarioFive" promote="ScenarioFiveService">
- <interface.java interface="org.apache.tuscany.sca.test.corba.types.ScenarioFive"/>
- <binding.sca uri="corbaname::localhost:5090#ScenarioFive"/>
- </service>
-
- <component name="ScenarioFive">
- <implementation.java class="org.apache.tuscany.sca.test.corba.types.ScenarioFiveComponent" />
- <reference name="scenarioFive">
- <binding.sca uri="corbaname::localhost:5090#ScenarioFive"/>
- </reference>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioFour.composite b/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioFour.composite deleted file mode 100644 index 50bfc02803..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioFour.composite +++ /dev/null @@ -1,56 +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.
--->
-
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="Corba4">
-
- <!-- note that some binding configuration (like port or host name) is also used in JUnit test class -->
-
- <component name="ScenarioFourService">
- <implementation.java class="org.apache.tuscany.sca.test.corba.types.ScenarioFourImpl" />
- </component>
- <service name="ScenarioFour" promote="ScenarioFourService">
- <interface.java interface="org.apache.tuscany.sca.test.corba.types.ScenarioFour"/>
- <binding.sca uri="corbaname::localhost:5080#ScenarioFour"/>
- </service>
-
- <component name="ScenarioFour">
- <implementation.java class="org.apache.tuscany.sca.test.corba.types.ScenarioFourComponent" />
- <reference name="scenarioFour">
- <binding.sca uri="corbaname::localhost:5080#ScenarioFour"/>
- </reference>
- </component>
-
- <!-- doubled service and reference to test reuse of name server -->
- <service name="ScenarioFourDoubled" promote="ScenarioFourService">
- <interface.java interface="org.apache.tuscany.sca.test.corba.types.ScenarioFour"/>
- <binding.sca uri="corbaname::localhost:5080#ScenarioFourReuse"/>
- </service>
-
- <component name="ScenarioFourReuse">
- <implementation.java class="org.apache.tuscany.sca.test.corba.types.ScenarioFourComponent" />
- <reference name="scenarioFour">
- <binding.sca uri="corbaname::localhost:5080#ScenarioFourReuse"/>
- </reference>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioOne.composite b/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioOne.composite deleted file mode 100644 index 495ca2a41f..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioOne.composite +++ /dev/null @@ -1,111 +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.
--->
-
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="Corba1">
-
- <!-- note that some binding configuration (like port or host name) is also used in JUnit test class -->
-
- <!-- reference 1 - consuming traditional CORBA service using USER PROVIDED Java interface -->
- <component name="ScenarioOne">
- <implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioOneComponent" />
- <reference name="scenarioOne">
- <tuscany:binding.corba host="localhost" port="5060" name="ScenarioOne"/>
- </reference>
- </component>
-
- <!-- reference 2 - consuming traditional CORBA service using GENERATED Java interface -->
- <component name="ScenarioOneGenerated">
- <implementation.java class="org.apache.tuscany.sca.test.corba.types.ScenarioOneComponent" />
- <reference name="scenarioOne">
- <tuscany:binding.corba host="localhost" port="5060" name="ScenarioOne"/>
- </reference>
- </component>
-
- <!-- TUSCANY CORBA SERVICE 1 (TS1) - CORBA service using USER PROVIDED Java interface -->
- <component name="ScenarionOneService">
- <implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioOneServant" />
- </component>
- <service name="ScenarionOneService" promote="ScenarionOneService">
- <interface.java interface="org.apache.tuscany.sca.test.corba.types.TScenarioOne"/>
- <tuscany:binding.corba host="localhost" port="5060" name="ScenarioOneTuscany" id="IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioOne:1.0"/>
- </service>
-
- <!-- TUSCANY CORBA SERVICE 2 (TS2) - CORBA service using GENERATED provided Java interface -->
- <component name="ScenarionOneServiceGenerated">
- <implementation.java class="org.apache.tuscany.sca.test.corba.types.ScenarioOneServant" />
- </component>
- <service name="ScenarionOneServiceGenerated" promote="ScenarionOneServiceGenerated">
- <interface.java interface="org.apache.tuscany.sca.test.corba.generated.ScenarioOneOperations"/>
- <tuscany:binding.corba host="localhost" port="5060" name="ScenarioOneTuscanyGenerated" id="IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioOne:1.0"/>
- </service>
-
- <!-- reference 3 - user provided interface combined with TUSCANY SERVICE 1 (TS1) -->
- <component name="TU2TS1">
- <implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioOneComponent" />
- <reference name="scenarioOne">
- <tuscany:binding.corba host="localhost" port="5060" name="ScenarioOneTuscany"/>
- </reference>
- </component>
-
- <!-- reference 4 - generated interface combined with TUSCANY SERVICE 1 (TS1) -->
- <component name="TG2TS1">
- <implementation.java class="org.apache.tuscany.sca.test.corba.types.ScenarioOneComponent" />
- <reference name="scenarioOne">
- <tuscany:binding.corba host="localhost" port="5060" name="ScenarioOneTuscany"/>
- </reference>
- </component>
-
- <!-- reference 5 - user provided interface combined with TUSCANY SERVICE 2 (TS2) -->
- <component name="TU2TS2">
- <implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioOneComponent" />
- <reference name="scenarioOne">
- <tuscany:binding.corba host="localhost" port="5060" name="ScenarioOneTuscanyGenerated"/>
- </reference>
- </component>
-
- <!-- reference 6 - generated interface combined with TUSCANY SERVICE 2 (TS2) -->
- <component name="TG2TS2">
- <implementation.java class="org.apache.tuscany.sca.test.corba.types.ScenarioOneComponent" />
- <reference name="scenarioOne">
- <tuscany:binding.corba host="localhost" port="5060" name="ScenarioOneTuscanyGenerated"/>
- </reference>
- </component>
-
- <!-- TUSCANY CORBA SERVICE 3 (TS3) - CORBA service using registered using URI -->
- <component name="ScenarionOneServiceURI">
- <implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioOneServant" />
- </component>
- <service name="ScenarionOneServiceGenerated" promote="ScenarionOneServiceGenerated">
- <interface.java interface="org.apache.tuscany.sca.test.corba.generated.ScenarioOneOperations"/>
- <tuscany:binding.corba uri="corbaname::localhost:5060#NamedWithURI"/>
- </service>
-
- <!-- reference 7 - ... -->
- <component name="UriBinding">
- <implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioOneComponent" />
- <reference name="scenarioOne">
- <tuscany:binding.corba uri="corbaname::localhost:5060#NamedWithURI"/>
- </reference>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioSix.composite b/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioSix.composite deleted file mode 100644 index 840cd076b1..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioSix.composite +++ /dev/null @@ -1,41 +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.
--->
-
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="Corba6">
-
- <component name="ScenarioSix">
- <implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioSixComponent" />
- <reference name="scenarioSix">
- <tuscany:binding.corba host="localhost" port="5050" name="ScenarioSix"/>
- </reference>
- </component>
-
- <component name="ScenarionSixService">
- <implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioSixServant" />
- </component>
- <service name="ScenarionSixService" promote="ScenarionSixService">
- <interface.java interface="org.apache.tuscany.sca.test.corba.types.TScenarioSix"/>
- <tuscany:binding.corba host="localhost" port="5050" name="ScenarioSixTuscany" id="IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioSix:1.0"/>
- </service>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioThree.composite b/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioThree.composite deleted file mode 100644 index f02ba89496..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioThree.composite +++ /dev/null @@ -1,43 +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.
--->
-
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="Corba3">
-
- <!-- note that some binding configuration (like port or host name) is also used in JUnit test class -->
-
- <component name="ScenarioThreeService">
- <implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioThreeServant" />
- </component>
- <service name="ScenarioThreeServiceTuscany" promote="ScenarioThreeService">
- <interface.java interface="org.apache.tuscany.sca.test.corba.types.TScenarioThree"/>
- <tuscany:binding.corba uri="corbaname::localhost:5060#ScenarioThree"/>
- </service>
-
- <component name="ScenarioThreeReference">
- <implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioThreeComponent" />
- <reference name="scenarioThree">
- <tuscany:binding.corba uri="corbaname::localhost:5060#ScenarioThree"/>
- </reference>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioTwo.composite b/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioTwo.composite deleted file mode 100644 index ed3f545f72..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/resources/ScenarioTwo.composite +++ /dev/null @@ -1,43 +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.
--->
-
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="Corba2">
-
- <!-- note that some binding configuration (like port or host name) is also used in JUnit test class -->
-
- <component name="ScenarioTwoService">
- <implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioTwoServant" />
- </component>
- <service name="ScenarioTwoServiceTuscany" promote="ScenarioTwoService">
- <interface.java interface="org.apache.tuscany.sca.test.corba.types.TScenarioTwo"/>
- <tuscany:binding.corba uri="corbaname::localhost:5060#ScenarioTwo" id="IDL:org/apache/tuscany/sca/test/corba/generated/ScenarioTwo:1.0"/>
- </service>
-
- <component name="ScenarioTwo">
- <implementation.java class="org.apache.tuscany.sca.test.corba.types.TScenarioTwoComponent" />
- <reference name="scenarioTwo">
- <tuscany:binding.corba uri="corbaname::localhost:5060#ScenarioTwoGenerated"/>
- </reference>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/corba/src/test/resources/itest_scenario.idl b/sca-java-2.x/trunk/itest/corba/src/test/resources/itest_scenario.idl deleted file mode 100644 index 41489a4565..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/resources/itest_scenario.idl +++ /dev/null @@ -1,110 +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.
- */
-
-/*
- * compile by
- * idlj -fall -oldImplBase itest_scenario.idl
- */
-
-module org {
- module apache {
- module tuscany {
- module sca {
- module test {
- module corba {
- module generated {
-
- // objects for ScenarioOne
-
- enum Color {red, yellow, green};
-
- typedef sequence<string> StringSequence;
- typedef sequence<long> LongSequence;
- typedef sequence<LongSequence> TwoDimLongSequence;
-
- struct InnerStruct {
- TwoDimLongSequence twoDimLongSequence;
- string stringField;
- Color color;
- };
-
- struct RichStruct {
- InnerStruct innerStruct;
- StringSequence stringSequence;
- long longField;
- };
-
- exception WrongColor {
- Color givenColor;
- Color correctColor;
- };
-
- exception UnexpectedException {
- string info;
- };
-
- interface ScenarioOne {
-
- RichStruct setRichStruct(in RichStruct richStruct) raises (WrongColor, UnexpectedException);
-
- };
-
- // objects for ScenarioTwo
-
- interface ScenarioTwo {
-
- attribute string stringField;
-
- };
-
- typedef string StringArray[2][2];
-
- struct AnnotatedStruct {
- StringArray stringArray;
- };
-
- union InnerUnion switch (long) {
- case 1: long x;
- case 2: float y;
- };
-
- union RichUnion switch (long) {
- case 1: long x;
- case 2: float y;
- case 3: string z;
- case 4: InnerUnion iu;
- default: boolean a;
- };
-
- interface ScenarioSix {
-
- StringArray passStringArray(in StringArray arg);
-
- AnnotatedStruct passAnnotatedStruct(in AnnotatedStruct arg);
-
- RichUnion passRichUnion(in RichUnion arg);
-
- };
- };
- };
- };
- };
- };
- };
-};
diff --git a/sca-java-2.x/trunk/itest/corba/src/test/resources/scenariofour.xsd b/sca-java-2.x/trunk/itest/corba/src/test/resources/scenariofour.xsd deleted file mode 100644 index 2669b54be3..0000000000 --- a/sca-java-2.x/trunk/itest/corba/src/test/resources/scenariofour.xsd +++ /dev/null @@ -1,31 +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. ---> -<schema targetNamespace="http://example.com/scenariofour" xmlns="http://www.w3.org/2001/XMLSchema"> - - <element name="ScenarioFourSdo"> - <complexType> - <sequence> - <element name="message" minOccurs="1" type="string" /> - <element name="symbol" minOccurs="1" type="string" /> - </sequence> - </complexType> - </element> - -</schema> diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/pom.xml b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/pom.xml deleted file mode 100644 index 669c85ca19..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/pom.xml +++ /dev/null @@ -1,188 +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. ---> -<project> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-databindings</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <modelVersion>4.0.0</modelVersion> - - <artifactId>itest-databindings-jaxb-bottom-up</artifactId> - <version>2.0-SNAPSHOT</version> - <name>Apache Tuscany SCA iTest Databinding - JAXB Bottom Up</name> - - <repositories> - <repository> - <snapshots> - <enabled>true</enabled> - </snapshots> - <id>java.net</id> - <name>java.net Maven 1.x Repository</name> - <url>http://download.java.net/maven/1</url> - <layout>legacy</layout> - </repository> - <repository> - <id>java.net2</id> - <name>java.net Maven 2.x Repository</name> - <url>http://download.java.net/maven/2</url> - </repository> - </repositories> - - <pluginRepositories> - <pluginRepository> - <id>java.net2</id> - <name>java.net Maven 2.x Repository</name> - <url>http://download.java.net/maven/2</url> - </pluginRepository> - </pluginRepositories> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> - <version>${pom.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-jaxb</artifactId> - <version>${pom.version}</version> - <scope>runtime</scope> - </dependency> - <!--dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-sdo</artifactId> - <version>${pom.version}</version> - <scope>compile</scope> - </dependency--> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-axiom</artifactId> - <version>${pom.version}</version> - <scope>compile</scope> - </dependency> - <!--dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-databindings-common</artifactId> - <version>${pom.version}</version> - <scope>compile</scope> - </dependency--> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>${pom.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-interface-java</artifactId> - <version>${pom.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-jetty</artifactId> - <version>${pom.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>2.1</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>com.sun.xml.ws</groupId> - <artifactId>jaxws-rt</artifactId> - <version>2.1.3</version> - </dependency> - <!-- Added by Simon Nash --> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.1</version> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.12</version> - <scope>provided</scope> - </dependency> - <!-- End of addition --> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>-Djava.endorsed.dirs=target/endorsed</argLine> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy</id> - <phase>generate-sources</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>javax.xml.ws</groupId> - <artifactId>jaxws-api</artifactId> - <version>2.1</version> - <type>jar</type> - </artifactItem> - <artifactItem> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>2.1</version> - <type>jar</type> - </artifactItem> - </artifactItems> - <outputDirectory>${project.build.directory}/endorsed</outputDirectory> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>true</overWriteSnapshots> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java deleted file mode 100644 index 5d389643cc..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java +++ /dev/null @@ -1,29 +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.itest.databindings.jaxb; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * The interface for AClientService. - */ -@Remotable -public interface AClientService { - public String getGreetingsForward(String name); -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java deleted file mode 100644 index 52f1c01fd8..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java +++ /dev/null @@ -1,32 +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.itest.databindings.jaxb; - -import javax.jws.soap.SOAPBinding; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * The interface for AService. - */ -@Remotable -@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE) -public interface AService { - public String getGreetings(String name); -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java deleted file mode 100644 index f1c948dc1c..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java +++ /dev/null @@ -1,66 +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.itest.databindings.jaxb; - -import javax.xml.bind.annotation.XmlSeeAlso; - -/** - * @version $Rev$ $Date$ - */ -@XmlSeeAlso({Bean10.class, Bean11.class, Bean10[].class, Bean11[].class}) -public class Bean1<T> { - private T item; - - public Bean1() { - } - - public Bean1(T item) { - this.item = item; - } - - public void setItem(T item) { - this.item = item; - } - - public T getItem() { - return item; - } - - public boolean equals(Object that) { - if(that == null) { - return false; - } - if(that.getClass() != this.getClass()) { - return false; - } - - Bean1<?> that1 = (Bean1<?>)that; - if(this == that1) { - return true; - } else if(this.item != null) { - return this.item.equals(that1.item); - } else { - return that1.item == null; - } - } - - public String toString() { - return this.getClass().getSimpleName()+"[item = "+item+"]"; - } -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java deleted file mode 100644 index 4a4419a42b..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java +++ /dev/null @@ -1,25 +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.itest.databindings.jaxb; - -/** - * @version $Rev$ $Date$ - */ -public class Bean10 extends Bean1<String> { -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java deleted file mode 100644 index 65f019ec48..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java +++ /dev/null @@ -1,25 +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.itest.databindings.jaxb; - -/** - * @version $Rev$ $Date$ - */ -public class Bean11 extends Bean1<String> { -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java deleted file mode 100644 index 45c01dc054..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java +++ /dev/null @@ -1,59 +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.itest.databindings.jaxb; - -import javax.xml.bind.annotation.XmlSeeAlso; - -/** - * @version $Rev$ $Date$ - */ -@XmlSeeAlso({Bean3.class, Bean3[].class, Bean31.class, Bean31[].class}) -public class Bean2 { - private String name; - - public void setName(String name) { - this.name = name; - } - - public String getName() { - return name; - } - - public boolean equals(Object that) { - if(that == null) { - return false; - } - - if(this.getClass() != that.getClass()) { - return false; - } - - if(this == that) { - return true; - } else if(this.name != null) { - return this.name.equals(((Bean2)that).name); - } else { - return ((Bean2)that).name == null; - } - } - - public String toString() { - return this.getClass().getSimpleName()+"[name = "+name+"]"; - } -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java deleted file mode 100644 index 4e0bd38b2b..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java +++ /dev/null @@ -1,56 +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.itest.databindings.jaxb; - -/** - * @version $Rev$ $Date$ - */ -public class Bean3 extends Bean2 { - private String address; - - public void setAddress(String address) { - this.address = address; - } - - public String getAddress() { - return address; - } - - public boolean equals(Object that) { - if(that == null) { - return false; - } - - if(this.getClass() != that.getClass()) { - return false; - } - - if(this == that) { - return true; - } else if(this.address != null) { - return this.address.equals(((Bean3)that).address) && super.equals(that); - } else { - return ((Bean3)that).address == null && super.equals(that); - } - } - - public String toString() { - return this.getClass().getSimpleName()+"[name = "+super.getName()+", address = "+address+"]"; - } -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java deleted file mode 100644 index 40aff31297..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java +++ /dev/null @@ -1,56 +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.itest.databindings.jaxb; - -/** - * @version $Rev$ $Date$ - */ -public class Bean31 extends Bean2 { - private String address; - - public void setAddress(String address) { - this.address = address; - } - - public String getAddress() { - return address; - } - - public boolean equals(Object that) { - if(that == null) { - return false; - } - - if(this.getClass() != that.getClass()) { - return false; - } - - if(this == that) { - return true; - } else if(this.address != null) { - return this.address.equals(((Bean31)that).address) && super.equals(that); - } else { - return ((Bean31)that).address == null && super.equals(that); - } - } - - public String toString() { - return this.getClass().getSimpleName()+"[name = "+super.getName()+", address = "+address+"]"; - } -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java deleted file mode 100644 index ca012b967d..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java +++ /dev/null @@ -1,42 +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.itest.databindings.jaxb; - -/** - * The interface for GenericsLocalService. - * - * @version $Rev$ $Date$ - */ -public interface GenericsLocalService { - Bean1<String> getTypeExplicit(Bean1<String> arg); - - <T> Bean1<T> getTypeUnbound(T[] anArray); - - <T extends Bean2> Bean1<T> getTypeExtends(T[] anArray); - - <T extends Bean1<String>> Bean1<T> getRecursiveTypeBound(T[] anArray); - - Bean1<?> getWildcardUnbound(Bean1<?> arg); - - Bean1<? super Bean3> getWildcardSuper(Bean1<? super Bean3> arg); - - Bean1<? extends Bean2> getWildcardExtends(Bean1<? extends Bean2> arg); - - Bean2 getPolymorphic(Bean2 arg); -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java deleted file mode 100644 index be446c9759..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java +++ /dev/null @@ -1,30 +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.itest.databindings.jaxb; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * The interface for GenericsService. - * - * @version $Rev$ $Date$ - */ -@Remotable -public interface GenericsService extends GenericsLocalService{ -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java deleted file mode 100644 index 3bae554dc7..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java +++ /dev/null @@ -1,43 +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.itest.databindings.jaxb; - -/** - * The interface for GenericsServiceClient. - * - * @version $Rev$ $Date$ - */ -public interface GenericsServiceClient { - Bean1<String> getTypeExplicitForward(Bean1<String> arg); - - <T> Bean1<T> getTypeUnboundForward(T[] anArray); - - <T extends Bean2> Bean1<T> getTypeExtendsForward(T[] anArray); - - <T extends Bean1<String>> Bean1<T> getRecursiveTypeBoundForward(T[] anArray); - - Bean1<?> getWildcardUnboundForward(Bean1<?> arg); - - Bean1<? super Bean3> getWildcardSuperForward(Bean1<? super Bean3> arg); - - Bean1<? extends Bean2> getWildcardExtendsForward(Bean1<? extends Bean2> arg); - - Bean2 getPolymorphicForward(Bean2 arg); -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java deleted file mode 100644 index a31cc3d45a..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.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.itest.databindings.jaxb; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * The interface for HelloLocalServiceSimple. - */ -public interface HelloLocalServiceSimple { - String getGreetings(String name); - String[] getGreetingsArray(String[] names); - List<String> getGreetingsList(List<String> names); - ArrayList<String> getGreetingsArrayList(ArrayList<String> names); - Map<String, String> getGreetingsMap(Map<String, String> namesMap); - HashMap<String, String> getGreetingsHashMap(HashMap<String, String> namesMap); - String getGreetingsVarArgs(String... names); -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java deleted file mode 100644 index df9e6e53ec..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java +++ /dev/null @@ -1,29 +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.itest.databindings.jaxb; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * The interface for HelloServiceSimple. - */ -@Remotable -public interface HelloServiceSimple extends HelloLocalServiceSimple { - // Add any methods to the local interface. -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java deleted file mode 100644 index 779943739e..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java +++ /dev/null @@ -1,38 +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.itest.databindings.jaxb; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * The interface for HelloServiceSimpleClient. - */ -public interface HelloServiceSimpleClient { - String getGreetingsForward(String name); - String[] getGreetingsArrayForward(String[] names); - List<String> getGreetingsListForward(List<String> names); - ArrayList<String> getGreetingsArrayListForward(ArrayList<String> names); - Map<String, String> getGreetingsMapForward(Map<String, String> namesMap); - HashMap<String, String> getGreetingsHashMapForward(HashMap<String, String> namesMap); - String getGreetingsVarArgsForward(String... names); -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java deleted file mode 100644 index 6239c0f5f1..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java +++ /dev/null @@ -1,47 +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.itest.databindings.jaxb; - - -/** - * The interface for PrimitivesLocalService. - */ -public interface PrimitivesLocalService { - boolean negateBoolean(boolean flag); - boolean[] negateBooleanArray(boolean[] flags); - boolean[] identityBooleanArray(boolean[] flags); - byte negateByte(byte b); - byte[] negateByteArray(byte[] ba); - byte[] identityByteArray(byte[] ba); - short negateShort(short s); - short[] negateShortArray(short[] s); - short[] identityShortArray(short[] sa); - int negateInt(int s); - int[] negateIntArray(int[] s); - int[] identityIntArray(int[] ia); - long negateLong(long l); - long[] negateLongArray(long[] la); - long[] identityLongArray(long[] la); - float negateFloat(float f); - float[] negateFloatArray(float[] fa); - float[] identityFloatArray(float[] fa); - double negateDouble(double d); - double[] negateDoubleArray(double[] da); - double[] identityDoubleArray(double[] da); -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java deleted file mode 100644 index 690a2adb3d..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java +++ /dev/null @@ -1,29 +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.itest.databindings.jaxb; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * The interface for PrimitivesService. - */ -@Remotable -public interface PrimitivesService extends PrimitivesLocalService { - // Add any methods to the local interface. -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java deleted file mode 100644 index 3bdf886dfa..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.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.itest.databindings.jaxb; - - -/** - * The interface for PrimitivesServiceClient. - */ -public interface PrimitivesServiceClient { - boolean negateBooleanForward(boolean flag); - boolean[] negateBooleanArrayForward(boolean[] flags); - boolean passByValueBooleanArray(); - byte negateByteForward(byte b); - byte[] negateByteArrayForward(byte[] ba); - boolean passByValueByteArray(); - short negateShortForward(short s); - short[] negateShortArrayForward(short[] sa); - boolean passByValueShortArray(); - int negateIntForward(int i); - int[] negateIntArrayForward(int[] ia); - boolean passByValueIntArray(); - long negateLongForward(long l); - long[] negateLongArrayForward(long[] la); - boolean passByValueLongArray(); - float negateFloatForward(float f); - float[] negateFloatArrayForward(float[] fa); - boolean passByValueFloatArray(); - double negateDoubleForward(double d); - double[] negateDoubleArrayForward(double[] da); - boolean passByValueDoubleArray(); -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java deleted file mode 100644 index 0fdf69459f..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java +++ /dev/null @@ -1,78 +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.itest.databindings.jaxb; - -import java.awt.Image; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.net.URI; -import java.util.Calendar; -import java.util.Date; -import java.util.UUID; - -import javax.activation.DataHandler; -import javax.xml.datatype.Duration; -import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.namespace.QName; -import javax.xml.transform.Source; - - -/** - * The interface for StandardTypesLocalService. - */ -public interface StandardTypesLocalService { - BigInteger getNewBigInteger(BigInteger bi); - BigInteger[] getNewBigIntegerArray(BigInteger[] bia); - - BigDecimal getNewBigDecimal(BigDecimal bd); - BigDecimal[] getNewBigDecimalArray(BigDecimal[] bda); - - Calendar getNewCalendar(Calendar c); - Calendar[] getNewCalendarArray(Calendar[] ca); - - Date getNewDate(Date d); - Date[] getNewDateArray(Date[] da); - - QName getNewQName(QName qname); - QName[] getNewQNameArray(QName[] qnames); - - URI getNewURI(URI uri); - URI[] getNewURIArray(URI[] uris); - - XMLGregorianCalendar getNewXMLGregorianCalendar(XMLGregorianCalendar xgcal); - XMLGregorianCalendar[] getNewXMLGregorianCalendarArray(XMLGregorianCalendar[] xgcal); - - Duration getNewDuration(Duration d); - Duration[] getNewDurationArray(Duration[] da); - - Object getNewObject(Object obj); - Object[] getNewObjectArray(Object[] objs); - - Image getNewImage(Image img); - Image[] getNewImageArray(Image[] imgs); - - DataHandler getNewDataHandler(DataHandler dh); - DataHandler[] getNewDataHandlerArray(DataHandler[] dha); - - Source getNewSource(Source src); - Source[] getNewSourceArray(Source[] srcs); - - UUID getNewUUID(UUID uuid); - UUID[] getNewUUIDArray(UUID[] uuids); -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java deleted file mode 100644 index 3b9690b7d2..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java +++ /dev/null @@ -1,30 +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.itest.databindings.jaxb; - -import org.oasisopen.sca.annotation.Remotable; - - - -/** - * The interface for StandardTypesService. - */ -@Remotable -public interface StandardTypesService extends StandardTypesLocalService{ -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java deleted file mode 100644 index 351d9df0cb..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java +++ /dev/null @@ -1,79 +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.itest.databindings.jaxb; - -import java.awt.Image; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.net.URI; -import java.util.Calendar; -import java.util.Date; -import java.util.UUID; - -import javax.activation.DataHandler; -import javax.xml.datatype.Duration; -import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.namespace.QName; -import javax.xml.transform.Source; - - -/** - * The interface for StandardTypesServiceClient. - */ -public interface StandardTypesServiceClient { - BigInteger getNewBigIntegerForward(BigInteger bi); - BigInteger[] getNewBigIntegerArrayForward(BigInteger[] bia); - - BigDecimal getNewBigDecimalForward(BigDecimal bd); - BigDecimal[] getNewBigDecimalArrayForward(BigDecimal[] bda); - - Calendar getNewCalendarForward(Calendar c); - Calendar[] getNewCalendarArrayForward(Calendar[] ca); - - Date getNewDateForward(Date d); - Date[] getNewDateArrayForward(Date[] da); - - QName getNewQNameForward(QName qname); - QName[] getNewQNameArrayForward(QName[] qnames); - - URI getNewURIForward(URI uri); - URI[] getNewURIArrayForward(URI[] uris); - - XMLGregorianCalendar getNewXMLGregorianCalendarForward(XMLGregorianCalendar xgcal); - XMLGregorianCalendar[] getNewXMLGregorianCalendarArrayForward(XMLGregorianCalendar[] xgcals); - - Duration getNewDurationForward(Duration d); - Duration[] getNewDurationArrayForward(Duration[] da); - - Object getNewObjectForward(Object obj); - Object[] getNewObjectArrayForward(Object[] objs); - - Image getNewImageForward(Image img); - Image[] getNewImageArrayForward(Image[] imgs); - - DataHandler getNewDataHandlerForward(DataHandler dh); - DataHandler[] getNewDataHandlerArrayForward(DataHandler[] dha); - - Source getNewSourceForward(Source src); - Source[] getNewSourceArrayForward(Source[] srcs); - - UUID getNewUUIDForward(UUID uuid); - UUID[] getNewUUIDArrayForward(UUID[] uuids); -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java deleted file mode 100644 index 2f3bd3f2cb..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java +++ /dev/null @@ -1,38 +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.itest.databindings.jaxb.impl; - -import org.apache.tuscany.sca.itest.databindings.jaxb.AClientService; -import org.apache.tuscany.sca.itest.databindings.jaxb.AService; -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Service; - -/** - * This class implements AService. - */ -@Service(AClientService.class) -public class AClientServiceImpl implements AClientService { - - @Reference - protected AService aService; - - public String getGreetingsForward(String name) { - return aService.getGreetings(name); - } -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java deleted file mode 100644 index 078be8896e..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java +++ /dev/null @@ -1,33 +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.itest.databindings.jaxb.impl; - -import org.apache.tuscany.sca.itest.databindings.jaxb.AService; -import org.oasisopen.sca.annotation.Service; - -/** - * This class implements AService. - */ -@Service(AService.class) -public class AServiceImpl implements AService { - - public String getGreetings(String name) { - return "Hello " + name; - } -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java deleted file mode 100644 index 4d451e6d32..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java +++ /dev/null @@ -1,77 +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.itest.databindings.jaxb.impl; - -import org.apache.tuscany.sca.itest.databindings.jaxb.Bean1; -import org.apache.tuscany.sca.itest.databindings.jaxb.Bean2; -import org.apache.tuscany.sca.itest.databindings.jaxb.Bean3; -import org.apache.tuscany.sca.itest.databindings.jaxb.GenericsLocalService; -import org.apache.tuscany.sca.itest.databindings.jaxb.GenericsServiceClient; -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Service; - -/** - * An implementation of GenericsLocalServiceClient. - * The client forwards the request to the service component and returns the response from the service component. - * - * @version $Rev$ $Date$ - */ -@Service(GenericsServiceClient.class) -public class GenericsLocalServiceClientImpl implements GenericsServiceClient { - - private GenericsLocalService service; - - @Reference(required=false) - protected void setGenericsLocalService(GenericsLocalService service) { - this.service = service; - } - - public Bean1<String> getTypeExplicitForward(Bean1<String> arg) { - return service.getTypeExplicit(arg); - } - - public <T> Bean1<T> getTypeUnboundForward(T[] anArray) { - return service.getTypeUnbound(anArray); - } - - public <T extends Bean2> Bean1<T> getTypeExtendsForward(T[] anArray) { - return service.getTypeExtends(anArray); - } - - public <T extends Bean1<String>> Bean1<T> getRecursiveTypeBoundForward(T[] anArray) { - return service.getRecursiveTypeBound(anArray); - } - - public Bean1<?> getWildcardUnboundForward(Bean1<?> arg) { - return service.getWildcardUnbound(arg); - } - - public Bean1<? super Bean3> getWildcardSuperForward(Bean1<? super Bean3> arg) { - return service.getWildcardSuper(arg); - } - - public Bean1<? extends Bean2> getWildcardExtendsForward(Bean1<? extends Bean2> arg) { - return service.getWildcardExtends(arg); - } - - public Bean2 getPolymorphicForward(Bean2 arg) { - return service.getPolymorphic(arg); - } -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java deleted file mode 100644 index d520e64881..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java +++ /dev/null @@ -1,40 +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.itest.databindings.jaxb.impl; - -import org.apache.tuscany.sca.itest.databindings.jaxb.GenericsService; -import org.apache.tuscany.sca.itest.databindings.jaxb.GenericsServiceClient; -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Service; - -/** - * An implementation of GenericsServiceClient. - * The client forwards the request to the service component and returns the response from the service component. - * - * @version $Rev$ $Date$ - */ -@Service(GenericsServiceClient.class) -public class GenericsServiceClientImpl extends GenericsLocalServiceClientImpl { - - @Reference - public void setGenericsService(GenericsService service) { - super.setGenericsLocalService(service); - } -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java deleted file mode 100644 index 460f6dd1a4..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java +++ /dev/null @@ -1,69 +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.itest.databindings.jaxb.impl; - -import org.apache.tuscany.sca.itest.databindings.jaxb.Bean1; -import org.apache.tuscany.sca.itest.databindings.jaxb.Bean2; -import org.apache.tuscany.sca.itest.databindings.jaxb.Bean3; -import org.apache.tuscany.sca.itest.databindings.jaxb.GenericsLocalService; -import org.apache.tuscany.sca.itest.databindings.jaxb.GenericsService; -import org.oasisopen.sca.annotation.Service; - -/** - * An implementation of GenericsService. - * This implementation provides both a local and a remotable service. - * - * @version $Rev$ $Date$ - */ -@Service(value={GenericsService.class, GenericsLocalService.class}) -public class GenericsServiceImpl implements GenericsService, GenericsLocalService { - - public Bean1<String> getTypeExplicit(Bean1<String> arg) { - return GenericsTransformer.getTypeExplicit(arg); - } - - public <T> Bean1<T> getTypeUnbound(T[] anArray) { - return GenericsTransformer.getTypeUnbound(anArray); - } - - public <T extends Bean2> Bean1<T> getTypeExtends(T[] anArray) { - return GenericsTransformer.getTypeExtends(anArray); - } - - public <T extends Bean1<String>> Bean1<T> getRecursiveTypeBound(T[] anArray) { - return GenericsTransformer.getRecursiveTypeBound(anArray); - } - - public Bean1<?> getWildcardUnbound(Bean1<?> arg) { - return GenericsTransformer.getWildcardUnbound(arg); - } - - public Bean1<? super Bean3> getWildcardSuper(Bean1<? super Bean3> arg) { - return GenericsTransformer.getWildcardSuper(arg); - } - - public Bean1<? extends Bean2> getWildcardExtends(Bean1<? extends Bean2> arg) { - return GenericsTransformer.getWildcardExtends(arg); - } - - public Bean2 getPolymorphic(Bean2 arg) { - return GenericsTransformer.getPolymorphic(arg); - } -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java deleted file mode 100644 index 858b8da59a..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java +++ /dev/null @@ -1,125 +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.itest.databindings.jaxb.impl; - -import org.apache.tuscany.sca.itest.databindings.jaxb.Bean1; -import org.apache.tuscany.sca.itest.databindings.jaxb.Bean10; -import org.apache.tuscany.sca.itest.databindings.jaxb.Bean11; -import org.apache.tuscany.sca.itest.databindings.jaxb.Bean2; -import org.apache.tuscany.sca.itest.databindings.jaxb.Bean3; -import org.apache.tuscany.sca.itest.databindings.jaxb.Bean31; - - -/** - * GenericsTransformer class that provide for transforming input provided to GenericsService methods. - * - * @version $Rev$ $Date$ - */ -public class GenericsTransformer { - - public static Bean1<String> getTypeExplicit(Bean1<String> arg) { - return new Bean1<String>(arg.getItem() == null ? null : arg.getItem()+" AA"); - } - - public static <T> Bean1<T> getTypeUnbound(T[] arg) { - if(arg instanceof String[]) { - return new Bean1<T>(arg[0]); - } else if(arg instanceof Integer[]){ - return new Bean1<T>(arg[1]); - } else { - return new Bean1<T>(arg[2]); - } - } - - public static <T extends Bean2> Bean1<T> getTypeExtends(T[] arg) { - if(arg instanceof Bean3[]) { - return new Bean1<T>(arg[0]); - } else if(arg instanceof Bean31[]) { - return new Bean1<T>(arg[1]); - } else { - return new Bean1<T>(arg[2]); - } - } - - public static <T extends Bean1<String>> Bean1<T> getRecursiveTypeBound(T[] arg) { - if(arg instanceof Bean10[]) { - return new Bean1<T>(arg[0]); - } else if(arg instanceof Bean11[]) { - return new Bean1<T>(arg[1]); - } else { - return new Bean1<T>(arg[2]); - } - } - - public static Bean1<?> getWildcardUnbound(Bean1<?> arg) { - if(arg.getItem() instanceof String) { - Bean1<String> temp = new Bean1<String>(); - temp.setItem("Hello "+arg.getItem()); - return temp; - } else if(arg.getItem() instanceof Integer) { - Bean1<Integer> temp = new Bean1<Integer>(); - temp.setItem(10+(Integer)arg.getItem()); - return temp; - } else { - return new Bean1<String>(arg.toString()); - } - } - - public static Bean1<? super Bean3> getWildcardSuper(Bean1<? super Bean3> arg) { - Object item = arg.getItem(); - if(item instanceof Bean3) { - Bean3 temp = new Bean3(); - temp.setName("Hello " + ((Bean3)item).getName()); - temp.setAddress("New "+((Bean3)item).getAddress()); - return new Bean1<Bean3>(temp); - } else if(item instanceof Bean2) { - Bean2 temp = new Bean2(); - temp.setName("Hello " + ((Bean3)item).getName()); - return new Bean1<Bean2>(temp); - } else { - Bean2 temp = new Bean2(); - temp.setName(item.toString()); - return new Bean1<Bean2>(temp); - } - } - - public static Bean1<? extends Bean2> getWildcardExtends(Bean1<? extends Bean2> arg) { - Bean2 item = arg.getItem(); - if(item instanceof Bean3) { - Bean3 temp = new Bean3(); - temp.setName("Hello "+item.getName()); - temp.setAddress("New "+((Bean3)item).getAddress()); - return new Bean1<Bean3>(temp); - } else if(item instanceof Bean31) { - Bean31 temp = new Bean31(); - temp.setName("Hello "+item.getName()); - temp.setAddress("New "+((Bean31)item).getAddress()); - return new Bean1<Bean31>(temp); - } else { - Bean2 temp = new Bean2(); - temp.setName("Hello "+item.getName()); - return new Bean1<Bean2>(temp); - } - } - - public static Bean2 getPolymorphic(Bean2 arg) { - return arg; - } -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java deleted file mode 100644 index 6c7c82a4ba..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java +++ /dev/null @@ -1,73 +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.itest.databindings.jaxb.impl; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.tuscany.sca.itest.databindings.jaxb.HelloLocalServiceSimple; -import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceSimpleClient; -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Service; - -/** - * An implementation of HelloServiceSimpleClient. - * The client forwards the request to the service component and returns the response from the service component. - */ -@Service(HelloServiceSimpleClient.class) -public class HelloLocalServiceSimpleClientImpl implements HelloServiceSimpleClient { - - private HelloLocalServiceSimple service; - - @Reference(required=false) - protected void setHelloLocalServiceSimple(HelloLocalServiceSimple service) { - this.service = service; - } - - public String getGreetingsForward(String name) { - return service.getGreetings(name); - } - - public String[] getGreetingsArrayForward(String[] names) { - return service.getGreetingsArray(names); - } - - public List<String> getGreetingsListForward(List<String> names) { - return service.getGreetingsList(names); - } - - public Map<String, String> getGreetingsMapForward(Map<String, String> namesMap) { - return service.getGreetingsMap(namesMap); - } - - public ArrayList<String> getGreetingsArrayListForward(ArrayList<String> names) { - return service.getGreetingsArrayList(names); - } - - public HashMap<String, String> getGreetingsHashMapForward(HashMap<String, String> namesMap) { - return service.getGreetingsHashMap(namesMap); - } - - public String getGreetingsVarArgsForward(String... names) { - return service.getGreetingsVarArgs(names[0], names[1], names[2]); - } -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java deleted file mode 100644 index 44b6e9d906..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java +++ /dev/null @@ -1,38 +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.itest.databindings.jaxb.impl; - -import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceSimple; -import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceSimpleClient; -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Service; - -/** - * An implementation of HelloServiceSimpleClient. - * The client forwards the request to the service component and returns the response from the service component. - */ -@Service(HelloServiceSimpleClient.class) -public class HelloServiceSimpleClientImpl extends HelloLocalServiceSimpleClientImpl { - - @Reference - public void setHelloServiceSimple(HelloServiceSimple service) { - super.setHelloLocalServiceSimple(service); - } -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java deleted file mode 100644 index e0b81152ad..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java +++ /dev/null @@ -1,86 +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.itest.databindings.jaxb.impl; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.tuscany.sca.itest.databindings.jaxb.HelloLocalServiceSimple; -import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceSimple; -import org.oasisopen.sca.annotation.Service; - -/** - * An implementation of HelloServiceSimple. - * The implementation provides both a local and a remotable service. - */ -@Service(value={HelloServiceSimple.class, HelloLocalServiceSimple.class}) -public class HelloServiceSimpleImpl implements HelloServiceSimple { - public String getGreetings(String name) { - return "Hello " + name; - } - - public String[] getGreetingsArray(String[] names) { - String[] resps = new String[names.length]; - for (int i = 0; i < names.length; ++i) { - resps[i] = "Hello " + names[i]; - } - return resps; - } - - public List<String> getGreetingsList(List<String> names) { - List<String> resps = new ArrayList<String>(); - for (int i = 0; i < names.size(); ++i) { - resps.add("Hello " + names.get(i)); - } - return resps; - } - - public ArrayList<String> getGreetingsArrayList(ArrayList<String> names) { - ArrayList<String> resps = new ArrayList<String>(); - for (int i = 0; i < names.size(); ++i) { - resps.add("Hello " + names.get(i)); - } - return resps; - } - - public Map<String, String> getGreetingsMap(Map<String, String> namesMap) { - for (Map.Entry<String, String> entry : namesMap.entrySet()) { - entry.setValue("Hello " + entry.getKey()); - } - return namesMap; - } - - public HashMap<String, String> getGreetingsHashMap(HashMap<String, String> namesMap) { - for (Map.Entry<String, String> entry : namesMap.entrySet()) { - entry.setValue("Hello " + entry.getKey()); - } - return namesMap; - } - - public String getGreetingsVarArgs(String... names) { - String resp = "Hello"; - for(int i = 0; i < names.length; ++i) { - resp += (" "+names[i]); - } - return resp; - } -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java deleted file mode 100644 index eea19521c4..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java +++ /dev/null @@ -1,138 +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.itest.databindings.jaxb.impl; - -import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesLocalService; -import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesServiceClient; -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Service; - -/** - * An implementation of PrimitivesLocalServiceClient. - * The client forwards the request to the service component and returns the response from the service component. - */ -@Service(PrimitivesServiceClient.class) -public class PrimitivesLocalServiceClientImpl implements PrimitivesServiceClient { - - private PrimitivesLocalService service; - - @Reference(required=false) - protected void setPrimitivesLocalService(PrimitivesLocalService service) { - this.service = service; - } - - public boolean negateBooleanForward(boolean flag) { - return service.negateBoolean(flag); - } - - public boolean[] negateBooleanArrayForward(boolean[] flags) { - return service.negateBooleanArray(flags); - } - - public boolean passByValueBooleanArray() { - boolean[] req = new boolean[2]; - boolean[] resp = service.identityBooleanArray(req); - return req != resp; - } - - public byte negateByteForward(byte b) { - return service.negateByte(b); - } - - public byte[] negateByteArrayForward(byte[] ba) { - return service.negateByteArray(ba); - } - - public boolean passByValueByteArray() { - byte[] req = new byte[2]; - byte[] resp = service.identityByteArray(req); - return req != resp; - } - - public short negateShortForward(short s) { - return service.negateShort(s); - } - - public short[] negateShortArrayForward(short[] s) { - return service.negateShortArray(s); - } - - public boolean passByValueShortArray() { - short[] req = new short[2]; - short[] resp = service.identityShortArray(req); - return req != resp; - } - - public int negateIntForward(int i) { - return service.negateInt(i); - } - - public int[] negateIntArrayForward(int[] ia) { - return service.negateIntArray(ia); - } - - public boolean passByValueIntArray() { - int[] req = new int[2]; - int[] resp = service.identityIntArray(req); - return req != resp; - } - - public long negateLongForward(long l) { - return service.negateLong(l); - } - - public long[] negateLongArrayForward(long[] la) { - return service.negateLongArray(la); - } - - public boolean passByValueLongArray() { - long[] req = new long[2]; - long[] resp = service.identityLongArray(req); - return req != resp; - } - - public float negateFloatForward(float f) { - return service.negateFloat(f); - } - - public float[] negateFloatArrayForward(float[] fa) { - return service.negateFloatArray(fa); - } - - public boolean passByValueFloatArray() { - float[] req = new float[2]; - float[] resp = service.identityFloatArray(req); - return req != resp; - } - - public double negateDoubleForward(double d) { - return service.negateDouble(d); - } - - public double[] negateDoubleArrayForward(double[] da) { - return service.negateDoubleArray(da); - } - - public boolean passByValueDoubleArray() { - double[] req = new double[2]; - double[] resp = service.identityDoubleArray(req); - return req != resp; - } -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java deleted file mode 100644 index 263d1212ca..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java +++ /dev/null @@ -1,38 +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.itest.databindings.jaxb.impl; - -import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesService; -import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesServiceClient; -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Service; - -/** - * An implementation of PrimitivesServiceClient. - * The client forwards the request to the service component and returns the response from the service component. - */ -@Service(PrimitivesServiceClient.class) -public class PrimitivesServiceClientImpl extends PrimitivesLocalServiceClientImpl { - - @Reference - public void setPrimitivesService(PrimitivesService service) { - super.setPrimitivesLocalService(service); - } -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java deleted file mode 100644 index 182ccf0f83..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java +++ /dev/null @@ -1,151 +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.itest.databindings.jaxb.impl; - -import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesLocalService; -import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesService; -import org.oasisopen.sca.annotation.Service; - -/** - * An implementation of PrimitivesService. - * This implementation provides both a local and a remotable service. - */ -@Service(value={PrimitivesService.class, PrimitivesLocalService.class}) -public class PrimitivesServiceImpl implements PrimitivesService, PrimitivesLocalService { - - public boolean negateBoolean(boolean flag) { - return !flag; - } - - public boolean[] negateBooleanArray(boolean[] flags) { - boolean[] resp = new boolean[flags.length]; - - for(int i = 0; i < flags.length; ++i) { - resp[i] = !flags[i]; - } - return resp; - } - - public boolean[] identityBooleanArray(boolean[] flags) { - return flags; - } - - public byte negateByte(byte b) { - return (byte)-b; - } - - public byte[] negateByteArray(byte[] ba) { - byte[] resp = new byte[ba.length]; - - for(int i = 0; i < ba.length; ++i) { - resp[i] = (byte)-ba[i]; - } - return resp; - } - - public byte[] identityByteArray(byte[] ba) { - return ba; - } - - public short negateShort(short s) { - return (short)-s; - } - - public short[] negateShortArray(short[] s) { - short[] resp = new short[s.length]; - - for(int i = 0; i < s.length; ++i) { - resp[i] = (short)-s[i]; - } - return resp; - } - - public short[] identityShortArray(short[] sa) { - return sa; - } - - public int negateInt(int i) { - return -i; - } - - public int[] negateIntArray(int[] ia) { - int[] resp = new int[ia.length]; - - for(int i = 0; i < ia.length; ++i) { - resp[i] = -ia[i]; - } - return resp; - } - - public int[] identityIntArray(int[] ia) { - return ia; - } - - public long negateLong(long l) { - return -l; - } - - public long[] negateLongArray(long[] la) { - long[] resp = new long[la.length]; - - for(int i = 0; i < la.length; ++i) { - resp[i] = -la[i]; - } - return resp; - } - - public long[] identityLongArray(long[] la) { - return la; - } - - public float negateFloat(float f) { - return -f; - } - - public float[] negateFloatArray(float[] fa) { - float[] resp = new float[fa.length]; - - for(int i = 0; i < fa.length; ++i) { - resp[i] = -fa[i]; - } - return resp; - } - - public float[] identityFloatArray(float[] fa) { - return fa; - } - - public double negateDouble(double d) { - return -d; - } - - public double[] negateDoubleArray(double[] da) { - double[] resp = new double[da.length]; - - for(int i = 0; i < da.length; ++i) { - resp[i] = -da[i]; - } - return resp; - } - - public double[] identityDoubleArray(double[] da) { - return da; - } -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java deleted file mode 100644 index 3ceee3c4b1..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java +++ /dev/null @@ -1,157 +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.itest.databindings.jaxb.impl; - -import java.awt.Image; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.net.URI; -import java.util.Calendar; -import java.util.Date; -import java.util.UUID; - -import javax.activation.DataHandler; -import javax.xml.datatype.Duration; -import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.namespace.QName; -import javax.xml.transform.Source; - -import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesLocalService; -import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesServiceClient; -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Service; - -/** - * An implementation of StandardTypesLocalServiceClient. - * The client forwards the request to the service component and returns the response from the service component. - */ -@Service(StandardTypesServiceClient.class) -public class StandardTypesLocalServiceClientImpl implements StandardTypesServiceClient { - - private StandardTypesLocalService service; - - @Reference(required=false) - protected void setStandardTypesLocalService(StandardTypesLocalService service) { - this.service = service; - } - - public BigInteger getNewBigIntegerForward(BigInteger bi) { - return service.getNewBigInteger(bi); - } - - public BigInteger[] getNewBigIntegerArrayForward(BigInteger[] bia) { - return service.getNewBigIntegerArray(bia); - } - - public BigDecimal getNewBigDecimalForward(BigDecimal bd) { - return service.getNewBigDecimal(bd); - } - - public BigDecimal[] getNewBigDecimalArrayForward(BigDecimal[] bda) { - return service.getNewBigDecimalArray(bda); - } - public Calendar getNewCalendarForward(Calendar c) { - return service.getNewCalendar(c); - } - public Calendar[] getNewCalendarArrayForward(Calendar[] ca) { - return service.getNewCalendarArray(ca); - } - - public Date getNewDateForward(Date d) { - return service.getNewDate(d); - } - - public Date[] getNewDateArrayForward(Date[] da) { - return service.getNewDateArray(da); - } - - public QName getNewQNameForward(QName qname) { - return service.getNewQName(qname); - } - - public QName[] getNewQNameArrayForward(QName[] qnames) { - return service.getNewQNameArray(qnames); - } - - public URI getNewURIForward(URI uri) { - return service.getNewURI(uri); - } - - public URI[] getNewURIArrayForward(URI[] uris) { - return service.getNewURIArray(uris); - } - - public XMLGregorianCalendar getNewXMLGregorianCalendarForward(XMLGregorianCalendar xgcal) { - return service.getNewXMLGregorianCalendar(xgcal); - } - - public XMLGregorianCalendar[] getNewXMLGregorianCalendarArrayForward(XMLGregorianCalendar[] xgcals) { - return service.getNewXMLGregorianCalendarArray(xgcals); - } - - public Duration getNewDurationForward(Duration d) { - return service.getNewDuration(d); - } - - public Duration[] getNewDurationArrayForward(Duration[] da) { - return service.getNewDurationArray(da); - } - - public Object getNewObjectForward(Object obj) { - return service.getNewObject(obj); - } - - public Object[] getNewObjectArrayForward(Object[] objs) { - return service.getNewObjectArray(objs); - } - - public Image getNewImageForward(Image img) { - return service.getNewImage(img); - } - - public Image[] getNewImageArrayForward(Image[] imgs) { - return service.getNewImageArray(imgs); - } - - public DataHandler getNewDataHandlerForward(DataHandler dh) { - return service.getNewDataHandler(dh); - } - - public DataHandler[] getNewDataHandlerArrayForward(DataHandler[] dha) { - return service.getNewDataHandlerArray(dha); - } - - - public Source getNewSourceForward(Source src) { - return service.getNewSource(src); - } - - public Source[] getNewSourceArrayForward(Source[] srcs) { - return service.getNewSourceArray(srcs); - } - - public UUID getNewUUIDForward(UUID uuid) { - return service.getNewUUID(uuid); - } - - public UUID[] getNewUUIDArrayForward(UUID[] uuids) { - return service.getNewUUIDArray(uuids); - } -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java deleted file mode 100644 index 6aefb05c83..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java +++ /dev/null @@ -1,38 +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.itest.databindings.jaxb.impl; - -import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesService; -import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesServiceClient; -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Service; - -/** - * An implementation of StandardTypesServiceClient. - * The client forwards the request to the service component and returns the response from the service component. - */ -@Service(StandardTypesServiceClient.class) -public class StandardTypesServiceClientImpl extends StandardTypesLocalServiceClientImpl { - - @Reference - public void setStandardTypesService(StandardTypesService service) { - super.setStandardTypesLocalService(service); - } -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java deleted file mode 100644 index 4e40f006d6..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java +++ /dev/null @@ -1,208 +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.itest.databindings.jaxb.impl; - -import java.awt.Image; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.net.URI; -import java.util.Calendar; -import java.util.Date; -import java.util.UUID; - -import javax.activation.DataHandler; -import javax.xml.datatype.Duration; -import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.namespace.QName; -import javax.xml.transform.Source; - -import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesLocalService; -import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesService; -import org.oasisopen.sca.annotation.Service; - -/** - * An implementation of StandardTypesService. - * This implementation provides both a local and a remotable service. - */ -@Service(value={StandardTypesService.class, StandardTypesLocalService.class}) -public class StandardTypesServiceImpl implements StandardTypesService, StandardTypesLocalService { - - public BigInteger getNewBigInteger(BigInteger bi) { - return bi.negate(); - } - - public BigInteger[] getNewBigIntegerArray(BigInteger[] bia) { - BigInteger[] resp = new BigInteger[bia.length]; - for(int i = 0; i < bia.length; ++i) { - resp[i] = bia[i].negate(); - } - return resp; - } - - public BigDecimal getNewBigDecimal(BigDecimal bd) { - return bd.negate(); - } - - public BigDecimal[] getNewBigDecimalArray(BigDecimal[] bda) { - BigDecimal[] resp = new BigDecimal[bda.length]; - for(int i = 0; i < bda.length; ++i) { - resp[i] = bda[i].negate(); - } - return resp; - } - - public Calendar getNewCalendar(Calendar c) { - Calendar resp = (Calendar)c.clone(); - resp.add(Calendar.DAY_OF_MONTH, 5); - return resp; - } - - public Calendar[] getNewCalendarArray(Calendar[] ca) { - Calendar[] resp = new Calendar[ca.length]; - for(int i = 0; i < ca.length; ++i) { - resp[i] = getNewCalendar(ca[i]); - } - return resp; - } - - public Date getNewDate(Date d) { - return new Date(d.getTime() + 5*24*60*60*1000); - } - - public Date[] getNewDateArray(Date[] da) { - Date[] resp = new Date[da.length]; - for(int i = 0; i < da.length; ++i) { - resp[i] = getNewDate(da[i]); - } - return resp; - } - - public QName getNewQName(QName qname) { - return new QName(qname.getNamespaceURI()+"q", qname.getLocalPart()+"q", qname.getPrefix()+"q"); - - } - - public QName[] getNewQNameArray(QName[] qnames) { - QName[] resp = new QName[qnames.length]; - for(int i = 0; i < qnames.length; ++i) { - resp[i] = getNewQName(qnames[i]); - } - return resp; - } - - public URI getNewURI(URI uri) { - return uri.resolve("uri"); - } - - public URI[] getNewURIArray(URI[] uris) { - URI[] resp = new URI[uris.length]; - for(int i = 0; i < uris.length; ++i) { - resp[i] = getNewURI(uris[i]); - } - return resp; - } - - public XMLGregorianCalendar getNewXMLGregorianCalendar(XMLGregorianCalendar xgcal) { - xgcal = (XMLGregorianCalendar)xgcal.clone(); - xgcal.setDay(xgcal.getDay()+5); - return xgcal; - } - - public XMLGregorianCalendar[] getNewXMLGregorianCalendarArray(XMLGregorianCalendar[] xgcals) { - XMLGregorianCalendar[] resp = new XMLGregorianCalendar[xgcals.length]; - for(int i = 0; i < xgcals.length; ++i) { - resp[i] = getNewXMLGregorianCalendar(xgcals[i]); - } - return resp; - } - - public Duration getNewDuration(Duration d) { - return d.negate(); - } - - public Duration[] getNewDurationArray(Duration[] da) { - Duration[] resp = new Duration[da.length]; - for(int i = 0; i < da.length; ++i) { - resp[i] = da[i].negate(); - } - return resp; - } - - public Object getNewObject(Object obj) { - return StandardTypesTransformer.getNewObject(obj); - } - - public Object[] getNewObjectArray(Object[] objs) { - Object[] resp = new Object[objs.length]; - for(int i = 0; i < objs.length; ++i) { - resp[i] = getNewObject(objs[i]); - } - return resp; - } - - public Image getNewImage(Image img) { - return StandardTypesTransformer.getNewImage(img); - } - - public Image[] getNewImageArray(Image[] imgs) { - Image[] resp = new Image[imgs.length]; - for(int i = 0; i < imgs.length; ++i) { - resp[i] = getNewImage(imgs[i]); - } - return resp; - } - - public DataHandler getNewDataHandler(DataHandler dh) { - // FIXME: transform the input - return dh; - } - - public DataHandler[] getNewDataHandlerArray(DataHandler[] dha) { - DataHandler[] resp = new DataHandler[dha.length]; - for(int i = 0; i < dha.length; ++i) { - resp[i] = dha[i]; - } - return resp; - } - - public Source getNewSource(Source src) { - return StandardTypesTransformer.getNewSource(src); - } - - public Source[] getNewSourceArray(Source[] srcs) { - Source[] resp = new Source[srcs.length]; - for(int i = 0; i < srcs.length; ++i) { - resp[i] = getNewSource(srcs[i]); - } - return resp; - } - - public UUID getNewUUID(UUID uuid) { - return UUID.fromString(uuid.toString()+"AAA"); - } - - public UUID[] getNewUUIDArray(UUID[] uuids) { - UUID[] resp = new UUID[uuids.length]; - for(int i = 0; i < uuids.length; ++i) { - resp[i] = getNewUUID(uuids[i]); - } - return resp; - } -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java deleted file mode 100644 index 68510b4b03..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java +++ /dev/null @@ -1,144 +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.itest.databindings.jaxb.impl; - -import java.awt.Image; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.CharArrayReader; -import java.io.CharArrayWriter; -import java.io.IOException; -import java.io.InputStream; -import java.io.Reader; - -import javax.xml.transform.Source; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.sax.SAXSource; -import javax.xml.transform.stream.StreamSource; - -import org.xml.sax.InputSource; - - - -/** - * StandardTypesTransformer class that provide for transforming input provided to StandardTypesService methods. - * - * @version $Rev$ $Date$ - */ -public class StandardTypesTransformer { - - public static Object getNewObject(Object obj) { - if(obj instanceof String) { - return "Hello "+obj; - } else if(obj instanceof Integer) { - return new Integer(-((Integer)obj).intValue()); - } else if(obj instanceof Double) { - return new Double(-((Double)obj).doubleValue()); - } - - return obj; - } - - /** - * Returns a copy of the source object if the input is DOMSource, SAXSource or StreamSource. - * Returns the input object as is for other types. - */ - public static Source getNewSource(Source src) { - Source ret = null; - if(src instanceof DOMSource) { - DOMSource dsrc = (DOMSource)src; - ret = new DOMSource(dsrc.getNode() != null ? dsrc.getNode().cloneNode(true) : null); - } else if(src instanceof SAXSource) { - SAXSource ssrc = (SAXSource)src; - if(ssrc.getInputSource().getByteStream() != null) { - InputStream inp = ssrc.getInputSource().getByteStream(); - ByteArrayOutputStream bout = new ByteArrayOutputStream(); - int b; - try { - while((b = inp.read()) != -1) { - bout.write(b); - } - } catch (IOException ignored) { - } - try { bout.close();} catch (IOException ignored) {} - try { inp.reset();} catch (IOException ignored) {} - ret = new SAXSource(new InputSource(new ByteArrayInputStream(bout.toByteArray()))); - } else if(ssrc.getInputSource().getCharacterStream() != null) { - Reader rdr = ssrc.getInputSource().getCharacterStream(); - CharArrayWriter caw = new CharArrayWriter(); - try { - int c; - while((c = rdr.read()) != -1) { - caw.append((char)c); - } - } catch (IOException ignored) { - } - caw.close(); - try{ rdr.reset();} catch(IOException ignored) {} - ret = new SAXSource(new InputSource(new CharArrayReader(caw.toCharArray()))); - } else { - ret = new SAXSource(); - } - } else if(src instanceof StreamSource) { - StreamSource ssrc = (StreamSource)src; - if(ssrc.getInputStream() != null) { - InputStream inp = ssrc.getInputStream(); - ByteArrayOutputStream bout = new ByteArrayOutputStream(); - int b; - try { - while((b = inp.read()) != -1) { - bout.write(b); - } - } catch (IOException ignored) { - } - try { bout.close();} catch (IOException ignored) {} - try { inp.reset();} catch (IOException ignored) {} - ret = new StreamSource(new ByteArrayInputStream(bout.toByteArray())); - } else if(ssrc.getReader() != null) { - Reader rdr = ssrc.getReader(); - CharArrayWriter caw = new CharArrayWriter(); - try { - int c; - while((c = rdr.read()) != -1) { - caw.append((char)c); - } - } catch (IOException ignored) { - } - caw.close(); - try{ rdr.reset();} catch(IOException ignored) {} - ret = new StreamSource(new CharArrayReader(caw.toCharArray())); - } else { - ret = new StreamSource(); - } - } - - if(ret != null) { - ret.setSystemId(src.getSystemId()); - } else { - ret = src; - } - return ret; - } - - public static Image getNewImage(Image arg) { - arg.getGraphics().drawOval(2, 2, 7, 7); - return arg; - } -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl deleted file mode 100644 index 10a242be4d..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl +++ /dev/null @@ -1,127 +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.
--->
-<wsdl:definitions targetNamespace="http://jaxb.databindings.itest.sca.tuscany.apache.org"
- xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"
- xmlns:ns0="http://jaxb.databindings.itest.sca.tuscany.apache.org"
- xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
- xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
- xmlns:ns1="http://org.apache.axis2/xsd"
- xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
- <wsdl:types>
- <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://jaxb.databindings.itest.sca.tuscany.apache.org" xmlns:ns="http://jaxb.databindings.itest.sca.tuscany.apache.org">
- <xs:element name="getGreetings" nillable="true" type="xs:string"/>
- <xs:element name="getGreetingsResponse" nillable="true" type="xs:string"/>
- </xs:schema>
- </wsdl:types>
-
- <wsdl:message name="getGreetingsRequest">
- <wsdl:part name="parameters" element="ns0:getGreetings"/>
- </wsdl:message>
-
- <wsdl:message name="getGreetingsResponse">
- <wsdl:part name="parameters" element="ns0:getGreetingsResponse"/>
- </wsdl:message>
-
- <wsdl:portType name="AServicePortType">
- <wsdl:operation name="getGreetings">
- <wsdl:input message="ns0:getGreetingsRequest" wsaw:Action="urn:getGreetings"/>
- <wsdl:output message="ns0:getGreetingsResponse" wsaw:Action="urn:getGreetingsResponse"/>
- </wsdl:operation>
- </wsdl:portType>
-
- <wsdl:binding name="AServiceSOAP12Binding" type="ns0:AServicePortType">
- <soap12:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <wsdl:operation name="getGreetings">
- <soap12:operation soapAction="urn:getGreetings" style="document"/>
- <wsdl:input>
- <soap12:body use="literal"/>
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
-
- <wsdl:binding name="AServicePortTypeBinding" type="ns0:AServicePortType">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <wsdl:operation name="getGreetings">
- <soap:operation soapAction=""/>
- <wsdl:input>
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
-
- <wsdl:binding name="AServiceHttpBinding" type="ns0:AServicePortType">
- <http:binding verb="POST"/>
- <wsdl:operation name="getGreetings">
- <http:operation location="AService/getGreetings"/>
- <wsdl:input>
- <mime:content part="getGreetings" type="text/xml"/>
- </wsdl:input>
- <wsdl:output>
- <mime:content part="getGreetings" type="text/xml"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
-
- <wsdl:binding name="AServiceSOAP11Binding" type="ns0:AServicePortType">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <wsdl:operation name="getGreetings">
- <soap:operation soapAction="urn:getGreetings" style="document"/>
- <wsdl:input>
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
-
- <wsdl:service name="AServicePortTypeService">
- <wsdl:port name="AServicePortTypePort" binding="ns0:AServicePortTypeBinding">
- <soap:address location="http://localhost:8080/AService"/>
- </wsdl:port>
- </wsdl:service>
-
- <wsdl:service name="AService">
- <wsdl:port name="AServiceHttpport" binding="ns0:AServiceHttpBinding">
- <http:address location="http://localhost:8080/AService/httpport"/>
- </wsdl:port>
- <wsdl:port name="AServiceSOAP12port_http" binding="ns0:AServiceSOAP12Binding">
- <soap12:address location="http://localhost:8080/AService/soap12port"/>
- </wsdl:port>
- <wsdl:port name="AServiceSOAP11port_http" binding="ns0:AServiceSOAP11Binding">
- <soap:address location="http://localhost:8080/AService/soap11port"/>
- </wsdl:port>
- <wsdl:port name="AServiceSOAP12port_http_null" binding="ns0:AServiceSOAP12Binding">
- <soap12:address location=""/>
- </wsdl:port>
- <wsdl:port name="AServiceSOAP12port_http_wsdl" binding="ns0:AServiceSOAP12Binding">
- <soap12:address location="inWsdl"/>
- </wsdl:port>
- </wsdl:service>
-</wsdl:definitions>
diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite deleted file mode 100644 index 0b5dacda35..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite +++ /dev/null @@ -1,37 +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://docs.oasis-open.org/ns/opencsa/sca/200912" targetNamespace="http://itest" name="doclitbarewsdltest">
-
- <component name="AComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.AServiceImpl"/>
- <service name="AService">
- <interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org#wsdl.interface(AServicePortType)"/>
- <binding.ws uri="http://localhost:8085/AService/endpointref"/>
- </service>
- </component>
- <component name="AClientComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.AClientServiceImpl"/>
- <reference name="aService">
- <!--interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org#wsdl.interface(AServicePortType)"/-->
- <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.AService"/>
- <binding.ws uri="http://localhost:8085/AService/endpointref"/>
- </reference>
- </component>
-</composite>
diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite deleted file mode 100644 index c38ee6ee78..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite +++ /dev/null @@ -1,69 +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.
--->
-
-<!-- $Rev: 741544 $ $Date: 2009-02-06 17:16:22 +0530 (Fri, 06 Feb 2009) $ -->
-
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
- targetNamespace="http://jaxb.databindings.itest.sca.tuscany.apache.org/"
- name="GenericsService">
-
- <!-- Clients to test the service -->
- <!-- A GenericsServiceClient component that uses WS binding to invoke GenericsService -->
- <component name="GenericsServiceClientWSComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.GenericsServiceClientImpl" />
- <reference name="genericsService">
- <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.GenericsService"/>
- <binding.ws uri="http://localhost:8085/gs-ep"/>
- </reference>
- </component>
-
- <!-- A GenericsServiceClient component that uses SCA binding to invoke GenericsService service -->
- <component name="GenericsServiceClientSCAComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.GenericsServiceClientImpl" />
- <reference name="genericsService" target="GenericsServiceComponent/GenericsService">
- <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.GenericsService"/>
- <binding.sca/>
- </reference>
- </component>
-
- <!-- A GenericsLocalServiceClient component that uses SCA binding to invoke GenericsLocalService service -->
- <component name="GenericsLocalServiceClientSCAComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.GenericsLocalServiceClientImpl" />
- <reference name="genericsLocalService" target="GenericsServiceComponent/GenericsLocalService">
- <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.GenericsLocalService"/>
- <binding.sca/>
- </reference>
- </component>
-
- <!-- Components used to implement the services -->
- <!-- A GenericsService component. -->
- <component name="GenericsServiceComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.GenericsServiceImpl"/>
- <service name="GenericsService">
- <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.GenericsService"/>
- <binding.ws uri="http://localhost:8085/gs-ep"/>
- </service>
- <service name="GenericsLocalService">
- <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.GenericsLocalService"/>
- <binding.sca/>
- </service>
- </component>
-</composite>
diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite deleted file mode 100644 index db01ba12ba..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite +++ /dev/null @@ -1,65 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
- targetNamespace="http://jaxb.databindings.itest.sca.tuscany.apache.org/"
- name="HelloService">
-
- <!-- Clients to test the service -->
- <!-- A HelloServiceSimpleClient component that uses WS binding to invoke HelloServiceSimple service -->
- <component name="HelloServiceSimpleClientWSComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.HelloServiceSimpleClientImpl" />
- <reference name="helloServiceSimple">
- <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceSimple"/>
- <binding.ws uri="http://localhost:8085/hs-ep0"/>
- </reference>
- </component>
-
- <!-- A HelloServiceSimpleClient component that uses SCA binding to invoke HelloServiceSimple service -->
- <component name="HelloServiceSimpleClientSCAComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.HelloServiceSimpleClientImpl" />
- <reference name="helloServiceSimple" target="HelloServiceSimpleComponent/HelloServiceSimple">
- <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceSimple"/>
- <binding.sca/>
- </reference>
- </component>
-
- <!-- A HelloLocalServiceSimpleClient component that uses SCA binding to invoke HelloLocalServiceSimple service -->
- <component name="HelloLocalServiceSimpleClientSCAComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.HelloLocalServiceSimpleClientImpl" />
- <reference name="helloLocalServiceSimple" target="HelloServiceSimpleComponent/HelloLocalServiceSimple">
- <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.HelloLocalServiceSimple"/>
- <binding.sca/>
- </reference>
- </component>
-
- <!-- Components used to implement the services -->
- <!-- A HelloServiceSimple component. -->
- <component name="HelloServiceSimpleComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.HelloServiceSimpleImpl"/>
- <service name="HelloServiceSimple">
- <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceSimple"/>
- <binding.ws uri="http://localhost:8085/hs-ep0"/>
- </service>
- <service name="HelloLocalServiceSimple">
- <binding.sca/>
- </service>
- </component>
-</composite>
diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite deleted file mode 100644 index 09d42b2bdf..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite +++ /dev/null @@ -1,66 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
- targetNamespace="http://jaxb.databindings.itest.sca.tuscany.apache.org/"
- name="PrimitivesService">
-
- <!-- Clients to test the service -->
- <!-- A PrimitivesServiceClient component that uses WS binding to invoke PrimitivesService -->
- <component name="PrimitivesServiceClientWSComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.PrimitivesServiceClientImpl" />
- <reference name="primitivesService">
- <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesService"/>
- <binding.ws uri="http://localhost:8085/ps-ep"/>
- </reference>
- </component>
-
- <!-- A PrimitivesServiceClient component that uses SCA binding to invoke PrimitivesService service -->
- <component name="PrimitivesServiceClientSCAComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.PrimitivesServiceClientImpl" />
- <reference name="primitivesService" target="PrimitivesServiceComponent/PrimitivesService">
- <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesService"/>
- <binding.sca/>
- </reference>
- </component>
-
- <!-- A PrimitivesLocalServiceClient component that uses SCA binding to invoke PrimitivesLocalService service -->
- <component name="PrimitivesLocalServiceClientSCAComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.PrimitivesLocalServiceClientImpl" />
- <reference name="primitivesLocalService" target="PrimitivesServiceComponent/PrimitivesLocalService">
- <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesLocalService"/>
- <binding.sca/>
- </reference>
- </component>
-
- <!-- Components used to implement the services -->
- <!-- A PrimitivesService component. -->
- <component name="PrimitivesServiceComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.PrimitivesServiceImpl"/>
- <service name="PrimitivesService">
- <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesService"/>
- <binding.ws uri="http://localhost:8085/ps-ep"/>
- </service>
- <service name="PrimitivesLocalService">
- <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesLocalService"/>
- <binding.sca/>
- </service>
- </component>
-</composite>
diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite deleted file mode 100644 index 5aefe799a6..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite +++ /dev/null @@ -1,66 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
- targetNamespace="http://jaxb.databindings.itest.sca.tuscany.apache.org/"
- name="StandardTypesService">
-
- <!-- Clients to test the service -->
- <!-- A StandardTypesServiceClient component that uses WS binding to invoke StandardTypesService -->
- <component name="StandardTypesServiceClientWSComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesServiceClientImpl" />
- <reference name="standardTypesService">
- <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesService"/>
- <binding.ws uri="http://localhost:8085/sts-ep"/>
- </reference>
- </component>
-
- <!-- A StandardTypesServiceClient component that uses SCA binding to invoke StandardTypesService service -->
- <component name="StandardTypesServiceClientSCAComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesServiceClientImpl" />
- <reference name="standardTypesService" target="StandardTypesServiceComponent/StandardTypesService">
- <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesService"/>
- <binding.sca/>
- </reference>
- </component>
-
- <!-- A StandardTypesLocalServiceClient component that uses SCA binding to invoke StandardTypesLocalService service -->
- <component name="StandardTypesLocalServiceClientSCAComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesLocalServiceClientImpl" />
- <reference name="standardTypesLocalService" target="StandardTypesServiceComponent/StandardTypesLocalService">
- <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesLocalService"/>
- <binding.sca/>
- </reference>
- </component>
-
- <!-- Components used to implement the services -->
- <!-- A StandardTypesService component. -->
- <component name="StandardTypesServiceComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesServiceImpl"/>
- <service name="StandardTypesService">
- <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesService"/>
- <binding.ws uri="http://localhost:8085/sts-ep"/>
- </service>
- <service name="StandardTypesLocalService">
- <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesLocalService"/>
- <binding.sca/>
- </service>
- </component>
-</composite>
diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java deleted file mode 100644 index 8bacf13063..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java +++ /dev/null @@ -1,345 +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.itest.databindings.jaxb; - -import java.io.File; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * @version $Rev$ $Date$ - */ -public class DatabindingTestCase { - - private static Node node; - - /** - * Runs once before running the tests - */ - @BeforeClass - public static void setUp() throws Exception { - try { - NodeFactory factory = NodeFactory.newInstance(); - node = factory.createNode(new File("src/main/resources/helloservice.composite").toURI().toURL().toString(), - new Contribution("TestContribution", new File("src/main/resources/").toURI().toURL().toString())); - node.start(); - } catch(Throwable e) { - e.printStackTrace(); - } - } - - /** - * Runs once after running the tests - */ - @AfterClass - public static void tearDown() { - node.stop(); - } - - /** - * Invokes the HelloServiceSimple service using SCA binding. - * Service method invoked is getGreetings. - */ - @Test - public void testSCA() throws Exception { - HelloServiceSimpleClient helloServiceSimpleClient = node.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientSCAComponent"); - performTest(helloServiceSimpleClient); - } - - /** - * Invokes the HelloServiceSimple service using SCA binding. - * Service method invoked is getGreetingsArray. - */ - @Test - public void testSCAArray() throws Exception { - HelloServiceSimpleClient helloServiceSimpleClient = node.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientSCAComponent"); - performTestArray(helloServiceSimpleClient); - } - - /** - * Invokes the HelloServiceSimple service using SCA binding. - * Service method invoked is getGreetingsList. - */ - @Test - public void testSCAList() throws Exception { - HelloServiceSimpleClient helloServiceSimpleClient = node.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientSCAComponent"); - performTestList(helloServiceSimpleClient); - } - - /** - * Invokes the HelloServiceSimple service using SCA binding. - * Service method invoked is getGreetingsArrayList. - */ - @Test - public void testSCAArrayList() throws Exception { - HelloServiceSimpleClient helloServiceSimpleClient = node.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientSCAComponent"); - performTestArrayList(helloServiceSimpleClient); - } - - /** - * Invokes the HelloServiceSimple service using SCA binding. - * Service method invoked is getGreetingsMap. - */ - @Test - public void testSCAMap() throws Exception { - HelloServiceSimpleClient helloServiceSimpleClient = node.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientSCAComponent"); - performTestMap(helloServiceSimpleClient); - } - - /** - * Invokes the HelloServiceSimple service using SCA binding. - * Service method invoked is getGreetingsHashMap. - */ - @Test - public void testSCAHashMap() throws Exception { - HelloServiceSimpleClient helloServiceSimpleClient = node.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientSCAComponent"); - performTestHashMap(helloServiceSimpleClient); - } - - /** - * Invokes the HelloServiceSimple service using SCA binding. - * Service method invoked is getGreetingsVarArgs. - */ - @Test - public void testSCAVarArgs() throws Exception { - HelloServiceSimpleClient helloServiceSimpleClient = node.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientSCAComponent"); - performTestVarArgs(helloServiceSimpleClient); - } - - /** - * Invokes the HelloServiceSimple service using WS binding. - * Service method invoked is getGreetings. - */ - @Test - public void testWS() throws Exception { - HelloServiceSimpleClient helloServiceSimpleClient = node.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientWSComponent"); - performTest(helloServiceSimpleClient); - } - - /** - * Invokes the HelloServiceSimple service using WS binding. - * Service method invoked is getGreetingsArray. - */ - @Test - public void testWSArray() throws Exception { - HelloServiceSimpleClient helloServiceSimpleClient = node.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientWSComponent"); - performTestArray(helloServiceSimpleClient); - } - - /** - * Invokes the HelloServiceSimple service using WS binding. - * Service method invoked is getGreetingsList. - */ - @Test - public void testWSList() throws Exception { - HelloServiceSimpleClient helloServiceSimpleClient = node.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientWSComponent"); - performTestList(helloServiceSimpleClient); - } - - /** - * Invokes the HelloServiceSimple service using WS binding. - * Service method invoked is getGreetingsArrayList. - */ - @Test - public void testWSArrayList() throws Exception { - HelloServiceSimpleClient helloServiceSimpleClient = node.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientWSComponent"); - performTestArrayList(helloServiceSimpleClient); - } - - /** - * Invokes the HelloServiceSimple service using WS binding. - * Service method invoked is getGreetingsMap. - */ - @Test - public void testWSMap() throws Exception { - HelloServiceSimpleClient helloServiceSimpleClient = node.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientWSComponent"); - performTestMap(helloServiceSimpleClient); - } - - /** - * Invokes the HelloServiceSimple service using WS binding. - * Service method invoked is getGreetingsHashMap. - */ - @Test - public void testWSHashMap() throws Exception { - HelloServiceSimpleClient helloServiceSimpleClient = node.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientWSComponent"); - performTestHashMap(helloServiceSimpleClient); - } - - /** - * Invokes the HelloServiceSimple service using WS binding. - * Service method invoked is getGreetingsVarArgs. - */ - @Test - public void testWSVarArgs() throws Exception { - HelloServiceSimpleClient helloServiceSimpleClient = node.getService(HelloServiceSimpleClient.class, "HelloServiceSimpleClientWSComponent"); - performTestVarArgs(helloServiceSimpleClient); - } - - /** - * Invokes the HelloLocalServiceSimple service using SCA binding. - * Service method invoked is getGreetings. - */ - @Test - public void testSCALocal() throws Exception { - HelloServiceSimpleClient helloServiceSimpleClient = node.getService(HelloServiceSimpleClient.class, "HelloLocalServiceSimpleClientSCAComponent"); - performTest(helloServiceSimpleClient); - } - - /** - * Invokes the HelloLocalServiceSimple service using SCA binding. - * Service method invoked is getGreetingsArray. - */ - @Test - public void testSCALocalArray() throws Exception { - HelloServiceSimpleClient helloServiceSimpleClient = node.getService(HelloServiceSimpleClient.class, "HelloLocalServiceSimpleClientSCAComponent"); - performTestArray(helloServiceSimpleClient); - } - - /** - * Invokes the HelloLocalServiceSimple service using SCA binding. - * Service method invoked is getGreetingsList. - */ - @Test - public void testSCALocalList() throws Exception { - HelloServiceSimpleClient helloServiceSimpleClient = node.getService(HelloServiceSimpleClient.class, "HelloLocalServiceSimpleClientSCAComponent"); - performTestList(helloServiceSimpleClient); - } - - /** - * Invokes the HelloLocalServiceSimple service using SCA binding. - * Service method invoked is getGreetingsArrayList. - */ - @Test - public void testSCALocalArrayList() throws Exception { - HelloServiceSimpleClient helloServiceSimpleClient = node.getService(HelloServiceSimpleClient.class, "HelloLocalServiceSimpleClientSCAComponent"); - performTestArrayList(helloServiceSimpleClient); - } - - /** - * Invokes the HelloLocalServiceSimple service using SCA binding. - * Service method invoked is getGreetingsMap. - */ - @Test - public void testSCALocalMap() throws Exception { - HelloServiceSimpleClient helloServiceSimpleClient = node.getService(HelloServiceSimpleClient.class, "HelloLocalServiceSimpleClientSCAComponent"); - performTestMap(helloServiceSimpleClient); - } - - /** - * Invokes the HelloLocalServiceSimple service using SCA binding. - * Service method invoked is getGreetingsHashMap. - */ - @Test - public void testSCALocalHashMap() throws Exception { - HelloServiceSimpleClient helloServiceSimpleClient = node.getService(HelloServiceSimpleClient.class, "HelloLocalServiceSimpleClientSCAComponent"); - performTestHashMap(helloServiceSimpleClient); - } - - /** - * Invokes the HelloLocalServiceSimple service using SCA binding. - * Service method invoked is getGreetingsVarArgs. - */ - @Test - public void testSCALocalVarArgs() throws Exception { - HelloServiceSimpleClient helloServiceSimpleClient = node.getService(HelloServiceSimpleClient.class, "HelloLocalServiceSimpleClientSCAComponent"); - performTestVarArgs(helloServiceSimpleClient); - } - - private void performTest(HelloServiceSimpleClient helloServiceSimpleClient) { - String name = "Pandu"; - String resp = helloServiceSimpleClient.getGreetingsForward(name); - Assert.assertEquals("Hello "+name, resp); - } - - private void performTestArray(HelloServiceSimpleClient helloServiceSimpleClient) { - String[] names = {"Me", "Pandu"}; - String[] resps = helloServiceSimpleClient.getGreetingsArrayForward(names); - for(int i = 0; i < names.length; ++i) { - Assert.assertEquals("Hello "+names[i], resps[i]); - } - } - - private void performTestList(HelloServiceSimpleClient helloServiceSimpleClient) { - List<String> namesList = new ArrayList<String>(); - namesList.add("Me"); - namesList.add("Pandu"); - namesList.add("Chinnipandu"); - List<String> respList = helloServiceSimpleClient.getGreetingsListForward(namesList); - Assert.assertEquals(namesList.size(), respList.size()); - for(int i = 0; i < namesList.size(); ++i) { - Assert.assertEquals("Hello "+namesList.get(i), respList.get(i)); - } - } - - private void performTestArrayList(HelloServiceSimpleClient helloServiceSimpleClient) { - ArrayList<String> namesList = new ArrayList<String>(); - namesList.add("Me"); - namesList.add("Pandu"); - namesList.add("Chinnipandu"); - ArrayList<String> respList = helloServiceSimpleClient.getGreetingsArrayListForward(namesList); - Assert.assertEquals(namesList.size(), respList.size()); - for(int i = 0; i < namesList.size(); ++i) { - Assert.assertEquals("Hello "+namesList.get(i), respList.get(i)); - } - } - - private void performTestMap(HelloServiceSimpleClient helloServiceSimpleClient) { - Map<String, String> namesMap = new HashMap<String, String>(); - namesMap.put("Me", null); - namesMap.put("Pandu", null); - namesMap.put("Chinnipandu", null); - Map<String, String> respMap = helloServiceSimpleClient.getGreetingsMapForward(namesMap); - Assert.assertEquals(namesMap.keySet().size(), respMap.keySet().size()); - for(Map.Entry<String, String> entry: namesMap.entrySet()) { - Assert.assertEquals("Hello "+entry.getKey(), respMap.get(entry.getKey())); - } - } - - private void performTestHashMap(HelloServiceSimpleClient helloServiceSimpleClient) { - HashMap<String, String> namesMap = new HashMap<String, String>(); - namesMap.put("Me", null); - namesMap.put("Pandu", null); - namesMap.put("Chinnipandu", null); - Map<String, String> respMap = helloServiceSimpleClient.getGreetingsHashMapForward(namesMap); - Assert.assertEquals(namesMap.keySet().size(), respMap.keySet().size()); - for(Map.Entry<String, String> entry: namesMap.entrySet()) { - Assert.assertEquals("Hello "+entry.getKey(), respMap.get(entry.getKey())); - } - } - - private void performTestVarArgs(HelloServiceSimpleClient helloServiceSimpleClient) { - String[] names = { "Me", "You", "Pandu" }; // Do not change the array size from 3. - String expected = "Hello Me You Pandu"; - String actual = helloServiceSimpleClient.getGreetingsVarArgsForward(names[0], names[1], names[2]); - Assert.assertEquals(expected, actual); - } -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java deleted file mode 100644 index 6aac75ae08..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java +++ /dev/null @@ -1,75 +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.itest.databindings.jaxb; - -import java.io.File; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - - -/** - * @version $Rev$ $Date$ - */ -public class DocLitBareWsdlTestCase { - - private static Node node; - - /** - * Runs once before running the tests - */ - @BeforeClass - public static void setUp() throws Exception { - try { - NodeFactory factory = NodeFactory.newInstance(); - node = factory.createNode(new File("src/main/resources/doclitbarewsdl.composite").toURI().toURL().toString(), - new Contribution("TestContribution", new File("src/main/resources/").toURI().toURL().toString())); - node.start(); - } catch (Throwable e) { - // @Ignore("TUSCANY-2398") - e.printStackTrace(); - } - } - - /** - * Runs once after running the tests - */ - @AfterClass - public static void tearDown() { - if (node != null) { - node.stop(); - } - } - - // @Ignore("TUSCANY-2398") - @Test - public void testDocLitBareWsdl() throws Exception { - AClientService client = node.getService(AClientService.class, "AClientComponent"); - String name = "Pandu"; - String resp = client.getGreetingsForward(name); - Assert.assertEquals("Hello " + name, resp); - } -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java deleted file mode 100644 index 755619908d..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java +++ /dev/null @@ -1,493 +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.itest.databindings.jaxb; - -import java.io.File; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.itest.databindings.jaxb.impl.GenericsTransformer; -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - - -/** - * Databinding tests for generics, parameterized and polymorphic types. - * - * @version $Rev$ $Date$ - */ -public class GenericsDatabindingTestCase { - - private static Node node; - - /** - * Runs before each test method - */ - @BeforeClass - public static void setUp() throws Exception { - try { - NodeFactory factory = NodeFactory.newInstance(); - node = factory.createNode(new File("src/main/resources/generics-service.composite").toURI().toURL().toString(), - new Contribution("TestContribution", new File("src/main/resources/").toURI().toURL().toString())); - node.start(); - } catch(Throwable e) { - e.printStackTrace(); - } - } - - /** - * Runs after each test method - */ - @AfterClass - public static void tearDown() { - node.stop(); - } - - /** - * Invokes the GenericsService service using SCA binding. - * Service method invoked is getTypeExplicit. - */ - @Test - public void testSCATypeExplicit() throws Exception { - GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent"); - performTestTypeExplicit(serviceClient); - } - - /** - * Invokes the GenericsService service using SCA binding. - * Service method invoked is getTypeUnbound. - */ - @Test - public void testSCATypeUnbound() throws Exception { - GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent"); - performTestTypeUnbound(serviceClient); - } - - /** - * Invokes the GenericsService service using SCA binding. - * Service method invoked is getTypeExtends. - */ - @Test - public void testSCATypeExtends() throws Exception { - GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent"); - performTestTypeExtends(serviceClient); - } - - /** - * Invokes the GenericsService service using SCA binding. - * Service method invoked is getRecursiveTypeBound. - */ - @Test - public void testSCARecursiveTypeBound() throws Exception { - GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent"); - performTestRecursiveTypeBound(serviceClient); - } - - /** - * Invokes the GenericsService service using SCA binding. - * Service method invoked is getWildcardUnbound. - */ - @Test - public void testSCAWildcardUnbound() throws Exception { - GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent"); - performTestWildcardUnbound(serviceClient); - } - - /** - * Invokes the GenericsService service using SCA binding. - * Service method invoked is getWildcardSuper. - */ - @Test - public void testSCAWildcardSuper() throws Exception { - GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent"); - performTestWildcardSuper(serviceClient); - } - - /** - * Invokes the GenericsService service using SCA binding. - * Service method invoked is getWildcardExtends. - */ - @Test - public void testSCAWildcardExtends() throws Exception { - GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent"); - performTestWildcardExtends(serviceClient); - } - - /** - * Invokes the GenericsService service using SCA binding. - * Service method invoked is getPolymorphic. - */ - @Test - public void testSCAPolymorphic() throws Exception { - GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsServiceClientSCAComponent"); - performTestPolymorphic(serviceClient); - } - - /** - * Invokes the GenericsService service using WS binding. - * Service method invoked is getTypeExplicit. - */ - @Test - public void testWSTypeExplicit() throws Exception { - GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent"); - performTestTypeExplicit(serviceClient); - } - - /** - * Invokes the GenericsService service using WS binding. - * Service method invoked is getTypeUnbound. - */ - @Test - public void testWSTypeUnbound() throws Exception { - GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent"); - performTestTypeUnbound(serviceClient); - } - - /** - * Invokes the GenericsService service using WS binding. - * Service method invoked is getTypeExtends. - */ - @Test - public void testWSTypeExtends() throws Exception { - GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent"); - performTestTypeExtends(serviceClient); - } - - /** - * Invokes the GenericsService service using WS binding. - * Service method invoked is getRecursiveTypeBound. - */ - @Test - public void testWSRecursiveTypeBound() throws Exception { - GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent"); - performTestRecursiveTypeBound(serviceClient); - } - - /** - * Invokes the GenericsService service using WS binding. - * Service method invoked is getWildcardUnbound. - */ - @Test - public void testWSWildcardUnbound() throws Exception { - GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent"); - performTestWildcardUnbound(serviceClient); - } - - /** - * Invokes the GenericsService service using WS binding. - * Service method invoked is getWildcardSuper. - */ - @Test - public void testWSWildcardSuper() throws Exception { - GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent"); - performTestWildcardSuper(serviceClient); - } - - /** - * Invokes the GenericsService service using WS binding. - * Service method invoked is getWildcardExtends. - */ - @Test - public void testWSWildcardExtends() throws Exception { - GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent"); - performTestWildcardExtends(serviceClient); - } - - /** - * Invokes the GenericsService service using WS binding. - * Service method invoked is getPolymorphic. - */ - @Test - public void testWSPolymorphic() throws Exception { - GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsServiceClientWSComponent"); - performTestPolymorphic(serviceClient); - } - - /** - * Invokes the GenericsLocalService service using SCA binding. - * Service method invoked is getTypeExplicit. - */ - @Test - public void testSCALocalTypeExplicit() throws Exception { - GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent"); - performTestTypeExplicit(serviceClient); - } - - /** - * Invokes the GenericsLocalService service using SCA binding. - * Service method invoked is getTypeUnbound. - */ - @Test - public void testSCALocalTypeUnbound() throws Exception { - GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent"); - performTestTypeUnbound(serviceClient); - } - - /** - * Invokes the GenericsLocalService service using SCA binding. - * Service method invoked is getTypeExtends. - */ - @Test - public void testSCALocalTypeExtends() throws Exception { - GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent"); - performTestTypeExtends(serviceClient); - } - - /** - * Invokes the GenericsLocalService service using SCA binding. - * Service method invoked is getRecursiveTypeBound. - */ - @Test - public void testSCALocalRecursiveTypeBound() throws Exception { - GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent"); - performTestRecursiveTypeBound(serviceClient); - } - - /** - * Invokes the GenericsLocalService service using SCA binding. - * Service method invoked is getWildcardUnbound. - */ - @Test - public void testSCALocalWildcardUnbound() throws Exception { - GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent"); - performTestWildcardUnbound(serviceClient); - } - - /** - * Invokes the GenericsLocalService service using SCA binding. - * Service method invoked is getWildcardSuper. - */ - @Test - public void testSCALocalWildcardSuper() throws Exception { - GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent"); - performTestWildcardSuper(serviceClient); - } - - /** - * Invokes the GenericsLocalService service using SCA binding. - * Service method invoked is getWildcardExtends. - */ - @Test - public void testSCALocalWildcardExtends() throws Exception { - GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent"); - performTestWildcardExtends(serviceClient); - } - - /** - * Invokes the GenericsLocalService service using SCA binding. - * Service method invoked is getPolymorphic. - */ - @Test - public void testSCALocalPolymorphic() throws Exception { - GenericsServiceClient serviceClient = node.getService(GenericsServiceClient.class, "GenericsLocalServiceClientSCAComponent"); - performTestPolymorphic(serviceClient); - } - - private void performTestTypeExplicit(GenericsServiceClient serviceClient) { - Bean1<String> args[] = new Bean1[2]; - args[0] = new Bean1<String>("Me"); - args[1] = new Bean1<String>(); - for(int i = 0; i < args.length; ++i) { - Bean1<String> arg = args[i]; - Bean1<String> expected = GenericsTransformer.getTypeExplicit(arg); - Bean1<String> actual = serviceClient.getTypeExplicitForward(arg); - Assert.assertEquals(expected, actual); - } - } - - private void performTestTypeUnbound(GenericsServiceClient serviceClient) { - { // String - String[] args = { "Me", "You", "Him" }; - Bean1<String> expected = GenericsTransformer.getTypeUnbound(args); - Bean1<String> actual = serviceClient.getTypeUnboundForward(args); - // Assert.assertEquals(expected, actual); - } - { // Integer - Integer[] args = new Integer[3]; - args[0] = -10; - args[1] = 0; - args[2] = 10; - Bean1<Integer> expected = GenericsTransformer.getTypeUnbound(args); - Bean1<Integer> actual = serviceClient.getTypeUnboundForward(args); - // Assert.assertEquals(expected, actual); - } - { // Object - Object[] args = new Object[3]; - args[0] = "Me"; - args[1] = 10; - args[2] = "Him"; - Bean1<Object> expected = GenericsTransformer.getTypeUnbound(args); - Bean1<Object> actual = serviceClient.getTypeUnboundForward(args); - Assert.assertEquals(expected, actual); - } - } - - private void performTestTypeExtends(GenericsServiceClient serviceClient) { - { // Bean2 - Bean2[] args = new Bean2[3]; - for(int i = 0; i < args.length; ++i) { - args[i] = new Bean2(); - args[i].setName("Name"+i); - } - - Bean1<Bean2> expected = GenericsTransformer.getTypeExtends(args); - Bean1<Bean2> actual = serviceClient.getTypeExtendsForward(args); - Assert.assertEquals(expected, actual); - } - { // Bean3 extends Bean2 - Bean3[] args = new Bean3[3]; - for(int i = 0; i < args.length; ++i) { - args[i] = new Bean3(); - args[i].setName("Name"+i); - args[i].setAddress("Address"+i); - } - - Bean1<Bean3> expected = GenericsTransformer.getTypeExtends(args); - Bean1<Bean3> actual = serviceClient.getTypeExtendsForward(args); - // Assert.assertEquals(expected, actual); - } - { //Bean31 extends Bean2 - Bean31[] args = new Bean31[3]; - for(int i = 0; i < args.length; ++i) { - args[i] = new Bean31(); - args[i].setName("Name"+i); - args[i].setAddress("Address"+i); - } - - Bean1<Bean31> expected = GenericsTransformer.getTypeExtends(args); - Bean1<Bean31> actual = serviceClient.getTypeExtendsForward(args); - // Assert.assertEquals(expected, actual); - } - } - - private void performTestRecursiveTypeBound(GenericsServiceClient serviceClient) { - { // Bean1<String> - Bean1<String>[] args = new Bean1[3]; - for(int i = 0; i < args.length; ++i) { - args[i] = new Bean1<String>(); - args[i].setItem("Bean."+i); - } - Bean1<Bean1<String>> expected = GenericsTransformer.getRecursiveTypeBound(args); - Bean1<Bean1<String>> actual = serviceClient.getRecursiveTypeBoundForward(args); - Assert.assertEquals(expected, actual); - } - { // Bean10 extends Bean1<String> - Bean10[] args = new Bean10[3]; - for(int i = 0; i < args.length; ++i) { - args[i] = new Bean10(); - args[i].setItem("Bean10."+i); - } - Bean1<Bean10> expected = GenericsTransformer.getRecursiveTypeBound(args); - Bean1<Bean10> actual = serviceClient.getRecursiveTypeBoundForward(args); - // Assert.assertEquals(expected, actual); - } - { // Bean11 extends Bean1<String> - Bean11[] args = new Bean11[3]; - for(int i = 0; i < args.length; ++i) { - args[i] = new Bean11(); - args[i].setItem("Bean11."+i); - } - Bean1<Bean11> expected = GenericsTransformer.getRecursiveTypeBound(args); - Bean1<Bean11> actual = serviceClient.getRecursiveTypeBoundForward(args); - // Assert.assertEquals(expected, actual); - } - } - - private void performTestWildcardUnbound(GenericsServiceClient serviceClient) { - { - Bean1<?> arg = new Bean1<String>("Me"); - Bean1<?> expected = GenericsTransformer.getWildcardUnbound(arg); - Bean1<?> actual = serviceClient.getWildcardUnboundForward(arg); - Assert.assertEquals(expected, actual); - } - { - Bean1<?> arg = new Bean1<Integer>(1); - Bean1<?> expected = GenericsTransformer.getWildcardUnbound(arg); - Bean1<?> actual = serviceClient.getWildcardUnboundForward(arg); - Assert.assertEquals(expected, actual); - } - } - - private void performTestWildcardSuper(GenericsServiceClient serviceClient) { - Bean1<? super Bean3> arg = new Bean1<Bean2>(); - Bean3 item = new Bean3(); - item.setName("Name"); - item.setAddress("Address"); - arg.setItem(item); - Bean1<? super Bean3> expected = GenericsTransformer.getWildcardSuper(arg); - Bean1<? super Bean3> actual = serviceClient.getWildcardSuperForward(arg); - Assert.assertEquals(expected, actual); - } - - private void performTestWildcardExtends(GenericsServiceClient serviceClient) { - { // Bean2 - Bean2 temp = new Bean2(); - temp.setName("Me"); - Bean1<? extends Bean2> arg = new Bean1<Bean2>(temp); - Bean1<? extends Bean2> expected = GenericsTransformer.getWildcardExtends(arg); - Bean1<? extends Bean2> actual = serviceClient.getWildcardExtendsForward(arg); - Assert.assertEquals(expected, actual); - } - { // Bean3 extends Bean2 - Bean3 temp = new Bean3(); - temp.setName("Me"); - temp.setAddress("My address"); - Bean1<? extends Bean2> arg = new Bean1<Bean3>(temp); - Bean1<? extends Bean2> expected = GenericsTransformer.getWildcardExtends(arg); - Bean1<? extends Bean2> actual = serviceClient.getWildcardExtendsForward(arg); - // The Bean3 will be unmarshalled into Bean2 - // Assert.assertEquals(expected, actual); - Assert.assertTrue(actual.getItem() instanceof Bean2); - } - { // Bean31 extends Bean2 - Bean31 temp = new Bean31(); - temp.setName("Me1"); - temp.setAddress("My address1"); - Bean1<? extends Bean2> arg = new Bean1<Bean31>(temp); - Bean1<? extends Bean2> expected = GenericsTransformer.getWildcardExtends(arg); - Bean1<? extends Bean2> actual = serviceClient.getWildcardExtendsForward(arg); - // The Bean31 will be unmarshalled into Bean2 - // Assert.assertEquals(expected, actual); - Assert.assertTrue(actual.getItem() instanceof Bean2); - } - } - - private void performTestPolymorphic(GenericsServiceClient serviceClient) { - { // Bean2 - Bean2 arg = new Bean2(); - arg.setName("Me"); - Bean2 expected = GenericsTransformer.getPolymorphic(arg); - Bean2 actual = serviceClient.getPolymorphicForward(arg); - Assert.assertEquals(expected, actual); - } - { // Bean3 extends Bean2 - Bean3 arg = new Bean3(); - arg.setName("Me"); - arg.setAddress("My address"); - Bean2 expected = GenericsTransformer.getPolymorphic(arg); - Bean2 actual = serviceClient.getPolymorphicForward(arg); - Assert.assertEquals(expected.getName(), actual.getName()); - } - } -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java deleted file mode 100644 index 8ece2c3293..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java +++ /dev/null @@ -1,784 +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.itest.databindings.jaxb; - -import java.io.File; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - - -/** - * @version $Rev$ $Date$ - */ -public class PrimitivesDatabindingTestCase { - - private static Node node; - - /** - * Runs before each test method - */ - @BeforeClass - public static void setUp() throws Exception { - try { - NodeFactory factory = NodeFactory.newInstance(); - node = factory.createNode(new File("src/main/resources/primitivesservice.composite").toURI().toURL().toString(), - new Contribution("TestContribution", new File("src/main/resources/").toURI().toURL().toString())); - node.start(); - } catch(Throwable e) { - e.printStackTrace(); - Assert.fail(); - } - } - - /** - * Runs after each test method - */ - @AfterClass - public static void tearDown() { - node.stop(); - } - - /** - * Invokes the PrimitivesService service using SCA binding. - * Service method invoked is negateBoolean. - */ - @Test - public void testSCANegateBoolean() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent"); - performTestNegateBoolean(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using SCA binding. - * Service method invoked is negateBooleanArray. - */ - @Test - public void testSCANegateBooleanArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent"); - performTestNegateBooleanArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with SCA binding. - * Test for boolean array. - */ - @Test - public void testSCAPassByValueBooleanArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueBooleanArray()); - } - - /** - * Invokes the PrimitivesService service using SCA binding. - * Service method invoked is negateByte. - */ - @Test - public void testSCANegateByte() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent"); - performTestNegateByte(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using SCA binding. - * Service method invoked is negateByteArray. - */ - @Test - public void testSCANegateByteArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent"); - performTestNegateByteArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with SCA binding. - * Test for byte array. - */ - @Test - public void testSCAPassByValueByteArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueByteArray()); - } - - /** - * Invokes the PrimitivesService service using SCA binding. - * Service method invoked is negateShort. - */ - @Test - public void testSCANegateShort() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent"); - performTestNegateShort(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using SCA binding. - * Service method invoked is negateShortArray. - */ - @Test - public void testSCANegateShortArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent"); - performTestNegateShortArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with SCA binding. - * Test for short array. - */ - @Test - public void testSCAPassByValueShortArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueShortArray()); - } - - /** - * Invokes the PrimitivesService service using SCA binding. - * Service method invoked is negateInt. - */ - @Test - public void testSCANegateInt() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent"); - performTestNegateInt(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using SCA binding. - * Service method invoked is negateIntArray. - */ - @Test - public void testSCANegateIntArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent"); - performTestNegateIntArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with SCA binding. - * Test for int array. - */ - @Test - public void testSCAPassByValueIntArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueIntArray()); - } - - /** - * Invokes the PrimitivesService service using SCA binding. - * Service method invoked is negateLong. - */ - @Test - public void testSCANegateLong() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent"); - performTestNegateLong(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using SCA binding. - * Service method invoked is negateLongArray. - */ - @Test - public void testSCANegateLongArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent"); - performTestNegateLongArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with SCA binding. - * Test for long array. - */ - @Test - public void testSCAPassByValueLongArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueLongArray()); - } - - /** - * Invokes the PrimitivesService service using SCA binding. - * Service method invoked is negateFloat. - */ - @Test - public void testSCANegateFloat() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent"); - performTestNegateFloat(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using SCA binding. - * Service method invoked is negateFloatArray. - */ - @Test - public void testSCANegateFloatArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent"); - performTestNegateFloatArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with SCA binding. - * Test for float array. - */ - @Test - public void testSCAPassByValueFloatArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueFloatArray()); - } - - /** - * Invokes the PrimitivesService service using SCA binding. - * Service method invoked is negateDouble. - */ - @Test - public void testSCANegateDouble() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent"); - performTestNegateDouble(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using SCA binding. - * Service method invoked is negateDoubleArray. - */ - @Test - public void testSCANegateDoubleArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent"); - performTestNegateDoubleArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with SCA binding. - * Test for double array. - */ - @Test - public void testSCAPassByValueDoubleArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientSCAComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueDoubleArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateBoolean. - */ - @Test - public void testWSNegateBoolean() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent"); - performTestNegateBoolean(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateBooleanArray. - */ - @Test - public void testWSNegateBooleanArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent"); - performTestNegateBooleanArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for boolean array. - */ - @Test - public void testWSPassByValueBooleanArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueBooleanArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateByte. - */ - @Test - public void testWSNegateByte() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent"); - performTestNegateByte(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateByteArray. - */ - @Test - public void testWSNegateByteArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent"); - performTestNegateByteArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for byte array. - */ - @Test - public void testWSPassByValueByteArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueByteArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateShort. - */ - @Test - public void testWSNegateShort() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent"); - performTestNegateShort(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateShortArray. - */ - @Test - public void testWSNegateShortArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent"); - performTestNegateShortArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for short array. - */ - @Test - public void testWSPassByValueShortArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueShortArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateInt. - */ - @Test - public void testWSNegateInt() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent"); - performTestNegateInt(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateIntArray. - */ - @Test - public void testWSNegateIntArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent"); - performTestNegateIntArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for int array. - */ - @Test - public void testWSPassByValueIntArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueIntArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateLong. - */ - @Test - public void testWSNegateLong() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent"); - performTestNegateLong(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateLongArray. - */ - @Test - public void testWSNegateLongArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent"); - performTestNegateLongArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for long array. - */ - @Test - public void testWSPassByValueLongArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueLongArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateFloat. - */ - @Test - public void testWSNegateFloat() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent"); - performTestNegateFloat(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateFloatArray. - */ - @Test - public void testWSNegateFloatArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent"); - performTestNegateFloatArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for float array. - */ - @Test - public void testWSPassByValueFloatArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueFloatArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateDouble. - */ - @Test - public void testWSNegateDouble() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent"); - performTestNegateDouble(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateDoubleArray. - */ - @Test - public void testWSNegateDoubleArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent"); - performTestNegateDoubleArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for double array. - */ - @Test - public void testWSPassByValueDoubleArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientWSComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueDoubleArray()); - } - - /** - * Invokes the PrimitivesLocalService service using SCA binding. - * Service method invoked is negateBoolean. - */ - @Test - public void testSCALocalNegateBoolean() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent"); - performTestNegateBoolean(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesLocalService service using SCA binding. - * Service method invoked is negateBooleanArray. - */ - @Test - public void testSCALocalNegateBooleanArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent"); - performTestNegateBooleanArray(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesLocalService service using SCA binding. - * Service method invoked is negateByte. - */ - @Test - public void testSCALocalNegateByte() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent"); - performTestNegateByte(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesLocalService service using SCA binding. - * Service method invoked is negateByteArray. - */ - @Test - public void testSCALocalNegateByteArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent"); - performTestNegateByteArray(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesLocalService service using SCA binding. - * Service method invoked is negateShort. - */ - @Test - public void testSCALocalNegateShort() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent"); - performTestNegateShort(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesLocalService service using SCA binding. - * Service method invoked is negateShortArray. - */ - @Test - public void testSCALocalNegateShortArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent"); - performTestNegateShortArray(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesLocalService service using SCA binding. - * Service method invoked is negateInt. - */ - @Test - public void testSCALocalNegateInt() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent"); - performTestNegateInt(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesLocalService service using SCA binding. - * Service method invoked is negateIntArray. - */ - @Test - public void testSCALocalNegateIntArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent"); - performTestNegateIntArray(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesLocalService service using SCA binding. - * Service method invoked is negateLong. - */ - @Test - public void testSCALocalNegateLong() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent"); - performTestNegateLong(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesLocalService service using SCA binding. - * Service method invoked is negateLongArray. - */ - @Test - public void testSCALocalNegateLongArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent"); - performTestNegateLongArray(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesLocalService service using SCA binding. - * Service method invoked is negateFloat. - */ - @Test - public void testSCALocalNegateFloat() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent"); - performTestNegateFloat(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using SCA binding. - * Service method invoked is negateFloatArray. - */ - @Test - public void testSCALocalNegateFloatArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent"); - performTestNegateFloatArray(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesLocalService service using SCA binding. - * Service method invoked is negateDouble. - */ - @Test - public void testSCALocalNegateDouble() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent"); - performTestNegateDouble(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesLocalService service using SCA binding. - * Service method invoked is negateDoubleArray. - */ - @Test - public void testSCALocalNegateDoubleArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesLocalServiceClientSCAComponent"); - performTestNegateDoubleArray(primitivesServiceClient); - } - - private void performTestNegateBoolean(PrimitivesServiceClient primitivesServiceClient) { - Assert.assertTrue(primitivesServiceClient.negateBooleanForward(false)); - Assert.assertFalse(primitivesServiceClient.negateBooleanForward(true)); - } - - private void performTestNegateBooleanArray(PrimitivesServiceClient primitivesServiceClient) { - boolean flags[] = new boolean[2]; - flags[0] = false; - flags[1] = true; - boolean[] respFlags = primitivesServiceClient.negateBooleanArrayForward(flags); - Assert.assertEquals(flags.length, respFlags.length); - for(int i = 0; i < flags.length; ++i) { - Assert.assertEquals(!flags[i], respFlags[i]); - } - } - - private void performTestNegateByte(PrimitivesServiceClient primitivesServiceClient) { - byte[] ba = new byte[3]; - ba[0] = -1; - ba[1] = 0; - ba[2] = 1; - - for(int i = 0; i < ba.length; ++i) { - Assert.assertEquals((byte)-ba[i], primitivesServiceClient.negateByteForward(ba[i])); - } - } - - private void performTestNegateByteArray(PrimitivesServiceClient primitivesServiceClient) { - byte[] ba = new byte[3]; - ba[0] = -1; - ba[1] = 0; - ba[2] = 1; - - byte[] r = primitivesServiceClient.negateByteArrayForward(ba); - Assert.assertEquals(ba.length, r.length); - for(int i = 0; i < ba.length; ++i) { - Assert.assertEquals((byte)-ba[i], r[i]); - } - } - - private void performTestNegateShort(PrimitivesServiceClient primitivesServiceClient) { - short[] s = new short[3]; - s[0] = -1; - s[1] = 0; - s[2] = 1; - - for(int i = 0; i < s.length; ++i) { - Assert.assertEquals((short)-s[i], primitivesServiceClient.negateShortForward(s[i])); - } - } - - private void performTestNegateShortArray(PrimitivesServiceClient primitivesServiceClient) { - short[] s = new short[3]; - s[0] = -1; - s[1] = 0; - s[2] = 1; - - short[] r = primitivesServiceClient.negateShortArrayForward(s); - Assert.assertEquals(s.length, r.length); - for(int i = 0; i < s.length; ++i) { - Assert.assertEquals((short)-s[i], r[i]); - } - } - - private void performTestNegateInt(PrimitivesServiceClient primitivesServiceClient) { - int[] ia = new int[3]; - ia[0] = -1; - ia[1] = 0; - ia[2] = 1; - - for(int i = 0; i < ia.length; ++i) { - Assert.assertEquals(-ia[i], primitivesServiceClient.negateIntForward(ia[i])); - } - } - - private void performTestNegateIntArray(PrimitivesServiceClient primitivesServiceClient) { - int[] ia = new int[3]; - ia[0] = -1; - ia[1] = 0; - ia[2] = 1; - - int[] r = primitivesServiceClient.negateIntArrayForward(ia); - Assert.assertEquals(ia.length, r.length); - for(int i = 0; i < ia.length; ++i) { - Assert.assertEquals(-ia[i], r[i]); - } - } - - private void performTestNegateLong(PrimitivesServiceClient primitivesServiceClient) { - long[] la = new long[3]; - la[0] = -1; - la[1] = 0; - la[2] = 1; - - for(int i = 0; i < la.length; ++i) { - Assert.assertEquals(-la[i], primitivesServiceClient.negateLongForward(la[i])); - } - } - - private void performTestNegateLongArray(PrimitivesServiceClient primitivesServiceClient) { - long[] la = new long[3]; - la[0] = -1; - la[1] = 0; - la[2] = 1; - - long[] r = primitivesServiceClient.negateLongArrayForward(la); - Assert.assertEquals(la.length, r.length); - for(int i = 0; i < la.length; ++i) { - Assert.assertEquals(-la[i], r[i]); - } - } - - private void performTestNegateFloat(PrimitivesServiceClient primitivesServiceClient) { - float[] fa = new float[3]; - fa[0] = -1; - fa[1] = 0; - fa[2] = 1; - - for(int i = 0; i < fa.length; ++i) { - Assert.assertEquals(-fa[i], primitivesServiceClient.negateFloatForward(fa[i])); - } - } - - private void performTestNegateFloatArray(PrimitivesServiceClient primitivesServiceClient) { - float[] ia = new float[3]; - ia[0] = -1; - ia[1] = 0; - ia[2] = 1; - - float[] r = primitivesServiceClient.negateFloatArrayForward(ia); - Assert.assertEquals(ia.length, r.length); - for(int i = 0; i < ia.length; ++i) { - Assert.assertEquals(-ia[i], r[i]); - } - } - - private void performTestNegateDouble(PrimitivesServiceClient primitivesServiceClient) { - double[] da = new double[3]; - da[0] = -1; - da[1] = 0; - da[2] = 1; - - for(int i = 0; i < da.length; ++i) { - Assert.assertEquals(-da[i], primitivesServiceClient.negateDoubleForward(da[i])); - } - } - - private void performTestNegateDoubleArray(PrimitivesServiceClient primitivesServiceClient) { - double[] da = new double[3]; - da[0] = -1; - da[1] = 0; - da[2] = 1; - - double[] r = primitivesServiceClient.negateDoubleArrayForward(da); - Assert.assertEquals(da.length, r.length); - for(int i = 0; i < da.length; ++i) { - Assert.assertEquals(-da[i], r[i]); - } - } -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java b/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java deleted file mode 100644 index dd9a689353..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java +++ /dev/null @@ -1,1439 +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.itest.databindings.jaxb; - -import java.awt.Image; -import java.awt.image.BufferedImage; -import java.awt.image.PixelGrabber; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.StringWriter; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.net.URI; -import java.net.URL; -import java.util.Calendar; -import java.util.Date; -import java.util.GregorianCalendar; -import java.util.TimeZone; -import java.util.UUID; - -import javax.activation.DataHandler; -import javax.xml.datatype.DatatypeConfigurationException; -import javax.xml.datatype.DatatypeFactory; -import javax.xml.datatype.Duration; -import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.namespace.QName; -import javax.xml.transform.Result; -import javax.xml.transform.Source; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.stream.StreamResult; - -import junit.framework.Assert; - -import org.apache.axiom.attachments.ByteArrayDataSource; -import org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesTransformer; -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - - -/** - * @version $Rev$ $Date$ - */ -public class StandardTypesDatabindingTestCase { - - private static Node node; - - /** - * Runs before each test method - */ - @BeforeClass - public static void setUp() throws Exception { - try { - NodeFactory factory = NodeFactory.newInstance(); - node = factory.createNode(new File("src/main/resources/standard-types-service.composite").toURI().toURL().toString(), - new Contribution("TestContribution", new File("src/main/resources/").toURI().toURL().toString())); - node.start(); - } catch (Throwable e) { - e.printStackTrace(); - } - } - - /** - * Runs after each test method - */ - @AfterClass - public static void tearDown() { - node.stop(); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewBigInteger. - */ - @Test - public void testSCANewBigInteger() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewBigInteger(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewBigIntegerArray. - */ - @Test - public void testSCANewBigIntegerArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewBigIntegerArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewBigDecimal. - */ - @Test - public void testSCANewBigDecimal() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewBigDecimal(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewBigDecimalArray. - */ - @Test - public void testSCANewBigDecimalArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewBigDecimalArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewCalendar. - */ - @Test - public void testSCANewCalendar() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewCalendar(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewCalendarArray. - */ - @Test - public void testSCANewCalendarArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewCalendarArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewDate. - */ - @Test - public void testSCANewDate() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewDate(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewDateArray. - */ - @Test - public void testSCANewDateArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewDateArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewQName. - */ - @Test - public void testSCANewQName() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewQName(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewQNameArray. - */ - @Test - public void testSCANewQNameArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewQNameArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewURI. - */ - @Test - public void testSCANewURI() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewURI(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewURIArray. - */ - @Test - public void testSCANewURIArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewURIArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewXMLGregorianCalendar. - */ - @Test - public void testSCANewXMLGregorianCalendar() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewXMLGregorianCalendar(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewXMLGregorianCalendarArray. - */ - @Test - public void testSCANewXMLGregorianCalendarArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewXMLGregorianCalendarArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewDuration. - */ - @Test - public void testSCANewDuration() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewDuration(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewDurationArray. - */ - @Test - public void testSCANewDurationArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewDurationArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewObject. - */ - @Test - public void testSCANewObject() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewObject(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewObjectArray. - */ - @Test - public void testSCANewObjectArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewObjectArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewImage. - */ - @Test - public void testSCANewImage() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewImage(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewImageArray. - */ - @Test - public void testSCANewImageArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewImageArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewDataHandler. - */ - @Test - public void testSCANewDataHandler() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewDataHandler(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewDataHandlerArray. - */ - @Test - public void testSCANewDataHandlerArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewDataHandlerArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewSource. - */ - /*@Test - public void testSCANewSource() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewSource(serviceClient); - }*/ - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewSourceArray. - */ - /*@Test - @Ignore("TUSCANY-2387") - public void testSCANewSourceArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewSourceArray(serviceClient); - }*/ - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewUUID. - */ - @Test - public void testSCANewUUID() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewUUID(serviceClient); - } - - /** - * Invokes the StandardTypesService service using SCA binding. - * Service method invoked is getNewUUIDArray. - */ - @Test - public void testSCANewUUIDArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientSCAComponent"); - performTestNewUUIDArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewBigInteger. - */ - @Test - public void testWSNewBigInteger() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewBigInteger(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewBigIntegerArray. - */ - @Test - public void testWSNewBigIntegerArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewBigIntegerArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewBigDecimal. - */ - @Test - public void testWSNewBigDecimal() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewBigDecimal(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewBigDecimalArray. - */ - @Test - public void testWSNewBigDecimalArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewBigDecimalArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewCalendar. - */ - @Test - public void testWSNewCalendar() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewCalendar(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewCalendarArray. - */ - @Test - public void testWSNewCalendarArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewCalendarArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDate. - */ - @Test - public void testWSNewDate() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewDate(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDateArray. - */ - @Test - public void testWSNewDateArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewDateArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewQName. - */ - @Test - public void testWSNewQName() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewQName(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewQNameArray. - */ - @Test - public void testWSNewQNameArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewQNameArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewURI. - */ - @Test - public void testWSNewURI() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewURI(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewURIArray. - */ - @Test - public void testWSNewURIArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewURIArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewXMLGregorianCalendar. - */ - @Test - public void testWSNewXMLGregorianCalendar() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewXMLGregorianCalendar(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewXMLGregorianCalendarArray. - */ - @Test - public void testWSNewXMLGregorianCalendarArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewXMLGregorianCalendarArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDuration. - */ - @Test - public void testWSNewDuration() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewDuration(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDurationArray. - */ - @Test - public void testWSNewDurationArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewDurationArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewObject. - */ - @Test - public void testWSNewObject() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewObject(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewObjectArray. - */ - @Test - public void testWSNewObjectArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewObjectArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewImage. - */ - @Test - public void testWSNewImage() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewImage(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewImageArray. - */ - @Test - public void testWSNewImageArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewImageArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDataHandler. - */ - @Test - public void testWSNewDataHandler() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewDataHandler(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDataHandlerArray. - */ - @Test - public void testWSNewDataHandlerArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewDataHandlerArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewSource. - */ - /*@Test - // @Ignore("junit.framework.ComparisonFailure: null expected:<... encoding=\"UTF-8\"?><[a>A</a]>> but was:<... encoding=\"UTF-8\"?><[return xmlns=\"http://jaxb.databindings.itest.sca.tuscany.apache.org/\">A</return]>>") - public void testWSNewSource() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewSource(serviceClient); - }*/ - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewSourceArray. - */ - /*@Test - @Ignore("TUSCANY-2386") - public void testWSNewSourceArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewSourceArray(serviceClient); - }*/ - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewUUID. - */ - @Test - public void testWSNewUUID() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewUUID(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewUUIDArray. - */ - @Test - public void testWSNewUUIDArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientWSComponent"); - performTestNewUUIDArray(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewBigInteger. - */ - @Test - public void testSCALocalNewBigInteger() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewBigInteger(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewBigIntegerArray. - */ - @Test - public void testSCALocalNewBigIntegerArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewBigIntegerArray(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewBigDecimal. - */ - @Test - public void testSCALocalNewBigDecimal() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewBigDecimal(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewBigDecimalArray. - */ - @Test - public void testSCALocalNewBigDecimalArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewBigDecimalArray(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewCalendar. - */ - @Test - public void testSCALocalNewCalendar() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewCalendar(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewCalendarArray. - */ - @Test - public void testSCALocalNewCalendarArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewCalendarArray(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewDate. - */ - @Test - public void testSCALocalNewDate() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewDate(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewDateArray. - */ - @Test - public void testSCALocalNewDateArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewDateArray(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewQName. - */ - @Test - public void testSCALocalNewQName() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewQName(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewQNameArray. - */ - @Test - public void testSCALocalNewQNameArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewQNameArray(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewURI. - */ - @Test - public void testSCALocalNewURI() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewURI(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewURIArray. - */ - @Test - public void testSCALocalNewURIArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewURIArray(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewXMLGregorianCalendar. - */ - @Test - public void testSCALocalNewXMLGregorianCalendar() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewXMLGregorianCalendar(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewXMLGregorianCalendarArray. - */ - @Test - public void testSCALocalNewXMLGregorianCalendarArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewXMLGregorianCalendarArray(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewDuration. - */ - @Test - public void testSCALocalNewDuration() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewDuration(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewDurationArray. - */ - @Test - public void testSCALocalNewDurationArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewDurationArray(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewObject. - */ - @Test - public void testSCALocalNewObject() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewObject(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewObjectArray. - */ - @Test - public void testSCALocalNewObjectArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewObjectArray(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewImage. - */ - @Test - public void testSCALocalNewImage() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewImage(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewImageArray. - */ - @Test - public void testSCALocalNewImageArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewImageArray(serviceClient); - } - - /** - * Invokes the StandardTypesLocalLocalService service using SCA binding. - * Service method invoked is getNewDataHandler. - */ - @Test - public void testSCALocalNewDataHandler() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewDataHandler(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewDataHandlerArray. - */ - @Test - public void testSCALocalNewDataHandlerArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewDataHandlerArray(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewSource. - */ - /*@Test - public void testSCALocalNewSource() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewSource(serviceClient); - }*/ - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewSourceArray. - */ - /*@Test - public void testSCALocalNewSourceArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewSourceArray(serviceClient); - }*/ - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewUUID. - */ - @Test - public void testSCALocalNewUUID() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewUUID(serviceClient); - } - - /** - * Invokes the StandardTypesLocalService service using SCA binding. - * Service method invoked is getNewUUIDArray. - */ - @Test - public void testSCALocalNewUUIDArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesLocalServiceClientSCAComponent"); - performTestNewUUIDArray(serviceClient); - } - - private void performTestNewBigInteger(StandardTypesServiceClient serviceClient) { - BigInteger bi = new BigInteger("1234567890123456789012345678901234"); - BigInteger expected = bi.negate(); - BigInteger actual = serviceClient.getNewBigIntegerForward(bi); - Assert.assertEquals(expected, actual); - } - - private void performTestNewBigIntegerArray(StandardTypesServiceClient serviceClient) { - BigInteger[] bia = new BigInteger[2]; - bia[0] = new BigInteger("1234567890123456789012345678901234"); - bia[1] = new BigInteger("-98765432109876543210987654321"); - BigInteger[] actual = serviceClient.getNewBigIntegerArrayForward(bia); - Assert.assertEquals(bia.length, actual.length); - for (int i = 0; i < bia.length; ++i) { - Assert.assertEquals(bia[i].negate(), actual[i]); - } - } - - private void performTestNewBigDecimal(StandardTypesServiceClient serviceClient) { - BigDecimal bd = new BigDecimal("12345678901234567890.12345678901234"); - BigDecimal expected = bd.negate(); - BigDecimal actual = serviceClient.getNewBigDecimalForward(bd); - Assert.assertEquals(expected, actual); - } - - private void performTestNewBigDecimalArray(StandardTypesServiceClient serviceClient) { - BigDecimal[] bda = new BigDecimal[2]; - bda[0] = new BigDecimal("1234567890123456.789012345678901234"); - bda[1] = new BigDecimal("-987654321098765.43210987654321"); - BigDecimal[] actual = serviceClient.getNewBigDecimalArrayForward(bda); - Assert.assertEquals(bda.length, actual.length); - for (int i = 0; i < bda.length; ++i) { - Assert.assertEquals(bda[i].negate(), actual[i]); - } - } - - private void performTestNewCalendar(StandardTypesServiceClient serviceClient) { - Calendar[] ca = new Calendar[3]; - String[] tz = {"GMT+05:30", "GMT+00:00", "GMT-05:00"}; - for (int i = 0; i < ca.length; ++i) { - ca[i] = Calendar.getInstance(TimeZone.getTimeZone(tz[i])); - ca[i].set(Calendar.DAY_OF_MONTH, i + 1); - } - for (int i = 0; i < ca.length; ++i) { - Calendar actual = serviceClient.getNewCalendarForward(ca[i]); - ca[i].add(Calendar.DAY_OF_MONTH, 5); - if (actual instanceof GregorianCalendar && ca[i] instanceof GregorianCalendar) { - // FIXME: Is this a problem? - // The instance returned by service method invoked over binding.ws seems to have a gregorianCutover - // different from the instance passed. Adjust the gregorianCutover as per the input instance. - ((GregorianCalendar)actual).setGregorianChange(((GregorianCalendar)ca[i]).getGregorianChange()); - } - Assert.assertEquals(ca[i], actual); - } - } - - private void performTestNewCalendarArray(StandardTypesServiceClient serviceClient) { - Calendar[] ca = new Calendar[3]; - String[] tz = {"GMT+05:30", "GMT+00:00", "GMT-05:00"}; - for (int i = 0; i < ca.length; ++i) { - ca[i] = Calendar.getInstance(TimeZone.getTimeZone(tz[i])); - ca[i].set(Calendar.DAY_OF_MONTH, i + 1); - } - Calendar[] actual = serviceClient.getNewCalendarArrayForward(ca); - Assert.assertEquals(ca.length, actual.length); - for (int i = 0; i < ca.length; ++i) { - ca[i].add(Calendar.DAY_OF_MONTH, 5); - if (actual[i] instanceof GregorianCalendar && ca[i] instanceof GregorianCalendar) { - // FIXME: Is this a problem? - // The instance returned by service method invoked over binding.ws seems to have a gregorianCutover - // different from the instance passed. Adjust the gregorianCutover as per the input instance. - ((GregorianCalendar)actual[i]).setGregorianChange(((GregorianCalendar)ca[i]).getGregorianChange()); - } - Assert.assertEquals(ca[i], actual[i]); - } - } - - private void performTestNewDate(StandardTypesServiceClient serviceClient) { - Date d = new Date(); - Date expected = new Date(d.getTime() + 5 * 24 * 60 * 60 * 1000); - Date actual = serviceClient.getNewDateForward(d); - Assert.assertEquals(expected, actual); - } - - private void performTestNewDateArray(StandardTypesServiceClient serviceClient) { - Date[] d = new Date[2]; - Date[] expected = new Date[d.length]; - for (int i = 0; i < d.length; ++i) { - d[i] = new Date(); - d[i].setTime(d[i].getTime() + i * 24 * 60 * 60 * 1000); - expected[i] = new Date(d[i].getTime() + 5 * 24 * 60 * 60 * 1000); - } - Date[] actual = serviceClient.getNewDateArrayForward(d); - Assert.assertEquals(expected.length, actual.length); - for (int i = 0; i < expected.length; ++i) { - Assert.assertEquals(expected[i], actual[i]); - } - } - - private void performTestNewQName(StandardTypesServiceClient serviceClient) { - QName[] qnames = new QName[3]; - qnames[0] = new QName("localPart"); - qnames[1] = new QName("namespaceUri", "localPart"); - qnames[2] = new QName("namespaceUri", "localPart", "prefix"); - QName[] expected = new QName[qnames.length]; - for (int i = 0; i < qnames.length; ++i) { - expected[i] = - new QName(qnames[i].getNamespaceURI() + "q", qnames[i].getLocalPart() + "q", - qnames[i].getPrefix() + "q"); - } - for (int i = 0; i < qnames.length; ++i) { - QName actual = serviceClient.getNewQNameForward(qnames[i]); - Assert.assertEquals(expected[i], actual); - } - } - - private void performTestNewQNameArray(StandardTypesServiceClient serviceClient) { - QName[] qnames = new QName[4]; - qnames[0] = new QName("localPart"); - qnames[1] = new QName("namespaceUri", "localPart"); - qnames[2] = new QName("namespaceUri", "localPart", "prefix"); - qnames[3] = new QName("localPart2"); - QName[] expected = new QName[qnames.length]; - for (int i = 0; i < qnames.length; ++i) { - expected[i] = - new QName(qnames[i].getNamespaceURI() + "q", qnames[i].getLocalPart() + "q", - qnames[i].getPrefix() + "q"); - } - QName[] actual = serviceClient.getNewQNameArrayForward(qnames); - Assert.assertEquals(expected.length, actual.length); - for (int i = 0; i < qnames.length; ++i) { - Assert.assertEquals(expected[i], actual[i]); - } - } - - private void performTestNewURI(StandardTypesServiceClient serviceClient) { - URI[] uris = new URI[4]; - uris[0] = URI.create("a/b/c"); - uris[1] = URI.create("http://abc/"); - uris[2] = URI.create("ftp://a/b"); - uris[3] = URI.create("http://abc/").resolve("xyz"); - - for (int i = 0; i < uris.length; ++i) { - URI expected = uris[i].resolve("uri"); - URI actual = serviceClient.getNewURIForward(uris[i]); - Assert.assertEquals(expected, actual); - } - } - - private void performTestNewURIArray(StandardTypesServiceClient serviceClient) { - URI[] uris = new URI[4]; - uris[0] = URI.create("a/b/c"); - // [rfeng] We need to have a trialign / to avoid the resolving problem - // FIXME: [vamsi] This is actually a data transformation problem. The array being returned from the service method is - // not making to the caller intact. - uris[1] = URI.create("http://abc/"); - uris[2] = URI.create("ftp://a/b"); - uris[3] = URI.create("http://abc/").resolve("xyz"); - - URI[] expected = new URI[uris.length]; - for (int i = 0; i < uris.length; ++i) { - expected[i] = uris[i].resolve("uri"); - } - - URI[] actual = serviceClient.getNewURIArrayForward(uris); - Assert.assertEquals(expected.length, actual.length); - for (int i = 0; i < uris.length; ++i) { - Assert.assertEquals(expected[i], actual[i]); - } - } - - private void performTestNewXMLGregorianCalendar(StandardTypesServiceClient serviceClient) - throws DatatypeConfigurationException { - DatatypeFactory df = DatatypeFactory.newInstance(); - XMLGregorianCalendar[] xgcals = new XMLGregorianCalendar[3]; - xgcals[0] = df.newXMLGregorianCalendar(new GregorianCalendar(1974, GregorianCalendar.APRIL, 19)); - xgcals[1] = df.newXMLGregorianCalendar(new GregorianCalendar(1978, GregorianCalendar.OCTOBER, 13)); - xgcals[2] = df.newXMLGregorianCalendar(new GregorianCalendar(2006, GregorianCalendar.JUNE, 16)); - - for (int i = 0; i < xgcals.length; ++i) { - XMLGregorianCalendar actual = serviceClient.getNewXMLGregorianCalendarForward(xgcals[i]); - xgcals[i].setDay(xgcals[i].getDay() + 5); - Assert.assertEquals(xgcals[i], actual); - } - } - - private void performTestNewXMLGregorianCalendarArray(StandardTypesServiceClient serviceClient) - throws DatatypeConfigurationException { - DatatypeFactory df = DatatypeFactory.newInstance(); - XMLGregorianCalendar[] xgcals = new XMLGregorianCalendar[3]; - xgcals[0] = df.newXMLGregorianCalendar(new GregorianCalendar(1974, GregorianCalendar.APRIL, 19)); - xgcals[1] = df.newXMLGregorianCalendar(new GregorianCalendar(1978, GregorianCalendar.OCTOBER, 13)); - xgcals[2] = df.newXMLGregorianCalendar(new GregorianCalendar(2006, GregorianCalendar.JUNE, 16)); - - XMLGregorianCalendar[] actual = serviceClient.getNewXMLGregorianCalendarArrayForward(xgcals); - Assert.assertEquals(xgcals.length, actual.length); - for (int i = 0; i < xgcals.length; ++i) { - xgcals[i].setDay(xgcals[i].getDay() + 5); - Assert.assertEquals(xgcals[i], actual[i]); - } - } - - private void performTestNewDuration(StandardTypesServiceClient serviceClient) throws DatatypeConfigurationException { - DatatypeFactory df = DatatypeFactory.newInstance(); - Duration[] da = new Duration[3]; - da[0] = df.newDuration(1000000000000L); - da[1] = df.newDurationDayTime(1000000000000L); - da[2] = df.newDurationYearMonth(true, 1, 3); - - for (int i = 0; i < da.length; ++i) { - Assert.assertEquals(da[i].negate(), serviceClient.getNewDurationForward(da[i])); - } - } - - private void performTestNewObject(StandardTypesServiceClient serviceClient) { - Object[] objs = new Object[5]; - objs[0] = "Hello"; - objs[1] = 10; - objs[2] = null; - objs[3] = -1.0; - objs[4] = null; - - for (int i = 0; i < objs.length; ++i) { - Object expected = StandardTypesTransformer.getNewObject(objs[i]); - Object actual = serviceClient.getNewObjectForward(objs[i]); - Assert.assertEquals(expected, actual); - } - } - - private void performTestNewObjectArray(StandardTypesServiceClient serviceClient) { - Object[] objs = new Object[5]; - objs[0] = "Hello"; - objs[1] = 10; - objs[2] = null; - objs[3] = -1.0; - objs[4] = null; - - Object[] actual = serviceClient.getNewObjectArrayForward(objs); - Assert.assertEquals(objs.length, actual.length); - for (int i = 0; i < objs.length; ++i) { - Object expected = StandardTypesTransformer.getNewObject(objs[i]); - Assert.assertEquals(expected, actual[i]); - } - } - - private void performTestNewImage(StandardTypesServiceClient serviceClient) throws InterruptedException { - // Create some images to test with. - Image[] imgs = new Image[3]; - imgs[0] = new BufferedImage(10, 10, BufferedImage.TYPE_3BYTE_BGR); - imgs[1] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_ARGB); - imgs[2] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB); - imgs[0].getGraphics().drawLine(1, 1, 8, 8); - imgs[1].getGraphics().drawLine(8, 1, 1, 8); - imgs[2].getGraphics().drawLine(1, 8, 8, 1); - - Image[] copy = imgs; - // Create the same images once again as the StandardTypesTransformer may manipulate the image passed. - imgs = new Image[3]; - imgs[0] = new BufferedImage(10, 10, BufferedImage.TYPE_3BYTE_BGR); - imgs[1] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_ARGB); - imgs[2] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB); - imgs[0].getGraphics().drawLine(1, 1, 8, 8); - imgs[1].getGraphics().drawLine(8, 1, 1, 8); - imgs[2].getGraphics().drawLine(1, 8, 8, 1); - - // Make sure the images and copies are equal using ImageInfo - for(int i = 0; i < imgs.length; ++i) { - Assert.assertEquals(new ImageInfo(imgs[i]), new ImageInfo(copy[i])); - } - - for (int i = 0; i < imgs.length; ++i) { - Image actual = serviceClient.getNewImageForward(imgs[i]); - Image expected = StandardTypesTransformer.getNewImage(copy[i]); - // Compare using ImageInfo - Assert.assertEquals(new ImageInfo(expected), new ImageInfo(actual)); - } - } - - private void performTestNewImageArray(StandardTypesServiceClient serviceClient) throws InterruptedException { - // Create some images to test with. - Image[] imgs = new Image[3]; - imgs[0] = new BufferedImage(10, 10, BufferedImage.TYPE_3BYTE_BGR); - imgs[1] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_ARGB); - imgs[2] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB); - imgs[0].getGraphics().drawLine(1, 1, 8, 8); - imgs[1].getGraphics().drawLine(8, 1, 1, 8); - imgs[2].getGraphics().drawLine(1, 8, 8, 1); - - Image[] copy = imgs; - // Create the same images once again as the StandardTypesTransformer may manipulate the image passed. - imgs = new Image[3]; - imgs[0] = new BufferedImage(10, 10, BufferedImage.TYPE_3BYTE_BGR); - imgs[1] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_ARGB); - imgs[2] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB); - imgs[0].getGraphics().drawLine(1, 1, 8, 8); - imgs[1].getGraphics().drawLine(8, 1, 1, 8); - imgs[2].getGraphics().drawLine(1, 8, 8, 1); - - // Make sure the images and copies are equal using ImageInfo - for(int i = 0; i < imgs.length; ++i) { - Assert.assertEquals(new ImageInfo(imgs[i]), new ImageInfo(copy[i])); - } - - Image[] actual = serviceClient.getNewImageArrayForward(imgs); - Assert.assertEquals(imgs.length, actual.length); - for (int i = 0; i < imgs.length; ++i) { - Image expected = StandardTypesTransformer.getNewImage(copy[i]); - // Compare using ImageInfo - Assert.assertEquals(new ImageInfo(expected), new ImageInfo(actual[i])); - } - } - - private void performTestNewDurationArray(StandardTypesServiceClient serviceClient) - throws DatatypeConfigurationException { - DatatypeFactory df = DatatypeFactory.newInstance(); - Duration[] da = new Duration[3]; - da[0] = df.newDuration(1000000000000L); - da[1] = df.newDurationDayTime(1000000000000L); - da[2] = df.newDurationYearMonth(true, 1, 3); - - Duration[] actual = serviceClient.getNewDurationArrayForward(da); - Assert.assertEquals(da.length, actual.length); - for (int i = 0; i < da.length; ++i) { - Assert.assertEquals(da[i].negate(), actual[i]); - } - } - - private void performTestNewDataHandler(StandardTypesServiceClient serviceClient) throws IOException { - DataHandler[] dha = new DataHandler[3]; - dha[0] = new DataHandler("Some data", "text/plain"); - dha[1] = new DataHandler(new URL("http://tuscany.apache.org/home.html")); - dha[2] = new DataHandler(new ByteArrayDataSource("Some data2".getBytes())); - - for (int i = 0; i < dha.length; ++i) { - DataHandler actual = serviceClient.getNewDataHandlerForward(dha[i]); - // Note: The DataHandler returned may use a different type of DataSource. - // Compare the data content instead of using equals(). - Assert.assertTrue(compare(dha[i], actual)); - } - } - - private void performTestNewDataHandlerArray(StandardTypesServiceClient serviceClient) throws IOException { - DataHandler[] dha = new DataHandler[3]; - dha[0] = new DataHandler("Some data", "text/plain"); - dha[1] = new DataHandler(new URL("http://tuscany.apache.org/home.html")); - dha[2] = new DataHandler(new ByteArrayDataSource("Some data2".getBytes())); - - DataHandler[] actual = serviceClient.getNewDataHandlerArrayForward(dha); - Assert.assertEquals(dha.length, actual.length); - for (int i = 0; i < dha.length; ++i) { - // Note: The DataHandler returned may use a different type of DataSource. - // Compare the data content instead of using equals(). - Assert.assertTrue(compare(dha[i], actual[i])); - } - } - - /*private void performTestNewSource(StandardTypesServiceClient serviceClient) throws Exception { - String xml = "<a>A<b>B</b><c>C</c></a>"; - Source[] srcs = new Source[3]; - srcs[0] = new DOMSource(new String2Node(null).transform(xml, null)); - srcs[1] = new SAXSource(new InputSource(new StringReader(xml))); - srcs[2] = new StreamSource(new StringReader(xml)); - - for (int i = 0; i < srcs.length; ++i) { - Source expected = StandardTypesTransformer.getNewSource(srcs[i]); - Source actual = serviceClient.getNewSourceForward(srcs[i]); - // [rfeng] The data may come back as a different source - Assert.assertEquals(sourceToString(expected), sourceToString(actual)); - } - } - - private void performTestNewSourceArray(StandardTypesServiceClient serviceClient) throws Exception { - String xml = "<a>A<b>B</b><c>C</c></a>"; - Source[] srcs = new Source[3]; - srcs[0] = new DOMSource(new String2Node(null).transform(xml, null)); - srcs[1] = new SAXSource(new InputSource(new StringReader(xml))); - srcs[2] = new StreamSource(new StringReader(xml)); - - Source[] actual = serviceClient.getNewSourceArrayForward(srcs); - Source[] expected = new Source[srcs.length]; - for(int i = 0; i < srcs.length; ++i) { - expected[i] = StandardTypesTransformer.getNewSource(srcs[i]); - } - Assert.assertEquals(srcs.length, actual.length); - for (int i = 0; i < srcs.length; ++i) { - // [rfeng] The data may come back as a different source - Assert.assertEquals(sourceToString(expected[i]), sourceToString(actual[i])); - } - - }*/ - - private void performTestNewUUID(StandardTypesServiceClient serviceClient) { - UUID[] uuids = new UUID[3]; - uuids[0] = UUID.nameUUIDFromBytes("ABCDEFGHJKLMNOPQRSTUVWXYZ".getBytes()); - uuids[1] = UUID.nameUUIDFromBytes("abcdefghjklmnopqrstuvwxyz".getBytes()); - uuids[2] = UUID.randomUUID(); - - for (int i = 0; i < uuids.length; ++i) { - UUID expected = UUID.fromString(uuids[i].toString() + "AAA"); - UUID actual = serviceClient.getNewUUIDForward(uuids[i]); - Assert.assertEquals(expected, actual); - } - } - - private void performTestNewUUIDArray(StandardTypesServiceClient serviceClient) { - UUID[] uuids = new UUID[3]; - uuids[0] = UUID.nameUUIDFromBytes("ABCDEFGHJKLMNOPQRSTUVWXYZ".getBytes()); - uuids[1] = UUID.nameUUIDFromBytes("abcdefghjklmnopqrstuvwxyz".getBytes()); - uuids[2] = UUID.randomUUID(); - - UUID[] actual = serviceClient.getNewUUIDArrayForward(uuids); - for (int i = 0; i < uuids.length; ++i) { - UUID expected = UUID.fromString(uuids[i].toString() + "AAA"); - Assert.assertEquals(expected, actual[i]); - } - } - - /** - * This method compares two DataHandlers. - * @return true if the data in the two handlers is the same. - */ - private boolean compare(DataHandler dh1, DataHandler dh2) throws IOException { - InputStream inp1 = dh1.getInputStream(); - InputStream inp2 = dh2.getInputStream(); - for(;;) { - int i1 = inp1.read(); - int i2 = inp2.read(); - if(i1 == -1 && i2 == -1) { - return true; - } else if(i1 != -1 && i2 != -1) { - if(i1 != i2) { - return false; - } - } else { - return false; - } - } - } - - /** - * This method returns the content of a source object as String. - */ - private String sourceToString(Source s) throws Exception { - StringWriter sw = new StringWriter(); - Result r = new StreamResult(sw); - TransformerFactory.newInstance().newTransformer().transform(s, r); - sw.close(); - return sw.toString(); - } - - /** - * This class initializes with the width, height and pixel data of a java.awt.Image object. - */ - private static class ImageInfo { - private int h, w, pixels[]; - public ImageInfo(Image img) throws InterruptedException { - w = img.getWidth(null); - h = img.getHeight(null); - pixels = new int[w*h]; - PixelGrabber pg = new PixelGrabber(img, 0, 0, w, h, pixels, 0, w); - pg.grabPixels(); - } - - public boolean equals(Object that) { - if(that == null) { - return false; - } else if(!(that instanceof ImageInfo)) { - return false; - } - - ImageInfo that1 = (ImageInfo)that; - if(w != that1.w || h != that1.h || pixels == null || that1.pixels == null || pixels.length != that1.pixels.length) { - return false; - } - for(int i = 0; i < pixels.length; ++i) { - if(pixels[i] != that1.pixels[i]) { - return false; - } - } - return true; - } - - public String toString() { - return this.getClass().getSimpleName()+"[w = "+w+", h = "+h+", pixels = "+pixels+"]"; - } - } -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/pom.xml b/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/pom.xml deleted file mode 100644 index be9d12f1e2..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/pom.xml +++ /dev/null @@ -1,189 +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. ---> - -<!-- $Rev$ $Date$ --> - -<project> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-databindings</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>itest-databindings-jaxb-top-down</artifactId> - <version>2.0-SNAPSHOT</version> - <name>Apache Tuscany SCA iTest Databinding - JAXB Top Down</name> - - <repositories> - <repository> - <snapshots> - <enabled>true</enabled> - </snapshots> - <id>java.net</id> - <name>java.net Maven 1.x Repository</name> - <url>http://download.java.net/maven/1</url> - <layout>legacy</layout> - </repository> - <repository> - <id>java.net2</id> - <name>java.net Maven 2.x Repository</name> - <url>http://download.java.net/maven/2</url> - </repository> - </repositories> - - <pluginRepositories> - <pluginRepository> - <id>java.net2</id> - <name>java.net Maven 2.x Repository</name> - <url>http://download.java.net/maven/2</url> - </pluginRepository> - </pluginRepositories> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>${pom.version}</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-jaxb</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - <!--dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-sdo</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>compile</scope> - </dependency--> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-axiom</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - <!-- dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-databindings-common</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>compile</scope> - </dependency --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-interface-java</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-jetty</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>2.1</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>com.sun.xml.ws</groupId> - <artifactId>jaxws-rt</artifactId> - <version>2.1.3</version> - </dependency> - <!-- Added by Simon Nash --> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.1</version> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.12</version> - <scope>provided</scope> - </dependency> - <!-- End of addition --> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>-Djava.endorsed.dirs=target/endorsed</argLine> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy</id> - <phase>generate-sources</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>javax.xml.ws</groupId> - <artifactId>jaxws-api</artifactId> - <version>2.1</version> - <type>jar</type> - </artifactItem> - <artifactItem> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>2.1</version> - <type>jar</type> - </artifactItem> - </artifactItems> - <outputDirectory>${project.build.directory}/endorsed</outputDirectory> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>true</overWriteSnapshots> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java b/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java deleted file mode 100644 index ab2d9630eb..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java +++ /dev/null @@ -1,42 +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.itest.databindings.jaxb; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * The interface for HelloService. - * - * @version $Rev$ $Date$ - */ -@Remotable -public interface HelloService { - String getGreetings(String name); - String[] getGreetingsArray(String[] names); - List<String> getGreetingsList(List<String> names); - ArrayList<String> getGreetingsArrayList(ArrayList<String> names); - Map<String, String> getGreetingsMap(Map<String, String> namesMap); - HashMap<String, String> getGreetingsHashMap(HashMap<String, String> namesMap); - String getGreetingsVarArgs(String... names); -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java b/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java deleted file mode 100644 index 7bd95cec95..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java +++ /dev/null @@ -1,41 +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.itest.databindings.jaxb; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - - -/** - * The interface for HelloServiceClient. - * - * @version $Rev$ $Date$ - */ -public interface HelloServiceClient { - String getGreetingsForward(String name); - String[] getGreetingsArrayForward(String[] names); - List<String> getGreetingsListForward(List<String> names); - ArrayList<String> getGreetingsArrayListForward(ArrayList<String> names); - Map<String, String> getGreetingsMapForward(Map<String, String> namesMap); - HashMap<String, String> getGreetingsHashMapForward(HashMap<String, String> namesMap); - String getGreetingsVarArgsForward(String... names); -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java b/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java deleted file mode 100644 index ac6c8d5a60..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.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.itest.databindings.jaxb; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * The interface for PrimitivesService. - * - * @version $Rev$ $Date$ - */ -@Remotable -public interface PrimitivesService { - boolean negateBoolean(boolean flag); - boolean[] negateBooleanArray(boolean[] flags); - boolean[] identityBooleanArray(boolean[] flags); - byte negateByte(byte b); - byte[] negateByteArray(byte[] ba); - byte[] identityByteArray(byte[] ba); - short negateShort(short s); - short[] negateShortArray(short[] s); - short[] identityShortArray(short[] sa); - int negateInt(int s); - int[] negateIntArray(int[] s); - int[] identityIntArray(int[] ia); - long negateLong(long l); - long[] negateLongArray(long[] la); - long[] identityLongArray(long[] la); - float negateFloat(float f); - float[] negateFloatArray(float[] fa); - float[] identityFloatArray(float[] fa); - double negateDouble(double d); - double[] negateDoubleArray(double[] da); - double[] identityDoubleArray(double[] da); -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java b/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java deleted file mode 100644 index 3a5a81bae4..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java +++ /dev/null @@ -1,50 +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.itest.databindings.jaxb; - - -/** - * The interface for PrimitivesServiceClient. - * - * @version $Rev$ $Date$ - */ -public interface PrimitivesServiceClient { - boolean negateBooleanForward(boolean flag); - boolean[] negateBooleanArrayForward(boolean[] flags); - boolean passByValueBooleanArray(); - byte negateByteForward(byte b); - byte[] negateByteArrayForward(byte[] ba); - boolean passByValueByteArray(); - short negateShortForward(short s); - short[] negateShortArrayForward(short[] sa); - boolean passByValueShortArray(); - int negateIntForward(int i); - int[] negateIntArrayForward(int[] ia); - boolean passByValueIntArray(); - long negateLongForward(long l); - long[] negateLongArrayForward(long[] la); - boolean passByValueLongArray(); - float negateFloatForward(float f); - float[] negateFloatArrayForward(float[] fa); - boolean passByValueFloatArray(); - double negateDoubleForward(double d); - double[] negateDoubleArrayForward(double[] da); - boolean passByValueDoubleArray(); -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java b/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java deleted file mode 100644 index 1f3b7ec633..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java +++ /dev/null @@ -1,84 +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.itest.databindings.jaxb; - -import java.awt.Image; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.net.URI; -import java.util.Calendar; -import java.util.Date; -import java.util.UUID; - -import javax.activation.DataHandler; -import javax.xml.datatype.Duration; -import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.namespace.QName; -import javax.xml.transform.Source; - -import org.oasisopen.sca.annotation.Remotable; - - - -/** - * The interface for StandardTypesService. - * - * @version $Rev$ $Date$ - */ -@Remotable -public interface StandardTypesService { - BigInteger getNewBigInteger(BigInteger bi); - BigInteger[] getNewBigIntegerArray(BigInteger[] bia); - - BigDecimal getNewBigDecimal(BigDecimal bd); - BigDecimal[] getNewBigDecimalArray(BigDecimal[] bda); - - Calendar getNewCalendar(Calendar c); - Calendar[] getNewCalendarArray(Calendar[] ca); - - Date getNewDate(Date d); - Date[] getNewDateArray(Date[] da); - - QName getNewQName(QName qname); - QName[] getNewQNameArray(QName[] qnames); - - URI getNewURI(URI uri); - URI[] getNewURIArray(URI[] uris); - - XMLGregorianCalendar getNewXMLGregorianCalendar(XMLGregorianCalendar xgcal); - XMLGregorianCalendar[] getNewXMLGregorianCalendarArray(XMLGregorianCalendar[] xgcal); - - Duration getNewDuration(Duration d); - Duration[] getNewDurationArray(Duration[] da); - - Object getNewObject(Object obj); - Object[] getNewObjectArray(Object[] objs); - - Image getNewImage(Image img); - Image[] getNewImageArray(Image[] imgs); - - DataHandler getNewDataHandler(DataHandler dh); - DataHandler[] getNewDataHandlerArray(DataHandler[] dha); - - Source getNewSource(Source src); - Source[] getNewSourceArray(Source[] srcs); - - UUID getNewUUID(UUID uuid); - UUID[] getNewUUIDArray(UUID[] uuids); -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java b/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java deleted file mode 100644 index 0c073cd054..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java +++ /dev/null @@ -1,81 +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.itest.databindings.jaxb; - -import java.awt.Image; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.net.URI; -import java.util.Calendar; -import java.util.Date; -import java.util.UUID; - -import javax.activation.DataHandler; -import javax.xml.datatype.Duration; -import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.namespace.QName; -import javax.xml.transform.Source; - - -/** - * The interface for StandardTypesServiceClient. - * - * @version $Rev$ $Date$ - */ -public interface StandardTypesServiceClient { - BigInteger getNewBigIntegerForward(BigInteger bi); - BigInteger[] getNewBigIntegerArrayForward(BigInteger[] bia); - - BigDecimal getNewBigDecimalForward(BigDecimal bd); - BigDecimal[] getNewBigDecimalArrayForward(BigDecimal[] bda); - - Calendar getNewCalendarForward(Calendar c); - Calendar[] getNewCalendarArrayForward(Calendar[] ca); - - Date getNewDateForward(Date d); - Date[] getNewDateArrayForward(Date[] da); - - QName getNewQNameForward(QName qname); - QName[] getNewQNameArrayForward(QName[] qnames); - - URI getNewURIForward(URI uri); - URI[] getNewURIArrayForward(URI[] uris); - - XMLGregorianCalendar getNewXMLGregorianCalendarForward(XMLGregorianCalendar xgcal); - XMLGregorianCalendar[] getNewXMLGregorianCalendarArrayForward(XMLGregorianCalendar[] xgcals); - - Duration getNewDurationForward(Duration d); - Duration[] getNewDurationArrayForward(Duration[] da); - - Object getNewObjectForward(Object obj); - Object[] getNewObjectArrayForward(Object[] objs); - - Image getNewImageForward(Image img); - Image[] getNewImageArrayForward(Image[] imgs); - - DataHandler getNewDataHandlerForward(DataHandler dh); - DataHandler[] getNewDataHandlerArrayForward(DataHandler[] dha); - - Source getNewSourceForward(Source src); - Source[] getNewSourceArrayForward(Source[] srcs); - - UUID getNewUUIDForward(UUID uuid); - UUID[] getNewUUIDArrayForward(UUID[] uuids); -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java b/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java deleted file mode 100644 index 61449c8981..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java +++ /dev/null @@ -1,73 +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.itest.databindings.jaxb.impl; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.tuscany.sca.itest.databindings.jaxb.HelloService; -import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceClient; -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Service; - -/** - * An implementation of HelloServiceClient. - * The client forwards the request to the service component and returns the response from the service component. - */ -@Service(HelloServiceClient.class) -public class HelloServiceClientImpl { - - private HelloService service; - - @Reference - public void setHelloService(HelloService service) { - this.service = service; - } - - public String getGreetingsForward(String name) { - return service.getGreetings(name); - } - - public String[] getGreetingsArrayForward(String[] names) { - return service.getGreetingsArray(names); - } - - public List<String> getGreetingsListForward(List<String> names) { - return service.getGreetingsList(names); - } - - public Map<String, String> getGreetingsMapForward(Map<String, String> namesMap) { - return service.getGreetingsMap(namesMap); - } - - public ArrayList<String> getGreetingsArrayListForward(ArrayList<String> names) { - return service.getGreetingsArrayList(names); - } - - public HashMap<String, String> getGreetingsHashMapForward(HashMap<String, String> namesMap) { - return service.getGreetingsHashMap(namesMap); - } - - public String getGreetingsVarArgsForward(String... names) { - return service.getGreetingsVarArgs(names[0], names[1], names[2]); - } -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java b/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java deleted file mode 100644 index 690001bfe1..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java +++ /dev/null @@ -1,86 +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.itest.databindings.jaxb.impl; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.tuscany.sca.itest.databindings.jaxb.HelloService; -import org.oasisopen.sca.annotation.Service; - -/** - * An implementation of HelloService. - * - * @version $Rev$ $Date$ - */ -@Service(HelloService.class) -public class HelloServiceImpl implements HelloService { - public String getGreetings(String name) { - return "Hello " + name; - } - - public String[] getGreetingsArray(String[] names) { - String[] resps = new String[names.length]; - for (int i = 0; i < names.length; ++i) { - resps[i] = "Hello " + names[i]; - } - return resps; - } - - public List<String> getGreetingsList(List<String> names) { - List<String> resps = new ArrayList<String>(); - for (int i = 0; i < names.size(); ++i) { - resps.add("Hello " + names.get(i)); - } - return resps; - } - - public ArrayList<String> getGreetingsArrayList(ArrayList<String> names) { - ArrayList<String> resps = new ArrayList<String>(); - for (int i = 0; i < names.size(); ++i) { - resps.add("Hello " + names.get(i)); - } - return resps; - } - - public Map<String, String> getGreetingsMap(Map<String, String> namesMap) { - for (Map.Entry<String, String> entry : namesMap.entrySet()) { - entry.setValue("Hello " + entry.getKey()); - } - return namesMap; - } - - public HashMap<String, String> getGreetingsHashMap(HashMap<String, String> namesMap) { - for (Map.Entry<String, String> entry : namesMap.entrySet()) { - entry.setValue("Hello " + entry.getKey()); - } - return namesMap; - } - - public String getGreetingsVarArgs(String... names) { - String resp = "Hello"; - for(int i = 0; i < names.length; ++i) { - resp += (" "+names[i]); - } - return resp; - } -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java b/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java deleted file mode 100644 index e55d2527f4..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java +++ /dev/null @@ -1,139 +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.itest.databindings.jaxb.impl; - -import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesService; -import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesServiceClient; -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Service; - -/** - * An implementation of PrimitivesServiceClient. - * The client forwards the request to the service component and returns the response from the service component. - * - * @version $Rev$ $Date$ - */ -@Service(PrimitivesServiceClient.class) -public class PrimitivesServiceClientImpl { - - private PrimitivesService service; - - @Reference - public void setPrimitivesService(PrimitivesService service) { - this.service = service; - } - public boolean negateBooleanForward(boolean flag) { - return service.negateBoolean(flag); - } - - public boolean[] negateBooleanArrayForward(boolean[] flags) { - return service.negateBooleanArray(flags); - } - - public boolean passByValueBooleanArray() { - boolean[] req = new boolean[2]; - boolean[] resp = service.identityBooleanArray(req); - return req != resp; - } - - public byte negateByteForward(byte b) { - return service.negateByte(b); - } - - public byte[] negateByteArrayForward(byte[] ba) { - return service.negateByteArray(ba); - } - - public boolean passByValueByteArray() { - byte[] req = new byte[2]; - byte[] resp = service.identityByteArray(req); - return req != resp; - } - - public short negateShortForward(short s) { - return service.negateShort(s); - } - - public short[] negateShortArrayForward(short[] s) { - return service.negateShortArray(s); - } - - public boolean passByValueShortArray() { - short[] req = new short[2]; - short[] resp = service.identityShortArray(req); - return req != resp; - } - - public int negateIntForward(int i) { - return service.negateInt(i); - } - - public int[] negateIntArrayForward(int[] ia) { - return service.negateIntArray(ia); - } - - public boolean passByValueIntArray() { - int[] req = new int[2]; - int[] resp = service.identityIntArray(req); - return req != resp; - } - - public long negateLongForward(long l) { - return service.negateLong(l); - } - - public long[] negateLongArrayForward(long[] la) { - return service.negateLongArray(la); - } - - public boolean passByValueLongArray() { - long[] req = new long[2]; - long[] resp = service.identityLongArray(req); - return req != resp; - } - - public float negateFloatForward(float f) { - return service.negateFloat(f); - } - - public float[] negateFloatArrayForward(float[] fa) { - return service.negateFloatArray(fa); - } - - public boolean passByValueFloatArray() { - float[] req = new float[2]; - float[] resp = service.identityFloatArray(req); - return req != resp; - } - - public double negateDoubleForward(double d) { - return service.negateDouble(d); - } - - public double[] negateDoubleArrayForward(double[] da) { - return service.negateDoubleArray(da); - } - - public boolean passByValueDoubleArray() { - double[] req = new double[2]; - double[] resp = service.identityDoubleArray(req); - return req != resp; - } -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java b/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java deleted file mode 100644 index 60ff4163d0..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java +++ /dev/null @@ -1,151 +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.itest.databindings.jaxb.impl; - -import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesService; -import org.oasisopen.sca.annotation.Service; - -/** - * An implementation of PrimitivesService. - * - * @version $Rev$ $Date$ - */ -@Service(PrimitivesService.class) -public class PrimitivesServiceImpl implements PrimitivesService { - - public boolean negateBoolean(boolean flag) { - return !flag; - } - - public boolean[] negateBooleanArray(boolean[] flags) { - boolean[] resp = new boolean[flags.length]; - - for(int i = 0; i < flags.length; ++i) { - resp[i] = !flags[i]; - } - return resp; - } - - public boolean[] identityBooleanArray(boolean[] flags) { - return flags; - } - - public byte negateByte(byte b) { - return (byte)-b; - } - - public byte[] negateByteArray(byte[] ba) { - byte[] resp = new byte[ba.length]; - - for(int i = 0; i < ba.length; ++i) { - resp[i] = (byte)-ba[i]; - } - return resp; - } - - public byte[] identityByteArray(byte[] ba) { - return ba; - } - - public short negateShort(short s) { - return (short)-s; - } - - public short[] negateShortArray(short[] s) { - short[] resp = new short[s.length]; - - for(int i = 0; i < s.length; ++i) { - resp[i] = (short)-s[i]; - } - return resp; - } - - public short[] identityShortArray(short[] sa) { - return sa; - } - - public int negateInt(int i) { - return -i; - } - - public int[] negateIntArray(int[] ia) { - int[] resp = new int[ia.length]; - - for(int i = 0; i < ia.length; ++i) { - resp[i] = -ia[i]; - } - return resp; - } - - public int[] identityIntArray(int[] ia) { - return ia; - } - - public long negateLong(long l) { - return -l; - } - - public long[] negateLongArray(long[] la) { - long[] resp = new long[la.length]; - - for(int i = 0; i < la.length; ++i) { - resp[i] = -la[i]; - } - return resp; - } - - public long[] identityLongArray(long[] la) { - return la; - } - - public float negateFloat(float f) { - return -f; - } - - public float[] negateFloatArray(float[] fa) { - float[] resp = new float[fa.length]; - - for(int i = 0; i < fa.length; ++i) { - resp[i] = -fa[i]; - } - return resp; - } - - public float[] identityFloatArray(float[] fa) { - return fa; - } - - public double negateDouble(double d) { - return -d; - } - - public double[] negateDoubleArray(double[] da) { - double[] resp = new double[da.length]; - - for(int i = 0; i < da.length; ++i) { - resp[i] = -da[i]; - } - return resp; - } - - public double[] identityDoubleArray(double[] da) { - return da; - } -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java b/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java deleted file mode 100644 index b3d3c3eb3a..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java +++ /dev/null @@ -1,159 +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.itest.databindings.jaxb.impl; - -import java.awt.Image; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.net.URI; -import java.util.Calendar; -import java.util.Date; -import java.util.UUID; - -import javax.activation.DataHandler; -import javax.xml.datatype.Duration; -import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.namespace.QName; -import javax.xml.transform.Source; - -import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesService; -import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesServiceClient; -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Service; - -/** - * An implementation of StandardTypesServiceClient. - * The client forwards the request to the service component and returns the response from the service component. - * - * @version $Rev$ $Date$ - */ -@Service(StandardTypesServiceClient.class) -public class StandardTypesServiceClientImpl implements StandardTypesServiceClient{ - - private StandardTypesService service; - - @Reference - public void setStandardTypesService(StandardTypesService service) { - this.service = service; - } - - public BigInteger getNewBigIntegerForward(BigInteger bi) { - return service.getNewBigInteger(bi); - } - - public BigInteger[] getNewBigIntegerArrayForward(BigInteger[] bia) { - return service.getNewBigIntegerArray(bia); - } - - public BigDecimal getNewBigDecimalForward(BigDecimal bd) { - return service.getNewBigDecimal(bd); - } - - public BigDecimal[] getNewBigDecimalArrayForward(BigDecimal[] bda) { - return service.getNewBigDecimalArray(bda); - } - public Calendar getNewCalendarForward(Calendar c) { - return service.getNewCalendar(c); - } - public Calendar[] getNewCalendarArrayForward(Calendar[] ca) { - return service.getNewCalendarArray(ca); - } - - public Date getNewDateForward(Date d) { - return service.getNewDate(d); - } - - public Date[] getNewDateArrayForward(Date[] da) { - return service.getNewDateArray(da); - } - - public QName getNewQNameForward(QName qname) { - return service.getNewQName(qname); - } - - public QName[] getNewQNameArrayForward(QName[] qnames) { - return service.getNewQNameArray(qnames); - } - - public URI getNewURIForward(URI uri) { - return service.getNewURI(uri); - } - - public URI[] getNewURIArrayForward(URI[] uris) { - return service.getNewURIArray(uris); - } - - public XMLGregorianCalendar getNewXMLGregorianCalendarForward(XMLGregorianCalendar xgcal) { - return service.getNewXMLGregorianCalendar(xgcal); - } - - public XMLGregorianCalendar[] getNewXMLGregorianCalendarArrayForward(XMLGregorianCalendar[] xgcals) { - return service.getNewXMLGregorianCalendarArray(xgcals); - } - - public Duration getNewDurationForward(Duration d) { - return service.getNewDuration(d); - } - - public Duration[] getNewDurationArrayForward(Duration[] da) { - return service.getNewDurationArray(da); - } - - public Object getNewObjectForward(Object obj) { - return service.getNewObject(obj); - } - - public Object[] getNewObjectArrayForward(Object[] objs) { - return service.getNewObjectArray(objs); - } - - public Image getNewImageForward(Image img) { - return service.getNewImage(img); - } - - public Image[] getNewImageArrayForward(Image[] imgs) { - return service.getNewImageArray(imgs); - } - - public DataHandler getNewDataHandlerForward(DataHandler dh) { - return service.getNewDataHandler(dh); - } - - public DataHandler[] getNewDataHandlerArrayForward(DataHandler[] dha) { - return service.getNewDataHandlerArray(dha); - } - - - public Source getNewSourceForward(Source src) { - return service.getNewSource(src); - } - - public Source[] getNewSourceArrayForward(Source[] srcs) { - return service.getNewSourceArray(srcs); - } - - public UUID getNewUUIDForward(UUID uuid) { - return service.getNewUUID(uuid); - } - - public UUID[] getNewUUIDArrayForward(UUID[] uuids) { - return service.getNewUUIDArray(uuids); - } -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java b/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java deleted file mode 100644 index 1fa525a0ee..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java +++ /dev/null @@ -1,207 +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.itest.databindings.jaxb.impl; - -import java.awt.Image; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.net.URI; -import java.util.Calendar; -import java.util.Date; -import java.util.UUID; - -import javax.activation.DataHandler; -import javax.xml.datatype.Duration; -import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.namespace.QName; -import javax.xml.transform.Source; - -import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesService; -import org.oasisopen.sca.annotation.Service; - -/** - * An implementation of StandardTypesService. - * - * @version $Rev$ $Date$ - */ -@Service(StandardTypesService.class) -public class StandardTypesServiceImpl implements StandardTypesService { - public BigInteger getNewBigInteger(BigInteger bi) { - return bi.negate(); - } - - public BigInteger[] getNewBigIntegerArray(BigInteger[] bia) { - BigInteger[] resp = new BigInteger[bia.length]; - for(int i = 0; i < bia.length; ++i) { - resp[i] = bia[i].negate(); - } - return resp; - } - - public BigDecimal getNewBigDecimal(BigDecimal bd) { - return bd.negate(); - } - - public BigDecimal[] getNewBigDecimalArray(BigDecimal[] bda) { - BigDecimal[] resp = new BigDecimal[bda.length]; - for(int i = 0; i < bda.length; ++i) { - resp[i] = bda[i].negate(); - } - return resp; - } - - public Calendar getNewCalendar(Calendar c) { - Calendar resp = (Calendar)c.clone(); - resp.add(Calendar.DAY_OF_MONTH, 5); - return resp; - } - - public Calendar[] getNewCalendarArray(Calendar[] ca) { - Calendar[] resp = new Calendar[ca.length]; - for(int i = 0; i < ca.length; ++i) { - resp[i] = getNewCalendar(ca[i]); - } - return resp; - } - - public Date getNewDate(Date d) { - return new Date(d.getTime() + 5*24*60*60*1000); - } - - public Date[] getNewDateArray(Date[] da) { - Date[] resp = new Date[da.length]; - for(int i = 0; i < da.length; ++i) { - resp[i] = getNewDate(da[i]); - } - return resp; - } - - public QName getNewQName(QName qname) { - return new QName(qname.getNamespaceURI()+"q", qname.getLocalPart()+"q", qname.getPrefix()+"q"); - - } - - public QName[] getNewQNameArray(QName[] qnames) { - QName[] resp = new QName[qnames.length]; - for(int i = 0; i < qnames.length; ++i) { - resp[i] = getNewQName(qnames[i]); - } - return resp; - } - - public URI getNewURI(URI uri) { - return uri.resolve("uri"); - } - - public URI[] getNewURIArray(URI[] uris) { - URI[] resp = new URI[uris.length]; - for(int i = 0; i < uris.length; ++i) { - resp[i] = getNewURI(uris[i]); - } - return resp; - } - - public XMLGregorianCalendar getNewXMLGregorianCalendar(XMLGregorianCalendar xgcal) { - xgcal = (XMLGregorianCalendar)xgcal.clone(); - xgcal.setDay(xgcal.getDay()+5); - return xgcal; - } - - public XMLGregorianCalendar[] getNewXMLGregorianCalendarArray(XMLGregorianCalendar[] xgcals) { - XMLGregorianCalendar[] resp = new XMLGregorianCalendar[xgcals.length]; - for(int i = 0; i < xgcals.length; ++i) { - resp[i] = getNewXMLGregorianCalendar(xgcals[i]); - } - return resp; - } - - public Duration getNewDuration(Duration d) { - return d.negate(); - } - - public Duration[] getNewDurationArray(Duration[] da) { - Duration[] resp = new Duration[da.length]; - for(int i = 0; i < da.length; ++i) { - resp[i] = da[i].negate(); - } - return resp; - } - - public Object getNewObject(Object obj) { - return StandardTypesTransformer.getNewObject(obj); - } - - public Object[] getNewObjectArray(Object[] objs) { - Object[] resp = new Object[objs.length]; - for(int i = 0; i < objs.length; ++i) { - resp[i] = getNewObject(objs[i]); - } - return resp; - } - - public Image getNewImage(Image img) { - return StandardTypesTransformer.getNewImage(img); - } - - public Image[] getNewImageArray(Image[] imgs) { - Image[] resp = new Image[imgs.length]; - for(int i = 0; i < imgs.length; ++i) { - resp[i] = getNewImage(imgs[i]); - } - return resp; - } - - public DataHandler getNewDataHandler(DataHandler dh) { - // FIXME: transform the input - return dh; - } - - public DataHandler[] getNewDataHandlerArray(DataHandler[] dha) { - DataHandler[] resp = new DataHandler[dha.length]; - for(int i = 0; i < dha.length; ++i) { - resp[i] = dha[i]; - } - return resp; - } - - public Source getNewSource(Source src) { - return StandardTypesTransformer.getNewSource(src); - } - - public Source[] getNewSourceArray(Source[] srcs) { - Source[] resp = new Source[srcs.length]; - for(int i = 0; i < srcs.length; ++i) { - resp[i] = getNewSource(srcs[i]); - } - return resp; - } - - public UUID getNewUUID(UUID uuid) { - return UUID.fromString(uuid.toString()+"AAA"); - } - - public UUID[] getNewUUIDArray(UUID[] uuids) { - UUID[] resp = new UUID[uuids.length]; - for(int i = 0; i < uuids.length; ++i) { - resp[i] = getNewUUID(uuids[i]); - } - return resp; - } -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java b/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java deleted file mode 100644 index 9d851455da..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java +++ /dev/null @@ -1,142 +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.itest.databindings.jaxb.impl; - -import java.awt.Image; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.CharArrayReader; -import java.io.CharArrayWriter; -import java.io.IOException; -import java.io.InputStream; -import java.io.Reader; - -import javax.xml.transform.Source; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.sax.SAXSource; -import javax.xml.transform.stream.StreamSource; - -import org.xml.sax.InputSource; - -/** - * StandardTypesTransformer class that provide for transforming input provided to StandardTypesService methods. - * - * @version $Rev$ $Date$ - */ -public class StandardTypesTransformer { - - public static Object getNewObject(Object obj) { - if(obj instanceof String) { - return "Hello "+obj; - } else if(obj instanceof Integer) { - return new Integer(-((Integer)obj).intValue()); - } else if(obj instanceof Double) { - return new Double(-((Double)obj).doubleValue()); - } - - return obj; - } - - /** - * Returns a copy of the source object if the input is DOMSource, SAXSource or StreamSource. - * Returns the input object as is for other types. - */ - public static Source getNewSource(Source src) { - Source ret = null; - if(src instanceof DOMSource) { - DOMSource dsrc = (DOMSource)src; - ret = new DOMSource(dsrc.getNode() != null ? dsrc.getNode().cloneNode(true) : null); - } else if(src instanceof SAXSource) { - SAXSource ssrc = (SAXSource)src; - if(ssrc.getInputSource().getByteStream() != null) { - InputStream inp = ssrc.getInputSource().getByteStream(); - ByteArrayOutputStream bout = new ByteArrayOutputStream(); - int b; - try { - while((b = inp.read()) != -1) { - bout.write(b); - } - } catch (IOException ignored) { - } - try { bout.close();} catch (IOException ignored) {} - try { inp.reset();} catch (IOException ignored) {} - ret = new SAXSource(new InputSource(new ByteArrayInputStream(bout.toByteArray()))); - } else if(ssrc.getInputSource().getCharacterStream() != null) { - Reader rdr = ssrc.getInputSource().getCharacterStream(); - CharArrayWriter caw = new CharArrayWriter(); - try { - int c; - while((c = rdr.read()) != -1) { - caw.append((char)c); - } - } catch (IOException ignored) { - } - caw.close(); - try{ rdr.reset();} catch(IOException ignored) {} - ret = new SAXSource(new InputSource(new CharArrayReader(caw.toCharArray()))); - } else { - ret = new SAXSource(); - } - } else if(src instanceof StreamSource) { - StreamSource ssrc = (StreamSource)src; - if(ssrc.getInputStream() != null) { - InputStream inp = ssrc.getInputStream(); - ByteArrayOutputStream bout = new ByteArrayOutputStream(); - int b; - try { - while((b = inp.read()) != -1) { - bout.write(b); - } - } catch (IOException ignored) { - } - try { bout.close();} catch (IOException ignored) {} - try { inp.reset();} catch (IOException ignored) {} - ret = new StreamSource(new ByteArrayInputStream(bout.toByteArray())); - } else if(ssrc.getReader() != null) { - Reader rdr = ssrc.getReader(); - CharArrayWriter caw = new CharArrayWriter(); - try { - int c; - while((c = rdr.read()) != -1) { - caw.append((char)c); - } - } catch (IOException ignored) { - } - caw.close(); - try{ rdr.reset();} catch(IOException ignored) {} - ret = new StreamSource(new CharArrayReader(caw.toCharArray())); - } else { - ret = new StreamSource(); - } - } - - if(ret != null) { - ret.setSystemId(src.getSystemId()); - } else { - ret = src; - } - return ret; - } - - public static Image getNewImage(Image arg) { - arg.getGraphics().drawOval(2, 2, 7, 7); - return arg; - } -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl b/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl deleted file mode 100644 index a76e5c5802..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl +++ /dev/null @@ -1,372 +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.
--->
-
-<!-- $Rev: 678733 $ $Date: 2008-07-22 17:48:58 +0530 (Tue, 22 Jul 2008) $ -->
-
-<wsdl:definitions name="HelloService"
- targetNamespace="http://jaxb.databindings.itest.sca.tuscany.apache.org/"
- xmlns:tns="http://jaxb.databindings.itest.sca.tuscany.apache.org/"
- xmlns:soap11="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
- <wsdl:types>
- <!-- <xs:schema targetNamespace="http://util.java/" -->
- <xs:schema targetNamespace=""
- version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:complexType name="arrayList">
- <xs:complexContent>
- <xs:extension base="abstractList">
- <xs:sequence />
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType abstract="true" name="abstractList">
- <xs:complexContent>
- <xs:extension base="abstractCollection">
- <xs:sequence />
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType abstract="true" name="abstractCollection">
- <xs:sequence />
- </xs:complexType>
- <xs:complexType name="hashMap">
- <xs:complexContent>
- <xs:extension base="abstractMap">
- <xs:sequence />
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- <xs:complexType abstract="true" name="abstractMap">
- <xs:sequence />
- </xs:complexType>
- </xs:schema>
- <xs:schema targetNamespace="http://jaxb.dev.java.net/array"
- version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:complexType final="#all" name="stringArray">
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="item" nillable="true" type="xs:string" />
- </xs:sequence>
- </xs:complexType>
- </xs:schema>
- <xs:schema attributeFormDefault="qualified"
- elementFormDefault="unqualified"
- targetNamespace="http://jaxb.databindings.itest.sca.tuscany.apache.org/"
- xmlns:ns0="http://util.java/"
- xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:element name="getGreetings">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="arg0"
- nillable="true" type="xs:string" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getGreetingsResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return"
- nillable="true" type="xs:string" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getGreetingsArray">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="arg0" nillable="true" type="xs:string" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getGreetingsArrayResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="return" nillable="true" type="xs:string" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getGreetingsList">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="arg0"
- nillable="true" type="xs:anyType" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getGreetingsListResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return"
- nillable="true" type="xs:anyType" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getGreetingsArrayList">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="arg0"
- nillable="true" type="ns0:arrayList" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getGreetingsArrayListResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return"
- nillable="true" type="ns0:arrayList" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getGreetingsMap">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="arg0"
- nillable="true" type="xs:anyType" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getGreetingsMapResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return"
- nillable="true" type="xs:anyType" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getGreetingsHashMap">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="arg0"
- nillable="true" type="ns0:hashMap" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getGreetingsHashMapResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return"
- nillable="true" type="ns0:hashMap" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getGreetingsVarArgs">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="arg0" nillable="true" type="xs:string" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getGreetingsVarArgsResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return"
- nillable="true" type="xs:string" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:schema>
- </wsdl:types>
- <wsdl:message name="getGreetings">
- <wsdl:part name="getGreetings" element="tns:getGreetings">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getGreetingsResponse">
- <wsdl:part name="getGreetingsResponse"
- element="tns:getGreetingsResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getGreetingsArray">
- <wsdl:part name="getGreetingsArray"
- element="tns:getGreetingsArray">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getGreetingsArrayResponse">
- <wsdl:part name="getGreetingsArrayResponse"
- element="tns:getGreetingsArrayResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getGreetingsList">
- <wsdl:part name="getGreetingsList"
- element="tns:getGreetingsList">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getGreetingsListResponse">
- <wsdl:part name="getGreetingsListResponse"
- element="tns:getGreetingsListResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getGreetingsArrayList">
- <wsdl:part name="getGreetingsArrayList"
- element="tns:getGreetingsArrayList">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getGreetingsArrayListResponse">
- <wsdl:part name="getGreetingsArrayListResponse"
- element="tns:getGreetingsArrayListResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getGreetingsMap">
- <wsdl:part name="getGreetingsMap"
- element="tns:getGreetingsMap">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getGreetingsMapResponse">
- <wsdl:part name="getGreetingsMapResponse"
- element="tns:getGreetingsMapResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getGreetingsHashMap">
- <wsdl:part name="getGreetingsHashMap"
- element="tns:getGreetingsHashMap">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getGreetingsHashMapResponse">
- <wsdl:part name="getGreetingsHashMapResponse"
- element="tns:getGreetingsHashMapResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getGreetingsVarArgs">
- <wsdl:part name="getGreetingsVarArgs"
- element="tns:getGreetingsVarArgs">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getGreetingsVarArgsResponse">
- <wsdl:part name="getGreetingsVarArgsResponse"
- element="tns:getGreetingsVarArgsResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:portType name="HelloService">
- <wsdl:operation name="getGreetings">
- <wsdl:input message="tns:getGreetings"></wsdl:input>
- <wsdl:output message="tns:getGreetingsResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getGreetingsArray">
- <wsdl:input message="tns:getGreetingsArray"></wsdl:input>
- <wsdl:output message="tns:getGreetingsArrayResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getGreetingsList">
- <wsdl:input message="tns:getGreetingsList"></wsdl:input>
- <wsdl:output message="tns:getGreetingsListResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getGreetingsArrayList">
- <wsdl:input message="tns:getGreetingsArrayList">
- </wsdl:input>
- <wsdl:output message="tns:getGreetingsArrayListResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getGreetingsMap">
- <wsdl:input message="tns:getGreetingsMap">
- </wsdl:input>
- <wsdl:output message="tns:getGreetingsMapResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getGreetingsHashMap">
- <wsdl:input message="tns:getGreetingsHashMap"></wsdl:input>
- <wsdl:output message="tns:getGreetingsHashMapResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getGreetingsVarArgs">
- <wsdl:input message="tns:getGreetingsVarArgs">
- </wsdl:input>
- <wsdl:output message="tns:getGreetingsVarArgsResponse">
- </wsdl:output>
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:binding name="HelloServiceBinding" type="tns:HelloService">
- <soap11:binding style="document"
- transport="http://schemas.xmlsoap.org/soap/http" />
- <wsdl:operation name="getGreetings">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getGreetingsArray">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getGreetingsList">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getGreetingsArrayList">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getGreetingsMap">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getGreetingsHashMap">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getGreetingsVarArgs">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:service name="HelloServiceService">
- <wsdl:port name="HelloServicePort"
- binding="tns:HelloServiceBinding">
- <soap11:address location="http://localhost:8085/hs-ep" />
- </wsdl:port>
- </wsdl:service>
-</wsdl:definitions>
diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite b/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite deleted file mode 100644 index f62689c8b8..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite +++ /dev/null @@ -1,80 +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.
--->
-
-<!-- $Rev: 741544 $ $Date: 2009-02-06 17:16:22 +0530 (Fri, 06 Feb 2009) $ -->
-
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
- targetNamespace="http://jaxb.databindings.itest.sca.tuscany.apache.org/"
- name="HelloService">
-
- <!-- Clients to test the service -->
- <!-- A HelloServiceClient component that uses WS binding to invoke HelloService service.
- The service component uses interface.wsdl on the service element.
- This client component uses interface.wsdl on the reference element. -->
- <component name="HelloServiceClientW2WComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.HelloServiceClientImpl" />
- <reference name="helloService">
- <interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org/#wsdl.interface(HelloService)"/>
- <binding.ws uri="http://localhost:8085/hs-ep-w"/>
- </reference>
- </component>
-
- <!-- A HelloServiceClient component that uses WS binding to invoke HelloService service.
- The service component uses interface.wsdl on the service element.
- This client component uses interface.java on the reference element. -->
- <component name="HelloServiceClientJ2WComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.HelloServiceClientImpl" />
- <reference name="helloService">
- <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.HelloService"/>
- <binding.ws uri="http://localhost:8085/hs-ep-w"/>
- </reference>
- </component>
-
- <!-- A HelloServiceClient component that uses WS binding to invoke HelloService service.
- The service component uses interface.wsdl on the service element.
- This client component uses interface.java on the reference element. -->
- <component name="HelloServiceClientW2JComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.HelloServiceClientImpl" />
- <reference name="helloService">
- <interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org/#wsdl.interface(HelloService)"/>
- <binding.ws uri="http://localhost:8085/hs-ep-j"/>
- </reference>
- </component>
-
- <!-- Components used to implement the services -->
- <!-- A HelloService component that uses interface.wsdl -->
- <component name="HelloServiceWSDLComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.HelloServiceImpl"/>
- <service name="HelloService">
- <interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org/#wsdl.interface(HelloService)"/>
- <binding.ws uri="http://localhost:8085/hs-ep-w"/>
- </service>
- </component>
-
- <!-- A HelloService component that uses interface.java -->
- <component name="HelloServiceJavaComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.HelloServiceImpl"/>
- <service name="HelloService">
- <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.HelloService"/>
- <binding.ws uri="http://localhost:8085/hs-ep-j"/>
- </service>
- </component>
-</composite>
diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl b/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl deleted file mode 100644 index 432c3115bd..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl +++ /dev/null @@ -1,927 +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.
--->
-
-<!-- $Rev: 673594 $ $Date: 2008-07-03 11:20:39 +0530 (Thu, 03 Jul 2008) $ -->
-
-<wsdl:definitions name="PrimitivesService"
- targetNamespace="http://jaxb.databindings.itest.sca.tuscany.apache.org/"
- xmlns:tns="http://jaxb.databindings.itest.sca.tuscany.apache.org/"
- xmlns:soap11="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
- <wsdl:types>
- <xs:schema targetNamespace="http://jaxb.dev.java.net/array"
- version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:complexType final="#all" name="shortArray">
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="item" nillable="true" type="xs:short" />
- </xs:sequence>
- </xs:complexType>
- <xs:complexType final="#all" name="intArray">
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="item" nillable="true" type="xs:int" />
- </xs:sequence>
- </xs:complexType>
- <xs:complexType final="#all" name="floatArray">
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="item" nillable="true" type="xs:float" />
- </xs:sequence>
- </xs:complexType>
- <xs:complexType final="#all" name="doubleArray">
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="item" nillable="true" type="xs:double" />
- </xs:sequence>
- </xs:complexType>
- <xs:complexType final="#all" name="longArray">
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="item" nillable="true" type="xs:long" />
- </xs:sequence>
- </xs:complexType>
- <xs:complexType final="#all" name="booleanArray">
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="item" nillable="true" type="xs:boolean" />
- </xs:sequence>
- </xs:complexType>
- </xs:schema>
- <xs:schema attributeFormDefault="qualified"
- elementFormDefault="unqualified"
- targetNamespace="http://jaxb.databindings.itest.sca.tuscany.apache.org/"
- xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:element name="negateLongArrayResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="return" nillable="true" type="xs:long" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="identityByteArrayResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return"
- nillable="true" type="xs:base64Binary" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="negateDoubleArray">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="arg0" nillable="true" type="xs:double" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="identityFloatArray">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="arg0" nillable="true" type="xs:float" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="negateLong">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="arg0"
- type="xs:long" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="identityIntArray">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="arg0" nillable="true" type="xs:int" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="negateIntResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return"
- type="xs:int" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="negateLongArray">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="arg0" nillable="true" type="xs:long" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="negateInt">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="arg0"
- type="xs:int" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="negateFloatArrayResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="return" nillable="true" type="xs:float" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="identityDoubleArrayResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="return" nillable="true" type="xs:double" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="negateDouble">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="arg0"
- type="xs:double" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="identityByteArray">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="arg0"
- nillable="true" type="xs:base64Binary" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="negateByte">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="arg0"
- type="xs:byte" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="identityLongArrayResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="return" nillable="true" type="xs:long" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="negateDoubleResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return"
- type="xs:double" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="identityFloatArrayResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="return" nillable="true" type="xs:float" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="negateFloat">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="arg0"
- type="xs:float" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="negateShortArrayResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="return" nillable="true" type="xs:short" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="negateByteArrayResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return"
- nillable="true" type="xs:base64Binary" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="negateLongResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return"
- type="xs:long" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="negateShortArray">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="arg0" nillable="true" type="xs:short" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="negateFloatArray">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="arg0" nillable="true" type="xs:float" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="negateBoolean">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="arg0"
- type="xs:boolean" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="negateShort">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="arg0"
- type="xs:short" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="negateByteArray">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="arg0"
- nillable="true" type="xs:base64Binary" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="identityBooleanArray">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="arg0" nillable="true" type="xs:boolean" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="identityShortArrayResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="return" nillable="true" type="xs:short" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="negateBooleanResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return"
- type="xs:boolean" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="negateFloatResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return"
- type="xs:float" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="identityBooleanArrayResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="return" nillable="true" type="xs:boolean" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="negateBooleanArray">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="arg0" nillable="true" type="xs:boolean" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="negateDoubleArrayResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="return" nillable="true" type="xs:double" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="identityDoubleArray">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="arg0" nillable="true" type="xs:double" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="negateIntArrayResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="return" nillable="true" type="xs:int" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="identityIntArrayResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="return" nillable="true" type="xs:int" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="negateByteResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return"
- type="xs:byte" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="negateBooleanArrayResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="return" nillable="true" type="xs:boolean" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="negateShortResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return"
- type="xs:short" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="negateIntArray">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="arg0" nillable="true" type="xs:int" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="identityShortArray">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="arg0" nillable="true" type="xs:short" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="identityLongArray">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="arg0" nillable="true" type="xs:long" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:schema>
- </wsdl:types>
-
- <wsdl:message name="negateLongArrayResponse">
- <wsdl:part name="negateLongArrayResponse"
- element="tns:negateLongArrayResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="identityByteArrayResponse">
- <wsdl:part name="identityByteArrayResponse"
- element="tns:identityByteArrayResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="negateDoubleArray">
- <wsdl:part name="negateDoubleArray"
- element="tns:negateDoubleArray">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="identityFloatArray">
- <wsdl:part name="identityFloatArray"
- element="tns:identityFloatArray">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="negateLong">
- <wsdl:part name="negateLong" element="tns:negateLong">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="identityIntArray">
- <wsdl:part name="identityIntArray"
- element="tns:identityIntArray">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="negateIntResponse">
- <wsdl:part name="negateIntResponse"
- element="tns:negateIntResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="negateLongArray">
- <wsdl:part name="negateLongArray"
- element="tns:negateLongArray">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="negateInt">
- <wsdl:part name="negateInt" element="tns:negateInt"></wsdl:part>
- </wsdl:message>
-
- <wsdl:message name="negateFloatArrayResponse">
- <wsdl:part name="negateFloatArrayResponse"
- element="tns:negateFloatArrayResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="identityDoubleArrayResponse">
- <wsdl:part name="identityDoubleArrayResponse"
- element="tns:identityDoubleArrayResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="negateDouble">
- <wsdl:part name="negateDouble" element="tns:negateDouble">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="identityByteArray">
- <wsdl:part name="identityByteArray"
- element="tns:identityByteArray">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="negateByte">
- <wsdl:part name="negateByte" element="tns:negateByte">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="identityLongArrayResponse">
- <wsdl:part name="identityLongArrayResponse"
- element="tns:identityLongArrayResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="negateDoubleResponse">
- <wsdl:part name="negateDoubleResponse"
- element="tns:negateDoubleResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="identityFloatArrayResponse">
- <wsdl:part name="identityFloatArrayResponse"
- element="tns:identityFloatArrayResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="negateFloat">
- <wsdl:part name="negateFloat" element="tns:negateFloat">
- </wsdl:part>
- </wsdl:message>
-
- <wsdl:message name="negateShortArrayResponse">
- <wsdl:part name="negateShortArrayResponse"
- element="tns:negateShortArrayResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="negateByteArrayResponse">
- <wsdl:part name="negateByteArrayResponse"
- element="tns:negateByteArrayResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="negateLongResponse">
- <wsdl:part name="negateLongResponse"
- element="tns:negateLongResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="negateShortArray">
- <wsdl:part name="negateShortArray"
- element="tns:negateShortArray">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="negateFloatArray">
- <wsdl:part name="negateFloatArray"
- element="tns:negateFloatArray">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="negateBoolean">
- <wsdl:part name="negateBoolean" element="tns:negateBoolean">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="negateShort">
- <wsdl:part name="negateShort" element="tns:negateShort">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="negateByteArray">
- <wsdl:part name="negateByteArray"
- element="tns:negateByteArray">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="identityBooleanArray">
- <wsdl:part name="identityBooleanArray"
- element="tns:identityBooleanArray">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="identityShortArrayResponse">
- <wsdl:part name="identityShortArrayResponse"
- element="tns:identityShortArrayResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="negateBooleanResponse">
- <wsdl:part name="negateBooleanResponse"
- element="tns:negateBooleanResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="negateFloatResponse">
- <wsdl:part name="negateFloatResponse"
- element="tns:negateFloatResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="identityBooleanArrayResponse">
- <wsdl:part name="identityBooleanArrayResponse"
- element="tns:identityBooleanArrayResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="negateBooleanArray">
- <wsdl:part name="negateBooleanArray"
- element="tns:negateBooleanArray">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="negateDoubleArrayResponse">
- <wsdl:part name="negateDoubleArrayResponse"
- element="tns:negateDoubleArrayResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="identityDoubleArray">
- <wsdl:part name="identityDoubleArray"
- element="tns:identityDoubleArray">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="negateIntArrayResponse">
- <wsdl:part name="negateIntArrayResponse"
- element="tns:negateIntArrayResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="identityIntArrayResponse">
- <wsdl:part name="identityIntArrayResponse"
- element="tns:identityIntArrayResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="negateByteResponse">
- <wsdl:part name="negateByteResponse"
- element="tns:negateByteResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="negateBooleanArrayResponse">
- <wsdl:part name="negateBooleanArrayResponse"
- element="tns:negateBooleanArrayResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="negateShortResponse">
- <wsdl:part name="negateShortResponse"
- element="tns:negateShortResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="negateIntArray">
- <wsdl:part name="negateIntArray" element="tns:negateIntArray">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="identityShortArray">
- <wsdl:part name="identityShortArray"
- element="tns:identityShortArray">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="identityLongArray">
- <wsdl:part name="identityLongArray"
- element="tns:identityLongArray">
- </wsdl:part>
- </wsdl:message>
- <wsdl:portType name="PrimitivesService">
- <wsdl:operation name="negateBoolean">
- <wsdl:input message="tns:negateBoolean">
- </wsdl:input>
- <wsdl:output message="tns:negateBooleanResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="negateBooleanArray">
- <wsdl:input message="tns:negateBooleanArray"></wsdl:input>
- <wsdl:output message="tns:negateBooleanArrayResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="identityBooleanArray">
- <wsdl:input message="tns:identityBooleanArray"></wsdl:input>
- <wsdl:output message="tns:identityBooleanArrayResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="negateByte">
- <wsdl:input message="tns:negateByte">
- </wsdl:input>
- <wsdl:output message="tns:negateByteResponse"></wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="negateByteArray">
- <wsdl:input message="tns:negateByteArray"></wsdl:input>
- <wsdl:output message="tns:negateByteArrayResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="identityByteArray">
- <wsdl:input message="tns:identityByteArray"></wsdl:input>
- <wsdl:output message="tns:identityByteArrayResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="negateShort">
- <wsdl:input message="tns:negateShort">
- </wsdl:input>
- <wsdl:output message="tns:negateShortResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="negateShortArray">
- <wsdl:input message="tns:negateShortArray"></wsdl:input>
- <wsdl:output message="tns:negateShortArrayResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="identityShortArray">
- <wsdl:input message="tns:identityShortArray"></wsdl:input>
- <wsdl:output message="tns:identityShortArrayResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="negateInt">
- <wsdl:input message="tns:negateInt">
- </wsdl:input>
- <wsdl:output message="tns:negateIntResponse"></wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="negateIntArray">
- <wsdl:input message="tns:negateIntArray"></wsdl:input>
- <wsdl:output message="tns:negateIntArrayResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="identityIntArray">
- <wsdl:input message="tns:identityIntArray"></wsdl:input>
- <wsdl:output message="tns:identityIntArrayResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="negateLong">
- <wsdl:input message="tns:negateLong">
- </wsdl:input>
- <wsdl:output message="tns:negateLongResponse"></wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="negateLongArray">
- <wsdl:input message="tns:negateLongArray"></wsdl:input>
- <wsdl:output message="tns:negateLongArrayResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="identityLongArray">
- <wsdl:input message="tns:identityLongArray"></wsdl:input>
- <wsdl:output message="tns:identityLongArrayResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="negateFloat">
- <wsdl:input message="tns:negateFloat">
- </wsdl:input>
- <wsdl:output message="tns:negateFloatResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="negateFloatArray">
- <wsdl:input message="tns:negateFloatArray"></wsdl:input>
- <wsdl:output message="tns:negateFloatArrayResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="identityFloatArray">
- <wsdl:input message="tns:identityFloatArray"></wsdl:input>
- <wsdl:output message="tns:identityFloatArrayResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="negateDouble">
- <wsdl:input message="tns:negateDouble">
- </wsdl:input>
- <wsdl:output message="tns:negateDoubleResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="negateDoubleArray">
- <wsdl:input message="tns:negateDoubleArray"></wsdl:input>
- <wsdl:output message="tns:negateDoubleArrayResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="identityDoubleArray">
- <wsdl:input message="tns:identityDoubleArray"></wsdl:input>
- <wsdl:output message="tns:identityDoubleArrayResponse">
- </wsdl:output>
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:binding name="PrimitivesServiceBinding"
- type="tns:PrimitivesService">
- <soap11:binding style="document"
- transport="http://schemas.xmlsoap.org/soap/http" />
- <wsdl:operation name="negateBoolean">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="negateBooleanArray">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="identityBooleanArray">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="negateByte">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="negateByteArray">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="identityByteArray">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="negateShort">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="negateShortArray">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="identityShortArray">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="negateInt">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="negateIntArray">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="identityIntArray">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="negateLong">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="negateLongArray">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="identityLongArray">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="negateFloat">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="negateFloatArray">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="identityFloatArray">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="negateDouble">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="negateDoubleArray">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="identityDoubleArray">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:service name="PrimitivesServiceService">
- <wsdl:port name="PrimitivesServicePort"
- binding="tns:PrimitivesServiceBinding">
- <soap11:address location="http://localhost:8085/ps-ep" />
- </wsdl:port>
- </wsdl:service>
-</wsdl:definitions>
diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite b/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite deleted file mode 100644 index 9b08c334cc..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite +++ /dev/null @@ -1,80 +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.
--->
-
-<!-- $Rev: 741544 $ $Date: 2009-02-06 17:16:22 +0530 (Fri, 06 Feb 2009) $ -->
-
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://jaxb.databindings.itest.sca.tuscany.apache.org/"
- xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
- name="PrimitivesService">
-
- <!-- Clients to test the service -->
- <!-- A PrimitivesServiceClient component that uses WS binding to invoke PrimitivesService.
- The service component uses interface.wsdl on the service element.
- This client component uses interface.wsdl on the reference element. -->
- <component name="PrimitivesServiceClientW2WComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.PrimitivesServiceClientImpl" />
- <reference name="primitivesService">
- <interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org/#wsdl.interface(PrimitivesService)"/>
- <binding.ws uri="http://localhost:8085/ps-ep-w"/>
- </reference>
- </component>
-
- <!-- A PrimitivesServiceClient component that uses WS binding to invoke PrimitivesService.
- The service component uses interface.wsdl on the service element.
- This client component uses interface.java on the reference element. -->
- <component name="PrimitivesServiceClientJ2WComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.PrimitivesServiceClientImpl" />
- <reference name="primitivesService">
- <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesService"/>
- <binding.ws uri="http://localhost:8085/ps-ep-w"/>
- </reference>
- </component>
-
- <!-- A PrimitivesServiceClient component that uses WS binding to invoke PrimitivesService.
- The service component uses interface.java on the service element.
- This client component uses interface.wsdl on the reference element. -->
- <component name="PrimitivesServiceClientW2JComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.PrimitivesServiceClientImpl" />
- <reference name="primitivesService">
- <interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org/#wsdl.interface(PrimitivesService)"/>
- <binding.ws uri="http://localhost:8085/ps-ep-j"/>
- </reference>
- </component>
-
- <!-- Components used to implement the services -->
- <!-- A PrimitivesService component that uses interface.java -->
- <component name="PrimitivesServiceJavaComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.PrimitivesServiceImpl"/>
- <service name="PrimitivesService">
- <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesService"/>
- <binding.ws uri="http://localhost:8085/ps-ep-j"/>
- </service>
- </component>
-
- <!-- A PrimitivesService component that uses interface.wsdl -->
- <component name="PrimitivesServiceWSDLComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.PrimitivesServiceImpl"/>
- <service name="PrimitivesService">
- <interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org/#wsdl.interface(PrimitivesService)"/>
- <binding.ws uri="http://localhost:8085/ps-ep-w"/>
- </service>
- </component>
-</composite>
diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite b/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite deleted file mode 100644 index f9ac98d5bc..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite +++ /dev/null @@ -1,80 +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.
--->
-
-<!-- $Rev: 741544 $ $Date: 2009-02-06 17:16:22 +0530 (Fri, 06 Feb 2009) $ -->
-
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://jaxb.databindings.itest.sca.tuscany.apache.org/"
- xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
- name="StandardTypesService">
-
- <!-- Clients to test the service -->
- <!-- A StandardTypesServiceClient component that uses WS binding to invoke StandardTypesService.
- The service component uses interface.wsdl on the service element.
- This client component uses interface.wsdl on the reference element. -->
- <component name="StandardTypesServiceClientW2WComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesServiceClientImpl" />
- <reference name="standardTypesService">
- <interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org/#wsdl.interface(StandardTypesService)"/>
- <binding.ws uri="http://localhost:8085/sts-ep-w"/>
- </reference>
- </component>
-
- <!-- A StandardTypesServiceClient component that uses WS binding to invoke StandardTypesService.
- The service component uses interface.wsdl on the service element.
- This client component uses interface.java on the reference element. -->
- <component name="StandardTypesServiceClientJ2WComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesServiceClientImpl" />
- <reference name="standardTypesService">
- <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesService"/>
- <binding.ws uri="http://localhost:8085/sts-ep-w"/>
- </reference>
- </component>
-
- <!-- A StandardTypesServiceClient component that uses WS binding to invoke StandardTypesService.
- The service component uses interface.java on the service element.
- This client component uses interface.wsdl on the reference element. -->
- <component name="StandardTypesServiceClientW2JComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesServiceClientImpl" />
- <reference name="standardTypesService">
- <interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org/#wsdl.interface(StandardTypesService)"/>
- <binding.ws uri="http://localhost:8085/sts-ep-j"/>
- </reference>
- </component>
-
- <!-- Components used to implement the services -->
- <!-- A StandardTypesService component. -->
- <component name="StandardTypesServiceJavaComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesServiceImpl"/>
- <service name="StandardTypesService">
- <interface.java interface="org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesService"/>
- <binding.ws uri="http://localhost:8085/sts-ep-j"/>
- </service>
- </component>
-
- <!-- A StandardTypesService component. -->
- <component name="StandardTypesServiceWSDLComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesServiceImpl"/>
- <service name="StandardTypesService">
- <interface.wsdl interface="http://jaxb.databindings.itest.sca.tuscany.apache.org/#wsdl.interface(StandardTypesService)"/>
- <binding.ws uri="http://localhost:8085/sts-ep-w"/>
- </service>
- </component>
-</composite>
diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl b/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl deleted file mode 100644 index 219497e2c1..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl +++ /dev/null @@ -1,1155 +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.
--->
-
-<!-- $Rev: 673585 $ $Date: 2008-07-03 10:42:18 +0530 (Thu, 03 Jul 2008) $ -->
-
-<wsdl:definitions name="StandardTypesService"
- targetNamespace="http://jaxb.databindings.itest.sca.tuscany.apache.org/"
- xmlns:tns="http://jaxb.databindings.itest.sca.tuscany.apache.org/"
- xmlns:soap11="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
- <wsdl:types>
- <xs:schema targetNamespace="http://jaxb.dev.java.net/array"
- version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:complexType final="#all" name="anyTypeArray">
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="item" nillable="true" type="xs:anyType" />
- </xs:sequence>
- </xs:complexType>
- <xs:complexType final="#all" name="base64BinaryArray">
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="item" nillable="true" type="xs:base64Binary" />
- </xs:sequence>
- </xs:complexType>
- </xs:schema>
- <xs:schema targetNamespace="http://jaxb.dev.java.net/array"
- version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:complexType final="#all" name="dateTimeArray">
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="item" nillable="true" type="xs:dateTime" />
- </xs:sequence>
- </xs:complexType>
- <xs:complexType final="#all" name="durationArray">
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="item" nillable="true" type="xs:duration" />
- </xs:sequence>
- </xs:complexType>
- <xs:complexType final="#all" name="integerArray">
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="item" nillable="true" type="xs:integer" />
- </xs:sequence>
- </xs:complexType>
- <xs:complexType final="#all" name="anySimpleTypeArray">
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="item" nillable="true" type="xs:anySimpleType" />
- </xs:sequence>
- </xs:complexType>
- <xs:complexType final="#all" name="QNameArray">
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="item" nillable="true" type="xs:QName" />
- </xs:sequence>
- </xs:complexType>
- <xs:complexType final="#all" name="decimalArray">
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="item" nillable="true" type="xs:decimal" />
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType final="#all" name="base64BinaryArray">
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="item" nillable="true" type="xs:base64Binary" />
- </xs:sequence>
- </xs:complexType>
- <xs:complexType final="#all" name="stringArray">
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="item" nillable="true" type="xs:string" />
- </xs:sequence>
- </xs:complexType>
- </xs:schema>
- <xs:schema attributeFormDefault="qualified"
- elementFormDefault="unqualified"
- targetNamespace="http://jaxb.databindings.itest.sca.tuscany.apache.org/"
- xmlns:ns0="http://activation.javax/"
- xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:element name="getNewBigDecimalArray">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="arg0" nillable="true" type="xs:decimal" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewImageArrayResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="return" nillable="true" type="xs:base64Binary" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewBigDecimal">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="arg0"
- nillable="true" type="xs:decimal" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewURIArray">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="arg0" nillable="true" type="xs:string" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewObjectArray">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="arg0" nillable="true" type="xs:anyType" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewDataHandler">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="arg0"
- nillable="true" type="xs:base64Binary" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewDateResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return"
- nillable="true" type="xs:dateTime" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewBigInteger">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="arg0"
- nillable="true" type="xs:integer" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewDateArrayResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="return" nillable="true" type="xs:dateTime" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewBigIntegerArray">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="arg0" nillable="true" type="xs:integer" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewQNameArrayResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="return" nillable="true" type="xs:QName" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewURIResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return"
- nillable="true" type="xs:string" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewUUIDArrayResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="return" nillable="true" type="xs:string" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewCalendarArrayResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="return" nillable="true" type="xs:dateTime" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewXMLGregorianCalendarArray">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="arg0" nillable="true" type="xs:anySimpleType" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewCalendarResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return"
- nillable="true" type="xs:dateTime" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewCalendar">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="arg0"
- nillable="true" type="xs:dateTime" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewCalendarArray">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="arg0" nillable="true" type="xs:dateTime" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewImageArray">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="arg0" nillable="true" type="xs:base64Binary" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewObjectResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return"
- nillable="true" type="xs:anyType" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewDurationArray">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="arg0" nillable="true" type="xs:duration" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element
- name="getNewXMLGregorianCalendarArrayResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="return" nillable="true" type="xs:anySimpleType" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewSource">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="arg0"
- nillable="true" type="xs:base64Binary" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewObjectArrayResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="return" nillable="true" type="xs:anyType" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewUUIDResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return"
- nillable="true" type="xs:string" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewBigIntegerResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return"
- nillable="true" type="xs:integer" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewQNameArray">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="arg0" nillable="true" type="xs:QName" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewUUIDArray">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="arg0" nillable="true" type="xs:string" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewBigDecimalResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return"
- nillable="true" type="xs:decimal" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewDateArray">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="arg0" nillable="true" type="xs:dateTime" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewURIArrayResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="return" nillable="true" type="xs:string" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewDurationArrayResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="return" nillable="true" type="xs:duration" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewObject">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="arg0"
- nillable="true" type="xs:anyType" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewDataHandlerResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return"
- nillable="true" type="xs:base64Binary" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewQName">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="arg0"
- nillable="true" type="xs:QName" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewDate">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="arg0"
- nillable="true" type="xs:dateTime" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewUUID">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="arg0"
- nillable="true" type="xs:string" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewXMLGregorianCalendarResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return"
- nillable="true" type="xs:anySimpleType" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewBigIntegerArrayResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="return" nillable="true" type="xs:integer" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewSourceArray">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="arg0" nillable="true" type="xs:base64Binary" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewImage">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="arg0"
- nillable="true" type="xs:base64Binary" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewSourceArrayResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="return" nillable="true" type="xs:base64Binary" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewXMLGregorianCalendar">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="arg0"
- nillable="true" type="xs:anySimpleType" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewQNameResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return"
- nillable="true" type="xs:QName" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewDataHandlerArrayResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="return" nillable="true" type="xs:base64Binary" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewBigDecimalArrayResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="return" nillable="true" type="xs:decimal" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewDuration">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="arg0"
- nillable="true" type="xs:duration" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewDataHandlerArray">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0"
- name="arg0" nillable="true" type="xs:base64Binary" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewImageResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return"
- nillable="true" type="xs:base64Binary" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewSourceResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return"
- nillable="true" type="xs:base64Binary" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewDurationResponse">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="return"
- nillable="true" type="xs:duration" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="getNewURI">
- <xs:complexType>
- <xs:sequence>
- <xs:element minOccurs="0" name="arg0"
- nillable="true" type="xs:string" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:schema>
- </wsdl:types>
- <wsdl:message name="getNewBigDecimalArray">
- <wsdl:part name="getNewBigDecimalArray"
- element="tns:getNewBigDecimalArray">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewImageArrayResponse">
-
- <wsdl:part name="getNewImageArrayResponse"
- element="tns:getNewImageArrayResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewBigDecimal">
- <wsdl:part name="getNewBigDecimal"
- element="tns:getNewBigDecimal">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewURIArray">
- <wsdl:part name="getNewURIArray" element="tns:getNewURIArray">
-
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewObjectArray">
- <wsdl:part name="getNewObjectArray"
- element="tns:getNewObjectArray">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewDataHandler">
- <wsdl:part name="getNewDataHandler"
- element="tns:getNewDataHandler">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewDateResponse">
- <wsdl:part name="getNewDateResponse"
- element="tns:getNewDateResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewBigInteger">
- <wsdl:part name="getNewBigInteger"
- element="tns:getNewBigInteger">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewDateArrayResponse">
- <wsdl:part name="getNewDateArrayResponse"
- element="tns:getNewDateArrayResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewBigIntegerArray">
- <wsdl:part name="getNewBigIntegerArray"
- element="tns:getNewBigIntegerArray">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewQNameArrayResponse">
- <wsdl:part name="getNewQNameArrayResponse"
- element="tns:getNewQNameArrayResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewURIResponse">
- <wsdl:part name="getNewURIResponse"
- element="tns:getNewURIResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewUUIDArrayResponse">
- <wsdl:part name="getNewUUIDArrayResponse"
- element="tns:getNewUUIDArrayResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewCalendarArrayResponse">
- <wsdl:part name="getNewCalendarArrayResponse"
- element="tns:getNewCalendarArrayResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewXMLGregorianCalendarArray">
- <wsdl:part name="getNewXMLGregorianCalendarArray"
- element="tns:getNewXMLGregorianCalendarArray">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewCalendarResponse">
- <wsdl:part name="getNewCalendarResponse"
- element="tns:getNewCalendarResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewCalendar">
- <wsdl:part name="getNewCalendar" element="tns:getNewCalendar">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewCalendarArray">
- <wsdl:part name="getNewCalendarArray"
- element="tns:getNewCalendarArray">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewImageArray">
- <wsdl:part name="getNewImageArray"
- element="tns:getNewImageArray">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewObjectResponse">
- <wsdl:part name="getNewObjectResponse"
- element="tns:getNewObjectResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewDurationArray">
- <wsdl:part name="getNewDurationArray"
- element="tns:getNewDurationArray">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewXMLGregorianCalendarArrayResponse">
- <wsdl:part name="getNewXMLGregorianCalendarArrayResponse"
- element="tns:getNewXMLGregorianCalendarArrayResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewSource">
- <wsdl:part name="getNewSource" element="tns:getNewSource">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewObjectArrayResponse">
- <wsdl:part name="getNewObjectArrayResponse"
- element="tns:getNewObjectArrayResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewUUIDResponse">
- <wsdl:part name="getNewUUIDResponse"
- element="tns:getNewUUIDResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewBigIntegerResponse">
- <wsdl:part name="getNewBigIntegerResponse"
- element="tns:getNewBigIntegerResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewQNameArray">
- <wsdl:part name="getNewQNameArray"
- element="tns:getNewQNameArray">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewUUIDArray">
- <wsdl:part name="getNewUUIDArray"
- element="tns:getNewUUIDArray">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewBigDecimalResponse">
- <wsdl:part name="getNewBigDecimalResponse"
- element="tns:getNewBigDecimalResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewDateArray">
- <wsdl:part name="getNewDateArray"
- element="tns:getNewDateArray">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewURIArrayResponse">
- <wsdl:part name="getNewURIArrayResponse"
- element="tns:getNewURIArrayResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewDurationArrayResponse">
- <wsdl:part name="getNewDurationArrayResponse"
- element="tns:getNewDurationArrayResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewObject">
- <wsdl:part name="getNewObject" element="tns:getNewObject">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewDataHandlerResponse">
- <wsdl:part name="getNewDataHandlerResponse"
- element="tns:getNewDataHandlerResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewQName">
- <wsdl:part name="getNewQName" element="tns:getNewQName">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewDate">
- <wsdl:part name="getNewDate" element="tns:getNewDate">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewUUID">
- <wsdl:part name="getNewUUID" element="tns:getNewUUID">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewXMLGregorianCalendarResponse">
- <wsdl:part name="getNewXMLGregorianCalendarResponse"
- element="tns:getNewXMLGregorianCalendarResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewBigIntegerArrayResponse">
- <wsdl:part name="getNewBigIntegerArrayResponse"
- element="tns:getNewBigIntegerArrayResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewSourceArray">
- <wsdl:part name="getNewSourceArray"
- element="tns:getNewSourceArray">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewImage">
- <wsdl:part name="getNewImage" element="tns:getNewImage">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewSourceArrayResponse">
- <wsdl:part name="getNewSourceArrayResponse"
- element="tns:getNewSourceArrayResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewXMLGregorianCalendar">
- <wsdl:part name="getNewXMLGregorianCalendar"
- element="tns:getNewXMLGregorianCalendar">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewQNameResponse">
- <wsdl:part name="getNewQNameResponse"
- element="tns:getNewQNameResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewDataHandlerArrayResponse">
- <wsdl:part name="getNewDataHandlerArrayResponse"
- element="tns:getNewDataHandlerArrayResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewBigDecimalArrayResponse">
- <wsdl:part name="getNewBigDecimalArrayResponse"
- element="tns:getNewBigDecimalArrayResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewDuration">
- <wsdl:part name="getNewDuration" element="tns:getNewDuration">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewDataHandlerArray">
- <wsdl:part name="getNewDataHandlerArray"
- element="tns:getNewDataHandlerArray">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewImageResponse">
- <wsdl:part name="getNewImageResponse"
- element="tns:getNewImageResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewSourceResponse">
- <wsdl:part name="getNewSourceResponse"
- element="tns:getNewSourceResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewDurationResponse">
- <wsdl:part name="getNewDurationResponse"
- element="tns:getNewDurationResponse">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getNewURI">
- <wsdl:part name="getNewURI" element="tns:getNewURI"></wsdl:part>
- </wsdl:message>
- <wsdl:portType name="StandardTypesService">
- <wsdl:operation name="getNewObject">
- <wsdl:input message="tns:getNewObject"></wsdl:input>
- <wsdl:output message="tns:getNewObjectResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewImage">
- <wsdl:input message="tns:getNewImage"></wsdl:input>
- <wsdl:output message="tns:getNewImageResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewSource">
- <wsdl:input message="tns:getNewSource"></wsdl:input>
- <wsdl:output message="tns:getNewSourceResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewBigInteger">
- <wsdl:input message="tns:getNewBigInteger"></wsdl:input>
- <wsdl:output message="tns:getNewBigIntegerResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewBigIntegerArray">
- <wsdl:input message="tns:getNewBigIntegerArray">
- </wsdl:input>
- <wsdl:output message="tns:getNewBigIntegerArrayResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewBigDecimal">
- <wsdl:input message="tns:getNewBigDecimal"></wsdl:input>
- <wsdl:output message="tns:getNewBigDecimalResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewBigDecimalArray">
- <wsdl:input message="tns:getNewBigDecimalArray">
- </wsdl:input>
- <wsdl:output message="tns:getNewBigDecimalArrayResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewCalendar">
- <wsdl:input message="tns:getNewCalendar"></wsdl:input>
- <wsdl:output message="tns:getNewCalendarResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewCalendarArray">
- <wsdl:input message="tns:getNewCalendarArray"></wsdl:input>
- <wsdl:output message="tns:getNewCalendarArrayResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewDate">
- <wsdl:input message="tns:getNewDate"></wsdl:input>
- <wsdl:output message="tns:getNewDateResponse"></wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewDateArray">
- <wsdl:input message="tns:getNewDateArray"></wsdl:input>
- <wsdl:output message="tns:getNewDateArrayResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewQName">
- <wsdl:input message="tns:getNewQName"></wsdl:input>
- <wsdl:output message="tns:getNewQNameResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewQNameArray">
- <wsdl:input message="tns:getNewQNameArray"></wsdl:input>
- <wsdl:output message="tns:getNewQNameArrayResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewURI">
- <wsdl:input message="tns:getNewURI"></wsdl:input>
- <wsdl:output message="tns:getNewURIResponse"></wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewURIArray">
- <wsdl:input message="tns:getNewURIArray"></wsdl:input>
- <wsdl:output message="tns:getNewURIArrayResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewXMLGregorianCalendar">
- <wsdl:input message="tns:getNewXMLGregorianCalendar">
- </wsdl:input>
- <wsdl:output
- message="tns:getNewXMLGregorianCalendarResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewXMLGregorianCalendarArray">
- <wsdl:input message="tns:getNewXMLGregorianCalendarArray">
- </wsdl:input>
- <wsdl:output
- message="tns:getNewXMLGregorianCalendarArrayResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewDuration">
- <wsdl:input message="tns:getNewDuration"></wsdl:input>
- <wsdl:output message="tns:getNewDurationResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewDurationArray">
- <wsdl:input message="tns:getNewDurationArray"></wsdl:input>
- <wsdl:output message="tns:getNewDurationArrayResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewObjectArray">
- <wsdl:input message="tns:getNewObjectArray"></wsdl:input>
- <wsdl:output message="tns:getNewObjectArrayResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewImageArray">
- <wsdl:input message="tns:getNewImageArray"></wsdl:input>
- <wsdl:output message="tns:getNewImageArrayResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewDataHandler">
- <wsdl:input message="tns:getNewDataHandler"></wsdl:input>
- <wsdl:output message="tns:getNewDataHandlerResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewDataHandlerArray">
- <wsdl:input message="tns:getNewDataHandlerArray">
- </wsdl:input>
- <wsdl:output message="tns:getNewDataHandlerArrayResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewSourceArray">
- <wsdl:input message="tns:getNewSourceArray"></wsdl:input>
- <wsdl:output message="tns:getNewSourceArrayResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewUUID">
- <wsdl:input message="tns:getNewUUID"></wsdl:input>
- <wsdl:output message="tns:getNewUUIDResponse"></wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewUUIDArray">
- <wsdl:input message="tns:getNewUUIDArray"></wsdl:input>
- <wsdl:output message="tns:getNewUUIDArrayResponse">
- </wsdl:output>
- </wsdl:operation>
-
- </wsdl:portType>
- <wsdl:binding name="StandardTypesServiceBinding"
- type="tns:StandardTypesService">
- <soap11:binding style="document"
- transport="http://schemas.xmlsoap.org/soap/http" />
- <wsdl:operation name="getNewObject">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewImage">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewSource">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewBigInteger">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewBigIntegerArray">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewBigDecimal">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewBigDecimalArray">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewCalendar">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewCalendarArray">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewDate">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewDateArray">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewQName">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewQNameArray">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewURI">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewURIArray">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewXMLGregorianCalendar">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewXMLGregorianCalendarArray">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewDuration">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewDurationArray">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewObjectArray">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewImageArray">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewDataHandler">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewDataHandlerArray">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewSourceArray">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewUUID">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getNewUUIDArray">
- <soap11:operation />
- <wsdl:input>
- <soap11:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap11:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:service name="StandardTypesServiceService">
- <wsdl:port name="StandardTypesServicePort"
- binding="tns:StandardTypesServiceBinding">
- <soap11:address location="http://localhost:8085/sts-ep"/>
- </wsdl:port>
- </wsdl:service>
-</wsdl:definitions>
diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java b/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java deleted file mode 100644 index 3351e9c441..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java +++ /dev/null @@ -1,346 +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.itest.databindings.jaxb.topdown; - -import java.io.File; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.itest.databindings.jaxb.HelloServiceClient; -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * @version $Rev$ $Date$ - */ -public class DatabindingTestCase { - - private static Node node; - - /** - * Runs once before running the tests - */ - @BeforeClass - public static void setUp() throws Exception { - try { - NodeFactory factory = NodeFactory.newInstance(); - node = factory.createNode(new File("src/main/resources/wsdl/wrapped/helloservice.composite").toURI().toURL().toString(), - new Contribution("TestContribution", new File("src/main/resources/wsdl/wrapped/").toURI().toURL().toString())); - node.start(); - }catch(Throwable e) { - e.printStackTrace(); - } - } - - /** - * Runs once after running the tests - */ - @AfterClass - public static void tearDown() { - node.stop(); - } - - /** - * Invokes the HelloService service using WS binding. - * Service method invoked is getGreetings. - */ - @Test - public void testW2W() throws Exception { - HelloServiceClient helloServiceClient = node.getService(HelloServiceClient.class, "HelloServiceClientW2WComponent"); - performTest(helloServiceClient); - } - - /** - * Invokes the HelloService service using WS binding. - * Service method invoked is getGreetingsArray. - */ - @Test - public void testW2WArray() throws Exception { - HelloServiceClient helloServiceClient = node.getService(HelloServiceClient.class, "HelloServiceClientW2WComponent"); - performTestArray(helloServiceClient); - } - - /** - * Invokes the HelloService service using WS binding. - * Service method invoked is getGreetingsList. - */ - @Test - public void testW2WList() throws Exception { - HelloServiceClient helloServiceClient = node.getService(HelloServiceClient.class, "HelloServiceClientW2WComponent"); - performTestList(helloServiceClient); - } - - /** - * Invokes the HelloService service using WS binding. - * Service method invoked is getGreetingsArrayList. - */ - @Test - public void testW2WArrayList() throws Exception { - HelloServiceClient helloServiceClient = node.getService(HelloServiceClient.class, "HelloServiceClientW2WComponent"); - performTestArrayList(helloServiceClient); - } - - /** - * Invokes the HelloService service using WS binding. - * Service method invoked is getGreetingsMap. - */ - @Test - public void testW2WMap() throws Exception { - HelloServiceClient helloServiceClient = node.getService(HelloServiceClient.class, "HelloServiceClientW2WComponent"); - performTestMap(helloServiceClient); - } - - /** - * Invokes the HelloService service using WS binding. - * Service method invoked is getGreetingsHashMap. - */ - @Test - public void testW2WHashMap() throws Exception { - HelloServiceClient helloServiceClient = node.getService(HelloServiceClient.class, "HelloServiceClientW2WComponent"); - performTestHashMap(helloServiceClient); - } - - /** - * Invokes the HelloService service using WS binding. - * Service method invoked is getGreetingsVarArgs. - */ - @Test - public void testW2WVarArgs() throws Exception { - HelloServiceClient helloServiceClient = node.getService(HelloServiceClient.class, "HelloServiceClientW2WComponent"); - performTestVarArgs(helloServiceClient); - } - - /** - * Invokes the HelloService service using WS binding. - * Service method invoked is getGreetings. - */ - @Test - public void testJ2W() throws Exception { - HelloServiceClient helloServiceClient = node.getService(HelloServiceClient.class, "HelloServiceClientJ2WComponent"); - performTest(helloServiceClient); - } - - /** - * Invokes the HelloService service using WS binding. - * Service method invoked is getGreetingsArray. - */ - @Test - public void testJ2WArray() throws Exception { - HelloServiceClient helloServiceClient = node.getService(HelloServiceClient.class, "HelloServiceClientJ2WComponent"); - performTestArray(helloServiceClient); - } - - /** - * Invokes the HelloService service using WS binding. - * Service method invoked is getGreetingsList. - */ - @Test - public void testJ2WList() throws Exception { - HelloServiceClient helloServiceClient = node.getService(HelloServiceClient.class, "HelloServiceClientJ2WComponent"); - performTestList(helloServiceClient); - } - - /** - * Invokes the HelloService service using WS binding. - * Service method invoked is getGreetingsArrayList. - */ - @Test - public void testJ2WArrayList() throws Exception { - HelloServiceClient helloServiceClient = node.getService(HelloServiceClient.class, "HelloServiceClientJ2WComponent"); - performTestArrayList(helloServiceClient); - } - - /** - * Invokes the HelloService service using WS binding. - * Service method invoked is getGreetingsMap. - */ - @Test - public void testJ2WMap() throws Exception { - HelloServiceClient helloServiceClient = node.getService(HelloServiceClient.class, "HelloServiceClientJ2WComponent"); - performTestMap(helloServiceClient); - } - - /** - * Invokes the HelloService service using WS binding. - * Service method invoked is getGreetingsHashMap. - */ - @Test - public void testJ2WHashMap() throws Exception { - HelloServiceClient helloServiceClient = node.getService(HelloServiceClient.class, "HelloServiceClientJ2WComponent"); - performTestHashMap(helloServiceClient); - } - - /** - * Invokes the HelloService service using WS binding. - * Service method invoked is getGreetingsVarArgs. - */ - @Test - public void testJ2WVarArgs() throws Exception { - HelloServiceClient helloServiceClient = node.getService(HelloServiceClient.class, "HelloServiceClientJ2WComponent"); - performTestVarArgs(helloServiceClient); - } - - /** - * Invokes the HelloService service using WS binding. - * Service method invoked is getGreetings. - */ - @Test - public void testW2J() throws Exception { - HelloServiceClient helloServiceClient = node.getService(HelloServiceClient.class, "HelloServiceClientW2JComponent"); - performTest(helloServiceClient); - } - - /** - * Invokes the HelloService service using WS binding. - * Service method invoked is getGreetingsArray. - */ - @Test - public void testW2JArray() throws Exception { - HelloServiceClient helloServiceClient = node.getService(HelloServiceClient.class, "HelloServiceClientW2JComponent"); - performTestArray(helloServiceClient); - } - - /** - * Invokes the HelloService service using WS binding. - * Service method invoked is getGreetingsList. - */ - @Test - public void testW2JList() throws Exception { - HelloServiceClient helloServiceClient = node.getService(HelloServiceClient.class, "HelloServiceClientW2JComponent"); - performTestList(helloServiceClient); - } - - /** - * Invokes the HelloService service using WS binding. - * Service method invoked is getGreetingsArrayList. - */ - @Test - public void testW2JArrayList() throws Exception { - HelloServiceClient helloServiceClient = node.getService(HelloServiceClient.class, "HelloServiceClientW2JComponent"); - performTestArrayList(helloServiceClient); - } - - /** - * Invokes the HelloService service using WS binding. - * Service method invoked is getGreetingsMap. - */ - @Test - public void testW2JMap() throws Exception { - HelloServiceClient helloServiceClient = node.getService(HelloServiceClient.class, "HelloServiceClientW2JComponent"); - performTestMap(helloServiceClient); - } - - /** - * Invokes the HelloService service using WS binding. - * Service method invoked is getGreetingsHashMap. - */ - @Test - public void testW2JHashMap() throws Exception { - HelloServiceClient helloServiceClient = node.getService(HelloServiceClient.class, "HelloServiceClientW2JComponent"); - performTestHashMap(helloServiceClient); - } - - /** - * Invokes the HelloService service using WS binding. - * Service method invoked is getGreetingsVarArgs. - */ - @Test - public void testW2JVarArgs() throws Exception { - HelloServiceClient helloServiceClient = node.getService(HelloServiceClient.class, "HelloServiceClientW2JComponent"); - performTestVarArgs(helloServiceClient); - } - - private void performTest(HelloServiceClient helloServiceClient) { - String name = "Pandu"; - String resp = helloServiceClient.getGreetingsForward(name); - Assert.assertEquals("Hello "+name, resp); - } - - private void performTestArray(HelloServiceClient helloServiceClient) { - String[] names = {"Me", "Pandu"}; - String[] resps = helloServiceClient.getGreetingsArrayForward(names); - for(int i = 0; i < names.length; ++i) { - Assert.assertEquals("Hello "+names[i], resps[i]); - } - } - - private void performTestList(HelloServiceClient helloServiceClient) { - List<String> namesList = new ArrayList<String>(); - namesList.add("Me"); - namesList.add("Pandu"); - namesList.add("Chinnipandu"); - List<String> respList = helloServiceClient.getGreetingsListForward(namesList); - Assert.assertEquals(namesList.size(), respList.size()); - for(int i = 0; i < namesList.size(); ++i) { - Assert.assertEquals("Hello "+namesList.get(i), respList.get(i)); - } - } - - private void performTestArrayList(HelloServiceClient helloServiceClient) { - ArrayList<String> namesList = new ArrayList<String>(); - namesList.add("Me"); - namesList.add("Pandu"); - namesList.add("Chinnipandu"); - ArrayList<String> respList = helloServiceClient.getGreetingsArrayListForward(namesList); - Assert.assertEquals(namesList.size(), respList.size()); - for(int i = 0; i < namesList.size(); ++i) { - Assert.assertEquals("Hello "+namesList.get(i), respList.get(i)); - } - } - - private void performTestMap(HelloServiceClient helloServiceClient) { - Map<String, String> namesMap = new HashMap<String, String>(); - namesMap.put("Me", null); - namesMap.put("Pandu", null); - namesMap.put("Chinnipandu", null); - Map<String, String> respMap = helloServiceClient.getGreetingsMapForward(namesMap); - Assert.assertEquals(namesMap.keySet().size(), respMap.keySet().size()); - for(Map.Entry<String, String> entry: namesMap.entrySet()) { - Assert.assertEquals("Hello "+entry.getKey(), respMap.get(entry.getKey())); - } - } - - private void performTestHashMap(HelloServiceClient helloServiceClient) { - HashMap<String, String> namesMap = new HashMap<String, String>(); - namesMap.put("Me", null); - namesMap.put("Pandu", null); - namesMap.put("Chinnipandu", null); - Map<String, String> respMap = helloServiceClient.getGreetingsHashMapForward(namesMap); - Assert.assertEquals(namesMap.keySet().size(), respMap.keySet().size()); - for(Map.Entry<String, String> entry: namesMap.entrySet()) { - Assert.assertEquals("Hello "+entry.getKey(), respMap.get(entry.getKey())); - } - } - - private void performTestVarArgs(HelloServiceClient helloServiceClient) { - String[] names = { "Me", "You", "Pandu" }; // Do not change the array size from 3. - String expected = "Hello Me You Pandu"; - String actual = helloServiceClient.getGreetingsVarArgsForward(names[0], names[1], names[2]); - Assert.assertEquals(expected, actual); - } -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java b/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java deleted file mode 100644 index 8430d5e978..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java +++ /dev/null @@ -1,849 +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.itest.databindings.jaxb.topdown; - -import java.io.File; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.itest.databindings.jaxb.PrimitivesServiceClient; -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * @version $Rev$ $Date$ - */ -public class PrimitivesDatabindingTestCase { - - private static Node node; - - /** - * Runs before each test method - */ - @BeforeClass - public static void setUp() throws Exception { - NodeFactory factory = NodeFactory.newInstance(); - node = factory.createNode(new File("src/main/resources/wsdl/wrapped/primitivesservice.composite").toURI().toURL().toString(), - new Contribution("TestContribution", new File("src/main/resources/wsdl/wrapped/").toURI().toURL().toString())); - node.start(); - } - - /** - * Runs after each test method - */ - @AfterClass - public static void tearDown() { - node.stop(); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateBoolean. - */ - @Test - public void testW2WNegateBoolean() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent"); - performTestNegateBoolean(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateBooleanArray. - */ - @Test - public void testW2WNegateBooleanArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent"); - performTestNegateBooleanArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for boolean array. - */ - @Test - public void testW2WPassByValueBooleanArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueBooleanArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateByte. - */ - @Test - public void testW2WNegateByte() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent"); - performTestNegateByte(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateByteArray. - */ - @Test - public void testW2WNegateByteArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent"); - performTestNegateByteArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for byte array. - */ - @Test - public void testW2WPassByValueByteArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueByteArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateShort. - */ - @Test - public void testW2WNegateShort() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent"); - performTestNegateShort(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateShortArray. - */ - @Test - public void testW2WNegateShortArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent"); - performTestNegateShortArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for short array. - */ - @Test - public void testW2WPassByValueShortArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueShortArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateInt. - */ - @Test - public void testW2WNegateInt() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent"); - performTestNegateInt(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateIntArray. - */ - @Test - public void testW2WNegateIntArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent"); - performTestNegateIntArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for int array. - */ - @Test - public void testW2WPassByValueIntArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueIntArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateLong. - */ - @Test - public void testW2WNegateLong() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent"); - performTestNegateLong(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateLongArray. - */ - @Test - public void testW2WNegateLongArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent"); - performTestNegateLongArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for long array. - */ - @Test - public void testW2WPassByValueLongArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueLongArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateFloat. - */ - @Test - public void testW2WNegateFloat() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent"); - performTestNegateFloat(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateFloatArray. - */ - @Test - public void testW2WNegateFloatArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent"); - performTestNegateFloatArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for float array. - */ - @Test - public void testW2WPassByValueFloatArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueFloatArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateDouble. - */ - @Test - public void testW2WNegateDouble() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent"); - performTestNegateDouble(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateDoubleArray. - */ - @Test - public void testW2WNegateDoubleArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent"); - performTestNegateDoubleArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for double array. - */ - @Test - public void testW2WPassByValueDoubleArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2WComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueDoubleArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateBoolean. - */ - @Test - public void testJ2WNegateBoolean() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent"); - performTestNegateBoolean(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateBooleanArray. - */ - @Test - public void testJ2WNegateBooleanArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent"); - performTestNegateBooleanArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for boolean array. - */ - @Test - public void testJ2WPassByValueBooleanArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueBooleanArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateByte. - */ - @Test - public void testJ2WNegateByte() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent"); - performTestNegateByte(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateByteArray. - */ - @Test - public void testJ2WNegateByteArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent"); - performTestNegateByteArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for byte array. - */ - @Test - public void testJ2WPassByValueByteArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueByteArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateShort. - */ - @Test - public void testJ2WNegateShort() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent"); - performTestNegateShort(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateShortArray. - */ - @Test - public void testJ2WNegateShortArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent"); - performTestNegateShortArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for short array. - */ - @Test - public void testJ2WPassByValueShortArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueShortArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateInt. - */ - @Test - public void testJ2WNegateInt() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent"); - performTestNegateInt(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateIntArray. - */ - @Test - public void testJ2WNegateIntArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent"); - performTestNegateIntArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for int array. - */ - @Test - public void testJ2WPassByValueIntArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueIntArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateLong. - */ - @Test - public void testJ2WNegateLong() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent"); - performTestNegateLong(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateLongArray. - */ - @Test - public void testJ2WNegateLongArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent"); - performTestNegateLongArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for long array. - */ - @Test - public void testJ2WPassByValueLongArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueLongArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateFloat. - */ - @Test - public void testJ2WNegateFloat() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent"); - performTestNegateFloat(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateFloatArray. - */ - @Test - public void testJ2WNegateFloatArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent"); - performTestNegateFloatArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for float array. - */ - @Test - public void testJ2WPassByValueFloatArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueFloatArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateDouble. - */ - @Test - public void testJ2WNegateDouble() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent"); - performTestNegateDouble(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateDoubleArray. - */ - @Test - public void testJ2WNegateDoubleArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent"); - performTestNegateDoubleArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for double array. - */ - @Test - public void testJ2WPassByValueDoubleArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientJ2WComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueDoubleArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateBoolean. - */ - @Test - public void testW2JNegateBoolean() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent"); - performTestNegateBoolean(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateBooleanArray. - */ - @Test - public void testW2JNegateBooleanArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent"); - performTestNegateBooleanArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for boolean array. - */ - @Test - public void testW2JPassByValueBooleanArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueBooleanArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateByte. - */ - @Test - public void testW2JNegateByte() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent"); - performTestNegateByte(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateByteArray. - */ - @Test - public void testW2JNegateByteArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent"); - performTestNegateByteArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for byte array. - */ - @Test - public void testW2JPassByValueByteArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueByteArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateShort. - */ - @Test - public void testW2JNegateShort() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent"); - performTestNegateShort(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateShortArray. - */ - @Test - public void testW2JNegateShortArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent"); - performTestNegateShortArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for short array. - */ - @Test - public void testW2JPassByValueShortArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueShortArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateInt. - */ - @Test - public void testW2JNegateInt() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent"); - performTestNegateInt(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateIntArray. - */ - @Test - public void testW2JNegateIntArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent"); - performTestNegateIntArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for int array. - */ - @Test - public void testW2JPassByValueIntArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueIntArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateLong. - */ - @Test - public void testW2JNegateLong() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent"); - performTestNegateLong(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateLongArray. - */ - @Test - public void testW2JNegateLongArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent"); - performTestNegateLongArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for long array. - */ - @Test - public void testW2JPassByValueLongArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueLongArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateFloat. - */ - @Test - public void testW2JNegateFloat() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent"); - performTestNegateFloat(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateFloatArray. - */ - @Test - public void testW2JNegateFloatArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent"); - performTestNegateFloatArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for float array. - */ - @Test - public void testW2JPassByValueFloatArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueFloatArray()); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateDouble. - */ - @Test - public void testW2JNegateDouble() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent"); - performTestNegateDouble(primitivesServiceClient); - } - - /** - * Invokes the PrimitivesService service using WS binding. - * Service method invoked is negateDoubleArray. - */ - @Test - public void testW2JNegateDoubleArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent"); - performTestNegateDoubleArray(primitivesServiceClient); - } - - /** - * Test the pass-by-value semantics of a remotable service with WS binding. - * Test for double array. - */ - @Test - public void testW2JPassByValueDoubleArray() throws Exception { - PrimitivesServiceClient primitivesServiceClient = node.getService(PrimitivesServiceClient.class, "PrimitivesServiceClientW2JComponent"); - Assert.assertTrue(primitivesServiceClient.passByValueDoubleArray()); - } - - private void performTestNegateBoolean(PrimitivesServiceClient primitivesServiceClient) { - Assert.assertTrue(primitivesServiceClient.negateBooleanForward(false)); - Assert.assertFalse(primitivesServiceClient.negateBooleanForward(true)); - } - - private void performTestNegateBooleanArray(PrimitivesServiceClient primitivesServiceClient) { - boolean flags[] = new boolean[2]; - flags[0] = false; - flags[1] = true; - boolean[] respFlags = primitivesServiceClient.negateBooleanArrayForward(flags); - Assert.assertEquals(flags.length, respFlags.length); - for(int i = 0; i < flags.length; ++i) { - Assert.assertEquals(!flags[i], respFlags[i]); - } - } - - private void performTestNegateByte(PrimitivesServiceClient primitivesServiceClient) { - byte[] ba = new byte[3]; - ba[0] = -1; - ba[1] = 0; - ba[2] = 1; - - for(int i = 0; i < ba.length; ++i) { - Assert.assertEquals((byte)-ba[i], primitivesServiceClient.negateByteForward(ba[i])); - } - } - - private void performTestNegateByteArray(PrimitivesServiceClient primitivesServiceClient) { - byte[] ba = new byte[3]; - ba[0] = -1; - ba[1] = 0; - ba[2] = 1; - - byte[] r = primitivesServiceClient.negateByteArrayForward(ba); - Assert.assertEquals(ba.length, r.length); - for(int i = 0; i < ba.length; ++i) { - Assert.assertEquals((byte)-ba[i], r[i]); - } - } - - private void performTestNegateShort(PrimitivesServiceClient primitivesServiceClient) { - short[] s = new short[3]; - s[0] = -1; - s[1] = 0; - s[2] = 1; - - for(int i = 0; i < s.length; ++i) { - Assert.assertEquals((short)-s[i], primitivesServiceClient.negateShortForward(s[i])); - } - } - - private void performTestNegateShortArray(PrimitivesServiceClient primitivesServiceClient) { - short[] s = new short[3]; - s[0] = -1; - s[1] = 0; - s[2] = 1; - - short[] r = primitivesServiceClient.negateShortArrayForward(s); - Assert.assertEquals(s.length, r.length); - for(int i = 0; i < s.length; ++i) { - Assert.assertEquals((short)-s[i], r[i]); - } - } - - private void performTestNegateInt(PrimitivesServiceClient primitivesServiceClient) { - int[] ia = new int[3]; - ia[0] = -1; - ia[1] = 0; - ia[2] = 1; - - for(int i = 0; i < ia.length; ++i) { - Assert.assertEquals(-ia[i], primitivesServiceClient.negateIntForward(ia[i])); - } - } - - private void performTestNegateIntArray(PrimitivesServiceClient primitivesServiceClient) { - int[] ia = new int[3]; - ia[0] = -1; - ia[1] = 0; - ia[2] = 1; - - int[] r = primitivesServiceClient.negateIntArrayForward(ia); - Assert.assertEquals(ia.length, r.length); - for(int i = 0; i < ia.length; ++i) { - Assert.assertEquals(-ia[i], r[i]); - } - } - - private void performTestNegateLong(PrimitivesServiceClient primitivesServiceClient) { - long[] la = new long[3]; - la[0] = -1; - la[1] = 0; - la[2] = 1; - - for(int i = 0; i < la.length; ++i) { - Assert.assertEquals(-la[i], primitivesServiceClient.negateLongForward(la[i])); - } - } - - private void performTestNegateLongArray(PrimitivesServiceClient primitivesServiceClient) { - long[] la = new long[3]; - la[0] = -1; - la[1] = 0; - la[2] = 1; - - long[] r = primitivesServiceClient.negateLongArrayForward(la); - Assert.assertEquals(la.length, r.length); - for(int i = 0; i < la.length; ++i) { - Assert.assertEquals(-la[i], r[i]); - } - } - - private void performTestNegateFloat(PrimitivesServiceClient primitivesServiceClient) { - float[] fa = new float[3]; - fa[0] = -1; - fa[1] = 0; - fa[2] = 1; - - for(int i = 0; i < fa.length; ++i) { - Assert.assertEquals(-fa[i], primitivesServiceClient.negateFloatForward(fa[i])); - } - } - - private void performTestNegateFloatArray(PrimitivesServiceClient primitivesServiceClient) { - float[] ia = new float[3]; - ia[0] = -1; - ia[1] = 0; - ia[2] = 1; - - float[] r = primitivesServiceClient.negateFloatArrayForward(ia); - Assert.assertEquals(ia.length, r.length); - for(int i = 0; i < ia.length; ++i) { - Assert.assertEquals(-ia[i], r[i]); - } - } - - private void performTestNegateDouble(PrimitivesServiceClient primitivesServiceClient) { - double[] da = new double[3]; - da[0] = -1; - da[1] = 0; - da[2] = 1; - - for(int i = 0; i < da.length; ++i) { - Assert.assertEquals(-da[i], primitivesServiceClient.negateDoubleForward(da[i])); - } - } - - private void performTestNegateDoubleArray(PrimitivesServiceClient primitivesServiceClient) { - double[] da = new double[3]; - da[0] = -1; - da[1] = 0; - da[2] = 1; - - double[] r = primitivesServiceClient.negateDoubleArrayForward(da); - Assert.assertEquals(da.length, r.length); - for(int i = 0; i < da.length; ++i) { - Assert.assertEquals(-da[i], r[i]); - } - } -} diff --git a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java b/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java deleted file mode 100644 index 7499978c0e..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java +++ /dev/null @@ -1,1438 +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.itest.databindings.jaxb.topdown; - -import java.awt.Image; -import java.awt.image.BufferedImage; -import java.awt.image.PixelGrabber; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.StringWriter; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.net.URI; -import java.net.URL; -import java.util.Calendar; -import java.util.Date; -import java.util.GregorianCalendar; -import java.util.TimeZone; -import java.util.UUID; - -import javax.activation.DataHandler; -import javax.xml.datatype.DatatypeConfigurationException; -import javax.xml.datatype.DatatypeFactory; -import javax.xml.datatype.Duration; -import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.namespace.QName; -import javax.xml.transform.Result; -import javax.xml.transform.Source; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.stream.StreamResult; - -import junit.framework.Assert; - -import org.apache.axiom.attachments.ByteArrayDataSource; -import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesServiceClient; -import org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesTransformer; -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * @version $Rev$ $Date$ - */ -public class StandardTypesDatabindingTestCase { - - private static Node node; - - /** - * Runs once before the tests - */ - @BeforeClass - public static void setUp() throws Exception { - NodeFactory factory = NodeFactory.newInstance(); - node = factory.createNode(new File("src/main/resources/wsdl/wrapped/standard-types-service.composite").toURI().toURL().toString(), - new Contribution("TestContribution", new File("src/main/resources/wsdl/wrapped/").toURI().toURL().toString())); - node.start(); - } - - /** - * Runs once after the tests - */ - @AfterClass - public static void tearDown() { - node.stop(); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewBigInteger. - */ - @Test - public void testW2WNewBigInteger() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewBigInteger(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewBigIntegerArray. - */ - @Test - public void testW2WNewBigIntegerArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewBigIntegerArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewBigDecimal. - */ - @Test - public void testW2WNewBigDecimal() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewBigDecimal(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewBigDecimalArray. - */ - @Test - public void testW2WNewBigDecimalArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewBigDecimalArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewCalendar. - */ - @Test - public void testW2WNewCalendar() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewCalendar(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewCalendarArray. - */ - @Test - public void testW2WNewCalendarArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewCalendarArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDate. - */ - @Test - public void testW2WNewDate() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewDate(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDateArray. - */ - @Test - public void testW2WNewDateArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewDateArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewQName. - */ - @Test - public void testW2WNewQName() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewQName(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewQNameArray. - */ - @Test - public void testW2WNewQNameArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewQNameArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewURI. - */ - @Test - public void testW2WNewURI() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewURI(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewURIArray. - */ - @Test - public void testW2WNewURIArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewURIArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewXMLGregorianCalendar. - */ - @Test - public void testW2WNewXMLGregorianCalendar() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewXMLGregorianCalendar(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewXMLGregorianCalendarArray. - */ - @Test - public void testW2WNewXMLGregorianCalendarArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewXMLGregorianCalendarArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDuration. - */ - @Test - public void testW2WNewDuration() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewDuration(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDurationArray. - */ - @Test - public void testW2WNewDurationArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewDurationArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewObject. - */ - @Test - public void testW2WNewObject() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewObject(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewObjectArray. - */ - @Test - public void testW2WNewObjectArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewObjectArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewImage. - */ - @Test - public void testW2WNewImage() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewImage(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewImageArray. - */ - @Test - public void testW2WNewImageArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewImageArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDataHandler. - */ - @Test - public void testW2WNewDataHandler() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewDataHandler(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDataHandlerArray. - */ - @Test - public void testW2WNewDataHandlerArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewDataHandlerArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewSource. - */ - /*@Test - //@Ignore("junit.framework.ComparisonFailure: null expected:<... encoding=\"UTF-8\"?><[a>A</a]>> but was:<... encoding=\"UTF-8\"?><[return xmlns=\"http://jaxb.databindings.itest.sca.tuscany.apache.org/\">A</return]>>") - public void testW2WNewSource() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewSource(serviceClient); - }*/ - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewSourceArray. - */ - /*@Test - @Ignore("TUSCANY-2452") - public void testW2WNewSourceArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewSourceArray(serviceClient); - }*/ - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewUUID. - */ - @Test - public void testW2WNewUUID() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewUUID(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewUUIDArray. - */ - @Test - public void testW2WNewUUIDArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); - performTestNewUUIDArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewBigInteger. - */ - @Test - public void testJ2WNewBigInteger() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewBigInteger(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewBigIntegerArray. - */ - @Test - public void testJ2WNewBigIntegerArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewBigIntegerArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewBigDecimal. - */ - @Test - public void testJ2WNewBigDecimal() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewBigDecimal(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewBigDecimalArray. - */ - @Test - public void testJ2WNewBigDecimalArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewBigDecimalArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewCalendar. - */ - @Test - public void testJ2WNewCalendar() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewCalendar(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewCalendarArray. - */ - @Test - public void testJ2WNewCalendarArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewCalendarArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDate. - */ - @Test - public void testJ2WNewDate() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewDate(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDateArray. - */ - @Test - public void testJ2WNewDateArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewDateArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewQName. - */ - @Test - public void testJ2WNewQName() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewQName(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewQNameArray. - */ - @Test - public void testJ2WNewQNameArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewQNameArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewURI. - */ - @Test - public void testJ2WNewURI() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewURI(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewURIArray. - */ - @Test - public void testJ2WNewURIArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewURIArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewXMLGregorianCalendar. - */ - @Test - public void testJ2WNewXMLGregorianCalendar() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewXMLGregorianCalendar(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewXMLGregorianCalendarArray. - */ - @Test - public void testJ2WNewXMLGregorianCalendarArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewXMLGregorianCalendarArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDuration. - */ - @Test - public void testJ2WNewDuration() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewDuration(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDurationArray. - */ - @Test - public void testJ2WNewDurationArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewDurationArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewObject. - */ - @Test - public void testJ2WNewObject() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewObject(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewObjectArray. - */ - @Test - public void testJ2WNewObjectArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewObjectArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewImage. - */ - @Test - public void testJ2WNewImage() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewImage(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewImageArray. - */ - @Test - public void testJ2WNewImageArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewImageArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDataHandler. - */ - @Test - public void testJ2WNewDataHandler() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewDataHandler(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDataHandlerArray. - */ - @Test - public void testJ2WNewDataHandlerArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewDataHandlerArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewSource. - */ - /*@Test - //@Ignore("junit.framework.ComparisonFailure: null expected:<... encoding=\"UTF-8\"?><[a>A</a]>> but was:<... encoding=\"UTF-8\"?><[return xmlns=\"http://jaxb.databindings.itest.sca.tuscany.apache.org/\">A</return]>>") - public void testJ2WNewSource() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewSource(serviceClient); - }*/ - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewSourceArray. - */ - /*@Test - @Ignore("TUSCANY-2452") - public void testJ2WNewSourceArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewSourceArray(serviceClient); - }*/ - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewUUID. - */ - @Test - public void testJ2WNewUUID() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewUUID(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewUUIDArray. - */ - @Test - public void testJ2WNewUUIDArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); - performTestNewUUIDArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewBigInteger. - */ - @Test - public void testW2JNewBigInteger() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewBigInteger(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewBigIntegerArray. - */ - @Test - public void testW2JNewBigIntegerArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewBigIntegerArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewBigDecimal. - */ - @Test - public void testW2JNewBigDecimal() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewBigDecimal(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewBigDecimalArray. - */ - @Test - public void testW2JNewBigDecimalArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewBigDecimalArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewCalendar. - */ - @Test - public void testW2JNewCalendar() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewCalendar(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewCalendarArray. - */ - @Test - public void testW2JNewCalendarArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewCalendarArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDate. - */ - @Test - public void testW2JNewDate() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewDate(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDateArray. - */ - @Test - public void testW2JNewDateArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewDateArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewQName. - */ - @Test - public void testW2JNewQName() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewQName(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewQNameArray. - */ - @Test - public void testW2JNewQNameArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewQNameArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewURI. - */ - @Test - public void testW2JNewURI() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewURI(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewURIArray. - */ - @Test - public void testW2JNewURIArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewURIArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewXMLGregorianCalendar. - */ - @Test - public void testW2JNewXMLGregorianCalendar() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewXMLGregorianCalendar(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewXMLGregorianCalendarArray. - */ - @Test - public void testW2JNewXMLGregorianCalendarArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewXMLGregorianCalendarArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDuration. - */ - @Test - public void testW2JNewDuration() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewDuration(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDurationArray. - */ - @Test - public void testW2JNewDurationArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewDurationArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewObject. - */ - @Test - public void testW2JNewObject() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewObject(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewObjectArray. - */ - @Test - public void testW2JNewObjectArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewObjectArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewImage. - */ - @Test - public void testW2JNewImage() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewImage(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewImageArray. - */ - @Test - public void testW2JNewImageArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewImageArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDataHandler. - */ - @Test - public void testW2JNewDataHandler() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewDataHandler(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewDataHandlerArray. - */ - @Test - public void testW2JNewDataHandlerArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewDataHandlerArray(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewSource. - */ - /*@Test - //@Ignore("junit.framework.ComparisonFailure: null expected:<... encoding=\"UTF-8\"?><[a>A</a]>> but was:<... encoding=\"UTF-8\"?><[return xmlns=\"http://jaxb.databindings.itest.sca.tuscany.apache.org/\">A</return]>>") - public void testW2JNewSource() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewSource(serviceClient); - }*/ - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewSourceArray. - */ - /*@Test - @Ignore("TUSCANY-2452") - public void testW2JNewSourceArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewSourceArray(serviceClient); - }*/ - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewUUID. - */ - @Test - public void testW2JNewUUID() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewUUID(serviceClient); - } - - /** - * Invokes the StandardTypesService service using WS binding. - * Service method invoked is getNewUUIDArray. - */ - @Test - public void testW2JNewUUIDArray() throws Exception { - StandardTypesServiceClient serviceClient = - node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); - performTestNewUUIDArray(serviceClient); - } - - private void performTestNewBigInteger(StandardTypesServiceClient serviceClient) { - BigInteger bi = new BigInteger("1234567890123456789012345678901234"); - BigInteger expected = bi.negate(); - BigInteger actual = serviceClient.getNewBigIntegerForward(bi); - Assert.assertEquals(expected, actual); - } - - private void performTestNewBigIntegerArray(StandardTypesServiceClient serviceClient) { - BigInteger[] bia = new BigInteger[2]; - bia[0] = new BigInteger("1234567890123456789012345678901234"); - bia[1] = new BigInteger("-98765432109876543210987654321"); - BigInteger[] actual = serviceClient.getNewBigIntegerArrayForward(bia); - Assert.assertEquals(bia.length, actual.length); - for (int i = 0; i < bia.length; ++i) { - Assert.assertEquals(bia[i].negate(), actual[i]); - } - } - - private void performTestNewBigDecimal(StandardTypesServiceClient serviceClient) { - BigDecimal bd = new BigDecimal("12345678901234567890.12345678901234"); - BigDecimal expected = bd.negate(); - BigDecimal actual = serviceClient.getNewBigDecimalForward(bd); - Assert.assertEquals(expected, actual); - } - - private void performTestNewBigDecimalArray(StandardTypesServiceClient serviceClient) { - BigDecimal[] bda = new BigDecimal[2]; - bda[0] = new BigDecimal("1234567890123456.789012345678901234"); - bda[1] = new BigDecimal("-987654321098765.43210987654321"); - BigDecimal[] actual = serviceClient.getNewBigDecimalArrayForward(bda); - Assert.assertEquals(bda.length, actual.length); - for (int i = 0; i < bda.length; ++i) { - Assert.assertEquals(bda[i].negate(), actual[i]); - } - } - - private void performTestNewCalendar(StandardTypesServiceClient serviceClient) { - Calendar[] ca = new Calendar[3]; - String[] tz = {"GMT+05:30", "GMT+00:00", "GMT-05:00"}; - for (int i = 0; i < ca.length; ++i) { - ca[i] = Calendar.getInstance(TimeZone.getTimeZone(tz[i])); - ca[i].set(Calendar.DAY_OF_MONTH, i + 1); - } - for (int i = 0; i < ca.length; ++i) { - Calendar actual = serviceClient.getNewCalendarForward(ca[i]); - ca[i].add(Calendar.DAY_OF_MONTH, 5); - if (actual instanceof GregorianCalendar && ca[i] instanceof GregorianCalendar) { - // FIXME: Is this a problem? - // The instance returned by service method invoked over binding.ws seems to have a gregorianCutover - // different from the instance passed. Adjust the gregorianCutover as per the input instance. - ((GregorianCalendar)actual).setGregorianChange(((GregorianCalendar)ca[i]).getGregorianChange()); - } - Assert.assertEquals(ca[i], actual); - } - } - - private void performTestNewCalendarArray(StandardTypesServiceClient serviceClient) { - Calendar[] ca = new Calendar[3]; - String[] tz = {"GMT+05:30", "GMT+00:00", "GMT-05:00"}; - for (int i = 0; i < ca.length; ++i) { - ca[i] = Calendar.getInstance(TimeZone.getTimeZone(tz[i])); - ca[i].set(Calendar.DAY_OF_MONTH, i + 1); - } - Calendar[] actual = serviceClient.getNewCalendarArrayForward(ca); - Assert.assertEquals(ca.length, actual.length); - for (int i = 0; i < ca.length; ++i) { - ca[i].add(Calendar.DAY_OF_MONTH, 5); - if (actual[i] instanceof GregorianCalendar && ca[i] instanceof GregorianCalendar) { - // FIXME: Is this a problem? - // The instance returned by service method invoked over binding.ws seems to have a gregorianCutover - // different from the instance passed. Adjust the gregorianCutover as per the input instance. - ((GregorianCalendar)actual[i]).setGregorianChange(((GregorianCalendar)ca[i]).getGregorianChange()); - } - Assert.assertEquals(ca[i], actual[i]); - } - } - - private void performTestNewDate(StandardTypesServiceClient serviceClient) { - Date d = new Date(); - Date expected = new Date(d.getTime() + 5 * 24 * 60 * 60 * 1000); - Date actual = serviceClient.getNewDateForward(d); - Assert.assertEquals(expected, actual); - } - - private void performTestNewDateArray(StandardTypesServiceClient serviceClient) { - Date[] d = new Date[2]; - Date[] expected = new Date[d.length]; - for (int i = 0; i < d.length; ++i) { - d[i] = new Date(); - d[i].setTime(d[i].getTime() + i * 24 * 60 * 60 * 1000); - expected[i] = new Date(d[i].getTime() + 5 * 24 * 60 * 60 * 1000); - } - Date[] actual = serviceClient.getNewDateArrayForward(d); - Assert.assertEquals(expected.length, actual.length); - for (int i = 0; i < expected.length; ++i) { - Assert.assertEquals(expected[i], actual[i]); - } - } - - private void performTestNewQName(StandardTypesServiceClient serviceClient) { - QName[] qnames = new QName[3]; - qnames[0] = new QName("localPart"); - qnames[1] = new QName("namespaceUri", "localPart"); - qnames[2] = new QName("namespaceUri", "localPart", "prefix"); - QName[] expected = new QName[qnames.length]; - for (int i = 0; i < qnames.length; ++i) { - expected[i] = - new QName(qnames[i].getNamespaceURI() + "q", qnames[i].getLocalPart() + "q", - qnames[i].getPrefix() + "q"); - } - for (int i = 0; i < qnames.length; ++i) { - QName actual = serviceClient.getNewQNameForward(qnames[i]); - Assert.assertEquals(expected[i], actual); - } - } - - private void performTestNewQNameArray(StandardTypesServiceClient serviceClient) { - QName[] qnames = new QName[4]; - qnames[0] = new QName("localPart"); - qnames[1] = new QName("namespaceUri", "localPart"); - qnames[2] = new QName("namespaceUri", "localPart", "prefix"); - qnames[3] = new QName("localPart2"); - QName[] expected = new QName[qnames.length]; - for (int i = 0; i < qnames.length; ++i) { - expected[i] = - new QName(qnames[i].getNamespaceURI() + "q", qnames[i].getLocalPart() + "q", - qnames[i].getPrefix() + "q"); - } - QName[] actual = serviceClient.getNewQNameArrayForward(qnames); - Assert.assertEquals(expected.length, actual.length); - for (int i = 0; i < qnames.length; ++i) { - Assert.assertEquals(expected[i], actual[i]); - } - } - - private void performTestNewURI(StandardTypesServiceClient serviceClient) { - URI[] uris = new URI[4]; - uris[0] = URI.create("a/b/c"); - uris[1] = URI.create("http://abc/"); - uris[2] = URI.create("ftp://a/b"); - uris[3] = URI.create("http://abc/").resolve("xyz"); - - for (int i = 0; i < uris.length; ++i) { - URI expected = uris[i].resolve("uri"); - URI actual = serviceClient.getNewURIForward(uris[i]); - Assert.assertEquals(expected, actual); - } - } - - private void performTestNewURIArray(StandardTypesServiceClient serviceClient) { - URI[] uris = new URI[4]; - uris[0] = URI.create("a/b/c"); - // [rfeng] We need to have a trialign / to avoid the resolving problem - // FIXME: [vamsi] This is actually a data transformation problem. The array being returned from the service method is - // not making to the caller intact. - uris[1] = URI.create("http://abc/"); - uris[2] = URI.create("ftp://a/b"); - uris[3] = URI.create("http://abc/").resolve("xyz"); - - URI[] expected = new URI[uris.length]; - for (int i = 0; i < uris.length; ++i) { - expected[i] = uris[i].resolve("uri"); - } - - URI[] actual = serviceClient.getNewURIArrayForward(uris); - Assert.assertEquals(expected.length, actual.length); - for (int i = 0; i < uris.length; ++i) { - Assert.assertEquals(expected[i], actual[i]); - } - } - - private void performTestNewXMLGregorianCalendar(StandardTypesServiceClient serviceClient) - throws DatatypeConfigurationException { - DatatypeFactory df = DatatypeFactory.newInstance(); - XMLGregorianCalendar[] xgcals = new XMLGregorianCalendar[3]; - xgcals[0] = df.newXMLGregorianCalendar(new GregorianCalendar(1974, GregorianCalendar.APRIL, 19)); - xgcals[1] = df.newXMLGregorianCalendar(new GregorianCalendar(1978, GregorianCalendar.OCTOBER, 13)); - xgcals[2] = df.newXMLGregorianCalendar(new GregorianCalendar(2006, GregorianCalendar.JUNE, 16)); - - for (int i = 0; i < xgcals.length; ++i) { - XMLGregorianCalendar actual = serviceClient.getNewXMLGregorianCalendarForward(xgcals[i]); - xgcals[i].setDay(xgcals[i].getDay() + 5); - Assert.assertEquals(xgcals[i], actual); - } - } - - private void performTestNewXMLGregorianCalendarArray(StandardTypesServiceClient serviceClient) - throws DatatypeConfigurationException { - DatatypeFactory df = DatatypeFactory.newInstance(); - XMLGregorianCalendar[] xgcals = new XMLGregorianCalendar[3]; - xgcals[0] = df.newXMLGregorianCalendar(new GregorianCalendar(1974, GregorianCalendar.APRIL, 19)); - xgcals[1] = df.newXMLGregorianCalendar(new GregorianCalendar(1978, GregorianCalendar.OCTOBER, 13)); - xgcals[2] = df.newXMLGregorianCalendar(new GregorianCalendar(2006, GregorianCalendar.JUNE, 16)); - - XMLGregorianCalendar[] actual = serviceClient.getNewXMLGregorianCalendarArrayForward(xgcals); - Assert.assertEquals(xgcals.length, actual.length); - for (int i = 0; i < xgcals.length; ++i) { - xgcals[i].setDay(xgcals[i].getDay() + 5); - Assert.assertEquals(xgcals[i], actual[i]); - } - } - - private void performTestNewDuration(StandardTypesServiceClient serviceClient) throws DatatypeConfigurationException { - DatatypeFactory df = DatatypeFactory.newInstance(); - Duration[] da = new Duration[3]; - da[0] = df.newDuration(1000000000000L); - da[1] = df.newDurationDayTime(1000000000000L); - da[2] = df.newDurationYearMonth(true, 1, 3); - - for (int i = 0; i < da.length; ++i) { - Assert.assertEquals(da[i].negate(), serviceClient.getNewDurationForward(da[i])); - } - } - - private void performTestNewObject(StandardTypesServiceClient serviceClient) { - Object[] objs = new Object[5]; - objs[0] = "Hello"; - objs[1] = 10; - objs[2] = null; - objs[3] = -1.0; - objs[4] = null; - - for (int i = 0; i < objs.length; ++i) { - Object expected = StandardTypesTransformer.getNewObject(objs[i]); - Object actual = serviceClient.getNewObjectForward(objs[i]); - Assert.assertEquals(expected, actual); - } - } - - private void performTestNewObjectArray(StandardTypesServiceClient serviceClient) { - Object[] objs = new Object[5]; - objs[0] = "Hello"; - objs[1] = 10; - objs[2] = null; - objs[3] = -1.0; - objs[4] = null; - - Object[] actual = serviceClient.getNewObjectArrayForward(objs); - Assert.assertEquals(objs.length, actual.length); - for (int i = 0; i < objs.length; ++i) { - Object expected = StandardTypesTransformer.getNewObject(objs[i]); - Assert.assertEquals(expected, actual[i]); - } - } - - private void performTestNewImage(StandardTypesServiceClient serviceClient) throws InterruptedException { - // Create some images to test with. - Image[] imgs = new Image[3]; - imgs[0] = new BufferedImage(10, 10, BufferedImage.TYPE_3BYTE_BGR); - imgs[1] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_ARGB); - imgs[2] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB); - imgs[0].getGraphics().drawLine(1, 1, 8, 8); - imgs[1].getGraphics().drawLine(8, 1, 1, 8); - imgs[2].getGraphics().drawLine(1, 8, 8, 1); - - Image[] copy = imgs; - // Create the same images once again as the StandardTypesTransformer may manipulate the image passed. - imgs = new Image[3]; - imgs[0] = new BufferedImage(10, 10, BufferedImage.TYPE_3BYTE_BGR); - imgs[1] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_ARGB); - imgs[2] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB); - imgs[0].getGraphics().drawLine(1, 1, 8, 8); - imgs[1].getGraphics().drawLine(8, 1, 1, 8); - imgs[2].getGraphics().drawLine(1, 8, 8, 1); - - // Make sure the images and copies are equal using ImageInfo - for(int i = 0; i < imgs.length; ++i) { - Assert.assertEquals(new ImageInfo(imgs[i]), new ImageInfo(copy[i])); - } - - for (int i = 0; i < imgs.length; ++i) { - Image actual = serviceClient.getNewImageForward(imgs[i]); - Image expected = StandardTypesTransformer.getNewImage(copy[i]); - // Compare using ImageInfo - Assert.assertEquals(new ImageInfo(expected), new ImageInfo(actual)); - } - } - - private void performTestNewImageArray(StandardTypesServiceClient serviceClient) throws InterruptedException { - // Create some images to test with. - Image[] imgs = new Image[3]; - imgs[0] = new BufferedImage(10, 10, BufferedImage.TYPE_3BYTE_BGR); - imgs[1] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_ARGB); - imgs[2] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB); - imgs[0].getGraphics().drawLine(1, 1, 8, 8); - imgs[1].getGraphics().drawLine(8, 1, 1, 8); - imgs[2].getGraphics().drawLine(1, 8, 8, 1); - - Image[] copy = imgs; - // Create the same images once again as the StandardTypesTransformer may manipulate the image passed. - imgs = new Image[3]; - imgs[0] = new BufferedImage(10, 10, BufferedImage.TYPE_3BYTE_BGR); - imgs[1] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_ARGB); - imgs[2] = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB); - imgs[0].getGraphics().drawLine(1, 1, 8, 8); - imgs[1].getGraphics().drawLine(8, 1, 1, 8); - imgs[2].getGraphics().drawLine(1, 8, 8, 1); - - // Make sure the images and copies are equal using ImageInfo - for(int i = 0; i < imgs.length; ++i) { - Assert.assertEquals(new ImageInfo(imgs[i]), new ImageInfo(copy[i])); - } - - Image[] actual = serviceClient.getNewImageArrayForward(imgs); - Assert.assertEquals(imgs.length, actual.length); - for (int i = 0; i < imgs.length; ++i) { - Image expected = StandardTypesTransformer.getNewImage(copy[i]); - // Compare using ImageInfo - Assert.assertEquals(new ImageInfo(expected), new ImageInfo(actual[i])); - } - } - - private void performTestNewDurationArray(StandardTypesServiceClient serviceClient) - throws DatatypeConfigurationException { - DatatypeFactory df = DatatypeFactory.newInstance(); - Duration[] da = new Duration[3]; - da[0] = df.newDuration(1000000000000L); - da[1] = df.newDurationDayTime(1000000000000L); - da[2] = df.newDurationYearMonth(true, 1, 3); - - Duration[] actual = serviceClient.getNewDurationArrayForward(da); - Assert.assertEquals(da.length, actual.length); - for (int i = 0; i < da.length; ++i) { - Assert.assertEquals(da[i].negate(), actual[i]); - } - } - - private void performTestNewDataHandler(StandardTypesServiceClient serviceClient) throws IOException { - DataHandler[] dha = new DataHandler[3]; - dha[0] = new DataHandler("Some data", "text/plain"); - dha[1] = new DataHandler(new URL("http://tuscany.apache.org/home.html")); - dha[2] = new DataHandler(new ByteArrayDataSource("Some data2".getBytes())); - - for (int i = 0; i < dha.length; ++i) { - DataHandler actual = serviceClient.getNewDataHandlerForward(dha[i]); - // Note: The DataHandler returned may use a different type of DataSource. - // Compare the data content instead of using equals(). - Assert.assertTrue(compare(dha[i], actual)); - } - } - - private void performTestNewDataHandlerArray(StandardTypesServiceClient serviceClient) throws IOException { - DataHandler[] dha = new DataHandler[3]; - dha[0] = new DataHandler("Some data", "text/plain"); - dha[1] = new DataHandler(new URL("http://tuscany.apache.org/home.html")); - dha[2] = new DataHandler(new ByteArrayDataSource("Some data2".getBytes())); - - DataHandler[] actual = serviceClient.getNewDataHandlerArrayForward(dha); - Assert.assertEquals(dha.length, actual.length); - for (int i = 0; i < dha.length; ++i) { - // Note: The DataHandler returned may use a different type of DataSource. - // Compare the data content instead of using equals(). - Assert.assertTrue(compare(dha[i], actual[i])); - } - } - - /*private void performTestNewSource(StandardTypesServiceClient serviceClient) throws Exception { - String xml = "<a>A<b>B</b><c>C</c></a>"; - Source[] srcs = new Source[3]; - srcs[0] = new DOMSource(new String2Node(null).transform(xml, null)); - srcs[1] = new SAXSource(new InputSource(new StringReader(xml))); - srcs[2] = new StreamSource(new StringReader(xml)); - - for (int i = 0; i < srcs.length; ++i) { - Source expected = StandardTypesTransformer.getNewSource(srcs[i]); - Source actual = serviceClient.getNewSourceForward(srcs[i]); - // [rfeng] The data may come back as a different source - Assert.assertEquals(sourceToString(expected), sourceToString(actual)); - } - } - - private void performTestNewSourceArray(StandardTypesServiceClient serviceClient) throws Exception { - String xml = "<a>A<b>B</b><c>C</c></a>"; - Source[] srcs = new Source[3]; - srcs[0] = new DOMSource(new String2Node(null).transform(xml, null)); - srcs[1] = new SAXSource(new InputSource(new StringReader(xml))); - srcs[2] = new StreamSource(new StringReader(xml)); - - Source[] actual = serviceClient.getNewSourceArrayForward(srcs); - Source[] expected = new Source[srcs.length]; - for(int i = 0; i < srcs.length; ++i) { - expected[i] = StandardTypesTransformer.getNewSource(srcs[i]); - } - Assert.assertEquals(srcs.length, actual.length); - for (int i = 0; i < srcs.length; ++i) { - // [rfeng] The data may come back as a different source - Assert.assertEquals(sourceToString(expected[i]), sourceToString(actual[i])); - } - - }*/ - - private void performTestNewUUID(StandardTypesServiceClient serviceClient) { - UUID[] uuids = new UUID[3]; - uuids[0] = UUID.nameUUIDFromBytes("ABCDEFGHJKLMNOPQRSTUVWXYZ".getBytes()); - uuids[1] = UUID.nameUUIDFromBytes("abcdefghjklmnopqrstuvwxyz".getBytes()); - uuids[2] = UUID.randomUUID(); - - for (int i = 0; i < uuids.length; ++i) { - UUID expected = UUID.fromString(uuids[i].toString() + "AAA"); - UUID actual = serviceClient.getNewUUIDForward(uuids[i]); - Assert.assertEquals(expected, actual); - } - } - - private void performTestNewUUIDArray(StandardTypesServiceClient serviceClient) { - UUID[] uuids = new UUID[3]; - uuids[0] = UUID.nameUUIDFromBytes("ABCDEFGHJKLMNOPQRSTUVWXYZ".getBytes()); - uuids[1] = UUID.nameUUIDFromBytes("abcdefghjklmnopqrstuvwxyz".getBytes()); - uuids[2] = UUID.randomUUID(); - - UUID[] actual = serviceClient.getNewUUIDArrayForward(uuids); - for (int i = 0; i < uuids.length; ++i) { - UUID expected = UUID.fromString(uuids[i].toString() + "AAA"); - Assert.assertEquals(expected, actual[i]); - } - } - - /** - * This method compares two DataHandlers. - * @return true if the data in the two handlers is the same. - */ - private boolean compare(DataHandler dh1, DataHandler dh2) throws IOException { - InputStream inp1 = dh1.getInputStream(); - InputStream inp2 = dh2.getInputStream(); - for(;;) { - int i1 = inp1.read(); - int i2 = inp2.read(); - if(i1 == -1 && i2 == -1) { - return true; - } else if(i1 != -1 && i2 != -1) { - if(i1 != i2) { - return false; - } - } else { - return false; - } - } - } - - /** - * This method returns the content of a source object as String. - */ - private String sourceToString(Source s) throws Exception { - StringWriter sw = new StringWriter(); - Result r = new StreamResult(sw); - TransformerFactory.newInstance().newTransformer().transform(s, r); - sw.close(); - return sw.toString(); - } - - /** - * This class initializes with the width, height and pixel data of a java.awt.Image object. - */ - private static class ImageInfo { - private int h, w, pixels[]; - public ImageInfo(Image img) throws InterruptedException { - w = img.getWidth(null); - h = img.getHeight(null); - pixels = new int[w*h]; - PixelGrabber pg = new PixelGrabber(img, 0, 0, w, h, pixels, 0, w); - pg.grabPixels(); - } - - public boolean equals(Object that) { - if(that == null) { - return false; - } else if(!(that instanceof ImageInfo)) { - return false; - } - - ImageInfo that1 = (ImageInfo)that; - if(w != that1.w || h != that1.h || pixels == null || that1.pixels == null || pixels.length != that1.pixels.length) { - return false; - } - for(int i = 0; i < pixels.length; ++i) { - if(pixels[i] != that1.pixels[i]) { - return false; - } - } - return true; - } - - public String toString() { - return this.getClass().getSimpleName()+"[w = "+w+", h = "+h+", pixels = "+pixels+"]"; - } - } -} diff --git a/sca-java-2.x/trunk/itest/databindings/pom.xml b/sca-java-2.x/trunk/itest/databindings/pom.xml deleted file mode 100644 index 8615b6c370..0000000000 --- a/sca-java-2.x/trunk/itest/databindings/pom.xml +++ /dev/null @@ -1,41 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-databindings</artifactId> - <name>Apache Tuscany SCA Databindings Integration Tests</name> - <version>2.0-SNAPSHOT</version> - - <packaging>pom</packaging> - <build> - <defaultGoal>install</defaultGoal> - </build> - <modules> - <module>jaxb-bottom-up</module> - <module>jaxb-top-down</module> - </modules> -</project> diff --git a/sca-java-2.x/trunk/itest/distribution/bin-distro-unzip/build.xml b/sca-java-2.x/trunk/itest/distribution/bin-distro-unzip/build.xml deleted file mode 100644 index 6c4b1fdf3f..0000000000 --- a/sca-java-2.x/trunk/itest/distribution/bin-distro-unzip/build.xml +++ /dev/null @@ -1,27 +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. ---> -<project name="itest-unzip" default="unzip"> - - <target name="unzip"> - <delete dir="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}.dir"/> - <unzip src="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}.zip" - dest="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}.dir"/> - </target> - -</project> diff --git a/sca-java-2.x/trunk/itest/distribution/bin-distro-unzip/pom.xml b/sca-java-2.x/trunk/itest/distribution/bin-distro-unzip/pom.xml deleted file mode 100644 index d9793d810d..0000000000 --- a/sca-java-2.x/trunk/itest/distribution/bin-distro-unzip/pom.xml +++ /dev/null @@ -1,128 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>itest-distribution</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>itest-bin-distro-unzip</artifactId>
- <name>Apache Tuscany SCA iTest Distribution Bin Distro Unzip</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-distribution-all</artifactId>
- <type>pom</type>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
- <!-- HACK: use profile to control if we need to add tools.jar -->
- <!-- Mac OS doesn't have tools.jar -->
- <profiles>
- <profile>
- <id>not-sun-jdk</id>
- <activation>
- <file>
- <missing>${java.home}/../lib/tools.jar</missing>
- </file>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>run-samples</id>
- <phase>verify</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <property name="java.home" value="${java.home}"/>
- <property name="tuscany.version" value="${version}" />
- <ant antfile="./build.xml" />
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>sun-jdk</id>
- <activation>
- <file>
- <exists>${java.home}/../lib/tools.jar</exists>
- </file>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
-
- <dependencies>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-trax</artifactId>
- <version>1.6.5</version>
- </dependency>
- <!-- this JDk dependency is a workaround for Maven bug - http://jira.codehaus.org/browse/MNG-1323 -->
- <dependency>
- <groupId>sun.jdk</groupId>
- <artifactId>tools</artifactId>
- <version>1.6</version>
- <scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
- </dependency>
- </dependencies>
-
- <executions>
- <execution>
- <id>run-samples</id>
- <phase>verify</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <property name="java.home" value="${java.home}"/>
- <property name="tuscany.version" value="${version}" />
- <ant antfile="./build.xml" />
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
diff --git a/sca-java-2.x/trunk/itest/distribution/contribution-binding-rmi-calculator/build.xml b/sca-java-2.x/trunk/itest/distribution/contribution-binding-rmi-calculator/build.xml deleted file mode 100644 index b3fe651c36..0000000000 --- a/sca-java-2.x/trunk/itest/distribution/contribution-binding-rmi-calculator/build.xml +++ /dev/null @@ -1,39 +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. ---> -<project name="itest-samples" default="run"> - - <!-- - compile and run each sample as though the user were running - samples from the binary distribution. Here we use ant targets - in the first instance but for some tests we may want to run - jars directly or fire up webapp containers and deploy wars. In other cases - we may need to run two samples together to provide reference and - service sides of the sample. - --> - - <property name="distro.root" value="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}.dir/tuscany-sca-${tuscany.version}" /> - - <target name="run"> - <ant antfile="build.xml" - dir="${distro.root}/samples/learning-more/binding-rmi/calculator-reference-contribution"/> - <ant antfile="build.xml" - dir="${distro.root}/samples/learning-more/binding-rmi/calculator-service-contribution"/> - </target> - -</project> diff --git a/sca-java-2.x/trunk/itest/distribution/contribution-binding-rmi-calculator/pom.xml b/sca-java-2.x/trunk/itest/distribution/contribution-binding-rmi-calculator/pom.xml deleted file mode 100644 index 35058e8300..0000000000 --- a/sca-java-2.x/trunk/itest/distribution/contribution-binding-rmi-calculator/pom.xml +++ /dev/null @@ -1,68 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-distribution</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-distribution-contribution-binding-rmi-calculator</artifactId> - <name>Apache Tuscany SCA iTest Distribution Contribution binding-rmi Calculator</name> - - <profiles> - <profile> - <id>distribution</id> - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-bin-distro-unzip</artifactId> - <type>pom</type> - <version>2.0-SNAPSHOT</version> - </dependency> - </dependencies> - </profile> - </profiles> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>run-samples</id> - <phase>verify</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="tuscany.version" value="${version}" /> - <ant antfile="./build.xml" target="run"/> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> diff --git a/sca-java-2.x/trunk/itest/distribution/contribution-binding-sca-calculator/build.xml b/sca-java-2.x/trunk/itest/distribution/contribution-binding-sca-calculator/build.xml deleted file mode 100644 index 2e7c182bf3..0000000000 --- a/sca-java-2.x/trunk/itest/distribution/contribution-binding-sca-calculator/build.xml +++ /dev/null @@ -1,40 +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. ---> -<project name="itest-samples" default="run"> - - <echo>${java.home}</echo> - <!-- - compile and run each sample as though the user were running - samples from the binary distribution. Here we use ant targets - in the first instance but for some tests we may want to run - jars directly or fire up webapp containers and deploy wars. In other cases - we may need to run two samples together to provide reference and - service sides of the sample. - --> - - <property name="distro.root" value="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}.dir/tuscany-sca-${tuscany.version}" /> - - <target name="run"> - - <ant antfile="build.xml" - dir="${distro.root}/samples/learning-more/binding-sca/calculator-contribution"/> - - </target> - -</project> diff --git a/sca-java-2.x/trunk/itest/distribution/contribution-binding-sca-calculator/pom.xml b/sca-java-2.x/trunk/itest/distribution/contribution-binding-sca-calculator/pom.xml deleted file mode 100644 index 5ea30a20f7..0000000000 --- a/sca-java-2.x/trunk/itest/distribution/contribution-binding-sca-calculator/pom.xml +++ /dev/null @@ -1,87 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-distribution</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-distribution-contribution-binding-sca-calculator</artifactId> - <name>Apache Tuscany SCA iTest Distribution Contribution binding-sca Calculator</name> - - <profiles> - <profile> - <id>distribution</id> - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-bin-distro-unzip</artifactId> - <type>pom</type> - <version>2.0-SNAPSHOT</version> - </dependency> - </dependencies> - </profile> - </profiles> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.3</version> - - <dependencies> - <dependency> - <groupId>ant</groupId> - <artifactId>ant-trax</artifactId> - <version>1.6.5</version> - </dependency> - <!-- this JDk dependency is a workaround for Maven bug - http://jira.codehaus.org/browse/MNG-1323 --> - <dependency> - <groupId>sun.jdk</groupId> - <artifactId>tools</artifactId> - <version>1.6</version> - <scope>system</scope> - <systemPath>${java.home}/../lib/tools.jar</systemPath> - </dependency> - </dependencies> - - <executions> - <execution> - <id>run-samples</id> - <phase>verify</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="tuscany.version" value="${version}" /> - <property name="java.home" value="${java.home}"/> - <ant antfile="./build.xml" target="run"/> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> diff --git a/sca-java-2.x/trunk/itest/distribution/contribution-binding-ws-calculator/build.xml b/sca-java-2.x/trunk/itest/distribution/contribution-binding-ws-calculator/build.xml deleted file mode 100644 index 2cd66aa9a2..0000000000 --- a/sca-java-2.x/trunk/itest/distribution/contribution-binding-ws-calculator/build.xml +++ /dev/null @@ -1,40 +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. ---> -<project name="itest-samples" default="run"> - - <echo>${java.home}</echo> - <!-- - compile and run each sample as though the user were running - samples from the binary distribution. Here we use ant targets - in the first instance but for some tests we may want to run - jars directly or fire up webapp containers and deploy wars. In other cases - we may need to run two samples together to provide reference and - service sides of the sample. - --> - - <property name="distro.root" value="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}.dir/tuscany-sca-${tuscany.version}" /> - - <target name="run"> - - <ant antfile="build.xml" - dir="${distro.root}/samples/learning-more/binding-ws/calculator-contribution"/> - - </target> - -</project> diff --git a/sca-java-2.x/trunk/itest/distribution/contribution-binding-ws-calculator/pom.xml b/sca-java-2.x/trunk/itest/distribution/contribution-binding-ws-calculator/pom.xml deleted file mode 100644 index c598f122e0..0000000000 --- a/sca-java-2.x/trunk/itest/distribution/contribution-binding-ws-calculator/pom.xml +++ /dev/null @@ -1,69 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-distribution</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-distribution-contribution-binding-ws-calculator</artifactId> - <name>Apache Tuscany SCA iTest Distribution Contribution binding-ws Calculator</name> - - <profiles> - <profile> - <id>distribution</id> - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-bin-distro-unzip</artifactId> - <type>pom</type> - <version>2.0-SNAPSHOT</version> - </dependency> - </dependencies> - </profile> - </profiles> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>run-samples</id> - <phase>verify</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="java.home" value="${java.home}"/> - <property name="tuscany.version" value="${version}" /> - <ant antfile="./build.xml" target="run"/> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> diff --git a/sca-java-2.x/trunk/itest/distribution/contribution-implementation-java-calculator/build.xml b/sca-java-2.x/trunk/itest/distribution/contribution-implementation-java-calculator/build.xml deleted file mode 100644 index 70a2207e11..0000000000 --- a/sca-java-2.x/trunk/itest/distribution/contribution-implementation-java-calculator/build.xml +++ /dev/null @@ -1,40 +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. ---> -<project name="itest-samples" default="run"> - - <echo>${java.home}</echo> - <!-- - compile and run each sample as though the user were running - samples from the binary distribution. Here we use ant targets - in the first instance but for some tests we may want to run - jars directly or fire up webapp containers and deploy wars. In other cases - we may need to run two samples together to provide reference and - service sides of the sample. - --> - - <property name="distro.root" value="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}.dir/tuscany-sca-${tuscany.version}" /> - - <target name="run"> - - <ant antfile="build.xml" - dir="${distro.root}/samples/learning-more/implementation-java/calculator-contribution"/> - - </target> - -</project> diff --git a/sca-java-2.x/trunk/itest/distribution/contribution-implementation-java-calculator/pom.xml b/sca-java-2.x/trunk/itest/distribution/contribution-implementation-java-calculator/pom.xml deleted file mode 100644 index a0a1790c00..0000000000 --- a/sca-java-2.x/trunk/itest/distribution/contribution-implementation-java-calculator/pom.xml +++ /dev/null @@ -1,87 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-distribution</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-distribution-contribution-implementation-java-calculator</artifactId> - <name>Apache Tuscany SCA iTest Distribution contribution implementation-java Calculator</name> - - <profiles> - <profile> - <id>distribution</id> - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-bin-distro-unzip</artifactId> - <type>pom</type> - <version>2.0-SNAPSHOT</version> - </dependency> - </dependencies> - </profile> - </profiles> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.3</version> - - <dependencies> - <dependency> - <groupId>ant</groupId> - <artifactId>ant-trax</artifactId> - <version>1.6.5</version> - </dependency> - <!-- this JDk dependency is a workaround for Maven bug - http://jira.codehaus.org/browse/MNG-1323 --> - <dependency> - <groupId>sun.jdk</groupId> - <artifactId>tools</artifactId> - <version>1.6</version> - <scope>system</scope> - <systemPath>${java.home}/../lib/tools.jar</systemPath> - </dependency> - </dependencies> - - <executions> - <execution> - <id>run-samples</id> - <phase>verify</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="tuscany.version" value="${version}" /> - <property name="java.home" value="${java.home}"/> - <ant antfile="./build.xml" target="run"/> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> diff --git a/sca-java-2.x/trunk/itest/distribution/launcher-embedded-jse/build.xml b/sca-java-2.x/trunk/itest/distribution/launcher-embedded-jse/build.xml deleted file mode 100644 index fa19e10325..0000000000 --- a/sca-java-2.x/trunk/itest/distribution/launcher-embedded-jse/build.xml +++ /dev/null @@ -1,41 +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. ---> -<project name="itest-samples" default="run"> - - <echo>${java.home}</echo> - <!-- - compile and run each sample as though the user were running - samples from the binary distribution. Here we use ant targets - in the first instance but for some tests we may want to run - jars directly or fire up webapp containers and deploy wars. In other cases - we may need to run two samples together to provide reference and - service sides of the sample. - --> - - <property name="distro.root" value="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}.dir/tuscany-sca-${tuscany.version}" /> - - <target name="run"> - - <ant dir="${distro.root}/samples/running-tuscany/embedded-jse" - target="binding-sca-calculator"> - </ant> - - </target> - -</project> diff --git a/sca-java-2.x/trunk/itest/distribution/launcher-embedded-jse/pom.xml b/sca-java-2.x/trunk/itest/distribution/launcher-embedded-jse/pom.xml deleted file mode 100644 index 93bd2e3327..0000000000 --- a/sca-java-2.x/trunk/itest/distribution/launcher-embedded-jse/pom.xml +++ /dev/null @@ -1,69 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-distribution</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-distribution-launcher-embedded-jse</artifactId> - <name>Apache Tuscany SCA iTest Distribution Launcher Embedded JSE</name> - - <profiles> - <profile> - <id>distribution</id> - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-bin-distro-unzip</artifactId> - <type>pom</type> - <version>2.0-SNAPSHOT</version> - </dependency> - </dependencies> - </profile> - </profiles> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>run-samples</id> - <phase>verify</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="java.home" value="${java.home}"/> - <property name="tuscany.version" value="${version}" /> - <ant antfile="./build.xml" target="run"/> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> diff --git a/sca-java-2.x/trunk/itest/distribution/launcher-embedded-osgi/build.xml b/sca-java-2.x/trunk/itest/distribution/launcher-embedded-osgi/build.xml deleted file mode 100644 index 6a36cf30cd..0000000000 --- a/sca-java-2.x/trunk/itest/distribution/launcher-embedded-osgi/build.xml +++ /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. ---> -<project name="itest-samples" default="run"> - - <echo>${java.home}</echo> - <!-- - compile and run each sample as though the user were running - samples from the binary distribution. Here we use ant targets - in the first instance but for some tests we may want to run - jars directly or fire up webapp containers and deploy wars. In other cases - we may need to run two samples together to provide reference and - service sides of the sample. - --> - - <property name="distro.root" value="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}.dir/tuscany-sca-${tuscany.version}" /> - - <target name="run"> - -<!-- Seems to be hanging in the console at the end of the OSGi run - configure it to run no tests for now - <ant dir="${distro.root}/samples/launcher-embedded-osgi" - target="run-contribution-binding-sca-calculator"/> ---> - - <ant dir="${distro.root}/samples/running-tuscany/embedded-osgi"/> - - </target> - -</project> diff --git a/sca-java-2.x/trunk/itest/distribution/launcher-embedded-osgi/pom.xml b/sca-java-2.x/trunk/itest/distribution/launcher-embedded-osgi/pom.xml deleted file mode 100644 index 0e4a97a07f..0000000000 --- a/sca-java-2.x/trunk/itest/distribution/launcher-embedded-osgi/pom.xml +++ /dev/null @@ -1,69 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-distribution</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-distribution-launcher-embedded-osgi</artifactId> - <name>Apache Tuscany SCA iTest Distribution Launcher Embedded OSGi</name> - - <profiles> - <profile> - <id>distribution</id> - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-bin-distro-unzip</artifactId> - <type>pom</type> - <version>2.0-SNAPSHOT</version> - </dependency> - </dependencies> - </profile> - </profiles> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>run-samples</id> - <phase>verify</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="java.home" value="${java.home}"/> - <property name="tuscany.version" value="${version}" /> - <ant antfile="./build.xml" target="run"/> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> diff --git a/sca-java-2.x/trunk/itest/distribution/legal-checks/pom.xml b/sca-java-2.x/trunk/itest/distribution/legal-checks/pom.xml deleted file mode 100644 index 7c4ae743f6..0000000000 --- a/sca-java-2.x/trunk/itest/distribution/legal-checks/pom.xml +++ /dev/null @@ -1,73 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-distribution</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-distribution-legal-checks</artifactId> - <name>Apache Tuscany SCA iTest Distribution Legal Checks</name> - - <profiles> - <profile> - <id>distribution</id> - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-bin-distro-unzip</artifactId> - <type>pom</type> - <version>2.0-SNAPSHOT</version> - </dependency> - </dependencies> - </profile> - </profiles> - - <build> - <plugins> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <version>0.6</version> - <executions> - <execution> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - <configuration> - <basedir>../../../distribution/all/target/apache-tuscany-sca-all-2.0-SNAPSHOT.dir</basedir> - <excludeSubProjects>false</excludeSubProjects> - <excludes> - <exclude>tuscany-sca-2.0-SNAPSHOT/CHANGES</exclude> - <exclude>**/MANIFEST.MF</exclude> - <exclude>**/DEPENDENCIES</exclude> - <exclude>**/target/**/*.log</exclude> - <exclude>**/config.ini</exclude> - <exclude>tuscany-sca-2.0-SNAPSHOT/features/configuration/config.ini</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> -</project> diff --git a/sca-java-2.x/trunk/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java b/sca-java-2.x/trunk/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java deleted file mode 100644 index 2fdbf62353..0000000000 --- a/sca-java-2.x/trunk/itest/distribution/legal-checks/src/test/java/itest/JarsInLICENSETestCase.java +++ /dev/null @@ -1,162 +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 itest; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileReader; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.StringTokenizer; - -import org.junit.Test; - -/** - * Checks that all jar files included in the distribution are mentioned in the LICENSE file - * and that all jars mentioned in the LICENSE are in the distribution. - */ -public class JarsInLICENSETestCase { - - @Test - public void testJars() throws Exception { - File distroRoot = getUnzipedDistroRoot(); - - File licenseFile = new File(distroRoot, "LICENSE"); - if (!licenseFile.exists()) { - throw new IllegalStateException("can't find LICENSE file at: " + licenseFile.getAbsoluteFile().toString()); - } - - File libDirectory = new File(distroRoot, "modules"); - if (!libDirectory.exists()) { - throw new IllegalStateException("can't find modules folder at: " + libDirectory.getAbsoluteFile().toString()); - } - - List<String> jars = getJarsInDistro(libDirectory); - - List<String> bad2 = getLICENSEJarsNotInDistro(licenseFile, jars); - if (bad2.size() > 0) { - System.err.println("Jars in LICENSE but not in Distribution: " + bad2); - } - - List<String> bad1 = getJarsNotInLICENSE(jars, licenseFile); - if (bad1.size() > 0) { - System.err.println("Jars in distribution but not in LICENSE: " + bad1); - } - - if (bad1.size() > 0 || bad2.size() > 0) { - throw new IllegalStateException("LICENSE problems, check log"); - } - } - - private List<String> getLICENSEJarsNotInDistro(File licenseFile, List<String> jars) throws IOException { - List<String> badJars = new ArrayList<String>(); - BufferedReader reader = new BufferedReader(new FileReader(licenseFile)); - String line = null; - while ((line = reader.readLine()) != null) { - line = line.trim(); - if (line.contains(".jar")) { - StringTokenizer st = new StringTokenizer(line); - while (st.hasMoreTokens()) { - String s = st.nextToken(); - if (s.contains(".jar")) { - if (s.startsWith("(")) { - s = s.substring(1); - } - if (s.endsWith(",") || s.endsWith(":")) { - s = s.substring(0, s.length()-1); - } - if (s.endsWith(")")) { - s = s.substring(0, s.length()-1); - } - if (!jars.contains(s) && !s.startsWith("tuscany-")) { - badJars.add(s); - } - } - } - } - } - return badJars; - } - - private List<String> getJarsNotInLICENSE(List<String> jars, File licenseFile) throws IOException { - List<String> badJars = new ArrayList<String>(); - String licenseText = readLICENSE(licenseFile); - for (String jar : jars) { - if (!licenseText.contains(jar)) { - if (jar.startsWith("tuscany-") || jar.startsWith("sample-") || jar.startsWith("test-") || jar.startsWith("itest-")) { - // ignore tuscany jars as they're not mentioned in the LICENSE file - } else { - badJars.add(jar); - } - } - } - return badJars; - } - - private List<String> getJarsInDistro(File directory) { - List<String> jars = new ArrayList<String>(); - for (String fn : directory.list()){ - if (fn.endsWith(".jar")) { - jars.add(fn); - } else { - File f = new File(directory, fn); - if (f.isDirectory()) { - jars.addAll(getJarsInDistro(f)); - } - } - } - return jars; - } - - private File getUnzipedDistroRoot() { - File distroTarget = new File("../../../distribution/all/target"); - File root = null; - for (String f : distroTarget.list()) { - if (f.endsWith(".dir")) { - root = new File(distroTarget, f); - break; - } - } - if (root == null) { - throw new IllegalStateException("can't find distro root"); - } - if (root.list().length != 1) { - throw new IllegalStateException("expecting one directory in distro root"); - } - root = new File(root, root.list()[0]); - return root; - } - - private static String readLICENSE(File licenseFile) throws java.io.IOException { - StringBuffer fileData = new StringBuffer(); - BufferedReader reader = new BufferedReader(new FileReader(licenseFile)); - char[] buf = new char[1024]; - int numRead = 0; - while ((numRead = reader.read(buf)) != -1) { - String readData = String.valueOf(buf, 0, numRead); - fileData.append(readData); - buf = new char[1024]; - } - reader.close(); - return fileData.toString(); - } - -} diff --git a/sca-java-2.x/trunk/itest/distribution/pom.xml b/sca-java-2.x/trunk/itest/distribution/pom.xml deleted file mode 100644 index 8c6d99c480..0000000000 --- a/sca-java-2.x/trunk/itest/distribution/pom.xml +++ /dev/null @@ -1,85 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <packaging>pom</packaging> - <artifactId>itest-distribution</artifactId> - <name>Apache Tuscany SCA iTest Distribution</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-distribution-all</artifactId> - <type>pom</type> - <version>2.0-SNAPSHOT</version> - </dependency> - </dependencies> - - <profiles> - <profile> - <id>default</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <modules> - <module>legal-checks</module> - <module>contribution-binding-sca-calculator</module> - <module>contribution-binding-ws-calculator</module> - <module>contribution-binding-rmi-calculator</module> - <module>contribution-implementation-java-calculator</module> - <module>launcher-embedded-jse</module> - <module>launcher-embedded-osgi</module> - </modules> - </profile> - - <profile> - <id>distribution</id> - <activation> - <property> - <name>buildZips</name> - <value>true</value> - </property> - </activation> - <modules> - <module>src-distro-unzip</module> - <module>src-distro-rat</module> - <module>bin-distro-unzip</module> - <module>legal-checks</module> - <module>contribution-binding-sca-calculator</module> - <module>contribution-binding-ws-calculator</module> - <module>contribution-binding-rmi-calculator</module> - <module>contribution-implementation-java-calculator</module> - <module>launcher-embedded-jse</module> - <module>launcher-embedded-osgi</module> - </modules> - </profile> - </profiles> - - <build> - <defaultGoal>install</defaultGoal> - </build> - -</project> diff --git a/sca-java-2.x/trunk/itest/distribution/src-distro-rat/pom.xml b/sca-java-2.x/trunk/itest/distribution/src-distro-rat/pom.xml deleted file mode 100644 index 541b1c9830..0000000000 --- a/sca-java-2.x/trunk/itest/distribution/src-distro-rat/pom.xml +++ /dev/null @@ -1,82 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-distribution</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-distribution-src-dsitro-rat</artifactId> - <name>Apache Tuscany SCA iTest Distribution Src Distro RAT</name> - - <profiles> - <profile> - <id>distribution</id> - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-src-distro-unzip</artifactId> - <type>pom</type> - <version>2.0-SNAPSHOT</version> - </dependency> - </dependencies> - </profile> - </profiles> - - <build> - <plugins> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <version>0.6</version> - <executions> - <execution> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - <configuration> - <basedir>../../../distribution/all/target/apache-tuscany-sca-all-2.0-SNAPSHOT-src.dir</basedir> - <excludeSubProjects>false</excludeSubProjects> - <excludes> - <exclude>tuscany-sca-2.0-SNAPSHOT-src/CHANGES</exclude> - <exclude>**/*.MF</exclude> - <exclude>tuscany-sca-2.0-SNAPSHOT-src/compliance-tests/binding-ws/sca_variables.dtd</exclude> - <exclude>tuscany-sca-2.0-SNAPSHOT-src/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config</exclude> - <exclude>tuscany-sca-2.0-SNAPSHOT-src/modules/binding-ws-runtime-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/repository/modules/modules.list</exclude> - <exclude>tuscany-sca-2.0-SNAPSHOT-src/modules/binding-ws-runtime-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/repository/services/services.list</exclude> - <exclude>tuscany-sca-2.0-SNAPSHOT-src/modules/implementation-spring-runtime/src/main/resources/META-INF/spring.handlers</exclude> - <exclude>tuscany-sca-2.0-SNAPSHOT-src/modules/implementation-spring-runtime/src/main/resources/META-INF/spring.schemas</exclude> - - <!-- these ones we need to implement RAT license processors to handle the non-AL headers, just exclude for now --> - <exclude>tuscany-sca-2.0-SNAPSHOT-src/modules/assembly-xsd/**/*.*</exclude> - <exclude>tuscany-sca-2.0-SNAPSHOT-src/modules/sca-api/**/*.*</exclude> - <exclude>tuscany-sca-2.0-SNAPSHOT-src/modules/implementation-web-runtime/src/main/resources/META-INF/sca.tld</exclude> - <exclude>tuscany-sca-2.0-SNAPSHOT-src/modules/assembly-xml/src/main/resources/META-INF/sca-policy-1.1-intents-definitions-cd03.xml</exclude> - <exclude>tuscany-sca-2.0-SNAPSHOT-src/modules/sca-client-impl/src/main/java/org/apache/tuscany/sca/client/impl/SCAClientFactoryFinderImpl.java</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> -</project> diff --git a/sca-java-2.x/trunk/itest/distribution/src-distro-unzip/build.xml b/sca-java-2.x/trunk/itest/distribution/src-distro-unzip/build.xml deleted file mode 100644 index c98e19b6a0..0000000000 --- a/sca-java-2.x/trunk/itest/distribution/src-distro-unzip/build.xml +++ /dev/null @@ -1,27 +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. ---> -<project name="itest-unzip" default="unzip"> - - <target name="unzip"> - <delete dir="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}-src.dir"/> - <unzip src="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}-src.zip" - dest="../../../distribution/all/target/apache-tuscany-sca-all-${tuscany.version}-src.dir"/> - </target> - -</project> diff --git a/sca-java-2.x/trunk/itest/distribution/src-distro-unzip/pom.xml b/sca-java-2.x/trunk/itest/distribution/src-distro-unzip/pom.xml deleted file mode 100644 index c4b6e5eb5f..0000000000 --- a/sca-java-2.x/trunk/itest/distribution/src-distro-unzip/pom.xml +++ /dev/null @@ -1,128 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-distribution</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-src-distro-unzip</artifactId> - <name>Apache Tuscany SCA iTest Distribution Src Distro Unzip</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-distribution-all</artifactId> - <type>pom</type> - <version>2.0-SNAPSHOT</version> - </dependency> - </dependencies> - - <!-- HACK: use profile to control if we need to add tools.jar --> - <!-- Mac OS doesn't have tools.jar --> - <profiles> - <profile> - <id>not-sun-jdk</id> - <activation> - <file> - <missing>${java.home}/../lib/tools.jar</missing> - </file> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>run-samples</id> - <phase>verify</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="java.home" value="${java.home}"/> - <property name="tuscany.version" value="${version}" /> - <ant antfile="./build.xml" /> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>sun-jdk</id> - <activation> - <file> - <exists>${java.home}/../lib/tools.jar</exists> - </file> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.3</version> - - <dependencies> - <dependency> - <groupId>ant</groupId> - <artifactId>ant-trax</artifactId> - <version>1.6.5</version> - </dependency> - <!-- this JDk dependency is a workaround for Maven bug - http://jira.codehaus.org/browse/MNG-1323 --> - <dependency> - <groupId>sun.jdk</groupId> - <artifactId>tools</artifactId> - <version>1.6</version> - <scope>system</scope> - <systemPath>${java.home}/../lib/tools.jar</systemPath> - </dependency> - </dependencies> - - <executions> - <execution> - <id>run-samples</id> - <phase>verify</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="java.home" value="${java.home}"/> - <property name="tuscany.version" value="${version}" /> - <ant antfile="./build.xml" /> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - -</project> diff --git a/sca-java-2.x/trunk/itest/domains/distributed/pom.xml b/sca-java-2.x/trunk/itest/domains/distributed/pom.xml deleted file mode 100644 index b568e5ba53..0000000000 --- a/sca-java-2.x/trunk/itest/domains/distributed/pom.xml +++ /dev/null @@ -1,51 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>itest-domains-distributed</artifactId>
- <name>Apache Tuscany SCA itest domain distributed</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base-nodep</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-
-</project>
diff --git a/sca-java-2.x/trunk/itest/domains/distributed/src/test/java/itest/Helloworld.java b/sca-java-2.x/trunk/itest/domains/distributed/src/test/java/itest/Helloworld.java deleted file mode 100644 index f764bc8358..0000000000 --- a/sca-java-2.x/trunk/itest/domains/distributed/src/test/java/itest/Helloworld.java +++ /dev/null @@ -1,28 +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 itest;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Helloworld {
-
- String sayHello(String name);
-
-}
diff --git a/sca-java-2.x/trunk/itest/domains/distributed/src/test/java/itest/StandaloneTestCase.java b/sca-java-2.x/trunk/itest/domains/distributed/src/test/java/itest/StandaloneTestCase.java deleted file mode 100644 index 222b3e8c3a..0000000000 --- a/sca-java-2.x/trunk/itest/domains/distributed/src/test/java/itest/StandaloneTestCase.java +++ /dev/null @@ -1,46 +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 itest;
-
-import static org.junit.Assert.assertEquals;
-
-import java.net.URI;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.Test;
-import org.oasisopen.sca.client.SCAClientFactory;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class StandaloneTestCase{
-
- @Test
- public void test1() throws Exception {
- Node node = NodeFactory.newInstance().createNode(URI.create("tuscany:foo"),"../helloworld/target/itest-domains-helloworld.zip");
- node.start();
- assertEquals(1, node.getServiceNames().size());
- assertEquals("HelloworldComponent/Helloworld", node.getServiceNames().get(0));
- Helloworld helloworld = SCAClientFactory.newInstance(URI.create("tuscany:foo")).getService(Helloworld.class, "HelloworldComponent");
- assertEquals("Hello petra", helloworld.sayHello("petra"));
- }
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/domains/helloworld/pom.xml b/sca-java-2.x/trunk/itest/domains/helloworld/pom.xml deleted file mode 100644 index ab3e8ecd8f..0000000000 --- a/sca-java-2.x/trunk/itest/domains/helloworld/pom.xml +++ /dev/null @@ -1,83 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>itest-domains-helloworld</artifactId>
- <name>Apache Tuscany SCA itest domain helloworld</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>itest-domains-interfaces</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-3</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-zip-contribution-descriptor</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
- <descriptor>tuscany-zip-contribution.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
-
diff --git a/sca-java-2.x/trunk/itest/domains/helloworld/src/main/java/itest/HelloworldImpl.java b/sca-java-2.x/trunk/itest/domains/helloworld/src/main/java/itest/HelloworldImpl.java deleted file mode 100644 index 2a10b3fb77..0000000000 --- a/sca-java-2.x/trunk/itest/domains/helloworld/src/main/java/itest/HelloworldImpl.java +++ /dev/null @@ -1,38 +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 itest;
-
-import itest.Helloworld;
-
-import org.oasisopen.sca.annotation.EagerInit;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Scope;
-
-@Scope("COMPOSITE") @EagerInit
-public class HelloworldImpl implements Helloworld {
-
- public String sayHello(String name) {
- return "Hello " + name;
- }
-
- @Init
- public void init() {
- System.out.println(sayHello("world"));
- }
-}
diff --git a/sca-java-2.x/trunk/itest/domains/helloworld/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/domains/helloworld/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 8939a73d01..0000000000 --- a/sca-java-2.x/trunk/itest/domains/helloworld/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://org.apache.tuscany.sca.itest">
- <deployable composite="itest:helloworld"/>
-</contribution> diff --git a/sca-java-2.x/trunk/itest/domains/helloworld/src/main/resources/helloworld.composite b/sca-java-2.x/trunk/itest/domains/helloworld/src/main/resources/helloworld.composite deleted file mode 100644 index 18d064c588..0000000000 --- a/sca-java-2.x/trunk/itest/domains/helloworld/src/main/resources/helloworld.composite +++ /dev/null @@ -1,29 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- targetNamespace="http://org.apache.tuscany.sca.itest"
- name="helloworld">
-
- <component name="HelloworldComponent">
- <implementation.java class="itest.HelloworldImpl"/>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/domains/interfaces/pom.xml b/sca-java-2.x/trunk/itest/domains/interfaces/pom.xml deleted file mode 100644 index 73ee94fef1..0000000000 --- a/sca-java-2.x/trunk/itest/domains/interfaces/pom.xml +++ /dev/null @@ -1,51 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>itest-domains-interfaces</artifactId>
- <name>Apache Tuscany SCA itest domain interfaces</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/domains/interfaces/src/main/java/itest/Helloworld.java b/sca-java-2.x/trunk/itest/domains/interfaces/src/main/java/itest/Helloworld.java deleted file mode 100644 index f764bc8358..0000000000 --- a/sca-java-2.x/trunk/itest/domains/interfaces/src/main/java/itest/Helloworld.java +++ /dev/null @@ -1,28 +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 itest;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Helloworld {
-
- String sayHello(String name);
-
-}
diff --git a/sca-java-2.x/trunk/itest/domains/pom.xml b/sca-java-2.x/trunk/itest/domains/pom.xml deleted file mode 100644 index 76286b77bb..0000000000 --- a/sca-java-2.x/trunk/itest/domains/pom.xml +++ /dev/null @@ -1,38 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>itest-domains</artifactId>
- <packaging>pom</packaging>
- <name>Apache Tuscany SCA Domians Integration Tests</name>
-
- <modules>
- <module>interfaces</module>
- <module>helloworld</module>
- <module>standalone</module>
- <module>distributed</module>
- </modules>
-</project>
diff --git a/sca-java-2.x/trunk/itest/domains/standalone/pom.xml b/sca-java-2.x/trunk/itest/domains/standalone/pom.xml deleted file mode 100644 index d434ce9816..0000000000 --- a/sca-java-2.x/trunk/itest/domains/standalone/pom.xml +++ /dev/null @@ -1,57 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>itest-domains-standalone</artifactId>
- <name>Apache Tuscany SCA itest domain standalone</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-domain-node</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <!-- TODO: shouldnt need to have this dependency, should be in DomainNode -->
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-client-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-
-</project>
diff --git a/sca-java-2.x/trunk/itest/domains/standalone/src/test/java/itest/StandaloneTestCase.java b/sca-java-2.x/trunk/itest/domains/standalone/src/test/java/itest/StandaloneTestCase.java deleted file mode 100644 index 0fbcc98a96..0000000000 --- a/sca-java-2.x/trunk/itest/domains/standalone/src/test/java/itest/StandaloneTestCase.java +++ /dev/null @@ -1,66 +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 itest;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.domain.node.DomainNode;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class StandaloneTestCase{
-
- private static DomainNode node;
-
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {
- node = new DomainNode();
- node.addContribution("../helloworld/target/itest-domains-helloworld.zip");
- }
-
- @AfterClass
- public static void tearDownAfterClass() throws Exception {
- node.stop();
- }
-
- @Test
- public void testServices() throws Exception {
- assertEquals(1, node.getServiceNames().size());
- assertEquals("HelloworldComponent/Helloworld", node.getServiceNames().get(0));
- }
-
- @Test
- public void testDuplicateComponents() throws Exception {
- try {
- node.addContribution("../helloworld/target/itest-domains-helloworld.zip", "dup");
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- // verify the old one is still there
- // TODO: doesn't work correctly yet
-// assertEquals(1, node.getServiceNames().size());
-// assertEquals("HelloworldComponent/Helloworld", node.getServiceNames().get(0));
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/endpoints/pom.xml b/sca-java-2.x/trunk/itest/endpoints/pom.xml deleted file mode 100644 index 4a962cfdf2..0000000000 --- a/sca-java-2.x/trunk/itest/endpoints/pom.xml +++ /dev/null @@ -1,68 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>itest-endpoints</artifactId>
- <name>Apache Tuscany SCA iTest Endpoints</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jsonp-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-rmi-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-jetty</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- </dependencies>
-
-</project>
diff --git a/sca-java-2.x/trunk/itest/endpoints/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/trunk/itest/endpoints/src/test/java/helloworld/HelloWorldImpl.java deleted file mode 100644 index c307547f56..0000000000 --- a/sca-java-2.x/trunk/itest/endpoints/src/test/java/helloworld/HelloWorldImpl.java +++ /dev/null @@ -1,28 +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 helloworld;
-
-
-public class HelloWorldImpl implements HelloWorldService {
-
- public String sayHello(String name) {
- return "Hello " + name;
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/endpoints/src/test/java/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/endpoints/src/test/java/helloworld/HelloWorldService.java deleted file mode 100644 index 064d615c45..0000000000 --- a/sca-java-2.x/trunk/itest/endpoints/src/test/java/helloworld/HelloWorldService.java +++ /dev/null @@ -1,28 +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 helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface HelloWorldService {
-
- String sayHello(String name);
-
-}
diff --git a/sca-java-2.x/trunk/itest/endpoints/src/test/java/test/EndpointsTestCase.java b/sca-java-2.x/trunk/itest/endpoints/src/test/java/test/EndpointsTestCase.java deleted file mode 100644 index 7802848c3b..0000000000 --- a/sca-java-2.x/trunk/itest/endpoints/src/test/java/test/EndpointsTestCase.java +++ /dev/null @@ -1,110 +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 test;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-
-import org.apache.tuscany.sca.http.jetty.JettyServer;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class EndpointsTestCase {
-
- private static Node node;
-
- @Test
- public void testJSONP1() throws MalformedURLException, IOException {
- // <tuscany:binding.jsonp />
- Utils.invokeJSONPEndpoint("http://localhost:8085/JSONPComponent1/HelloWorldService/sayHello?name=petra&callback=foo");
- }
- @Test
- public void testJSONP2() throws MalformedURLException, IOException {
- // <tuscany:binding.jsonp name="jsonp2"/>
- Utils.invokeJSONPEndpoint("http://localhost:8085/JSONPComponent2/HelloWorldService/jsonp2/sayHello?name=petra&callback=foo");
- }
- @Test
- public void testJSONP3() throws MalformedURLException, IOException {
- // <tuscany:binding.jsonp uri="jsonp3"/>
- Utils.invokeJSONPEndpoint("http://localhost:8085/JSONPComponent3/HelloWorldService/jsonp3/sayHello?name=petra&callback=foo");
- }
- @Test
- public void testJSONP4() throws MalformedURLException, IOException {
- // <tuscany:binding.jsonp uri="/jsonp4"/>
- Utils.invokeJSONPEndpoint("http://localhost:8085/jsonp4/sayHello?name=petra&callback=foo");
- }
- @Test
- public void testJSONP5() throws MalformedURLException, IOException {
- // <tuscany:binding.jsonp name="jsonp5a" uri="/jsonp5b"/>
- Utils.invokeJSONPEndpoint("http://localhost:8085/jsonp5b/sayHello?name=petra&callback=foo");
- }
- @Test
- public void testJSONP6() throws MalformedURLException, IOException {
- // <tuscany:binding.jsonp name="jsonp6a" uri="jsonp6b"/>
- Utils.invokeJSONPEndpoint("http://localhost:8085/JSONPComponent6/HelloWorldService/jsonp6a/jsonp6b/sayHello?name=petra&callback=foo");
- }
-
- @Test
- public void testWS1() throws MalformedURLException, Exception {
- // <tuscany:binding.WS />
- Utils.invokeWSEndpoint("http://localhost:8085/WSComponent1/HelloWorldService");
- }
- @Test
- public void testWS2() throws MalformedURLException, Exception {
- // <tuscany:binding.WS name="WS2"/>
- Utils.invokeWSEndpoint("http://localhost:8085/WSComponent2/HelloWorldService/ws2");
- }
- @Test
- public void testWS3() throws MalformedURLException, Exception {
- // <tuscany:binding.WS uri="WS3"/>
- Utils.invokeWSEndpoint("http://localhost:8085/WSComponent3/HelloWorldService/ws3");
- }
- @Test
- public void testWS4() throws MalformedURLException, Exception {
- // <tuscany:binding.WS uri="/WS4"/>
- Utils.invokeWSEndpoint("http://localhost:8085/ws4");
- }
- @Test
- public void testWS5() throws MalformedURLException, Exception {
- // <tuscany:binding.WS name="WS5a" uri="/WS5b"/>
- Utils.invokeWSEndpoint("http://localhost:8085/ws5b");
- }
- @Test
- public void testWS6() throws Exception {
- // <tuscany:binding.ws name="ws6a" uri="ws6b"/>
- Utils.invokeWSEndpoint("http://localhost:8085/WSComponent6/HelloWorldService/ws6a/ws6b");
- }
-
- @BeforeClass
- public static void init() throws Exception {
- JettyServer.portDefault = 8085;
- node = NodeFactory.newInstance().createNode("helloworld.composite").start();
- }
-
- @AfterClass
- public static void destroy() throws Exception {
- if (node != null) {
- node.stop();
- }
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/endpoints/src/test/java/test/NestedEndpointsTestCase.java b/sca-java-2.x/trunk/itest/endpoints/src/test/java/test/NestedEndpointsTestCase.java deleted file mode 100644 index f3b6c15bf1..0000000000 --- a/sca-java-2.x/trunk/itest/endpoints/src/test/java/test/NestedEndpointsTestCase.java +++ /dev/null @@ -1,110 +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 test;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-
-import org.apache.tuscany.sca.http.jetty.JettyServer;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class NestedEndpointsTestCase {
-
- private static Node node;
-
- @Test
- public void testJSONP1() throws MalformedURLException, IOException {
- // <tuscany:binding.jsonp />
- Utils.invokeJSONPEndpoint("http://localhost:8085/NestedComponent1/JSONPComponent1/HelloWorldService/sayHello?name=petra&callback=foo");
- }
- @Test
- public void testJSONP2() throws MalformedURLException, IOException {
- // <tuscany:binding.jsonp name="jsonp2"/>
- Utils.invokeJSONPEndpoint("http://localhost:8085/NestedComponent1/JSONPComponent2/HelloWorldService/jsonp2/sayHello?name=petra&callback=foo");
- }
- @Test
- public void testJSONP3() throws MalformedURLException, IOException {
- // <tuscany:binding.jsonp uri="jsonp3"/>
- Utils.invokeJSONPEndpoint("http://localhost:8085/NestedComponent1/JSONPComponent3/HelloWorldService/jsonp3/sayHello?name=petra&callback=foo");
- }
- @Test
- public void testJSONP4() throws MalformedURLException, IOException {
- // <tuscany:binding.jsonp uri="/jsonp4"/>
- Utils.invokeJSONPEndpoint("http://localhost:8085/jsonp4/sayHello?name=petra&callback=foo");
- }
- @Test
- public void testJSONP5() throws MalformedURLException, IOException {
- // <tuscany:binding.jsonp name="jsonp5a" uri="/jsonp5b"/>
- Utils.invokeJSONPEndpoint("http://localhost:8085/jsonp5b/sayHello?name=petra&callback=foo");
- }
- @Test
- public void testJSONP6() throws MalformedURLException, IOException {
- // <tuscany:binding.jsonp name="jsonp6a" uri="jsonp6b"/>
- Utils.invokeJSONPEndpoint("http://localhost:8085/NestedComponent1/JSONPComponent6/HelloWorldService/jsonp6a/jsonp6b/sayHello?name=petra&callback=foo");
- }
-
- @Test
- public void testWS1() throws MalformedURLException, Exception {
- // <tuscany:binding.WS />
- Utils.invokeWSEndpoint("http://localhost:8085/NestedComponent1/WSComponent1/HelloWorldService");
- }
- @Test
- public void testWS2() throws MalformedURLException, Exception {
- // <tuscany:binding.WS name="WS2"/>
- Utils.invokeWSEndpoint("http://localhost:8085/NestedComponent1/WSComponent2/HelloWorldService/ws2");
- }
- @Test
- public void testWS3() throws MalformedURLException, Exception {
- // <tuscany:binding.WS uri="WS3"/>
- Utils.invokeWSEndpoint("http://localhost:8085/NestedComponent1/WSComponent3/HelloWorldService/ws3");
- }
- @Test
- public void testWS4() throws MalformedURLException, Exception {
- // <tuscany:binding.WS uri="/WS4"/>
- Utils.invokeWSEndpoint("http://localhost:8085/ws4");
- }
- @Test
- public void testWS5() throws MalformedURLException, Exception {
- // <tuscany:binding.WS name="WS5a" uri="/WS5b"/>
- Utils.invokeWSEndpoint("http://localhost:8085/ws5b");
- }
- @Test
- public void testWS6() throws Exception {
- // <tuscany:binding.ws name="ws6a" uri="ws6b"/>
- Utils.invokeWSEndpoint("http://localhost:8085/NestedComponent1/WSComponent6/HelloWorldService/ws6a/ws6b");
- }
-
- @BeforeClass
- public static void init() throws Exception {
- JettyServer.portDefault = 8085;
- node = NodeFactory.newInstance().createNode("nested.composite").start();
- }
-
- @AfterClass
- public static void destroy() throws Exception {
- if (node != null) {
- node.stop();
- }
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/endpoints/src/test/java/test/Utils.java b/sca-java-2.x/trunk/itest/endpoints/src/test/java/test/Utils.java deleted file mode 100644 index 5107d8f660..0000000000 --- a/sca-java-2.x/trunk/itest/endpoints/src/test/java/test/Utils.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 test;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.List;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-
-import junit.framework.Assert;
-
-public class Utils {
-
- public static void invokeJSONPEndpoint(String s) throws MalformedURLException, IOException {
- URL url = new URL(s);
- BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
- String response = br.readLine();
- Assert.assertEquals("foo(\"Hello petra\");", response);
- }
-
- public static void invokeWSEndpoint(String endpoint) throws Exception {
- WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
- wsdlReader.setFeature("javax.wsdl.verbose",false);
- wsdlReader.setFeature("javax.wsdl.importDocuments",true);
-
- Definition definition = wsdlReader.readWSDL(endpoint + "?wsdl");
- Assert.assertNotNull(definition);
- Service service = (Service)definition.getServices().values().iterator().next();
- Port port = (Port)service.getPorts().values().iterator().next();
-
- Assert.assertEquals(new URL(endpoint).getPath(), new URL(getEndpoint(port)).getPath());
- }
-
- private static String getEndpoint(Port port) {
- List<?> wsdlPortExtensions = port.getExtensibilityElements();
- for (final Object extension : wsdlPortExtensions) {
- if (extension instanceof SOAPAddress) {
- return ((SOAPAddress) extension).getLocationURI();
- }
- }
- throw new RuntimeException("no SOAPAddress");
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/endpoints/src/test/resources/helloworld.composite b/sca-java-2.x/trunk/itest/endpoints/src/test/resources/helloworld.composite deleted file mode 100644 index 1f56c3d73b..0000000000 --- a/sca-java-2.x/trunk/itest/endpoints/src/test/resources/helloworld.composite +++ /dev/null @@ -1,116 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- targetNamespace="http://itest"
- name="HelloWorldComposite">
-
- <component name="JSONPComponent1">
- <implementation.java class="helloworld.HelloWorldImpl"/>
- <service name="HelloWorldService" >
- <tuscany:binding.jsonp />
- </service>
- </component>
-
- <component name="JSONPComponent2">
- <implementation.java class="helloworld.HelloWorldImpl"/>
- <service name="HelloWorldService" >
- <tuscany:binding.jsonp name="jsonp2"/>
- </service>
- </component>
-
- <component name="JSONPComponent3">
- <implementation.java class="helloworld.HelloWorldImpl"/>
- <service name="HelloWorldService" >
- <tuscany:binding.jsonp uri="jsonp3"/>
- </service>
- </component>
-
- <component name="JSONPComponent4">
- <implementation.java class="helloworld.HelloWorldImpl"/>
- <service name="HelloWorldService" >
- <tuscany:binding.jsonp uri="/jsonp4"/>
- </service>
- </component>
-
- <component name="JSONPComponent5">
- <implementation.java class="helloworld.HelloWorldImpl"/>
- <service name="HelloWorldService" >
- <tuscany:binding.jsonp name="jsonp5a" uri="/jsonp5b"/>
- </service>
- </component>
-
- <component name="JSONPComponent6">
- <implementation.java class="helloworld.HelloWorldImpl"/>
- <service name="HelloWorldService" >
- <tuscany:binding.jsonp name="jsonp6a" uri="jsonp6b"/>
- </service>
- </component>
-
- <component name="RMIComponent6">
- <implementation.java class="helloworld.HelloWorldImpl"/>
- <service name="HelloWorldService" >
- <tuscany:binding.rmi name="rmi6a" uri="rmi6b"/>
- </service>
- </component>
-
- <component name="WSComponent1">
- <implementation.java class="helloworld.HelloWorldImpl"/>
- <service name="HelloWorldService" >
- <binding.ws />
- </service>
- </component>
-
- <component name="WSComponent2">
- <implementation.java class="helloworld.HelloWorldImpl"/>
- <service name="HelloWorldService" >
- <binding.ws name="ws2"/>
- </service>
- </component>
-
- <component name="WSComponent3">
- <implementation.java class="helloworld.HelloWorldImpl"/>
- <service name="HelloWorldService" >
- <binding.ws uri="ws3"/>
- </service>
- </component>
-
- <component name="WSComponent4">
- <implementation.java class="helloworld.HelloWorldImpl"/>
- <service name="HelloWorldService" >
- <binding.ws uri="/ws4"/>
- </service>
- </component>
-
- <component name="WSComponent5">
- <implementation.java class="helloworld.HelloWorldImpl"/>
- <service name="HelloWorldService" >
- <binding.ws name="ws5a" uri="/ws5b"/>
- </service>
- </component>
-
- <component name="WSComponent6">
- <implementation.java class="helloworld.HelloWorldImpl"/>
- <service name="HelloWorldService" >
- <binding.ws name="ws6a" uri="ws6b"/>
- </service>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/endpoints/src/test/resources/nested.composite b/sca-java-2.x/trunk/itest/endpoints/src/test/resources/nested.composite deleted file mode 100644 index 138020eab0..0000000000 --- a/sca-java-2.x/trunk/itest/endpoints/src/test/resources/nested.composite +++ /dev/null @@ -1,30 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- xmlns:itest="http://itest"
- targetNamespace="http://itest"
- name="NestedComposite">
-
- <component name="NestedComponent1">
- <implementation.composite name="itest:HelloWorldComposite"/>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/exceptions/pom.xml b/sca-java-2.x/trunk/itest/exceptions/pom.xml deleted file mode 100644 index 41dd198009..0000000000 --- a/sca-java-2.x/trunk/itest/exceptions/pom.xml +++ /dev/null @@ -1,53 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-exceptions</artifactId> - <name>Apache Tuscany SCA iTest Exceptions</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - </dependencies> -</project> diff --git a/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java b/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java deleted file mode 100644 index 1f57116bac..0000000000 --- a/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java +++ /dev/null @@ -1,57 +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.test.exceptions; - -public class Checked extends Exception { - private static final long serialVersionUID = -129752837478357452L; - - /** - * - */ - public Checked() { - - } - - /** - * @param message - */ - public Checked(String message) { - super(message); - - } - - /** - * @param cause - */ - public Checked(Throwable cause) { - super(cause); - - } - - /** - * @param message - * @param cause - */ - public Checked(String message, Throwable cause) { - super(message, cause); - - } - -} diff --git a/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java b/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java deleted file mode 100644 index 112aefc747..0000000000 --- a/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionHandler.java +++ /dev/null @@ -1,32 +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.test.exceptions; - -public interface ExceptionHandler { - - void testing(); - - Checked getTheBad(); - - String getTheGood(); - - UnChecked getTheUgly(); - -} diff --git a/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java b/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java deleted file mode 100644 index 53a6c70b57..0000000000 --- a/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionRemoteThrower.java +++ /dev/null @@ -1,30 +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.test.exceptions; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * Remote exception thrower - * @version $Rev$ $Date$ - */ -@Remotable -public interface ExceptionRemoteThrower extends ExceptionThrower { -} diff --git a/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java b/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java deleted file mode 100644 index ace219991b..0000000000 --- a/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.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.test.exceptions; - -/** - * Local exception thrower - * @version $Rev$ $Date$ - */ -public interface ExceptionThrower { - Checked BAD = new Checked("theBad"); - UnChecked UGLY = new UnChecked("theUgly"); - String SO_THEY_SAY = "All is good that ends good."; - - String theGood() throws Checked; - - String theBad() throws Checked; - - String theUgly() throws Checked; - -} diff --git a/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java b/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java deleted file mode 100644 index 453528444d..0000000000 --- a/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/UnChecked.java +++ /dev/null @@ -1,57 +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.test.exceptions; - -public class UnChecked extends RuntimeException { - private static final long serialVersionUID = -1318118082838092244L; - - /** - * - */ - public UnChecked() { - - } - - /** - * @param message - */ - public UnChecked(String message) { - super(message); - - } - - /** - * @param cause - */ - public UnChecked(Throwable cause) { - super(cause); - - } - - /** - * @param message - * @param cause - */ - public UnChecked(String message, Throwable cause) { - super(message, cause); - - } - -} diff --git a/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java b/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java deleted file mode 100644 index 26b9f0a383..0000000000 --- a/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java +++ /dev/null @@ -1,115 +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.test.exceptions.impl; - -import org.apache.tuscany.sca.test.exceptions.Checked; -import org.apache.tuscany.sca.test.exceptions.ExceptionHandler; -import org.apache.tuscany.sca.test.exceptions.ExceptionThrower; -import org.apache.tuscany.sca.test.exceptions.UnChecked; -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Scope; - -@Scope("COMPOSITE") -public class ExceptionHandlerImpl implements ExceptionHandler { - static final String INIT = "INIT"; - - private ExceptionThrower exceptionThrower; - - private String theGood; - - private Checked theBad; - - private UnChecked theUgly; - - public void testing() { - - assert exceptionThrower != null : "'exceptionThrower' never wired"; - String result = INIT; - try { - theGood = result = exceptionThrower.theGood(); - assert result == ExceptionThrower.SO_THEY_SAY; - } catch (Throwable e) { - assert result == INIT; - assert false; - e.printStackTrace(); - } - - result = INIT; - try { - result = exceptionThrower.theBad(); - // incredible - assert false : "Expected 'Check' Exception"; - - } catch (Checked e) { - // This is good... - assert result == INIT; - theBad = e; - } catch (Throwable t) { - // This is not so good. - t.printStackTrace(); - assert result == INIT; - assert false : "Got wrong exception '" + t.getClass().getName(); - } - - result = INIT; - try { - result = exceptionThrower.theUgly(); - // incredible - assert false : "Expected 'UnCheck' Exception"; - - } catch (Checked e) { - // This is not so good... - assert false : "Got wrong exception '" + e.getClass().getName(); - assert result == INIT; - } catch (UnChecked e) { - theUgly = e; - - } catch (Throwable t) { - // This is not good. - assert false; - assert result == INIT; - - System.out.println(ExceptionThrower.SO_THEY_SAY + " " + INIT); - } - - } - - @Reference - public void setExceptionThrower(ExceptionThrower exceptionThrower) { - this.exceptionThrower = exceptionThrower; - } - - public String getTheGood() { - return theGood; - } - - public Checked getTheBad() { - return theBad; - } - - public UnChecked getTheUgly() { - return theUgly; - } - - public ExceptionThrower getExceptionThrower() { - return exceptionThrower; - } - -} diff --git a/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java b/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.java deleted file mode 100644 index cd62338841..0000000000 --- a/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionRemoteThrowerImpl.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.test.exceptions.impl; - -import org.apache.tuscany.sca.test.exceptions.Checked; -import org.apache.tuscany.sca.test.exceptions.ExceptionRemoteThrower; -import org.oasisopen.sca.annotation.Service; - -/** - * - * @version $Rev$ $Date$ - */ -@Service(ExceptionRemoteThrower.class) -public class ExceptionRemoteThrowerImpl implements ExceptionRemoteThrower { - public String theBad() throws Checked { - throw BAD; - } - - public String theGood() throws Checked { - return SO_THEY_SAY; - } - - public String theUgly() throws Checked { - throw UGLY; - } - -} diff --git a/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java b/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.java deleted file mode 100644 index 56b9fc6f5b..0000000000 --- a/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionThrowerImpl.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.test.exceptions.impl; - -import org.apache.tuscany.sca.test.exceptions.Checked; -import org.apache.tuscany.sca.test.exceptions.ExceptionThrower; -import org.oasisopen.sca.annotation.Service; - -/** - * - * @version $Rev$ $Date$ - */ -@Service(ExceptionThrower.class) -public class ExceptionThrowerImpl implements ExceptionThrower { - - public String theBad() throws Checked { - throw BAD; - } - - public String theGood() throws Checked { - return SO_THEY_SAY; - } - - public String theUgly() throws Checked { - throw UGLY; - } - -} diff --git a/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java b/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java deleted file mode 100644 index c5b54ff902..0000000000 --- a/sca-java-2.x/trunk/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java +++ /dev/null @@ -1,116 +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.test.exceptions.impl; - -import org.apache.tuscany.sca.test.exceptions.Checked; -import org.apache.tuscany.sca.test.exceptions.ExceptionHandler; -import org.apache.tuscany.sca.test.exceptions.ExceptionRemoteThrower; -import org.apache.tuscany.sca.test.exceptions.ExceptionThrower; -import org.apache.tuscany.sca.test.exceptions.UnChecked; -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Scope; - -@Scope("COMPOSITE") -public class RemoteExceptionHandlerImpl implements ExceptionHandler { - static final String INIT = "INIT"; - - private ExceptionRemoteThrower exceptionThrower; - - private String theGood; - - private Checked theBad; - - private UnChecked theUgly; - - public void testing() { - - assert exceptionThrower != null : "'exceptionThrower' never wired"; - String result = INIT; - try { - theGood = result = exceptionThrower.theGood(); - assert result == ExceptionThrower.SO_THEY_SAY; - } catch (Throwable e) { - assert result == INIT; - assert false; - e.printStackTrace(); - } - - result = INIT; - try { - result = exceptionThrower.theBad(); - // incredible - assert false : "Expected 'Check' Exception"; - - } catch (Checked e) { - // This is good... - assert result == INIT; - theBad = e; - } catch (Throwable t) { - // This is not so good. - t.printStackTrace(); - assert result == INIT; - assert false : "Got wrong exception '" + t.getClass().getName(); - } - - result = INIT; - try { - result = exceptionThrower.theUgly(); - // incredible - assert false : "Expected 'UnCheck' Exception"; - - } catch (Checked e) { - // This is not so good... - assert false : "Got wrong exception '" + e.getClass().getName(); - assert result == INIT; - } catch (UnChecked e) { - theUgly = e; - - } catch (Throwable t) { - // This is not good. - assert false; - assert result == INIT; - - System.out.println(ExceptionThrower.SO_THEY_SAY + " " + INIT); - } - - } - - @Reference - public void setExceptionThrower(ExceptionRemoteThrower exceptionThrower) { - this.exceptionThrower = exceptionThrower; - } - - public String getTheGood() { - return theGood; - } - - public Checked getTheBad() { - return theBad; - } - - public UnChecked getTheUgly() { - return theUgly; - } - - public ExceptionRemoteThrower getExceptionThrower() { - return exceptionThrower; - } - -} diff --git a/sca-java-2.x/trunk/itest/exceptions/src/main/resources/ExceptionTest.composite b/sca-java-2.x/trunk/itest/exceptions/src/main/resources/ExceptionTest.composite deleted file mode 100644 index b8a8b01e8b..0000000000 --- a/sca-java-2.x/trunk/itest/exceptions/src/main/resources/ExceptionTest.composite +++ /dev/null @@ -1,41 +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://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:foo="http://foo" targetNamespace="http://foo" - name="ExceptionTest"> - <component name="main"> - <implementation.java class="org.apache.tuscany.sca.test.exceptions.impl.ExceptionHandlerImpl" /> - <reference name="exceptionThrower" target="exceptionThrower" /> - </component> - - <component name="exceptionThrower"> - <implementation.java class="org.apache.tuscany.sca.test.exceptions.impl.ExceptionThrowerImpl" /> - </component> - - <component name="mainRemote"> - <implementation.java class="org.apache.tuscany.sca.test.exceptions.impl.RemoteExceptionHandlerImpl" /> - <reference name="exceptionThrower" target="exceptionThrowerRemote" /> - </component> - - <component name="exceptionThrowerRemote"> - <implementation.java class="org.apache.tuscany.sca.test.exceptions.impl.ExceptionRemoteThrowerImpl" /> - </component> - - -</composite> diff --git a/sca-java-2.x/trunk/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java b/sca-java-2.x/trunk/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java deleted file mode 100644 index 7794348476..0000000000 --- a/sca-java-2.x/trunk/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.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.test.exceptions; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertSame; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -public class ExceptionsTestCase { - - private static Node node; - - /** - * Test exception handling over a local interface - */ - @Test - public void testLocal() { - ExceptionHandler exceptionHandler = node.getService(ExceptionHandler.class, "main"); - exceptionHandler.testing(); - assertEquals(ExceptionThrower.SO_THEY_SAY, exceptionHandler.getTheGood()); - assertNotNull(exceptionHandler.getTheBad()); - assertEquals(Checked.class, exceptionHandler.getTheBad().getClass()); - assertSame(ExceptionThrower.BAD, exceptionHandler.getTheBad()); - assertNotNull(exceptionHandler.getTheUgly()); - assertEquals(UnChecked.class, exceptionHandler.getTheUgly().getClass()); - assertSame(ExceptionThrower.UGLY, exceptionHandler.getTheUgly()); - } - - /** - * Test exception handling over a remotable interface - */ - @Test - public void testRemote() { - ExceptionHandler exceptionHandler = node.getService(ExceptionHandler.class, "mainRemote"); - exceptionHandler.testing(); - assertEquals(ExceptionThrower.SO_THEY_SAY, exceptionHandler.getTheGood()); - assertNotNull(exceptionHandler.getTheBad()); - assertEquals(Checked.class, exceptionHandler.getTheBad().getClass()); - assertNotSame(ExceptionThrower.BAD, exceptionHandler.getTheBad()); - assertNotNull(exceptionHandler.getTheUgly()); - assertEquals(UnChecked.class, exceptionHandler.getTheUgly().getClass()); - - // [rfeng] We're not in a position to copy non business exceptions - // assertNotSame(ExceptionThrower.UGLY, exceptionHandler.getTheUgly()); - - } - - @BeforeClass - public static void setUp() throws Exception { - String location = ContributionLocationHelper.getContributionLocation("ExceptionTest.composite"); - node = NodeFactory.newInstance().createNode("ExceptionTest.composite", new Contribution("c1", location)); - node.start(); - } - - @AfterClass - public static void tearDown() throws Exception { - node.stop(); - } - -} diff --git a/sca-java-2.x/trunk/itest/implementation-spring/pom.xml b/sca-java-2.x/trunk/itest/implementation-spring/pom.xml deleted file mode 100644 index ac5265d026..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/pom.xml +++ /dev/null @@ -1,92 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-implementation-spring</artifactId> - <name>Apache Tuscany SCA iTest Spring Implementation</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-spring</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-spring-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-jetty</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-policy-security</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <!-- Spring dependencies... --> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - <version>3.0.2.RELEASE</version> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - <version>3.0.2.RELEASE</version> - </dependency> - - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - <version>3.0.2.RELEASE</version> - </dependency> - </dependencies> -</project> diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java deleted file mode 100644 index bd7770ca7d..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteImpl.java +++ /dev/null @@ -1,38 +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 bigbank.stockquote; - -import org.oasisopen.sca.annotation.Service; - -/** - * This class implements the StockQuote service. - */ -@Service(StockQuoteService.class) -public class StockQuoteImpl implements StockQuoteService { - - public double getQuote(String symbol) { - double price = 104.0 + Math.random(); - price = ((int)(price * 100)) / 100.0; - - System.out.println("Getting stock quote for: " + symbol + ", value: "+ price); - - return price; - } - -} diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteService.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteService.java deleted file mode 100644 index 747433a9e7..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/bigbank/stockquote/StockQuoteService.java +++ /dev/null @@ -1,30 +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 bigbank.stockquote; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * This is the business interface of the StockQuote service. - */ -@Remotable -public interface StockQuoteService { - - public double getQuote(String symbol); -} diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/AddService.java deleted file mode 100644 index 188451ebac..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/AddService.java +++ /dev/null @@ -1,28 +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 calculator; - -/** - * The Add service interface - */ -public interface AddService { - - double add(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/AddServiceImpl.java deleted file mode 100644 index eae607a7ca..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/AddServiceImpl.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 calculator; - -import java.util.logging.Level; -import java.util.logging.Logger; - -/** - * An implementation of the Add service - */ -public class AddServiceImpl implements AddService { - - public double add(double n1, double n2) { - Logger logger = Logger.getLogger("calculator"); - logger.log(Level.FINEST, "Adding " + n1 + " and " + n2); - return n1 + n2; - } - -}
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/CalculatorService.java deleted file mode 100644 index ce1cdaae5a..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/CalculatorService.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 calculator; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * The Calculator service interface. - */ -@Remotable -public interface CalculatorService { - - double add(double n1, double n2); - - double subtract(double n1, double n2); - - double multiply(double n1, double n2); - - double divide(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/CalculatorServiceImpl.java deleted file mode 100644 index b033516c1b..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/CalculatorServiceImpl.java +++ /dev/null @@ -1,79 +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 calculator; - -/** - * An implementation of the Calculator service. - */ -public class CalculatorServiceImpl implements CalculatorService { - - private AddService addService; - private SubtractService subtractService; - private MultiplyService multiplyService; - private DivideService divideService; - - public void setAddService(AddService addService) { - this.addService = addService; - } - - public AddService getAddService() { - return addService; - } - - public void setSubtractService(SubtractService subtractService) { - this.subtractService = subtractService; - } - - public SubtractService getSubtractService() { - return subtractService; - } - - public void setDivideService(DivideService divideService) { - this.divideService = divideService; - } - - public DivideService getDivideService() { - return divideService; - } - - public void setMultiplyService(MultiplyService multiplyService) { - this.multiplyService = multiplyService; - } - - public MultiplyService getMultiplyService() { - return multiplyService; - } - - public double add(double n1, double n2) { - return addService.add(n1, n2); - } - - public double subtract(double n1, double n2) { - return subtractService.subtract(n1, n2); - } - - public double multiply(double n1, double n2) { - return multiplyService.multiply(n1, n2); - } - - public double divide(double n1, double n2) { - return divideService.divide(n1, n2); - } - -} diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/DivideService.java deleted file mode 100644 index 30d248208b..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/DivideService.java +++ /dev/null @@ -1,28 +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 calculator; - -/** - * The divide service interface - */ -public interface DivideService { - - double divide(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/DivideServiceImpl.java deleted file mode 100644 index 1323edf55a..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/DivideServiceImpl.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 calculator; - -import java.util.logging.Level; -import java.util.logging.Logger; - -/** - * An implementation of the Divide service. - */ -public class DivideServiceImpl implements DivideService { - - public double divide(double n1, double n2) { - Logger logger = Logger.getLogger("calculator"); - logger.log(Level.FINEST, "Dividing " + n1 + " with " + n2); - return n1 / n2; - } - -} diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/MultiplyService.java deleted file mode 100644 index 5290605938..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/MultiplyService.java +++ /dev/null @@ -1,28 +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 calculator; - -/** - * The interface for the multiply service - */ -public interface MultiplyService { - - double multiply(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/MultiplyServiceImpl.java deleted file mode 100644 index 91b803bc9e..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/MultiplyServiceImpl.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 calculator; - -import java.util.logging.Level; -import java.util.logging.Logger; - -/** - * An implementation of the Multiply service. - */ -public class MultiplyServiceImpl implements MultiplyService { - - public double multiply(double n1, double n2) { - Logger logger = Logger.getLogger("calculator"); - logger.log(Level.FINEST, "Multiplying " + n1 + " with " + n2); - return n1 * n2; - } - -} diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/SubtractService.java deleted file mode 100644 index bf0d1882b6..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/SubtractService.java +++ /dev/null @@ -1,28 +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 calculator; - -/** - * The interface for the multiply service - */ -public interface SubtractService { - - double subtract(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/SubtractServiceImpl.java deleted file mode 100644 index 58cc4a3547..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/SubtractServiceImpl.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 calculator; - -import java.util.logging.Level; -import java.util.logging.Logger; - -/** - * An implementation of the subtract service. - */ -public class SubtractServiceImpl implements SubtractService { - - public double subtract(double n1, double n2) { - Logger logger = Logger.getLogger("calculator"); - logger.log(Level.FINEST, "Subtracting " + n1 + " from " + n2); - return n1 - n2; - } - -} diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/security/CalculatorCallbackHandler.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/security/CalculatorCallbackHandler.java deleted file mode 100644 index 4f063993a3..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/security/CalculatorCallbackHandler.java +++ /dev/null @@ -1,50 +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 calculator.security; - -import java.io.IOException; - -import javax.security.auth.callback.Callback; -import javax.security.auth.callback.CallbackHandler; -import javax.security.auth.callback.NameCallback; -import javax.security.auth.callback.PasswordCallback; -import javax.security.auth.callback.UnsupportedCallbackException; - -/** - * @version $Rev$ $Date$ - */ -public class CalculatorCallbackHandler implements CallbackHandler { - - public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException { - for (int i = 0; i < callbacks.length; i++) { - if (callbacks[i] instanceof NameCallback) { - NameCallback nc = (NameCallback)callbacks[i]; - nc.setName("CalculatorUser"); - } else if (callbacks[i] instanceof PasswordCallback) { - PasswordCallback pc = (PasswordCallback)callbacks[i]; - pc.setPassword("CalculatorUserPasswd".toCharArray()); - } else { - throw new UnsupportedCallbackException - (callbacks[i], "Unsupported Callback!"); - } - } - } - -} diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/security/JaasLoginModule.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/security/JaasLoginModule.java deleted file mode 100644 index b3ef6e7312..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/security/JaasLoginModule.java +++ /dev/null @@ -1,178 +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 calculator.security; - -import java.security.Principal; -import java.util.Map; - -import javax.security.auth.Subject; -import javax.security.auth.callback.Callback; -import javax.security.auth.callback.CallbackHandler; -import javax.security.auth.callback.NameCallback; -import javax.security.auth.callback.PasswordCallback; -import javax.security.auth.login.LoginException; -import javax.security.auth.spi.LoginModule; - -/** - * @version $Rev$ $Date$ - */ -public class JaasLoginModule implements LoginModule { - - private CallbackHandler callbackHandler; - private Subject subject; - private Principal userPrincipal; - private String userId; - private String password; - private boolean succeeded; - private boolean commitSucceeded; - - public void initialize(Subject subject, - CallbackHandler callbackHandler, - Map<String, ?> sharedState, - Map<String, ?> options) { - this.callbackHandler = callbackHandler; - this.subject = subject; - } - - public boolean login() throws LoginException { - Callback[] callbacks = new Callback[2]; - callbacks[0] = new NameCallback("UserId:"); - callbacks[1] = new PasswordCallback("Password:", false); - - try { - callbackHandler.handle(callbacks); - userId = ((NameCallback)callbacks[0]).getName(); - password = new String(((PasswordCallback)callbacks[1]).getPassword()); - - if (userId.equals("CalculatorUser") && password.equals("CalculatorUserPasswd")) { - System.out.println("Successfully AUTHENTICATED!!"); - succeeded = true; - return true; - } else { - System.out.println("Incorrect userId / password! AUTHENTICATION FAILED!!"); - return false; - } - } catch (Exception e) { - e.printStackTrace(); - return false; - } - } - - /** - * <p> This method is called if the LoginContext's - * overall authentication succeeded - * (the relevant REQUIRED, REQUISITE, SUFFICIENT and OPTIONAL LoginModules - * succeeded). - * - * <p> If this LoginModule's own authentication attempt - * succeeded (checked by retrieving the private state saved by the - * <code>login</code> method), then this method associates a - * <code>UserPrincipal</code> - * with the <code>Subject</code> located in the - * <code>LoginModule</code>. If this LoginModule's own - * authentication attempted failed, then this method removes - * any state that was originally saved. - * - * <p> - * - * @exception LoginException if the commit fails. - * - * @return true if this LoginModule's own login and commit - * attempts succeeded, or false otherwise. - */ - public boolean commit() throws LoginException { - if (succeeded == false) { - return false; - } else { - // add a Principal (authenticated identity) to the Subject - - // assume the user we authenticated is the UserPrincipal - userPrincipal = new UserPrincipal(userId); - if (!subject.getPrincipals().contains(userPrincipal)) - subject.getPrincipals().add(userPrincipal); - - // in any case, clean out state - userId = null; - password = null; - commitSucceeded = true; - return true; - } - } - - /** - * <p> This method is called if the LoginContext's - * overall authentication failed. - * (the relevant REQUIRED, REQUISITE, SUFFICIENT and OPTIONAL LoginModules - * did not succeed). - * - * <p> If this LoginModule's own authentication attempt - * succeeded (checked by retrieving the private state saved by the - * <code>login</code> and <code>commit</code> methods), - * then this method cleans up any state that was originally saved. - * - * <p> - * - * @exception LoginException if the abort fails. - * - * @return false if this LoginModule's own login and/or commit attempts - * failed, and true otherwise. - */ - public boolean abort() throws LoginException { - if (succeeded == false) { - return false; - } else if (succeeded == true && commitSucceeded == false) { - // login succeeded but overall authentication failed - succeeded = false; - userId = null; - password = null; - userPrincipal = null; - } else { - // overall authentication succeeded and commit succeeded, - // but someone else's commit failed - logout(); - } - return true; - } - - /** - * Logout the user. - * - * <p> This method removes the <code>SimplePrincipal</code> - * that was added by the <code>commit</code> method. - * - * <p> - * - * @exception LoginException if the logout fails. - * - * @return true in all cases since this <code>LoginModule</code> - * should not be ignored. - */ - public boolean logout() throws LoginException { - subject.getPrincipals().remove(userPrincipal); - succeeded = false; - succeeded = commitSucceeded; - userId = null; - if (password != null) - password = null; - userPrincipal = null; - return true; - } - -} diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/security/UserPrincipal.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/security/UserPrincipal.java deleted file mode 100644 index 595626e672..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/calculator/security/UserPrincipal.java +++ /dev/null @@ -1,66 +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 calculator.security; - -import java.security.Principal; - -/** - * @version $Rev$ $Date$ - */ -public class UserPrincipal implements Principal { - - private final String name; - - public UserPrincipal(String name) { - if (name == null) - throw new IllegalArgumentException("name cannot be null"); - this.name = name; - } - - public String getName() { - return name; - } - - public String toString() { - return name; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((name == null) ? 0 : name.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - final UserPrincipal other = (UserPrincipal)obj; - if (name == null) { - if (other.name != null) - return false; - } else if (!name.equals(other.name)) - return false; - return true; - } -} diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/context/access/SCAApplicationContextProvider.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/context/access/SCAApplicationContextProvider.java deleted file mode 100644 index 968d420fc8..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/context/access/SCAApplicationContextProvider.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 context.access; - -import org.springframework.beans.BeansException; -import org.springframework.context.ApplicationContext; -import org.springframework.context.ApplicationContextAware; - -public class SCAApplicationContextProvider implements ApplicationContextAware { - - private static ApplicationContext ctx; - - public void setApplicationContext(ApplicationContext appContext) throws BeansException { - // Wiring the ApplicationContext into a static method - ctx = appContext; - } - - public static ApplicationContext getApplicationContext() { - return ctx; - } -} diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/helloworld/HelloWorld.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/helloworld/HelloWorld.java deleted file mode 100644 index 8bb3006d12..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/helloworld/HelloWorld.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 helloworld; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * Interface for the "hello world" service - predictably simple with a single operation - * "sayHello" - * - * @version $Rev$ $Date$ - */ -@Remotable -public interface HelloWorld { - - String sayHello(String s); - -} diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/helloworld/HelloWorldImpl.java deleted file mode 100644 index f68134702b..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/helloworld/HelloWorldImpl.java +++ /dev/null @@ -1,38 +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 helloworld; - -/** - * A simple proxy Java class which implements the HelloWorld interface but which uses - * a reference "delegate" to actually provide the HelloWorld service - * - * @version $Rev$ $Date$ - */ -public class HelloWorldImpl implements HelloWorld { - - static String hello = "Hello "; - - public String sayHello(String s) { - // Simply call the reference to satisfy the service request... - System.out.println("HelloWorldImpl - sayHello called"); - return (hello + s); - } - -} diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java deleted file mode 100644 index 78b3649b5b..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java +++ /dev/null @@ -1,42 +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 helloworld; - -import org.oasisopen.sca.annotation.Reference; - -/** - * A simple proxy Java class which implements the HelloWorld interface but which uses - * a reference "delegate" to actually provide the HelloWorld service - * - * @version $Rev$ $Date$ - */ -public class HelloWorldProxy implements HelloWorld { - - // Here is the reference "delegate" - it implements the HelloWorld interface... - @Reference - public HelloWorld delegate; - - public String sayHello(String s) { - // Simply call the reference to satisfy the service request... - System.out.println("HelloWorldProxy - calling sayHello"); - return delegate.sayHello(s); - } - -} diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/mock/TestBean.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/mock/TestBean.java deleted file mode 100644 index 1a0abd7f8f..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/mock/TestBean.java +++ /dev/null @@ -1,31 +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 mock; - -/** - * @version $Rev$ $Date$ - */ -public interface TestBean { - String echo(String msg); - - TestBean getBean(); - - void setBean(TestBean bean); - -} diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/mock/TestBeanImpl.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/mock/TestBeanImpl.java deleted file mode 100644 index e3d9a36bb8..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/mock/TestBeanImpl.java +++ /dev/null @@ -1,42 +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 mock; - -/** - * @version $Rev$ $Date$ - */ -public class TestBeanImpl implements TestBean { - - private TestBean bean; - - public TestBeanImpl() { - } - - public String echo(String msg) { - return msg; - } - - public TestBean getBean() { - return bean; - } - - public void setBean(TestBean bean) { - this.bean = bean; - } -} diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/mock/TestHelloWorldBean.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/mock/TestHelloWorldBean.java deleted file mode 100644 index 47342fded8..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/mock/TestHelloWorldBean.java +++ /dev/null @@ -1,39 +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 mock; - -/** - * A simple test Spring bean which provides the HelloWorld service - * - * @version $Rev$ $Date$ - */ - -import helloworld.HelloWorld; - -public class TestHelloWorldBean implements HelloWorld { - - static String hello = "Hello "; - - // Classic "Hello xxx" response to any input message - public String sayHello(String message) { - System.out.println("TestHelloWorldBean - sayHello called"); - return (hello + message); - } - -} // end class TestHelloWorldBean diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/mock/TestReference.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/mock/TestReference.java deleted file mode 100644 index 6f5b280f31..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/mock/TestReference.java +++ /dev/null @@ -1,27 +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 mock; - -/** - * @version $Rev$ $Date$ - */ -public interface TestReference { - String echo(String msg); -} diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/mock/TestReferenceBean.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/mock/TestReferenceBean.java deleted file mode 100644 index dea7933e1a..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/mock/TestReferenceBean.java +++ /dev/null @@ -1,57 +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 mock; - -/** - * A test Spring bean which provides the HelloWorld service by calling a reference - * to provide the content of the response - * - * @version $Rev$ $Date$ - */ - -import helloworld.HelloWorld; - -public class TestReferenceBean implements HelloWorld { - - // The reference - private HelloWorld bean; - - // Classic "Hello xxx" response to any input message - public String sayHello(String message) { - System.out.println("TestReferenceBean - sayHello called"); - return (bean.sayHello(message)); - } - - /** - * Setter for the bean reference - * @param theBean - */ - public void setBean(HelloWorld theBean) { - this.bean = theBean; - } - - /** - * Getter for the reference - * @return - */ - public HelloWorld getBean() { - return this.bean; - } - -} // end class TestReferenceBean diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/mock/TestSCAPropertyBean.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/mock/TestSCAPropertyBean.java deleted file mode 100644 index b80b05dc08..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/mock/TestSCAPropertyBean.java +++ /dev/null @@ -1,55 +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 mock; - -/** - * A test Spring bean which provides the HelloWorld service. - * This bean has a single String property called "hello" which must be set through - * external configuration to give the correct response message, otherwise an (incorrect) - * default message is generated - * - * @version $Rev$ $Date$ - */ - -import helloworld.HelloWorld; - -public class TestSCAPropertyBean implements HelloWorld { - - private String hello = "Go away"; - - /** - * Provides the operation of the "HelloWorld" interface - a simple string response - * to a string input message, where the response is a greeting followed by the original - * input message. - */ - public String sayHello(String message) { - System.out.println("TestHelloWorldBean - sayHello called"); - return (hello + " " + message); - } - - /** - * Public setter for the (unannotated) field "hello" which constitutes an SCA - * property - * @param message - the message to use for the response to "sayHello" - */ - public void setHello(String message) { - hello = message; - } - -} // end class TestSCAPropertyBean diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/spring/annotations/CalculatorServiceImpl.java b/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/spring/annotations/CalculatorServiceImpl.java deleted file mode 100644 index 544b39ad58..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/spring/annotations/CalculatorServiceImpl.java +++ /dev/null @@ -1,131 +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 spring.annotations; - -import org.oasisopen.sca.annotation.ComponentName; -import org.oasisopen.sca.annotation.Destroy; -import org.oasisopen.sca.annotation.Init; -import org.oasisopen.sca.annotation.Property; -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Service; - -import calculator.AddService; -import calculator.CalculatorService; -import calculator.DivideService; -import calculator.MultiplyService; -import calculator.SubtractService; - -/** - * An implementation of the Calculator service. - */ -@Service(CalculatorService.class) -public class CalculatorServiceImpl implements AddService, SubtractService, MultiplyService, DivideService { - - public AddService addService; // setter injection - - @Reference - public SubtractService subtractService; // field injection - - @Reference(name="multiplyService", required=false) - public MultiplyService multiply; // field injection (different reference and field name) - - public DivideService divide; // setter injection (different reference and field name) - - public String message; // setter injection - - @Property(name="message", required=false) - public String message2; // field injection - - public String componentName; - - @Init - public void initMethod () { - System.out.println("Init method is sucessfully called....."); - // Property value should be null here. - System.out.println("Property Value message is...." + message); - } - - @Destroy - public void destroyMethod () { - System.out.println("Component Name is...." + componentName); - System.out.println("Property Value message is...." + message); - System.out.println("Property Value message2 is...." + message2); - System.out.println("Destroy method is sucessfully called....."); - } - - @Reference - public void setAddService(AddService addService) { - this.addService = addService; - } - - public AddService getAddService() { - return addService; - } - - /*public void setSubtractService(SubtractService subtractService) { - this.subtractService = subtractService; - } - - public SubtractService getSubtractService() { - return subtractService; - }*/ - - @Reference(name="divideService", required=false) - public void setDivideService(DivideService divide) { - this.divide = divide; - } - - public DivideService getDivideService() { - return divide; - } - - /*public void setMultiplyService(MultiplyService multiplyService) { - this.multiplyService = multiplyService; - } - - public MultiplyService getMultiplyService() { - return multiplyService; - }*/ - - @ComponentName - public void setComponentName(String componentName) { - this.componentName = componentName; - } - - @Property - public void setMessage(String message) { - this.message = message; - } - - public double add(double n1, double n2) { - return addService.add(n1, n2); - } - - public double subtract(double n1, double n2) { - return subtractService.subtract(n1, n2); - } - - public double multiply(double n1, double n2) { - return multiply.multiply(n1, n2); - } - - public double divide(double n1, double n2) { - return divide.divide(n1, n2); - } -} diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/access/CalculatorService-context.xml b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/access/CalculatorService-context.xml deleted file mode 100644 index 81d59432b8..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/access/CalculatorService-context.xml +++ /dev/null @@ -1,45 +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. ---> -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:sca="http://www.springframework.org/schema/sca" - xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd"> - - <sca:service name="CalculatorService" - type="calculator.CalculatorService" target="CalculatorServiceBean"/> - - <bean id="CalculatorServiceBean" class="calculator.CalculatorServiceImpl"> - <property name="addService" ref="addService"/> - <property name="subtractService" ref="subtractService"/> - <property name="multiplyService" ref="multiplyService"/> - <property name="divideService" ref="divideService"/> - </bean> - - <bean id="contextAccess" class="context.access.SCAApplicationContextProvider"> - </bean> - - <sca:reference name="addService" type="calculator.AddService"/> - <sca:reference name="subtractService" type="calculator.SubtractService"/> - <sca:reference name="multiplyService" type="calculator.MultiplyService"/> - <sca:reference name="divideService" type="calculator.DivideService"/> - -</beans>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite deleted file mode 100644 index f5514bad0a..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/access/ContextAccess.composite +++ /dev/null @@ -1,49 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://contextaccess" - xmlns:sample="http://contextaccess" - name="ContextAccess" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"> - - <component name="CalculatorServiceComponent"> - <implementation.spring location="CalculatorService-context.xml"/> - <reference name="addService" target="AddServiceComponent" /> - <reference name="subtractService" target="SubtractServiceComponent" /> - <reference name="multiplyService" target="MultiplyServiceComponent" /> - <reference name="divideService" target="DivideServiceComponent" /> - </component> - - <component name="AddServiceComponent"> - <implementation.java class="calculator.AddServiceImpl"/> - </component> - - <component name="SubtractServiceComponent"> - <implementation.java class="calculator.SubtractServiceImpl"/> - </component> - - <component name="MultiplyServiceComponent"> - <implementation.java class="calculator.MultiplyServiceImpl"/> - </component> - - <component name="DivideServiceComponent"> - <implementation.java class="calculator.DivideServiceImpl"/> - </component> -</composite> diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite deleted file mode 100644 index 27df510da8..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/imports/ContextImports.composite +++ /dev/null @@ -1,49 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://contextimports" - xmlns:sample="http://contextimports" - name="ContextImports" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"> - - <component name="CalculatorServiceComponent"> - <implementation.spring location="META-INF/spring/SpringImport-context.xml"/> - <reference name="addService" target="AddServiceComponent" /> - <reference name="subtractService" target="SubtractServiceComponent" /> - <reference name="multiplyService" target="MultiplyServiceComponent" /> - <reference name="divideService" target="DivideServiceComponent" /> - </component> - - <component name="AddServiceComponent"> - <implementation.java class="calculator.AddServiceImpl"/> - </component> - - <component name="SubtractServiceComponent"> - <implementation.java class="calculator.SubtractServiceImpl"/> - </component> - - <component name="MultiplyServiceComponent"> - <implementation.java class="calculator.MultiplyServiceImpl"/> - </component> - - <component name="DivideServiceComponent"> - <implementation.java class="calculator.DivideServiceImpl"/> - </component> -</composite> diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml deleted file mode 100644 index c50f0ef4d9..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml +++ /dev/null @@ -1,39 +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. ---> -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:sca="http://www.springframework.org/schema/sca" - xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd"> - - <bean id="CalculatorServiceBean" class="calculator.CalculatorServiceImpl"> - <property name="addService" ref="addService"/> - <property name="subtractService" ref="subtractService"/> - <property name="multiplyService" ref="multiplyService"/> - <property name="divideService" ref="divideService"/> - </bean> - - <sca:reference name="addService" type="calculator.AddService"/> - <sca:reference name="subtractService" type="calculator.SubtractService"/> - <sca:reference name="multiplyService" type="calculator.MultiplyService"/> - <sca:reference name="divideService" type="calculator.DivideService"/> - -</beans> diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml deleted file mode 100644 index a0bb10e8dd..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml +++ /dev/null @@ -1,29 +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. ---> -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:sca="http://www.springframework.org/schema/sca" - xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd"> - - <import resource="CalculatorService-context.xml"/> - -</beans>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite deleted file mode 100644 index 5973484f6e..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/multiple/MultipleContext.composite +++ /dev/null @@ -1,30 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://stockquote" - xmlns:hw="http://stockquote" - name="MultipleContext"> - - <component name="StockQuoteServiceComponent"> - <implementation.spring location="springapp"/> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/MANIFEST.MF deleted file mode 100644 index 9267f28e83..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0
-Spring-Context: META-INF/spring/beanRefContext.xml; META-INF/spring/StockQuoteService-context.xml
-
diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/SpringHelloWorld-context.xml b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/SpringHelloWorld-context.xml deleted file mode 100644 index 62e4e077b6..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/SpringHelloWorld-context.xml +++ /dev/null @@ -1,31 +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. ---> -<!-- Application context for the SpringHelloWorld testcase --> -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:sca="http://www.springframework.org/schema/sca" - xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd -http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd"> - - <bean id="testBean" class="org.apache.tuscany.sca.itest.spring.TestHelloWorldBean" lazy-init="true"> - </bean> - -</beans>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/StockQuoteService-context.xml b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/StockQuoteService-context.xml deleted file mode 100644 index 5b1885d6b3..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/StockQuoteService-context.xml +++ /dev/null @@ -1,36 +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. ---> -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:sca="http://www.springframework.org/schema/sca" - xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd"> - - <sca:service name="StockQuoteService" - type="bigbank.stockquote.StockQuoteService" target="StockQuoteServiceBean"/> - - <bean id="StockQuoteServiceBean" class="bigbank.stockquote.StockQuoteImpl"> - </bean> - - <bean id="applicationContextProvider" class="context.access.SCAApplicationContextProvider"> - </bean> - -</beans>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/beanRefContext.xml b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/beanRefContext.xml deleted file mode 100644 index dcc88f6770..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/context/multiple/springapp/META-INF/spring/beanRefContext.xml +++ /dev/null @@ -1,34 +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. ---> -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:sca="http://www.springframework.org/schema/sca" - xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd"> - - <bean id="beanRefFactory" class="org.springframework.context.support.ClassPathXmlApplicationContext"> - <constructor-arg> - <list> - <value>context/multiple/springapp/META-INF/spring/SpringHelloWorld-context.xml</value> - </list> - </constructor-arg> - </bean> -</beans>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config deleted file mode 100644 index 0e7cb86633..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorJass.config +++ /dev/null @@ -1,3 +0,0 @@ -Calculator {
- calculator.security.JaasLoginModule required debug=true;
-};
diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties deleted file mode 100644 index 0238f0b013..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/CalculatorLogMessages.properties +++ /dev/null @@ -1,18 +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. -CALLING_OPERATION=Inovoking operation {0} with arguments {1} -OPERATION_RETURNED=Returning from operation {0} with return value {1}
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite deleted file mode 100644 index 5ffeda11df..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/ImplementationPolicies.composite +++ /dev/null @@ -1,58 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://sample" - xmlns:sample="http://sample" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" - name="Calculator"> - - <component name="CalculatorServiceComponent"> - <implementation.spring location="META-INF/spring/CalculatorService-context.xml"/> - <reference name="addService" target="AddServiceComponent" /> - <reference name="subtractService" target="SubtractServiceComponent" /> - <reference name="multiplyService" target="MultiplyServiceComponent" policySets="tuscany:JaasPolicy"/> - <reference name="divideService" target="DivideServiceComponent" /> - </component> - - <component name="AddServiceComponent"> - <implementation.java class="calculator.AddServiceImpl"/> - </component> - - <component name="SubtractServiceComponent"> - <implementation.java class="calculator.SubtractServiceImpl"/> - </component> - - <component name="MultiplyServiceComponent" policySets="tuscany:JaasPolicy"> - <implementation.java class="calculator.MultiplyServiceImpl" /> - </component> - - <component name="DivideServiceComponent"> - <implementation.java class="calculator.DivideServiceImpl"/> - </component> - - <component name="AnotherCalculatorServiceComponent"> - <implementation.spring location="META-INF/spring/CalculatorService-context.xml" requires="tuscany:logging"/> - <reference name="addService" target="AddServiceComponent" /> - <reference name="subtractService" target="SubtractServiceComponent" /> - <reference name="multiplyService" target="MultiplyServiceComponent" policySets="tuscany:JaasPolicy"/> - <reference name="divideService" target="DivideServiceComponent" /> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/definitions.xml b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/definitions.xml deleted file mode 100644 index efc2464425..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/definitions.xml +++ /dev/null @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?> -<!-- - * 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. ---> -<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1" - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" - xmlns:calc="http://calculator"> - - <intent name="logging" constrains="sca:implementation" intentType="implementation"/> - - <!-- PolicySets --> - <policySet name="JaasPolicy" provides="tuscany:jaasAuthentication" appliesTo="//sca:binding"> -<!-- empty policy set so that intents are resolved and match works but without including - any actual policy runtime artifacts - <tuscany:jaasAuthentication> - <tuscany:configurationName>Calculator</tuscany:configurationName> - <tuscany:callbackHandler>calculator.security.CalculatorCallbackHandler</tuscany:callbackHandler> - </tuscany:jaasAuthentication> ---> - </policySet> - - - <!-- PolicySets --> - - <policySet name="JDKLoggingPolicy" - provides="tuscany:logging" - appliesTo="//sca:implementation.spring" - attachTo="//sca:implementation.spring"> -<!-- empty policy set so that intents are resolved and match works but without including - any actual policy runtime artifacts - <tuscany:jdkLogger name="calculator"> - <logLevel>FINER</logLevel> - </tuscany:jdkLogger> ---> - </policySet> - -</definitions>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml deleted file mode 100644 index c50f0ef4d9..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml +++ /dev/null @@ -1,39 +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. ---> -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:sca="http://www.springframework.org/schema/sca" - xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd"> - - <bean id="CalculatorServiceBean" class="calculator.CalculatorServiceImpl"> - <property name="addService" ref="addService"/> - <property name="subtractService" ref="subtractService"/> - <property name="multiplyService" ref="multiplyService"/> - <property name="divideService" ref="divideService"/> - </bean> - - <sca:reference name="addService" type="calculator.AddService"/> - <sca:reference name="subtractService" type="calculator.SubtractService"/> - <sca:reference name="multiplyService" type="calculator.MultiplyService"/> - <sca:reference name="divideService" type="calculator.DivideService"/> - -</beans> diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite deleted file mode 100644 index e889d84544..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite +++ /dev/null @@ -1,40 +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 for the SpringSCAPropertyTestCase - * This composite has the HelloWorldComponent implemented with a Spring implementation where - * the Spring application context uses an explicit SCA property. The value of the property - * is set in this composite and is used to compute the response to a service invocation from - * the ClientComponent. - --> -<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://SpringFolderLocation" - name="SpringFolderLocation"> - - <component name="ClientComponent"> - <implementation.java class="helloworld.HelloWorldProxy"/> - <reference name="delegate" target="HelloWorldComponent"/> - </component> - - <component name="HelloWorldComponent"> - <implementation.spring location="springapp"/> - <property name="TestProperty">Hello</property> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF deleted file mode 100644 index 950dbeba4c..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0
-Spring-Context: META-INF/spring/SpringSCAProperty-context.xml
-
diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml deleted file mode 100644 index 8613e6c82a..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml +++ /dev/null @@ -1,34 +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. ---> -<!-- Application context for the SpringHelloWorld testcase --> -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:sca="http://www.springframework.org/schema/sca" - xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd -http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd"> - - <bean id="testBean" class="mock.TestSCAPropertyBean" lazy-init="true"> - <property name="hello" ref="TestProperty"/> - </bean> - - <sca:property id="foo" name="TestProperty" type="java.lang.String"/> - -</beans>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite deleted file mode 100644 index b7281272da..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite +++ /dev/null @@ -1,40 +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 for the SpringSCAPropertyTestCase - * This composite has the HelloWorldComponent implemented with a Spring implementation where - * the Spring application context uses an explicit SCA property. The value of the property - * is set in this composite and is used to compute the response to a service invocation from - * the ClientComponent. - --> -<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://SpringJarLocation" - name="SpringJarLocation"> - - <component name="ClientComponent"> - <implementation.java class="helloworld.HelloWorldProxy"/> - <reference name="delegate" target="HelloWorldComponent"/> - </component> - - <component name="HelloWorldComponent"> - <implementation.spring location="spring-context.jar"/> - <property name="TestProperty">Hello</property> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/location/jar/spring-context.jar b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/location/jar/spring-context.jar Binary files differdeleted file mode 100644 index 504d59e5ff..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/location/jar/spring-context.jar +++ /dev/null diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml deleted file mode 100644 index 9912624870..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml +++ /dev/null @@ -1,39 +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. ---> -<!-- Application context for the SpringHelloWorld testcase --> -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:sca="http://www.springframework.org/schema/sca" - xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd -http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd"> - - <sca:service name="HelloWorld" type="helloworld.HelloWorld" target="testBean"/> - - <bean id="delegateBean" - class="org.apache.tuscany.sca.itest.spring.TestHelloWorldBean" lazy-init="true"> - </bean> - - <bean id="testBean" - class="org.apache.tuscany.sca.itest.spring.TestHelloWorldDelegatorBean" lazy-init="true"> - <property name="delegate"><ref bean="delegateBean"/></property> - </bean> - -</beans>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml deleted file mode 100644 index 62e4e077b6..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml +++ /dev/null @@ -1,31 +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. ---> -<!-- Application context for the SpringHelloWorld testcase --> -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:sca="http://www.springframework.org/schema/sca" - xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd -http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd"> - - <bean id="testBean" class="org.apache.tuscany.sca.itest.spring.TestHelloWorldBean" lazy-init="true"> - </bean> - -</beans>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite deleted file mode 100644 index e9f8bb888b..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite +++ /dev/null @@ -1,33 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://SpringDelegationHelloWorld" - name="SpringDelegationHelloWorld"> - - <component name="ClientComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.spring.HelloWorldProxy"/> - <reference name="delegate" target="HelloWorldComponent"/> - </component> - - <component name="HelloWorldComponent"> - <implementation.spring location="META-INF/spring/SpringDelegationHelloWorld-context.xml"/> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite deleted file mode 100644 index 30719684a9..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite +++ /dev/null @@ -1,33 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="SpringHelloWorld" - name="SpringHelloWorld"> - - <component name="ClientComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.spring.HelloWorldProxy"/> - <reference name="delegate" target="HelloWorldComponent"/> - </component> - - <component name="HelloWorldComponent"> - <implementation.spring location="META-INF/spring/SpringHelloWorld-context.xml"/> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml deleted file mode 100644 index 1705164104..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml +++ /dev/null @@ -1,33 +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. ---> -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:sca="http://www.springframework.org/schema/sca" - xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd -http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd"> - - <bean id="testBean" class="mock.TestReferenceBean"> - <property name="bean" ref="testReference"/> - </bean> - - <sca:reference name="testReference" type="helloworld.HelloWorld"/> - -</beans> diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml deleted file mode 100644 index 539dfa6e32..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml +++ /dev/null @@ -1,34 +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. ---> -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:sca="http://www.springframework.org/schema/sca" - xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd -http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd"> - - <bean id="testBean" class="mock.TestReferenceBean"> - <!-- Here is the implicit reference - a property with a ref not satisifed within the - * Spring application context. - --> - <property name="bean" ref="testReference"/> - </bean> - -</beans> diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite deleted file mode 100644 index fcbafad27d..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite +++ /dev/null @@ -1,33 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://SpringExplicitReference" - name="SpringExplicitReference"> - - <component name="ClientComponent"> - <implementation.spring location="META-INF/spring/SpringExplicitReference-context.xml"/> - <reference name="testReference" target="ExplicitReferenceComponent"/> - </component> - - <component name="ExplicitReferenceComponent"> - <implementation.java class="helloworld.HelloWorldImpl"/> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite deleted file mode 100644 index 4204b75b48..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite +++ /dev/null @@ -1,40 +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 for the SpringImplicitReferenceTestCase - * This composite has a ClientComponent implemented with a Spring implementation where - * Spring application context uses an implicit reference definition through a Bean with - * a property with an unsatisfied ref attribute, which forms the reference. - * The reference is satisified by a wire to a ReferenceComponent which is implemented - * by a plain Java POJO. ---> -<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://SpringImplicitReference" - name="SpringImplicitReference"> - - <component name="ClientComponent"> - <implementation.spring location="META-INF/spring/SpringImplicitReference-context.xml"/> - <reference name="testReference" target="ImplicitReferenceComponent"/> - </component> - - <component name="ImplicitReferenceComponent"> - <implementation.java class="helloworld.HelloWorldImpl"/> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml deleted file mode 100644 index 5fe57ed733..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml +++ /dev/null @@ -1,41 +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. ---> -<!-- Application context for the SpringExplicitHelloWorld testcase -In this case, the service offered by the Spring application is specified -explicitly using an sca:service element --> -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:sca="http://www.springframework.org/schema/sca" - xmlns:spec="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd -http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd"> - - <sca:service name="fooService" - type="helloworld.HelloWorld" - target="testBean"/> - <!-- requires="spec:serverAuthentication" --> - - <bean id="testBean" - class="mock.TestHelloWorldBean" - lazy-init="true"> - </bean> - -</beans>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml deleted file mode 100644 index 83558e8abc..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml +++ /dev/null @@ -1,31 +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. ---> -<!-- Application context for the SpringHelloWorld testcase --> -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:sca="http://www.springframework.org/schema/sca" - xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd -http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd"> - - <bean id="testBean" class="mock.TestHelloWorldBean" lazy-init="true"> - </bean> - -</beans>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite deleted file mode 100644 index c9bb5b9e3e..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite +++ /dev/null @@ -1,34 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" - targetNamespace="http://SpringExplicitService" - name="SpringExplicitService"> - - <component name="ClientComponent"> - <implementation.java class="helloworld.HelloWorldProxy"/> - <reference name="delegate" target="ExplicitServiceComponent"/> - </component> - - <component name="ExplicitServiceComponent"> - <implementation.spring location="META-INF/spring/SpringExplicitService-context.xml"/> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite deleted file mode 100644 index 856b41f897..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite +++ /dev/null @@ -1,33 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://SpringImplicitService" - name="SpringImplicitService"> - - <component name="ClientComponent"> - <implementation.java class="helloworld.HelloWorldProxy"/> - <reference name="delegate" target="ImplicitServiceComponent"/> - </component> - - <component name="ImplicitServiceComponent"> - <implementation.spring location="META-INF/spring/SpringImplicitService-context.xml"/> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite deleted file mode 100644 index b59114bd31..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/spring/annotations/Calculator.composite +++ /dev/null @@ -1,60 +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 targetNamespace="http://sample" - xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sample="http://sample" - name="Calculator" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"> - - <component name="CalculatorServiceComponent"> - <implementation.spring location="CalculatorService-context.xml"/> - <property name="message">HelloWorld</property> - <reference name="addService" target="AddServiceComponent" /> - <reference name="subtractService" target="SubtractServiceComponent" /> - <reference name="multiplyService" target="MultiplyServiceComponent" /> - <reference name="divideService" target="DivideServiceComponent" /> - </component> - - <component name="AddServiceComponent"> - <implementation.java class="calculator.AddServiceImpl"/> - </component> - - <component name="SubtractServiceComponent"> - <implementation.java class="calculator.SubtractServiceImpl"/> - </component> - - <component name="MultiplyServiceComponent"> - <implementation.java class="calculator.MultiplyServiceImpl"/> - </component> - - <component name="DivideServiceComponent"> - <implementation.java class="calculator.DivideServiceImpl"/> - </component> - - <!--<component name="AnotherCalculatorServiceComponent"> - <implementation.spring location="CalculatorService-context.xml"/> - <property name="message">HelloWorld</property> - <reference name="addService" target="AddServiceComponent" /> - <reference name="subtractService" target="SubtractServiceComponent" /> - <reference name="multiplyService" target="MultiplyServiceComponent" /> - <reference name="divideService" target="DivideServiceComponent" /> - </component> - ---></composite> diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/spring/annotations/CalculatorService-context.xml b/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/spring/annotations/CalculatorService-context.xml deleted file mode 100644 index 4a873f2424..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/main/resources/spring/annotations/CalculatorService-context.xml +++ /dev/null @@ -1,41 +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. ---> -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:sca="http://www.springframework.org/schema/sca" - xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd"> - - <bean id="CalculatorServiceBean" class="spring.annotations.CalculatorServiceImpl"> - <property name="addService" ref="addService"/> - <!-- <property name="subtractService" ref="subtractService"/> - <property name="multiplyService" ref="multiplyService"/> --> - <property name="divideService" ref="divideService"/> - </bean> - - <sca:reference name="addService" type="calculator.AddService"/> - <sca:reference name="subtractService" type="calculator.SubtractService"/> - <sca:reference name="multiplyService" type="calculator.MultiplyService"/> - <sca:reference name="divideService" type="calculator.DivideService"/> - - <sca:property id="msg" name="message" type="java.lang.String"/> - -</beans> diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/access/CalculatorClient.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/access/CalculatorClient.java deleted file mode 100644 index a346e290b9..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/access/CalculatorClient.java +++ /dev/null @@ -1,59 +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 context.access; - -import java.io.File; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.springframework.context.ApplicationContext; - -import calculator.CalculatorService; - -/** - * This client program shows how to create an SCA runtime, start it, - * and locate and invoke a SCA component - */ -public class CalculatorClient { - public static void main(String[] args) throws Exception { - - NodeFactory factory = NodeFactory.newInstance(); - Node node = factory.createNode(new File("src/main/resources/context/access/ContextAccess.composite").toURI().toURL().toString(), - new Contribution("TestContribution", new File("src/main/resources/context/access/").toURI().toURL().toString())); - node.start(); - - // Code: To access the Spring Application Context instance - ApplicationContext ctx = SCAApplicationContextProvider.getApplicationContext(); - if (ctx.containsBean("CalculatorServiceBean")) - System.out.println("CalculatorServiceBean is now available for use..."); - - CalculatorService calculatorService = - node.getService(CalculatorService.class, "CalculatorServiceComponent"); - - System.out.println("3 + 2=" + calculatorService.add(3, 2)); - System.out.println("3 - 2=" + calculatorService.subtract(3, 2)); - System.out.println("3 * 2=" + calculatorService.multiply(3, 2)); - System.out.println("3 / 2=" + calculatorService.divide(3, 2)); - - node.stop(); - } - -} diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/access/ContextAccessTestCase.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/access/ContextAccessTestCase.java deleted file mode 100644 index 2602839d1d..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/access/ContextAccessTestCase.java +++ /dev/null @@ -1,32 +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 context.access; - -import junit.framework.TestCase; - -/** - * Tests out the big bank service - * - */ -public class ContextAccessTestCase extends TestCase { - - public void testServer() throws Exception { - CalculatorClient.main(new String[] {""}); - } -} diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/imports/CalculatorClient.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/imports/CalculatorClient.java deleted file mode 100644 index c029b06a8c..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/imports/CalculatorClient.java +++ /dev/null @@ -1,53 +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 context.imports; - -import java.io.File; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; - -import calculator.CalculatorService; - -/** - * This client program shows how to create an SCA runtime, start it, - * and locate and invoke a SCA component - */ -public class CalculatorClient { - public static void main(String[] args) throws Exception { - - NodeFactory factory = NodeFactory.newInstance(); - Node node = factory.createNode(new File("src/main/resources/context/imports/ContextImports.composite").toURI().toURL().toString(), - new Contribution("TestContribution", new File("src/main/resources/context/imports/").toURI().toURL().toString())); - node.start(); - - CalculatorService calculatorService = - node.getService(CalculatorService.class, "CalculatorServiceComponent"); - - System.out.println("3 + 2=" + calculatorService.add(3, 2)); - System.out.println("3 - 2=" + calculatorService.subtract(3, 2)); - System.out.println("3 * 2=" + calculatorService.multiply(3, 2)); - System.out.println("3 / 2=" + calculatorService.divide(3, 2)); - - node.stop(); - } - -} diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/imports/ContextImportsTestCase.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/imports/ContextImportsTestCase.java deleted file mode 100644 index 8df60c5bab..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/imports/ContextImportsTestCase.java +++ /dev/null @@ -1,32 +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 context.imports; - -import junit.framework.TestCase; - -/** - * Tests out the big bank service - * - */ -public class ContextImportsTestCase extends TestCase { - - public void testServer() throws Exception { - CalculatorClient.main(new String[] {""}); - } -} diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/multiple/MultipleContextTestCase.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/multiple/MultipleContextTestCase.java deleted file mode 100644 index f5261c85bb..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/multiple/MultipleContextTestCase.java +++ /dev/null @@ -1,32 +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 context.multiple; - -import junit.framework.TestCase; - -/** - * Tests out the big bank service - * - */ -public class MultipleContextTestCase extends TestCase { - - public void testServer() throws Exception { - StockQuoteServer.main(new String[] {"1000"}); - } -} diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java deleted file mode 100644 index 83875e0b0a..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java +++ /dev/null @@ -1,54 +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 context.multiple; - -import java.io.File; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.springframework.context.ApplicationContext; - -import context.access.SCAApplicationContextProvider; - -/** - * This server program shows how to bootstrap SCA from a simple J2SE program - * and start it which activates the StockQuote Web service endpoint. - */ -public class StockQuoteServer { - - public static void main(String[] args) throws Exception { - - NodeFactory factory = NodeFactory.newInstance(); - Node node = factory.createNode(new File("src/main/resources/context/multiple/MultipleContext.composite").toURI().toURL().toString(), - new Contribution("TestContribution", new File("src/main/resources/context/multiple/").toURI().toURL().toString())); - node.start(); - - // Method 1: To access the Spring Application Context instance - ApplicationContext ctx = SCAApplicationContextProvider.getApplicationContext(); - if (ctx.containsBean("StockQuoteServiceBean")) - System.out.println("StockQuoteServiceBean is now available for use..."); - - System.out.println("Press Enter to Exit..."); - Thread.sleep(1000); - - node.stop(); - System.out.println("Bye"); - } -} diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java deleted file mode 100644 index 19892597c1..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java +++ /dev/null @@ -1,77 +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 implementation.policies; - -import java.io.File; - -import javax.security.auth.login.Configuration; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; - -import calculator.CalculatorService; - - -/** - * This client program shows how to create an SCA runtime, start it, - * and locate and invoke a SCA component - */ -public class CalculatorClient { - public static void main(String[] args) throws Exception { - try { - Configuration secConf = Configuration.getConfiguration(); - } catch (java.lang.SecurityException e) { - System.setProperty("java.security.auth.login.config", CalculatorClient.class.getClassLoader() - .getResource("implementation/policies/CalculatorJass.config").toString()); - } - - NodeFactory factory = NodeFactory.newInstance(); - Node node = factory.createNode(new File("src/main/resources/implementation/policies/ImplementationPolicies.composite").toURI().toURL().toString(), - new Contribution("TestContribution", new File("src/main/resources/implementation/policies/").toURI().toURL().toString())); - node.start(); - - CalculatorService calculatorService = - node.getService(CalculatorService.class, "CalculatorServiceComponent"); - - // Calculate - System.out.println("Calling CalculatorServiceComponent configured with 'logging' " + - "policy for subtract and divide operations..."); - System.out.println("3 + 2=" + calculatorService.add(3, 2)); - System.out.println("3 - 2=" + calculatorService.subtract(3, 2)); - System.out.println("3 * 2=" + calculatorService.multiply(3, 2)); - System.out.println("3 / 2=" + calculatorService.divide(3, 2)); - - calculatorService = - node.getService(CalculatorService.class, "AnotherCalculatorServiceComponent"); - - // Calculate - System.out.println("Calling CalculatorServiceComponent configured with 'logging' " + - "for all operations in the implementation..."); - System.out.println("3 + 2=" + calculatorService.add(3, 2)); - System.out.println("3 - 2=" + calculatorService.subtract(3, 2)); - System.out.println("3 * 2=" + calculatorService.multiply(3, 2)); - System.out.println("3 / 2=" + calculatorService.divide(3, 2)); - - node.stop(); - System.out.println("Bye"); - } - -} diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java deleted file mode 100644 index a44ae38d24..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/implementation/policies/ImplementationPoliciesTestCase.java +++ /dev/null @@ -1,32 +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 implementation.policies; - -import junit.framework.TestCase; - -/** - * Tests out the big bank service - * - */ -public class ImplementationPoliciesTestCase extends TestCase { - - public void testServer() throws Exception { - CalculatorClient.main(new String[] {""}); - } -} diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/location/folder/SpringFolderLocationTestCase.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/location/folder/SpringFolderLocationTestCase.java deleted file mode 100644 index d54f0544d8..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/location/folder/SpringFolderLocationTestCase.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 location.folder; - -import org.apache.tuscany.sca.itest.spring.AbstractHelloWorldTestCase; - -/** - * A test case designed to test the implementation of Properties from a Spring application - * context, where the properties are explicit, through the presence of an sca:property - * element within the Spring application context - * - * The artifacts involved in this test are: - * - * 1) A composite containing a component with a Spring implementation - * 2) The <implementation.spring.../> element references an application context that - * uses an explicit sca:property element which is used to compute the response to an invocation - * of the service of the implementation - * - * @version $Rev$ $Date$ - */ -public class SpringFolderLocationTestCase extends AbstractHelloWorldTestCase { - // super class does it all getting composite based on this class name - - public SpringFolderLocationTestCase() { - super("SpringFolderLocation.composite", "location/folder/"); - } -} - diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/location/jar/SpringJarLocationTestCase.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/location/jar/SpringJarLocationTestCase.java deleted file mode 100644 index 71768f5a7b..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/location/jar/SpringJarLocationTestCase.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 location.jar; - -import org.apache.tuscany.sca.itest.spring.AbstractHelloWorldTestCase; - -/** - * A test case designed to test the implementation of Properties from a Spring application - * context, where the properties are explicit, through the presence of an sca:property - * element within the Spring application context - * - * The artifacts involved in this test are: - * - * 1) A composite containing a component with a Spring implementation - * 2) The <implementation.spring.../> element references an application context that - * uses an explicit sca:property element which is used to compute the response to an invocation - * of the service of the implementation - * - * @version $Rev$ $Date$ - */ -public class SpringJarLocationTestCase extends AbstractHelloWorldTestCase { - // super class does it all getting composite based on this class name - - public SpringJarLocationTestCase() { - super("SpringJarLocation.composite", "location/jar/"); - } -} - diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java deleted file mode 100644 index 0c6f8d2e84..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.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.itest.spring; - - -/** - * Basic "hello world" style test case for testing Spring component implementation - * - */ -public abstract class AbstractHelloWorldTestCase extends AbstractSCATestCase<HelloWorld> { - - /** - * Calls the hello world service and checks that it gives the right response... - */ - public AbstractHelloWorldTestCase(String compositeName, String contributionLocation) { - super(compositeName, contributionLocation); - } - - public void testHello() throws Exception { - assertEquals("Hello petra", service.sayHello("petra")); - } - - @Override - protected Class<HelloWorld> getServiceClass() { - return HelloWorld.class; - } -} diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java deleted file mode 100644 index 53cc094aca..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java +++ /dev/null @@ -1,58 +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.itest.spring; - -import java.io.File; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; - -public abstract class AbstractSCATestCase<T> extends TestCase { - - protected Node node; - protected T service; - protected String compositeName; - protected String contributionLocation; - - public AbstractSCATestCase(String compositeName, String contributionLocation) { - super(); - this.compositeName = compositeName; - this.contributionLocation = contributionLocation; - } - - @Override - protected void setUp() throws Exception { - NodeFactory factory = NodeFactory.newInstance(); - node = factory.createNode(new File("src/main/resources/" + contributionLocation + compositeName).toURI().toURL().toString(), - new Contribution("TestContribution", new File("src/main/resources/" + contributionLocation).toURI().toURL().toString())); - node.start(); - service = node.getService(getServiceClass(), "ClientComponent"); - } - - abstract protected Class<T> getServiceClass(); - - @Override - protected void tearDown() throws Exception { - node.stop(); - } -} diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java deleted file mode 100644 index 5869d344f6..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java +++ /dev/null @@ -1,34 +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.itest.spring; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * Interface for the "hello world" service - predictably simple with a single operation - * "sayHello" - * - */ -@Remotable -public interface HelloWorld { - - public String sayHello(String s); - -} diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java deleted file mode 100644 index 90d26dd89f..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorldProxy.java +++ /dev/null @@ -1,41 +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.itest.spring; - -import org.oasisopen.sca.annotation.Reference; - -/** - * A simple proxy Java class which implements the HelloWorld interface but which uses - * a reference "delegate" to actually provide the HelloWorld service - * - */ -public class HelloWorldProxy implements HelloWorld { - - // Here is the reference "delegate" - it implements the HelloWorld interface... - @Reference - public HelloWorld delegate; - - public String sayHello(String s) { - // Simply call the reference to satisfy the service request... - System.out.println("HelloWorldProxy - calling sayHello"); - return delegate.sayHello(s); - } - -} diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java deleted file mode 100644 index f28dace31a..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.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.itest.spring; - -/** - * A basic test case of: - * 1) A composite containing a component with a Spring implementation - * 2) The composite has a component with a Java POJO implementation which uses the - * Spring implementation to satisfy a reference - * - */ -public class SpringDelegationHelloWorldTestCase extends AbstractHelloWorldTestCase { - // super class does it all getting composite based on this class name - - public SpringDelegationHelloWorldTestCase() { - super("SpringDelegationHelloWorld.composite", "org/apache/tuscany/sca/itest/spring/"); - } -} diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java deleted file mode 100644 index def30b3ea0..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java +++ /dev/null @@ -1,36 +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.itest.spring; - -/** - * A basic test case of: - * 1) A composite containing a component with a Spring implementation - * 2) The composite has a component with a Java POJO implementation which uses the - * Spring implementation to satisfy a reference - * 3) The Spring component delegates function to a second spring bean - * - */ -public class SpringHelloWorldTestCase extends AbstractHelloWorldTestCase { - - // super class does it all getting composite based on this class name - public SpringHelloWorldTestCase() { - super("SpringHelloWorld.composite", "org/apache/tuscany/sca/itest/spring/"); - } -} diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java deleted file mode 100644 index fa7967c964..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java +++ /dev/null @@ -1,36 +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.itest.spring; - -/** - * A simple test Spring bean which provides the HelloWorld service - * - */ - -public class TestHelloWorldBean implements HelloWorld { - - static String hello = "Hello "; - - // Classic "Hello xxx" response to any input message - public String sayHello(String message) { - System.out.println("TestHelloWorldBean - sayHello called"); - return (hello + message); - } - -} // end class TestHelloWorldBean diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java deleted file mode 100644 index b57cc7f366..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java +++ /dev/null @@ -1,40 +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.itest.spring; - -/** - * A simple test Spring bean which delgates to another bean - * - */ - -public class TestHelloWorldDelegatorBean implements HelloWorld { - - HelloWorld delegate; - - public void setDelegate(HelloWorld delegate) { - this.delegate = delegate; - } - - // Classic "Hello xxx" response to any input message - public String sayHello(String message) { - System.out.println("TestHelloWorldDelegatorBean - sayHello called"); - return delegate.sayHello(message); - } - -} diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java deleted file mode 100644 index 0c2e1daa81..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.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 sca.references; - -import org.apache.tuscany.sca.itest.spring.AbstractHelloWorldTestCase; - -/** - * A test case designed to test the implementation of References from a Spring application - * context, where the references are explicit, through the presence of an sca:reference - * element within the Spring application context - * - * The artifacts involved in this test are: - * - * 1) A composite containing a component with a Spring implementation which makes - * a reference to a second component - * 2) The composite has a component with a Java POJO implementation which satisfies the reference - * 3) The <implementation.spring.../> element references an application context that - * uses an explicit sca:reference element to identify the reference made by the Spring application - * - * @version $Rev$ $Date$ - */ -public class SpringExplicitReferenceTestCase extends AbstractHelloWorldTestCase { - // super class does it all getting composite based on this class name - - public SpringExplicitReferenceTestCase() { - super("SpringExplicitReference.composite", "sca/references/"); - } -} diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java deleted file mode 100644 index 8d0c548899..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.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 sca.references; - -import org.apache.tuscany.sca.itest.spring.AbstractHelloWorldTestCase; - -/** - * A test case designed to test the implementation of References from a Spring application - * context, where the references are implicit, through the presence of Bean properties with a - * ref attribute which is not satisfied by a Bean within the application context. - * - * The artifacts involved in this test are: - * - * 1) A composite containing a component with a Spring implementation which makes - * a reference to a second component - * 2) The composite has a component with a Java POJO implementation which satisfies the reference - * 3) The <implementation.spring.../> element references an application context that - * does not use an explicit sca:reference element to identify the reference made by the - * Spring application, but relies on an unsatisfied Bean property with a ref attribute. - * - * @version $Rev$ $Date$ - */ -public class SpringImplicitReferenceTestCase extends AbstractHelloWorldTestCase { - // super class does it all getting composite based on this class name - - public SpringImplicitReferenceTestCase() { - super("SpringImplicitReference.composite", "sca/references/"); - } -} - - diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java deleted file mode 100644 index f4bd53876c..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java +++ /dev/null @@ -1,40 +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 sca.services; - -import org.apache.tuscany.sca.itest.spring.AbstractHelloWorldTestCase; - -/** - * A basic test case of: - * 1) A composite containing a component with a Spring implementation - * 2) The composite has a component with a Java POJO implementation which uses the - * Spring implementation to satisfy a reference - * 3) The <implementation.spring.../> element references an application context that - * uses an explicit sca: element to identify the service offered by the Spring application - * - * @version $Rev$ $Date$ - */ -public class SpringExplicitServiceTestCase extends AbstractHelloWorldTestCase { - // super class does it all getting composite based on this class name - - public SpringExplicitServiceTestCase() { - super("SpringExplicitService.composite", "sca/services/"); - } -} diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java deleted file mode 100644 index 0907985d7f..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java +++ /dev/null @@ -1,38 +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 sca.services; - -import org.apache.tuscany.sca.itest.spring.AbstractHelloWorldTestCase; - -/** - * A basic test case of: - * 1) A composite containing a component with a Spring implementation - * 2) The composite has a component with a Java POJO implementation which uses the - * Spring implementation to satisfy a reference - * - * @version $Rev$ $Date$ - */ -public class SpringImplicitServiceTestCase extends AbstractHelloWorldTestCase { - // super class does it all getting composite based on this class name - - public SpringImplicitServiceTestCase() { - super("SpringImplicitService.composite", "sca/services/"); - } -} diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java deleted file mode 100644 index c2dfbf247f..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java +++ /dev/null @@ -1,55 +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 spring.annotations; - -import java.io.File; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; - -import calculator.CalculatorService; - - -/** - * This client program shows how to create an SCA runtime, start it, - * and locate and invoke a SCA component - */ -public class CalculatorClient { - public static void main(String[] args) throws Exception { - - NodeFactory factory = NodeFactory.newInstance(); - Node node = factory.createNode(new File("src/main/resources/spring/annotations/Calculator.composite").toURI().toURL().toString(), - new Contribution("TestContribution", new File("src/main/resources/spring/annotations/").toURI().toURL().toString())); - node.start(); - - CalculatorService calculatorService = - node.getService(CalculatorService.class, "CalculatorServiceComponent"); - - System.out.println("3 + 2=" + calculatorService.add(3, 2)); - System.out.println("3 - 2=" + calculatorService.subtract(3, 2)); - System.out.println("3 * 2=" + calculatorService.multiply(3, 2)); - System.out.println("3 / 2=" + calculatorService.divide(3, 2)); - - node.stop(); - System.out.println("Bye"); - } - -} diff --git a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java b/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java deleted file mode 100644 index 5db9c84c00..0000000000 --- a/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/spring/annotations/SpringAnnotationsTestCase.java +++ /dev/null @@ -1,32 +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 spring.annotations; - -import junit.framework.TestCase; - -/** - * Tests out the big bank service - * - */ -public class SpringAnnotationsTestCase extends TestCase { - - public void testServer() throws Exception { - CalculatorClient.main(new String[] {""}); - } -} diff --git a/sca-java-2.x/trunk/itest/import-export/exports/pom.xml b/sca-java-2.x/trunk/itest/import-export/exports/pom.xml deleted file mode 100644 index e83be7145f..0000000000 --- a/sca-java-2.x/trunk/itest/import-export/exports/pom.xml +++ /dev/null @@ -1,40 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-import-export-export</artifactId>
- <name>Apache Tuscany SCA iTest Import Export Exports</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/sca-java-2.x/trunk/itest/import-export/exports/src/main/java/org/apache/tuscany/sca/itest/exports/Helloworld.java b/sca-java-2.x/trunk/itest/import-export/exports/src/main/java/org/apache/tuscany/sca/itest/exports/Helloworld.java deleted file mode 100644 index 186e42da39..0000000000 --- a/sca-java-2.x/trunk/itest/import-export/exports/src/main/java/org/apache/tuscany/sca/itest/exports/Helloworld.java +++ /dev/null @@ -1,27 +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.itest.exports;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Helloworld {
- String sayHello(String s);
-}
diff --git a/sca-java-2.x/trunk/itest/import-export/exports/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/import-export/exports/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 9a0edcba68..0000000000 --- a/sca-java-2.x/trunk/itest/import-export/exports/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://itest">
- <export.java package="org.apache.tuscany.sca.itest.exports"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/import-export/imports/pom.xml b/sca-java-2.x/trunk/itest/import-export/imports/pom.xml deleted file mode 100644 index 73da8052b5..0000000000 --- a/sca-java-2.x/trunk/itest/import-export/imports/pom.xml +++ /dev/null @@ -1,46 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-import-export-imports</artifactId>
- <name>Apache Tuscany SCA iTest Import Export Imports</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>itest-import-export-export</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/sca-java-2.x/trunk/itest/import-export/imports/src/main/java/org/apache/tuscany/sca/itest/imports/HelloworldImpl.java b/sca-java-2.x/trunk/itest/import-export/imports/src/main/java/org/apache/tuscany/sca/itest/imports/HelloworldImpl.java deleted file mode 100644 index 4c7bc92b4f..0000000000 --- a/sca-java-2.x/trunk/itest/import-export/imports/src/main/java/org/apache/tuscany/sca/itest/imports/HelloworldImpl.java +++ /dev/null @@ -1,30 +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.itest.imports;
-
-import org.apache.tuscany.sca.itest.exports.Helloworld;
-
-public class HelloworldImpl implements Helloworld {
-
- public String sayHello(String name) {
- return "Hello " + name;
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/import-export/imports/src/main/resources/Helloworld.composite b/sca-java-2.x/trunk/itest/import-export/imports/src/main/resources/Helloworld.composite deleted file mode 100644 index b4e2ff8868..0000000000 --- a/sca-java-2.x/trunk/itest/import-export/imports/src/main/resources/Helloworld.composite +++ /dev/null @@ -1,29 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- targetNamespace="http://itest"
- name="HelloworldImpl">
-
- <component name="HelloworldComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.imports.HelloworldImpl"/>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/import-export/imports/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/import-export/imports/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index c136923ab4..0000000000 --- a/sca-java-2.x/trunk/itest/import-export/imports/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://itest">
- <deployable composite="itest:Helloworld"/>
- <import.java package="org.apache.tuscany.sca.itest.exports"/>
-</contribution>
diff --git a/sca-java-2.x/trunk/itest/import-export/pom.xml b/sca-java-2.x/trunk/itest/import-export/pom.xml deleted file mode 100644 index 182203291b..0000000000 --- a/sca-java-2.x/trunk/itest/import-export/pom.xml +++ /dev/null @@ -1,38 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <packaging>pom</packaging>
- <artifactId>itest-import-export</artifactId>
- <name>Apache Tuscany SCA iTest Import Export</name>
-
- <modules>
- <module>imports</module>
- <module>exports</module>
- <module>tests</module>
- </modules>
-
-</project>
diff --git a/sca-java-2.x/trunk/itest/import-export/tests/pom.xml b/sca-java-2.x/trunk/itest/import-export/tests/pom.xml deleted file mode 100644 index 2e95f157b8..0000000000 --- a/sca-java-2.x/trunk/itest/import-export/tests/pom.xml +++ /dev/null @@ -1,40 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-import-export-tests</artifactId>
- <name>Apache Tuscany SCA iTest Import Export Tests</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca.shades</groupId>
- <artifactId>tuscany-base</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/sca-java-2.x/trunk/itest/import-export/tests/src/test/java/org/apache/tuscany/sca/itests/TestTestCase.java b/sca-java-2.x/trunk/itest/import-export/tests/src/test/java/org/apache/tuscany/sca/itests/TestTestCase.java deleted file mode 100644 index ea76a23c03..0000000000 --- a/sca-java-2.x/trunk/itest/import-export/tests/src/test/java/org/apache/tuscany/sca/itests/TestTestCase.java +++ /dev/null @@ -1,60 +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.itests;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Test;
-
-public class TestTestCase {
-
- private Node node;
- private Node node2;
-
- @Test
- public void testOneNode() throws Exception {
-
- node = NodeFactory.newInstance().createNode((String)null, new String[] {"../exports/target/classes", "../imports/target/classes"});
- node.start();
-
- }
-
- @Test
- public void testSeparateNodes() throws Exception {
-
- node = NodeFactory.newInstance().createNode((String)null, new String[] {"../exports/target/classes"});
- node.start();
-
- node2 = NodeFactory.newInstance().createNode((String)null, new String[] {"../imports/target/classes"});
- node2.start();
- }
-
- @After
- public void tearDown() throws Exception {
- if (node != null) {
- node.stop();
- }
- if (node2 != null) {
- node2.stop();
- }
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/interfaces/pom.xml b/sca-java-2.x/trunk/itest/interfaces/pom.xml deleted file mode 100644 index 09a969d146..0000000000 --- a/sca-java-2.x/trunk/itest/interfaces/pom.xml +++ /dev/null @@ -1,53 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-interfaces</artifactId> - <name>Apache Tuscany SCA iTest Interface</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - </dependencies> -</project> diff --git a/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java b/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java deleted file mode 100644 index f4131593d5..0000000000 --- a/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java +++ /dev/null @@ -1,30 +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.itest.interfaces; - -/** - * only for callBack - */ -public interface LocalCallbackInterface { - - void callbackMethod(String str); - - void modifyParameter(ParameterObject po); - -} diff --git a/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java b/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java deleted file mode 100644 index 3c7a398abd..0000000000 --- a/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponent.java +++ /dev/null @@ -1,47 +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.itest.interfaces; - -import org.oasisopen.sca.annotation.OneWay; - -/* - * itest for interface: local,method-overloading - */ -public interface LocalClientComponent { - - String foo1(ParameterObject po); - - String foo2(String str) throws Exception; - - String foo3(String str, int i); - - String foo4(int i, String str) throws Exception; - - void callback(String str); - - void callModifyParameter(); - - @OneWay - void onewayMethod(String str); - - String getCallbackValue(); - - String getOnewayValue(); -} diff --git a/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java b/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java deleted file mode 100644 index fc88c4f119..0000000000 --- a/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java +++ /dev/null @@ -1,83 +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.itest.interfaces; - -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Service; - -@Service(LocalClientComponent.class) -public class LocalClientComponentImpl implements LocalClientComponent, LocalCallbackInterface { - - @Reference - protected LocalServiceComponent aCallBackService; - private static String callbackValue; - private static String onewayValue; - - public String foo1(ParameterObject po) { - po.field1 = "AComponent"; - return "AComponent"; - } - - public String foo2(String str) throws Exception { - return str + "AComponent"; - } - - public String foo3(String str, int i) { - return str + "AComponent" + i; - } - - public String foo4(int i, String str) throws Exception { - return str + "AComponent" + i; - } - - public void callback(String str) { - aCallBackService.callback(str); - } - - public void callbackMethod(String str) { - callbackValue = str; - } - - public void callModifyParameter() { - this.aCallBackService.modifyParameter(); - } - - public String getCallbackValue() { - return callbackValue; - } - - public void onewayMethod(String str) { - onewayValue = str; - try { - Thread.sleep(200); - } catch (Exception e) { - //do nothing - } - } - - public String getOnewayValue() { - return onewayValue; - } - - public void modifyParameter(ParameterObject po) { - po.field1 = "AComponent"; - } - -} diff --git a/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java b/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java deleted file mode 100644 index 05a9d09bdd..0000000000 --- a/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.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.itest.interfaces; - -import org.oasisopen.sca.annotation.Callback; - -/** - * Local be-directional callBackService - */ -@Callback(LocalCallbackInterface.class) -public interface LocalServiceComponent { - - String foo(String str); - - void callback(String str); - - void modifyParameter(); - - ParameterObject getPO(); - -} diff --git a/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java b/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java deleted file mode 100644 index ab0b18191c..0000000000 --- a/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java +++ /dev/null @@ -1,49 +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.itest.interfaces; - -import org.oasisopen.sca.annotation.Callback; -import org.oasisopen.sca.annotation.Service; - -@Service(LocalServiceComponent.class) -public class LocalServiceComponentImpl implements LocalServiceComponent { - - @Callback - protected LocalCallbackInterface callback; - - private static ParameterObject po; - - public void callback(String str) { - callback.callbackMethod(str); - } - - public void modifyParameter() { - po = new ParameterObject("CallBack"); - callback.modifyParameter(po); - } - - public String foo(String str) { - return str; - } - - public ParameterObject getPO() { - return po; - } - -} diff --git a/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java b/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java deleted file mode 100644 index 724d94dffb..0000000000 --- a/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.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.itest.interfaces; - -import java.io.Serializable; - -public class ParameterObject implements Serializable { - private static final long serialVersionUID = 1L; - public String field1; - - public ParameterObject() { - this.field1 = null; - } - - public ParameterObject(String field1) { - this.field1 = field1; - } - - public boolean equals(Object o) { - if (o == this) { - return true; - } - if (o instanceof ParameterObject) { - ParameterObject other = (ParameterObject)o; - if (field1 != null) { - return field1.equals(other.field1); - } - } - return false; - } -} diff --git a/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java b/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java deleted file mode 100644 index be3fa4c15a..0000000000 --- a/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteCallbackInterface.java +++ /dev/null @@ -1,33 +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.itest.interfaces; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * only for callBack - */ -@Remotable -public interface RemoteCallbackInterface { - - void callbackMethod(String str); - - void modifyParameter(ParameterObject po); -} diff --git a/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java b/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java deleted file mode 100644 index 9f34dfd274..0000000000 --- a/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java +++ /dev/null @@ -1,64 +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. - */ -/* - * 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.itest.interfaces; - -import org.oasisopen.sca.annotation.Remotable; - -/* - * different signatures - */ - -@Remotable -public interface RemoteClientComponent { - - String foo1(ParameterObject po); - - String foo3(ParameterObject po); - - String foo2(int i, String str1) throws Exception; - - void callback(String str); - - void callModifyParameter(); - - String getCallbackValue(); - - void onewayMethod(String str); - - String getOnewayValue(); -} diff --git a/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java b/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java deleted file mode 100644 index 541b1f1508..0000000000 --- a/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java +++ /dev/null @@ -1,81 +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.itest.interfaces; - -import org.oasisopen.sca.annotation.AllowsPassByReference; -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Service; - -@Service(RemoteClientComponent.class) -public class RemoteClientComponentImpl implements RemoteClientComponent, RemoteCallbackInterface { - - @Reference - protected RemoteServiceComponent aCallBackService; - private static String callbackValue; - private static String onewayValue; - - public String foo1(ParameterObject po) { - po.field1 = "BComponent"; - return "BComponent"; - } - - @AllowsPassByReference - public String foo3(ParameterObject po) { - po.field1 = "BComponent"; - return "BComponent"; - } - - public String foo2(int i, String str) throws Exception { - return str + "BComponent" + i; - } - - public void callback(String str) { - aCallBackService.callback(str); - } - - public void callModifyParameter() { - this.aCallBackService.modifyParameter(); - } - - public void callbackMethod(String str) { - callbackValue = str; - } - - public String getCallbackValue() { - return callbackValue; - } - - public void onewayMethod(String str) { - onewayValue = str; - try { - Thread.sleep(200); - } catch (Exception e) { - //do nothing - } - } - - public String getOnewayValue() { - return onewayValue; - } - - public void modifyParameter(ParameterObject po) { - po.field1 = "BComponent"; - } -} diff --git a/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java b/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java deleted file mode 100644 index b29b298ab6..0000000000 --- a/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java +++ /dev/null @@ -1,38 +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.itest.interfaces; - -import org.oasisopen.sca.annotation.Callback; -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -@Callback(RemoteCallbackInterface.class) -public interface RemoteServiceComponent { - - String foo(String str); - - void callback(String str); - - void modifyParameter(); - - ParameterObject getPO(); - - String[] bar(int[][] intArray); -} diff --git a/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java b/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java deleted file mode 100644 index 00a0f5645b..0000000000 --- a/sca-java-2.x/trunk/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponentImpl.java +++ /dev/null @@ -1,54 +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.itest.interfaces; - -import org.oasisopen.sca.annotation.Callback; -import org.oasisopen.sca.annotation.Service; - -@Service(RemoteServiceComponent.class) -public class RemoteServiceComponentImpl implements RemoteServiceComponent { - - @Callback - protected RemoteCallbackInterface callback; - - private static ParameterObject po; - - public void callback(String str) { - callback.callbackMethod(str); - } - - public void modifyParameter() { - po = new ParameterObject("CallBack"); - callback.modifyParameter(po); - } - - public String foo(String str) { - return str; - } - - public ParameterObject getPO() { - return po; - } - - public String[] bar(int[][] intArray) { - return new String[] {"int"}; - } - -} diff --git a/sca-java-2.x/trunk/itest/interfaces/src/main/resources/org/apache/tuscany/sca/itest/interfaces/invalid/InvalidRemoteAttribute.composite b/sca-java-2.x/trunk/itest/interfaces/src/main/resources/org/apache/tuscany/sca/itest/interfaces/invalid/InvalidRemoteAttribute.composite deleted file mode 100644 index da5700aa35..0000000000 --- a/sca-java-2.x/trunk/itest/interfaces/src/main/resources/org/apache/tuscany/sca/itest/interfaces/invalid/InvalidRemoteAttribute.composite +++ /dev/null @@ -1,28 +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 - * 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://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:foo="http://foo" targetNamespace="http://foo" - name="InvalidRemoteAttribute" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - - <component name="RemoteServiceComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.interfaces.RemoteServiceComponentImpl" /> - <service name="RemoteServiceComponent"> - <interface.java interface="org.apache.tuscany.sca.itest.interfaces.RemoteServiceComponent" remotable="false"/> - </service> - </component> -</composite>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/interfaces/src/main/resources/org/apache/tuscany/sca/itest/interfaces/valid/InterfacesTest.composite b/sca-java-2.x/trunk/itest/interfaces/src/main/resources/org/apache/tuscany/sca/itest/interfaces/valid/InterfacesTest.composite deleted file mode 100644 index e9267b75d3..0000000000 --- a/sca-java-2.x/trunk/itest/interfaces/src/main/resources/org/apache/tuscany/sca/itest/interfaces/valid/InterfacesTest.composite +++ /dev/null @@ -1,40 +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 - * 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://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:foo="http://foo" targetNamespace="http://foo" - name="InterfacesTest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - - <component name="LocalClientComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.interfaces.LocalClientComponentImpl" /> - <reference name="aCallBackService" target="LocalServiceComponent" /> - </component> - - <component name="RemoteClientComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.interfaces.RemoteClientComponentImpl" /> - <reference name="aCallBackService" target="RemoteServiceComponent" /> - </component> - - <component name="LocalServiceComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.interfaces.LocalServiceComponentImpl" /> - </component> - - <component name="RemoteServiceComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.interfaces.RemoteServiceComponentImpl" /> - </component> - -</composite>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java b/sca-java-2.x/trunk/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java deleted file mode 100644 index d04351f51e..0000000000 --- a/sca-java-2.x/trunk/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java +++ /dev/null @@ -1,137 +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.itest.interfaces; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - -import java.io.File; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -// @Ignore("TUSCANY-3138") -public class InterfacesTestCase { - private static final String PKG = "org/apache/tuscany/sca/itest/interfaces/valid"; - private static String ROOT = new File("target/classes/" + PKG).toURI().toString(); - - private static Node node; - - @BeforeClass - public static void init() throws Exception { - String location = ROOT; - node = NodeFactory.newInstance().createNode("InterfacesTest.composite", new Contribution("c1", location)); - node.start(); - } - - @AfterClass - public static void destroy() throws Exception { - node.stop(); - } - - @Test - public void testLocalClient() { - LocalServiceComponent service = node.getService(LocalServiceComponent.class, "LocalServiceComponent"); - LocalClientComponent local = node.getService(LocalClientComponent.class, "LocalClientComponent"); - - try { - ParameterObject po = new ParameterObject(); - assertEquals("AComponent", local.foo1(po)); - assertEquals("AComponent", po.field1); - - assertEquals("AAComponent", local.foo2("A")); - - assertEquals("AAComponent1", local.foo3("A", 1)); - assertEquals("AAComponent1", local.foo4(1, "A")); - } catch (Exception e) { - fail(); - } - - try { - // test local callback - local.callback("CallBack"); - Thread.sleep(100); - assertEquals("CallBack", local.getCallbackValue()); - - local.callModifyParameter(); - Thread.sleep(100); - assertEquals("AComponent", service.getPO().field1); - } catch (Exception e) { - e.printStackTrace(); - fail("CallBack failed"); - } - - try { - local.onewayMethod("OneWay"); - Thread.sleep(100); - assertEquals("OneWay", local.getOnewayValue()); - } catch (Exception e) { - fail("OneWay failed"); - } - } - - @Test - public void testRemoteClient() { - RemoteServiceComponent service = node.getService(RemoteServiceComponent.class, "RemoteServiceComponent"); - RemoteClientComponent remote = node.getService(RemoteClientComponent.class, "RemoteClientComponent"); - - try { - // Test Pass By Value - ParameterObject po = new ParameterObject("NotBComponent"); - assertEquals("BComponent", remote.foo1(po)); - assertEquals("NotBComponent", po.field1); - - assertEquals("BBComponent1", remote.foo2(1, "B")); - -// TODO: TUSCANY-3479, investigate Node/SCAClient pass by reference -// // Test allowsPassByReference -// assertEquals("BComponent", remote.foo3(po)); -// assertEquals("BComponent", po.field1); - } catch (Exception e) { - e.printStackTrace(); - fail(); - } - - try { - remote.callback("CallBack"); - Thread.sleep(100); - assertEquals("CallBack", remote.getCallbackValue()); - - remote.callModifyParameter(); - Thread.sleep(100); - assertEquals("CallBack", service.getPO().field1); - } catch (Exception e) { - fail("CallBack failed"); - } - - try { - remote.onewayMethod("OneWay"); - Thread.sleep(100); - assertEquals("OneWay", remote.getOnewayValue()); - } catch (Exception e) { - fail("OneWay failed"); - } - } - -} diff --git a/sca-java-2.x/trunk/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InvalidRemoteAttributeTestCase.java b/sca-java-2.x/trunk/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InvalidRemoteAttributeTestCase.java deleted file mode 100644 index 5aa8be2f04..0000000000 --- a/sca-java-2.x/trunk/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InvalidRemoteAttributeTestCase.java +++ /dev/null @@ -1,52 +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.itest.interfaces; - -import java.io.File; - -import org.apache.tuscany.sca.interfacedef.InvalidAnnotationException; -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.Test; - -public class InvalidRemoteAttributeTestCase { - private static final String PKG = "org/apache/tuscany/sca/itest/interfaces/invalid"; - private static String ROOT = new File("target/classes/" + PKG).toURI().toString(); - - @Test - public void testInvalidRemoteAttribute() throws Exception { - Node node = null; - - try { - String location = ROOT; - node = NodeFactory.newInstance().createNode("InvalidRemoteAttribute.composite", new Contribution("c1", location)); - node.start(); - } catch (Exception e) { - if (! e.getCause().getClass().equals(InvalidAnnotationException.class)) { - throw e; - } - } finally { - if (node != null) { - node.stop(); - } - } - } -} diff --git a/sca-java-2.x/trunk/itest/jaxws-asyncclient/pom.xml b/sca-java-2.x/trunk/itest/jaxws-asyncclient/pom.xml deleted file mode 100644 index 1f9b339386..0000000000 --- a/sca-java-2.x/trunk/itest/jaxws-asyncclient/pom.xml +++ /dev/null @@ -1,53 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-jaxws-asyncclient</artifactId>
- <name>Apache Tuscany JAX-WS Integration Tests</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/sca-java-2.x/trunk/itest/jaxws-asyncclient/src/main/java/stock/StockQuote.java b/sca-java-2.x/trunk/itest/jaxws-asyncclient/src/main/java/stock/StockQuote.java deleted file mode 100644 index 4e55bae98d..0000000000 --- a/sca-java-2.x/trunk/itest/jaxws-asyncclient/src/main/java/stock/StockQuote.java +++ /dev/null @@ -1,36 +0,0 @@ -package stock;
-/*
- * 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.
- */
-
-
-
-import javax.jws.WebService;
-
-/**
- * JAX-WS Async style Stock quote interface
- *
- * @version $Rev: 828277 $ $Date: 2009-10-22 02:40:52 +0100 (Thu, 22 Oct 2009) $
- */
-
-@WebService
-public interface StockQuote {
-
- float getPrice(String ticker);
-
-}
diff --git a/sca-java-2.x/trunk/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteClient.java b/sca-java-2.x/trunk/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteClient.java deleted file mode 100644 index 0bf3328c31..0000000000 --- a/sca-java-2.x/trunk/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteClient.java +++ /dev/null @@ -1,69 +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 stock;
-
-import java.util.concurrent.ExecutionException;
-
-import javax.xml.ws.AsyncHandler;
-import javax.xml.ws.Response;
-
-import org.oasisopen.sca.annotation.Reference;
-
-public class StockQuoteClient {
-
- @Reference public StockQuoteRef stockQuote;
-
- public float getPrice(String ticker) {
- return stockQuote.getPrice(ticker);
- }
-
- public float getPriceAsyncPoll(String ticker) throws InterruptedException, ExecutionException {
- Response<Float> response = stockQuote.getPriceAsync("foo");
- return response.get();
- }
-
- float price = 0f;
- Object mutex = new Object();
- Exception exception;
-
- public float getPriceAsyncCallback(String ticker) throws Exception {
- AsyncHandler<Float> callback = new AsyncHandler<Float>() {
- public void handleResponse(Response<Float> arg) {
- synchronized (mutex) {
- try {
- price = arg.get();
- } catch (Exception e) {
- exception = e;
- }
- mutex.notify();
- }
- }
- };
- stockQuote.getPriceAsync("foo", callback);
- synchronized (mutex) {
- if (price == 0f)
- mutex.wait(5000); // wait for up to 5 seconds
- }
-
- if (exception != null) throw exception;
- return price;
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteImpl.java b/sca-java-2.x/trunk/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteImpl.java deleted file mode 100644 index a43b85361b..0000000000 --- a/sca-java-2.x/trunk/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteImpl.java +++ /dev/null @@ -1,34 +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 stock;
-
-
-/**
- * Stock quote impl
- *
- * @version $Rev: 828277 $ $Date: 2009-10-22 02:40:52 +0100 (Thu, 22 Oct 2009) $
- */
-public class StockQuoteImpl implements StockQuote {
-
- public float getPrice(String ticker) {
- return 10;
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteRef.java b/sca-java-2.x/trunk/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteRef.java deleted file mode 100644 index b15ab6be08..0000000000 --- a/sca-java-2.x/trunk/itest/jaxws-asyncclient/src/main/java/stock/StockQuoteRef.java +++ /dev/null @@ -1,39 +0,0 @@ -package stock;
-/*
- * 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.
- */
-
-
-
-import java.util.concurrent.Future;
-
-import javax.xml.ws.AsyncHandler;
-import javax.xml.ws.Response;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * JAX-WS Async style Stock quote interface
- */
-@Remotable
-public interface StockQuoteRef extends StockQuote {
-
- Response<Float> getPriceAsync(String ticker);
-
- Future<?> getPriceAsync(String ticker, AsyncHandler<Float> callback);
-}
diff --git a/sca-java-2.x/trunk/itest/jaxws-asyncclient/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jaxws-asyncclient/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index b30367319d..0000000000 --- a/sca-java-2.x/trunk/itest/jaxws-asyncclient/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://itest/jaxws">
- <deployable composite="itest:jaxwsAsync"/>
-</contribution> diff --git a/sca-java-2.x/trunk/itest/jaxws-asyncclient/src/main/resources/StockQuote.composite b/sca-java-2.x/trunk/itest/jaxws-asyncclient/src/main/resources/StockQuote.composite deleted file mode 100644 index 548b7a9da5..0000000000 --- a/sca-java-2.x/trunk/itest/jaxws-asyncclient/src/main/resources/StockQuote.composite +++ /dev/null @@ -1,33 +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
- * 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://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:foo="http://itest/jaxws"
- targetNamespace="http://itest/jaxws"
- name="jaxwsAsync">
-
- <component name="StockQuote">
- <implementation.java class="stock.StockQuoteImpl" />
- </component>
-
- <component name="StockQuoteClient">
- <implementation.java class="stock.StockQuoteClient" />
- <reference name="stockQuote" target="StockQuote" />
- </component>
-
-</composite> diff --git a/sca-java-2.x/trunk/itest/jaxws-asyncclient/src/test/java/itest/AsyncServiceTestCase.java b/sca-java-2.x/trunk/itest/jaxws-asyncclient/src/test/java/itest/AsyncServiceTestCase.java deleted file mode 100644 index eb72924093..0000000000 --- a/sca-java-2.x/trunk/itest/jaxws-asyncclient/src/test/java/itest/AsyncServiceTestCase.java +++ /dev/null @@ -1,67 +0,0 @@ -package itest;
-import java.util.concurrent.ExecutionException;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import stock.StockQuoteClient;
-
-/*
- * 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.
- */
-
-public class AsyncServiceTestCase {
-
- private Node node;
-
- @Before
- public void init() {
- node = NodeFactory.newInstance().createNode().start();
- }
-
- @After
- public void end() {
- if (node != null) {
- node.stop();
- }
- }
-
- @Test
- public void invokeRPC() {
- StockQuoteClient sc = node.getService(StockQuoteClient.class, "StockQuoteClient");
- Assert.assertEquals(10.0f, sc.getPrice("foo"));
- }
-
- @Test
- public void invokeAsyncPoll() throws InterruptedException, ExecutionException {
- StockQuoteClient sc = node.getService(StockQuoteClient.class, "StockQuoteClient");
- Assert.assertEquals(10.0f, sc.getPriceAsyncPoll("foo"));
- }
-
- @Test
- public void invokeAsyncCallback() throws Exception {
- StockQuoteClient sc = node.getService(StockQuoteClient.class, "StockQuoteClient");
- Assert.assertEquals(10.0f, sc.getPriceAsyncCallback("foo"));
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jaxws/pom.xml b/sca-java-2.x/trunk/itest/jaxws/pom.xml deleted file mode 100644 index 3566980756..0000000000 --- a/sca-java-2.x/trunk/itest/jaxws/pom.xml +++ /dev/null @@ -1,53 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>itest-jaxws</artifactId> - <name>Apache Tuscany SCA iTest JAX-WS Integration Tests</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.1</version> - <scope>test</scope> - </dependency> - </dependencies> -</project> diff --git a/sca-java-2.x/trunk/itest/jaxws/src/test/java/stock/AsyncServiceTestCase.java b/sca-java-2.x/trunk/itest/jaxws/src/test/java/stock/AsyncServiceTestCase.java deleted file mode 100644 index e1c2bedea3..0000000000 --- a/sca-java-2.x/trunk/itest/jaxws/src/test/java/stock/AsyncServiceTestCase.java +++ /dev/null @@ -1,42 +0,0 @@ -package stock; -import junit.framework.Assert; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.Test; - -/* - * 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. - */ - -public class AsyncServiceTestCase { - - @Test - public void init() throws Exception { - try{ - String location = ContributionLocationHelper.getContributionLocation("StockQuote.composite"); - Node node = NodeFactory.newInstance().createNode("StockQuote.composite", new Contribution("c1", location)); - node.start(); - node.stop(); - } catch (Exception e) { - Assert.assertTrue(e.getMessage().contains("[JCA100006]")); - } - } -} diff --git a/sca-java-2.x/trunk/itest/jaxws/src/test/java/stock/StockQuote.java b/sca-java-2.x/trunk/itest/jaxws/src/test/java/stock/StockQuote.java deleted file mode 100644 index 74e25bb3bd..0000000000 --- a/sca-java-2.x/trunk/itest/jaxws/src/test/java/stock/StockQuote.java +++ /dev/null @@ -1,45 +0,0 @@ -package stock; -/* - * 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. - */ - - - -import java.util.concurrent.Future; - -import javax.jws.WebService; -import javax.xml.ws.AsyncHandler; -import javax.xml.ws.Response; - -/** - * JAX-WS Async style Stock quote interface - * - * @version $Rev$ $Date$ - */ - -@WebService -public interface StockQuote { - - float getPrice(String ticker); - - Response<Float> getPriceAsync(String ticker); - - Future<?> getPriceAsync(String ticker, AsyncHandler<Float> callback); - - -} diff --git a/sca-java-2.x/trunk/itest/jaxws/src/test/java/stock/StockQuoteImpl.java b/sca-java-2.x/trunk/itest/jaxws/src/test/java/stock/StockQuoteImpl.java deleted file mode 100644 index 516c63d864..0000000000 --- a/sca-java-2.x/trunk/itest/jaxws/src/test/java/stock/StockQuoteImpl.java +++ /dev/null @@ -1,46 +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 stock; - -import java.util.concurrent.Future; - -import javax.xml.ws.AsyncHandler; -import javax.xml.ws.Response; - -/** - * Stock quote impl - * - * @version $Rev$ $Date$ - */ -public class StockQuoteImpl implements StockQuote { - - public float getPrice(String ticker) { - return 10; - } - - public Response<Float> getPriceAsync(String ticker) { - return null; - } - - public Future<?> getPriceAsync(String ticker, AsyncHandler<Float> callback) { - return null; - } - -} diff --git a/sca-java-2.x/trunk/itest/jaxws/src/test/resources/StockQuote.composite b/sca-java-2.x/trunk/itest/jaxws/src/test/resources/StockQuote.composite deleted file mode 100644 index c8c7719dfa..0000000000 --- a/sca-java-2.x/trunk/itest/jaxws/src/test/resources/StockQuote.composite +++ /dev/null @@ -1,31 +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 - * 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://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:foo="http://itest/jaxws" - targetNamespace="http://itest/jaxws" - name="jaxwsAsync"> - - <component name="StockQuote"> - <implementation.java class="stock.StockQuoteImpl" /> - <service name="StockQuote"> - <interface.java interface="stock.StockQuote"/> - </service> - </component> - -</composite>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/pom.xml b/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/pom.xml deleted file mode 100644 index 4a28617959..0000000000 --- a/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/pom.xml +++ /dev/null @@ -1,83 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-jms-dynamic-replyq</artifactId>
- <name>Apache Tuscany SCA iTest JMS with dynamic replyq</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jms-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.2.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java deleted file mode 100644 index 9aef6ba1a3..0000000000 --- a/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java +++ /dev/null @@ -1,41 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(HelloWorldService.class)
-public class HelloWorldClientImpl implements HelloWorldService {
-
- private HelloWorldService serviceA;
-
- @Reference
- public void setServiceA(HelloWorldService service) {
- this.serviceA = service;
- }
-
- public String sayHello(String name) {
- return serviceA.sayHello(name);
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java deleted file mode 100644 index 430c71aaef..0000000000 --- a/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java +++ /dev/null @@ -1,26 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface HelloWorldService {
- String sayHello(String name);
-}
diff --git a/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java deleted file mode 100644 index 2c6d9d0d17..0000000000 --- a/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java +++ /dev/null @@ -1,30 +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.binding.jms;
-
-public class HelloWorldServiceImpl implements HelloWorldService {
-
- public String sayHello(String name) {
- if ("bang".equals(name)) {
- throw new RuntimeException("blem wit");
- }
- return "jmsHello " + name;
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index ce6a9514af..0000000000 --- a/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://itest">
- <deployable composite="itest:SimpleServiceComposite"/>
- <deployable composite="itest:DynamicComposite"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/src/main/resources/dynamic/client.composite b/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/src/main/resources/dynamic/client.composite deleted file mode 100644 index 7f9ed9612f..0000000000 --- a/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/src/main/resources/dynamic/client.composite +++ /dev/null @@ -1,34 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://itest"
- name="DynamicComposite">
-
- <component name="HelloWorldClient">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldClientImpl"/>
- <reference name="serviceA">
- <binding.jms>
- <destination jndiName="DestQueueA"/>
- <!-- No response destination defined means a temporary queue will be used -->
- </binding.jms>
- </reference>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/src/main/resources/jndi.properties deleted file mode 100644 index 4d6acc037b..0000000000 --- a/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/src/main/resources/jndi.properties +++ /dev/null @@ -1,39 +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.
-## ---------------------------------------------------------------------------
-
-# START SNIPPET: jndi
-
-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
-
-# use the following property to configure the default connector
-java.naming.provider.url = vm://localhost?broker.persistent=false
-
-# use the following property to specify the JNDI name the connection factory
-# should appear as.
-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry
-connectionFactoryNames = ConnectionFactory
-
-# register some queues in JNDI using the form
-# queue.[jndiName] = [physicalName]
-queue.RequestQueue = RequestQueue
-queue.ResponseQueue = ResponseQueue
-
-# register some topics in JNDI using the form
-# topic.[jndiName] = [physicalName]
-#topic.MyTopic = example.MyTopic
-
-# END SNIPPET: jndi
diff --git a/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/src/main/resources/simple/service.composite b/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/src/main/resources/simple/service.composite deleted file mode 100644 index 33364f61c0..0000000000 --- a/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/src/main/resources/simple/service.composite +++ /dev/null @@ -1,37 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://itest"
- name="SimpleServiceComposite">
-
- <component name="HelloWorldService">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldServiceImpl"/>
- <service name="HelloWorldService">
- <binding.jms>
- <destination jndiName="DestQueueA" create="always">
- </destination>
- <response>
- <destination jndiName="RespQueueA" create="always"/>
- </response>
- </binding.jms>
- </service>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java b/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java deleted file mode 100644 index 3bf4e0bc30..0000000000 --- a/sca-java-2.x/trunk/itest/jms/DynamicReplyQ/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java +++ /dev/null @@ -1,53 +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.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class DynamicReplyQTestCase {
-
- private static Node node;
-
- @Before
- public void init() {
- node = NodeFactory.newInstance().createNode().start();
- }
-
- @Test
- public void testHelloWorldCreate() throws Exception {
- HelloWorldService helloWorldService = node.getService(HelloWorldService.class, "HelloWorldClient");
- assertEquals("jmsHello Beate", helloWorldService.sayHello("Beate"));
- }
-
- @After
- public void end() {
- if (node != null) {
- node.stop();
- }
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/args/pom.xml b/sca-java-2.x/trunk/itest/jms/args/pom.xml deleted file mode 100644 index 405017ef33..0000000000 --- a/sca-java-2.x/trunk/itest/jms/args/pom.xml +++ /dev/null @@ -1,70 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-jms-args</artifactId>
- <name>Apache Tuscany SCA iTest JMS Args</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jms-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <!-- uses ActiveMQ 5.1 as 4.1 Session.createQueue does not work using
- a temporary queue name -->
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.2.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
-</project>
diff --git a/sca-java-2.x/trunk/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/sca-java-2.x/trunk/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java deleted file mode 100644 index 68506b857b..0000000000 --- a/sca-java-2.x/trunk/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java +++ /dev/null @@ -1,41 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements the OneWay service.
- */
-@Service(MyService.class)
-public class ClientImpl implements MyService {
-
- private MyService serviceA;
-
- @Reference
- public void setServiceA(MyService service) {
- this.serviceA = service;
- }
-
- public void sayHello(String name, String n2) {
- serviceA.sayHello(name, n2);
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java b/sca-java-2.x/trunk/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java deleted file mode 100644 index 5f19aa1fa5..0000000000 --- a/sca-java-2.x/trunk/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java +++ /dev/null @@ -1,29 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.OneWay;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface MyService {
-
- @OneWay
- void sayHello(String name, String n2);
-}
diff --git a/sca-java-2.x/trunk/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java b/sca-java-2.x/trunk/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java deleted file mode 100644 index 18324d5d1d..0000000000 --- a/sca-java-2.x/trunk/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java +++ /dev/null @@ -1,38 +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.binding.jms;
-
-
-public class ServiceImpl implements MyService {
-
- public static Object lock = new Object();
- public static String name;
- public static String n2;
-
- public void sayHello(String name, String n2) {
- System.out.println("SelectorServiceImpl1 " + name + n2);
- ServiceImpl.name = name;
- ServiceImpl.n2 = n2;
- synchronized (ServiceImpl.lock) {
- ServiceImpl.lock.notify();
- }
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/args/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/args/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index ac6e94ca21..0000000000 --- a/sca-java-2.x/trunk/itest/jms/args/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://itest">
- <deployable composite="itest:DefinitionsTests"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/jms/args/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/args/src/main/resources/jndi.properties deleted file mode 100644 index 7f82eb48d3..0000000000 --- a/sca-java-2.x/trunk/itest/jms/args/src/main/resources/jndi.properties +++ /dev/null @@ -1,38 +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.
-## ---------------------------------------------------------------------------
-
-# START SNIPPET: jndi
-
-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
-
-# use the following property to configure the default connector
-java.naming.provider.url = vm://localhost?broker.persistent=false&broker.useJmx=false&broker.useShutdownHook=false
-
-# use the following property to specify the JNDI name the connection factory
-# should appear as.
-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry
-connectionFactoryNames = ConnectionFactory, ConnectionFactory2
-
-# register some queues in JNDI using the form
-queue.MyService = MyService
-
-# register some topics in JNDI using the form
-# topic.[jndiName] = [physicalName]
-#topic.MyTopic = example.MyTopic
-topic.ServiceTopic = ServiceTopic
-
-# END SNIPPET: jndi
diff --git a/sca-java-2.x/trunk/itest/jms/args/src/main/resources/selectors/selectors.composite b/sca-java-2.x/trunk/itest/jms/args/src/main/resources/selectors/selectors.composite deleted file mode 100644 index fcda648f1c..0000000000 --- a/sca-java-2.x/trunk/itest/jms/args/src/main/resources/selectors/selectors.composite +++ /dev/null @@ -1,38 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://itest"
- name="DefinitionsTests">
-
- <component name="Client1">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.ClientImpl"/>
- <reference name="serviceA">
- <binding.jms uri="jms:jndi:MyService" />
- </reference>
- </component>
-
- <component name="Service1">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.ServiceImpl"/>
- <service name="MyService">
- <binding.jms />
- </service>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/jms/args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java b/sca-java-2.x/trunk/itest/jms/args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java deleted file mode 100644 index 28e0b530c1..0000000000 --- a/sca-java-2.x/trunk/itest/jms/args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java +++ /dev/null @@ -1,62 +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.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- */
-public class ArgsTestCase {
-
- private Node node;
-
- @Before
- public void init() {
- node = NodeFactory.newInstance().createNode().start();
- }
-
- @Test
- public void testSayHello() throws Exception {
- MyService client1 = node.getService(MyService.class, "Client1");
-
- client1.sayHello("petra", "beate");
-
- synchronized(ServiceImpl.lock) {
- if (ServiceImpl.name == null) {
- ServiceImpl.lock.wait(5000);
- }
- }
-
- assertEquals("petra", ServiceImpl.name);
- assertEquals("beate", ServiceImpl.n2);
- }
-
- @After
- public void end() {
- if (node != null) {
- node.stop();
- }
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/callbacks/pom.xml b/sca-java-2.x/trunk/itest/jms/callbacks/pom.xml deleted file mode 100644 index 780724ce5e..0000000000 --- a/sca-java-2.x/trunk/itest/jms/callbacks/pom.xml +++ /dev/null @@ -1,73 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>itest-jms-callbacks</artifactId>
- <name>Apache Tuscany SCA iTest JMS Tests For Callbacks</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jms-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
- <!-- uses ActiveMQ 5.1 as 4.1 Session.createQueue does not work using
- a temporary queue name -->
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.2.0</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java b/sca-java-2.x/trunk/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java deleted file mode 100644 index d4cd5df431..0000000000 --- a/sca-java-2.x/trunk/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java +++ /dev/null @@ -1,28 +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.binding.jms;
-
-
-/**
- * The client interface
- */
-public interface JMSClient {
-
- void aClientMethod();
-}
diff --git a/sca-java-2.x/trunk/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java b/sca-java-2.x/trunk/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java deleted file mode 100644 index f90db55dda..0000000000 --- a/sca-java-2.x/trunk/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java +++ /dev/null @@ -1,50 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * Remote Web service client with callback interface
- */
-@Service(JMSClient.class)
-public class JMSClientImpl implements JMSClient, JMSServiceCallback {
-
- @Reference protected JMSService myService;
-
- public static String result;
- public static Object lock = new Object();
-
- public void aClientMethod() {
- System.out.println("aClientMethod " + this + " on thread " + Thread.currentThread());
- myService.someMethod("-> someMethod"); // calls the server
- System.out.println("aClientMethod return from someMethod on thread " + Thread.currentThread());
- }
-
- public void receiveResult(String result) {
- System.out.println("receiveResult " + this + " '" + result + "' on thread " + Thread.currentThread());
- JMSClientImpl.result = result;
-
- // wakeup the waiting testcase
- synchronized (lock) {
- lock.notifyAll();
- }
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java b/sca-java-2.x/trunk/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java deleted file mode 100644 index b78feab413..0000000000 --- a/sca-java-2.x/trunk/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java +++ /dev/null @@ -1,34 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.OneWay;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The remote service that will be invoked by the client
- */
-@Remotable
-@Callback(JMSServiceCallback.class)
-public interface JMSService {
-
- @OneWay
- void someMethod(String arg);
-}
diff --git a/sca-java-2.x/trunk/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java b/sca-java-2.x/trunk/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java deleted file mode 100644 index 20b74ccc1a..0000000000 --- a/sca-java-2.x/trunk/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java +++ /dev/null @@ -1,32 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.OneWay;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The callback interface for {@link JMSService}.
- */
-@Remotable
-public interface JMSServiceCallback {
-
- @OneWay
- void receiveResult(String result);
-}
diff --git a/sca-java-2.x/trunk/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java b/sca-java-2.x/trunk/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java deleted file mode 100644 index cec4e6fa6d..0000000000 --- a/sca-java-2.x/trunk/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java +++ /dev/null @@ -1,47 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements MyService and uses a callback.
- */
-@Service(JMSService.class)
-public class JMSServiceImpl implements JMSService {
-
- private JMSServiceCallback myServiceCallback;
-
- @Callback
- public void setMyServiceCallback(JMSServiceCallback myServiceCallback) {
- System.out.println("setMyServiceCallback on thread " + Thread.currentThread() + " cb: " + myServiceCallback);
- this.myServiceCallback = myServiceCallback;
- }
-
- public void someMethod(String arg) {
- System.out.println("someMethod '" + arg + "' on thread " + Thread.currentThread());
- try {
- myServiceCallback.receiveResult(arg + "-> receiveResult");
- } catch(Exception e) {
- System.out.println("RuntimeException invoking receiveResult: " + e.toString());
- e.printStackTrace();
- }
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/callbacks/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/callbacks/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 68c3bfa4e0..0000000000 --- a/sca-java-2.x/trunk/itest/jms/callbacks/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://itest">
- <deployable composite="itest:CallbackClientComposite"/>
- <deployable composite="itest:CallbackTempQComposite"/>
-</contribution> diff --git a/sca-java-2.x/trunk/itest/jms/callbacks/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/callbacks/src/main/resources/jndi.properties deleted file mode 100644 index b8c4b1c6aa..0000000000 --- a/sca-java-2.x/trunk/itest/jms/callbacks/src/main/resources/jndi.properties +++ /dev/null @@ -1,40 +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.
-## ---------------------------------------------------------------------------
-
-# START SNIPPET: jndi
-
-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
-
-# use the following property to configure the default connector
-java.naming.provider.url = vm://localhost?broker.persistent=false&broker.useJmx=false&broker.useShutdownHook=false
-
-# use the following property to specify the JNDI name the connection factory
-# should appear as.
-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry
-connectionFactoryNames = ConnectionFactory
-
-# register some queues in JNDI using the form
-# queue.[jndiName] = [physicalName]
-queue.ServiceQueue = ServiceQueue
-queue.TQServiceQueue = TQServiceQueue
-queue.CallbackQueue = CallbackQueue
-
-# register some topics in JNDI using the form
-# topic.[jndiName] = [physicalName]
-#topic.MyTopic = example.MyTopic
-
-# END SNIPPET: jndi
diff --git a/sca-java-2.x/trunk/itest/jms/callbacks/src/main/resources/simple/client.composite b/sca-java-2.x/trunk/itest/jms/callbacks/src/main/resources/simple/client.composite deleted file mode 100644 index 64d45f1816..0000000000 --- a/sca-java-2.x/trunk/itest/jms/callbacks/src/main/resources/simple/client.composite +++ /dev/null @@ -1,44 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://itest"
- name="CallbackClientComposite">
-
- <component name="ClientComponent">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.JMSClientImpl" />
- <reference name="myService">
- <binding.jms uri="jms:jndi:ServiceQueue"/>
- <callback>
- <binding.jms uri="jms:jndi:CallbackQueue"/>
- </callback>
- </reference>
- </component>
-
- <component name="ServiceComponent">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.JMSServiceImpl" />
- <service name="JMSService">
- <binding.jms uri="jms:jndi:ServiceQueue"/>
- <callback>
- <binding.jms uri="jms:jndi:CallbackQueue"/>
- </callback>
- </service>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/jms/callbacks/src/main/resources/simple/tempq.composite b/sca-java-2.x/trunk/itest/jms/callbacks/src/main/resources/simple/tempq.composite deleted file mode 100644 index f9bccedfe9..0000000000 --- a/sca-java-2.x/trunk/itest/jms/callbacks/src/main/resources/simple/tempq.composite +++ /dev/null @@ -1,50 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://itest"
- name="CallbackTempQComposite">
-
-<!--
-
-The client component does not define the callback destination so a temporary queue should be used
-
--->
-
- <component name="TQClientComponent">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.JMSClientImpl" />
- <reference name="myService">
- <binding.jms uri="jms:jndi:TQServiceQueue"/>
- <callback>
- <binding.jms />
- </callback>
- </reference>
- </component>
-
- <component name="TQServiceComponent">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.JMSServiceImpl" />
- <service name="JMSService">
- <binding.jms uri="jms:jndi:TQServiceQueue"/>
- <callback>
- <binding.jms />
- </callback>
- </service>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java b/sca-java-2.x/trunk/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java deleted file mode 100644 index 1661a4614c..0000000000 --- a/sca-java-2.x/trunk/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java +++ /dev/null @@ -1,61 +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.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class CallbackTestCase {
-
- private Node node;
-
- @Before
- public void init() {
- node = NodeFactory.newInstance().createNode().start();
- }
-
- @Test
- public void testHelloWorldCreate() throws Exception {
- JMSClient client = node.getService(JMSClient.class, "ClientComponent");
-
- client.aClientMethod();
-
- // wait for up to 5 seconds but should wake up as soon as done
- synchronized(JMSClientImpl.lock) {
- JMSClientImpl.lock.wait(5000);
- }
-
- assertEquals("-> someMethod-> receiveResult", JMSClientImpl.result);
- }
-
- @After
- public void end() {
- if (node != null) {
- node.stop();
- }
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java b/sca-java-2.x/trunk/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java deleted file mode 100644 index 5897df6784..0000000000 --- a/sca-java-2.x/trunk/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java +++ /dev/null @@ -1,64 +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.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-
-import java.net.MalformedURLException;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class TempCallbackQTestCase {
-
- private Node node;
-
- @Before
- public void init() throws MalformedURLException {
- node = NodeFactory.newInstance().createNode().start();
- }
-
- @Test
- public void testHelloWorldCreate() throws Exception {
- JMSClient client = node.getService(JMSClient.class, "ClientComponent");
-
- client.aClientMethod();
-
- // wait for up to 5 seconds but should wake up as soon as done
- synchronized (JMSClientImpl.lock) {
- JMSClientImpl.lock.wait(5000);
- }
-
- assertEquals("-> someMethod-> receiveResult", JMSClientImpl.result);
- }
-
- @After
- public void end() {
- if (node != null) {
- node.stop();
- }
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/defaults/pom.xml b/sca-java-2.x/trunk/itest/jms/defaults/pom.xml deleted file mode 100644 index df8dc88819..0000000000 --- a/sca-java-2.x/trunk/itest/jms/defaults/pom.xml +++ /dev/null @@ -1,83 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-jms-defaults</artifactId>
- <name>Apache Tuscany SCA iTest JMS with Defaults</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jms-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.2.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-2.x/trunk/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java deleted file mode 100644 index 9aef6ba1a3..0000000000 --- a/sca-java-2.x/trunk/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java +++ /dev/null @@ -1,41 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(HelloWorldService.class)
-public class HelloWorldClientImpl implements HelloWorldService {
-
- private HelloWorldService serviceA;
-
- @Reference
- public void setServiceA(HelloWorldService service) {
- this.serviceA = service;
- }
-
- public String sayHello(String name) {
- return serviceA.sayHello(name);
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java deleted file mode 100644 index 430c71aaef..0000000000 --- a/sca-java-2.x/trunk/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java +++ /dev/null @@ -1,26 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface HelloWorldService {
- String sayHello(String name);
-}
diff --git a/sca-java-2.x/trunk/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java deleted file mode 100644 index 2c6d9d0d17..0000000000 --- a/sca-java-2.x/trunk/itest/jms/defaults/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java +++ /dev/null @@ -1,30 +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.binding.jms;
-
-public class HelloWorldServiceImpl implements HelloWorldService {
-
- public String sayHello(String name) {
- if ("bang".equals(name)) {
- throw new RuntimeException("blem wit");
- }
- return "jmsHello " + name;
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/defaults/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/defaults/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index f4da034c55..0000000000 --- a/sca-java-2.x/trunk/itest/jms/defaults/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://itest">
- <deployable composite="itest:DefaultServiceComposite"/>
- <deployable composite="itest:DefaultClientComposite"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/jms/defaults/src/main/resources/defaults/client.composite b/sca-java-2.x/trunk/itest/jms/defaults/src/main/resources/defaults/client.composite deleted file mode 100644 index ebafbb6bcd..0000000000 --- a/sca-java-2.x/trunk/itest/jms/defaults/src/main/resources/defaults/client.composite +++ /dev/null @@ -1,31 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://itest"
- name="DefaultClientComposite">
-
- <component name="HelloWorldClient">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldClientImpl"/>
- <reference name="serviceA">
- <binding.jms uri="jms:jndi:HelloWorldService" />
- </reference>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/jms/defaults/src/main/resources/defaults/service.composite b/sca-java-2.x/trunk/itest/jms/defaults/src/main/resources/defaults/service.composite deleted file mode 100644 index 5354afb130..0000000000 --- a/sca-java-2.x/trunk/itest/jms/defaults/src/main/resources/defaults/service.composite +++ /dev/null @@ -1,31 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://itest"
- name="DefaultServiceComposite">
-
- <component name="HelloWorldService">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldServiceImpl"/>
- <service name="HelloWorldService">
- <binding.jms />
- </service>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/jms/defaults/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/defaults/src/main/resources/jndi.properties deleted file mode 100644 index c8b186a83c..0000000000 --- a/sca-java-2.x/trunk/itest/jms/defaults/src/main/resources/jndi.properties +++ /dev/null @@ -1,38 +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.
-## ---------------------------------------------------------------------------
-
-# START SNIPPET: jndi
-
-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
-
-# use the following property to configure the default connector
-java.naming.provider.url = vm://localhost?broker.persistent=false
-
-# use the following property to specify the JNDI name the connection factory
-# should appear as.
-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry
-connectionFactoryNames = ConnectionFactory
-
-# register some queues in JNDI using the form
-# queue.[jndiName] = [physicalName]
-queue.HelloWorldService = HelloWorldService
-
-# register some topics in JNDI using the form
-# topic.[jndiName] = [physicalName]
-#topic.MyTopic = example.MyTopic
-
-# END SNIPPET: jndi
diff --git a/sca-java-2.x/trunk/itest/jms/defaults/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java b/sca-java-2.x/trunk/itest/jms/defaults/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java deleted file mode 100644 index d2b1a5fe59..0000000000 --- a/sca-java-2.x/trunk/itest/jms/defaults/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java +++ /dev/null @@ -1,54 +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.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class DefaultsTestCase {
-
- private Node node;
-
- @Before
- public void init() {
- node = NodeFactory.newInstance().createNode().start();
- }
-
- @Test
- public void testHelloWorldCreate() throws Exception {
- HelloWorldService helloWorldService = node.getService(HelloWorldService.class, "HelloWorldClient");
- assertEquals("jmsHello Petra", helloWorldService.sayHello("Petra"));
- }
-
- @After
- public void end() {
- if (node != null) {
- node.stop();
- }
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/definitions/pom.xml b/sca-java-2.x/trunk/itest/jms/definitions/pom.xml deleted file mode 100644 index 28e9dd74c5..0000000000 --- a/sca-java-2.x/trunk/itest/jms/definitions/pom.xml +++ /dev/null @@ -1,73 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-jms-definitions</artifactId>
- <name>Apache Tuscany SCA iTest JMS Tests For Properties</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jms-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
- <!-- uses ActiveMQ 5.1 as 4.1 Session.createQueue does not work using
- a temporary queue name -->
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.2.0</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-2.x/trunk/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java deleted file mode 100644 index b572b1012a..0000000000 --- a/sca-java-2.x/trunk/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java +++ /dev/null @@ -1,41 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements the OneWay service.
- */
-@Service(OneWayService.class)
-public class OneWayClientImpl implements OneWayService {
-
- private OneWayService serviceA;
-
- @Reference
- public void setServiceA(OneWayService service) {
- this.serviceA = service;
- }
-
- public void sayHello(String name) {
- serviceA.sayHello(name);
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-2.x/trunk/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java deleted file mode 100644 index 9cec2d9b3e..0000000000 --- a/sca-java-2.x/trunk/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java +++ /dev/null @@ -1,29 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.OneWay;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface OneWayService {
-
- @OneWay
- void sayHello(String name);
-}
diff --git a/sca-java-2.x/trunk/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-2.x/trunk/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java deleted file mode 100644 index 6b763874df..0000000000 --- a/sca-java-2.x/trunk/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java +++ /dev/null @@ -1,34 +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.binding.jms;
-
-public class OneWayServiceImpl implements OneWayService {
-
- public static Object lock = new Object();
- public static String name;
-
- public void sayHello(String name) {
- OneWayServiceImpl.name = name;
- synchronized (OneWayServiceImpl.lock) {
- OneWayServiceImpl.lock.notify();
- }
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/definitions/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/definitions/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index a57e5befe2..0000000000 --- a/sca-java-2.x/trunk/itest/jms/definitions/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://itest">
- <deployable composite="itest:DefinitionsTests"/>
-</contribution> diff --git a/sca-java-2.x/trunk/itest/jms/definitions/src/main/resources/definitions.xml b/sca-java-2.x/trunk/itest/jms/definitions/src/main/resources/definitions.xml deleted file mode 100644 index 07b9f4aaa8..0000000000 --- a/sca-java-2.x/trunk/itest/jms/definitions/src/main/resources/definitions.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.
--->
-<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://jms" >
-
- <binding.jms name="TestService" >
- <destination name="MyServiceQueue" create="never"/>
- <connectionFactory name="MyConnectionFactory"/>
- </binding.jms>
-
- </definitions>
diff --git a/sca-java-2.x/trunk/itest/jms/definitions/src/main/resources/definitions/definitions.composite b/sca-java-2.x/trunk/itest/jms/definitions/src/main/resources/definitions/definitions.composite deleted file mode 100644 index 6e478e067d..0000000000 --- a/sca-java-2.x/trunk/itest/jms/definitions/src/main/resources/definitions/definitions.composite +++ /dev/null @@ -1,39 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://itest"
- targetNamespace="http://itest"
- name="DefinitionsTests">
-
- <component name="OneWayClient">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayClientImpl"/>
- <reference name="serviceA">
- <binding.jms requestConnection="itest:TestService" />
- </reference>
- </component>
-
- <component name="OneWayService">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayServiceImpl"/>
- <service name="OneWayService">
- <binding.jms requestConnection="itest:TestService" />
- </service>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/jms/definitions/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/definitions/src/main/resources/jndi.properties deleted file mode 100644 index d7f64fda62..0000000000 --- a/sca-java-2.x/trunk/itest/jms/definitions/src/main/resources/jndi.properties +++ /dev/null @@ -1,38 +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.
-## ---------------------------------------------------------------------------
-
-# START SNIPPET: jndi
-
-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
-
-# use the following property to configure the default connector
-java.naming.provider.url = vm://localhost?broker.persistent=false&broker.useJmx=false&broker.useShutdownHook=false
-
-# use the following property to specify the JNDI name the connection factory
-# should appear as.
-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry
-connectionFactoryNames = MyConnectionFactory
-
-# register some queues in JNDI using the form
-# queue.[jndiName] = [physicalName]
-queue.MyServiceQueue= MyServiceQueue
-
-# register some topics in JNDI using the form
-# topic.[jndiName] = [physicalName]
-#topic.MyTopic = example.MyTopic
-
-# END SNIPPET: jndi
diff --git a/sca-java-2.x/trunk/itest/jms/definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java b/sca-java-2.x/trunk/itest/jms/definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java deleted file mode 100644 index 729ad072b7..0000000000 --- a/sca-java-2.x/trunk/itest/jms/definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java +++ /dev/null @@ -1,62 +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.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- */
-public class DefinitionsTestCase {
-
- private Node node;
-
- @Before
- public void init() {
- node = NodeFactory.newInstance().createNode().start();
- }
-
- @Test
- public void testSayHello() throws Exception {
- OneWayService client = node.getService(OneWayService.class, "OneWayClient");
-
- client.sayHello("petra");
-
- // wait for up to 5 seconds but should wake up as soon as done
- synchronized(OneWayServiceImpl.lock) {
- if (OneWayServiceImpl.name == null) {
- OneWayServiceImpl.lock.wait(5000);
- }
- }
-
- assertEquals("petra", OneWayServiceImpl.name);
- }
-
- @After
- public void end() {
- if (node != null) {
- node.stop();
- }
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/exceptions/pom.xml b/sca-java-2.x/trunk/itest/jms/exceptions/pom.xml deleted file mode 100644 index 4189bb096e..0000000000 --- a/sca-java-2.x/trunk/itest/jms/exceptions/pom.xml +++ /dev/null @@ -1,90 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-jms-nonscaclient-exceptions</artifactId>
- <name>Apache Tuscany SCA iTest JMS NonSCA Client Exceptions</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jms-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>xmlunit</groupId>
- <artifactId>xmlunit</artifactId>
- <version>1.2</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.2.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java b/sca-java-2.x/trunk/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java deleted file mode 100644 index 469882f3b3..0000000000 --- a/sca-java-2.x/trunk/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java +++ /dev/null @@ -1,28 +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.binding.jms;
-
-public class CheckedExcpetion extends Exception {
- private static final long serialVersionUID = 1L;
-
- public CheckedExcpetion(String s) {
- super(s);
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java b/sca-java-2.x/trunk/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java deleted file mode 100644 index 19b584950a..0000000000 --- a/sca-java-2.x/trunk/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java +++ /dev/null @@ -1,28 +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.binding.jms;
-
-public class CheckedExcpetion2Args extends Exception {
- private static final long serialVersionUID = 1L;
-
- public CheckedExcpetion2Args(String s, Throwable e) {
- super(s, e);
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java b/sca-java-2.x/trunk/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java deleted file mode 100644 index b12e3a562e..0000000000 --- a/sca-java-2.x/trunk/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java +++ /dev/null @@ -1,28 +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.binding.jms;
-
-public class CheckedExcpetionChained extends Exception {
- private static final long serialVersionUID = 1L;
-
- public CheckedExcpetionChained(Throwable e) {
- super(e);
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java b/sca-java-2.x/trunk/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java deleted file mode 100644 index b23db73c01..0000000000 --- a/sca-java-2.x/trunk/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java +++ /dev/null @@ -1,28 +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.binding.jms;
-
-public class CheckedExcpetionNoArgs extends Exception {
- private static final long serialVersionUID = 1L;
-
- public CheckedExcpetionNoArgs() {
- super();
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java b/sca-java-2.x/trunk/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java deleted file mode 100644 index 9e4c4c46d4..0000000000 --- a/sca-java-2.x/trunk/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java +++ /dev/null @@ -1,33 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface ExceptionService {
-
- public void throwChecked() throws CheckedExcpetion;
- public void throwCheckedNoArgs() throws CheckedExcpetionNoArgs;
- public void throwChecked2Args() throws CheckedExcpetion2Args;
- public void throwCheckedChained() throws CheckedExcpetionChained;
-
- public void throwUnChecked();
-}
diff --git a/sca-java-2.x/trunk/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java b/sca-java-2.x/trunk/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java deleted file mode 100644 index 866acf1ce1..0000000000 --- a/sca-java-2.x/trunk/itest/jms/exceptions/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.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.binding.jms;
-
-public class ExceptionServiceImpl implements ExceptionService {
-
- public void throwChecked() throws CheckedExcpetion {
- throw new CheckedExcpetion("foo");
- }
-
- public void throwChecked2Args() throws CheckedExcpetion2Args {
- throw new CheckedExcpetion2Args("foo", new Exception("bla"));
- }
-
- public void throwCheckedChained() throws CheckedExcpetionChained {
- throw new CheckedExcpetionChained(new Exception("bla"));
- }
-
- public void throwCheckedNoArgs() throws CheckedExcpetionNoArgs {
- throw new CheckedExcpetionNoArgs();
- }
-
- public void throwUnChecked() {
- throw new RuntimeException("bla");
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/exceptions/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/exceptions/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 865bb39b4c..0000000000 --- a/sca-java-2.x/trunk/itest/jms/exceptions/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://itest">
- <deployable composite="itest:ExceptionServiceComposite"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/jms/exceptions/src/main/resources/exceptions/service.composite b/sca-java-2.x/trunk/itest/jms/exceptions/src/main/resources/exceptions/service.composite deleted file mode 100644 index 42e33330d7..0000000000 --- a/sca-java-2.x/trunk/itest/jms/exceptions/src/main/resources/exceptions/service.composite +++ /dev/null @@ -1,44 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://itest"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- name="ExceptionServiceComposite">
-
- <component name="TextExceptionService">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.ExceptionServiceImpl"/>
- <service name="ExceptionService">
- <binding.jms>
- <destination jndiName="TextExceptionService"/>
- </binding.jms>
- </service>
- </component>
-
- <component name="ObjectExceptionService">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.ExceptionServiceImpl"/>
- <service name="ExceptionService">
- <binding.jms>
- <tuscany:wireFormat.jmsObject/>
- <destination jndiName="ObjectExceptionService"/>
- </binding.jms>
- </service>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/jms/exceptions/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/exceptions/src/main/resources/jndi.properties deleted file mode 100644 index 72d5457faf..0000000000 --- a/sca-java-2.x/trunk/itest/jms/exceptions/src/main/resources/jndi.properties +++ /dev/null @@ -1,40 +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.
-## ---------------------------------------------------------------------------
-
-# START SNIPPET: jndi
-
-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
-
-# use the following property to configure the default connector
-java.naming.provider.url = vm://localhost?broker.persistent=false
-
-# use the following property to specify the JNDI name the connection factory
-# should appear as.
-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry
-connectionFactoryNames = ConnectionFactory
-
-# register some queues in JNDI using the form
-# queue.[jndiName] = [physicalName]
-queue.TextExceptionService = TextRequestQueue
-queue.ObjectExceptionService = ObjectRequestQueue
-queue.ResponseQueue = ResponseQueue
-
-# register some topics in JNDI using the form
-# topic.[jndiName] = [physicalName]
-#topic.MyTopic = example.MyTopic
-
-# END SNIPPET: jndi
diff --git a/sca-java-2.x/trunk/itest/jms/exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java b/sca-java-2.x/trunk/itest/jms/exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java deleted file mode 100644 index b266517282..0000000000 --- a/sca-java-2.x/trunk/itest/jms/exceptions/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java +++ /dev/null @@ -1,210 +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.binding.jms;
-
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-import java.util.Properties;
-
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.ObjectMessage;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.xml.sax.SAXException;
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class ExceptionsTestCase {
-
- private Node node;
- private Session session;
- private InitialContext context;
- private Connection connection;
-
- private static final String CHECKED_XML =
- "<ns2:CheckedExcpetion xmlns:ns2=\"http://jms.binding.sca.tuscany.apache.org/\"><message>foo</message></ns2:CheckedExcpetion>";
- private static final String CHECKED_NOARGS_XML = "<ns2:CheckedExcpetionNoArgs xmlns:ns2=\"http://jms.binding.sca.tuscany.apache.org/\" />";
- private static final String CHECKED_2ARGS_XML =
- "<ns2:CheckedExcpetion2Args xmlns:ns2=\"http://jms.binding.sca.tuscany.apache.org/\"><message>foo</message></ns2:CheckedExcpetion2Args>";
- private static final String CHECKED_CHAINED_XML =
- "<ns2:CheckedExcpetionChained xmlns:ns2=\"http://jms.binding.sca.tuscany.apache.org/\"><message>java.lang.Exception: bla</message></ns2:CheckedExcpetionChained>";
-
- @Before
- public void init() {
- node = NodeFactory.newInstance().createNode().start();
- }
-
- @Test
- public void testTextChecked() throws NamingException, JMSException, SAXException, IOException {
- sendJMSTextRequest("throwChecked");
- Message m = receiveJMSResponse();
- assertXMLEqual(CHECKED_XML, ((TextMessage)m).getText());
- }
-
- @Test
- public void testTextCheckedNoArgs() throws NamingException, JMSException, SAXException, IOException {
- sendJMSTextRequest("throwCheckedNoArgs");
- Message m = receiveJMSResponse();
- assertXMLEqual(CHECKED_NOARGS_XML, ((TextMessage)m).getText());
- }
-
- @Test
- public void testTextChecked2Args() throws NamingException, JMSException, SAXException, IOException {
- sendJMSTextRequest("throwChecked2Args");
- Message m = receiveJMSResponse();
- assertXMLEqual(CHECKED_2ARGS_XML, ((TextMessage)m).getText());
- }
-
- @Test
- public void testTextCheckedChained() throws NamingException, JMSException, SAXException, IOException {
- sendJMSTextRequest("throwCheckedChained");
- Message m = receiveJMSResponse();
- assertXMLEqual(CHECKED_CHAINED_XML, ((TextMessage)m).getText());
- }
-
- @Test
- public void testTextUnChecked() throws NamingException, JMSException, SAXException, IOException {
- sendJMSTextRequest("throwUnChecked");
- Message m = receiveJMSResponse();
-
- // FIXME: what should the response message be for unchecked exceptions with wireFormat.textXML???
- Object o = ((ObjectMessage)m).getObject();
- assertTrue(o instanceof RuntimeException);
- assertTrue(((RuntimeException)o).getMessage().startsWith("Message = bla"));
- }
-
- @Test
- public void testObjectChecked() throws NamingException, JMSException {
- sendJMSObjectRequest("throwChecked");
- Message m = receiveJMSResponse();
- Object o = ((ObjectMessage)m).getObject();
- assertTrue(o instanceof CheckedExcpetion);
- assertEquals("foo", ((CheckedExcpetion)o).getMessage());
- }
-
- @Test
- public void testObjectCheckedNoArgs() throws NamingException, JMSException {
- sendJMSObjectRequest("throwCheckedNoArgs");
- Message m = receiveJMSResponse();
- Object o = ((ObjectMessage)m).getObject();
- assertTrue(o instanceof CheckedExcpetionNoArgs);
- }
-
- @Test
- public void testObjectChecked2Args() throws NamingException, JMSException {
- sendJMSObjectRequest("throwChecked2Args");
- Message m = receiveJMSResponse();
- Object o = ((ObjectMessage)m).getObject();
- assertTrue(o instanceof CheckedExcpetion2Args);
- assertEquals("foo", ((CheckedExcpetion2Args)o).getMessage());
- assertEquals("bla", ((CheckedExcpetion2Args)o).getCause().getMessage());
- }
-
- @Test
- public void testObjectCheckedChained() throws NamingException, JMSException {
- sendJMSObjectRequest("throwCheckedChained");
- Message m = receiveJMSResponse();
- Object o = ((ObjectMessage)m).getObject();
- assertTrue(o instanceof CheckedExcpetionChained);
- assertEquals("bla", ((CheckedExcpetionChained)o).getCause().getMessage());
- }
-
- @Test
- public void testObjectUnChecked() throws NamingException, JMSException {
- sendJMSObjectRequest("throwUnChecked");
- Message m = receiveJMSResponse();
- Object o = ((ObjectMessage)m).getObject();
- assertTrue(o instanceof RuntimeException);
- assertTrue(((RuntimeException)o).getMessage().startsWith("Message = bla"));
- }
-
- @After
- public void end() throws JMSException {
- if (node != null) {
- node.stop();
- }
- if (connection != null) {
- connection.close();
- }
- }
-
- private void sendJMSTextRequest(String operationName) throws NamingException, JMSException {
- context = new InitialContext(new Properties());
- ConnectionFactory cf = (ConnectionFactory)context.lookup("ConnectionFactory");
- connection = cf.createConnection();
- connection.start();
-
- session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- Destination toDest = (Destination)context.lookup("TextExceptionService");
-
- TextMessage m = session.createTextMessage();
- m.setStringProperty("scaOperationName", operationName);
- m.setJMSReplyTo((Destination)context.lookup("ResponseQueue"));
- m.setText("<_ns_:" + operationName + " xmlns:_ns_=\"http://jms.binding.sca.tuscany.apache.org/\" />");
-
- MessageProducer producer = session.createProducer(toDest);
- producer.send(m);
- }
-
- private void sendJMSObjectRequest(String operationName) throws NamingException, JMSException {
- context = new InitialContext(new Properties());
- ConnectionFactory cf = (ConnectionFactory)context.lookup("ConnectionFactory");
- connection = cf.createConnection();
- connection.start();
-
- session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- Destination toDest = (Destination)context.lookup("ObjectExceptionService");
-
- ObjectMessage m = session.createObjectMessage();
- m.setStringProperty("scaOperationName", operationName);
- m.setJMSReplyTo((Destination)context.lookup("ResponseQueue"));
- m.setObject(new Object[0]);
-
- MessageProducer producer = session.createProducer(toDest);
- producer.send(m);
- }
-
- private Message receiveJMSResponse() throws NamingException, JMSException {
- Destination replyDest = (Destination)context.lookup("ResponseQueue");
- MessageConsumer consumer = session.createConsumer(replyDest);
- Message m = consumer.receive(5000);
- if (m == null) {
- throw new RuntimeException("No reply message received");
- }
- return m;
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/exceptions1/pom.xml b/sca-java-2.x/trunk/itest/jms/exceptions1/pom.xml deleted file mode 100644 index 5c6dbaaaa2..0000000000 --- a/sca-java-2.x/trunk/itest/jms/exceptions1/pom.xml +++ /dev/null @@ -1,83 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-jms-exceptions1</artifactId>
- <name>Apache Tuscany SCA iTest JMS with Exceptions1</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jms-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.2.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java b/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java deleted file mode 100644 index 469882f3b3..0000000000 --- a/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion.java +++ /dev/null @@ -1,28 +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.binding.jms;
-
-public class CheckedExcpetion extends Exception {
- private static final long serialVersionUID = 1L;
-
- public CheckedExcpetion(String s) {
- super(s);
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java b/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java deleted file mode 100644 index 19b584950a..0000000000 --- a/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java +++ /dev/null @@ -1,28 +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.binding.jms;
-
-public class CheckedExcpetion2Args extends Exception {
- private static final long serialVersionUID = 1L;
-
- public CheckedExcpetion2Args(String s, Throwable e) {
- super(s, e);
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java b/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java deleted file mode 100644 index b12e3a562e..0000000000 --- a/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java +++ /dev/null @@ -1,28 +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.binding.jms;
-
-public class CheckedExcpetionChained extends Exception {
- private static final long serialVersionUID = 1L;
-
- public CheckedExcpetionChained(Throwable e) {
- super(e);
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java b/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java deleted file mode 100644 index b23db73c01..0000000000 --- a/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java +++ /dev/null @@ -1,28 +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.binding.jms;
-
-public class CheckedExcpetionNoArgs extends Exception {
- private static final long serialVersionUID = 1L;
-
- public CheckedExcpetionNoArgs() {
- super();
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java b/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java deleted file mode 100644 index 9e4c4c46d4..0000000000 --- a/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java +++ /dev/null @@ -1,33 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface ExceptionService {
-
- public void throwChecked() throws CheckedExcpetion;
- public void throwCheckedNoArgs() throws CheckedExcpetionNoArgs;
- public void throwChecked2Args() throws CheckedExcpetion2Args;
- public void throwCheckedChained() throws CheckedExcpetionChained;
-
- public void throwUnChecked();
-}
diff --git a/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java b/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java deleted file mode 100644 index 02426936d2..0000000000 --- a/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java +++ /dev/null @@ -1,57 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(ExceptionService.class)
-public class ExceptionServiceClient implements ExceptionService {
-
- private ExceptionService service;
-
- @Reference
- public void setService(ExceptionService service) {
- this.service = service;
- }
-
- public void throwChecked() throws CheckedExcpetion {
- service.throwChecked();
- }
-
- public void throwChecked2Args() throws CheckedExcpetion2Args {
- service.throwChecked2Args();
- }
-
- public void throwCheckedChained() throws CheckedExcpetionChained {
- service.throwCheckedChained();
- }
-
- public void throwCheckedNoArgs() throws CheckedExcpetionNoArgs {
- service.throwCheckedNoArgs();
- }
-
- public void throwUnChecked() {
- service.throwUnChecked();
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java b/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java deleted file mode 100644 index 866acf1ce1..0000000000 --- a/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.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.binding.jms;
-
-public class ExceptionServiceImpl implements ExceptionService {
-
- public void throwChecked() throws CheckedExcpetion {
- throw new CheckedExcpetion("foo");
- }
-
- public void throwChecked2Args() throws CheckedExcpetion2Args {
- throw new CheckedExcpetion2Args("foo", new Exception("bla"));
- }
-
- public void throwCheckedChained() throws CheckedExcpetionChained {
- throw new CheckedExcpetionChained(new Exception("bla"));
- }
-
- public void throwCheckedNoArgs() throws CheckedExcpetionNoArgs {
- throw new CheckedExcpetionNoArgs();
- }
-
- public void throwUnChecked() {
- throw new RuntimeException("bla");
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 53504398bf..0000000000 --- a/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://itest">
- <deployable composite="itest:ExceptionServiceComposite"/>
- <deployable composite="itest:ExceptionClientComposite"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/resources/exceptions/client.composite b/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/resources/exceptions/client.composite deleted file mode 100644 index 86451dcf02..0000000000 --- a/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/resources/exceptions/client.composite +++ /dev/null @@ -1,31 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://itest"
- name="ExceptionClientComposite">
-
- <component name="ExceptionServiceClient">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.ExceptionServiceClient"/>
- <reference name="service">
- <binding.jms uri="jms:jndi:ExceptionService" />
- </reference>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/resources/exceptions/service.composite b/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/resources/exceptions/service.composite deleted file mode 100644 index dce41b86ac..0000000000 --- a/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/resources/exceptions/service.composite +++ /dev/null @@ -1,31 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://itest"
- name="ExceptionServiceComposite">
-
- <component name="ExceptionService">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.ExceptionServiceImpl"/>
- <service name="ExceptionService">
- <binding.jms />
- </service>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/resources/jndi.properties deleted file mode 100644 index f7875b52a2..0000000000 --- a/sca-java-2.x/trunk/itest/jms/exceptions1/src/main/resources/jndi.properties +++ /dev/null @@ -1,38 +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.
-## ---------------------------------------------------------------------------
-
-# START SNIPPET: jndi
-
-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
-
-# use the following property to configure the default connector
-java.naming.provider.url = vm://localhost?broker.persistent=false
-
-# use the following property to specify the JNDI name the connection factory
-# should appear as.
-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry
-connectionFactoryNames = ConnectionFactory
-
-# register some queues in JNDI using the form
-# queue.[jndiName] = [physicalName]
-queue.ExceptionService = ExceptionService
-
-# register some topics in JNDI using the form
-# topic.[jndiName] = [physicalName]
-#topic.MyTopic = example.MyTopic
-
-# END SNIPPET: jndi
diff --git a/sca-java-2.x/trunk/itest/jms/exceptions1/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java b/sca-java-2.x/trunk/itest/jms/exceptions1/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java deleted file mode 100644 index 9d3a55754c..0000000000 --- a/sca-java-2.x/trunk/itest/jms/exceptions1/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java +++ /dev/null @@ -1,111 +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.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class ExceptionsTestCase {
-
- private static Node node;
-
- @Before
- public void init() {
- node = NodeFactory.newInstance().createNode().start();
- }
-
- @Test
- public void testChecked() {
- ExceptionService service = node.getService(ExceptionService.class, "ExceptionServiceClient");
- try {
- service.throwChecked();
- fail();
- } catch (CheckedExcpetion e) {
- assertEquals("foo", e.getMessage());
- } catch (Throwable e) {
- fail();
- }
- }
-
- @Test
- public void testCheckedNoArgs() {
- ExceptionService service = node.getService(ExceptionService.class, "ExceptionServiceClient");
- try {
- service.throwCheckedNoArgs();
- fail();
- } catch (CheckedExcpetionNoArgs e) {
- // ok
- }
- }
-
- @Test
- public void testChecked2Args() {
- ExceptionService service = node.getService(ExceptionService.class, "ExceptionServiceClient");
- try {
- service.throwChecked2Args();
- fail();
- } catch (CheckedExcpetion2Args e) {
- assertEquals("foo", e.getMessage());
-// FIXME: TUSCANY-2848: lost the cause!
-// assertNotNull(e.getCause());
-// assertEquals("bla", e.getCause().getMessage());
- }
- }
-
- @Test
- public void testCheckedChained() {
- ExceptionService service = node.getService(ExceptionService.class, "ExceptionServiceClient");
- try {
- service.throwCheckedChained();
- fail();
- } catch (CheckedExcpetionChained e) {
- // FIXME: TUSCANY-2848: lost the cause!
-// assertNotNull(e.getCause());
-// assertEquals("bla", e.getCause().getMessage());
- }
- }
-
- @Test
- public void testUnChecked() {
- ExceptionService service = node.getService(ExceptionService.class, "ExceptionServiceClient");
- try {
- service.throwUnChecked();
- fail();
- } catch (Exception e) {
- assertTrue(e.getCause().getMessage().startsWith("Message = bla"));
- }
- }
-
- @After
- public void end() {
- if (node != null) {
- node.stop();
- }
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/externalBroker/pom.xml b/sca-java-2.x/trunk/itest/jms/externalBroker/pom.xml deleted file mode 100644 index ac890aa687..0000000000 --- a/sca-java-2.x/trunk/itest/jms/externalBroker/pom.xml +++ /dev/null @@ -1,83 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-jms-external-broker</artifactId>
- <name>Apache Tuscany SCA iTest JMS with External JMS Broker</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jms-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.2.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-2.x/trunk/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java deleted file mode 100644 index 9aef6ba1a3..0000000000 --- a/sca-java-2.x/trunk/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java +++ /dev/null @@ -1,41 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(HelloWorldService.class)
-public class HelloWorldClientImpl implements HelloWorldService {
-
- private HelloWorldService serviceA;
-
- @Reference
- public void setServiceA(HelloWorldService service) {
- this.serviceA = service;
- }
-
- public String sayHello(String name) {
- return serviceA.sayHello(name);
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java deleted file mode 100644 index 430c71aaef..0000000000 --- a/sca-java-2.x/trunk/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java +++ /dev/null @@ -1,26 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface HelloWorldService {
- String sayHello(String name);
-}
diff --git a/sca-java-2.x/trunk/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java deleted file mode 100644 index 2c6d9d0d17..0000000000 --- a/sca-java-2.x/trunk/itest/jms/externalBroker/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java +++ /dev/null @@ -1,30 +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.binding.jms;
-
-public class HelloWorldServiceImpl implements HelloWorldService {
-
- public String sayHello(String name) {
- if ("bang".equals(name)) {
- throw new RuntimeException("blem wit");
- }
- return "jmsHello " + name;
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/externalBroker/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/externalBroker/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 5883e9a2d8..0000000000 --- a/sca-java-2.x/trunk/itest/jms/externalBroker/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://itest">
- <deployable composite="itest:ExternalServiceComposite"/>
- <deployable composite="itest:ExternalClientComposite"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/jms/externalBroker/src/main/resources/external/client.composite b/sca-java-2.x/trunk/itest/jms/externalBroker/src/main/resources/external/client.composite deleted file mode 100644 index e27e3818f8..0000000000 --- a/sca-java-2.x/trunk/itest/jms/externalBroker/src/main/resources/external/client.composite +++ /dev/null @@ -1,36 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://itest"
- name="ExternalClientComposite">
-
- <component name="HelloWorldClient">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldClientImpl"/>
- <reference name="serviceA">
- <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61606">
- <destination jndiName="DestQueueA"/>
- <response>
- <destination jndiName="RespQueueA"/>
- </response>
- </binding.jms>
- </reference>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/jms/externalBroker/src/main/resources/external/service.composite b/sca-java-2.x/trunk/itest/jms/externalBroker/src/main/resources/external/service.composite deleted file mode 100644 index d5ab03e688..0000000000 --- a/sca-java-2.x/trunk/itest/jms/externalBroker/src/main/resources/external/service.composite +++ /dev/null @@ -1,36 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://itest"
- name="ExternalServiceComposite">
-
- <component name="HelloWorldService">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldServiceImpl"/>
- <service name="HelloWorldService">
- <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61606">
- <destination jndiName="DestQueueA" create="always"/>
- <response>
- <destination jndiName="RespQueueA" create="always"/>
- </response>
- </binding.jms>
- </service>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/jms/externalBroker/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/externalBroker/src/main/resources/jndi.properties deleted file mode 100644 index 4d6acc037b..0000000000 --- a/sca-java-2.x/trunk/itest/jms/externalBroker/src/main/resources/jndi.properties +++ /dev/null @@ -1,39 +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.
-## ---------------------------------------------------------------------------
-
-# START SNIPPET: jndi
-
-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
-
-# use the following property to configure the default connector
-java.naming.provider.url = vm://localhost?broker.persistent=false
-
-# use the following property to specify the JNDI name the connection factory
-# should appear as.
-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry
-connectionFactoryNames = ConnectionFactory
-
-# register some queues in JNDI using the form
-# queue.[jndiName] = [physicalName]
-queue.RequestQueue = RequestQueue
-queue.ResponseQueue = ResponseQueue
-
-# register some topics in JNDI using the form
-# topic.[jndiName] = [physicalName]
-#topic.MyTopic = example.MyTopic
-
-# END SNIPPET: jndi
diff --git a/sca-java-2.x/trunk/itest/jms/externalBroker/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java b/sca-java-2.x/trunk/itest/jms/externalBroker/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java deleted file mode 100644 index 53acb22e64..0000000000 --- a/sca-java-2.x/trunk/itest/jms/externalBroker/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java +++ /dev/null @@ -1,71 +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.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.activemq.broker.BrokerService;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Tests using the JMS binding with an external JMS broker
- */
-public class ExternalBrokerTestCase {
-
- private static Node node;
- private BrokerService broker;
-
- @Before
- public void init() throws Exception {
- startBroker();
- node = NodeFactory.newInstance().createNode().start();
- }
-
- @Test
- public void testHelloWorldCreate() throws Exception {
- HelloWorldService helloWorldService = node.getService(HelloWorldService.class, "HelloWorldClient");
- assertEquals("jmsHello Petra", helloWorldService.sayHello("Petra"));
- }
-
- @After
- public void end() throws Exception {
- if (node != null) {
- node.stop();
- }
- stopBroker();
- }
-
- protected void startBroker() throws Exception {
- broker = new BrokerService();
- broker.setPersistent(false);
- broker.setUseJmx(false);
- broker.addConnector("tcp://localhost:61606");
- broker.start();
- }
- protected void stopBroker() throws Exception {
- if (broker != null) {
- broker.stop();
- }
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsbytes/pom.xml b/sca-java-2.x/trunk/itest/jms/format-jmsbytes/pom.xml deleted file mode 100644 index fac0721715..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsbytes/pom.xml +++ /dev/null @@ -1,83 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-jms-format-jmsbytes</artifactId>
- <name>Apache Tuscany SCA iTest JMS Message Format jmsbytes</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jms-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.2.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java b/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java deleted file mode 100644 index 1acbfbd5ae..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java +++ /dev/null @@ -1,28 +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.binding.jms.format.jmsbytes.helloworld;
-
-public class CheckedException extends Exception {
- private static final long serialVersionUID = 1L;
-
- public CheckedException(String s) {
- super(s);
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java deleted file mode 100644 index 2d19d4bd82..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java +++ /dev/null @@ -1,32 +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.binding.jms.format.jmsbytes.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldReference {
-
- public String getGreetings(String message);
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java deleted file mode 100644 index 3ccd54e9bd..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java +++ /dev/null @@ -1,50 +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.binding.jms.format.jmsbytes.helloworld;
-
-import org.oasisopen.sca.annotation.Reference;
-
-
-public class HelloWorldReferenceImpl implements HelloWorldReference {
-
- @Reference
- protected HelloWorldServiceReference helloWorldService1;
-
- public String getGreetings(String name){
- byte[] bytesValue = helloWorldService1.getByteArrayGreetings(name.getBytes());
- String stringValue = new String(bytesValue);
-
- try {
- helloWorldService1.throwChecked(name.getBytes());
- } catch (Exception e) {
- // Test to see what happens if we talk to a service
- // that declares a checked exception through an
- // interface that doesn't
- stringValue += " " + e.getCause().getMessage();
- }
-
- try {
- helloWorldService1.throwUnChecked(name.getBytes());
- } catch (Exception e) {
- stringValue += " " + e.getMessage();
- }
- return stringValue;
- }
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java deleted file mode 100644 index b9a1ffd5ef..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.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.binding.jms.format.jmsbytes.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
- public byte[] getByteArrayGreetings(byte[] msg);
-
- public void throwChecked(byte[] msg) throws CheckedException;
- public void throwUnChecked(byte[] msg);
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java deleted file mode 100644 index b92959cfd3..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java +++ /dev/null @@ -1,40 +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.binding.jms.format.jmsbytes.helloworld;
-
-
-public class HelloWorldServiceImpl implements HelloWorldService {
-
- public byte[] getByteArrayGreetings(byte[] msg){
-
- String name = new String(msg);
- name = "Hello " + name;
-
- return name.getBytes();
- }
-
- public void throwChecked(byte[] msg) throws CheckedException {
- throw new CheckedException("foo");
- }
-
- public void throwUnChecked(byte[] msg) {
- throw new RuntimeException("bla");
- }
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java deleted file mode 100644 index ff5cf617f2..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.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.binding.jms.format.jmsbytes.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldServiceReference {
-
- public byte[] getByteArrayGreetings(byte[] msg);
-
- public void throwChecked(byte[] msg) ;
- public void throwUnChecked(byte[] msg);
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index ced023ecdd..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://itest">
- <deployable composite="itest:helloworld" />
-</contribution>
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/resources/jmsbytes/helloworld.composite b/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/resources/jmsbytes/helloworld.composite deleted file mode 100644 index cdd079810e..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/resources/jmsbytes/helloworld.composite +++ /dev/null @@ -1,45 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://itest"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- xmlns:hw="http://helloworld"
- name="helloworld">
-
- <component name="HelloWorldReferenceComponent">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld.HelloWorldReferenceImpl" />
- <reference name="helloWorldService1" >
- <binding.jms>
- <tuscany:wireFormat.jmsBytes/>
- <destination jndiName="HelloWorldService1"/>
- </binding.jms>
- </reference>
- </component>
-
- <component name="HelloWorldServiceComponent1">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld.HelloWorldServiceImpl" />
- <service name="HelloWorldService">
- <binding.jms>
- <tuscany:wireFormat.jmsBytes/>
- <destination jndiName="HelloWorldService1"/>
- </binding.jms>
- </service>
- </component>
-</composite>
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/resources/jndi.properties deleted file mode 100644 index 4d6acc037b..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/main/resources/jndi.properties +++ /dev/null @@ -1,39 +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.
-## ---------------------------------------------------------------------------
-
-# START SNIPPET: jndi
-
-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
-
-# use the following property to configure the default connector
-java.naming.provider.url = vm://localhost?broker.persistent=false
-
-# use the following property to specify the JNDI name the connection factory
-# should appear as.
-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry
-connectionFactoryNames = ConnectionFactory
-
-# register some queues in JNDI using the form
-# queue.[jndiName] = [physicalName]
-queue.RequestQueue = RequestQueue
-queue.ResponseQueue = ResponseQueue
-
-# register some topics in JNDI using the form
-# topic.[jndiName] = [physicalName]
-#topic.MyTopic = example.MyTopic
-
-# END SNIPPET: jndi
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java b/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java deleted file mode 100644 index 49cb0a69ab..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsbytes/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java +++ /dev/null @@ -1,69 +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.binding.jms.format;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld.HelloWorldReference;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class FormatJMSBytesTestCase {
-
- private Node node;
-
- @Before
- public void init() {
- node = NodeFactory.newInstance().createNode().start();
- }
-
- @Test
- public void testHelloWorldCreate() throws Exception {
- HelloWorldReference helloWorldService = node.getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
-
- System.out.println(helloWorldService.getGreetings("Fred Bloggs"));
-/* TUSCANY-2967 - disable this change while we decide what to do and
- * return faults as JMSObject messages to be consistent
- * again with other wire formats
- assertEquals("Hello Fred Bloggs " +
- "org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld.CheckedException: foo " +
- "org.osoa.sca.ServiceRuntimeException: java.lang.RuntimeException: bla",
- helloWorldService.getGreetings("Fred Bloggs"));
-*/
- assertEquals("Hello Fred Bloggs " +
- "foo " +
- "remote service exception, see nested exception" ,
- helloWorldService.getGreetings("Fred Bloggs"));
-
- }
-
- @After
- public void end() {
- if (node != null) {
- node.stop();
- }
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/pom.xml b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/pom.xml deleted file mode 100644 index 7705c82c55..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/pom.xml +++ /dev/null @@ -1,83 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-jms-format-jmsbytesxml</artifactId>
- <name>Apache Tuscany SCA iTest JMS Message Format jmsbytesxml</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jms-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.2.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java deleted file mode 100644 index 1684c19c50..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java +++ /dev/null @@ -1,28 +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.binding.jms.format.jmsbytesxml.helloworld;
-
-public class CheckedException extends Exception {
- private static final long serialVersionUID = 1L;
-
- public CheckedException(String s) {
- super(s);
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java deleted file mode 100644 index cc7b7b11e4..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java +++ /dev/null @@ -1,32 +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.binding.jms.format.jmsbytesxml.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldReference {
-
- public String getGreetings(String message);
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java deleted file mode 100644 index 3742bd6ac6..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java +++ /dev/null @@ -1,46 +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.binding.jms.format.jmsbytesxml.helloworld;
-
-import org.oasisopen.sca.annotation.Reference;
-
-public class HelloWorldReferenceImpl implements HelloWorldReference {
-
- @Reference
- protected HelloWorldService helloWorldService1;
-
- public String getGreetings(String name){
- byte[] bytesValue = helloWorldService1.getByteArrayGreetings(name.getBytes());
- String stringValue = new String(bytesValue);
-
- try {
- helloWorldService1.throwChecked(name.getBytes());
- } catch (CheckedException e) {
- stringValue += " " + e.getMessage();
- }
-
- try {
- helloWorldService1.throwUnChecked(name.getBytes());
- } catch (Exception e) {
- stringValue += " " + e.getMessage();
- }
- return stringValue;
- }
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java deleted file mode 100644 index eae95b4201..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java +++ /dev/null @@ -1,34 +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.binding.jms.format.jmsbytesxml.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
- public byte[] getByteArrayGreetings(byte[] msg);
-
- public void throwChecked(byte[] msg) throws CheckedException;
- public void throwUnChecked(byte[] msg);
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java deleted file mode 100644 index a37a03d994..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java +++ /dev/null @@ -1,39 +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.binding.jms.format.jmsbytesxml.helloworld;
-
-public class HelloWorldServiceImpl implements HelloWorldService {
-
- public byte[] getByteArrayGreetings(byte[] msg){
-
- String name = new String(msg);
- name = "Hello " + name;
-
- return name.getBytes();
- }
-
- public void throwChecked(byte[] msg) throws CheckedException {
- throw new CheckedException("foo");
- }
-
- public void throwUnChecked(byte[] msg) {
- throw new RuntimeException("bla");
- }
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index ced023ecdd..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://itest">
- <deployable composite="itest:helloworld" />
-</contribution>
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/resources/jmsbytesxml/helloworld.composite b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/resources/jmsbytesxml/helloworld.composite deleted file mode 100644 index f74ab86a14..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/resources/jmsbytesxml/helloworld.composite +++ /dev/null @@ -1,45 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://itest"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- xmlns:hw="http://helloworld"
- name="helloworld">
-
- <component name="HelloWorldReferenceComponent">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsbytesxml.helloworld.HelloWorldReferenceImpl" />
- <reference name="helloWorldService1" >
- <binding.jms>
- <tuscany:wireFormat.jmsBytesXML/>
- <destination jndiName="HelloWorldService1"/>
- </binding.jms>
- </reference>
- </component>
-
- <component name="HelloWorldServiceComponent1">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsbytesxml.helloworld.HelloWorldServiceImpl" />
- <service name="HelloWorldService">
- <binding.jms>
- <tuscany:wireFormat.jmsBytesXML/>
- <destination jndiName="HelloWorldService1"/>
- </binding.jms>
- </service>
- </component>
-</composite>
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/resources/jndi.properties deleted file mode 100644 index 4d6acc037b..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/main/resources/jndi.properties +++ /dev/null @@ -1,39 +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.
-## ---------------------------------------------------------------------------
-
-# START SNIPPET: jndi
-
-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
-
-# use the following property to configure the default connector
-java.naming.provider.url = vm://localhost?broker.persistent=false
-
-# use the following property to specify the JNDI name the connection factory
-# should appear as.
-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry
-connectionFactoryNames = ConnectionFactory
-
-# register some queues in JNDI using the form
-# queue.[jndiName] = [physicalName]
-queue.RequestQueue = RequestQueue
-queue.ResponseQueue = ResponseQueue
-
-# register some topics in JNDI using the form
-# topic.[jndiName] = [physicalName]
-#topic.MyTopic = example.MyTopic
-
-# END SNIPPET: jndi
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java deleted file mode 100644 index 53498ce44d..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java +++ /dev/null @@ -1,58 +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.binding.jms.format;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld.HelloWorldReference;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class FormatJMSBytesXMLTestCase {
-
- private static Node node;
-
- @Before
- public void init() {
- node = NodeFactory.newInstance().createNode().start();
- }
-
- @Test
- public void testHelloWorldCreate() throws Exception {
- HelloWorldReference helloWorldService = node.getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
-
- System.out.println(helloWorldService.getGreetings("Fred Bloggs"));
- assertEquals("Hello Fred Bloggs foo remote service exception, see nested exception", helloWorldService.getGreetings("Fred Bloggs"));
-
- }
-
- @After
- public void end() {
- if (node != null) {
- node.stop();
- }
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java deleted file mode 100644 index 1acbfbd5ae..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java +++ /dev/null @@ -1,28 +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.binding.jms.format.jmsbytes.helloworld;
-
-public class CheckedException extends Exception {
- private static final long serialVersionUID = 1L;
-
- public CheckedException(String s) {
- super(s);
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java deleted file mode 100644 index 2d19d4bd82..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java +++ /dev/null @@ -1,32 +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.binding.jms.format.jmsbytes.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldReference {
-
- public String getGreetings(String message);
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java deleted file mode 100644 index 3ccd54e9bd..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java +++ /dev/null @@ -1,50 +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.binding.jms.format.jmsbytes.helloworld;
-
-import org.oasisopen.sca.annotation.Reference;
-
-
-public class HelloWorldReferenceImpl implements HelloWorldReference {
-
- @Reference
- protected HelloWorldServiceReference helloWorldService1;
-
- public String getGreetings(String name){
- byte[] bytesValue = helloWorldService1.getByteArrayGreetings(name.getBytes());
- String stringValue = new String(bytesValue);
-
- try {
- helloWorldService1.throwChecked(name.getBytes());
- } catch (Exception e) {
- // Test to see what happens if we talk to a service
- // that declares a checked exception through an
- // interface that doesn't
- stringValue += " " + e.getCause().getMessage();
- }
-
- try {
- helloWorldService1.throwUnChecked(name.getBytes());
- } catch (Exception e) {
- stringValue += " " + e.getMessage();
- }
- return stringValue;
- }
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java deleted file mode 100644 index b9a1ffd5ef..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.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.binding.jms.format.jmsbytes.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
- public byte[] getByteArrayGreetings(byte[] msg);
-
- public void throwChecked(byte[] msg) throws CheckedException;
- public void throwUnChecked(byte[] msg);
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java deleted file mode 100644 index b92959cfd3..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java +++ /dev/null @@ -1,40 +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.binding.jms.format.jmsbytes.helloworld;
-
-
-public class HelloWorldServiceImpl implements HelloWorldService {
-
- public byte[] getByteArrayGreetings(byte[] msg){
-
- String name = new String(msg);
- name = "Hello " + name;
-
- return name.getBytes();
- }
-
- public void throwChecked(byte[] msg) throws CheckedException {
- throw new CheckedException("foo");
- }
-
- public void throwUnChecked(byte[] msg) {
- throw new RuntimeException("bla");
- }
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java deleted file mode 100644 index ff5cf617f2..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsbytesxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.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.binding.jms.format.jmsbytes.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldServiceReference {
-
- public byte[] getByteArrayGreetings(byte[] msg);
-
- public void throwChecked(byte[] msg) ;
- public void throwUnChecked(byte[] msg);
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsdefault/pom.xml b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/pom.xml deleted file mode 100644 index 85cd35ec82..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsdefault/pom.xml +++ /dev/null @@ -1,83 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-jms-format-jmsdefault</artifactId>
- <name>Apache Tuscany SCA iTest JMS Message Format jmsdefault</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jms-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.2.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java deleted file mode 100644 index 1acbfbd5ae..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java +++ /dev/null @@ -1,28 +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.binding.jms.format.jmsbytes.helloworld;
-
-public class CheckedException extends Exception {
- private static final long serialVersionUID = 1L;
-
- public CheckedException(String s) {
- super(s);
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java deleted file mode 100644 index 2d19d4bd82..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java +++ /dev/null @@ -1,32 +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.binding.jms.format.jmsbytes.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldReference {
-
- public String getGreetings(String message);
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java deleted file mode 100644 index 3ccd54e9bd..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java +++ /dev/null @@ -1,50 +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.binding.jms.format.jmsbytes.helloworld;
-
-import org.oasisopen.sca.annotation.Reference;
-
-
-public class HelloWorldReferenceImpl implements HelloWorldReference {
-
- @Reference
- protected HelloWorldServiceReference helloWorldService1;
-
- public String getGreetings(String name){
- byte[] bytesValue = helloWorldService1.getByteArrayGreetings(name.getBytes());
- String stringValue = new String(bytesValue);
-
- try {
- helloWorldService1.throwChecked(name.getBytes());
- } catch (Exception e) {
- // Test to see what happens if we talk to a service
- // that declares a checked exception through an
- // interface that doesn't
- stringValue += " " + e.getCause().getMessage();
- }
-
- try {
- helloWorldService1.throwUnChecked(name.getBytes());
- } catch (Exception e) {
- stringValue += " " + e.getMessage();
- }
- return stringValue;
- }
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java deleted file mode 100644 index b9a1ffd5ef..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.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.binding.jms.format.jmsbytes.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
- public byte[] getByteArrayGreetings(byte[] msg);
-
- public void throwChecked(byte[] msg) throws CheckedException;
- public void throwUnChecked(byte[] msg);
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java deleted file mode 100644 index b92959cfd3..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java +++ /dev/null @@ -1,40 +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.binding.jms.format.jmsbytes.helloworld;
-
-
-public class HelloWorldServiceImpl implements HelloWorldService {
-
- public byte[] getByteArrayGreetings(byte[] msg){
-
- String name = new String(msg);
- name = "Hello " + name;
-
- return name.getBytes();
- }
-
- public void throwChecked(byte[] msg) throws CheckedException {
- throw new CheckedException("foo");
- }
-
- public void throwUnChecked(byte[] msg) {
- throw new RuntimeException("bla");
- }
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java deleted file mode 100644 index ff5cf617f2..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.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.binding.jms.format.jmsbytes.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldServiceReference {
-
- public byte[] getByteArrayGreetings(byte[] msg);
-
- public void throwChecked(byte[] msg) ;
- public void throwUnChecked(byte[] msg);
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java deleted file mode 100644 index 530eac3d00..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java +++ /dev/null @@ -1,28 +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.binding.jms.format.jmsdefault.helloworld;
-
-public class CheckedException extends Exception {
- private static final long serialVersionUID = 1L;
-
- public CheckedException(String s) {
- super(s);
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java deleted file mode 100644 index 1768816247..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java +++ /dev/null @@ -1,36 +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.binding.jms.format.jmsdefault.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldReference {
-
- public String getGreetings(String name);
-
- public String getPersonGreetings(Person person);
-
- public void nullInVoidOut();
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java deleted file mode 100644 index d0a5faaef7..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.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.binding.jms.format.jmsdefault.helloworld;
-
-import org.oasisopen.sca.annotation.Reference;
-
-public class HelloWorldReferenceImpl implements HelloWorldReference {
-
- @Reference
- protected HelloWorldService helloWorldService1;
-
- @Reference
- protected HelloWorldService helloWorldService2;
-
- @Reference
- protected HelloWorldService helloWorldService3;
-
- @Reference
- protected HelloWorldService helloWorldService4;
-
- public String getGreetings(String name){
- String stringValue = helloWorldService1.getGreetings(name) + " " +
- helloWorldService2.getGreetings(name) + " " +
- helloWorldService3.getGreetings(name) + " " +
- helloWorldService4.getGreetings(name);
-
- try {
- helloWorldService3.throwChecked(name);
- } catch (CheckedException e) {
- stringValue += " " + e.getMessage();
- }
-
- try {
- helloWorldService3.throwUnChecked(name);
- } catch (Exception e) {
- stringValue += " " + e.getMessage();
- }
-
- try {
- helloWorldService4.throwChecked(name);
- } catch (CheckedException e) {
- stringValue += " " + e.getMessage();
- }
-
- try {
- helloWorldService4.throwUnChecked(name);
- } catch (Exception e) {
- stringValue += " " + e.getMessage();
- }
-
- return stringValue;
- }
-
- public String getPersonGreetings(Person person){
- return helloWorldService1.getPersonGreetings(person) + " " +
- helloWorldService2.getPersonGreetings(person) + " " +
- helloWorldService3.getPersonGreetings(person) + " " +
- helloWorldService4.getPersonGreetings(person);
- }
-
- public void nullInVoidOut() {
- helloWorldService1.nullInVoidOut();
- helloWorldService2.nullInVoidOut();
- helloWorldService3.nullInVoidOut();
- helloWorldService4.nullInVoidOut();
-
- }
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java deleted file mode 100644 index 204863423d..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java +++ /dev/null @@ -1,38 +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.binding.jms.format.jmsdefault.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
- public String getGreetings(String name);
-
- public String getPersonGreetings(Person person);
-
- public void nullInVoidOut();
-
- public void throwChecked(String msg) throws CheckedException;
- public void throwUnChecked(String msg);
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java deleted file mode 100644 index b143079fe3..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.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.binding.jms.format.jmsdefault.helloworld;
-
-
-public class HelloWorldServiceImpl implements HelloWorldService {
-
- public static int nullInVoidOutCalled = 0;
-
- public String getGreetings(String name){
- String response = "Hello " + name;
- System.out.println("getGreetings: " + response);
- return response;
- }
-
- public String getPersonGreetings(Person person){
- String response = "Hello " + person.getFirstName() + " " + person.getLastName();
- System.out.println("getPersonGreetings: " + response);
- return response;
- }
-
- public void nullInVoidOut() {
- System.out.println("nullInVoidOut");
- nullInVoidOutCalled++;
- }
-
- public void throwChecked(String msg) throws CheckedException {
- throw new CheckedException("foo");
- }
-
- public void throwUnChecked(String msg) {
- throw new RuntimeException("bla");
- }
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java deleted file mode 100644 index b62d1b1f1d..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java +++ /dev/null @@ -1,42 +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.binding.jms.format.jmsdefault.helloworld;
-
-public class Person {
- String firstName;
- String lastName;
-
- public String getFirstName() {
- return firstName;
- }
-
- public void setFirstName(String firstName) {
- this.firstName = firstName;
- }
-
- public String getLastName() {
- return lastName;
- }
-
- public void setLastName(String lastName) {
- this.lastName = lastName;
- }
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index ced023ecdd..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://itest">
- <deployable composite="itest:helloworld" />
-</contribution>
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.composite b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.composite deleted file mode 100644 index 56285ad234..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.composite +++ /dev/null @@ -1,94 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://itest"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- xmlns:hw="http://helloworld"
- name="helloworld">
-
- <component name="HelloWorldReferenceComponent">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.HelloWorldReferenceImpl" />
- <reference name="helloWorldService1" >
- <binding.jms>
- <destination jndiName="HelloWorldService1"/>
- </binding.jms>
- </reference>
- <reference name="helloWorldService2" >
- <binding.jms>
- <wireFormat.jmsDefault/>
- <destination jndiName="HelloWorldService2"/>
- </binding.jms>
- </reference>
- <reference name="helloWorldService3" >
- <binding.jms>
- <wireFormat.jmsDefault/>
- <destination jndiName="HelloWorldService3"/>
- </binding.jms>
- </reference>
- <reference name="helloWorldService4" >
- <binding.jms>
- <wireFormat.jmsDefault/>
- <destination jndiName="HelloWorldService4"/>
- </binding.jms>
- </reference>
- </component>
-
- <component name="HelloWorldServiceComponent1">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.HelloWorldServiceImpl" />
- <service name="HelloWorldService">
- <binding.jms>
- <destination jndiName="HelloWorldService1"/>
- </binding.jms>
- </service>
- </component>
-
- <component name="HelloWorldServiceComponent2">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.HelloWorldServiceImpl" />
- <service name="HelloWorldService">
- <interface.java interface="org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.HelloWorldService" />
- <binding.jms>
- <destination jndiName="HelloWorldService2"/>
- </binding.jms>
- </service>
- </component>
-
- <component name="HelloWorldServiceComponent3">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.HelloWorldServiceImpl" />
- <service name="HelloWorldService">
- <!--interface.wsdl interface="http://helloworld/textxml#wsdl.interface(HelloWorld)" /-->
- <binding.jms>
- <wireFormat.jmsDefault />
- <destination jndiName="HelloWorldService3"/>
- </binding.jms>
- </service>
- </component>
-
- <component name="HelloWorldServiceComponent4">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.HelloWorldServiceImpl" />
- <service name="HelloWorldService">
- <!--interface.wsdl interface="http://helloworld/textxml#wsdl.interface(HelloWorld)" /-->
- <binding.jms>
- <wireFormat.jmsDefault />
- <destination jndiName="HelloWorldService4"/>
- </binding.jms>
- </service>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.wsdl b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.wsdl deleted file mode 100644 index 935a2e73c5..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/resources/jmsdefault/helloworld.wsdl +++ /dev/null @@ -1,139 +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.
--->
-<wsdl:definitions targetNamespace="http://helloworld/textxml" xmlns:tns="http://helloworld/textxml" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- name="helloworld">
-
- <wsdl:types>
- <schema elementFormDefault="qualified" targetNamespace="http://helloworld/textxml" xmlns="http://www.w3.org/2001/XMLSchema">
-
- <element name="getGreetings">
- <complexType>
- <sequence>
- <element name="name" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
-
- <element name="getGreetingsResponse">
- <complexType>
- <sequence>
- <element name="getGreetingsReturn" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
-
- </schema>
- <schema elementFormDefault="qualified" targetNamespace="http://helloworld/textxml" xmlns="http://www.w3.org/2001/XMLSchema">
-
- <xsd:complexType name="PersonType">
- <xsd:sequence>
- <xsd:element name="firstName" type="xsd:string"/>
- <xsd:element name="lastName" type="xsd:string"/>
- </xsd:sequence>
- </xsd:complexType>
-
- <element name="getPersonGreetings">
- <complexType>
- <sequence>
- <element name="person" type="PersonType"/>
- </sequence>
- </complexType>
- </element>
-
- <element name="getPersonGreetingsResponse">
- <complexType>
- <sequence>
- <element name="getPersonGreetingsReturn" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
- </schema>
-
- </wsdl:types>
-
- <wsdl:message name="getGreetingsRequest">
- <wsdl:part element="tns:getGreetings" name="parameters"/>
- </wsdl:message>
-
- <wsdl:message name="getGreetingsResponse">
- <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>
- </wsdl:message>
-
- <wsdl:message name="getPersonGreetingsRequest">
- <wsdl:part element="tns:getPersonGreetings" name="parameters"/>
- </wsdl:message>
-
- <wsdl:message name="getPersonGreetingsResponse">
- <wsdl:part element="tns:getPersonGreetingsResponse" name="parameters"/>
- </wsdl:message>
-
- <wsdl:portType name="HelloWorld">
- <wsdl:operation name="getGreetings">
- <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>
- <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>
- </wsdl:operation>
- <wsdl:operation name="getPersonGreetings">
- <wsdl:input message="tns:getPersonGreetingsRequest" name="getPersonGreetingsRequest"/>
- <wsdl:output message="tns:getPersonGreetingsResponse" name="getPersonGreetingsResponse"/>
- </wsdl:operation>
- </wsdl:portType>
-
- <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
- <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <wsdl:operation name="getGreetings">
- <wsdlsoap:operation soapAction=""/>
- <wsdl:input name="getGreetingsRequest">
- <wsdlsoap:body use="literal"/>
- </wsdl:input>
- <wsdl:output name="getGreetingsResponse">
- <wsdlsoap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getPersonGreetings">
- <wsdlsoap:operation soapAction=""/>
- <wsdl:input name="getPersonGreetingsRequest">
- <wsdlsoap:body use="literal"/>
- </wsdl:input>
- <wsdl:output name="getPersonGreetingsResponse">
- <wsdlsoap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
-
- <!-- wsdl:binding name="HelloWorldSoapJmsBinding" type="tns:HelloWorld">
- <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/jms"/>
- <wsdl:operation name="getGreetings">
- <wsdlsoap:operation soapAction=""/>
- <wsdl:input name="getGreetingsRequest">
- <wsdlsoap:body use="literal"/>
- </wsdl:input>
- <wsdl:output name="getGreetingsResponse">
- <wsdlsoap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding-->
-
- <wsdl:service name="HelloWorldService">
- <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
- <wsdlsoap:address location="http://localhost:8085/HelloWorldService"/>
- </wsdl:port>
- </wsdl:service>
-
-</wsdl:definitions>
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/resources/jndi.properties deleted file mode 100644 index 4d6acc037b..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/main/resources/jndi.properties +++ /dev/null @@ -1,39 +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.
-## ---------------------------------------------------------------------------
-
-# START SNIPPET: jndi
-
-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
-
-# use the following property to configure the default connector
-java.naming.provider.url = vm://localhost?broker.persistent=false
-
-# use the following property to specify the JNDI name the connection factory
-# should appear as.
-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry
-connectionFactoryNames = ConnectionFactory
-
-# register some queues in JNDI using the form
-# queue.[jndiName] = [physicalName]
-queue.RequestQueue = RequestQueue
-queue.ResponseQueue = ResponseQueue
-
-# register some topics in JNDI using the form
-# topic.[jndiName] = [physicalName]
-#topic.MyTopic = example.MyTopic
-
-# END SNIPPET: jndi
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java b/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java deleted file mode 100644 index 78c0239f0d..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsdefault/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java +++ /dev/null @@ -1,68 +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.binding.jms.format;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.HelloWorldReference;
-import org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.HelloWorldServiceImpl;
-import org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.Person;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class FormatJMSDefaultTestCase {
-
- private static Node node;
-
- @Before
- public void init() {
- node = NodeFactory.newInstance().createNode().start();
- }
-
- @Test
- public void testHelloWorldCreate() throws Exception {
- HelloWorldReference helloWorldService = node.getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
-
- assertEquals("Hello Fred Bloggs Hello Fred Bloggs Hello Fred Bloggs Hello Fred Bloggs foo remote service exception, see nested exception foo remote service exception, see nested exception", helloWorldService.getGreetings("Fred Bloggs"));
-
- Person person = new Person();
- person.setFirstName("Fred");
- person.setLastName("Bloggs");
- assertEquals("Hello Fred Bloggs Hello Fred Bloggs Hello Fred Bloggs Hello Fred Bloggs", helloWorldService.getPersonGreetings(person));
-
- // this just makes sure that there are no exceptions thrown for this case
- helloWorldService.nullInVoidOut();
- Assert.assertEquals(4, HelloWorldServiceImpl.nullInVoidOutCalled);
- }
-
- @After
- public void end() {
- if (node != null) {
- node.stop();
- }
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsmessage/pom.xml b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/pom.xml deleted file mode 100644 index 312dea14fa..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsmessage/pom.xml +++ /dev/null @@ -1,83 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-jms-format-jmsmessage</artifactId>
- <name>Apache Tuscany SCA iTest JMS Message Format jmsmessage</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jms-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.2.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java deleted file mode 100644 index 1acbfbd5ae..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java +++ /dev/null @@ -1,28 +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.binding.jms.format.jmsbytes.helloworld;
-
-public class CheckedException extends Exception {
- private static final long serialVersionUID = 1L;
-
- public CheckedException(String s) {
- super(s);
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java deleted file mode 100644 index 2d19d4bd82..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java +++ /dev/null @@ -1,32 +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.binding.jms.format.jmsbytes.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldReference {
-
- public String getGreetings(String message);
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java deleted file mode 100644 index 3ccd54e9bd..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java +++ /dev/null @@ -1,50 +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.binding.jms.format.jmsbytes.helloworld;
-
-import org.oasisopen.sca.annotation.Reference;
-
-
-public class HelloWorldReferenceImpl implements HelloWorldReference {
-
- @Reference
- protected HelloWorldServiceReference helloWorldService1;
-
- public String getGreetings(String name){
- byte[] bytesValue = helloWorldService1.getByteArrayGreetings(name.getBytes());
- String stringValue = new String(bytesValue);
-
- try {
- helloWorldService1.throwChecked(name.getBytes());
- } catch (Exception e) {
- // Test to see what happens if we talk to a service
- // that declares a checked exception through an
- // interface that doesn't
- stringValue += " " + e.getCause().getMessage();
- }
-
- try {
- helloWorldService1.throwUnChecked(name.getBytes());
- } catch (Exception e) {
- stringValue += " " + e.getMessage();
- }
- return stringValue;
- }
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java deleted file mode 100644 index b9a1ffd5ef..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.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.binding.jms.format.jmsbytes.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
- public byte[] getByteArrayGreetings(byte[] msg);
-
- public void throwChecked(byte[] msg) throws CheckedException;
- public void throwUnChecked(byte[] msg);
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java deleted file mode 100644 index b92959cfd3..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java +++ /dev/null @@ -1,40 +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.binding.jms.format.jmsbytes.helloworld;
-
-
-public class HelloWorldServiceImpl implements HelloWorldService {
-
- public byte[] getByteArrayGreetings(byte[] msg){
-
- String name = new String(msg);
- name = "Hello " + name;
-
- return name.getBytes();
- }
-
- public void throwChecked(byte[] msg) throws CheckedException {
- throw new CheckedException("foo");
- }
-
- public void throwUnChecked(byte[] msg) {
- throw new RuntimeException("bla");
- }
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java deleted file mode 100644 index ff5cf617f2..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.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.binding.jms.format.jmsbytes.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldServiceReference {
-
- public byte[] getByteArrayGreetings(byte[] msg);
-
- public void throwChecked(byte[] msg) ;
- public void throwUnChecked(byte[] msg);
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java deleted file mode 100644 index 490bd5d4a3..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java +++ /dev/null @@ -1,32 +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.binding.jms.format.jmsmessage.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldReference {
-
- public String getGreetings(String message);
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java deleted file mode 100644 index 5aed6b12d7..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java +++ /dev/null @@ -1,41 +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.binding.jms.format.jmsmessage.helloworld;
-
-import org.oasisopen.sca.annotation.Reference;
-
-
-public class HelloWorldReferenceImpl implements HelloWorldReference {
-
- @Reference
- protected HelloWorldServiceReferenceSide helloWorldService1;
-
- public String getGreetings(String name){
- helloWorldService1.getGreetings(name);
-
- try {
- Thread.sleep(2000);
- } catch (Exception ex) {
- // do nothing
- }
-
- return HelloWorldServiceImpl.getGreetings();
- }
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java deleted file mode 100644 index efe2f1a4dc..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java +++ /dev/null @@ -1,34 +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.binding.jms.format.jmsmessage.helloworld;
-
-import org.oasisopen.sca.annotation.OneWay;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
- @OneWay
- public void onMessage(javax.jms.Message message);
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java deleted file mode 100644 index c1011ce6fb..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.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.binding.jms.format.jmsmessage.helloworld;
-
-import javax.jms.TextMessage;
-
-public class HelloWorldServiceImpl implements HelloWorldService {
-
- private static String greetings = "not set";
-
- public void onMessage(javax.jms.Message message){
-
- String name = null;
-
- try {
- name = ((TextMessage)message).getText();
- } catch (Exception ex) {
- name = "EXCEPTION";
- }
- greetings = "Hello " + name;
- }
-
- public static String getGreetings(){
- return greetings;
- }
-
- // javax.jms.BytesMessage
- // javax.jms.MapMessage
- // javax.jms.ObjectMessage
- // javax.jms.StreamMessage
- // javax.jms.TextMessage
-
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java deleted file mode 100644 index d863b3a0a3..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.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.binding.jms.format.jmsmessage.helloworld;
-
-import javax.jws.soap.SOAPBinding;
-
-import org.oasisopen.sca.annotation.OneWay;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldServiceReferenceSide {
-
- @OneWay
- @SOAPBinding(parameterStyle=SOAPBinding.ParameterStyle.BARE)
- public void getGreetings(String message);
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README deleted file mode 100644 index 0f7a730b91..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README +++ /dev/null @@ -1,3 +0,0 @@ -This test uses an SCA composite to fake a scenario where the reference is an SCA reference but the
-service is a non-SCA JMS endpoint. This gives us the opportunity to play about with the interface
-configuration at the reference to see how the contents of the JMS message can be controlled.
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index ced023ecdd..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://itest">
- <deployable composite="itest:helloworld" />
-</contribution>
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.composite b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.composite deleted file mode 100644 index 48608ba9b3..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.composite +++ /dev/null @@ -1,46 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://itest"
- xmlns:hw="http://helloworld"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- name="helloworld">
-
- <component name="HelloWorldReferenceComponent">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsmessage.helloworld.HelloWorldReferenceImpl" />
- <reference name="helloWorldService1" >
- <!--interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)"/-->
- <interface.java interface="org.apache.tuscany.sca.binding.jms.format.jmsmessage.helloworld.HelloWorldServiceReferenceSide"/>
- <binding.jms>
- <tuscany:wireFormat.jmsText/>
- <destination jndiName="HelloWorldService1"/>
- </binding.jms>
- </reference>
- </component>
-
- <component name="HelloWorldServiceComponent1">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsmessage.helloworld.HelloWorldServiceImpl" />
- <service name="HelloWorldService">
- <binding.jms>
- <destination jndiName="HelloWorldService1"/>
- </binding.jms>
- </service>
- </component>
-</composite>
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.wsdl b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.wsdl deleted file mode 100644 index f72ce434fa..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/resources/jmsmessage/helloworld.wsdl +++ /dev/null @@ -1,129 +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.
--->
-<wsdl:definitions targetNamespace="http://helloworld" xmlns:tns="http://helloworld" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- name="helloworld">
-
- <wsdl:types>
- <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema">
-
- <xsd:complexType name="PersonType">
- <xsd:sequence>
- <xsd:element name="firstName" type="xsd:string"/>
- <xsd:element name="lastName" type="xsd:string"/>
- </xsd:sequence>
- </xsd:complexType>
-
- <element name="getPersonGreetings">
- <complexType>
- <sequence>
- <element name="person" type="PersonType"/>
- </sequence>
- </complexType>
- </element>
-
- <element name="getPersonGreetingsResponse">
- <complexType>
- <sequence>
- <element name="getPersonGreetingsReturn" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
-
- <element name="getGreetings">
- <complexType>
- <sequence>
- <element name="name" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
-
- <element name="getGreetingsResponse">
- <complexType>
- <sequence>
- <element name="getGreetingsReturn" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
-
- </schema>
- </wsdl:types>
-
- <wsdl:message name="getGreetingsRequest">
- <!-- wsdl:part element="tns:getGreetings" name="parameters"/-->
- <wsdl:part type="xsd:string" name="parameters"/>
- </wsdl:message>
-
- <wsdl:message name="getGreetingsResponse">
- <!-- wsdl:part element="tns:getGreetingsResponse" name="parameters"/-->
- <wsdl:part type="xsd:string" name="parameters"/>
- </wsdl:message>
-
- <!-- wsdl:message name="getPersonGreetingsRequest">
- <wsdl:part element="tns:getPersonGreetings" name="parameters"/>
- </wsdl:message>
-
- <wsdl:message name="getPersonGreetingsResponse">
- <wsdl:part element="tns:getPersonGreetingsResponse" name="parameters"/>
- </wsdl:message-->
-
- <wsdl:portType name="HelloWorld">
- <wsdl:operation name="getGreetings">
- <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>
- <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>
- </wsdl:operation>
- <!-- wsdl:operation name="getPersonGreetings">
- <wsdl:input message="tns:getPersonGreetingsRequest" name="getPersonGreetingsRequest"/>
- <wsdl:output message="tns:getPersonGreetingsResponse" name="getPersonGreetingsResponse"/>
- </wsdl:operation-->
- </wsdl:portType>
-
- <!-- wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
- <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <wsdl:operation name="getGreetings">
- <wsdlsoap:operation soapAction=""/>
- <wsdl:input name="getGreetingsRequest">
- <wsdlsoap:body use="literal"/>
- </wsdl:input>
- <wsdl:output name="getGreetingsResponse">
- <wsdlsoap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding-->
-
- <!-- wsdl:binding name="HelloWorldSoapJmsBinding" type="tns:HelloWorld">
- <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/jms"/>
- <wsdl:operation name="getGreetings">
- <wsdlsoap:operation soapAction=""/>
- <wsdl:input name="getGreetingsRequest">
- <wsdlsoap:body use="literal"/>
- </wsdl:input>
- <wsdl:output name="getGreetingsResponse">
- <wsdlsoap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding-->
-
- <!-- wsdl:service name="HelloWorldService">
- <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
- <wsdlsoap:address location="http://localhost:8085/HelloWorldService"/>
- </wsdl:port>
- </wsdl:service-->
-
-</wsdl:definitions>
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/resources/jndi.properties deleted file mode 100644 index 4d6acc037b..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/main/resources/jndi.properties +++ /dev/null @@ -1,39 +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.
-## ---------------------------------------------------------------------------
-
-# START SNIPPET: jndi
-
-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
-
-# use the following property to configure the default connector
-java.naming.provider.url = vm://localhost?broker.persistent=false
-
-# use the following property to specify the JNDI name the connection factory
-# should appear as.
-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry
-connectionFactoryNames = ConnectionFactory
-
-# register some queues in JNDI using the form
-# queue.[jndiName] = [physicalName]
-queue.RequestQueue = RequestQueue
-queue.ResponseQueue = ResponseQueue
-
-# register some topics in JNDI using the form
-# topic.[jndiName] = [physicalName]
-#topic.MyTopic = example.MyTopic
-
-# END SNIPPET: jndi
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java b/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java deleted file mode 100644 index f47031da10..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsmessage/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java +++ /dev/null @@ -1,58 +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.binding.jms.format;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.binding.jms.format.jmsmessage.helloworld.HelloWorldReference;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class FormatJMSMessageTestCase {
-
- private static Node node;
-
- @Before
- public void init() {
- node = NodeFactory.newInstance().createNode().start();
- }
-
- @Test
- public void testHelloWorldCreate() throws Exception {
- HelloWorldReference helloWorldService = node.getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
-
- System.out.println(helloWorldService.getGreetings("Fred Bloggs"));
- assertEquals("Hello Fred Bloggs", helloWorldService.getGreetings("Fred Bloggs"));
-
- }
-
- @After
- public void end() {
- if (node != null) {
- node.stop();
- }
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsobject/pom.xml b/sca-java-2.x/trunk/itest/jms/format-jmsobject/pom.xml deleted file mode 100644 index 9e784d5f4f..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsobject/pom.xml +++ /dev/null @@ -1,83 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-jms-format-jmsobject</artifactId>
- <name>Apache Tuscany SCA iTest JMS Message Format jmsobject</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jms-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.2.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java deleted file mode 100644 index 1acbfbd5ae..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java +++ /dev/null @@ -1,28 +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.binding.jms.format.jmsbytes.helloworld;
-
-public class CheckedException extends Exception {
- private static final long serialVersionUID = 1L;
-
- public CheckedException(String s) {
- super(s);
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java deleted file mode 100644 index 2d19d4bd82..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java +++ /dev/null @@ -1,32 +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.binding.jms.format.jmsbytes.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldReference {
-
- public String getGreetings(String message);
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java deleted file mode 100644 index 3ccd54e9bd..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java +++ /dev/null @@ -1,50 +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.binding.jms.format.jmsbytes.helloworld;
-
-import org.oasisopen.sca.annotation.Reference;
-
-
-public class HelloWorldReferenceImpl implements HelloWorldReference {
-
- @Reference
- protected HelloWorldServiceReference helloWorldService1;
-
- public String getGreetings(String name){
- byte[] bytesValue = helloWorldService1.getByteArrayGreetings(name.getBytes());
- String stringValue = new String(bytesValue);
-
- try {
- helloWorldService1.throwChecked(name.getBytes());
- } catch (Exception e) {
- // Test to see what happens if we talk to a service
- // that declares a checked exception through an
- // interface that doesn't
- stringValue += " " + e.getCause().getMessage();
- }
-
- try {
- helloWorldService1.throwUnChecked(name.getBytes());
- } catch (Exception e) {
- stringValue += " " + e.getMessage();
- }
- return stringValue;
- }
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java deleted file mode 100644 index b9a1ffd5ef..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.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.binding.jms.format.jmsbytes.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
- public byte[] getByteArrayGreetings(byte[] msg);
-
- public void throwChecked(byte[] msg) throws CheckedException;
- public void throwUnChecked(byte[] msg);
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java deleted file mode 100644 index b92959cfd3..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java +++ /dev/null @@ -1,40 +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.binding.jms.format.jmsbytes.helloworld;
-
-
-public class HelloWorldServiceImpl implements HelloWorldService {
-
- public byte[] getByteArrayGreetings(byte[] msg){
-
- String name = new String(msg);
- name = "Hello " + name;
-
- return name.getBytes();
- }
-
- public void throwChecked(byte[] msg) throws CheckedException {
- throw new CheckedException("foo");
- }
-
- public void throwUnChecked(byte[] msg) {
- throw new RuntimeException("bla");
- }
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java deleted file mode 100644 index ff5cf617f2..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.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.binding.jms.format.jmsbytes.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldServiceReference {
-
- public byte[] getByteArrayGreetings(byte[] msg);
-
- public void throwChecked(byte[] msg) ;
- public void throwUnChecked(byte[] msg);
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java deleted file mode 100644 index a1c38f7295..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java +++ /dev/null @@ -1,28 +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.binding.jms.format.jmsobject.helloworld;
-
-public class CheckedException extends Exception {
- private static final long serialVersionUID = 1L;
-
- public CheckedException(String s) {
- super(s);
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java deleted file mode 100644 index 3b34dbae85..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java +++ /dev/null @@ -1,32 +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.binding.jms.format.jmsobject.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldReference {
-
- public String getGreetingsWrapSingle(String firstName, String lastName);
- public String getGreetingsDontWrapSingle(String firstName, String lastName);
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java deleted file mode 100644 index 04d4a02462..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java +++ /dev/null @@ -1,112 +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.binding.jms.format.jmsobject.helloworld;
-
-import org.oasisopen.sca.annotation.Reference;
-
-
-public class HelloWorldReferenceImpl implements HelloWorldReference {
-
- @Reference
- protected HelloWorldService helloWorldServiceWrapSingle;
-
- @Reference
- protected HelloWorldService helloWorldServiceDontWrapSingle;
-
- public String getGreetingsWrapSingle(String firstName, String lastName){
- Person person = new Person();
- person.setFirstName(firstName);
- person.setLastName(lastName);
-
- String returnString = "";
-
- Person returnPerson = helloWorldServiceWrapSingle.getPersonGreetings(person);
- returnString = returnPerson.getFirstName() + " " + returnPerson.getLastName();
-
- Person returnNullPerson = helloWorldServiceWrapSingle.getNullReturnGreetings(person);
-
- if (returnNullPerson == null){
- returnString += " Hello2 null";
- }
-
- String returnGreeting = helloWorldServiceWrapSingle.getArrayGreeting(new String[]{firstName, lastName});
- returnString += " " + returnGreeting;
-
- returnGreeting = helloWorldServiceWrapSingle.getMultiArrayGreetings(new String[]{firstName, firstName},new String[]{lastName, lastName});
- returnString += " " + returnGreeting;
-
- returnGreeting = helloWorldServiceWrapSingle.getMultiGreetings(firstName, lastName);
- returnString += " " + returnGreeting;
-
- returnGreeting = helloWorldServiceWrapSingle.getObjectGreeting(person);
- returnString += " " + returnGreeting;
-
- returnGreeting = helloWorldServiceWrapSingle.getObjectArrayGreeting(new Object[]{person});
- returnString += " " + returnGreeting;
-
- return returnString;
- }
-
- public String getGreetingsDontWrapSingle(String firstName, String lastName){
- Person person = new Person();
- person.setFirstName(firstName);
- person.setLastName(lastName);
-
- String returnString = "";
-
- Person returnPerson = helloWorldServiceDontWrapSingle.getPersonGreetings(person);
- returnString = returnPerson.getFirstName() + " " + returnPerson.getLastName();
-
- Person returnNullPerson = helloWorldServiceDontWrapSingle.getNullReturnGreetings(person);
-
- if (returnNullPerson == null){
- returnString += " Hello2 null";
- }
-
- String returnGreeting = helloWorldServiceDontWrapSingle.getArrayGreeting(new String[]{firstName, lastName});
- returnString += " " + returnGreeting;
-
- returnGreeting = helloWorldServiceDontWrapSingle.getMultiArrayGreetings(new String[]{firstName, firstName},new String[]{lastName, lastName});
- returnString += " " + returnGreeting;
-
- returnGreeting = helloWorldServiceDontWrapSingle.getMultiGreetings(firstName, lastName);
- returnString += " " + returnGreeting;
-
- returnGreeting = helloWorldServiceDontWrapSingle.getObjectGreeting(person);
- returnString += " " + returnGreeting;
-
- returnGreeting = helloWorldServiceDontWrapSingle.getObjectArrayGreeting(new Object[]{person});
- returnString += " " + returnGreeting;
-
- try {
- helloWorldServiceDontWrapSingle.throwChecked(person);
- } catch (CheckedException e) {
- returnString += " " + e.getMessage();
- }
-
- try {
- helloWorldServiceDontWrapSingle.throwUnChecked(person);
- } catch (Exception e) {
- returnString += " " + (e.getCause().getMessage().startsWith("Message = bla") ? "bla" : e.getCause().getMessage());
- }
-
- return returnString;
- }
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java deleted file mode 100644 index b179a86f52..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java +++ /dev/null @@ -1,41 +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.binding.jms.format.jmsobject.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
- public Person getPersonGreetings(Person person);
- public Person getNullReturnGreetings(Person person);
- public String getArrayGreeting(String[] names);
- public String getMultiArrayGreetings(String[] firstName, String[] lastName);
- public String getMultiGreetings(String firstName, String lastName);
- public String getObjectGreeting(Object person);
- public String getObjectArrayGreeting(Object[] pearson);
-
- public void throwChecked(Person person) throws CheckedException;
- public void throwUnChecked(Person person);
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java deleted file mode 100644 index fa9e9eb1cb..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java +++ /dev/null @@ -1,63 +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.binding.jms.format.jmsobject.helloworld;
-
-public class HelloWorldServiceImpl implements HelloWorldService {
-
- public Person getPersonGreetings(Person person){
-
- person.setFirstName("Hello1 " + person.getFirstName());
- person.setLastName("Hello1 " + person.getLastName());
-
- return person;
- }
-
- public Person getNullReturnGreetings(Person person){
- return null;
- }
-
- public String getArrayGreeting(String[] names) {
- return "Hello3 " + names[0];
- }
-
- public String getMultiArrayGreetings(String[] firstName, String[] lastName) {
- return "Hello4 " + firstName[0] + " " + lastName[0];
- }
-
- public String getMultiGreetings(String firstName, String lastName) {
- return "Hello5 " + firstName + " " + lastName;
- }
-
- public String getObjectGreeting(Object person) {
- return "Hello6 " + ((Person)person).getFirstName() + " " + ((Person)person).getLastName();
- }
-
- public String getObjectArrayGreeting(Object[] person) {
- return "Hello7 " + ((Person)person[0]).getFirstName() + " " + ((Person)person[0]).getLastName();
- }
-
- public void throwChecked(Person person) throws CheckedException {
- throw new CheckedException("foo");
- }
-
- public void throwUnChecked(Person person) {
- throw new RuntimeException("bla");
- }
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java deleted file mode 100644 index 29233d74a9..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java +++ /dev/null @@ -1,47 +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.binding.jms.format.jmsobject.helloworld;
-
-import java.io.Serializable;
-
-public class Person implements Serializable {
-
- private static final long serialVersionUID = -6842761353978551779L;
-
- String firstName;
- String lastName;
-
- public String getFirstName() {
- return firstName;
- }
-
- public void setFirstName(String firstName) {
- this.firstName = firstName;
- }
-
- public String getLastName() {
- return lastName;
- }
-
- public void setLastName(String lastName) {
- this.lastName = lastName;
- }
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index ced023ecdd..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://itest">
- <deployable composite="itest:helloworld" />
-</contribution>
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.composite b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.composite deleted file mode 100644 index 7950309b07..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/resources/jmsobject/helloworld.composite +++ /dev/null @@ -1,61 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://itest"
- xmlns:hw="http://helloworld"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- name="helloworld">
-
- <component name="HelloWorldReferenceComponent">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsobject.helloworld.HelloWorldReferenceImpl" />
- <reference name="helloWorldServiceWrapSingle" >
- <binding.jms>
- <tuscany:wireFormat.jmsObject wrapSingle="true"/>
- <destination jndiName="HelloWorldService1"/>
- </binding.jms>
- </reference>
- <reference name="helloWorldServiceDontWrapSingle" >
- <binding.jms>
- <tuscany:wireFormat.jmsObject wrapSingle="false" />
- <destination jndiName="HelloWorldService2"/>
- </binding.jms>
- </reference>
- </component>
-
- <component name="HelloWorldServiceComponent1">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsobject.helloworld.HelloWorldServiceImpl" />
- <service name="HelloWorldService">
- <binding.jms>
- <tuscany:wireFormat.jmsObject wrapSingle="true"/>
- <destination jndiName="HelloWorldService1"/>
- </binding.jms>
- </service>
- </component>
-
- <component name="HelloWorldServiceComponent2">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsobject.helloworld.HelloWorldServiceImpl" />
- <service name="HelloWorldService">
- <binding.jms>
- <tuscany:wireFormat.jmsObject /> <!-- test that wrapSingle default works -->
- <destination jndiName="HelloWorldService2"/>
- </binding.jms>
- </service>
- </component>
-</composite>
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/resources/jndi.properties deleted file mode 100644 index 4d6acc037b..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/main/resources/jndi.properties +++ /dev/null @@ -1,39 +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.
-## ---------------------------------------------------------------------------
-
-# START SNIPPET: jndi
-
-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
-
-# use the following property to configure the default connector
-java.naming.provider.url = vm://localhost?broker.persistent=false
-
-# use the following property to specify the JNDI name the connection factory
-# should appear as.
-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry
-connectionFactoryNames = ConnectionFactory
-
-# register some queues in JNDI using the form
-# queue.[jndiName] = [physicalName]
-queue.RequestQueue = RequestQueue
-queue.ResponseQueue = ResponseQueue
-
-# register some topics in JNDI using the form
-# topic.[jndiName] = [physicalName]
-#topic.MyTopic = example.MyTopic
-
-# END SNIPPET: jndi
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java b/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java deleted file mode 100644 index a2bfc0ca8a..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmsobject/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java +++ /dev/null @@ -1,73 +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.binding.jms.format;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.binding.jms.format.jmsobject.helloworld.HelloWorldReference;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class FormatJMSObjectTestCase {
-
- private static Node node;
-
- @Before
- public void init() {
- node = NodeFactory.newInstance().createNode().start();
- }
-
- @Test
- public void testHelloWorldCreate() throws Exception {
- HelloWorldReference helloWorldService = node.getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
-
- assertEquals("Hello1 Fred Hello1 Bloggs Hello2 null Hello3 Fred Hello4 Fred Bloggs Hello5 Fred Bloggs Hello6 Fred Bloggs Hello7 Fred Bloggs",
- helloWorldService.getGreetingsWrapSingle("Fred", "Bloggs"));
-
- assertEquals("Hello1 Fred Hello1 Bloggs Hello2 null Hello3 Fred Hello4 Fred Bloggs Hello5 Fred Bloggs Hello6 Fred Bloggs Hello7 Fred Bloggs foo bla",
- helloWorldService.getGreetingsDontWrapSingle("Fred", "Bloggs"));
-
- }
-
- @Ignore
- @Test
- public void testWaitForInput() {
- System.out.println("Press a key to end");
- try {
- System.in.read();
- } catch (Exception ex) {
- }
- System.out.println("Shutting down");
- }
-
- @After
- public void end() {
- if (node != null) {
- node.stop();
- }
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstext/pom.xml b/sca-java-2.x/trunk/itest/jms/format-jmstext/pom.xml deleted file mode 100644 index a416b7ae72..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstext/pom.xml +++ /dev/null @@ -1,83 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-jms-format-jmstext</artifactId>
- <name>Apache Tuscany SCA iTest JMS Message Format jmstext</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jms-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.2.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java deleted file mode 100644 index 1acbfbd5ae..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java +++ /dev/null @@ -1,28 +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.binding.jms.format.jmsbytes.helloworld;
-
-public class CheckedException extends Exception {
- private static final long serialVersionUID = 1L;
-
- public CheckedException(String s) {
- super(s);
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java deleted file mode 100644 index 2d19d4bd82..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java +++ /dev/null @@ -1,32 +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.binding.jms.format.jmsbytes.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldReference {
-
- public String getGreetings(String message);
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java deleted file mode 100644 index 3ccd54e9bd..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java +++ /dev/null @@ -1,50 +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.binding.jms.format.jmsbytes.helloworld;
-
-import org.oasisopen.sca.annotation.Reference;
-
-
-public class HelloWorldReferenceImpl implements HelloWorldReference {
-
- @Reference
- protected HelloWorldServiceReference helloWorldService1;
-
- public String getGreetings(String name){
- byte[] bytesValue = helloWorldService1.getByteArrayGreetings(name.getBytes());
- String stringValue = new String(bytesValue);
-
- try {
- helloWorldService1.throwChecked(name.getBytes());
- } catch (Exception e) {
- // Test to see what happens if we talk to a service
- // that declares a checked exception through an
- // interface that doesn't
- stringValue += " " + e.getCause().getMessage();
- }
-
- try {
- helloWorldService1.throwUnChecked(name.getBytes());
- } catch (Exception e) {
- stringValue += " " + e.getMessage();
- }
- return stringValue;
- }
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java deleted file mode 100644 index b9a1ffd5ef..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.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.binding.jms.format.jmsbytes.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
- public byte[] getByteArrayGreetings(byte[] msg);
-
- public void throwChecked(byte[] msg) throws CheckedException;
- public void throwUnChecked(byte[] msg);
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java deleted file mode 100644 index b92959cfd3..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java +++ /dev/null @@ -1,40 +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.binding.jms.format.jmsbytes.helloworld;
-
-
-public class HelloWorldServiceImpl implements HelloWorldService {
-
- public byte[] getByteArrayGreetings(byte[] msg){
-
- String name = new String(msg);
- name = "Hello " + name;
-
- return name.getBytes();
- }
-
- public void throwChecked(byte[] msg) throws CheckedException {
- throw new CheckedException("foo");
- }
-
- public void throwUnChecked(byte[] msg) {
- throw new RuntimeException("bla");
- }
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java deleted file mode 100644 index ff5cf617f2..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.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.binding.jms.format.jmsbytes.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldServiceReference {
-
- public byte[] getByteArrayGreetings(byte[] msg);
-
- public void throwChecked(byte[] msg) ;
- public void throwUnChecked(byte[] msg);
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java deleted file mode 100644 index 57ad23e064..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java +++ /dev/null @@ -1,28 +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.binding.jms.format.jmstext.helloworld;
-
-public class CheckedException extends Exception {
- private static final long serialVersionUID = 1L;
-
- public CheckedException(String s) {
- super(s);
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java deleted file mode 100644 index ea8d5ffd28..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java +++ /dev/null @@ -1,32 +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.binding.jms.format.jmstext.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldReference {
-
- public String getGreetings(String message);
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java deleted file mode 100644 index afcd391009..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java +++ /dev/null @@ -1,46 +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.binding.jms.format.jmstext.helloworld;
-
-import org.oasisopen.sca.annotation.Reference;
-
-
-public class HelloWorldReferenceImpl implements HelloWorldReference {
-
- @Reference
- protected HelloWorldService helloWorldService1;
-
- public String getGreetings(String name){
- String stringValue = helloWorldService1.getStringGreetings(name);
-
- try {
- helloWorldService1.throwChecked(name);
- } catch (Exception e) {
- stringValue += " " + e.getMessage();
- }
-
- try {
- helloWorldService1.throwUnChecked(name);
- } catch (Exception e) {
- stringValue += " " + e.getMessage();
- }
- return stringValue;
- }
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java deleted file mode 100644 index 8af585c13c..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.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.binding.jms.format.jmstext.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
- public String getStringGreetings(String msg);
-
- public void throwChecked(String msg) throws CheckedException;
- public void throwUnChecked(String msg);
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java deleted file mode 100644 index 4f0a6fe4c5..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java +++ /dev/null @@ -1,38 +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.binding.jms.format.jmstext.helloworld;
-
-
-public class HelloWorldServiceImpl implements HelloWorldService {
-
- public String getStringGreetings(String msg){
-
- msg = "Hello " + msg;
- return msg;
- }
-
- public void throwChecked(String msg) throws CheckedException {
- throw new CheckedException("foo");
- }
-
- public void throwUnChecked(String msg) {
- throw new RuntimeException("bla");
- }
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java deleted file mode 100644 index a8dd686725..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.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.binding.jms.format.jmstext.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldServiceReference {
-
- public String getStringGreetings(String msg);
-
- public void throwChecked(String msg) ;
- public void throwUnChecked(String msg);
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index ced023ecdd..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://itest">
- <deployable composite="itest:helloworld" />
-</contribution>
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/resources/jmstext/helloworld.composite b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/resources/jmstext/helloworld.composite deleted file mode 100644 index a9e8782f94..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/resources/jmstext/helloworld.composite +++ /dev/null @@ -1,45 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://itest"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- xmlns:hw="http://helloworld"
- name="helloworld">
-
- <component name="HelloWorldReferenceComponent">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmstext.helloworld.HelloWorldReferenceImpl" />
- <reference name="helloWorldService1" >
- <binding.jms>
- <tuscany:wireFormat.jmsText/>
- <destination jndiName="HelloWorldService1"/>
- </binding.jms>
- </reference>
- </component>
-
- <component name="HelloWorldServiceComponent1">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmstext.helloworld.HelloWorldServiceImpl" />
- <service name="HelloWorldService">
- <binding.jms>
- <tuscany:wireFormat.jmsText/>
- <destination jndiName="HelloWorldService1"/>
- </binding.jms>
- </service>
- </component>
-</composite>
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/resources/jndi.properties deleted file mode 100644 index 4d6acc037b..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstext/src/main/resources/jndi.properties +++ /dev/null @@ -1,39 +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.
-## ---------------------------------------------------------------------------
-
-# START SNIPPET: jndi
-
-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
-
-# use the following property to configure the default connector
-java.naming.provider.url = vm://localhost?broker.persistent=false
-
-# use the following property to specify the JNDI name the connection factory
-# should appear as.
-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry
-connectionFactoryNames = ConnectionFactory
-
-# register some queues in JNDI using the form
-# queue.[jndiName] = [physicalName]
-queue.RequestQueue = RequestQueue
-queue.ResponseQueue = ResponseQueue
-
-# register some topics in JNDI using the form
-# topic.[jndiName] = [physicalName]
-#topic.MyTopic = example.MyTopic
-
-# END SNIPPET: jndi
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstext/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextTestCase.java b/sca-java-2.x/trunk/itest/jms/format-jmstext/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextTestCase.java deleted file mode 100644 index b887aa18fd..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstext/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextTestCase.java +++ /dev/null @@ -1,60 +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.binding.jms.format;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld.HelloWorldReference;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class FormatJMSTextTestCase {
-
- private static Node node;
-
- @Before
- public void init() {
- node = NodeFactory.newInstance().createNode().start();
- }
-
- @Test
- public void testHelloWorldCreate() throws Exception {
- HelloWorldReference helloWorldService = node.getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
-
- System.out.println(helloWorldService.getGreetings("Fred Bloggs"));
- assertEquals("Hello Fred Bloggs " +
- "foo remote service exception, see nested exception",
- helloWorldService.getGreetings("Fred Bloggs"));
-
- }
-
- @After
- public void end() {
- if (node != null) {
- node.stop();
- }
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxml/pom.xml b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/pom.xml deleted file mode 100644 index 9235ad3f93..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxml/pom.xml +++ /dev/null @@ -1,83 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-jms-format-jmstextxml</artifactId>
- <name>Apache Tuscany SCA iTest JMS Message Format jmstextxml</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jms-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.2.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java deleted file mode 100644 index 5e9a7a316e..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java +++ /dev/null @@ -1,28 +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.binding.jms.format.jmstextxml.helloworld;
-
-public class CheckedException extends Exception {
- private static final long serialVersionUID = 1L;
-
- public CheckedException(String s) {
- super(s);
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java deleted file mode 100644 index 768b293380..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java +++ /dev/null @@ -1,33 +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.binding.jms.format.jmstextxml.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldReference {
-
- public String getGreetings(String name);
- public String getPersonGreetings(Person person);
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java deleted file mode 100644 index 2bac5db5ab..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java +++ /dev/null @@ -1,62 +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.binding.jms.format.jmstextxml.helloworld;
-
-import org.oasisopen.sca.annotation.Reference;
-
-public class HelloWorldReferenceImpl implements HelloWorldReference {
-
- @Reference
- protected HelloWorldService helloWorldService1;
-
- @Reference
- protected HelloWorldService helloWorldService2;
-
- @Reference
- protected HelloWorldService helloWorldService3;
-
- public String getGreetings(String name){
- String stringValue = helloWorldService1.getGreetings(name) + " " +
- helloWorldService2.getGreetings(name) + " " +
- helloWorldService3.getGreetings(name);
-
- return stringValue;
- }
-
- public String getPersonGreetings(Person person){
- String stringValue = helloWorldService1.getPersonGreetings(person) + " " +
- helloWorldService2.getPersonGreetings(person) + " " +
- helloWorldService3.getPersonGreetings(person);
-
- try {
- helloWorldService1.throwChecked(person.getLastName());
- } catch (CheckedException e) {
- stringValue += " " + e.getMessage();
- }
-
- try {
- helloWorldService1.throwUnChecked(person.getLastName());
- } catch (Exception e) {
- stringValue += " " + e.getMessage();
- }
-
- return stringValue;
- }
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java deleted file mode 100644 index fe200e3cbe..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.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.binding.jms.format.jmstextxml.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
- public String getGreetings(String name);
- public String getPersonGreetings(Person person);
-
- public String throwChecked(String msg) throws CheckedException;
- public String throwUnChecked(String msg);
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java deleted file mode 100644 index 80624ee770..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.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.binding.jms.format.jmstextxml.helloworld;
-
-
-public class HelloWorldServiceImpl implements HelloWorldService {
-
- public String getGreetings(String name){
- String response = "Hello " + name;
- System.out.println("getGreetings: " + response);
- return response;
- }
-
- public String getPersonGreetings(Person person){
- String response = "Hello " + person.getFirstName() + " " + person.getLastName();
- System.out.println("getPersonGreetings: " + response);
- return response;
- }
-
- public String throwChecked(String msg) throws CheckedException {
- throw new CheckedException("foo");
- }
-
- public String throwUnChecked(String msg) {
- throw new RuntimeException("bla");
- }
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java deleted file mode 100644 index 175b482c81..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java +++ /dev/null @@ -1,42 +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.binding.jms.format.jmstextxml.helloworld;
-
-public class Person {
- String firstName;
- String lastName;
-
- public String getFirstName() {
- return firstName;
- }
-
- public void setFirstName(String firstName) {
- this.firstName = firstName;
- }
-
- public String getLastName() {
- return lastName;
- }
-
- public void setLastName(String lastName) {
- this.lastName = lastName;
- }
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index ced023ecdd..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://itest">
- <deployable composite="itest:helloworld" />
-</contribution>
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.composite b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.composite deleted file mode 100644 index c15d99550e..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.composite +++ /dev/null @@ -1,80 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://itest"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- xmlns:hw="http://helloworld"
- name="helloworld">
-
- <component name="HelloWorldReferenceComponent">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.HelloWorldReferenceImpl" />
- <reference name="helloWorldService1" >
- <binding.jms>
- <tuscany:wireFormat.jmsTextXML/>
- <destination jndiName="HelloWorldService1"/>
- </binding.jms>
- </reference>
- <reference name="helloWorldService2" >
- <binding.jms>
- <tuscany:wireFormat.jmsTextXML/>
- <destination jndiName="HelloWorldService2"/>
- </binding.jms>
- </reference>
- <reference name="helloWorldService3" >
- <binding.jms>
- <tuscany:wireFormat.jmsTextXML/>
- <destination jndiName="HelloWorldService3"/>
- </binding.jms>
- </reference>
- </component>
-
- <component name="HelloWorldServiceComponent1">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.HelloWorldServiceImpl" />
- <service name="HelloWorldService">
- <binding.jms>
- <tuscany:wireFormat.jmsTextXML/>
- <destination jndiName="HelloWorldService1"/>
- </binding.jms>
- </service>
- </component>
-
- <component name="HelloWorldServiceComponent2">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.HelloWorldServiceImpl" />
- <service name="HelloWorldService">
- <interface.java interface="org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.HelloWorldService" />
- <binding.jms>
- <tuscany:wireFormat.jmsTextXML/>
- <destination jndiName="HelloWorldService2"/>
- </binding.jms>
- </service>
- </component>
-
- <component name="HelloWorldServiceComponent3">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.HelloWorldServiceImpl" />
- <service name="HelloWorldService">
- <interface.wsdl interface="http://helloworld/textxml#wsdl.interface(HelloWorld)" />
- <binding.jms>
- <tuscany:wireFormat.jmsTextXML/>
- <destination jndiName="HelloWorldService3"/>
- </binding.jms>
- </service>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.wsdl b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.wsdl deleted file mode 100644 index ac68c85fd5..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/resources/jmstextxml/helloworld.wsdl +++ /dev/null @@ -1,161 +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.
--->
-<wsdl:definitions targetNamespace="http://helloworld/textxml" xmlns:tns="http://helloworld/textxml" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- name="helloworld">
-
- <wsdl:types>
- <schema elementFormDefault="qualified" targetNamespace="http://helloworld/textxml" xmlns="http://www.w3.org/2001/XMLSchema">
-
- <element name="getGreetings">
- <complexType>
- <sequence>
- <element name="name" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
-
- <element name="getGreetingsResponse">
- <complexType>
- <sequence>
- <element name="getGreetingsReturn" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
-
- </schema>
- <schema elementFormDefault="qualified" targetNamespace="http://helloworld/textxml" xmlns="http://www.w3.org/2001/XMLSchema">
-
- <xsd:complexType name="PersonType">
- <xsd:sequence>
- <xsd:element name="firstName" type="xsd:string"/>
- <xsd:element name="lastName" type="xsd:string"/>
- </xsd:sequence>
- </xsd:complexType>
-
- <element name="getPersonGreetings">
- <complexType>
- <sequence>
- <element name="person" type="PersonType"/>
- </sequence>
- </complexType>
- </element>
-
- <element name="getPersonGreetingsResponse">
- <complexType>
- <sequence>
- <element name="getPersonGreetingsReturn" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
-
- <element name="CheckedException" type="CheckedException" />
-
- <complexType name="CheckedException">
- <sequence>
- <element minOccurs="0" name="message" type="xsd:string" />
- </sequence>
- </complexType>
-
- </schema>
-
- </wsdl:types>
-
- <wsdl:message name="getGreetingsRequest">
- <wsdl:part element="tns:getGreetings" name="parameters"/>
- </wsdl:message>
-
- <wsdl:message name="getGreetingsResponse">
- <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>
- </wsdl:message>
-
- <wsdl:message name="getPersonGreetingsRequest">
- <wsdl:part element="tns:getPersonGreetings" name="parameters"/>
- </wsdl:message>
-
- <wsdl:message name="getPersonGreetingsResponse">
- <wsdl:part element="tns:getPersonGreetingsResponse" name="parameters"/>
- </wsdl:message>
-
- <wsdl:message name="CheckedException">
- <wsdl:part element="tns:CheckedException" name="fault" />
- </wsdl:message>
-
- <wsdl:portType name="HelloWorld">
- <wsdl:operation name="getGreetings">
- <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>
- <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>
- </wsdl:operation>
- <wsdl:operation name="getPersonGreetings">
- <wsdl:input message="tns:getPersonGreetingsRequest" name="getPersonGreetingsRequest"/>
- <wsdl:output message="tns:getPersonGreetingsResponse" name="getPersonGreetingsResponse"/>
- </wsdl:operation>
- <wsdl:operation name="throwChecked">
- <wsdl:input message="tns:getPersonGreetingsRequest" name="getPersonGreetingsRequest"/>
- <wsdl:output message="tns:getPersonGreetingsResponse" name="getPersonGreetingsResponse"/>
- <wsdl:fault message="tns:CheckedException" name="CheckedException"/>
- </wsdl:operation>
- <wsdl:operation name="throwUnChecked">
- <wsdl:input message="tns:getPersonGreetingsRequest" name="getPersonGreetingsRequest"/>
- <wsdl:output message="tns:getPersonGreetingsResponse" name="getPersonGreetingsResponse"/>
- </wsdl:operation>
- </wsdl:portType>
-
- <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
- <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <wsdl:operation name="getGreetings">
- <wsdlsoap:operation soapAction=""/>
- <wsdl:input name="getGreetingsRequest">
- <wsdlsoap:body use="literal"/>
- </wsdl:input>
- <wsdl:output name="getGreetingsResponse">
- <wsdlsoap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getPersonGreetings">
- <wsdlsoap:operation soapAction=""/>
- <wsdl:input name="getPersonGreetingsRequest">
- <wsdlsoap:body use="literal"/>
- </wsdl:input>
- <wsdl:output name="getPersonGreetingsResponse">
- <wsdlsoap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
-
- <!-- wsdl:binding name="HelloWorldSoapJmsBinding" type="tns:HelloWorld">
- <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/jms"/>
- <wsdl:operation name="getGreetings">
- <wsdlsoap:operation soapAction=""/>
- <wsdl:input name="getGreetingsRequest">
- <wsdlsoap:body use="literal"/>
- </wsdl:input>
- <wsdl:output name="getGreetingsResponse">
- <wsdlsoap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding-->
-
- <wsdl:service name="HelloWorldService">
- <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
- <wsdlsoap:address location="http://localhost:8085/HelloWorldService"/>
- </wsdl:port>
- </wsdl:service>
-
-</wsdl:definitions>
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/resources/jndi.properties deleted file mode 100644 index 4d6acc037b..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/main/resources/jndi.properties +++ /dev/null @@ -1,39 +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.
-## ---------------------------------------------------------------------------
-
-# START SNIPPET: jndi
-
-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
-
-# use the following property to configure the default connector
-java.naming.provider.url = vm://localhost?broker.persistent=false
-
-# use the following property to specify the JNDI name the connection factory
-# should appear as.
-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry
-connectionFactoryNames = ConnectionFactory
-
-# register some queues in JNDI using the form
-# queue.[jndiName] = [physicalName]
-queue.RequestQueue = RequestQueue
-queue.ResponseQueue = ResponseQueue
-
-# register some topics in JNDI using the form
-# topic.[jndiName] = [physicalName]
-#topic.MyTopic = example.MyTopic
-
-# END SNIPPET: jndi
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java deleted file mode 100644 index 6054050a5d..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxml/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java +++ /dev/null @@ -1,62 +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.binding.jms.format;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.HelloWorldReference;
-import org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.Person;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class FormatJMSTextXMLTestCase {
-
- private static Node node;
-
- @Before
- public void init() {
- node = NodeFactory.newInstance().createNode().start();
- }
-
- @Test
- public void testHelloWorldCreate() throws Exception {
- HelloWorldReference helloWorldService = node.getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
-
- assertEquals("Hello Fred Bloggs Hello Fred Bloggs Hello Fred Bloggs", helloWorldService.getGreetings("Fred Bloggs"));
-
- Person person = new Person();
- person.setFirstName("Fred");
- person.setLastName("Bloggs");
- assertEquals("Hello Fred Bloggs Hello Fred Bloggs Hello Fred Bloggs foo remote service exception, see nested exception", helloWorldService.getPersonGreetings(person));
- }
-
- @After
- public void end() {
- if (node != null) {
- node.stop();
- }
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/pom.xml b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/pom.xml deleted file mode 100644 index 28da31fbde..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/pom.xml +++ /dev/null @@ -1,83 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-jms-format-jmstextxmlinjmsobjectout</artifactId>
- <name>Apache Tuscany SCA iTest JMS Message Format jmstextxmlinjmsobjectout</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jms-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.2.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java deleted file mode 100644 index 1acbfbd5ae..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/CheckedException.java +++ /dev/null @@ -1,28 +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.binding.jms.format.jmsbytes.helloworld;
-
-public class CheckedException extends Exception {
- private static final long serialVersionUID = 1L;
-
- public CheckedException(String s) {
- super(s);
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java deleted file mode 100644 index 2d19d4bd82..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java +++ /dev/null @@ -1,32 +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.binding.jms.format.jmsbytes.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldReference {
-
- public String getGreetings(String message);
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java deleted file mode 100644 index 3ccd54e9bd..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java +++ /dev/null @@ -1,50 +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.binding.jms.format.jmsbytes.helloworld;
-
-import org.oasisopen.sca.annotation.Reference;
-
-
-public class HelloWorldReferenceImpl implements HelloWorldReference {
-
- @Reference
- protected HelloWorldServiceReference helloWorldService1;
-
- public String getGreetings(String name){
- byte[] bytesValue = helloWorldService1.getByteArrayGreetings(name.getBytes());
- String stringValue = new String(bytesValue);
-
- try {
- helloWorldService1.throwChecked(name.getBytes());
- } catch (Exception e) {
- // Test to see what happens if we talk to a service
- // that declares a checked exception through an
- // interface that doesn't
- stringValue += " " + e.getCause().getMessage();
- }
-
- try {
- helloWorldService1.throwUnChecked(name.getBytes());
- } catch (Exception e) {
- stringValue += " " + e.getMessage();
- }
- return stringValue;
- }
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java deleted file mode 100644 index b9a1ffd5ef..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.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.binding.jms.format.jmsbytes.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
- public byte[] getByteArrayGreetings(byte[] msg);
-
- public void throwChecked(byte[] msg) throws CheckedException;
- public void throwUnChecked(byte[] msg);
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java deleted file mode 100644 index b92959cfd3..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceImpl.java +++ /dev/null @@ -1,40 +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.binding.jms.format.jmsbytes.helloworld;
-
-
-public class HelloWorldServiceImpl implements HelloWorldService {
-
- public byte[] getByteArrayGreetings(byte[] msg){
-
- String name = new String(msg);
- name = "Hello " + name;
-
- return name.getBytes();
- }
-
- public void throwChecked(byte[] msg) throws CheckedException {
- throw new CheckedException("foo");
- }
-
- public void throwUnChecked(byte[] msg) {
- throw new RuntimeException("bla");
- }
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java deleted file mode 100644 index ff5cf617f2..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.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.binding.jms.format.jmsbytes.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldServiceReference {
-
- public byte[] getByteArrayGreetings(byte[] msg);
-
- public void throwChecked(byte[] msg) ;
- public void throwUnChecked(byte[] msg);
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java deleted file mode 100644 index 1684c19c50..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/CheckedException.java +++ /dev/null @@ -1,28 +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.binding.jms.format.jmsbytesxml.helloworld;
-
-public class CheckedException extends Exception {
- private static final long serialVersionUID = 1L;
-
- public CheckedException(String s) {
- super(s);
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java deleted file mode 100644 index cc7b7b11e4..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java +++ /dev/null @@ -1,32 +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.binding.jms.format.jmsbytesxml.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldReference {
-
- public String getGreetings(String message);
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java deleted file mode 100644 index 3742bd6ac6..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java +++ /dev/null @@ -1,46 +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.binding.jms.format.jmsbytesxml.helloworld;
-
-import org.oasisopen.sca.annotation.Reference;
-
-public class HelloWorldReferenceImpl implements HelloWorldReference {
-
- @Reference
- protected HelloWorldService helloWorldService1;
-
- public String getGreetings(String name){
- byte[] bytesValue = helloWorldService1.getByteArrayGreetings(name.getBytes());
- String stringValue = new String(bytesValue);
-
- try {
- helloWorldService1.throwChecked(name.getBytes());
- } catch (CheckedException e) {
- stringValue += " " + e.getMessage();
- }
-
- try {
- helloWorldService1.throwUnChecked(name.getBytes());
- } catch (Exception e) {
- stringValue += " " + e.getMessage();
- }
- return stringValue;
- }
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java deleted file mode 100644 index eae95b4201..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java +++ /dev/null @@ -1,34 +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.binding.jms.format.jmsbytesxml.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
- public byte[] getByteArrayGreetings(byte[] msg);
-
- public void throwChecked(byte[] msg) throws CheckedException;
- public void throwUnChecked(byte[] msg);
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java deleted file mode 100644 index a37a03d994..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldServiceImpl.java +++ /dev/null @@ -1,39 +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.binding.jms.format.jmsbytesxml.helloworld;
-
-public class HelloWorldServiceImpl implements HelloWorldService {
-
- public byte[] getByteArrayGreetings(byte[] msg){
-
- String name = new String(msg);
- name = "Hello " + name;
-
- return name.getBytes();
- }
-
- public void throwChecked(byte[] msg) throws CheckedException {
- throw new CheckedException("foo");
- }
-
- public void throwUnChecked(byte[] msg) {
- throw new RuntimeException("bla");
- }
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java deleted file mode 100644 index 530eac3d00..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/CheckedException.java +++ /dev/null @@ -1,28 +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.binding.jms.format.jmsdefault.helloworld;
-
-public class CheckedException extends Exception {
- private static final long serialVersionUID = 1L;
-
- public CheckedException(String s) {
- super(s);
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java deleted file mode 100644 index 1768816247..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java +++ /dev/null @@ -1,36 +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.binding.jms.format.jmsdefault.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldReference {
-
- public String getGreetings(String name);
-
- public String getPersonGreetings(Person person);
-
- public void nullInVoidOut();
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java deleted file mode 100644 index d0a5faaef7..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.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.binding.jms.format.jmsdefault.helloworld;
-
-import org.oasisopen.sca.annotation.Reference;
-
-public class HelloWorldReferenceImpl implements HelloWorldReference {
-
- @Reference
- protected HelloWorldService helloWorldService1;
-
- @Reference
- protected HelloWorldService helloWorldService2;
-
- @Reference
- protected HelloWorldService helloWorldService3;
-
- @Reference
- protected HelloWorldService helloWorldService4;
-
- public String getGreetings(String name){
- String stringValue = helloWorldService1.getGreetings(name) + " " +
- helloWorldService2.getGreetings(name) + " " +
- helloWorldService3.getGreetings(name) + " " +
- helloWorldService4.getGreetings(name);
-
- try {
- helloWorldService3.throwChecked(name);
- } catch (CheckedException e) {
- stringValue += " " + e.getMessage();
- }
-
- try {
- helloWorldService3.throwUnChecked(name);
- } catch (Exception e) {
- stringValue += " " + e.getMessage();
- }
-
- try {
- helloWorldService4.throwChecked(name);
- } catch (CheckedException e) {
- stringValue += " " + e.getMessage();
- }
-
- try {
- helloWorldService4.throwUnChecked(name);
- } catch (Exception e) {
- stringValue += " " + e.getMessage();
- }
-
- return stringValue;
- }
-
- public String getPersonGreetings(Person person){
- return helloWorldService1.getPersonGreetings(person) + " " +
- helloWorldService2.getPersonGreetings(person) + " " +
- helloWorldService3.getPersonGreetings(person) + " " +
- helloWorldService4.getPersonGreetings(person);
- }
-
- public void nullInVoidOut() {
- helloWorldService1.nullInVoidOut();
- helloWorldService2.nullInVoidOut();
- helloWorldService3.nullInVoidOut();
- helloWorldService4.nullInVoidOut();
-
- }
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java deleted file mode 100644 index 204863423d..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java +++ /dev/null @@ -1,38 +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.binding.jms.format.jmsdefault.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
- public String getGreetings(String name);
-
- public String getPersonGreetings(Person person);
-
- public void nullInVoidOut();
-
- public void throwChecked(String msg) throws CheckedException;
- public void throwUnChecked(String msg);
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java deleted file mode 100644 index b143079fe3..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.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.binding.jms.format.jmsdefault.helloworld;
-
-
-public class HelloWorldServiceImpl implements HelloWorldService {
-
- public static int nullInVoidOutCalled = 0;
-
- public String getGreetings(String name){
- String response = "Hello " + name;
- System.out.println("getGreetings: " + response);
- return response;
- }
-
- public String getPersonGreetings(Person person){
- String response = "Hello " + person.getFirstName() + " " + person.getLastName();
- System.out.println("getPersonGreetings: " + response);
- return response;
- }
-
- public void nullInVoidOut() {
- System.out.println("nullInVoidOut");
- nullInVoidOutCalled++;
- }
-
- public void throwChecked(String msg) throws CheckedException {
- throw new CheckedException("foo");
- }
-
- public void throwUnChecked(String msg) {
- throw new RuntimeException("bla");
- }
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java deleted file mode 100644 index b62d1b1f1d..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/Person.java +++ /dev/null @@ -1,42 +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.binding.jms.format.jmsdefault.helloworld;
-
-public class Person {
- String firstName;
- String lastName;
-
- public String getFirstName() {
- return firstName;
- }
-
- public void setFirstName(String firstName) {
- this.firstName = firstName;
- }
-
- public String getLastName() {
- return lastName;
- }
-
- public void setLastName(String lastName) {
- this.lastName = lastName;
- }
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java deleted file mode 100644 index 490bd5d4a3..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java +++ /dev/null @@ -1,32 +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.binding.jms.format.jmsmessage.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldReference {
-
- public String getGreetings(String message);
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java deleted file mode 100644 index 5aed6b12d7..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java +++ /dev/null @@ -1,41 +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.binding.jms.format.jmsmessage.helloworld;
-
-import org.oasisopen.sca.annotation.Reference;
-
-
-public class HelloWorldReferenceImpl implements HelloWorldReference {
-
- @Reference
- protected HelloWorldServiceReferenceSide helloWorldService1;
-
- public String getGreetings(String name){
- helloWorldService1.getGreetings(name);
-
- try {
- Thread.sleep(2000);
- } catch (Exception ex) {
- // do nothing
- }
-
- return HelloWorldServiceImpl.getGreetings();
- }
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java deleted file mode 100644 index efe2f1a4dc..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java +++ /dev/null @@ -1,34 +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.binding.jms.format.jmsmessage.helloworld;
-
-import org.oasisopen.sca.annotation.OneWay;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
- @OneWay
- public void onMessage(javax.jms.Message message);
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.java deleted file mode 100644 index c1011ce6fb..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceImpl.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.binding.jms.format.jmsmessage.helloworld;
-
-import javax.jms.TextMessage;
-
-public class HelloWorldServiceImpl implements HelloWorldService {
-
- private static String greetings = "not set";
-
- public void onMessage(javax.jms.Message message){
-
- String name = null;
-
- try {
- name = ((TextMessage)message).getText();
- } catch (Exception ex) {
- name = "EXCEPTION";
- }
- greetings = "Hello " + name;
- }
-
- public static String getGreetings(){
- return greetings;
- }
-
- // javax.jms.BytesMessage
- // javax.jms.MapMessage
- // javax.jms.ObjectMessage
- // javax.jms.StreamMessage
- // javax.jms.TextMessage
-
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java deleted file mode 100644 index d863b3a0a3..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.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.binding.jms.format.jmsmessage.helloworld;
-
-import javax.jws.soap.SOAPBinding;
-
-import org.oasisopen.sca.annotation.OneWay;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldServiceReferenceSide {
-
- @OneWay
- @SOAPBinding(parameterStyle=SOAPBinding.ParameterStyle.BARE)
- public void getGreetings(String message);
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README deleted file mode 100644 index 0f7a730b91..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/README +++ /dev/null @@ -1,3 +0,0 @@ -This test uses an SCA composite to fake a scenario where the reference is an SCA reference but the
-service is a non-SCA JMS endpoint. This gives us the opportunity to play about with the interface
-configuration at the reference to see how the contents of the JMS message can be controlled.
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java deleted file mode 100644 index a1c38f7295..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/CheckedException.java +++ /dev/null @@ -1,28 +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.binding.jms.format.jmsobject.helloworld;
-
-public class CheckedException extends Exception {
- private static final long serialVersionUID = 1L;
-
- public CheckedException(String s) {
- super(s);
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java deleted file mode 100644 index 3b34dbae85..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java +++ /dev/null @@ -1,32 +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.binding.jms.format.jmsobject.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldReference {
-
- public String getGreetingsWrapSingle(String firstName, String lastName);
- public String getGreetingsDontWrapSingle(String firstName, String lastName);
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java deleted file mode 100644 index 443d2aa746..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java +++ /dev/null @@ -1,112 +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.binding.jms.format.jmsobject.helloworld;
-
-import org.oasisopen.sca.annotation.Reference;
-
-
-public class HelloWorldReferenceImpl implements HelloWorldReference {
-
- @Reference
- protected HelloWorldService helloWorldServiceWrapSingle;
-
- @Reference
- protected HelloWorldService helloWorldServiceDontWrapSingle;
-
- public String getGreetingsWrapSingle(String firstName, String lastName){
- Person person = new Person();
- person.setFirstName(firstName);
- person.setLastName(lastName);
-
- String returnString = "";
-
- Person returnPerson = helloWorldServiceWrapSingle.getPersonGreetings(person);
- returnString = returnPerson.getFirstName() + " " + returnPerson.getLastName();
-
- Person returnNullPerson = helloWorldServiceWrapSingle.getNullReturnGreetings(person);
-
- if (returnNullPerson == null){
- returnString += " Hello2 null";
- }
-
- String returnGreeting = helloWorldServiceWrapSingle.getArrayGreeting(new String[]{firstName, lastName});
- returnString += " " + returnGreeting;
-
- returnGreeting = helloWorldServiceWrapSingle.getMultiArrayGreetings(new String[]{firstName, firstName},new String[]{lastName, lastName});
- returnString += " " + returnGreeting;
-
- returnGreeting = helloWorldServiceWrapSingle.getMultiGreetings(firstName, lastName);
- returnString += " " + returnGreeting;
-
- returnGreeting = helloWorldServiceWrapSingle.getObjectGreeting(person);
- returnString += " " + returnGreeting;
-
- returnGreeting = helloWorldServiceWrapSingle.getObjectArrayGreeting(new Object[]{person});
- returnString += " " + returnGreeting;
-
- return returnString;
- }
-
- public String getGreetingsDontWrapSingle(String firstName, String lastName){
- Person person = new Person();
- person.setFirstName(firstName);
- person.setLastName(lastName);
-
- String returnString = "";
-
- Person returnPerson = helloWorldServiceDontWrapSingle.getPersonGreetings(person);
- returnString = returnPerson.getFirstName() + " " + returnPerson.getLastName();
-
- Person returnNullPerson = helloWorldServiceDontWrapSingle.getNullReturnGreetings(person);
-
- if (returnNullPerson == null){
- returnString += " Hello2 null";
- }
-
- String returnGreeting = helloWorldServiceDontWrapSingle.getArrayGreeting(new String[]{firstName, lastName});
- returnString += " " + returnGreeting;
-
- returnGreeting = helloWorldServiceDontWrapSingle.getMultiArrayGreetings(new String[]{firstName, firstName},new String[]{lastName, lastName});
- returnString += " " + returnGreeting;
-
- returnGreeting = helloWorldServiceDontWrapSingle.getMultiGreetings(firstName, lastName);
- returnString += " " + returnGreeting;
-
- returnGreeting = helloWorldServiceDontWrapSingle.getObjectGreeting(person);
- returnString += " " + returnGreeting;
-
- returnGreeting = helloWorldServiceDontWrapSingle.getObjectArrayGreeting(new Object[]{person});
- returnString += " " + returnGreeting;
-
- try {
- helloWorldServiceDontWrapSingle.throwChecked(person);
- } catch (CheckedException e) {
- returnString += " " + e.getMessage();
- }
-
- try {
- helloWorldServiceDontWrapSingle.throwUnChecked(person);
- } catch (Exception e) {
- returnString += " " + e.getCause().getMessage();
- }
-
- return returnString;
- }
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java deleted file mode 100644 index b179a86f52..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java +++ /dev/null @@ -1,41 +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.binding.jms.format.jmsobject.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
- public Person getPersonGreetings(Person person);
- public Person getNullReturnGreetings(Person person);
- public String getArrayGreeting(String[] names);
- public String getMultiArrayGreetings(String[] firstName, String[] lastName);
- public String getMultiGreetings(String firstName, String lastName);
- public String getObjectGreeting(Object person);
- public String getObjectArrayGreeting(Object[] pearson);
-
- public void throwChecked(Person person) throws CheckedException;
- public void throwUnChecked(Person person);
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java deleted file mode 100644 index fa9e9eb1cb..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldServiceImpl.java +++ /dev/null @@ -1,63 +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.binding.jms.format.jmsobject.helloworld;
-
-public class HelloWorldServiceImpl implements HelloWorldService {
-
- public Person getPersonGreetings(Person person){
-
- person.setFirstName("Hello1 " + person.getFirstName());
- person.setLastName("Hello1 " + person.getLastName());
-
- return person;
- }
-
- public Person getNullReturnGreetings(Person person){
- return null;
- }
-
- public String getArrayGreeting(String[] names) {
- return "Hello3 " + names[0];
- }
-
- public String getMultiArrayGreetings(String[] firstName, String[] lastName) {
- return "Hello4 " + firstName[0] + " " + lastName[0];
- }
-
- public String getMultiGreetings(String firstName, String lastName) {
- return "Hello5 " + firstName + " " + lastName;
- }
-
- public String getObjectGreeting(Object person) {
- return "Hello6 " + ((Person)person).getFirstName() + " " + ((Person)person).getLastName();
- }
-
- public String getObjectArrayGreeting(Object[] person) {
- return "Hello7 " + ((Person)person[0]).getFirstName() + " " + ((Person)person[0]).getLastName();
- }
-
- public void throwChecked(Person person) throws CheckedException {
- throw new CheckedException("foo");
- }
-
- public void throwUnChecked(Person person) {
- throw new RuntimeException("bla");
- }
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java deleted file mode 100644 index 29233d74a9..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/Person.java +++ /dev/null @@ -1,47 +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.binding.jms.format.jmsobject.helloworld;
-
-import java.io.Serializable;
-
-public class Person implements Serializable {
-
- private static final long serialVersionUID = -6842761353978551779L;
-
- String firstName;
- String lastName;
-
- public String getFirstName() {
- return firstName;
- }
-
- public void setFirstName(String firstName) {
- this.firstName = firstName;
- }
-
- public String getLastName() {
- return lastName;
- }
-
- public void setLastName(String lastName) {
- this.lastName = lastName;
- }
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java deleted file mode 100644 index 57ad23e064..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/CheckedException.java +++ /dev/null @@ -1,28 +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.binding.jms.format.jmstext.helloworld;
-
-public class CheckedException extends Exception {
- private static final long serialVersionUID = 1L;
-
- public CheckedException(String s) {
- super(s);
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java deleted file mode 100644 index ea8d5ffd28..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java +++ /dev/null @@ -1,32 +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.binding.jms.format.jmstext.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldReference {
-
- public String getGreetings(String message);
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java deleted file mode 100644 index afcd391009..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java +++ /dev/null @@ -1,46 +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.binding.jms.format.jmstext.helloworld;
-
-import org.oasisopen.sca.annotation.Reference;
-
-
-public class HelloWorldReferenceImpl implements HelloWorldReference {
-
- @Reference
- protected HelloWorldService helloWorldService1;
-
- public String getGreetings(String name){
- String stringValue = helloWorldService1.getStringGreetings(name);
-
- try {
- helloWorldService1.throwChecked(name);
- } catch (Exception e) {
- stringValue += " " + e.getMessage();
- }
-
- try {
- helloWorldService1.throwUnChecked(name);
- } catch (Exception e) {
- stringValue += " " + e.getMessage();
- }
- return stringValue;
- }
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java deleted file mode 100644 index 8af585c13c..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.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.binding.jms.format.jmstext.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
- public String getStringGreetings(String msg);
-
- public void throwChecked(String msg) throws CheckedException;
- public void throwUnChecked(String msg);
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java deleted file mode 100644 index 4f0a6fe4c5..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceImpl.java +++ /dev/null @@ -1,38 +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.binding.jms.format.jmstext.helloworld;
-
-
-public class HelloWorldServiceImpl implements HelloWorldService {
-
- public String getStringGreetings(String msg){
-
- msg = "Hello " + msg;
- return msg;
- }
-
- public void throwChecked(String msg) throws CheckedException {
- throw new CheckedException("foo");
- }
-
- public void throwUnChecked(String msg) {
- throw new RuntimeException("bla");
- }
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java deleted file mode 100644 index a8dd686725..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.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.binding.jms.format.jmstext.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldServiceReference {
-
- public String getStringGreetings(String msg);
-
- public void throwChecked(String msg) ;
- public void throwUnChecked(String msg);
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java deleted file mode 100644 index 5e9a7a316e..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/CheckedException.java +++ /dev/null @@ -1,28 +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.binding.jms.format.jmstextxml.helloworld;
-
-public class CheckedException extends Exception {
- private static final long serialVersionUID = 1L;
-
- public CheckedException(String s) {
- super(s);
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java deleted file mode 100644 index 768b293380..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java +++ /dev/null @@ -1,33 +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.binding.jms.format.jmstextxml.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldReference {
-
- public String getGreetings(String name);
- public String getPersonGreetings(Person person);
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java deleted file mode 100644 index 2bac5db5ab..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java +++ /dev/null @@ -1,62 +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.binding.jms.format.jmstextxml.helloworld;
-
-import org.oasisopen.sca.annotation.Reference;
-
-public class HelloWorldReferenceImpl implements HelloWorldReference {
-
- @Reference
- protected HelloWorldService helloWorldService1;
-
- @Reference
- protected HelloWorldService helloWorldService2;
-
- @Reference
- protected HelloWorldService helloWorldService3;
-
- public String getGreetings(String name){
- String stringValue = helloWorldService1.getGreetings(name) + " " +
- helloWorldService2.getGreetings(name) + " " +
- helloWorldService3.getGreetings(name);
-
- return stringValue;
- }
-
- public String getPersonGreetings(Person person){
- String stringValue = helloWorldService1.getPersonGreetings(person) + " " +
- helloWorldService2.getPersonGreetings(person) + " " +
- helloWorldService3.getPersonGreetings(person);
-
- try {
- helloWorldService1.throwChecked(person.getLastName());
- } catch (CheckedException e) {
- stringValue += " " + e.getMessage();
- }
-
- try {
- helloWorldService1.throwUnChecked(person.getLastName());
- } catch (Exception e) {
- stringValue += " " + e.getMessage();
- }
-
- return stringValue;
- }
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java deleted file mode 100644 index be2af78958..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.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.binding.jms.format.jmstextxml.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
- public String getGreetings(String name);
- public String getPersonGreetings(Person person);
-
- public void throwChecked(String msg) throws CheckedException;
- public void throwUnChecked(String msg);
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java deleted file mode 100644 index e85d4ca5a4..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.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.binding.jms.format.jmstextxml.helloworld;
-
-
-public class HelloWorldServiceImpl implements HelloWorldService {
-
- public String getGreetings(String name){
- String response = "Hello " + name;
- System.out.println("getGreetings: " + response);
- return response;
- }
-
- public String getPersonGreetings(Person person){
- String response = "Hello " + person.getFirstName() + " " + person.getLastName();
- System.out.println("getPersonGreetings: " + response);
- return response;
- }
-
- public void throwChecked(String msg) throws CheckedException {
- throw new CheckedException("foo");
- }
-
- public void throwUnChecked(String msg) {
- throw new RuntimeException("bla");
- }
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java deleted file mode 100644 index 175b482c81..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/Person.java +++ /dev/null @@ -1,42 +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.binding.jms.format.jmstextxml.helloworld;
-
-public class Person {
- String firstName;
- String lastName;
-
- public String getFirstName() {
- return firstName;
- }
-
- public void setFirstName(String firstName) {
- this.firstName = firstName;
- }
-
- public String getLastName() {
- return lastName;
- }
-
- public void setLastName(String lastName) {
- this.lastName = lastName;
- }
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java deleted file mode 100644 index 7bb33ae270..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java +++ /dev/null @@ -1,38 +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.binding.jms.format.jmstextxmlinjmsobjectout.helloworld;
-
-import org.oasisopen.sca.annotation.Reference;
-
-
-public class HelloWorldReferenceImpl implements HelloWorldService {
-
- @Reference
- protected HelloWorldService helloWorldService1;
-
- public String getGreetings(String name){
- return helloWorldService1.getGreetings(name).toString();
- }
-
- public String getPersonGreetings(Person person){
- return helloWorldService1.getPersonGreetings(person).toString();
- }
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java deleted file mode 100644 index 9f955c278a..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java +++ /dev/null @@ -1,33 +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.binding.jms.format.jmstextxmlinjmsobjectout.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
- public String getGreetings(String name);
-
- public String getPersonGreetings(Person person);
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldServiceImpl.java deleted file mode 100644 index 7c1cce6087..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldServiceImpl.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.binding.jms.format.jmstextxmlinjmsobjectout.helloworld;
-
-public class HelloWorldServiceImpl implements HelloWorldService {
-
- public String getGreetings(String name){
- String response = "Hello " + name;
- System.out.println("getGreetings: " + response);
- return response;
- }
-
- public String getPersonGreetings(Person person){
- String response = "Hello " + person.getFirstName() + " " + person.getLastName();
- System.out.println("getPersonGreetings: " + response);
- return response;
- }
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/Person.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/Person.java deleted file mode 100644 index 3d41f656f9..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/Person.java +++ /dev/null @@ -1,42 +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.binding.jms.format.jmstextxmlinjmsobjectout.helloworld;
-
-public class Person {
- String firstName;
- String lastName;
-
- public String getFirstName() {
- return firstName;
- }
-
- public void setFirstName(String firstName) {
- this.firstName = firstName;
- }
-
- public String getLastName() {
- return lastName;
- }
-
- public void setLastName(String lastName) {
- this.lastName = lastName;
- }
-
-}
-
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index ced023ecdd..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://itest">
- <deployable composite="itest:helloworld" />
-</contribution>
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite deleted file mode 100644 index 79dd18b027..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.composite +++ /dev/null @@ -1,52 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://itest"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- xmlns:hw="http://helloworld"
- name="helloworld">
-
- <component name="HelloWorldReferenceComponent">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmstextxmlinjmsobjectout.helloworld.HelloWorldReferenceImpl" />
- <reference name="helloWorldService1" >
- <binding.jms>
- <tuscany:wireFormat.jmsTextXML/>
- <destination jndiName="HelloWorldService1"/>
- <response>
- <tuscany:wireFormat.jmsObject/>
- </response>
- </binding.jms>
- </reference>
- </component>
-
- <component name="HelloWorldServiceComponent1">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmstextxmlinjmsobjectout.helloworld.HelloWorldServiceImpl" />
- <service name="HelloWorldService">
- <binding.jms>
- <tuscany:wireFormat.jmsTextXML/>
- <destination jndiName="HelloWorldService1"/>
- <response>
- <tuscany:wireFormat.jmsObject/>
- </response>
- </binding.jms>
- </service>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.wsdl b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.wsdl deleted file mode 100644 index 935a2e73c5..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jmstextxmlinjmsobjectout/helloworld.wsdl +++ /dev/null @@ -1,139 +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.
--->
-<wsdl:definitions targetNamespace="http://helloworld/textxml" xmlns:tns="http://helloworld/textxml" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- name="helloworld">
-
- <wsdl:types>
- <schema elementFormDefault="qualified" targetNamespace="http://helloworld/textxml" xmlns="http://www.w3.org/2001/XMLSchema">
-
- <element name="getGreetings">
- <complexType>
- <sequence>
- <element name="name" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
-
- <element name="getGreetingsResponse">
- <complexType>
- <sequence>
- <element name="getGreetingsReturn" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
-
- </schema>
- <schema elementFormDefault="qualified" targetNamespace="http://helloworld/textxml" xmlns="http://www.w3.org/2001/XMLSchema">
-
- <xsd:complexType name="PersonType">
- <xsd:sequence>
- <xsd:element name="firstName" type="xsd:string"/>
- <xsd:element name="lastName" type="xsd:string"/>
- </xsd:sequence>
- </xsd:complexType>
-
- <element name="getPersonGreetings">
- <complexType>
- <sequence>
- <element name="person" type="PersonType"/>
- </sequence>
- </complexType>
- </element>
-
- <element name="getPersonGreetingsResponse">
- <complexType>
- <sequence>
- <element name="getPersonGreetingsReturn" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
- </schema>
-
- </wsdl:types>
-
- <wsdl:message name="getGreetingsRequest">
- <wsdl:part element="tns:getGreetings" name="parameters"/>
- </wsdl:message>
-
- <wsdl:message name="getGreetingsResponse">
- <wsdl:part element="tns:getGreetingsResponse" name="parameters"/>
- </wsdl:message>
-
- <wsdl:message name="getPersonGreetingsRequest">
- <wsdl:part element="tns:getPersonGreetings" name="parameters"/>
- </wsdl:message>
-
- <wsdl:message name="getPersonGreetingsResponse">
- <wsdl:part element="tns:getPersonGreetingsResponse" name="parameters"/>
- </wsdl:message>
-
- <wsdl:portType name="HelloWorld">
- <wsdl:operation name="getGreetings">
- <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/>
- <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/>
- </wsdl:operation>
- <wsdl:operation name="getPersonGreetings">
- <wsdl:input message="tns:getPersonGreetingsRequest" name="getPersonGreetingsRequest"/>
- <wsdl:output message="tns:getPersonGreetingsResponse" name="getPersonGreetingsResponse"/>
- </wsdl:operation>
- </wsdl:portType>
-
- <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">
- <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <wsdl:operation name="getGreetings">
- <wsdlsoap:operation soapAction=""/>
- <wsdl:input name="getGreetingsRequest">
- <wsdlsoap:body use="literal"/>
- </wsdl:input>
- <wsdl:output name="getGreetingsResponse">
- <wsdlsoap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getPersonGreetings">
- <wsdlsoap:operation soapAction=""/>
- <wsdl:input name="getPersonGreetingsRequest">
- <wsdlsoap:body use="literal"/>
- </wsdl:input>
- <wsdl:output name="getPersonGreetingsResponse">
- <wsdlsoap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
-
- <!-- wsdl:binding name="HelloWorldSoapJmsBinding" type="tns:HelloWorld">
- <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/jms"/>
- <wsdl:operation name="getGreetings">
- <wsdlsoap:operation soapAction=""/>
- <wsdl:input name="getGreetingsRequest">
- <wsdlsoap:body use="literal"/>
- </wsdl:input>
- <wsdl:output name="getGreetingsResponse">
- <wsdlsoap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding-->
-
- <wsdl:service name="HelloWorldService">
- <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">
- <wsdlsoap:address location="http://localhost:8085/HelloWorldService"/>
- </wsdl:port>
- </wsdl:service>
-
-</wsdl:definitions>
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jndi.properties deleted file mode 100644 index 4d6acc037b..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/main/resources/jndi.properties +++ /dev/null @@ -1,39 +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.
-## ---------------------------------------------------------------------------
-
-# START SNIPPET: jndi
-
-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
-
-# use the following property to configure the default connector
-java.naming.provider.url = vm://localhost?broker.persistent=false
-
-# use the following property to specify the JNDI name the connection factory
-# should appear as.
-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry
-connectionFactoryNames = ConnectionFactory
-
-# register some queues in JNDI using the form
-# queue.[jndiName] = [physicalName]
-queue.RequestQueue = RequestQueue
-queue.ResponseQueue = ResponseQueue
-
-# register some topics in JNDI using the form
-# topic.[jndiName] = [physicalName]
-#topic.MyTopic = example.MyTopic
-
-# END SNIPPET: jndi
diff --git a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java b/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java deleted file mode 100644 index 5c4d3cba9e..0000000000 --- a/sca-java-2.x/trunk/itest/jms/format-jmstextxmlinjmsobjectout/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java +++ /dev/null @@ -1,64 +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.binding.jms.format;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.binding.jms.format.jmstextxmlinjmsobjectout.helloworld.HelloWorldService;
-import org.apache.tuscany.sca.binding.jms.format.jmstextxmlinjmsobjectout.helloworld.Person;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class FormatJMSTextXMLInJMSObjectOutTestCase {
-
- private static Node node;
-
- @Before
- public void init() {
- node = NodeFactory.newInstance().createNode().start();
- }
-
- @Test
- @Ignore("TUSCANY-3654")
- public void testHelloWorldCreate() throws Exception {
- HelloWorldService helloWorldService = node.getService(HelloWorldService.class, "HelloWorldReferenceComponent");
-
- assertEquals("Hello Fred Bloggs", helloWorldService.getGreetings("Fred Bloggs"));
-
- Person person = new Person();
- person.setFirstName("Fred");
- person.setLastName("Bloggs");
- assertEquals("Hello Fred Bloggs", helloWorldService.getPersonGreetings(person));
- }
-
- @After
- public void end() {
- if (node != null) {
- node.stop();
- }
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/non-sca-client/pom.xml b/sca-java-2.x/trunk/itest/jms/non-sca-client/pom.xml deleted file mode 100644 index 84331d04cc..0000000000 --- a/sca-java-2.x/trunk/itest/jms/non-sca-client/pom.xml +++ /dev/null @@ -1,83 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-jms-non-sca-client-broker</artifactId>
- <name>Apache Tuscany SCA iTest JMS with Non SCA Client</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jms-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.2.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java b/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java deleted file mode 100644 index 9083ba1d9c..0000000000 --- a/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java +++ /dev/null @@ -1,29 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.OneWay;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface OneWayObjectService {
-
- @OneWay
- void sayHello(Object name);
-}
diff --git a/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java b/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java deleted file mode 100644 index 3149f99a25..0000000000 --- a/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java +++ /dev/null @@ -1,34 +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.binding.jms;
-
-public class OneWayObjectServiceImpl implements OneWayObjectService {
-
- public static Object mutex = new Object();
- public static Object name;
-
- public void sayHello(Object name) {
- OneWayObjectServiceImpl.name = name;
- synchronized (OneWayObjectServiceImpl.mutex) {
- OneWayObjectServiceImpl.mutex.notify();
- }
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java deleted file mode 100644 index 9cec2d9b3e..0000000000 --- a/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java +++ /dev/null @@ -1,29 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.OneWay;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface OneWayService {
-
- @OneWay
- void sayHello(String name);
-}
diff --git a/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java deleted file mode 100644 index 0036391696..0000000000 --- a/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java +++ /dev/null @@ -1,34 +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.binding.jms;
-
-public class OneWayServiceImpl implements OneWayService {
-
- public static Object mutex = new Object();
- public static String name;
-
- public void sayHello(String name) {
- OneWayServiceImpl.name = name;
- synchronized (OneWayServiceImpl.mutex) {
- OneWayServiceImpl.mutex.notify();
- }
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index decff8708f..0000000000 --- a/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://itest">
- <deployable composite="itest:ServiceComposite"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/resources/jndi.properties deleted file mode 100644 index 03690b1169..0000000000 --- a/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/resources/jndi.properties +++ /dev/null @@ -1,39 +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.
-## ---------------------------------------------------------------------------
-
-# START SNIPPET: jndi
-
-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
-
-# use the following property to configure the default connector
-java.naming.provider.url = vm://localhost?broker.persistent=false
-
-# use the following property to specify the JNDI name the connection factory
-# should appear as.
-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry
-connectionFactoryNames = ConnectionFactory
-
-# register some queues in JNDI using the form
-# queue.[jndiName] = [physicalName]
-queue.TextDest = TextDest
-queue.ObjectDest = ObjectDest
-
-# register some topics in JNDI using the form
-# topic.[jndiName] = [physicalName]
-#topic.MyTopic = example.MyTopic
-
-# END SNIPPET: jndi
diff --git a/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/resources/nonSCAclient/service.composite b/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/resources/nonSCAclient/service.composite deleted file mode 100644 index 67d5038a51..0000000000 --- a/sca-java-2.x/trunk/itest/jms/non-sca-client/src/main/resources/nonSCAclient/service.composite +++ /dev/null @@ -1,54 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- targetNamespace="http://itest"
- name="ServiceComposite">
-
- <component name="DefaultService">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayServiceImpl"/>
- <service name="OneWayService">
- <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61623">
- <tuscany:wireFormat.jmsTextXML/>
- </binding.jms>
- </service>
- </component>
-
- <component name="TextService">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayServiceImpl"/>
- <service name="OneWayService">
- <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61623"
- uri="jms:jndi:TextDest">
- <tuscany:wireFormat.jmsText/>
- </binding.jms>
- </service>
- </component>
-
- <component name="ObjectService">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayObjectServiceImpl"/>
- <service name="OneWayObjectService">
- <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory" jndiURL="tcp://localhost:61623"
- uri="jms:jndi:ObjectDest">
- <tuscany:wireFormat.jmsObject /> <!-- test that wrapSingle default works -->
- </binding.jms>
- </service>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/jms/non-sca-client/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java b/sca-java-2.x/trunk/itest/jms/non-sca-client/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java deleted file mode 100644 index 54cfdeb273..0000000000 --- a/sca-java-2.x/trunk/itest/jms/non-sca-client/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java +++ /dev/null @@ -1,144 +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.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.Serializable;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.jms.JMSException;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.naming.NamingException;
-
-import org.apache.activemq.broker.BrokerService;
-import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory;
-import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactoryImpl;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class NonSCAClientTestCase {
-
- private static Node node;
-
- @Before
- public void init() throws Exception {
- startBroker();
- node = NodeFactory.newInstance().createNode().start();
- }
-
- @After
- public void end() throws Exception {
- if (node != null) {
- node.stop();
- }
- stopBroker();
- }
-
-
- @Test
- public void testXMLText() throws Exception {
-
- synchronized (OneWayServiceImpl.mutex) {
-
- sendTextMessage("dynamicQueues/OneWayService", "<ns2:sayHello xmlns:ns2=\"http://jms.binding.sca.tuscany.apache.org/\"><arg0>Petra</arg0></ns2:sayHello>");
-
- // wait up to 10 seconds but it will likely be a lot less
- // as the service invocation will wake this up earlier
- if (OneWayServiceImpl.name == null) {
- OneWayServiceImpl.mutex.wait(10000);
- }
- }
- assertEquals("Petra", OneWayServiceImpl.name);
- }
-
- @Test
- public void testText() throws Exception {
-
- synchronized (OneWayServiceImpl.mutex) {
-
- sendTextMessage("dynamicQueues/TextDest", "Petra");
-
- // wait up to 10 seconds but it will likely be a lot less
- // as the service invocation will wake this up earlier
- OneWayServiceImpl.mutex.wait(10000);
- }
- assertEquals("Petra", OneWayServiceImpl.name);
- }
-
- @Test
- public void testObject() throws Exception {
-
- Set<Integer> arg = new HashSet<Integer>();
- arg.add(new Integer(3));
-
- synchronized (OneWayObjectServiceImpl.mutex) {
-
- sendObjectMessage("dynamicQueues/ObjectDest", arg);
-
- // wait up to 10 seconds but it will likely be a lot less
- // as the service invocation will wake this up earlier
- OneWayObjectServiceImpl.mutex.wait(10000);
- }
- assertEquals(arg, OneWayObjectServiceImpl.name);
- }
-
- private static BrokerService broker;
- protected static void startBroker() throws Exception {
- broker = new BrokerService();
- broker.setPersistent(false);
- broker.setUseJmx(false);
- broker.addConnector("tcp://localhost:61623");
- broker.start();
- }
-
- protected static void stopBroker() throws Exception {
- if (broker != null) {
- broker.stop();
- }
- }
-
- protected static void sendTextMessage(String destName, String payload) throws JMSException, NamingException {
- JMSResourceFactory rf = new JMSResourceFactoryImpl(null, null, null, "tcp://localhost:61623");
- Session session = rf.getConnection().createSession(false, Session.AUTO_ACKNOWLEDGE);
- MessageProducer p = session.createProducer(rf.lookupDestination(destName));
- rf.getConnection().start();
- session.run();
- p.send(session.createTextMessage(payload));
- rf.closeConnection();
- }
-
- protected static void sendObjectMessage(String destName, Object payload) throws JMSException, NamingException {
- JMSResourceFactory rf = new JMSResourceFactoryImpl(null, null, null, "tcp://localhost:61623");
- Session session = rf.getConnection().createSession(false, Session.AUTO_ACKNOWLEDGE);
- MessageProducer p = session.createProducer(rf.lookupDestination(destName));
- rf.getConnection().start();
- session.run();
- p.send(session.createObjectMessage((Serializable)payload));
- rf.closeConnection();
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/noreplyto/pom.xml b/sca-java-2.x/trunk/itest/jms/noreplyto/pom.xml deleted file mode 100644 index 79cbc59ed5..0000000000 --- a/sca-java-2.x/trunk/itest/jms/noreplyto/pom.xml +++ /dev/null @@ -1,83 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-jms-noreplyto</artifactId>
- <name>Apache Tuscany SCA iTest JMS No replyTo</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jms-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.2.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java deleted file mode 100644 index 430c71aaef..0000000000 --- a/sca-java-2.x/trunk/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java +++ /dev/null @@ -1,26 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface HelloWorldService {
- String sayHello(String name);
-}
diff --git a/sca-java-2.x/trunk/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java deleted file mode 100644 index 2c6d9d0d17..0000000000 --- a/sca-java-2.x/trunk/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java +++ /dev/null @@ -1,30 +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.binding.jms;
-
-public class HelloWorldServiceImpl implements HelloWorldService {
-
- public String sayHello(String name) {
- if ("bang".equals(name)) {
- throw new RuntimeException("blem wit");
- }
- return "jmsHello " + name;
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/noreplyto/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/noreplyto/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 16825fe48f..0000000000 --- a/sca-java-2.x/trunk/itest/jms/noreplyto/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://itest">
- <deployable composite="itest:SimpleServiceComposite"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/jms/noreplyto/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/noreplyto/src/main/resources/jndi.properties deleted file mode 100644 index 4d6acc037b..0000000000 --- a/sca-java-2.x/trunk/itest/jms/noreplyto/src/main/resources/jndi.properties +++ /dev/null @@ -1,39 +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.
-## ---------------------------------------------------------------------------
-
-# START SNIPPET: jndi
-
-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
-
-# use the following property to configure the default connector
-java.naming.provider.url = vm://localhost?broker.persistent=false
-
-# use the following property to specify the JNDI name the connection factory
-# should appear as.
-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry
-connectionFactoryNames = ConnectionFactory
-
-# register some queues in JNDI using the form
-# queue.[jndiName] = [physicalName]
-queue.RequestQueue = RequestQueue
-queue.ResponseQueue = ResponseQueue
-
-# register some topics in JNDI using the form
-# topic.[jndiName] = [physicalName]
-#topic.MyTopic = example.MyTopic
-
-# END SNIPPET: jndi
diff --git a/sca-java-2.x/trunk/itest/jms/noreplyto/src/main/resources/service.composite b/sca-java-2.x/trunk/itest/jms/noreplyto/src/main/resources/service.composite deleted file mode 100644 index a712990a9b..0000000000 --- a/sca-java-2.x/trunk/itest/jms/noreplyto/src/main/resources/service.composite +++ /dev/null @@ -1,38 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://itest"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- name="SimpleServiceComposite">
-
- <component name="HelloWorldService">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldServiceImpl"/>
- <service name="HelloWorldService">
- <binding.jms>
- <tuscany:wireFormat.jmsObject/>
- <destination jndiName="RequestQueue"/>
- <response>
- <destination jndiName="ResponseQueue"/>
- </response>
- </binding.jms>
- </service>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/jms/noreplyto/src/test/java/org/apache/tuscany/sca/binding/jms/NoReplyToTestCase.java b/sca-java-2.x/trunk/itest/jms/noreplyto/src/test/java/org/apache/tuscany/sca/binding/jms/NoReplyToTestCase.java deleted file mode 100644 index 848e340181..0000000000 --- a/sca-java-2.x/trunk/itest/jms/noreplyto/src/test/java/org/apache/tuscany/sca/binding/jms/NoReplyToTestCase.java +++ /dev/null @@ -1,100 +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.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.Properties;
-
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.ObjectMessage;
-import javax.jms.Session;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Uses a non-Tuscany JMS client to send/receive a JMS request to a Tuscany/SCA JMS service
- */
-public class NoReplyToTestCase {
-
- private Node node;
- private Session session;
- private InitialContext context;
- private Connection connection;
-
- @Before
- public void init() {
- node = NodeFactory.newInstance().createNode().start();
- }
-
- @Test
- public void testHelloWorldCreate() throws Exception {
- sendJMSRequest();
- String response = receiveJMSResponse();
- assertEquals("jmsHello Petra", response);
- }
-
- private void sendJMSRequest() throws NamingException, JMSException {
- context = new InitialContext(new Properties());
- ConnectionFactory cf = (ConnectionFactory)context.lookup("ConnectionFactory");
- connection = cf.createConnection();
- connection.start();
-
- session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- Destination toDest = (Destination)context.lookup("RequestQueue");
-
- ObjectMessage m = session.createObjectMessage();
- m.setObject("Petra");
-
- MessageProducer producer = session.createProducer(toDest);
- producer.send(m);
- }
-
- private String receiveJMSResponse() throws NamingException, JMSException {
- Destination replyDest = (Destination)context.lookup("ResponseQueue");
- MessageConsumer consumer = session.createConsumer(replyDest);
- Message m = consumer.receive(5000);
- if (m == null) {
- throw new RuntimeException("No reply message received");
- }
- return ((ObjectMessage)m).getObject().toString();
- }
-
- @After
- public void end() throws JMSException {
- if (node != null) {
- node.stop();
- }
- if (connection != null) {
- connection.close();
- }
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/nulls/pom.xml b/sca-java-2.x/trunk/itest/jms/nulls/pom.xml deleted file mode 100644 index cdf628fe76..0000000000 --- a/sca-java-2.x/trunk/itest/jms/nulls/pom.xml +++ /dev/null @@ -1,71 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-jms-nulls</artifactId>
- <name>Apache Tuscany SCA iTest JMS Nulls</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jms-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.2.0</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/sca-java-2.x/trunk/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java deleted file mode 100644 index 7fed36fa77..0000000000 --- a/sca-java-2.x/trunk/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java +++ /dev/null @@ -1,41 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements the OneWay service.
- */
-@Service(MyService.class)
-public class ClientImpl implements MyService {
-
- private MyService serviceA;
-
- @Reference
- public void setServiceA(MyService service) {
- this.serviceA = service;
- }
-
- public void sayHello() {
- serviceA.sayHello();
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java b/sca-java-2.x/trunk/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java deleted file mode 100644 index 7ab6019fd5..0000000000 --- a/sca-java-2.x/trunk/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java +++ /dev/null @@ -1,28 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface MyService {
-
- void sayHello();
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java b/sca-java-2.x/trunk/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java deleted file mode 100644 index 89758becff..0000000000 --- a/sca-java-2.x/trunk/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ServiceImpl.java +++ /dev/null @@ -1,28 +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.binding.jms;
-
-
-public class ServiceImpl implements MyService {
-
- public void sayHello() {
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/nulls/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/nulls/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index ccb52c8702..0000000000 --- a/sca-java-2.x/trunk/itest/jms/nulls/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://itest">
- <deployable composite="itest:Nulls"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/jms/nulls/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/nulls/src/main/resources/jndi.properties deleted file mode 100644 index 4bada514fa..0000000000 --- a/sca-java-2.x/trunk/itest/jms/nulls/src/main/resources/jndi.properties +++ /dev/null @@ -1,39 +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.
-## ---------------------------------------------------------------------------
-
-# START SNIPPET: jndi
-
-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
-
-# use the following property to configure the default connector
-java.naming.provider.url = vm://localhost?broker.persistent=false&broker.useJmx=false&broker.useShutdownHook=false
-
-# use the following property to specify the JNDI name the connection factory
-# should appear as.
-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry
-connectionFactoryNames = ConnectionFactory, ConnectionFactory2
-
-# register some queues in JNDI using the form
-queue.MyService = MyService
-queue.MyService2 = MyService2
-
-# register some topics in JNDI using the form
-# topic.[jndiName] = [physicalName]
-#topic.MyTopic = example.MyTopic
-topic.ServiceTopic = ServiceTopic
-
-# END SNIPPET: jndi
diff --git a/sca-java-2.x/trunk/itest/jms/nulls/src/main/resources/nulls.composite b/sca-java-2.x/trunk/itest/jms/nulls/src/main/resources/nulls.composite deleted file mode 100644 index 1aa17808bf..0000000000 --- a/sca-java-2.x/trunk/itest/jms/nulls/src/main/resources/nulls.composite +++ /dev/null @@ -1,57 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- targetNamespace="http://itest"
- name="Nulls">
-
- <component name="Client1">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.ClientImpl"/>
- <reference name="serviceA">
- <binding.jms uri="jms:jndi:MyService" />
- </reference>
- </component>
-
- <component name="Service1">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.ServiceImpl"/>
- <service name="MyService">
- <binding.jms />
- </service>
- </component>
-
- <component name="Client2">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.ClientImpl"/>
- <reference name="serviceA">
- <binding.jms uri="jms:jndi:MyService2">
- <tuscany:wireFormat.jmsObject/>
- </binding.jms>
- </reference>
- </component>
-
- <component name="Service2">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.ServiceImpl"/>
- <service name="MyService">
- <binding.jms uri="jms:jndi:MyService2">
- <tuscany:wireFormat.jmsObject/>
- </binding.jms>
- </service>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/jms/nulls/src/test/java/org/apache/tuscany/sca/binding/jms/NullsTestCase.java b/sca-java-2.x/trunk/itest/jms/nulls/src/test/java/org/apache/tuscany/sca/binding/jms/NullsTestCase.java deleted file mode 100644 index ac872f46a6..0000000000 --- a/sca-java-2.x/trunk/itest/jms/nulls/src/test/java/org/apache/tuscany/sca/binding/jms/NullsTestCase.java +++ /dev/null @@ -1,60 +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.binding.jms;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- */
-public class NullsTestCase {
-
- private Node node;
-
- @Before
- public void init() {
- node = NodeFactory.newInstance().createNode().start();
- }
-
- @Test
- public void testSayHello() throws Exception {
- MyService client1 = node.getService(MyService.class, "Client1");
-
- client1.sayHello();
-
- }
-
- @Test
- public void testSayHelloObjectFormat() throws Exception {
- MyService client1 = node.getService(MyService.class, "Client2");
-
- client1.sayHello();
-
- }
-
- @After
- public void end() {
- if (node != null) {
- node.stop();
- }
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/oneway-nocf/pom.xml b/sca-java-2.x/trunk/itest/jms/oneway-nocf/pom.xml deleted file mode 100644 index 97365205e6..0000000000 --- a/sca-java-2.x/trunk/itest/jms/oneway-nocf/pom.xml +++ /dev/null @@ -1,83 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>itest-jms-oneway-nocf</artifactId>
- <name>Apache Tuscany SCA iTest JMS for a oneway service</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jms-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.2.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-2.x/trunk/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java deleted file mode 100644 index b572b1012a..0000000000 --- a/sca-java-2.x/trunk/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java +++ /dev/null @@ -1,41 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements the OneWay service.
- */
-@Service(OneWayService.class)
-public class OneWayClientImpl implements OneWayService {
-
- private OneWayService serviceA;
-
- @Reference
- public void setServiceA(OneWayService service) {
- this.serviceA = service;
- }
-
- public void sayHello(String name) {
- serviceA.sayHello(name);
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-2.x/trunk/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java deleted file mode 100644 index 9cec2d9b3e..0000000000 --- a/sca-java-2.x/trunk/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java +++ /dev/null @@ -1,29 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.OneWay;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface OneWayService {
-
- @OneWay
- void sayHello(String name);
-}
diff --git a/sca-java-2.x/trunk/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-2.x/trunk/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java deleted file mode 100644 index 0036391696..0000000000 --- a/sca-java-2.x/trunk/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java +++ /dev/null @@ -1,34 +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.binding.jms;
-
-public class OneWayServiceImpl implements OneWayService {
-
- public static Object mutex = new Object();
- public static String name;
-
- public void sayHello(String name) {
- OneWayServiceImpl.name = name;
- synchronized (OneWayServiceImpl.mutex) {
- OneWayServiceImpl.mutex.notify();
- }
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/oneway-nocf/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/oneway-nocf/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index edd6d508f7..0000000000 --- a/sca-java-2.x/trunk/itest/jms/oneway-nocf/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://itest">
- <deployable composite="itest:OneWayServiceComposite"/>
- <deployable composite="itest:OneWayClientComposite"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/jms/oneway-nocf/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/oneway-nocf/src/main/resources/jndi.properties deleted file mode 100644 index 8934614a8a..0000000000 --- a/sca-java-2.x/trunk/itest/jms/oneway-nocf/src/main/resources/jndi.properties +++ /dev/null @@ -1,38 +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.
-## ---------------------------------------------------------------------------
-
-# START SNIPPET: jndi
-
-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
-
-# use the following property to configure the default connector
-java.naming.provider.url = vm://localhost?broker.persistent=false
-
-# use the following property to specify the JNDI name the connection factory
-# should appear as.
-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry
-connectionFactoryNames = SomeConnectionFactory
-
-# register some queues in JNDI using the form
-# queue.[jndiName] = [physicalName]
-queue.SomeQueue = RequestQueue
-
-# register some topics in JNDI using the form
-# topic.[jndiName] = [physicalName]
-#topic.MyTopic = example.MyTopic
-
-# END SNIPPET: jndi
diff --git a/sca-java-2.x/trunk/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayClient.composite b/sca-java-2.x/trunk/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayClient.composite deleted file mode 100644 index bf709776df..0000000000 --- a/sca-java-2.x/trunk/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayClient.composite +++ /dev/null @@ -1,35 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://itest"
- name="OneWayClientComposite">
-
- <component name="OneWayClient">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayClientImpl"/>
- <reference name="serviceA">
- <interface.java interface="org.apache.tuscany.sca.binding.jms.OneWayService" />
- <binding.jms>
- <destination jndiName="SomeQueue"/>
- <connectionFactory jndiName="SomeConnectionFactory"/>
- </binding.jms>
- </reference>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayService.composite b/sca-java-2.x/trunk/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayService.composite deleted file mode 100644 index da2e6a2264..0000000000 --- a/sca-java-2.x/trunk/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayService.composite +++ /dev/null @@ -1,34 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://itest"
- name="OneWayServiceComposite">
-
- <component name="OneWayService">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayServiceImpl"/>
- <service name="OneWayService">
- <binding.jms>
- <destination jndiName="SomeQueue"/>
- <connectionFactory jndiName="SomeConnectionFactory"/>
- </binding.jms>
- </service>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/jms/oneway-nocf/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java b/sca-java-2.x/trunk/itest/jms/oneway-nocf/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java deleted file mode 100644 index 5d1f764382..0000000000 --- a/sca-java-2.x/trunk/itest/jms/oneway-nocf/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java +++ /dev/null @@ -1,59 +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.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class OneWayTestCase {
-
- private Node node;
-
- @Before
- public void init() {
- node = NodeFactory.newInstance().createNode().start();
- }
-
- @Test
- public void testOneWayInvoked() throws Exception {
- OneWayService oneWayService = node.getService(OneWayService.class, "OneWayClient");
- oneWayService.sayHello("Petra");
- synchronized (OneWayServiceImpl.mutex) {
- // wait up to 10 seconds but it will likely be a lot less
- // as the service invocation will wake this up earlier
- OneWayServiceImpl.mutex.wait(10000);
- }
- assertEquals("Petra", OneWayServiceImpl.name);
- }
-
- @After
- public void end() {
- if (node != null) {
- node.stop();
- }
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/oneway/pom.xml b/sca-java-2.x/trunk/itest/jms/oneway/pom.xml deleted file mode 100644 index f201e5e0d3..0000000000 --- a/sca-java-2.x/trunk/itest/jms/oneway/pom.xml +++ /dev/null @@ -1,83 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-jms-oneway</artifactId>
- <name>Apache Tuscany SCA iTest JMS with Oneway</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jms-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.2.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-2.x/trunk/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java deleted file mode 100644 index b572b1012a..0000000000 --- a/sca-java-2.x/trunk/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java +++ /dev/null @@ -1,41 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements the OneWay service.
- */
-@Service(OneWayService.class)
-public class OneWayClientImpl implements OneWayService {
-
- private OneWayService serviceA;
-
- @Reference
- public void setServiceA(OneWayService service) {
- this.serviceA = service;
- }
-
- public void sayHello(String name) {
- serviceA.sayHello(name);
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java b/sca-java-2.x/trunk/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java deleted file mode 100644 index 9083ba1d9c..0000000000 --- a/sca-java-2.x/trunk/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java +++ /dev/null @@ -1,29 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.OneWay;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface OneWayObjectService {
-
- @OneWay
- void sayHello(Object name);
-}
diff --git a/sca-java-2.x/trunk/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java b/sca-java-2.x/trunk/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java deleted file mode 100644 index 3149f99a25..0000000000 --- a/sca-java-2.x/trunk/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectServiceImpl.java +++ /dev/null @@ -1,34 +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.binding.jms;
-
-public class OneWayObjectServiceImpl implements OneWayObjectService {
-
- public static Object mutex = new Object();
- public static Object name;
-
- public void sayHello(Object name) {
- OneWayObjectServiceImpl.name = name;
- synchronized (OneWayObjectServiceImpl.mutex) {
- OneWayObjectServiceImpl.mutex.notify();
- }
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-2.x/trunk/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java deleted file mode 100644 index 9cec2d9b3e..0000000000 --- a/sca-java-2.x/trunk/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java +++ /dev/null @@ -1,29 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.OneWay;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface OneWayService {
-
- @OneWay
- void sayHello(String name);
-}
diff --git a/sca-java-2.x/trunk/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-2.x/trunk/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java deleted file mode 100644 index 0036391696..0000000000 --- a/sca-java-2.x/trunk/itest/jms/oneway/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java +++ /dev/null @@ -1,34 +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.binding.jms;
-
-public class OneWayServiceImpl implements OneWayService {
-
- public static Object mutex = new Object();
- public static String name;
-
- public void sayHello(String name) {
- OneWayServiceImpl.name = name;
- synchronized (OneWayServiceImpl.mutex) {
- OneWayServiceImpl.mutex.notify();
- }
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/oneway/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/oneway/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index edd6d508f7..0000000000 --- a/sca-java-2.x/trunk/itest/jms/oneway/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://itest">
- <deployable composite="itest:OneWayServiceComposite"/>
- <deployable composite="itest:OneWayClientComposite"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/jms/oneway/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/oneway/src/main/resources/jndi.properties deleted file mode 100644 index 4d6acc037b..0000000000 --- a/sca-java-2.x/trunk/itest/jms/oneway/src/main/resources/jndi.properties +++ /dev/null @@ -1,39 +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.
-## ---------------------------------------------------------------------------
-
-# START SNIPPET: jndi
-
-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
-
-# use the following property to configure the default connector
-java.naming.provider.url = vm://localhost?broker.persistent=false
-
-# use the following property to specify the JNDI name the connection factory
-# should appear as.
-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry
-connectionFactoryNames = ConnectionFactory
-
-# register some queues in JNDI using the form
-# queue.[jndiName] = [physicalName]
-queue.RequestQueue = RequestQueue
-queue.ResponseQueue = ResponseQueue
-
-# register some topics in JNDI using the form
-# topic.[jndiName] = [physicalName]
-#topic.MyTopic = example.MyTopic
-
-# END SNIPPET: jndi
diff --git a/sca-java-2.x/trunk/itest/jms/oneway/src/main/resources/oneway/OneWayClient.composite b/sca-java-2.x/trunk/itest/jms/oneway/src/main/resources/oneway/OneWayClient.composite deleted file mode 100644 index 8bccf22bea..0000000000 --- a/sca-java-2.x/trunk/itest/jms/oneway/src/main/resources/oneway/OneWayClient.composite +++ /dev/null @@ -1,33 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://itest"
- name="OneWayClientComposite">
-
- <component name="OneWayClient">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayClientImpl"/>
- <reference name="serviceA">
- <binding.jms>
- <destination jndiName="DestQueueA"/>
- </binding.jms>
- </reference>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/jms/oneway/src/main/resources/oneway/OneWayService.composite b/sca-java-2.x/trunk/itest/jms/oneway/src/main/resources/oneway/OneWayService.composite deleted file mode 100644 index 0014b88050..0000000000 --- a/sca-java-2.x/trunk/itest/jms/oneway/src/main/resources/oneway/OneWayService.composite +++ /dev/null @@ -1,33 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://itest"
- name="OneWayServiceComposite">
-
- <component name="OneWayService">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayServiceImpl"/>
- <service name="OneWayService">
- <binding.jms>
- <destination jndiName="DestQueueA" create="always"/>
- </binding.jms>
- </service>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/jms/oneway/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java b/sca-java-2.x/trunk/itest/jms/oneway/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java deleted file mode 100644 index 14bbf238e1..0000000000 --- a/sca-java-2.x/trunk/itest/jms/oneway/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java +++ /dev/null @@ -1,60 +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.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class OneWayTestCase {
-
- private Node node;
-
- @Before
- public void init() {
- node = NodeFactory.newInstance().createNode().start();
- }
-
- @Test
- public void testOneWayInvoked() throws Exception {
- OneWayService oneWayService = node.getService(OneWayService.class, "OneWayClient");
- oneWayService.sayHello("Petra");
- synchronized (OneWayServiceImpl.mutex) {
- // wait up to 10 seconds but it will likely be a lot less
- // as the service invocation will wake this up earlier
- OneWayServiceImpl.mutex.wait(10000);
- }
- assertEquals("Petra", OneWayServiceImpl.name);
- }
-
- @After
- public void end() {
- if (node != null) {
- node.stop();
- }
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/policy-headers/pom.xml b/sca-java-2.x/trunk/itest/jms/policy-headers/pom.xml deleted file mode 100644 index 42596b8d0e..0000000000 --- a/sca-java-2.x/trunk/itest/jms/policy-headers/pom.xml +++ /dev/null @@ -1,83 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-jms-policy-headers</artifactId>
- <name>Apache Tuscany SCA iTest JMS with Policy Headers</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jms-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.2.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java b/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java deleted file mode 100644 index d4cd5df431..0000000000 --- a/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java +++ /dev/null @@ -1,28 +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.binding.jms;
-
-
-/**
- * The client interface
- */
-public interface JMSClient {
-
- void aClientMethod();
-}
diff --git a/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java b/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java deleted file mode 100644 index 464072b42d..0000000000 --- a/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java +++ /dev/null @@ -1,29 +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.binding.jms;
-
-
-/**
- * The client interface
- */
-public interface MsgClient {
-
- void aClientMethod();
- void op2();
-}
diff --git a/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java b/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java deleted file mode 100644 index 4140fa0b89..0000000000 --- a/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java +++ /dev/null @@ -1,38 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(MsgClient.class)
-public class MsgClientImpl implements MsgClient {
-
- @Reference protected MsgClientService myService;
-
- public void aClientMethod() {
- myService.aClientMethod();
- }
-
- public void op2() {
- myService.op2();
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java b/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java deleted file mode 100644 index 2be4f2ad3e..0000000000 --- a/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java +++ /dev/null @@ -1,33 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-
-/**
- * The client interface
- */
-@Remotable
-public interface MsgClientService {
-
- void aClientMethod();
-
- void op2();
-}
diff --git a/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java b/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java deleted file mode 100644 index d5684ca56c..0000000000 --- a/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java +++ /dev/null @@ -1,32 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.AllowsPassByReference;
-import org.oasisopen.sca.annotation.Remotable;
-
-
-@Remotable
-@AllowsPassByReference
-public interface MsgService {
-
- void onMessage(javax.jms.Message msg);
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java b/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java deleted file mode 100644 index e18de0456c..0000000000 --- a/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java +++ /dev/null @@ -1,39 +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.binding.jms;
-
-import javax.jms.Message;
-
-import org.oasisopen.sca.annotation.Service;
-
-@Service(MsgService.class)
-public class MsgServiceImpl implements MsgService {
-
- public static Object lock = new Object();
- public static Message msg;
-
- public void onMessage(Message msg) {
- MsgServiceImpl.msg = msg;
- synchronized(lock) {
- lock.notifyAll();
- }
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/META-INF/definitions.xml b/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/META-INF/definitions.xml deleted file mode 100644 index 7e417723f2..0000000000 --- a/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/META-INF/definitions.xml +++ /dev/null @@ -1,65 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.
--->
-<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912">
-
- <policySet name="JMSPolicySet1"
- provides="priority"
- appliesTo="sca:binding.jms">
- <intentMap provides="priority">
- <qualifier name="high">
- <tuscany:jmsHeader JMSPriority="9"/>
- </qualifier>
- <qualifier name="medium">
- <tuscany:jmsHeader JMSPriority="4"/>
- </qualifier>
- <qualifier name="low">
- <tuscany:jmsHeader JMSPriority="0"/>
- </qualifier>
- </intentMap>
- </policySet>
-
- <policySet name="JMSPolicySet2"
- provides="deliveryMode"
- appliesTo="sca:binding.jms">
- <intentMap provides="deliveryMode">
- <qualifier name="persistent">
- <tuscany:jmsHeader JMSDeliveryMode="PERSISTENT"/>
- </qualifier>
- <qualifier name="nonPersistent">
- <tuscany:jmsHeader JMSDeliveryMode="NON_PERSISTENT"/>
- </qualifier>
- </intentMap>
- </policySet>
-
- <intent name="priority" constrains="sca:binding" intentType="interaction">
- <qualifier name="high" default="true"/>
- <qualifier name="medium"/>
- <qualifier name="low"/>
- </intent>
-
- <intent name="deliveryMode" constrains="sca:binding" intentType="interaction">
- <qualifier name="nonPersistent" default="true"/>
- <qualifier name="persistent"/>
- </intent>
-
-</definitions>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 12c7313bb4..0000000000 --- a/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://itest">
- <deployable composite="itest:PropertiesClientComposite"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/jndi.properties deleted file mode 100644 index f0b9fbd734..0000000000 --- a/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/jndi.properties +++ /dev/null @@ -1,38 +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.
-## ---------------------------------------------------------------------------
-
-# START SNIPPET: jndi
-
-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
-
-# use the following property to configure the default connector
-java.naming.provider.url = vm://localhost?broker.persistent=false
-
-# use the following property to specify the JNDI name the connection factory
-# should appear as.
-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry
-connectionFactoryNames = ConnectionFactory
-
-# register some queues in JNDI using the form
-# queue.[jndiName] = [physicalName]
-queue.ServiceQueue = ServiceQueue
-
-# register some topics in JNDI using the form
-# topic.[jndiName] = [physicalName]
-#topic.MyTopic = example.MyTopic
-
-# END SNIPPET: jndi
diff --git a/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/policyHeaders/policyHeaders.composite b/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/policyHeaders/policyHeaders.composite deleted file mode 100644 index 68f93669ec..0000000000 --- a/sca-java-2.x/trunk/itest/jms/policy-headers/src/main/resources/policyHeaders/policyHeaders.composite +++ /dev/null @@ -1,45 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://itest"
- name="PropertiesClientComposite">
-
- <component name="ClientComponent">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.MsgClientImpl" />
- <reference name="myService" requires="priority.medium">
- <binding.jms uri="jms:jndi:ServiceQueue">
- <headers type="myType"
- deliveryMode="persistent"
- timeToLive="4321"
- priority="7">
- <property name="headP1">myHeadP1</property>
- </headers>
- </binding.jms>
- </reference>
- </component>
-
- <component name="ServiceComponent">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.MsgServiceImpl" />
- <service name="MsgService">
- <binding.jms uri="jms:jndi:ServiceQueue"/>
- </service>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/jms/policy-headers/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java b/sca-java-2.x/trunk/itest/jms/policy-headers/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java deleted file mode 100644 index ebffbc4bc4..0000000000 --- a/sca-java-2.x/trunk/itest/jms/policy-headers/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java +++ /dev/null @@ -1,94 +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.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import javax.jms.DeliveryMode;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- */
-public class PolicyHeadersTestCase {
-
- private Node node;
-
- @Before
- public void init() {
- node = NodeFactory.newInstance().createNode().start();
- }
-
- @Test
- public void testProps1() throws Exception {
- JMSClient client = node.getService(JMSClient.class, "ClientComponent");
-
- client.aClientMethod();
-
- // wait for up to 5 seconds but should wake up as soon as done
- synchronized(MsgServiceImpl.lock) {
- if (MsgServiceImpl.msg == null) {
- MsgServiceImpl.lock.wait(5000); // For debugging set higher.
- }
- }
- assertNotNull(MsgServiceImpl.msg);
-
- assertEquals("myType", MsgServiceImpl.msg.getJMSType());
- assertEquals(DeliveryMode.PERSISTENT, MsgServiceImpl.msg.getJMSDeliveryMode());
- assertEquals(7, MsgServiceImpl.msg.getJMSPriority());
- assertEquals("myHeadP1", MsgServiceImpl.msg.getStringProperty("headP1"));
- }
-
- @Test
- @Ignore
- public void testOp2() throws Exception {
- MsgClient client = node.getService(MsgClient.class, "ClientComponent");
-
- client.op2();
-
- // wait for up to 5 seconds but should wake up as soon as done
- synchronized(MsgServiceImpl.lock) {
- if (MsgServiceImpl.msg == null) {
- MsgServiceImpl.lock.wait(5000);
- }
- }
- assertNotNull(MsgServiceImpl.msg);
-
- assertEquals("op2Type", MsgServiceImpl.msg.getJMSType());
- assertEquals(DeliveryMode.NON_PERSISTENT, MsgServiceImpl.msg.getJMSDeliveryMode());
- assertEquals(3, MsgServiceImpl.msg.getJMSPriority());
- assertEquals("myHeadP1", MsgServiceImpl.msg.getStringProperty("headP1"));
- assertEquals("foo", MsgServiceImpl.msg.getStringProperty("op2P2"));
- assertEquals("nativeOp2", MsgServiceImpl.msg.getStringProperty("scaOperationName"));
- }
-
- @After
- public void end() {
- if (node != null) {
- node.stop();
- }
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/pom.xml b/sca-java-2.x/trunk/itest/jms/pom.xml deleted file mode 100644 index cccfe5c657..0000000000 --- a/sca-java-2.x/trunk/itest/jms/pom.xml +++ /dev/null @@ -1,68 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <packaging>pom</packaging>
- <artifactId>itest-jms</artifactId>
- <name>Apache Tuscany SCA iTest JMS</name>
-
- <modules>
- <module>args</module>
- <module>callbacks</module>
- <module>defaults</module>
- <module>DynamicReplyQ</module>
- <module>exceptions</module>
- <module>exceptions1</module>
- <module>externalBroker</module>
- <module>format-jmsbytes</module>
- <module>format-jmsbytesxml</module>
- <module>format-jmsdefault</module>
- <module>format-jmsmessage</module>
- <module>format-jmsobject</module>
- <module>format-jmstext</module>
- <module>format-jmstextxml</module>
- <module>format-jmstextxmlinjmsobjectout</module>
- <module>non-sca-client</module>
- <module>noreplyto</module>
- <module>nulls</module>
- <module>oneway</module>
- <module>oneway-nocf</module>
- <module>policy-headers</module>
- <module>properties</module>
- <module>responsecf</module>
- <module>rpc</module>
- <module>selectors</module>
- <module>topics</module>
- <module>ttl</module>
- <module>uri-rpc</module>
-
-<!-- still to bring up in 2.x
- <module>definitions</module>
--->
-
- </modules>
-
-</project>
diff --git a/sca-java-2.x/trunk/itest/jms/properties/pom.xml b/sca-java-2.x/trunk/itest/jms/properties/pom.xml deleted file mode 100644 index 72d1041f44..0000000000 --- a/sca-java-2.x/trunk/itest/jms/properties/pom.xml +++ /dev/null @@ -1,83 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-jms-properties</artifactId>
- <name>Apache Tuscany SCA iTest JMS with Properties</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jms-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.2.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java b/sca-java-2.x/trunk/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java deleted file mode 100644 index d4cd5df431..0000000000 --- a/sca-java-2.x/trunk/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClient.java +++ /dev/null @@ -1,28 +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.binding.jms;
-
-
-/**
- * The client interface
- */
-public interface JMSClient {
-
- void aClientMethod();
-}
diff --git a/sca-java-2.x/trunk/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java b/sca-java-2.x/trunk/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java deleted file mode 100644 index 464072b42d..0000000000 --- a/sca-java-2.x/trunk/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClient.java +++ /dev/null @@ -1,29 +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.binding.jms;
-
-
-/**
- * The client interface
- */
-public interface MsgClient {
-
- void aClientMethod();
- void op2();
-}
diff --git a/sca-java-2.x/trunk/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java b/sca-java-2.x/trunk/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java deleted file mode 100644 index 4140fa0b89..0000000000 --- a/sca-java-2.x/trunk/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java +++ /dev/null @@ -1,38 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(MsgClient.class)
-public class MsgClientImpl implements MsgClient {
-
- @Reference protected MsgClientService myService;
-
- public void aClientMethod() {
- myService.aClientMethod();
- }
-
- public void op2() {
- myService.op2();
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java b/sca-java-2.x/trunk/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java deleted file mode 100644 index 2be4f2ad3e..0000000000 --- a/sca-java-2.x/trunk/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java +++ /dev/null @@ -1,33 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-
-/**
- * The client interface
- */
-@Remotable
-public interface MsgClientService {
-
- void aClientMethod();
-
- void op2();
-}
diff --git a/sca-java-2.x/trunk/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java b/sca-java-2.x/trunk/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java deleted file mode 100644 index d5684ca56c..0000000000 --- a/sca-java-2.x/trunk/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java +++ /dev/null @@ -1,32 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.AllowsPassByReference;
-import org.oasisopen.sca.annotation.Remotable;
-
-
-@Remotable
-@AllowsPassByReference
-public interface MsgService {
-
- void onMessage(javax.jms.Message msg);
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java b/sca-java-2.x/trunk/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java deleted file mode 100644 index e18de0456c..0000000000 --- a/sca-java-2.x/trunk/itest/jms/properties/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java +++ /dev/null @@ -1,39 +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.binding.jms;
-
-import javax.jms.Message;
-
-import org.oasisopen.sca.annotation.Service;
-
-@Service(MsgService.class)
-public class MsgServiceImpl implements MsgService {
-
- public static Object lock = new Object();
- public static Message msg;
-
- public void onMessage(Message msg) {
- MsgServiceImpl.msg = msg;
- synchronized(lock) {
- lock.notifyAll();
- }
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/properties/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/properties/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 12c7313bb4..0000000000 --- a/sca-java-2.x/trunk/itest/jms/properties/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://itest">
- <deployable composite="itest:PropertiesClientComposite"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/jms/properties/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/properties/src/main/resources/jndi.properties deleted file mode 100644 index c44da27df1..0000000000 --- a/sca-java-2.x/trunk/itest/jms/properties/src/main/resources/jndi.properties +++ /dev/null @@ -1,38 +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.
-## ---------------------------------------------------------------------------
-
-# START SNIPPET: jndi
-
-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
-
-# use the following property to configure the default connector
-java.naming.provider.url = vm://localhost?broker.persistent=false
-
-# use the following property to specify the JNDI name the connection factory
-# should appear as.
-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry
-connectionFactoryNames = ConnectionFactory
-
-# register some queues in JNDI using the form
-# queue.[jndiName] = [physicalName]
-queue.ServiceQueue = RequestQueue
-
-# register some topics in JNDI using the form
-# topic.[jndiName] = [physicalName]
-#topic.MyTopic = example.MyTopic
-
-# END SNIPPET: jndi
diff --git a/sca-java-2.x/trunk/itest/jms/properties/src/main/resources/properties/properties.composite b/sca-java-2.x/trunk/itest/jms/properties/src/main/resources/properties/properties.composite deleted file mode 100644 index 85babc8634..0000000000 --- a/sca-java-2.x/trunk/itest/jms/properties/src/main/resources/properties/properties.composite +++ /dev/null @@ -1,53 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://itest"
- name="PropertiesClientComposite">
-
- <component name="ClientComponent">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.MsgClientImpl" />
- <reference name="myService">
- <binding.jms uri="jms:jndi:ServiceQueue">
- <headers type="myType"
- deliveryMode="persistent"
- timeToLive="4321"
- priority="7">
- <property name="headP1">myHeadP1</property>
- </headers>
- <operationProperties name="op2" selectedOperation="nativeOp2">
- <headers type="op2Type"
- deliveryMode="nonpersistent"
- timeToLive="6000"
- priority="8">
- <property name="op2P2">foo</property>
- </headers>
- </operationProperties>
- </binding.jms>
- </reference>
- </component>
-
- <component name="ServiceComponent">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.MsgServiceImpl" />
- <service name="MsgService">
- <binding.jms uri="jms:jndi:ServiceQueue"/>
- </service>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/jms/properties/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java b/sca-java-2.x/trunk/itest/jms/properties/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java deleted file mode 100644 index e8d748bb19..0000000000 --- a/sca-java-2.x/trunk/itest/jms/properties/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java +++ /dev/null @@ -1,93 +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.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-
-import javax.jms.DeliveryMode;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- */
-public class PropertiesTestCase {
-
- private static Node node;
-
- @Before
- public void init() {
- node = NodeFactory.newInstance().createNode().start();
- }
-
- @Test
- public void testProps1() throws Exception {
- JMSClient client = node.getService(JMSClient.class, "ClientComponent");
-
- client.aClientMethod();
-
- // wait for up to 5 seconds but should wake up as soon as done
- synchronized(MsgServiceImpl.lock) {
- if (MsgServiceImpl.msg == null) {
- MsgServiceImpl.lock.wait(5000);
- }
- }
- assertNotNull(MsgServiceImpl.msg);
-
- assertEquals("myType", MsgServiceImpl.msg.getJMSType());
- assertEquals(DeliveryMode.PERSISTENT, MsgServiceImpl.msg.getJMSDeliveryMode());
- // assertEquals(3, MsgServiceImpl.msg.getJMSPriority()); // Doesn't seem to work with ActiveMQ
- assertEquals("myHeadP1", MsgServiceImpl.msg.getStringProperty("headP1"));
- }
-
- @Test
- public void testOp2() throws Exception {
- MsgClient client = node.getService(MsgClient.class, "ClientComponent");
-
- client.op2();
-
- // wait for up to 5 seconds but should wake up as soon as done
- synchronized(MsgServiceImpl.lock) {
- if (MsgServiceImpl.msg == null) {
- MsgServiceImpl.lock.wait(15000);
- }
- }
- assertNotNull(MsgServiceImpl.msg);
-
- assertEquals("op2Type", MsgServiceImpl.msg.getJMSType());
- // assertEquals(DeliveryMode.NON_PERSISTENT, MsgServiceImpl.msg.getJMSDeliveryMode()); // Doesn't seem to work with ActiveMQ
- // assertEquals(3, MsgServiceImpl.msg.getJMSPriority()); // Doesn't seem to work with ActiveMQ
- assertEquals("myHeadP1", MsgServiceImpl.msg.getStringProperty("headP1"));
- assertEquals("foo", MsgServiceImpl.msg.getStringProperty("op2P2"));
- //operation properties are a service side thing
- //assertEquals("nativeOp2", MsgServiceImpl.msg.getStringProperty("scaOperationName"));
- }
-
- @After
- public void end() {
- if (node != null) {
- node.stop();
- }
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/responsecf/pom.xml b/sca-java-2.x/trunk/itest/jms/responsecf/pom.xml deleted file mode 100644 index fb7edf2918..0000000000 --- a/sca-java-2.x/trunk/itest/jms/responsecf/pom.xml +++ /dev/null @@ -1,83 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-jms-responsecf</artifactId>
- <name>Apache Tuscany SCA iTest JMS Response ConnectionFactory</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jms-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.2.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-2.x/trunk/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java deleted file mode 100644 index 9aef6ba1a3..0000000000 --- a/sca-java-2.x/trunk/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java +++ /dev/null @@ -1,41 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(HelloWorldService.class)
-public class HelloWorldClientImpl implements HelloWorldService {
-
- private HelloWorldService serviceA;
-
- @Reference
- public void setServiceA(HelloWorldService service) {
- this.serviceA = service;
- }
-
- public String sayHello(String name) {
- return serviceA.sayHello(name);
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java deleted file mode 100644 index 430c71aaef..0000000000 --- a/sca-java-2.x/trunk/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java +++ /dev/null @@ -1,26 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface HelloWorldService {
- String sayHello(String name);
-}
diff --git a/sca-java-2.x/trunk/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java deleted file mode 100644 index 2c6d9d0d17..0000000000 --- a/sca-java-2.x/trunk/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java +++ /dev/null @@ -1,30 +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.binding.jms;
-
-public class HelloWorldServiceImpl implements HelloWorldService {
-
- public String sayHello(String name) {
- if ("bang".equals(name)) {
- throw new RuntimeException("blem wit");
- }
- return "jmsHello " + name;
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/responsecf/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/responsecf/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 23c5979291..0000000000 --- a/sca-java-2.x/trunk/itest/jms/responsecf/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://itest">
- <deployable composite="itest:SimpleServiceComposite"/>
- <deployable composite="itest:SimpleClientComposite"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/jms/responsecf/src/main/resources/cf/client.composite b/sca-java-2.x/trunk/itest/jms/responsecf/src/main/resources/cf/client.composite deleted file mode 100644 index a3e5403432..0000000000 --- a/sca-java-2.x/trunk/itest/jms/responsecf/src/main/resources/cf/client.composite +++ /dev/null @@ -1,36 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://itest"
- name="SimpleClientComposite">
-
- <component name="HelloWorldClient">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldClientImpl"/>
- <reference name="serviceA">
- <binding.jms>
- <destination jndiName="DestQueueA"/>
- <response>
- <destination jndiName="RespQueueA"/>
- </response>
- </binding.jms>
- </reference>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/jms/responsecf/src/main/resources/cf/service.composite b/sca-java-2.x/trunk/itest/jms/responsecf/src/main/resources/cf/service.composite deleted file mode 100644 index cd04ae7836..0000000000 --- a/sca-java-2.x/trunk/itest/jms/responsecf/src/main/resources/cf/service.composite +++ /dev/null @@ -1,36 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://itest"
- name="SimpleServiceComposite">
-
- <component name="HelloWorldService">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldServiceImpl"/>
- <service name="HelloWorldService">
- <binding.jms>
- <destination jndiName="DestQueueA"/>
- <response>
- <connectionFactory jndiName="ResponseCF"/>
- </response>
- </binding.jms>
- </service>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/jms/responsecf/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/responsecf/src/main/resources/jndi.properties deleted file mode 100644 index a41e42950e..0000000000 --- a/sca-java-2.x/trunk/itest/jms/responsecf/src/main/resources/jndi.properties +++ /dev/null @@ -1,39 +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.
-## ---------------------------------------------------------------------------
-
-# START SNIPPET: jndi
-
-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
-
-# use the following property to configure the default connector
-java.naming.provider.url = vm://localhost?broker.persistent=false
-
-# use the following property to specify the JNDI name the connection factory
-# should appear as.
-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry
-connectionFactoryNames = ConnectionFactory, ResponseCF
-
-# register some queues in JNDI using the form
-# queue.[jndiName] = [physicalName]
-queue.DestQueueA = RequestQueue
-queue.RespQueueA = ResponseQueue
-
-# register some topics in JNDI using the form
-# topic.[jndiName] = [physicalName]
-#topic.MyTopic = example.MyTopic
-
-# END SNIPPET: jndi
diff --git a/sca-java-2.x/trunk/itest/jms/responsecf/src/test/java/org/apache/tuscany/sca/binding/jms/ResponseCFTestCase.java b/sca-java-2.x/trunk/itest/jms/responsecf/src/test/java/org/apache/tuscany/sca/binding/jms/ResponseCFTestCase.java deleted file mode 100644 index 03b834ce7d..0000000000 --- a/sca-java-2.x/trunk/itest/jms/responsecf/src/test/java/org/apache/tuscany/sca/binding/jms/ResponseCFTestCase.java +++ /dev/null @@ -1,53 +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.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * This shows how to test the JMS binding using a response ConnectionFactory
- */
-public class ResponseCFTestCase {
-
- private Node node;
-
- @Before
- public void init() {
- node = NodeFactory.newInstance().createNode().start();
- }
-
- @Test
- public void testHelloWorldCreate() throws Exception {
- HelloWorldService helloWorldService = node.getService(HelloWorldService.class, "HelloWorldClient");
- assertEquals("jmsHello Petra", helloWorldService.sayHello("Petra"));
- }
-
- @After
- public void end() {
- if (node != null) {
- node.stop();
- }
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/rpc/pom.xml b/sca-java-2.x/trunk/itest/jms/rpc/pom.xml deleted file mode 100644 index b436479c3c..0000000000 --- a/sca-java-2.x/trunk/itest/jms/rpc/pom.xml +++ /dev/null @@ -1,83 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-jms-rpc</artifactId>
- <name>Apache Tuscany SCA iTest JMS with RPC</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jms-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.2.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-2.x/trunk/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java deleted file mode 100644 index 9aef6ba1a3..0000000000 --- a/sca-java-2.x/trunk/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java +++ /dev/null @@ -1,41 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(HelloWorldService.class)
-public class HelloWorldClientImpl implements HelloWorldService {
-
- private HelloWorldService serviceA;
-
- @Reference
- public void setServiceA(HelloWorldService service) {
- this.serviceA = service;
- }
-
- public String sayHello(String name) {
- return serviceA.sayHello(name);
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java deleted file mode 100644 index 430c71aaef..0000000000 --- a/sca-java-2.x/trunk/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java +++ /dev/null @@ -1,26 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface HelloWorldService {
- String sayHello(String name);
-}
diff --git a/sca-java-2.x/trunk/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java deleted file mode 100644 index 2c6d9d0d17..0000000000 --- a/sca-java-2.x/trunk/itest/jms/rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java +++ /dev/null @@ -1,30 +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.binding.jms;
-
-public class HelloWorldServiceImpl implements HelloWorldService {
-
- public String sayHello(String name) {
- if ("bang".equals(name)) {
- throw new RuntimeException("blem wit");
- }
- return "jmsHello " + name;
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/rpc/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/rpc/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 23c5979291..0000000000 --- a/sca-java-2.x/trunk/itest/jms/rpc/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://itest">
- <deployable composite="itest:SimpleServiceComposite"/>
- <deployable composite="itest:SimpleClientComposite"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/jms/rpc/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/rpc/src/main/resources/jndi.properties deleted file mode 100644 index 4d6acc037b..0000000000 --- a/sca-java-2.x/trunk/itest/jms/rpc/src/main/resources/jndi.properties +++ /dev/null @@ -1,39 +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.
-## ---------------------------------------------------------------------------
-
-# START SNIPPET: jndi
-
-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
-
-# use the following property to configure the default connector
-java.naming.provider.url = vm://localhost?broker.persistent=false
-
-# use the following property to specify the JNDI name the connection factory
-# should appear as.
-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry
-connectionFactoryNames = ConnectionFactory
-
-# register some queues in JNDI using the form
-# queue.[jndiName] = [physicalName]
-queue.RequestQueue = RequestQueue
-queue.ResponseQueue = ResponseQueue
-
-# register some topics in JNDI using the form
-# topic.[jndiName] = [physicalName]
-#topic.MyTopic = example.MyTopic
-
-# END SNIPPET: jndi
diff --git a/sca-java-2.x/trunk/itest/jms/rpc/src/main/resources/simple/client.composite b/sca-java-2.x/trunk/itest/jms/rpc/src/main/resources/simple/client.composite deleted file mode 100644 index a758389e89..0000000000 --- a/sca-java-2.x/trunk/itest/jms/rpc/src/main/resources/simple/client.composite +++ /dev/null @@ -1,37 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://itest"
- name="SimpleClientComposite">
-
- <component name="HelloWorldClient">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldClientImpl"/>
- <reference name="serviceA">
- <binding.jms>
- <destination jndiName="DestQueueA">
- </destination>
- <response>
- <destination jndiName="RespQueueA"/>
- </response>
- </binding.jms>
- </reference>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/jms/rpc/src/main/resources/simple/service.composite b/sca-java-2.x/trunk/itest/jms/rpc/src/main/resources/simple/service.composite deleted file mode 100644 index 33364f61c0..0000000000 --- a/sca-java-2.x/trunk/itest/jms/rpc/src/main/resources/simple/service.composite +++ /dev/null @@ -1,37 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://itest"
- name="SimpleServiceComposite">
-
- <component name="HelloWorldService">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldServiceImpl"/>
- <service name="HelloWorldService">
- <binding.jms>
- <destination jndiName="DestQueueA" create="always">
- </destination>
- <response>
- <destination jndiName="RespQueueA" create="always"/>
- </response>
- </binding.jms>
- </service>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/jms/rpc/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java b/sca-java-2.x/trunk/itest/jms/rpc/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java deleted file mode 100644 index 3c0eb0791b..0000000000 --- a/sca-java-2.x/trunk/itest/jms/rpc/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java +++ /dev/null @@ -1,53 +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.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class RPCTestCase {
-
- private Node node;
-
- @Before
- public void init() {
- node = NodeFactory.newInstance().createNode().start();
- }
-
- @Test
- public void testHelloWorldCreate() throws Exception {
- HelloWorldService helloWorldService = node.getService(HelloWorldService.class, "HelloWorldClient");
- assertEquals("jmsHello Petra", helloWorldService.sayHello("Petra"));
- }
-
- @After
- public void end() {
- if (node != null) {
- node.stop();
- }
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/selectors/pom.xml b/sca-java-2.x/trunk/itest/jms/selectors/pom.xml deleted file mode 100644 index c3dd5edee8..0000000000 --- a/sca-java-2.x/trunk/itest/jms/selectors/pom.xml +++ /dev/null @@ -1,70 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-jms-selectors</artifactId>
- <name>Apache Tuscany SCA iTest JMS Tests For Selectors</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jms-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.2.0</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java deleted file mode 100644 index b589d5e8bc..0000000000 --- a/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java +++ /dev/null @@ -1,41 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements the OneWay service.
- */
-@Service(SelectorService.class)
-public class ClientImpl implements SelectorService {
-
- private SelectorService serviceA;
-
- @Reference
- public void setServiceA(SelectorService service) {
- this.serviceA = service;
- }
-
- public void sayHello(String name) {
- serviceA.sayHello(name);
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java b/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java deleted file mode 100644 index 1aff0d454e..0000000000 --- a/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java +++ /dev/null @@ -1,29 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.OneWay;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface SelectorService {
-
- @OneWay
- void sayHello(String name);
-}
diff --git a/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java b/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java deleted file mode 100644 index fb53c877e6..0000000000 --- a/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl1.java +++ /dev/null @@ -1,40 +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.binding.jms;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class SelectorServiceImpl1 implements SelectorService {
-
- public static Object lock = new Object();
- public static List<String> names = new ArrayList<String>();
-
- public void sayHello(String name) {
- System.out.println("SelectorServiceImpl1 " + name);
- SelectorServiceImpl1.names.add(name);
- if (names.size() == 2) {
- synchronized (SelectorServiceImpl1.lock) {
- SelectorServiceImpl1.lock.notify();
- }
- }
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java b/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java deleted file mode 100644 index 1bbaf5d6f4..0000000000 --- a/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl2.java +++ /dev/null @@ -1,38 +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.binding.jms;
-
-public class SelectorServiceImpl2 implements SelectorService {
-
- public static Object lock = new Object();
- public static String name;
-
- public void sayHello(String name) {
- if (SelectorServiceImpl2.name != null) {
- throw new IllegalStateException("name already set");
- }
- System.out.println("SelectorServiceImpl2 " + name);
- SelectorServiceImpl2.name = name;
- synchronized (SelectorServiceImpl2.lock) {
- SelectorServiceImpl2.lock.notify();
- }
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java b/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java deleted file mode 100644 index 4bdc4edcb5..0000000000 --- a/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorServiceImpl3.java +++ /dev/null @@ -1,38 +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.binding.jms;
-
-public class SelectorServiceImpl3 implements SelectorService {
-
- public static Object lock = new Object();
- public static String name;
-
- public void sayHello(String name) {
- if (SelectorServiceImpl3.name != null) {
- throw new IllegalStateException("name already set");
- }
- System.out.println("SelectorServiceImpl3 " + name);
- SelectorServiceImpl3.name = name;
- synchronized (SelectorServiceImpl3.lock) {
- SelectorServiceImpl3.lock.notify();
- }
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReference.java b/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReference.java deleted file mode 100644 index 0592194b21..0000000000 --- a/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReference.java +++ /dev/null @@ -1,32 +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.binding.jms.operationselector.jmsdefault; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * This is the business interface of the HelloWorld greetings service. - */ -@Remotable -public interface HelloWorldReference { - - public String getGreetings(String name); - -} - diff --git a/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReferenceImpl.java deleted file mode 100644 index 2d4ff0192b..0000000000 --- a/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReferenceImpl.java +++ /dev/null @@ -1,39 +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.binding.jms.operationselector.jmsdefault; - -import org.oasisopen.sca.annotation.Reference; - - -public class HelloWorldReferenceImpl implements HelloWorldReference { - - @Reference - protected HelloWorldService helloWorldService1; - - @Reference - protected HelloWorldService helloWorldService2; - - public String getGreetings(String name){ - return helloWorldService1.getGreetingsOne(name) + " " + - helloWorldService1.getGreetingsTwo(name) + " " + - helloWorldService2.getGreetingsOne(name) + " " + - helloWorldService1.getGreetingsThree(name); - } -} - diff --git a/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldService.java deleted file mode 100644 index b632b3f60f..0000000000 --- a/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldService.java +++ /dev/null @@ -1,38 +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.binding.jms.operationselector.jmsdefault; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * This is the business interface of the HelloWorld greetings service. - */ -@Remotable -public interface HelloWorldService { - - public String getGreetingsOne(String name); - - public String getGreetingsTwo(String name); - - public String getGreetingsThree(String name); - - public String getGreetingsFour(String name); - -} - diff --git a/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldServiceImpl.java deleted file mode 100644 index b2df9137c8..0000000000 --- a/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldServiceImpl.java +++ /dev/null @@ -1,47 +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.binding.jms.operationselector.jmsdefault; - -public class HelloWorldServiceImpl implements HelloWorldService { - - public String getGreetingsOne(String name){ - String response = "Hello One " + name; - System.out.println("getGreetingsOne: " + response); - return response; - } - - public String getGreetingsTwo(String name){ - String response = "Hello Two " + name; - System.out.println("getGreetingsTwo: " + response); - return response; - } - - public String getGreetingsThree(String name){ - String response = "Hello Three " + name; - System.out.println("getGreetingsThree: " + response); - return response; - } - - public String getGreetingsFour(String name){ - String response = "Hello Four " + name; - System.out.println("getGreetingsFour: " + response); - return response; - } -} - diff --git a/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReference.java b/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReference.java deleted file mode 100644 index 0b24678543..0000000000 --- a/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReference.java +++ /dev/null @@ -1,32 +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.binding.jms.operationselector.jmsuserprop; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * This is the business interface of the HelloWorld greetings service. - */ -@Remotable -public interface HelloWorldReference { - - public String getGreetings(String name); - -} - diff --git a/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReferenceImpl.java b/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReferenceImpl.java deleted file mode 100644 index 0ce66005fc..0000000000 --- a/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReferenceImpl.java +++ /dev/null @@ -1,36 +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.binding.jms.operationselector.jmsuserprop; - -import org.oasisopen.sca.annotation.Reference; - - -public class HelloWorldReferenceImpl implements HelloWorldReference { - - @Reference - protected HelloWorldService helloWorldService1; - - - public String getGreetings(String name){ - return helloWorldService1.getGreetingsOne(name) + " " + - helloWorldService1.getGreetingsTwo(name) + " " + - helloWorldService1.getGreetingsThree(name); - } -} - diff --git a/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldService.java deleted file mode 100644 index 7e42113da4..0000000000 --- a/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldService.java +++ /dev/null @@ -1,38 +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.binding.jms.operationselector.jmsuserprop; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * This is the business interface of the HelloWorld greetings service. - */ -@Remotable -public interface HelloWorldService { - - public String getGreetingsOne(String name); - - public String getGreetingsTwo(String name); - - public String getGreetingsThree(String name); - - public String getGreetingsFour(String name); - -} - diff --git a/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldServiceImpl.java deleted file mode 100644 index 724de6ff7c..0000000000 --- a/sca-java-2.x/trunk/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldServiceImpl.java +++ /dev/null @@ -1,47 +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.binding.jms.operationselector.jmsuserprop; - -public class HelloWorldServiceImpl implements HelloWorldService { - - public String getGreetingsOne(String name){ - String response = "Hello One " + name; - System.out.println("getGreetingsOne: " + response); - return response; - } - - public String getGreetingsTwo(String name){ - String response = "Hello Two " + name; - System.out.println("getGreetingsTwo: " + response); - return response; - } - - public String getGreetingsThree(String name){ - String response = "Hello Three " + name; - System.out.println("getGreetingsThree: " + response); - return response; - } - - public String getGreetingsFour(String name){ - String response = "Hello Four " + name; - System.out.println("getGreetingsFour: " + response); - return response; - } -} - diff --git a/sca-java-2.x/trunk/itest/jms/selectors/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/selectors/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 3527e98032..0000000000 --- a/sca-java-2.x/trunk/itest/jms/selectors/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,25 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://itest">
- <deployable composite="itest:helloworld"/>
- <deployable composite="itest:helloworldUP"/>
- <deployable composite="itest:Selectors"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/jms/selectors/src/main/resources/jmsdefault/helloworld.composite b/sca-java-2.x/trunk/itest/jms/selectors/src/main/resources/jmsdefault/helloworld.composite deleted file mode 100644 index d8c9d051ba..0000000000 --- a/sca-java-2.x/trunk/itest/jms/selectors/src/main/resources/jmsdefault/helloworld.composite +++ /dev/null @@ -1,69 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://itest" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" - xmlns:hw="http://helloworld" - name="helloworld"> - - <component name="HelloWorldReferenceComponent"> - <implementation.java class="org.apache.tuscany.sca.binding.jms.operationselector.jmsdefault.HelloWorldReferenceImpl" /> - <reference name="helloWorldService1" > - <binding.jms> - <destination jndiName="HelloWorldService1"/> - </binding.jms> - </reference> - <reference name="helloWorldService2" > - <binding.jms> - <destination jndiName="HelloWorldService2"/> - <operationProperties name="getGreetingsOne" > - <headers> - <property name="scaOperationName">getGreetingsThree</property> - </headers> - </operationProperties> - </binding.jms> - </reference> - </component> - - <component name="HelloWorldServiceComponent1"> - <implementation.java class="org.apache.tuscany.sca.binding.jms.operationselector.jmsdefault.HelloWorldServiceImpl" /> - <service name="HelloWorldService"> - <binding.jms> - <destination jndiName="HelloWorldService1"/> - <operationProperties name="getGreetingsThree" selectedOperation="getGreetingsFour"> - <headers> - <property name="blaNotUsed">getGreetingsThree</property> - </headers> - </operationProperties> - </binding.jms> - </service> - </component> - - <component name="HelloWorldServiceComponent2"> - <implementation.java class="org.apache.tuscany.sca.binding.jms.operationselector.jmsdefault.HelloWorldServiceImpl" /> - <service name="HelloWorldService"> - <binding.jms> - <operationSelector.jmsDefault/> - <destination jndiName="HelloWorldService2"/> - </binding.jms> - </service> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/jms/selectors/src/main/resources/jmsuserprop/helloworld.composite b/sca-java-2.x/trunk/itest/jms/selectors/src/main/resources/jmsuserprop/helloworld.composite deleted file mode 100644 index a3f1d0825b..0000000000 --- a/sca-java-2.x/trunk/itest/jms/selectors/src/main/resources/jmsuserprop/helloworld.composite +++ /dev/null @@ -1,65 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://itest" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" - xmlns:hw="http://helloworld" - name="helloworldUP"> - - <component name="HelloWorldReferenceComponent1"> - <implementation.java class="org.apache.tuscany.sca.binding.jms.operationselector.jmsuserprop.HelloWorldReferenceImpl" /> - <reference name="helloWorldService1" > - <binding.jms> - <destination jndiName="HelloWorldService4"/> - <operationProperties name="getGreetingsOne" > - <headers> - <property name="myProperty">getGreetingsOne</property> - </headers> - </operationProperties> - <operationProperties name="getGreetingsTwo" > - <headers> - <property name="myProperty">getGreetingsThree</property> - </headers> - </operationProperties> - <operationProperties name="getGreetingsThree" > - <headers> - <property name="myProperty">getGreetingsTwo</property> - </headers> - </operationProperties> - </binding.jms> - </reference> - </component> - - <component name="HelloWorldServiceComponent3"> - <implementation.java class="org.apache.tuscany.sca.binding.jms.operationselector.jmsuserprop.HelloWorldServiceImpl" /> - <service name="HelloWorldService"> - <binding.jms> - <tuscany:operationSelector.jmsUserProp propertyName="myProperty"/> - <destination jndiName="HelloWorldService4"/> - <operationProperties name="getGreetingsThree" selectedOperation="getGreetingsFour"> - <headers> - <property name="blaNotUsed2">getGreetingsThree</property> - </headers> - </operationProperties> - </binding.jms> - </service> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/jms/selectors/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/selectors/src/main/resources/jndi.properties deleted file mode 100644 index 7ce468aa0f..0000000000 --- a/sca-java-2.x/trunk/itest/jms/selectors/src/main/resources/jndi.properties +++ /dev/null @@ -1,38 +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.
-## ---------------------------------------------------------------------------
-
-# START SNIPPET: jndi
-
-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
-
-# use the following property to configure the default connector
-java.naming.provider.url = vm://localhost?broker.persistent=false&broker.useJmx=false&broker.useShutdownHook=false
-
-# use the following property to specify the JNDI name the connection factory
-# should appear as.
-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry
-connectionFactoryNames = ConnectionFactory, ConnectionFactory2
-
-# register some queues in JNDI using the form
-# queue.[jndiName] = [physicalName]
-
-# register some topics in JNDI using the form
-# topic.[jndiName] = [physicalName]
-#topic.MyTopic = example.MyTopic
-topic.ServiceTopic = ServiceTopic
-
-# END SNIPPET: jndi
diff --git a/sca-java-2.x/trunk/itest/jms/selectors/src/main/resources/selectors/selectors.composite b/sca-java-2.x/trunk/itest/jms/selectors/src/main/resources/selectors/selectors.composite deleted file mode 100644 index 1a408dfb9a..0000000000 --- a/sca-java-2.x/trunk/itest/jms/selectors/src/main/resources/selectors/selectors.composite +++ /dev/null @@ -1,68 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://itest"
- xmlns:itest="http://jms"
- name="Selectors">
-
- <component name="Client1">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.ClientImpl"/>
- <reference name="serviceA">
- <binding.jms uri="jms:jndi:ServiceTopic" >
- <headers type="type1" />
- </binding.jms>
- </reference>
- </component>
-
- <component name="Client2">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.ClientImpl"/>
- <reference name="serviceA">
- <binding.jms uri="jms:jndi:ServiceTopic" >
- <headers type="type2" />
- </binding.jms>
- </reference>
- </component>
-
- <component name="Service1">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.SelectorServiceImpl1"/>
- <service name="SelectorService">
- <binding.jms uri="jms:jndi:ServiceTopic" />
- </service>
- </component>
-
- <component name="Service2">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.SelectorServiceImpl2"/>
- <service name="SelectorService">
- <binding.jms uri="jms:jndi:ServiceTopic" >
- <messageSelection selector="JMSType = 'type1'"/>
- </binding.jms>
- </service>
- </component>
-
- <component name="Service3">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.SelectorServiceImpl3"/>
- <service name="SelectorService">
- <binding.jms uri="jms:jndi:ServiceTopic" >
- <messageSelection selector="JMSType = 'type2'"/>
- </binding.jms>
- </service>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSDefaultTestCase.java b/sca-java-2.x/trunk/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSDefaultTestCase.java deleted file mode 100644 index bee0c549bd..0000000000 --- a/sca-java-2.x/trunk/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSDefaultTestCase.java +++ /dev/null @@ -1,57 +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.binding.jms; - -import static org.junit.Assert.assertEquals; - -import org.apache.tuscany.sca.binding.jms.operationselector.jmsdefault.HelloWorldReference; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - - -/** - * This shows how to test the JMS binding using a simple HelloWorld application. - */ -public class OperationselectorJMSDefaultTestCase { - - private Node node; - - @Before - public void init() { - node = NodeFactory.newInstance().createNode().start(); - } - - @Test - public void testHelloWorldCreate() throws Exception { - HelloWorldReference helloWorldReference = node.getService(HelloWorldReference.class, "HelloWorldReferenceComponent"); - - assertEquals("Hello One Fred Bloggs Hello Two Fred Bloggs Hello Three Fred Bloggs Hello Four Fred Bloggs", helloWorldReference.getGreetings("Fred Bloggs")); - - } - - @After - public void end() { - if (node != null) { - node.stop(); - } - } -} diff --git a/sca-java-2.x/trunk/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java b/sca-java-2.x/trunk/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java deleted file mode 100644 index 33e047ae18..0000000000 --- a/sca-java-2.x/trunk/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java +++ /dev/null @@ -1,57 +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.binding.jms; - -import static org.junit.Assert.assertEquals; - -import org.apache.tuscany.sca.binding.jms.operationselector.jmsdefault.HelloWorldReference; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - - -/** - * This shows how to test the JMS binding using a simple HelloWorld application. - */ -public class OperationselectorJMSUserPropTestCase { - - private Node node; - - @Before - public void init() { - node = NodeFactory.newInstance().createNode().start(); - } - - @Test - public void testHelloWorldCreate() throws Exception { - HelloWorldReference helloWorldReference = node.getService(HelloWorldReference.class, "HelloWorldReferenceComponent1"); - - assertEquals("Hello One Fred Bloggs Hello Four Fred Bloggs Hello Two Fred Bloggs", helloWorldReference.getGreetings("Fred Bloggs")); - - } - - @After - public void end() { - if (node != null) { - node.stop(); - } - } -} diff --git a/sca-java-2.x/trunk/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java b/sca-java-2.x/trunk/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java deleted file mode 100644 index e7254005be..0000000000 --- a/sca-java-2.x/trunk/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java +++ /dev/null @@ -1,76 +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.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- */
-public class SelectorsTestCase {
-
- private Node node;
-
- @Before
- public void init() {
- node = NodeFactory.newInstance().createNode().start();
- }
-
- @Test
- public void testSayHello() throws Exception {
- SelectorService client1 = node.getService(SelectorService.class, "Client1");
- SelectorService client2 = node.getService(SelectorService.class, "Client2");
-
- client1.sayHello("petra");
- client2.sayHello("beate");
-
- // wait for up to 5 seconds but should wake up as soon as done
- synchronized(SelectorServiceImpl2.lock) {
- if (SelectorServiceImpl2.name == null) {
- SelectorServiceImpl2.lock.wait(5000);
- }
- }
- synchronized(SelectorServiceImpl3.lock) {
- if (SelectorServiceImpl3.name == null) {
- SelectorServiceImpl3.lock.wait(5000);
- }
- }
- synchronized(SelectorServiceImpl1.lock) {
- if (SelectorServiceImpl1.names.size() != 2) {
- SelectorServiceImpl1.lock.wait(5000);
- }
- }
-
- assertEquals("petra", SelectorServiceImpl2.name);
- assertEquals("beate", SelectorServiceImpl3.name);
- assertEquals(2, SelectorServiceImpl1.names.size());
- }
-
- @After
- public void end() {
- if (node != null) {
- node.stop();
- }
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/topics/pom.xml b/sca-java-2.x/trunk/itest/jms/topics/pom.xml deleted file mode 100644 index 0be4f6e4b0..0000000000 --- a/sca-java-2.x/trunk/itest/jms/topics/pom.xml +++ /dev/null @@ -1,71 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-jms-topics</artifactId>
- <name>Apache Tuscany SCA iTest JMS Tests for topics</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jms-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.2.0</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/sca-java-2.x/trunk/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java deleted file mode 100644 index b572b1012a..0000000000 --- a/sca-java-2.x/trunk/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java +++ /dev/null @@ -1,41 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements the OneWay service.
- */
-@Service(OneWayService.class)
-public class OneWayClientImpl implements OneWayService {
-
- private OneWayService serviceA;
-
- @Reference
- public void setServiceA(OneWayService service) {
- this.serviceA = service;
- }
-
- public void sayHello(String name) {
- serviceA.sayHello(name);
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/sca-java-2.x/trunk/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java deleted file mode 100644 index 9cec2d9b3e..0000000000 --- a/sca-java-2.x/trunk/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java +++ /dev/null @@ -1,29 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.OneWay;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface OneWayService {
-
- @OneWay
- void sayHello(String name);
-}
diff --git a/sca-java-2.x/trunk/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java b/sca-java-2.x/trunk/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java deleted file mode 100644 index 0036391696..0000000000 --- a/sca-java-2.x/trunk/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayServiceImpl.java +++ /dev/null @@ -1,34 +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.binding.jms;
-
-public class OneWayServiceImpl implements OneWayService {
-
- public static Object mutex = new Object();
- public static String name;
-
- public void sayHello(String name) {
- OneWayServiceImpl.name = name;
- synchronized (OneWayServiceImpl.mutex) {
- OneWayServiceImpl.mutex.notify();
- }
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/topics/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/topics/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index c1156b35e6..0000000000 --- a/sca-java-2.x/trunk/itest/jms/topics/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://itest">
- <deployable composite="itest:TopicsClientComposite"/>
- <deployable composite="itest:OneWayServiceComposite"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/jms/topics/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/topics/src/main/resources/jndi.properties deleted file mode 100644 index d7988ee60d..0000000000 --- a/sca-java-2.x/trunk/itest/jms/topics/src/main/resources/jndi.properties +++ /dev/null @@ -1,38 +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.
-## ---------------------------------------------------------------------------
-
-# START SNIPPET: jndi
-
-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
-
-# use the following property to configure the default connector
-java.naming.provider.url = vm://localhost?broker.persistent=false&broker.useJmx=false&broker.useShutdownHook=false
-
-# use the following property to specify the JNDI name the connection factory
-# should appear as.
-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry
-connectionFactoryNames = ConnectionFactory
-
-# register some queues in JNDI using the form
-# queue.[jndiName] = [physicalName]
-
-# register some topics in JNDI using the form
-# topic.[jndiName] = [physicalName]
-#topic.MyTopic = example.MyTopic
-topic.MyTopic = example.MyTopic
-
-# END SNIPPET: jndi
diff --git a/sca-java-2.x/trunk/itest/jms/topics/src/main/resources/topics/TopicsClient.composite b/sca-java-2.x/trunk/itest/jms/topics/src/main/resources/topics/TopicsClient.composite deleted file mode 100644 index d4027ff60d..0000000000 --- a/sca-java-2.x/trunk/itest/jms/topics/src/main/resources/topics/TopicsClient.composite +++ /dev/null @@ -1,33 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://itest"
- name="TopicsClientComposite">
-
- <component name="OneWayClient">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayClientImpl"/>
- <reference name="serviceA">
- <binding.jms>
- <destination jndiName="MyTopic" type="topic" create="never"/>
- </binding.jms>
- </reference>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/jms/topics/src/main/resources/topics/TopicsService.composite b/sca-java-2.x/trunk/itest/jms/topics/src/main/resources/topics/TopicsService.composite deleted file mode 100644 index 8726543253..0000000000 --- a/sca-java-2.x/trunk/itest/jms/topics/src/main/resources/topics/TopicsService.composite +++ /dev/null @@ -1,33 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://itest"
- name="OneWayServiceComposite">
-
- <component name="OneWayService">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayServiceImpl"/>
- <service name="OneWayService">
- <binding.jms>
- <destination jndiName="MyTopic" type="topic" create="never"/>
- </binding.jms>
- </service>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/jms/topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java b/sca-java-2.x/trunk/itest/jms/topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java deleted file mode 100644 index 35fe96b81a..0000000000 --- a/sca-java-2.x/trunk/itest/jms/topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java +++ /dev/null @@ -1,59 +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.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class TopicsTestCase {
-
- private Node node;
-
- @Before
- public void init() {
- node = NodeFactory.newInstance().createNode().start();
- }
-
- @Test
- public void testOneWayInvoked() throws Exception {
- OneWayService oneWayService = node.getService(OneWayService.class, "OneWayClient");
- oneWayService.sayHello("Petra");
- synchronized (OneWayServiceImpl.mutex) {
- // wait up to 10 seconds but it will likely be a lot less
- // as the service invocation will wake this up earlier
- OneWayServiceImpl.mutex.wait(10000);
- }
- assertEquals("Petra", OneWayServiceImpl.name);
- }
-
- @After
- public void end() {
- if (node != null) {
- node.stop();
- }
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/ttl/pom.xml b/sca-java-2.x/trunk/itest/jms/ttl/pom.xml deleted file mode 100644 index c7462bc039..0000000000 --- a/sca-java-2.x/trunk/itest/jms/ttl/pom.xml +++ /dev/null @@ -1,71 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-jms-ttl</artifactId>
- <name>Apache Tuscany SCA iTest JMS Time To Live</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jms-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.2.0</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/jms/ttl/src/main/java/itest/MockInitialContextFactory.java b/sca-java-2.x/trunk/itest/jms/ttl/src/main/java/itest/MockInitialContextFactory.java deleted file mode 100644 index 336fecf67b..0000000000 --- a/sca-java-2.x/trunk/itest/jms/ttl/src/main/java/itest/MockInitialContextFactory.java +++ /dev/null @@ -1,904 +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 itest;
-
-import java.io.Serializable;
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import javax.jms.BytesMessage;
-import javax.jms.Connection;
-import javax.jms.ConnectionConsumer;
-import javax.jms.ConnectionFactory;
-import javax.jms.ConnectionMetaData;
-import javax.jms.Destination;
-import javax.jms.ExceptionListener;
-import javax.jms.JMSException;
-import javax.jms.MapMessage;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageListener;
-import javax.jms.MessageProducer;
-import javax.jms.ObjectMessage;
-import javax.jms.Queue;
-import javax.jms.QueueBrowser;
-import javax.jms.ServerSessionPool;
-import javax.jms.Session;
-import javax.jms.StreamMessage;
-import javax.jms.TemporaryQueue;
-import javax.jms.TemporaryTopic;
-import javax.jms.TextMessage;
-import javax.jms.Topic;
-import javax.jms.TopicSubscriber;
-import javax.naming.Binding;
-import javax.naming.Context;
-import javax.naming.Name;
-import javax.naming.NameClassPair;
-import javax.naming.NameParser;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-
-/**
- * Some classes that mock up various JMS interfaces with the end result
- * of having the Time-To-Live value set on the static timeToLive
- *
- * This class is referenced from the AMQ jndi.properties file
- */
-public class MockInitialContextFactory extends org.apache.activemq.jndi.ActiveMQInitialContextFactory{
-
- public static Object lock = new Object();
- public static Long timeToLive;
-
- public Context getInitialContext(Hashtable environment) throws NamingException {
- return new Context() {
-
- public Object addToEnvironment(String propName, Object propVal) throws NamingException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public void bind(Name name, Object obj) throws NamingException {
- // TODO Auto-generated method stub
-
- }
-
- public void bind(String name, Object obj) throws NamingException {
- // TODO Auto-generated method stub
-
- }
-
- public void close() throws NamingException {
- // TODO Auto-generated method stub
-
- }
-
- public Name composeName(Name name, Name prefix) throws NamingException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public String composeName(String name, String prefix) throws NamingException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Context createSubcontext(Name name) throws NamingException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Context createSubcontext(String name) throws NamingException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public void destroySubcontext(Name name) throws NamingException {
- // TODO Auto-generated method stub
-
- }
-
- public void destroySubcontext(String name) throws NamingException {
- // TODO Auto-generated method stub
-
- }
-
- public Hashtable<?, ?> getEnvironment() throws NamingException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public String getNameInNamespace() throws NamingException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public NameParser getNameParser(Name name) throws NamingException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public NameParser getNameParser(String name) throws NamingException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public NamingEnumeration<NameClassPair> list(Name name) throws NamingException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public NamingEnumeration<NameClassPair> list(String name) throws NamingException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public NamingEnumeration<Binding> listBindings(Name name) throws NamingException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public NamingEnumeration<Binding> listBindings(String name) throws NamingException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Object lookup(Name name) throws NamingException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Object lookup(String name) throws NamingException {
- if (name.endsWith("ConnectionFactory")) {
- return new ConnectionFactory() {
- public Connection createConnection() throws JMSException {
- return new Connection(){
-
- public void close() throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public ConnectionConsumer createConnectionConsumer(Destination arg0,
- String arg1,
- ServerSessionPool arg2,
- int arg3) throws JMSException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public ConnectionConsumer createDurableConnectionConsumer(Topic arg0,
- String arg1,
- String arg2,
- ServerSessionPool arg3,
- int arg4) throws JMSException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Session createSession(boolean arg0, int arg1) throws JMSException {
- // TODO Auto-generated method stub
- return new Session() {
-
- public void close() throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void commit() throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public QueueBrowser createBrowser(Queue arg0) throws JMSException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public QueueBrowser createBrowser(Queue arg0, String arg1) throws JMSException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public BytesMessage createBytesMessage() throws JMSException {
- // TODO Auto-generated method stub
- return new BytesMessage() {
-
- public long getBodyLength() throws JMSException {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public boolean readBoolean() throws JMSException {
- // TODO Auto-generated method stub
- return false;
- }
-
- public byte readByte() throws JMSException {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public int readBytes(byte[] arg0) throws JMSException {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public int readBytes(byte[] arg0, int arg1) throws JMSException {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public char readChar() throws JMSException {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public double readDouble() throws JMSException {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public float readFloat() throws JMSException {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public int readInt() throws JMSException {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public long readLong() throws JMSException {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public short readShort() throws JMSException {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public String readUTF() throws JMSException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public int readUnsignedByte() throws JMSException {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public int readUnsignedShort() throws JMSException {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public void reset() throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void writeBoolean(boolean arg0) throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void writeByte(byte arg0) throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void writeBytes(byte[] arg0) throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void writeBytes(byte[] arg0, int arg1, int arg2)
- throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void writeChar(char arg0) throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void writeDouble(double arg0) throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void writeFloat(float arg0) throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void writeInt(int arg0) throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void writeLong(long arg0) throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void writeObject(Object arg0) throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void writeShort(short arg0) throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void writeUTF(String arg0) throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void acknowledge() throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void clearBody() throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void clearProperties() throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public boolean getBooleanProperty(String arg0) throws JMSException {
- // TODO Auto-generated method stub
- return false;
- }
-
- public byte getByteProperty(String arg0) throws JMSException {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public double getDoubleProperty(String arg0) throws JMSException {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public float getFloatProperty(String arg0) throws JMSException {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public int getIntProperty(String arg0) throws JMSException {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public String getJMSCorrelationID() throws JMSException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public byte[] getJMSCorrelationIDAsBytes() throws JMSException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public int getJMSDeliveryMode() throws JMSException {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public Destination getJMSDestination() throws JMSException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public long getJMSExpiration() throws JMSException {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public String getJMSMessageID() throws JMSException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public int getJMSPriority() throws JMSException {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public boolean getJMSRedelivered() throws JMSException {
- // TODO Auto-generated method stub
- return false;
- }
-
- public Destination getJMSReplyTo() throws JMSException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public long getJMSTimestamp() throws JMSException {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public String getJMSType() throws JMSException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public long getLongProperty(String arg0) throws JMSException {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public Object getObjectProperty(String arg0) throws JMSException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Enumeration getPropertyNames() throws JMSException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public short getShortProperty(String arg0) throws JMSException {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public String getStringProperty(String arg0) throws JMSException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public boolean propertyExists(String arg0) throws JMSException {
- // TODO Auto-generated method stub
- return false;
- }
-
- public void setBooleanProperty(String arg0, boolean arg1)
- throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void setByteProperty(String arg0, byte arg1) throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void setDoubleProperty(String arg0, double arg1)
- throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void setFloatProperty(String arg0, float arg1)
- throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void setIntProperty(String arg0, int arg1) throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void setJMSCorrelationID(String arg0) throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void setJMSCorrelationIDAsBytes(byte[] arg0) throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void setJMSDeliveryMode(int arg0) throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void setJMSDestination(Destination arg0) throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void setJMSExpiration(long arg0) throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void setJMSMessageID(String arg0) throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void setJMSPriority(int arg0) throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void setJMSRedelivered(boolean arg0) throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void setJMSReplyTo(Destination arg0) throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void setJMSTimestamp(long arg0) throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void setJMSType(String arg0) throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void setLongProperty(String arg0, long arg1) throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void setObjectProperty(String arg0, Object arg1)
- throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void setShortProperty(String arg0, short arg1)
- throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void setStringProperty(String arg0, String arg1)
- throws JMSException {
- // TODO Auto-generated method stub
-
- }};
- }
-
- public MessageConsumer createConsumer(Destination arg0) throws JMSException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public MessageConsumer createConsumer(Destination arg0, String arg1)
- throws JMSException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public MessageConsumer createConsumer(Destination arg0,
- String arg1,
- boolean arg2) throws JMSException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public TopicSubscriber createDurableSubscriber(Topic arg0, String arg1)
- throws JMSException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public TopicSubscriber createDurableSubscriber(Topic arg0,
- String arg1,
- String arg2,
- boolean arg3)
- throws JMSException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public MapMessage createMapMessage() throws JMSException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Message createMessage() throws JMSException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public ObjectMessage createObjectMessage() throws JMSException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public ObjectMessage createObjectMessage(Serializable arg0) throws JMSException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public MessageProducer createProducer(Destination arg0) throws JMSException {
- return new MessageProducer() {
-
- public void close() throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public int getDeliveryMode() throws JMSException {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public Destination getDestination() throws JMSException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public boolean getDisableMessageID() throws JMSException {
- // TODO Auto-generated method stub
- return false;
- }
-
- public boolean getDisableMessageTimestamp() throws JMSException {
- // TODO Auto-generated method stub
- return false;
- }
-
- public int getPriority() throws JMSException {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public long getTimeToLive() throws JMSException {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public void send(Message arg0) throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void send(Destination arg0, Message arg1) throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void send(Message arg0, int arg1, int arg2, long arg3)
- throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void send(Destination arg0,
- Message arg1,
- int arg2,
- int arg3,
- long arg4) throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void setDeliveryMode(int arg0) throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void setDisableMessageID(boolean arg0) throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void setDisableMessageTimestamp(boolean arg0)
- throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void setPriority(int arg0) throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void setTimeToLive(long arg0) throws JMSException {
- MockInitialContextFactory.timeToLive = Long.valueOf(arg0);
- synchronized(MockInitialContextFactory.lock) {
- MockInitialContextFactory.lock.notifyAll();
- }
- }};
- }
-
- public Queue createQueue(String arg0) throws JMSException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public StreamMessage createStreamMessage() throws JMSException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public TemporaryQueue createTemporaryQueue() throws JMSException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public TemporaryTopic createTemporaryTopic() throws JMSException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public TextMessage createTextMessage() throws JMSException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public TextMessage createTextMessage(String arg0) throws JMSException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Topic createTopic(String arg0) throws JMSException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public int getAcknowledgeMode() throws JMSException {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public MessageListener getMessageListener() throws JMSException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public boolean getTransacted() throws JMSException {
- // TODO Auto-generated method stub
- return false;
- }
-
- public void recover() throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void rollback() throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void run() {
- // TODO Auto-generated method stub
-
- }
-
- public void setMessageListener(MessageListener arg0) throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void unsubscribe(String arg0) throws JMSException {
- // TODO Auto-generated method stub
-
- }};
- }
-
- public String getClientID() throws JMSException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public ExceptionListener getExceptionListener() throws JMSException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public ConnectionMetaData getMetaData() throws JMSException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public void setClientID(String arg0) throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void setExceptionListener(ExceptionListener arg0) throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void start() throws JMSException {
- // TODO Auto-generated method stub
-
- }
-
- public void stop() throws JMSException {
- // TODO Auto-generated method stub
-
- }};
- }
- public Connection createConnection(String arg0, String arg1) throws JMSException {
- return null;
- }};
- } else {
- return new Queue(){
- public String getQueueName() throws JMSException {
- return null;
- }};
- }
- }
-
- public Object lookupLink(Name name) throws NamingException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Object lookupLink(String name) throws NamingException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public void rebind(Name name, Object obj) throws NamingException {
- // TODO Auto-generated method stub
-
- }
-
- public void rebind(String name, Object obj) throws NamingException {
- // TODO Auto-generated method stub
-
- }
-
- public Object removeFromEnvironment(String propName) throws NamingException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public void rename(Name oldName, Name newName) throws NamingException {
- // TODO Auto-generated method stub
-
- }
-
- public void rename(String oldName, String newName) throws NamingException {
- // TODO Auto-generated method stub
-
- }
-
- public void unbind(Name name) throws NamingException {
- // TODO Auto-generated method stub
-
- }
-
- public void unbind(String name) throws NamingException {
- // TODO Auto-generated method stub
-
- }};
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientIface.java b/sca-java-2.x/trunk/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientIface.java deleted file mode 100644 index dc6577b7e1..0000000000 --- a/sca-java-2.x/trunk/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientIface.java +++ /dev/null @@ -1,30 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.OneWay;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface ClientIface {
-
- @OneWay
- void sayHello(String s);
-}
diff --git a/sca-java-2.x/trunk/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/sca-java-2.x/trunk/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java deleted file mode 100644 index 4f9908f062..0000000000 --- a/sca-java-2.x/trunk/itest/jms/ttl/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java +++ /dev/null @@ -1,39 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.Reference;
-
-/**
- * This class implements the OneWay service.
- */
-public class ClientImpl implements ClientIface {
-
- private ClientIface serviceA;
-
- @Reference
- public void setServiceA(ClientIface service) {
- this.serviceA = service;
- }
-
- public void sayHello(String name) {
- serviceA.sayHello(name);
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/ttl/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/ttl/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index ff50ad2daa..0000000000 --- a/sca-java-2.x/trunk/itest/jms/ttl/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://itest">
- <deployable composite="itest:TTLTests"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/jms/ttl/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/ttl/src/main/resources/jndi.properties deleted file mode 100644 index 7ac9aa559c..0000000000 --- a/sca-java-2.x/trunk/itest/jms/ttl/src/main/resources/jndi.properties +++ /dev/null @@ -1,38 +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.
-## ---------------------------------------------------------------------------
-
-# START SNIPPET: jndi
-
-java.naming.factory.initial = itest.MockInitialContextFactory
-
-# use the following property to configure the default connector
-java.naming.provider.url = vm://localhost?broker.persistent=false&broker.useJmx=false&broker.useShutdownHook=false
-
-# use the following property to specify the JNDI name the connection factory
-# should appear as.
-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry
-connectionFactoryNames = ConnectionFactory, ConnectionFactory2
-
-# register some queues in JNDI using the form
-# queue.[jndiName] = [physicalName]
-
-# register some topics in JNDI using the form
-# topic.[jndiName] = [physicalName]
-#topic.MyTopic = example.MyTopic
-topic.ServiceTopic = ServiceTopic
-
-# END SNIPPET: jndi
diff --git a/sca-java-2.x/trunk/itest/jms/ttl/src/main/resources/ttl.composite b/sca-java-2.x/trunk/itest/jms/ttl/src/main/resources/ttl.composite deleted file mode 100644 index 8b06a9fc7c..0000000000 --- a/sca-java-2.x/trunk/itest/jms/ttl/src/main/resources/ttl.composite +++ /dev/null @@ -1,35 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://itest"
- name="TTLTests">
-
- <component name="Client1">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.ClientImpl"/>
- <reference name="serviceA">
- <interface.java interface="org.apache.tuscany.sca.binding.jms.ClientIface" />
- <binding.jms >
- <destination jndiName="dynamic/MyService"/>
- <headers timeToLive="123" />
- </binding.jms>
- </reference>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/jms/ttl/src/test/java/org/apache/tuscany/sca/binding/jms/TTLTestCase.java b/sca-java-2.x/trunk/itest/jms/ttl/src/test/java/org/apache/tuscany/sca/binding/jms/TTLTestCase.java deleted file mode 100644 index b5839f4c4f..0000000000 --- a/sca-java-2.x/trunk/itest/jms/ttl/src/test/java/org/apache/tuscany/sca/binding/jms/TTLTestCase.java +++ /dev/null @@ -1,64 +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.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import itest.MockInitialContextFactory;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- */
-public class TTLTestCase {
-
- private Node node;
-
- @Before
- public void init() {
- node = NodeFactory.newInstance().createNode().start();
- }
-
- @Test
- public void testSayHello() throws Exception {
- ClientIface client1 = node.getService(ClientIface.class, "Client1");
-
- client1.sayHello("petra");
-
- synchronized(MockInitialContextFactory.lock) {
- if (MockInitialContextFactory.timeToLive == null) {
- MockInitialContextFactory.lock.wait(10000);
- }
- }
-
- assertNotNull(MockInitialContextFactory.timeToLive);
- assertEquals(123, MockInitialContextFactory.timeToLive.longValue());
- }
-
- @After
- public void end() {
- if (node != null) {
- node.stop();
- }
- }
-}
diff --git a/sca-java-2.x/trunk/itest/jms/uri-rpc/pom.xml b/sca-java-2.x/trunk/itest/jms/uri-rpc/pom.xml deleted file mode 100644 index 61c0602f03..0000000000 --- a/sca-java-2.x/trunk/itest/jms/uri-rpc/pom.xml +++ /dev/null @@ -1,83 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-jms-uri-rpc</artifactId>
- <name>Apache Tuscany SCA iTest JMS with URI RPC</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jms-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.2.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java b/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java deleted file mode 100644 index 9aef6ba1a3..0000000000 --- a/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java +++ /dev/null @@ -1,41 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(HelloWorldService.class)
-public class HelloWorldClientImpl implements HelloWorldService {
-
- private HelloWorldService serviceA;
-
- @Reference
- public void setServiceA(HelloWorldService service) {
- this.serviceA = service;
- }
-
- public String sayHello(String name) {
- return serviceA.sayHello(name);
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java b/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java deleted file mode 100644 index 430c71aaef..0000000000 --- a/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java +++ /dev/null @@ -1,26 +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.binding.jms;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface HelloWorldService {
- String sayHello(String name);
-}
diff --git a/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java deleted file mode 100644 index 2c6d9d0d17..0000000000 --- a/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldServiceImpl.java +++ /dev/null @@ -1,30 +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.binding.jms;
-
-public class HelloWorldServiceImpl implements HelloWorldService {
-
- public String sayHello(String name) {
- if ("bang".equals(name)) {
- throw new RuntimeException("blem wit");
- }
- return "jmsHello " + name;
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 655372580c..0000000000 --- a/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://itest">
- <deployable composite="itest:SimpleServiceComposite"/>
- <deployable composite="itest:URIClientComposite"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/resources/jndi.properties b/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/resources/jndi.properties deleted file mode 100644 index f6dfc8e9d0..0000000000 --- a/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/resources/jndi.properties +++ /dev/null @@ -1,38 +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.
-## ---------------------------------------------------------------------------
-
-# START SNIPPET: jndi
-
-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory
-
-# use the following property to configure the default connector
-java.naming.provider.url = vm://localhost?broker.persistent=false
-
-# use the following property to specify the JNDI name the connection factory
-# should appear as.
-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry
-connectionFactoryNames = ConnectionFactory
-
-# register some queues in JNDI using the form
-# queue.[jndiName] = [physicalName]
-queue.DestQueueA = DestQueueA
-
-# register some topics in JNDI using the form
-# topic.[jndiName] = [physicalName]
-#topic.MyTopic = example.MyTopic
-
-# END SNIPPET: jndi
diff --git a/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/resources/simple/service.composite b/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/resources/simple/service.composite deleted file mode 100644 index 99ed243196..0000000000 --- a/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/resources/simple/service.composite +++ /dev/null @@ -1,37 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://itest"
- name="SimpleServiceComposite">
-
- <component name="HelloWorldService">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldServiceImpl"/>
- <service name="HelloWorldService">
- <binding.jms>
- <destination jndiName="DestQueueA" >
- </destination>
- <response>
- <destination jndiName="RespQueueA"/>
- </response>
- </binding.jms>
- </service>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/resources/simple/uriclient.composite b/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/resources/simple/uriclient.composite deleted file mode 100644 index 8295fb10c9..0000000000 --- a/sca-java-2.x/trunk/itest/jms/uri-rpc/src/main/resources/simple/uriclient.composite +++ /dev/null @@ -1,31 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://itest"
- name="URIClientComposite">
-
- <component name="HelloWorldClient">
- <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldClientImpl"/>
- <reference name="serviceA">
- <binding.jms uri="jms:jndi:DestQueueA" />
- </reference>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/jms/uri-rpc/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java b/sca-java-2.x/trunk/itest/jms/uri-rpc/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java deleted file mode 100644 index 60b0f0a1a3..0000000000 --- a/sca-java-2.x/trunk/itest/jms/uri-rpc/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java +++ /dev/null @@ -1,54 +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.binding.jms;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * This shows how to test the JMS binding using a simple HelloWorld application.
- */
-public class URIRPCTestCase {
-
- private static Node node;
-
- @Before
- public void init() {
- node = NodeFactory.newInstance().createNode().start();
- }
-
- @After
- public void end() {
- if (node != null) {
- node.stop();
- }
- }
-
- @Test
- public void testHelloWorldCreate() throws Exception {
- HelloWorldService helloWorldService = node.getService(HelloWorldService.class, "HelloWorldClient");
- assertEquals("jmsHello Petra", helloWorldService.sayHello("Petra"));
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/node-launcher-equinox/pom.xml b/sca-java-2.x/trunk/itest/node-launcher-equinox/pom.xml deleted file mode 100644 index 8e80bd658c..0000000000 --- a/sca-java-2.x/trunk/itest/node-launcher-equinox/pom.xml +++ /dev/null @@ -1,76 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>itest-node-launcher-equinox</artifactId>
- <name>Apache Tuscany SCA iTest Node Launcher Exuinox</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-launcher-equinox</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-extensibility-equinox</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
- <!-- dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-http-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency-->
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/node-launcher-equinox/src/test/java/hello/HelloWorld.java b/sca-java-2.x/trunk/itest/node-launcher-equinox/src/test/java/hello/HelloWorld.java deleted file mode 100644 index e3fcdfd25f..0000000000 --- a/sca-java-2.x/trunk/itest/node-launcher-equinox/src/test/java/hello/HelloWorld.java +++ /dev/null @@ -1,30 +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 hello; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * HelloWorld interface - */ -@Remotable -public interface HelloWorld { - String hello(String name); -} diff --git a/sca-java-2.x/trunk/itest/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java b/sca-java-2.x/trunk/itest/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java deleted file mode 100644 index 8232acb658..0000000000 --- a/sca-java-2.x/trunk/itest/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java +++ /dev/null @@ -1,50 +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 hello; - -import org.oasisopen.sca.annotation.EagerInit; -import org.oasisopen.sca.annotation.Init; -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Scope; - -/** - * This client program shows how to create an SCA runtime, start it, - * and locate and invoke a SCA component - */ -@Scope("COMPOSITE") -@EagerInit -public class HelloWorldClient { - - private HelloWorld hw; - - @Reference - public void setHelloWorld(HelloWorld hw) { - this.hw = hw; - } - - @Init - public void hello() { - // Say hello - System.out.println("Contribution ClassLoader: " + getClass().getClassLoader()); - System.out.println("SCA API ClassLoader: " + Reference.class.getClassLoader()); - System.out.println(hw.hello("Equinox")); - } - -} diff --git a/sca-java-2.x/trunk/itest/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java b/sca-java-2.x/trunk/itest/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java deleted file mode 100644 index e51d3c79d9..0000000000 --- a/sca-java-2.x/trunk/itest/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java +++ /dev/null @@ -1,30 +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 hello; - -/** - * HelloWorldImpl - */ -public class HelloWorldImpl implements HelloWorld { - public String hello(String name) { - System.out.println("Name: " + name); - return "Hello, " + name; - } -} diff --git a/sca-java-2.x/trunk/itest/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java b/sca-java-2.x/trunk/itest/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java deleted file mode 100644 index 5728ad2e07..0000000000 --- a/sca-java-2.x/trunk/itest/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java +++ /dev/null @@ -1,100 +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.node.equinox.launcher; - -import java.util.Dictionary; -import java.util.Enumeration; - -import org.junit.Assert; -import org.junit.Test; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; - - -/** - * Test case for equinox host - */ -public class EquinoxOSGiHostTestCase { - - @Test - public void testStartThenStop() { - EquinoxHost host = new EquinoxHost(); - BundleContext context = host.start(); - Assert.assertNotNull(context); - for (Bundle b : context.getBundles()) { - System.out.println(toString(b, false)); - } - host.stop(); - } - - @Test - public void testStartThenStopTwice() { - EquinoxHost host = new EquinoxHost(); - BundleContext context = host.start(); - Assert.assertNotNull(context); - for (Bundle b : context.getBundles()) { - System.out.println(toString(b, false)); - } - host.stop(); - - host = new EquinoxHost(); - context = host.start(); - Assert.assertNotNull(context); - for (Bundle b : context.getBundles()) { - System.out.println(toString(b, false)); - } - host.stop(); - } - - public static String toString(Bundle b, boolean verbose) { - StringBuffer sb = new StringBuffer(); - sb.append(b.getBundleId()).append(" ").append(b.getSymbolicName()); - int s = b.getState(); - if ((s & Bundle.UNINSTALLED) != 0) { - sb.append(" UNINSTALLED"); - } - if ((s & Bundle.INSTALLED) != 0) { - sb.append(" INSTALLED"); - } - if ((s & Bundle.RESOLVED) != 0) { - sb.append(" RESOLVED"); - } - if ((s & Bundle.STARTING) != 0) { - sb.append(" STARTING"); - } - if ((s & Bundle.STOPPING) != 0) { - sb.append(" STOPPING"); - } - if ((s & Bundle.ACTIVE) != 0) { - sb.append(" ACTIVE"); - } - - sb.append(" ").append(b.getLocation()); - if (verbose) { - Dictionary<Object, Object> dict = b.getHeaders(); - Enumeration<Object> keys = dict.keys(); - while (keys.hasMoreElements()) { - Object key = keys.nextElement(); - sb.append(" ").append(key).append("=").append(dict.get(key)); - } - } - return sb.toString(); - } -} diff --git a/sca-java-2.x/trunk/itest/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java b/sca-java-2.x/trunk/itest/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java deleted file mode 100644 index 5cc40ca77f..0000000000 --- a/sca-java-2.x/trunk/itest/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java +++ /dev/null @@ -1,67 +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.node.equinox.launcher; - -import org.apache.tuscany.sca.node.Node; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; - -/** - * - */ -public class NodeLauncherTestCase { - private static NodeLauncher launcher; - - @BeforeClass - public static void setUp() { - System.setProperty("osgi.configuration.area", "target/equinox/configuration"); - try { - launcher = NodeLauncher.newInstance(); - } catch (Exception e) { - e.printStackTrace(); - } - } - - @AfterClass - public static void tearDown() { - System.clearProperty("osgi.configuration.area"); - if (launcher != null) { - launcher.destroy(); - } - - } - - @Test - public void testLaunch() throws Exception { - String location = ContributionLocationHelper.getContributionLocation(getClass()); - Node node = launcher.createNode("HelloWorld.composite", new Contribution("test", location)); - node.start(); - node.stop(); - } - - @Test - @Ignore("contribution-osgi issue") - public void testLaunchDomain() throws Exception { - DomainManagerLauncher.main(new String[] {}); - } - -} diff --git a/sca-java-2.x/trunk/itest/node-launcher-equinox/src/test/resources/HelloWorld.composite b/sca-java-2.x/trunk/itest/node-launcher-equinox/src/test/resources/HelloWorld.composite deleted file mode 100644 index 32ec5f0e2f..0000000000 --- a/sca-java-2.x/trunk/itest/node-launcher-equinox/src/test/resources/HelloWorld.composite +++ /dev/null @@ -1,34 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" - targetNamespace="http://sample/composite" - xmlns:sc="http://sample/composite" - name="HelloWorld"> - - <component name="HelloWorld"> - <implementation.java class="hello.HelloWorldImpl" /> - </component> - <component name="HelloWorldClient"> - <implementation.java class="hello.HelloWorldClient" /> - <reference name="helloWorld" target="HelloWorld"></reference> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/pom.xml b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/pom.xml deleted file mode 100644 index aa08bfde8e..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/pom.xml +++ /dev/null @@ -1,94 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>itest-nodes-binding-sca-hazelcast</artifactId>
- <name>Apache Tuscany SCA iTest Nodes binding.sca Using Hazelcast Registry</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-client-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-endpoint-hazelcast</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-endpoint-hazelcast-client</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-hazelcast-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-jetty</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <includes>
- <include>**/*TestCase.java</include>
- </includes>
- <reportFormat>brief</reportFormat>
- <useFile>true</useFile>
- <forkMode>once</forkMode>
- <argLine>-ea -Xmx256m</argLine>
- <parallel>off</parallel>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Client.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Client.java deleted file mode 100644 index ef2565b750..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Client.java +++ /dev/null @@ -1,29 +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.itest.bindingsca; - -/** - * - */ -public interface Client { - String getName(String id); - - String create(String name); -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/ClientImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/ClientImpl.java deleted file mode 100644 index 96a0f2dadd..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/ClientImpl.java +++ /dev/null @@ -1,53 +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.itest.bindingsca; - -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Service; - -/** - * - */ -@Service(Client.class) -public class ClientImpl implements Client { - @Reference - protected Local local; - - @Reference - protected Remote remote; - - public String getName(String id) { - Customer customer = null; - try { - customer = remote.getCustomer(id); - } catch (CustomerNotFoundException e) { - return null; - } - customer.dump("Client.getName()"); - return local.getName(customer); - } - - public String create(String name) { - String id = remote.generateId(); - Customer customer = remote.createCustomer(id, name); - customer.dump("Client.create()"); - return remote.getId(customer); - } -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Customer.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Customer.java deleted file mode 100644 index f2b7b1e41d..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Customer.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.itest.bindingsca; - -/** - * - */ -public class Customer { - private String id; - private String name; - - public Customer() { - } - - /** - * @param id - * @param name - */ - public Customer(String id, String name) { - super(); - this.id = id; - this.name = name; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public String toString() { - return "Customer [id=" + id + ", name=" + name + "]"; - } - - public void dump(String prefix) { - System.out.print(prefix); - System.out.print(": "); - System.out.print(toString()); - System.out.println(" @" + System.identityHashCode(this)); - System.out.println(getClass().getClassLoader()); - } -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/CustomerNotFoundException.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/CustomerNotFoundException.java deleted file mode 100644 index a6e80c9eca..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/CustomerNotFoundException.java +++ /dev/null @@ -1,64 +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.itest.bindingsca; - -/** - * - */ -public class CustomerNotFoundException extends Exception { - private String customerId; - - /** - * - */ - public CustomerNotFoundException() { - } - - /** - * @param message - */ - public CustomerNotFoundException(String message) { - super(message); - } - - /** - * @param cause - */ - public CustomerNotFoundException(Throwable cause) { - super(cause); - } - - /** - * @param message - * @param cause - */ - public CustomerNotFoundException(String message, Throwable cause) { - super(message, cause); - } - - public String getCustomerId() { - return customerId; - } - - public void setCustomerId(String customerId) { - this.customerId = customerId; - } - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Local.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Local.java deleted file mode 100644 index 0fe30c9d53..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Local.java +++ /dev/null @@ -1,27 +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.itest.bindingsca; - -/** - * - */ -public interface Local { - String getName(Customer customer); -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/LocalServiceImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/LocalServiceImpl.java deleted file mode 100644 index 8783808334..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/LocalServiceImpl.java +++ /dev/null @@ -1,38 +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.itest.bindingsca; - -import org.oasisopen.sca.annotation.Service; - -/** - * - */ -@Service(Local.class) -public class LocalServiceImpl implements Local { - - public String getName(Customer customer) { - if (customer == null) { - return null; - } - customer.dump("Local.getName()"); - return customer.getName(); - } - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Remote.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Remote.java deleted file mode 100644 index 050d35007b..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Remote.java +++ /dev/null @@ -1,36 +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.itest.bindingsca; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * - */ -@Remotable -public interface Remote { - String generateId(); - - String getId(Customer customer); - - Customer getCustomer(String id) throws CustomerNotFoundException; - - Customer createCustomer(String id, String name); -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/RemoteServiceImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/RemoteServiceImpl.java deleted file mode 100644 index 6c432a500a..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/RemoteServiceImpl.java +++ /dev/null @@ -1,66 +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.itest.bindingsca; - -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; - -import org.oasisopen.sca.annotation.AllowsPassByReference; -import org.oasisopen.sca.annotation.Scope; -import org.oasisopen.sca.annotation.Service; - -/** - * - */ -@Service(Remote.class) -@Scope("COMPOSITE") -public class RemoteServiceImpl implements Remote { - private Map<String, Customer> customers = new HashMap<String, Customer>(); - - public String generateId() { - return UUID.randomUUID().toString(); - } - - @AllowsPassByReference - public String getId(Customer customer) { - customer.dump("Remote.getId()"); - return customer.getId(); - } - - public Customer getCustomer(String id) throws CustomerNotFoundException { - Customer customer = customers.get(id); - if (customer == null) { - CustomerNotFoundException ex = new CustomerNotFoundException("Customer not found"); - ex.setCustomerId(id); - throw ex; - } - customer.dump("Remote.getCustomer()"); - return customer; - } - - public Customer createCustomer(String id, String name) { - Customer customer = new Customer(id, name); - customer.dump("Remote.createCustomer()"); - customers.put(id, customer); - return customer; - } - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/SCAClientImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/SCAClientImpl.java deleted file mode 100644 index 3573eea978..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/SCAClientImpl.java +++ /dev/null @@ -1,57 +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.itest.bindingsca; - -import java.net.URI; - -import org.oasisopen.sca.client.SCAClientFactory; - -/** - * - */ -public class SCAClientImpl implements Client { - private Local local; - private Remote remote; - - public SCAClientImpl(String domainURI) throws Exception { - SCAClientFactory factory = SCAClientFactory.newInstance(URI.create(domainURI)); - local = factory.getService(Local.class, "LocalComponent/Local"); - remote = factory.getService(Remote.class, "RemoteComponent/Remote"); - } - - public String getName(String id) { - Customer customer = null; - try { - customer = remote.getCustomer(id); - } catch (CustomerNotFoundException e) { - return null; - } - customer.dump("Client.getName()"); - return local.getName(customer); - } - - public String create(String name) { - String id = remote.generateId(); - Customer customer = remote.createCustomer(id, name); - customer.dump("Client.create()"); - return remote.getId(customer); - } - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Client.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Client.composite deleted file mode 100644 index b04cc33023..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Client.composite +++ /dev/null @@ -1,30 +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 - * 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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://client" - name="Client"> - - <component name="ClientComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.bindingsca.ClientImpl" /> - <reference name="local" target="LocalComponent" /> - <reference name="remote" target="RemoteComponent" /> - </component> - - -</composite>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Service.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Service.composite deleted file mode 100644 index fe282d291c..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Service.composite +++ /dev/null @@ -1,31 +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 - * 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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://service" - name="Service"> - - <component name="LocalComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.bindingsca.LocalServiceImpl" /> - </component> - - <component name="RemoteComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.bindingsca.RemoteServiceImpl" /> - </component> - -</composite>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java deleted file mode 100644 index 9efa1a99ec..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java +++ /dev/null @@ -1,79 +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.binding.sca.axis2; - - -import junit.framework.Assert; - -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient; -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientCallbackOnewayRemoteImpl; -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -// @Ignore("TUSCANY-3138") -public class AsynchTestCase { - - public static Node nodeA; - public static Node nodeB; - - @BeforeClass - public static void init() throws Exception { - System.out.println("Setting up nodes"); - - try { - // create and start nodes - Contribution contrib = new Contribution("asynch", "./target/test-classes/ws/asynchReference"); - nodeA = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib); - nodeA.start(); - - contrib = new Contribution("asynch", "./target/test-classes/ws/asynchService"); - nodeB = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib); - nodeB.start(); - - } catch (Exception ex) { - System.err.println("Exception when creating domain " + ex.getMessage()); - ex.printStackTrace(System.err); - throw ex; - } - } - - @AfterClass - public static void destroy() throws Exception { - nodeA.stop(); - nodeB.stop(); - } - - @Test - public void testHelloWorldAsynch() throws Exception { - HelloWorldClient helloWorldClientB; - helloWorldClientB = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientCallbackRemote"); - helloWorldClientB.getGreetings("fred"); - System.out.println("Sleeping ..."); - Thread.sleep(2000); - System.out.println("... Done"); - Assert.assertEquals("callback fred", HelloWorldClientCallbackOnewayRemoteImpl.result ); - - } - - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java deleted file mode 100644 index efa84e92a5..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java +++ /dev/null @@ -1,83 +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.binding.sca.axis2; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient; -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -// @Ignore("TUSCANY-3138") -public class CallbackTestCase { - - public static Node nodeA; - public static Node nodeB; - - @BeforeClass - public static void init() throws Exception { - System.out.println("Setting up nodes"); - - try { - // create and start nodes - Contribution contrib = new Contribution("reference", "./target/test-classes/ws/callbackReference"); - nodeA = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib); - nodeA.start(); - - contrib = new Contribution("service", "./target/test-classes/ws/callbackService"); - nodeB = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib); - nodeB.start(); - - } catch (Exception ex) { - System.err.println("Exception when creating domain " + ex.getMessage()); - ex.printStackTrace(System.err); - throw ex; - } - } - - @AfterClass - public static void destroy() throws Exception { - nodeA.stop(); - nodeB.stop(); - } - - //@Test - public void testKeepServerRunning() throws Exception { - System.out.println("press enter to continue"); - System.in.read(); - } - - @Test - public void testHelloWorldCallbackLocal() throws Exception { - HelloWorldClient helloWorldClientB; - helloWorldClientB = nodeB.getService(HelloWorldClient.class, "BHelloWorldClientCallbackLocal"); - Assert.assertEquals("Hello callback fred", helloWorldClientB.getGreetings("fred")); - } - - @Test - public void testHelloWorldCallbackRemote() throws Exception { - HelloWorldClient helloWorldClientA; - helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientCallbackRemote"); - Assert.assertEquals("Hello callback fred", helloWorldClientA.getGreetings("fred")); - } -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java deleted file mode 100644 index 45d28140b4..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java +++ /dev/null @@ -1,74 +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.binding.sca.axis2; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient; -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; - -public class PromotionTestCase { - - - public static Node nodeA; - public static Node nodeB; - - @BeforeClass - public static void init() throws Exception { - System.out.println("Setting up nodes"); - - try { - // create and start nodes - Contribution contrib = new Contribution("reference", "./target/test-classes/ws/promotionReference"); - nodeA = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib); - nodeA.start(); - - contrib = new Contribution("service", "./target/test-classes/ws/promotionService"); - nodeB = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib); - nodeB.start(); - - } catch (Exception ex) { - System.err.println("Exception when creating domain " + ex.getMessage()); - ex.printStackTrace(System.err); - throw ex; - } - } - - @AfterClass - public static void destroy() throws Exception { - nodeA.stop(); - nodeB.stop(); - } - - @Test - @Ignore - public void testHelloWorldPromotion() throws Exception { - HelloWorldClient helloWorldClientA; - helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientRemotePromotion"); - Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello fred"); - - } - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java deleted file mode 100644 index a5d6529895..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java +++ /dev/null @@ -1,110 +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.binding.sca.axis2; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient; -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.oasisopen.sca.ServiceUnavailableException; - -public class SimpleTestCase { - - public static Node nodeA; - public static Node nodeB; - - @BeforeClass - public static void init() throws Exception { - System.out.println("Setting up nodes"); - - try { - // create and start nodes - Contribution contrib = new Contribution("reference", "./target/test-classes/ws/simpleReference"); - nodeA = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib); - nodeA.start(); - - contrib = new Contribution("service", "./target/test-classes/ws/simpleService"); - nodeB = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib); - nodeB.start(); - - } catch (Exception ex) { - System.err.println("Exception when creating domain " + ex.getMessage()); - ex.printStackTrace(System.err); - throw ex; - } - } - - @AfterClass - public static void destroy() throws Exception { - nodeA.stop(); - nodeB.stop(); - } - - @Test - public void testHelloWorldLocal() throws Exception { - HelloWorldClient helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientLocal"); - Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello fred"); - - } - - @Test - public void testHelloWorldRemote() throws Exception { - - HelloWorldClient helloWorldClientA; - helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientRemote"); - - try { - helloWorldClientA.getGreetings("fred"); - } catch (ServiceUnavailableException ex){ - Assert.fail(); - } - } - - @Test - public void testHelloWorldLocalAndRemote() throws Exception { - HelloWorldClient helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientLocalAndRemote"); - HelloWorldClient helloWorldClientB = nodeB.getService(HelloWorldClient.class, "BHelloWorldClientLocalAndRemote"); - Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello fred"); - Assert.assertEquals(helloWorldClientB.getGreetings("fred"), "Hello fred"); - } - - @Test - public void testHelloWorldMultipleServices() throws Exception { - HelloWorldClient helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientMultipleServices"); - HelloWorldClient helloWorldClientA2 = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientMultipleServices2"); - HelloWorldClient helloWorldClientB = nodeB.getService(HelloWorldClient.class, "BHelloWorldClientMultipleServices"); - Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello fred"); - Assert.assertEquals(helloWorldClientA2.getGreetings("fred"), "Hello fred"); - Assert.assertEquals(helloWorldClientB.getGreetings("fred"), "Hello fred"); - } - - @Test - public void testHelloWorldMultipleBindings() throws Exception { - HelloWorldClient helloWorldClientA; - helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientMultipleBindings"); - Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello fred"); - - } - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java deleted file mode 100644 index f7ab3dfe98..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java +++ /dev/null @@ -1,30 +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.binding.sca.axis2.helloworld; - -import org.oasisopen.sca.annotation.Remotable; - - -@Remotable -public interface HelloWorldCallbackRemote { - - String getGreetingsCallbackRemote(String s); - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java deleted file mode 100644 index 3d25d37708..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java +++ /dev/null @@ -1,27 +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.binding.sca.axis2.helloworld; - - -public interface HelloWorldClient { - - String getGreetings(String s); - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java deleted file mode 100644 index a469d197d6..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java +++ /dev/null @@ -1,33 +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.binding.sca.axis2.helloworld; - -import org.oasisopen.sca.annotation.Callback; -import org.oasisopen.sca.annotation.OneWay; -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -@Callback(HelloWorldCallbackRemote.class) -public interface HelloWorldServiceCallbackOnewayRemote { - - @OneWay - void getGreetingsRemote(String s); - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java deleted file mode 100644 index 3f5a21fddd..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java +++ /dev/null @@ -1,31 +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.binding.sca.axis2.helloworld; - -import org.oasisopen.sca.annotation.Callback; -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -@Callback(HelloWorldCallbackRemote.class) -public interface HelloWorldServiceCallbackRemote { - - String getGreetingsRemote(String s); - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java deleted file mode 100644 index 49e5232b31..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java +++ /dev/null @@ -1,27 +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.binding.sca.axis2.helloworld; - - -public interface HelloWorldServiceLocal { - - String getGreetingsLocal(String s); - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java deleted file mode 100644 index ccc77c142b..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java +++ /dev/null @@ -1,29 +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.binding.sca.axis2.helloworld; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface HelloWorldServiceRemote { - - String getGreetingsRemote(String s); - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java deleted file mode 100644 index c2be798d1a..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java +++ /dev/null @@ -1,29 +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.binding.sca.axis2.helloworld; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface HelloWorldServiceRemote2 { - - String getGreetingsRemote2(String s); - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java deleted file mode 100644 index 9355aece1f..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java +++ /dev/null @@ -1,43 +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.binding.sca.axis2.helloworld.impl; - -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient; -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceCallbackOnewayRemote; -import org.oasisopen.sca.annotation.Reference; - -public class HelloWorldClientCallbackOnewayRemoteImpl implements HelloWorldClient { - - public static String result; - - @Reference - public HelloWorldServiceCallbackOnewayRemote helloWorldService; - - public String getGreetings(String s) { - helloWorldService.getGreetingsRemote(s); - return null; - } - - public String getGreetingsCallbackRemote(String s) { - result = "callback " + s; - return result; - } - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java deleted file mode 100644 index efc47aa94d..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java +++ /dev/null @@ -1,42 +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.binding.sca.axis2.helloworld.impl; - -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient; -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceCallbackRemote; -import org.oasisopen.sca.annotation.Reference; - -public class HelloWorldClientCallbackRemoteImpl implements HelloWorldClient { - - public static String result; - - @Reference - public HelloWorldServiceCallbackRemote helloWorldService; - - public String getGreetings(String s) { - return helloWorldService.getGreetingsRemote(s); - } - - public String getGreetingsCallbackRemote(String s) { - result = "callback " + s; - return result; - } - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java deleted file mode 100644 index 6ed813ff0a..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.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.binding.sca.axis2.helloworld.impl; - -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient; -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceLocal; -import org.oasisopen.sca.annotation.Reference; - -public class HelloWorldClientLocalImpl implements HelloWorldClient { - - @Reference - public HelloWorldServiceLocal helloWorldService; - - public String getGreetings(String s) { - return helloWorldService.getGreetingsLocal(s); - } - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java deleted file mode 100644 index ba70573efb..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.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.binding.sca.axis2.helloworld.impl; - -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient; -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote2; -import org.oasisopen.sca.annotation.Reference; - -public class HelloWorldClientRemote2Impl implements HelloWorldClient { - - @Reference - public HelloWorldServiceRemote2 helloWorldService; - - public String getGreetings(String s) { - return helloWorldService.getGreetingsRemote2(s); - } - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java deleted file mode 100644 index a87d6eb49a..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.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.binding.sca.axis2.helloworld.impl; - -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient; -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote; -import org.oasisopen.sca.annotation.Reference; - -public class HelloWorldClientRemoteImpl implements HelloWorldClient { - - @Reference - public HelloWorldServiceRemote helloWorldService; - - public String getGreetings(String s) { - return helloWorldService.getGreetingsRemote(s); - } - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java deleted file mode 100644 index 3dc0b12b82..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.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.binding.sca.axis2.helloworld.impl; - -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldCallbackRemote; -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceCallbackOnewayRemote; -import org.oasisopen.sca.annotation.Callback; - -public class HelloWorldServiceCallbackOnewayRemoteImpl implements HelloWorldServiceCallbackOnewayRemote { - - @Callback - protected HelloWorldCallbackRemote theCallback; - - public void getGreetingsRemote(String s) { - theCallback.getGreetingsCallbackRemote(s); - } - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java deleted file mode 100644 index b15d6dea80..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java +++ /dev/null @@ -1,39 +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.binding.sca.axis2.helloworld.impl; - -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldCallbackRemote; -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceCallbackRemote; -import org.oasisopen.sca.annotation.Callback; - -public class HelloWorldServiceCallbackRemoteImpl implements HelloWorldServiceCallbackRemote { - - @Callback - protected HelloWorldCallbackRemote theCallback; - - public HelloWorldServiceCallbackRemoteImpl() { - System.out.println("Constructor"); - } - - public String getGreetingsRemote(String s) { - return "Hello " + theCallback.getGreetingsCallbackRemote(s); - } - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java deleted file mode 100644 index c4347b084a..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java +++ /dev/null @@ -1,30 +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.binding.sca.axis2.helloworld.impl; - -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceLocal; - -public class HelloWorldServiceLocalImpl implements HelloWorldServiceLocal { - - public String getGreetingsLocal(String s) { - return "Hello " + s; - } - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java deleted file mode 100644 index 846bff02e1..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java +++ /dev/null @@ -1,41 +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.binding.sca.axis2.helloworld.impl; - -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceLocal; -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote; -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote2; -import org.oasisopen.sca.annotation.Service; - -@Service({HelloWorldServiceRemote.class, HelloWorldServiceRemote2.class, HelloWorldServiceLocal.class} ) -public class HelloWorldServiceMultipleServicesImpl implements HelloWorldServiceLocal, HelloWorldServiceRemote, HelloWorldServiceRemote2 { - - public String getGreetingsLocal(String s) { - return "Hello " + s; - } - - public String getGreetingsRemote(String s) { - return "Hello " + s; - } - - public String getGreetingsRemote2(String s) { - return "Hello " + s; - } -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java deleted file mode 100644 index d69f442879..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java +++ /dev/null @@ -1,30 +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.binding.sca.axis2.helloworld.impl; - -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote; - -public class HelloWorldServiceRemoteImpl implements HelloWorldServiceRemote { - - public String getGreetingsRemote(String s) { - return "Hello " + s; - } - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java deleted file mode 100644 index cbcc06056a..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java +++ /dev/null @@ -1,79 +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.binding.sca.rmi;
-
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldClient;
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldClientCallbackOnewayRemoteImpl;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class AsynchTestCase {
-
- public static Node nodeA;
- public static Node nodeB;
-
- @BeforeClass
- public static void init() throws Exception {
- System.out.println("Setting up nodes");
- // System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding", RMIBinding.TYPE.toString());
- try {
- // create and start nodes
- Contribution contrib = new Contribution("asynch", "./target/test-classes/rmi/asynchReference");
- nodeA = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
- nodeA.start();
-
- contrib = new Contribution("asynch", "./target/test-classes/rmi/asynchService");
- nodeB = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
- nodeB.start();
-
- } catch (Exception ex) {
- System.err.println("Exception when creating domain " + ex.getMessage());
- ex.printStackTrace(System.err);
- throw ex;
- }
- }
-
- @AfterClass
- public static void destroy() throws Exception {
- nodeA.stop();
- nodeB.stop();
- // System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");
- }
-
- @Test
- public void testHelloWorldAsynch() throws Exception {
- HelloWorldClient helloWorldClientB;
- helloWorldClientB = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientCallbackRemote");
- helloWorldClientB.getGreetings("fred");
- System.out.println("Sleeping ...");
- Thread.sleep(2000);
- System.out.println("... Done");
- Assert.assertEquals("callback fred", HelloWorldClientCallbackOnewayRemoteImpl.result );
-
- }
-
-
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java deleted file mode 100644 index dccd2dace8..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java +++ /dev/null @@ -1,84 +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.binding.sca.rmi;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldClient;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class CallbackTestCase {
-
- public static Node nodeA;
- public static Node nodeB;
-
- @BeforeClass
- public static void init() throws Exception {
- System.out.println("Setting up nodes");
- // System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding", RMIBinding.TYPE.toString());
-
- try {
- // create and start nodes
- Contribution contrib = new Contribution("reference", "./target/test-classes/rmi/callbackReference");
- nodeA = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
- nodeA.start();
-
- contrib = new Contribution("service", "./target/test-classes/rmi/callbackService");
- nodeB = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
- nodeB.start();
-
- } catch (Exception ex) {
- System.err.println("Exception when creating domain " + ex.getMessage());
- ex.printStackTrace(System.err);
- throw ex;
- }
- }
-
- @AfterClass
- public static void destroy() throws Exception {
- nodeA.stop();
- nodeB.stop();
- // System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");
- }
-
- //@Test
- public void testKeepServerRunning() throws Exception {
- System.out.println("press enter to continue");
- System.in.read();
- }
-
- @Test
- public void testHelloWorldCallbackLocal() throws Exception {
- HelloWorldClient helloWorldClientB;
- helloWorldClientB = nodeB.getService(HelloWorldClient.class, "BHelloWorldClientCallbackLocal");
- Assert.assertEquals("Hello callback fred", helloWorldClientB.getGreetings("fred"));
- }
-
- @Test
- public void testHelloWorldCallbackRemote() throws Exception {
- HelloWorldClient helloWorldClientA;
- helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientCallbackRemote");
- Assert.assertEquals("Hello callback fred", helloWorldClientA.getGreetings("fred"));
- }
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java deleted file mode 100644 index 7aac95a8ff..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java +++ /dev/null @@ -1,76 +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.binding.sca.rmi;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldClient;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class PromotionTestCase {
-
-
- public static Node nodeA;
- public static Node nodeB;
-
- @BeforeClass
- public static void init() throws Exception {
- System.out.println("Setting up nodes");
- System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding",
- "{http://tuscany.apache.org/xmlns/sca/1.1}binding.rmi");
-
- try {
- // create and start nodes
- Contribution contrib = new Contribution("reference", "./target/test-classes/rmi/promotionReference");
- nodeA = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
- nodeA.start();
-
- contrib = new Contribution("service", "./target/test-classes/rmi/promotionService");
- nodeB = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
- nodeB.start();
-
- } catch (Exception ex) {
- System.err.println("Exception when creating domain " + ex.getMessage());
- ex.printStackTrace(System.err);
- throw ex;
- }
- }
-
- @AfterClass
- public static void destroy() throws Exception {
- nodeA.stop();
- nodeB.stop();
- System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");
-
- }
-
- @Test
- public void testHelloWorldPromotion() throws Exception {
- HelloWorldClient helloWorldClientA;
- helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientRemotePromotion");
- Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello fred");
-
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java deleted file mode 100644 index f748beb6cb..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java +++ /dev/null @@ -1,116 +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.binding.sca.rmi;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldClient;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.oasisopen.sca.ServiceUnavailableException;
-
-public class SimpleTestCase {
-
- private static NodeFactory factory;
- public static Node nodeA;
- public static Node nodeB;
-
- @BeforeClass
- public static void init() throws Exception {
- System.out.println("Setting up nodes");
- System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding",
- "{http://tuscany.apache.org/xmlns/sca/1.1}binding.rmi");
-
- try {
- factory = NodeFactory.getInstance();
- // create and start nodes
- Contribution contrib = new Contribution("reference", "./target/test-classes/rmi/simpleReference");
- nodeA = factory.createNode("HelloWorld.composite", contrib);
- nodeA.start();
-
- contrib = new Contribution("service", "./target/test-classes/rmi/simpleService");
- nodeB = factory.createNode("HelloWorld.composite", contrib);
- nodeB.start();
-
- } catch (Exception ex) {
- System.err.println("Exception when creating domain " + ex.getMessage());
- ex.printStackTrace(System.err);
- throw ex;
- }
- }
-
- @AfterClass
- public static void destroy() throws Exception {
- nodeA.stop();
- nodeB.stop();
- factory.destroy();
- System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");
- }
-
- @Test
- public void testHelloWorldLocal() throws Exception {
- HelloWorldClient helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientLocal");
- Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello fred");
-
- }
-
- @Test
- public void testHelloWorldRemote() throws Exception {
-
- HelloWorldClient helloWorldClientA;
- helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientRemote");
-
- try {
- helloWorldClientA.getGreetings("fred");
- } catch (ServiceUnavailableException ex){
- Assert.fail();
- }
- }
-
- @Test
- public void testHelloWorldLocalAndRemote() throws Exception {
- HelloWorldClient helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientLocalAndRemote");
- HelloWorldClient helloWorldClientB = nodeB.getService(HelloWorldClient.class, "BHelloWorldClientLocalAndRemote");
- Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello fred");
- Assert.assertEquals(helloWorldClientB.getGreetings("fred"), "Hello fred");
- }
-
- @Test
- public void testHelloWorldMultipleServices() throws Exception {
- HelloWorldClient helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientMultipleServices");
- HelloWorldClient helloWorldClientA2 = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientMultipleServices2");
- HelloWorldClient helloWorldClientB = nodeB.getService(HelloWorldClient.class, "BHelloWorldClientMultipleServices");
- Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello fred");
- Assert.assertEquals(helloWorldClientA2.getGreetings("fred"), "Hello fred");
- Assert.assertEquals(helloWorldClientB.getGreetings("fred"), "Hello fred");
- }
-
- @Test
- public void testHelloWorldMultipleBindings() throws Exception {
- HelloWorldClient helloWorldClientA;
- helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientMultipleBindings");
- Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello fred");
-
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldCallbackRemote.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldCallbackRemote.java deleted file mode 100644 index 7c4cf4b0b7..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldCallbackRemote.java +++ /dev/null @@ -1,30 +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.binding.sca.rmi.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-
-@Remotable
-public interface HelloWorldCallbackRemote {
-
- String getGreetingsCallbackRemote(String s);
-
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldClient.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldClient.java deleted file mode 100644 index 017acee582..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldClient.java +++ /dev/null @@ -1,27 +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.binding.sca.rmi.helloworld;
-
-
-public interface HelloWorldClient {
-
- String getGreetings(String s);
-
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackOnewayRemote.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackOnewayRemote.java deleted file mode 100644 index 86f984e61a..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackOnewayRemote.java +++ /dev/null @@ -1,33 +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.binding.sca.rmi.helloworld;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.OneWay;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-@Callback(HelloWorldCallbackRemote.class)
-public interface HelloWorldServiceCallbackOnewayRemote {
-
- @OneWay
- void getGreetingsRemote(String s);
-
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackRemote.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackRemote.java deleted file mode 100644 index 8e19fd7382..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackRemote.java +++ /dev/null @@ -1,31 +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.binding.sca.rmi.helloworld;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-@Callback(HelloWorldCallbackRemote.class)
-public interface HelloWorldServiceCallbackRemote {
-
- String getGreetingsRemote(String s);
-
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceLocal.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceLocal.java deleted file mode 100644 index b0d623e2e4..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceLocal.java +++ /dev/null @@ -1,27 +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.binding.sca.rmi.helloworld;
-
-
-public interface HelloWorldServiceLocal {
-
- String getGreetingsLocal(String s);
-
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote.java deleted file mode 100644 index ccb44694d9..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote.java +++ /dev/null @@ -1,29 +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.binding.sca.rmi.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface HelloWorldServiceRemote {
-
- String getGreetingsRemote(String s);
-
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote2.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote2.java deleted file mode 100644 index 5c8bb13f43..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote2.java +++ /dev/null @@ -1,29 +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.binding.sca.rmi.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface HelloWorldServiceRemote2 {
-
- String getGreetingsRemote2(String s);
-
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java deleted file mode 100644 index 1ff1792bb7..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java +++ /dev/null @@ -1,43 +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.binding.sca.rmi.helloworld.impl;
-
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldClient;
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceCallbackOnewayRemote;
-import org.oasisopen.sca.annotation.Reference;
-
-public class HelloWorldClientCallbackOnewayRemoteImpl implements HelloWorldClient {
-
- public static String result;
-
- @Reference
- public HelloWorldServiceCallbackOnewayRemote helloWorldService;
-
- public String getGreetings(String s) {
- helloWorldService.getGreetingsRemote(s);
- return null;
- }
-
- public String getGreetingsCallbackRemote(String s) {
- result = "callback " + s;
- return result;
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java deleted file mode 100644 index b17d8e2016..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java +++ /dev/null @@ -1,42 +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.binding.sca.rmi.helloworld.impl;
-
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldClient;
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceCallbackRemote;
-import org.oasisopen.sca.annotation.Reference;
-
-public class HelloWorldClientCallbackRemoteImpl implements HelloWorldClient {
-
- public static String result;
-
- @Reference
- public HelloWorldServiceCallbackRemote helloWorldService;
-
- public String getGreetings(String s) {
- return helloWorldService.getGreetingsRemote(s);
- }
-
- public String getGreetingsCallbackRemote(String s) {
- result = "callback " + s;
- return result;
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientLocalImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientLocalImpl.java deleted file mode 100644 index e230326f5f..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientLocalImpl.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.binding.sca.rmi.helloworld.impl;
-
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldClient;
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceLocal;
-import org.oasisopen.sca.annotation.Reference;
-
-public class HelloWorldClientLocalImpl implements HelloWorldClient {
-
- @Reference
- public HelloWorldServiceLocal helloWorldService;
-
- public String getGreetings(String s) {
- return helloWorldService.getGreetingsLocal(s);
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemote2Impl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemote2Impl.java deleted file mode 100644 index 77df8c2c39..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemote2Impl.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.binding.sca.rmi.helloworld.impl;
-
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldClient;
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceRemote2;
-import org.oasisopen.sca.annotation.Reference;
-
-public class HelloWorldClientRemote2Impl implements HelloWorldClient {
-
- @Reference
- public HelloWorldServiceRemote2 helloWorldService;
-
- public String getGreetings(String s) {
- return helloWorldService.getGreetingsRemote2(s);
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemoteImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemoteImpl.java deleted file mode 100644 index 8effa3ac36..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemoteImpl.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.binding.sca.rmi.helloworld.impl;
-
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldClient;
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceRemote;
-import org.oasisopen.sca.annotation.Reference;
-
-public class HelloWorldClientRemoteImpl implements HelloWorldClient {
-
- @Reference
- public HelloWorldServiceRemote helloWorldService;
-
- public String getGreetings(String s) {
- return helloWorldService.getGreetingsRemote(s);
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java deleted file mode 100644 index 2467ddab88..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.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.binding.sca.rmi.helloworld.impl;
-
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldCallbackRemote;
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceCallbackOnewayRemote;
-import org.oasisopen.sca.annotation.Callback;
-
-public class HelloWorldServiceCallbackOnewayRemoteImpl implements HelloWorldServiceCallbackOnewayRemote {
-
- @Callback
- protected HelloWorldCallbackRemote theCallback;
-
- public void getGreetingsRemote(String s) {
- theCallback.getGreetingsCallbackRemote(s);
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java deleted file mode 100644 index d1b75d0a2c..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java +++ /dev/null @@ -1,39 +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.binding.sca.rmi.helloworld.impl;
-
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldCallbackRemote;
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceCallbackRemote;
-import org.oasisopen.sca.annotation.Callback;
-
-public class HelloWorldServiceCallbackRemoteImpl implements HelloWorldServiceCallbackRemote {
-
- @Callback
- protected HelloWorldCallbackRemote theCallback;
-
- public HelloWorldServiceCallbackRemoteImpl() {
- System.out.println("Constructor");
- }
-
- public String getGreetingsRemote(String s) {
- return "Hello " + theCallback.getGreetingsCallbackRemote(s);
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceLocalImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceLocalImpl.java deleted file mode 100644 index 44e7efc668..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceLocalImpl.java +++ /dev/null @@ -1,30 +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.binding.sca.rmi.helloworld.impl;
-
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceLocal;
-
-public class HelloWorldServiceLocalImpl implements HelloWorldServiceLocal {
-
- public String getGreetingsLocal(String s) {
- return "Hello " + s;
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java deleted file mode 100644 index 88440de023..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java +++ /dev/null @@ -1,41 +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.binding.sca.rmi.helloworld.impl;
-
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceLocal;
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceRemote;
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceRemote2;
-import org.oasisopen.sca.annotation.Service;
-
-@Service({HelloWorldServiceRemote.class, HelloWorldServiceRemote2.class, HelloWorldServiceLocal.class} )
-public class HelloWorldServiceMultipleServicesImpl implements HelloWorldServiceLocal, HelloWorldServiceRemote, HelloWorldServiceRemote2 {
-
- public String getGreetingsLocal(String s) {
- return "Hello " + s;
- }
-
- public String getGreetingsRemote(String s) {
- return "Hello " + s;
- }
-
- public String getGreetingsRemote2(String s) {
- return "Hello " + s;
- }
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceRemoteImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceRemoteImpl.java deleted file mode 100644 index 06dc2c3f79..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceRemoteImpl.java +++ /dev/null @@ -1,30 +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.binding.sca.rmi.helloworld.impl;
-
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceRemote;
-
-public class HelloWorldServiceRemoteImpl implements HelloWorldServiceRemote {
-
- public String getGreetingsRemote(String s) {
- return "Hello " + s;
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/BindingSCATestCase.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/BindingSCATestCase.java deleted file mode 100644 index fcd0d39162..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/BindingSCATestCase.java +++ /dev/null @@ -1,170 +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.itest.bindingsca; - -import java.io.File; - -import org.apache.tuscany.sca.assembly.SCABinding; -import org.apache.tuscany.sca.binding.ws.WebServiceBinding; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.apache.tuscany.sca.node.configuration.NodeConfiguration; -import org.junit.Assert; -import org.junit.Test; -import org.oasisopen.sca.ServiceRuntimeException; - -/** - * Test binding.sca in the same classloader - */ -public class BindingSCATestCase { - static final String DOMAIN_URI = "my-domain"; - private static final String REGISTRY_URI = "tuscany:bindingScaTestDomain"; - private static final String PKG = "org/apache/tuscany/sca/itest/bindingsca/"; - private static final String CLIENT = "Client.composite"; - private static final String SERVICE = "Service.composite"; - private static final String ROOT = new File("target/classes/" + PKG).toURI().toString(); - - /** - * One NodeFactory and two nodes - */ - @Test - public void testOneFactoryTwoNodes() { - NodeFactory factory1 = NodeFactory.getInstance(); - Node node1 = createClientNode(factory1); - Node node2 = createServiceNode(factory1); - node1.start(); - node2.start(); - try { - runClient(node1); - } finally { - node2.stop(); - node1.stop(); - factory1.destroy(); - } - } - - /** - * Create the service node - * @param factory - * @return - */ - static Node createServiceNode(NodeFactory factory) { - NodeConfiguration config2 = - factory.createNodeConfiguration().setDomainURI(DOMAIN_URI).setURI("node2").addContribution("c2", ROOT) - .addDeploymentComposite("c2", SERVICE).setDomainRegistryURI(REGISTRY_URI) - .addBinding(WebServiceBinding.TYPE, "http://localhost:8085/").addBinding(SCABinding.TYPE, - "http://localhost:8085/"); - - Node node2 = factory.createNode(config2); - return node2; - } - - /** - * Create the client node - * @param factory - * @return - */ - static Node createClientNode(NodeFactory factory) { - NodeConfiguration config1 = - factory.createNodeConfiguration().setDomainURI(DOMAIN_URI).setURI("node1").addContribution("c1", ROOT) - .addDeploymentComposite("c1", CLIENT).setDomainRegistryURI(REGISTRY_URI) - .addBinding(WebServiceBinding.TYPE, "http://localhost:8085/").addBinding(SCABinding.TYPE, - "http://localhost:8085/"); - Node node1 = factory.createNode(config1); - return node1; - } - - /** - * Two node factories and two nodes - */ - @Test - public void testTwoFactoriesTwoNodes() throws Exception { - NodeFactory factory1 = NodeFactory.newInstance(); - Node node1 = createClientNode(factory1); - NodeFactory factory2 = NodeFactory.newInstance(); - Node node2 = createServiceNode(factory2); - node1.start(); - node2.start(); - Thread.sleep(1000); - try { - // This call doesn't require the Local service, it should be successful - createCustomer(node1); - try { - runClient(node1); - // We cannot make local call to remote endpoints - Assert.fail("ServiceRuntimeException should have been thrown."); - } catch (ServiceRuntimeException e) { - // ignore - } - } finally { - node2.stop(); - node1.stop(); - factory2.destroy(); - factory1.destroy(); - } - } - - /** - * Run the client - * @param node - */ - static void runClient(Node node) { - Client client = node.getService(Client.class, "ClientComponent/Client"); - runClient(client); - } - - static void runClient(Client client) { - String id = client.create("Ray"); - Assert.assertEquals("Ray", client.getName(id)); - } - - static void runClientNotFound(Client client) { - String id = "not-there"; - Assert.assertNull(client.getName(id)); - } - - static String createCustomer(Node node) { - Client client = node.getService(Client.class, "ClientComponent/Client"); - String id = client.create("John"); - Assert.assertNotNull(id); - return id; - } - - /** - * One node factory and one node for both composites - */ - @Test - public void testOneFactoryOneNode() { - NodeFactory factory = NodeFactory.getInstance(); - NodeConfiguration config1 = - factory.createNodeConfiguration().setDomainURI(DOMAIN_URI).setURI("node1").addContribution("c1", ROOT) - .addDeploymentComposite("c1", CLIENT).addDeploymentComposite("c1", SERVICE); - - Node node1 = factory.createNode(config1); - node1.start(); - try { - runClient(node1); - } finally { - node1.stop(); - factory.destroy(); - } - } - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedCustomerTestCase.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedCustomerTestCase.java deleted file mode 100644 index 7255697d4b..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedCustomerTestCase.java +++ /dev/null @@ -1,62 +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.itest.bindingsca; - -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * Running the client node and service node with two different classloaders that share the Customer class - */ -public class ClientNodeSharedCustomerTestCase { - private static Node clientNode; - private static TestCaseRunner runner; - private static NodeFactory factory; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - runner = new TestCaseRunner(ServiceNode.class, Remote.class.getName(), RemoteServiceImpl.class.getName()); - runner.beforeClass(); - factory = NodeFactory.getInstance(); - clientNode = BindingSCATestCase.createClientNode(factory).start(); - Thread.sleep(1000); - } - - @Test - public void testClient() throws Exception { - BindingSCATestCase.runClient(clientNode); - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - if (clientNode != null) { - clientNode.stop(); - } - if (runner != null) { - runner.afterClass(); - } - if (factory != null) { - factory.destroy(); - } - } -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedLocalTestCase.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedLocalTestCase.java deleted file mode 100644 index 51fafae32c..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedLocalTestCase.java +++ /dev/null @@ -1,62 +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.itest.bindingsca; - -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * Running the client node and service node with two different classloaders that share the Local class - * (but not Customer) - */ -public class ClientNodeSharedLocalTestCase { - private static Node clientNode; - private static TestCaseRunner runner; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - runner = - new TestCaseRunner(ServiceNode.class, Remote.class.getName(), RemoteServiceImpl.class.getName(), - Customer.class.getName()); - runner.beforeClass(); - NodeFactory factory = NodeFactory.getInstance(); - clientNode = BindingSCATestCase.createClientNode(factory).start(); - Thread.sleep(1000); - } - - @Test - public void testClient() throws Exception { - BindingSCATestCase.runClient(clientNode); - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - if (clientNode != null) { - clientNode.stop(); - } - if (runner != null) { - runner.afterClass(); - } - NodeFactory.getInstance().destroy(); - } -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedCustomerTestCase.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedCustomerTestCase.java deleted file mode 100644 index b8ff0c58ba..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedCustomerTestCase.java +++ /dev/null @@ -1,54 +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.itest.bindingsca; - -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * Running the client api and service node with two different classloaders that share the Customer class - */ -public class ClientSharedCustomerTestCase { - private static Client client; - private static TestCaseRunner runner; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - runner = new TestCaseRunner(ServiceNode.class, Remote.class.getName(), RemoteServiceImpl.class.getName()); - runner.beforeClass(); - client = new SCAClientImpl(BindingSCATestCase.DOMAIN_URI); - Thread.sleep(1000); - } - - @Test - public void testClient() throws Exception { - BindingSCATestCase.runClient(client); - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - if (runner != null) { - runner.afterClass(); - } - NodeFactory.getInstance().destroy(); - } -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedLocalTestCase.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedLocalTestCase.java deleted file mode 100644 index 633e1a767c..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedLocalTestCase.java +++ /dev/null @@ -1,63 +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.itest.bindingsca; - -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * Running the client api and service node with two different classloaders that share the Local class - * (but not Customer) - */ -public class ClientSharedLocalTestCase { - private static Client client; - private static TestCaseRunner runner; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - runner = - new TestCaseRunner(ServiceNode.class, Remote.class.getName(), RemoteServiceImpl.class.getName(), - Customer.class.getName(), CustomerNotFoundException.class.getName()); - runner.beforeClass(); - client = new SCAClientImpl(BindingSCATestCase.DOMAIN_URI); - Thread.sleep(1000); - } - - @Test - public void testClient() throws Exception { - BindingSCATestCase.runClient(client); - } - - @Test - public void testClientNotFound() throws Exception { - BindingSCATestCase.runClientNotFound(client); - } - - - @AfterClass - public static void tearDownAfterClass() throws Exception { - if (runner != null) { - runner.afterClass(); - } - NodeFactory.getInstance().destroy(); - } -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ServiceNode.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ServiceNode.java deleted file mode 100644 index 1cba2b57c2..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ServiceNode.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.itest.bindingsca; - -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; - -/** - * This shows how to test the Calculator service component. - */ -public class ServiceNode { - private static Node serviceNode; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - /* System.setProperty("org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint.enabled", - "false"); - */ - NodeFactory factory = NodeFactory.getInstance(); - serviceNode = BindingSCATestCase.createServiceNode(factory).start(); - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - if (serviceNode != null) { - serviceNode.stop(); - } - } -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/TestCaseRunner.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/TestCaseRunner.java deleted file mode 100644 index c0960ffe95..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/TestCaseRunner.java +++ /dev/null @@ -1,329 +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.itest.bindingsca; - -import java.lang.annotation.Annotation; -import java.lang.reflect.Constructor; -import java.lang.reflect.Method; -import java.net.URL; -import java.net.URLClassLoader; -import java.security.AccessController; -import java.security.PrivilegedAction; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; - -/** - * A helper class that can be used to run an SCA JUnit test case. The test case will run in an isolated class loader. - * - * @version $Rev$ $Date$ - */ -public class TestCaseRunner { - - private ClassLoader classLoader; - private Class<?> testSuiteClass; - private Object testSuite; - private Class<?> testResultClass; - private Class<?> testCaseClass; - private Object testCase; - - private Class<?> beforeAnnotation; - private Class<?> beforeClassAnnotation; - private Class<?> afterAnnotation; - private Class<?> afterClassAnnotation; - private Class<?> junit4AdapterClass; - private Class<?> junit3TestCaseClass; - - /** - * Constructs a new TestCase runner. - * - * @param testClass - */ - public TestCaseRunner(Class<?> testClass, String... isolatedClasses) { - try { - ClassLoader tccl = setupClassLoader(testClass, isolatedClasses); - - try { - // Thread.currentThread().setContextClassLoader(classLoader); - // Allow privileged access to set class loader. Requires RuntimePermission - // setContextClassLoader in security policy. - final ClassLoader finalClassLoader = classLoader; - AccessController.doPrivileged(new PrivilegedAction<Object>() { - public Object run() { - Thread.currentThread().setContextClassLoader(finalClassLoader); - return null; - } - }); - - testCaseClass = Class.forName(testClass.getName(), true, classLoader); - testCase = testCaseClass.newInstance(); - ClassLoader testClassLoader = testCaseClass.getClassLoader(); - - junit3TestCaseClass = Class.forName("junit.framework.TestCase", true, testClassLoader); - - testSuiteClass = Class.forName("junit.framework.TestSuite", true, testClassLoader); - Constructor<?> testSuiteConstructor = testSuiteClass.getConstructor(Class.class); - testSuite = testSuiteConstructor.newInstance(testCaseClass); - - testResultClass = Class.forName("junit.framework.TestResult", true, testClassLoader); - - try { - beforeAnnotation = Class.forName("org.junit.Before", true, testClassLoader); - afterAnnotation = Class.forName("org.junit.After", true, testClassLoader); - beforeClassAnnotation = Class.forName("org.junit.BeforeClass", true, testClassLoader); - afterClassAnnotation = Class.forName("org.junit.AfterClass", true, testClassLoader); - junit4AdapterClass = Class.forName("junit.framework.JUnit4TestAdapter", true, testClassLoader); - } catch (Exception e) { - // Unexpected - throw new AssertionError(e); - } - } catch (Throwable e) { - e.printStackTrace(); - } finally { - // Thread.currentThread().setContextClassLoader(tccl); - // Allow privileged access to set class loader. Requires RuntimePermission - // setContextClassLoader in security policy. - final ClassLoader finaltccl = tccl; - AccessController.doPrivileged(new PrivilegedAction<Object>() { - public Object run() { - Thread.currentThread().setContextClassLoader(finaltccl); - return null; - } - }); - } - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - private ClassLoader setupClassLoader(Class<?> testClass, String... isolatedClasses) { - ClassLoader tccl = Thread.currentThread().getContextClassLoader(); - classLoader = testClass.getClassLoader(); - if (classLoader instanceof URLClassLoader) { - URL[] urls = ((URLClassLoader)classLoader).getURLs(); - classLoader = new ClassLoaderImpl(urls, classLoader, isolatedClasses); - } else if (classLoader == tccl || classLoader.getParent() == tccl) { - classLoader = new URLClassLoader(new URL[0], classLoader); - } else { - classLoader = tccl; - } - return tccl; - } - - /** - * Run the test case - */ - public void run() { - ClassLoader tccl = Thread.currentThread().getContextClassLoader(); - try { - // Thread.currentThread().setContextClassLoader(classLoader); - // Allow privileged access to set class loader. Requires RuntimePermission - // setContextClassLoader in security policy. - final ClassLoader finalClassLoader = classLoader; - AccessController.doPrivileged(new PrivilegedAction<Object>() { - public Object run() { - Thread.currentThread().setContextClassLoader(finalClassLoader); - return null; - } - }); - - if (junit3TestCaseClass.isAssignableFrom(testCaseClass)) { - Object testResult = testResultClass.newInstance(); - Method runMethod = testSuiteClass.getMethod("run", testResultClass); - runMethod.invoke(testSuite, testResult); - } else { - Object junit4Adapter = junit4AdapterClass.getConstructor(Class.class).newInstance(testCaseClass); - Object testResult = testResultClass.newInstance(); - Method runMethod = junit4AdapterClass.getMethod("run", testResultClass); - runMethod.invoke(junit4Adapter, testResult); - } - } catch (Exception e) { - throw new RuntimeException(e); - } finally { - // Thread.currentThread().setContextClassLoader(tccl); - // Allow privileged access to set class loader. Requires RuntimePermission - // setContextClassLoader in security policy. - final ClassLoader finaltccl = tccl; - AccessController.doPrivileged(new PrivilegedAction<Object>() { - public Object run() { - Thread.currentThread().setContextClassLoader(finaltccl); - return null; - } - }); - } - } - - /** - * Invoke the setUp method - */ - public void setUp() { - execute("setUp"); - } - - /** - * Invoke the before methods - */ - public void before() { - execute(beforeAnnotation); - } - - /** - * Invoke the beforeClass methods - */ - public void beforeClass() { - execute(beforeClassAnnotation); - } - - /** - * Invoke the tearDown method - */ - public void tearDown() { - execute("tearDown"); - } - - /** - * Invoke the after methods - */ - public void after() { - execute(afterAnnotation); - } - - /** - * Invoke the afterClass methods - */ - public void afterClass() { - execute(afterClassAnnotation); - } - - /** - * Invoke the specified test method. - */ - public void run(String methodName) { - execute(methodName); - } - - /** - * Invoke the methods annotated with the specified annotation. - */ - private void execute(Class<?> annotationClass) { - if (annotationClass == null) { - throw new RuntimeException(new NoSuchMethodException()); - } - ClassLoader tccl = Thread.currentThread().getContextClassLoader(); - try { - // Thread.currentThread().setContextClassLoader(classLoader); - // Allow privileged access to set class loader. Requires RuntimePermission - // setContextClassLoader in security policy. - final ClassLoader finalClassLoader = classLoader; - AccessController.doPrivileged(new PrivilegedAction<Object>() { - public Object run() { - Thread.currentThread().setContextClassLoader(finalClassLoader); - return null; - } - }); - - for (Method method : testCaseClass.getDeclaredMethods()) { - for (Annotation annotation : method.getAnnotations()) { - if (annotation.annotationType() == annotationClass) { - method.invoke(testCase); - } - } - } - } catch (Exception e) { - throw new RuntimeException(e); - } finally { - // Thread.currentThread().setContextClassLoader(tccl); - // Allow privileged access to set class loader. Requires RuntimePermission - // setContextClassLoader in security policy. - final ClassLoader finaltccl = tccl; - AccessController.doPrivileged(new PrivilegedAction<Object>() { - public Object run() { - Thread.currentThread().setContextClassLoader(finaltccl); - return null; - } - }); - } - } - - /** - * Invoke the specified method - */ - private void execute(String methodName) { - ClassLoader tccl = Thread.currentThread().getContextClassLoader(); - try { - // Thread.currentThread().setContextClassLoader(classLoader); - // Allow privileged access to set class loader. Requires RuntimePermission - // setContextClassLoader in security policy. - final ClassLoader finalClassLoader = classLoader; - AccessController.doPrivileged(new PrivilegedAction<Object>() { - public Object run() { - Thread.currentThread().setContextClassLoader(finalClassLoader); - return null; - } - }); - Method setUpMethod = testCaseClass.getDeclaredMethod(methodName); - setUpMethod.setAccessible(true); - setUpMethod.invoke(testCase); - } catch (Exception e) { - throw new RuntimeException(e); - } finally { - // Thread.currentThread().setContextClassLoader(tccl); - // Allow privileged access to set class loader. Requires RuntimePermission - // setContextClassLoader in security policy. - final ClassLoader finaltccl = tccl; - AccessController.doPrivileged(new PrivilegedAction<Object>() { - public Object run() { - Thread.currentThread().setContextClassLoader(finaltccl); - return null; - } - }); - } - } - - public static class ClassLoaderImpl extends URLClassLoader { - private Set<String> isolatedClasses = new HashSet<String>(); - - /** - * @param urls - * @param parent - */ - public ClassLoaderImpl(URL[] urls, ClassLoader parent, String... sharedClasses) { - super(urls, parent); - this.isolatedClasses.addAll(Arrays.asList(sharedClasses)); - } - - @Override - protected synchronized Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException { - if (!isolatedClasses.contains(name)) { - return super.loadClass(name, resolve); - } else { - Class<?> cls = findLoadedClass(name); - if (cls == null) { - cls = findClass(name); - } - if (resolve) { - resolveClass(cls); - } - return cls; - } - } - - } - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchReference/HelloWorld.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchReference/HelloWorld.composite deleted file mode 100644 index 8c825ca805..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchReference/HelloWorld.composite +++ /dev/null @@ -1,36 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="HelloWorld">
-
- <!-- callback remote wire -->
- <component name="AHelloWorldClientCallbackRemote">
- <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldClientCallbackOnewayRemoteImpl" />
- <reference name="helloWorldService" target="BHelloWorldServiceCallbackRemote">
- <binding.sca/>
- <callback>
- <binding.sca uri="http://localhost:8084/AHelloWorldClientCallbackRemote"/>
- </callback>
- </reference>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchReference/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchReference/META-INF/sca-contribution.xml deleted file mode 100644 index ab75f7d225..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchReference/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:sample="http://sample">
- <deployable composite="sample:HelloWorld"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchService/HelloWorld.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchService/HelloWorld.composite deleted file mode 100644 index 79b1a5d794..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchService/HelloWorld.composite +++ /dev/null @@ -1,38 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="HelloWorld">
-
-
- <!-- callback remote wire -->
- <component name="BHelloWorldServiceCallbackRemote">
- <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldServiceCallbackOnewayRemoteImpl" />
- <service name="HelloWorldServiceCallbackOnewayRemote">
- <binding.sca uri="http://localhost:8085/BHelloWorldServiceCallbackRemote"/>
- <callback>
- <binding.sca/>
- </callback>
- </service>
- </component>
-
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchService/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchService/META-INF/sca-contribution.xml deleted file mode 100644 index ab75f7d225..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchService/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:sample="http://sample">
- <deployable composite="sample:HelloWorld"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackReference/HelloWorld.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackReference/HelloWorld.composite deleted file mode 100644 index e8924d2728..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackReference/HelloWorld.composite +++ /dev/null @@ -1,36 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="HelloWorld">
-
- <!-- callback remote wire -->
- <component name="AHelloWorldClientCallbackRemote">
- <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldClientCallbackRemoteImpl" />
- <reference name="helloWorldService" target="BHelloWorldServiceCallbackRemote">
- <binding.sca/>
- <callback>
- <binding.sca uri="http://localhost:8084/AHelloWorldClientCallbackRemote"/>
- </callback>
- </reference>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackReference/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackReference/META-INF/sca-contribution.xml deleted file mode 100644 index ab75f7d225..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackReference/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:sample="http://sample">
- <deployable composite="sample:HelloWorld"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackService/HelloWorld.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackService/HelloWorld.composite deleted file mode 100644 index 4edc8df5cd..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackService/HelloWorld.composite +++ /dev/null @@ -1,43 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="HelloWorld">
-
-
- <!-- callback remote wire -->
- <component name="BHelloWorldServiceCallbackRemote">
- <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldServiceCallbackRemoteImpl" />
- <service name="HelloWorldServiceCallbackRemote">
- <binding.sca uri="http://localhost:8085/BHelloWorldServiceCallbackRemote"/>
- <callback>
- <binding.sca/>
- </callback>
- </service>
- </component>
-
- <!-- callback local wire -->
- <component name="BHelloWorldClientCallbackLocal">
- <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldClientCallbackRemoteImpl" />
- <reference name="helloWorldService" target="BHelloWorldServiceCallbackRemote" />
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackService/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackService/META-INF/sca-contribution.xml deleted file mode 100644 index ab75f7d225..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackService/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:sample="http://sample">
- <deployable composite="sample:HelloWorld"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/HelloWorld.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/HelloWorld.composite deleted file mode 100644 index 823cab4f56..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/HelloWorld.composite +++ /dev/null @@ -1,33 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="HelloWorld">
-
-
- <!-- composite hierarchy -->
- <component name="AHelloWorldClientRemotePromotion">
- <implementation.composite name="sample:HelloWorldComponent" />
- <reference name="AHelloWorldClientRemoteReference" target="BHelloWorldServiceRemotePromotion"/>
- </component>
-
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/HelloWorldComponent.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/HelloWorldComponent.composite deleted file mode 100644 index 088fd616f4..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/HelloWorldComponent.composite +++ /dev/null @@ -1,37 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="HelloWorldComponent">
-
- <service name="AHelloWorldClientRemoteService" promote="AHelloWorldClientRemoteComponent">
- <interface.java interface="org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldClient"/>
- </service>
-
- <reference name="AHelloWorldClientRemoteReference" promote="AHelloWorldClientRemoteComponent/helloWorldService" multiplicity="1..1">
- <interface.java interface="org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceRemote"/>
- </reference>
-
- <component name="AHelloWorldClientRemoteComponent">
- <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldClientRemoteImpl"/>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/META-INF/sca-contribution.xml deleted file mode 100644 index ab75f7d225..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:sample="http://sample">
- <deployable composite="sample:HelloWorld"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/HelloWorld.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/HelloWorld.composite deleted file mode 100644 index 454e9c55cf..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/HelloWorld.composite +++ /dev/null @@ -1,35 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="HelloWorld">
-
-
- <!-- composite hierarchy -->
- <component name="BHelloWorldServiceRemotePromotion">
- <implementation.composite name="sample:HelloWorldComponent" />
- <service name="BHelloWorldServiceRemoteService">
- <binding.sca uri="http://localhost:8085/BHelloWorldServiceRemotePromotion"/>
- </service>
- </component>
-
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/HelloWorldComponent.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/HelloWorldComponent.composite deleted file mode 100644 index a313fb8f68..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/HelloWorldComponent.composite +++ /dev/null @@ -1,37 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="HelloWorldComponent">
-
- <service name="BHelloWorldServiceRemoteService"
- promote="BHelloWorldServiceRemoteComponent/HelloWorldServiceRemote"/>
-
- <component name="BHelloWorldServiceRemoteComponent">
- <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldServiceRemoteImpl"/>
- </component>
-
- <component name="BHelloWorldServiceLocalAndRemoteNested">
- <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldServiceRemoteImpl" />
- </component>
-
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/META-INF/sca-contribution.xml deleted file mode 100644 index ab75f7d225..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:sample="http://sample">
- <deployable composite="sample:HelloWorld"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleReference/HelloWorld.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleReference/HelloWorld.composite deleted file mode 100644 index 4151749523..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleReference/HelloWorld.composite +++ /dev/null @@ -1,67 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="HelloWorld">
-
-
- <!-- local only wire -->
- <component name="AHelloWorldClientLocal">
- <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldClientLocalImpl"/>
- <reference name="helloWorldService" target="AHelloWorldServiceLocal" />
- </component>
-
- <component name="AHelloWorldServiceLocal">
- <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldServiceLocalImpl" />
- </component>
-
- <!-- unresolved remote wire -->
- <component name="AHelloWorldClientRemote">
- <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldClientRemoteImpl" />
- <reference name="helloWorldService" target="BHelloWorldServiceRemote" />
- </component>
-
- <!-- local and remote wires -->
- <component name="AHelloWorldClientLocalAndRemote">
- <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldClientRemoteImpl" />
- <reference name="helloWorldService" target="BHelloWorldServiceLocalAndRemote"/>
- </component>
-
- <!-- multiple services -->
- <component name="AHelloWorldClientMultipleServices">
- <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldClientRemoteImpl" />
- <reference name="helloWorldService" target="BHelloWorldServiceMultipleServices/HelloWorldServiceRemote"/>
- </component>
-
- <component name="AHelloWorldClientMultipleServices2">
- <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldClientRemote2Impl" />
- <reference name="helloWorldService" target="BHelloWorldServiceMultipleServices/HelloWorldServiceRemote2"/>
- </component>
-
- <!-- multiple bindings -->
- <component name="AHelloWorldClientMultipleBindings">
- <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldClientRemoteImpl" />
- <reference name="helloWorldService" target="BHelloWorldMultipleBindings/HelloWorldServiceRemote/scaBinding">
- <interface.java interface="org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceRemote" />
- </reference>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleReference/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleReference/META-INF/sca-contribution.xml deleted file mode 100644 index ab75f7d225..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleReference/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:sample="http://sample">
- <deployable composite="sample:HelloWorld"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleService/HelloWorld.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleService/HelloWorld.composite deleted file mode 100644 index 37af7625ff..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleService/HelloWorld.composite +++ /dev/null @@ -1,85 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="HelloWorld">
-
-
- <!-- local only wire -->
-
-
- <!-- unresolved remote wire -->
- <component name="BHelloWorldServiceRemote">
- <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldServiceRemoteImpl" />
- <service name="HelloWorldServiceRemote">
- <binding.sca uri="http://localhost:8085/BHelloWorldServiceRemote"/>
- </service>
- </component>
-
- <!-- local and remote wires -->
- <component name="BHelloWorldServiceLocalAndRemote">
- <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldServiceRemoteImpl" />
- <service name="HelloWorldServiceRemote">
- <binding.sca uri="http://localhost:8085/BHelloWorldServiceLocalAndRemote"/>
- </service>
- </component>
-
- <component name="BHelloWorldClientLocalAndRemote">
- <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldClientRemoteImpl" />
- <reference name="helloWorldService" target="BHelloWorldServiceLocalAndRemote" />
- </component>
-
- <!-- multiple services -->
- <component name="BHelloWorldServiceMultipleServices">
- <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldServiceMultipleServicesImpl" />
- <service name="HelloWorldServiceLocal">
- </service>
- <service name="HelloWorldServiceRemote">
- <binding.sca uri="http://localhost:8085/BHelloWorldServiceMultipleServices/HelloWorldServiceRemote"/>
- </service>
- <service name="HelloWorldServiceRemote2">
- <binding.sca uri="http://localhost:8085/BHelloWorldServiceMultipleServices/HelloWorldServiceRemote2"/>
- </service>
- </component>
-
- <component name="BHelloWorldClientMultipleServices">
- <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldClientLocalImpl" />
- <reference name="helloWorldService" target="BHelloWorldServiceMultipleServices/HelloWorldServiceLocal" />
- </component>
-
- <!-- multiple bindings -->
- <component name="BHelloWorldMultipleBindings">
- <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldServiceRemoteImpl" />
- <service name="HelloWorldServiceRemote">
- <interface.java interface="org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceRemote" />
- <!-- tuscany:binding.rmi name="rmiBinding" uri="http://localhost:8085/BHelloWorldMultipleBindings/HelloWorldServiceRemote-wsbinding"/ -->
- <binding.sca name="scaBinding" uri="http://localhost:8085/BHelloWorldMultipleBindings/HelloWorldServiceRemote-scabinding"/>
- </service>
- </component>
-
-
- <!-- Dynamic interfaces -->
- <!--component name="BHelloWorldServiceScript">
- <implementation.script script="calculator/AddServiceImpl.js"/>
- </component-->
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleService/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleService/META-INF/sca-contribution.xml deleted file mode 100644 index ab75f7d225..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleService/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:sample="http://sample">
- <deployable composite="sample:HelloWorld"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchReference/HelloWorld.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchReference/HelloWorld.composite deleted file mode 100644 index e797a0aa9c..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchReference/HelloWorld.composite +++ /dev/null @@ -1,36 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://sample" - xmlns:sample="http://sample" - name="HelloWorld"> - - <!-- callback remote wire --> - <component name="AHelloWorldClientCallbackRemote"> - <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientCallbackOnewayRemoteImpl" /> - <reference name="helloWorldService" target="BHelloWorldServiceCallbackRemote"> - <binding.sca/> - <callback> - <binding.sca uri="http://localhost:8084/AHelloWorldClientCallbackRemote"/> - </callback> - </reference> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchReference/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchReference/META-INF/sca-contribution.xml deleted file mode 100644 index e6ccae5c73..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchReference/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sample="http://sample"> - <deployable composite="sample:HelloWorld"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchService/HelloWorld.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchService/HelloWorld.composite deleted file mode 100644 index 079ee49380..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchService/HelloWorld.composite +++ /dev/null @@ -1,38 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://sample" - xmlns:sample="http://sample" - name="HelloWorld"> - - - <!-- callback remote wire --> - <component name="BHelloWorldServiceCallbackRemote"> - <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceCallbackOnewayRemoteImpl" /> - <service name="HelloWorldServiceCallbackOnewayRemote"> - <binding.sca uri="http://localhost:8085/BHelloWorldServiceCallbackRemote"/> - <callback> - <binding.sca/> - </callback> - </service> - </component> - - -</composite> diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchService/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchService/META-INF/sca-contribution.xml deleted file mode 100644 index e6ccae5c73..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchService/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sample="http://sample"> - <deployable composite="sample:HelloWorld"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackReference/HelloWorld.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackReference/HelloWorld.composite deleted file mode 100644 index 1d5630f3d0..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackReference/HelloWorld.composite +++ /dev/null @@ -1,36 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://sample" - xmlns:sample="http://sample" - name="HelloWorld"> - - <!-- callback remote wire --> - <component name="AHelloWorldClientCallbackRemote"> - <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientCallbackRemoteImpl" /> - <reference name="helloWorldService" target="BHelloWorldServiceCallbackRemote"> - <binding.sca/> - <callback> - <binding.sca uri="http://localhost:8084/AHelloWorldClientCallbackRemote"/> - </callback> - </reference> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackReference/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackReference/META-INF/sca-contribution.xml deleted file mode 100644 index e6ccae5c73..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackReference/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sample="http://sample"> - <deployable composite="sample:HelloWorld"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackService/HelloWorld.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackService/HelloWorld.composite deleted file mode 100644 index ded3766d49..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackService/HelloWorld.composite +++ /dev/null @@ -1,43 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://sample" - xmlns:sample="http://sample" - name="HelloWorld"> - - - <!-- callback remote wire --> - <component name="BHelloWorldServiceCallbackRemote"> - <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceCallbackRemoteImpl" /> - <service name="HelloWorldServiceCallbackRemote"> - <binding.sca uri="http://localhost:8085/BHelloWorldServiceCallbackRemote"/> - <callback> - <binding.sca/> - </callback> - </service> - </component> - - <!-- callback local wire --> - <component name="BHelloWorldClientCallbackLocal"> - <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientCallbackRemoteImpl" /> - <reference name="helloWorldService" target="BHelloWorldServiceCallbackRemote" /> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackService/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackService/META-INF/sca-contribution.xml deleted file mode 100644 index e6ccae5c73..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackService/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sample="http://sample"> - <deployable composite="sample:HelloWorld"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/HelloWorld.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/HelloWorld.composite deleted file mode 100644 index 4513f21acf..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/HelloWorld.composite +++ /dev/null @@ -1,33 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://sample" - xmlns:sample="http://sample" - name="HelloWorld"> - - - <!-- composite hierarchy --> - <component name="AHelloWorldClientRemotePromotion"> - <implementation.composite name="sample:HelloWorldComponent" /> - <reference name="AHelloWorldClientRemoteReference" target="BHelloWorldServiceRemotePromotion"/> - </component> - - -</composite> diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/HelloWorldComponent.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/HelloWorldComponent.composite deleted file mode 100644 index 22c20ff94a..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/HelloWorldComponent.composite +++ /dev/null @@ -1,37 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://sample" - xmlns:sample="http://sample" - name="HelloWorldComponent"> - - <service name="AHelloWorldClientRemoteService" promote="AHelloWorldClientRemoteComponent"> - <interface.java interface="org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient"/> - </service> - - <reference name="AHelloWorldClientRemoteReference" promote="AHelloWorldClientRemoteComponent/helloWorldService" multiplicity="1..1"> - <interface.java interface="org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote"/> - </reference> - - <component name="AHelloWorldClientRemoteComponent"> - <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientRemoteImpl"/> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/META-INF/sca-contribution.xml deleted file mode 100644 index e6ccae5c73..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sample="http://sample"> - <deployable composite="sample:HelloWorld"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/HelloWorld.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/HelloWorld.composite deleted file mode 100644 index e6a7d776c9..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/HelloWorld.composite +++ /dev/null @@ -1,35 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://sample" - xmlns:sample="http://sample" - name="HelloWorld"> - - - <!-- composite hierarchy --> - <component name="BHelloWorldServiceRemotePromotion"> - <implementation.composite name="sample:HelloWorldComponent" /> - <service name="BHelloWorldServiceRemoteService"> - <binding.sca uri="http://localhost:8085/BHelloWorldServiceRemotePromotion"/> - </service> - </component> - - -</composite> diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/HelloWorldComponent.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/HelloWorldComponent.composite deleted file mode 100644 index 0393280625..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/HelloWorldComponent.composite +++ /dev/null @@ -1,37 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://sample" - xmlns:sample="http://sample" - name="HelloWorldComponent"> - - <service name="BHelloWorldServiceRemoteService" - promote="BHelloWorldServiceRemoteComponent/HelloWorldServiceRemote"/> - - <component name="BHelloWorldServiceRemoteComponent"> - <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceRemoteImpl"/> - </component> - - <component name="BHelloWorldServiceLocalAndRemoteNested"> - <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceRemoteImpl" /> - </component> - - -</composite> diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/META-INF/sca-contribution.xml deleted file mode 100644 index e6ccae5c73..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sample="http://sample"> - <deployable composite="sample:HelloWorld"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleReference/HelloWorld.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleReference/HelloWorld.composite deleted file mode 100644 index f4d2789ff7..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleReference/HelloWorld.composite +++ /dev/null @@ -1,67 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://sample" - xmlns:sample="http://sample" - name="HelloWorld"> - - - <!-- local only wire --> - <component name="AHelloWorldClientLocal"> - <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientLocalImpl"/> - <reference name="helloWorldService" target="AHelloWorldServiceLocal" /> - </component> - - <component name="AHelloWorldServiceLocal"> - <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceLocalImpl" /> - </component> - - <!-- unresolved remote wire --> - <component name="AHelloWorldClientRemote"> - <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientRemoteImpl" /> - <reference name="helloWorldService" target="BHelloWorldServiceRemote" /> - </component> - - <!-- local and remote wires --> - <component name="AHelloWorldClientLocalAndRemote"> - <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientRemoteImpl" /> - <reference name="helloWorldService" target="BHelloWorldServiceLocalAndRemote"/> - </component> - - <!-- multiple services --> - <component name="AHelloWorldClientMultipleServices"> - <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientRemoteImpl" /> - <reference name="helloWorldService" target="BHelloWorldServiceMultipleServices/HelloWorldServiceRemote"/> - </component> - - <component name="AHelloWorldClientMultipleServices2"> - <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientRemote2Impl" /> - <reference name="helloWorldService" target="BHelloWorldServiceMultipleServices/HelloWorldServiceRemote2"/> - </component> - - <!-- multiple bindings --> - <component name="AHelloWorldClientMultipleBindings"> - <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientRemoteImpl" /> - <reference name="helloWorldService" target="BHelloWorldMultipleBindings/HelloWorldServiceRemote/scaBinding"> - <interface.java interface="org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote" /> - </reference> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleReference/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleReference/META-INF/sca-contribution.xml deleted file mode 100644 index e6ccae5c73..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleReference/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sample="http://sample"> - <deployable composite="sample:HelloWorld"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleService/HelloWorld.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleService/HelloWorld.composite deleted file mode 100644 index 7e6311a22d..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleService/HelloWorld.composite +++ /dev/null @@ -1,84 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://sample" - xmlns:sample="http://sample" - name="HelloWorld"> - - - <!-- local only wire --> - - - <!-- unresolved remote wire --> - <component name="BHelloWorldServiceRemote"> - <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceRemoteImpl" /> - <service name="HelloWorldServiceRemote"> - <binding.sca uri="http://localhost:8085/BHelloWorldServiceRemote"/> - </service> - </component> - - <!-- local and remote wires --> - <component name="BHelloWorldServiceLocalAndRemote"> - <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceRemoteImpl" /> - <service name="HelloWorldServiceRemote"> - <binding.sca uri="http://localhost:8085/BHelloWorldServiceLocalAndRemote"/> - </service> - </component> - - <component name="BHelloWorldClientLocalAndRemote"> - <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientRemoteImpl" /> - <reference name="helloWorldService" target="BHelloWorldServiceLocalAndRemote" /> - </component> - - <!-- multiple services --> - <component name="BHelloWorldServiceMultipleServices"> - <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceMultipleServicesImpl" /> - <service name="HelloWorldServiceLocal"> - </service> - <service name="HelloWorldServiceRemote"> - <binding.sca uri="http://localhost:8085/BHelloWorldServiceMultipleServices/HelloWorldServiceRemote"/> - </service> - <service name="HelloWorldServiceRemote2"> - <binding.sca uri="http://localhost:8085/BHelloWorldServiceMultipleServices/HelloWorldServiceRemote2"/> - </service> - </component> - - <component name="BHelloWorldClientMultipleServices"> - <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientLocalImpl" /> - <reference name="helloWorldService" target="BHelloWorldServiceMultipleServices/HelloWorldServiceLocal" /> - </component> - - <!-- multiple bindings --> - <component name="BHelloWorldMultipleBindings"> - <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceRemoteImpl" /> - <service name="HelloWorldServiceRemote"> - <interface.java interface="org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote" /> - <binding.ws name="wsBinding" uri="http://localhost:8085/BHelloWorldMultipleBindings/HelloWorldServiceRemote-wsbinding"/> - <binding.sca name="scaBinding" uri="http://localhost:8085/BHelloWorldMultipleBindings/HelloWorldServiceRemote-scabinding"/> - </service> - </component> - - - <!-- Dynamic interfaces --> - <!--component name="BHelloWorldServiceScript"> - <implementation.script script="calculator/AddServiceImpl.js"/> - </component--> - -</composite> diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleService/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleService/META-INF/sca-contribution.xml deleted file mode 100644 index e6ccae5c73..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleService/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sample="http://sample"> - <deployable composite="sample:HelloWorld"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/pom.xml b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/pom.xml deleted file mode 100644 index 0cfb13dd46..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/pom.xml +++ /dev/null @@ -1,70 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>itest-nodes-binding-sca-tribes</artifactId>
- <name>Apache Tuscany SCA iTest Nodes binding.sca Using Tribes Registry</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-client-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-endpoint-tribes</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-rmi-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-jetty</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
-</project>
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Client.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Client.java deleted file mode 100644 index ef2565b750..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Client.java +++ /dev/null @@ -1,29 +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.itest.bindingsca; - -/** - * - */ -public interface Client { - String getName(String id); - - String create(String name); -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/ClientImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/ClientImpl.java deleted file mode 100644 index 96a0f2dadd..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/ClientImpl.java +++ /dev/null @@ -1,53 +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.itest.bindingsca; - -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Service; - -/** - * - */ -@Service(Client.class) -public class ClientImpl implements Client { - @Reference - protected Local local; - - @Reference - protected Remote remote; - - public String getName(String id) { - Customer customer = null; - try { - customer = remote.getCustomer(id); - } catch (CustomerNotFoundException e) { - return null; - } - customer.dump("Client.getName()"); - return local.getName(customer); - } - - public String create(String name) { - String id = remote.generateId(); - Customer customer = remote.createCustomer(id, name); - customer.dump("Client.create()"); - return remote.getId(customer); - } -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Customer.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Customer.java deleted file mode 100644 index f2b7b1e41d..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Customer.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.itest.bindingsca; - -/** - * - */ -public class Customer { - private String id; - private String name; - - public Customer() { - } - - /** - * @param id - * @param name - */ - public Customer(String id, String name) { - super(); - this.id = id; - this.name = name; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public String toString() { - return "Customer [id=" + id + ", name=" + name + "]"; - } - - public void dump(String prefix) { - System.out.print(prefix); - System.out.print(": "); - System.out.print(toString()); - System.out.println(" @" + System.identityHashCode(this)); - System.out.println(getClass().getClassLoader()); - } -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/CustomerNotFoundException.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/CustomerNotFoundException.java deleted file mode 100644 index a6e80c9eca..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/CustomerNotFoundException.java +++ /dev/null @@ -1,64 +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.itest.bindingsca; - -/** - * - */ -public class CustomerNotFoundException extends Exception { - private String customerId; - - /** - * - */ - public CustomerNotFoundException() { - } - - /** - * @param message - */ - public CustomerNotFoundException(String message) { - super(message); - } - - /** - * @param cause - */ - public CustomerNotFoundException(Throwable cause) { - super(cause); - } - - /** - * @param message - * @param cause - */ - public CustomerNotFoundException(String message, Throwable cause) { - super(message, cause); - } - - public String getCustomerId() { - return customerId; - } - - public void setCustomerId(String customerId) { - this.customerId = customerId; - } - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Local.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Local.java deleted file mode 100644 index 0fe30c9d53..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Local.java +++ /dev/null @@ -1,27 +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.itest.bindingsca; - -/** - * - */ -public interface Local { - String getName(Customer customer); -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/LocalServiceImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/LocalServiceImpl.java deleted file mode 100644 index 8783808334..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/LocalServiceImpl.java +++ /dev/null @@ -1,38 +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.itest.bindingsca; - -import org.oasisopen.sca.annotation.Service; - -/** - * - */ -@Service(Local.class) -public class LocalServiceImpl implements Local { - - public String getName(Customer customer) { - if (customer == null) { - return null; - } - customer.dump("Local.getName()"); - return customer.getName(); - } - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Remote.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Remote.java deleted file mode 100644 index 050d35007b..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Remote.java +++ /dev/null @@ -1,36 +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.itest.bindingsca; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * - */ -@Remotable -public interface Remote { - String generateId(); - - String getId(Customer customer); - - Customer getCustomer(String id) throws CustomerNotFoundException; - - Customer createCustomer(String id, String name); -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/RemoteServiceImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/RemoteServiceImpl.java deleted file mode 100644 index 6c432a500a..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/RemoteServiceImpl.java +++ /dev/null @@ -1,66 +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.itest.bindingsca; - -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; - -import org.oasisopen.sca.annotation.AllowsPassByReference; -import org.oasisopen.sca.annotation.Scope; -import org.oasisopen.sca.annotation.Service; - -/** - * - */ -@Service(Remote.class) -@Scope("COMPOSITE") -public class RemoteServiceImpl implements Remote { - private Map<String, Customer> customers = new HashMap<String, Customer>(); - - public String generateId() { - return UUID.randomUUID().toString(); - } - - @AllowsPassByReference - public String getId(Customer customer) { - customer.dump("Remote.getId()"); - return customer.getId(); - } - - public Customer getCustomer(String id) throws CustomerNotFoundException { - Customer customer = customers.get(id); - if (customer == null) { - CustomerNotFoundException ex = new CustomerNotFoundException("Customer not found"); - ex.setCustomerId(id); - throw ex; - } - customer.dump("Remote.getCustomer()"); - return customer; - } - - public Customer createCustomer(String id, String name) { - Customer customer = new Customer(id, name); - customer.dump("Remote.createCustomer()"); - customers.put(id, customer); - return customer; - } - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/SCAClientImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/SCAClientImpl.java deleted file mode 100644 index 3573eea978..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/main/java/org/apache/tuscany/sca/itest/bindingsca/SCAClientImpl.java +++ /dev/null @@ -1,57 +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.itest.bindingsca; - -import java.net.URI; - -import org.oasisopen.sca.client.SCAClientFactory; - -/** - * - */ -public class SCAClientImpl implements Client { - private Local local; - private Remote remote; - - public SCAClientImpl(String domainURI) throws Exception { - SCAClientFactory factory = SCAClientFactory.newInstance(URI.create(domainURI)); - local = factory.getService(Local.class, "LocalComponent/Local"); - remote = factory.getService(Remote.class, "RemoteComponent/Remote"); - } - - public String getName(String id) { - Customer customer = null; - try { - customer = remote.getCustomer(id); - } catch (CustomerNotFoundException e) { - return null; - } - customer.dump("Client.getName()"); - return local.getName(customer); - } - - public String create(String name) { - String id = remote.generateId(); - Customer customer = remote.createCustomer(id, name); - customer.dump("Client.create()"); - return remote.getId(customer); - } - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Client.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Client.composite deleted file mode 100644 index b04cc33023..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Client.composite +++ /dev/null @@ -1,30 +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 - * 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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://client" - name="Client"> - - <component name="ClientComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.bindingsca.ClientImpl" /> - <reference name="local" target="LocalComponent" /> - <reference name="remote" target="RemoteComponent" /> - </component> - - -</composite>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Service.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Service.composite deleted file mode 100644 index fe282d291c..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Service.composite +++ /dev/null @@ -1,31 +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 - * 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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://service" - name="Service"> - - <component name="LocalComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.bindingsca.LocalServiceImpl" /> - </component> - - <component name="RemoteComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.bindingsca.RemoteServiceImpl" /> - </component> - -</composite>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java deleted file mode 100644 index 9efa1a99ec..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java +++ /dev/null @@ -1,79 +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.binding.sca.axis2; - - -import junit.framework.Assert; - -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient; -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientCallbackOnewayRemoteImpl; -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -// @Ignore("TUSCANY-3138") -public class AsynchTestCase { - - public static Node nodeA; - public static Node nodeB; - - @BeforeClass - public static void init() throws Exception { - System.out.println("Setting up nodes"); - - try { - // create and start nodes - Contribution contrib = new Contribution("asynch", "./target/test-classes/ws/asynchReference"); - nodeA = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib); - nodeA.start(); - - contrib = new Contribution("asynch", "./target/test-classes/ws/asynchService"); - nodeB = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib); - nodeB.start(); - - } catch (Exception ex) { - System.err.println("Exception when creating domain " + ex.getMessage()); - ex.printStackTrace(System.err); - throw ex; - } - } - - @AfterClass - public static void destroy() throws Exception { - nodeA.stop(); - nodeB.stop(); - } - - @Test - public void testHelloWorldAsynch() throws Exception { - HelloWorldClient helloWorldClientB; - helloWorldClientB = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientCallbackRemote"); - helloWorldClientB.getGreetings("fred"); - System.out.println("Sleeping ..."); - Thread.sleep(2000); - System.out.println("... Done"); - Assert.assertEquals("callback fred", HelloWorldClientCallbackOnewayRemoteImpl.result ); - - } - - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java deleted file mode 100644 index efa84e92a5..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java +++ /dev/null @@ -1,83 +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.binding.sca.axis2; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient; -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -// @Ignore("TUSCANY-3138") -public class CallbackTestCase { - - public static Node nodeA; - public static Node nodeB; - - @BeforeClass - public static void init() throws Exception { - System.out.println("Setting up nodes"); - - try { - // create and start nodes - Contribution contrib = new Contribution("reference", "./target/test-classes/ws/callbackReference"); - nodeA = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib); - nodeA.start(); - - contrib = new Contribution("service", "./target/test-classes/ws/callbackService"); - nodeB = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib); - nodeB.start(); - - } catch (Exception ex) { - System.err.println("Exception when creating domain " + ex.getMessage()); - ex.printStackTrace(System.err); - throw ex; - } - } - - @AfterClass - public static void destroy() throws Exception { - nodeA.stop(); - nodeB.stop(); - } - - //@Test - public void testKeepServerRunning() throws Exception { - System.out.println("press enter to continue"); - System.in.read(); - } - - @Test - public void testHelloWorldCallbackLocal() throws Exception { - HelloWorldClient helloWorldClientB; - helloWorldClientB = nodeB.getService(HelloWorldClient.class, "BHelloWorldClientCallbackLocal"); - Assert.assertEquals("Hello callback fred", helloWorldClientB.getGreetings("fred")); - } - - @Test - public void testHelloWorldCallbackRemote() throws Exception { - HelloWorldClient helloWorldClientA; - helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientCallbackRemote"); - Assert.assertEquals("Hello callback fred", helloWorldClientA.getGreetings("fred")); - } -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java deleted file mode 100644 index 45d28140b4..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java +++ /dev/null @@ -1,74 +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.binding.sca.axis2; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient; -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; - -public class PromotionTestCase { - - - public static Node nodeA; - public static Node nodeB; - - @BeforeClass - public static void init() throws Exception { - System.out.println("Setting up nodes"); - - try { - // create and start nodes - Contribution contrib = new Contribution("reference", "./target/test-classes/ws/promotionReference"); - nodeA = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib); - nodeA.start(); - - contrib = new Contribution("service", "./target/test-classes/ws/promotionService"); - nodeB = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib); - nodeB.start(); - - } catch (Exception ex) { - System.err.println("Exception when creating domain " + ex.getMessage()); - ex.printStackTrace(System.err); - throw ex; - } - } - - @AfterClass - public static void destroy() throws Exception { - nodeA.stop(); - nodeB.stop(); - } - - @Test - @Ignore - public void testHelloWorldPromotion() throws Exception { - HelloWorldClient helloWorldClientA; - helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientRemotePromotion"); - Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello fred"); - - } - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java deleted file mode 100644 index a5d6529895..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java +++ /dev/null @@ -1,110 +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.binding.sca.axis2; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient; -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.oasisopen.sca.ServiceUnavailableException; - -public class SimpleTestCase { - - public static Node nodeA; - public static Node nodeB; - - @BeforeClass - public static void init() throws Exception { - System.out.println("Setting up nodes"); - - try { - // create and start nodes - Contribution contrib = new Contribution("reference", "./target/test-classes/ws/simpleReference"); - nodeA = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib); - nodeA.start(); - - contrib = new Contribution("service", "./target/test-classes/ws/simpleService"); - nodeB = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib); - nodeB.start(); - - } catch (Exception ex) { - System.err.println("Exception when creating domain " + ex.getMessage()); - ex.printStackTrace(System.err); - throw ex; - } - } - - @AfterClass - public static void destroy() throws Exception { - nodeA.stop(); - nodeB.stop(); - } - - @Test - public void testHelloWorldLocal() throws Exception { - HelloWorldClient helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientLocal"); - Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello fred"); - - } - - @Test - public void testHelloWorldRemote() throws Exception { - - HelloWorldClient helloWorldClientA; - helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientRemote"); - - try { - helloWorldClientA.getGreetings("fred"); - } catch (ServiceUnavailableException ex){ - Assert.fail(); - } - } - - @Test - public void testHelloWorldLocalAndRemote() throws Exception { - HelloWorldClient helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientLocalAndRemote"); - HelloWorldClient helloWorldClientB = nodeB.getService(HelloWorldClient.class, "BHelloWorldClientLocalAndRemote"); - Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello fred"); - Assert.assertEquals(helloWorldClientB.getGreetings("fred"), "Hello fred"); - } - - @Test - public void testHelloWorldMultipleServices() throws Exception { - HelloWorldClient helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientMultipleServices"); - HelloWorldClient helloWorldClientA2 = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientMultipleServices2"); - HelloWorldClient helloWorldClientB = nodeB.getService(HelloWorldClient.class, "BHelloWorldClientMultipleServices"); - Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello fred"); - Assert.assertEquals(helloWorldClientA2.getGreetings("fred"), "Hello fred"); - Assert.assertEquals(helloWorldClientB.getGreetings("fred"), "Hello fred"); - } - - @Test - public void testHelloWorldMultipleBindings() throws Exception { - HelloWorldClient helloWorldClientA; - helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientMultipleBindings"); - Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello fred"); - - } - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java deleted file mode 100644 index f7ab3dfe98..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java +++ /dev/null @@ -1,30 +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.binding.sca.axis2.helloworld; - -import org.oasisopen.sca.annotation.Remotable; - - -@Remotable -public interface HelloWorldCallbackRemote { - - String getGreetingsCallbackRemote(String s); - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java deleted file mode 100644 index 3d25d37708..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java +++ /dev/null @@ -1,27 +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.binding.sca.axis2.helloworld; - - -public interface HelloWorldClient { - - String getGreetings(String s); - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java deleted file mode 100644 index a469d197d6..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java +++ /dev/null @@ -1,33 +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.binding.sca.axis2.helloworld; - -import org.oasisopen.sca.annotation.Callback; -import org.oasisopen.sca.annotation.OneWay; -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -@Callback(HelloWorldCallbackRemote.class) -public interface HelloWorldServiceCallbackOnewayRemote { - - @OneWay - void getGreetingsRemote(String s); - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java deleted file mode 100644 index 3f5a21fddd..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java +++ /dev/null @@ -1,31 +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.binding.sca.axis2.helloworld; - -import org.oasisopen.sca.annotation.Callback; -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -@Callback(HelloWorldCallbackRemote.class) -public interface HelloWorldServiceCallbackRemote { - - String getGreetingsRemote(String s); - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java deleted file mode 100644 index 49e5232b31..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java +++ /dev/null @@ -1,27 +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.binding.sca.axis2.helloworld; - - -public interface HelloWorldServiceLocal { - - String getGreetingsLocal(String s); - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java deleted file mode 100644 index ccc77c142b..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java +++ /dev/null @@ -1,29 +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.binding.sca.axis2.helloworld; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface HelloWorldServiceRemote { - - String getGreetingsRemote(String s); - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java deleted file mode 100644 index c2be798d1a..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java +++ /dev/null @@ -1,29 +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.binding.sca.axis2.helloworld; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface HelloWorldServiceRemote2 { - - String getGreetingsRemote2(String s); - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java deleted file mode 100644 index 9355aece1f..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java +++ /dev/null @@ -1,43 +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.binding.sca.axis2.helloworld.impl; - -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient; -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceCallbackOnewayRemote; -import org.oasisopen.sca.annotation.Reference; - -public class HelloWorldClientCallbackOnewayRemoteImpl implements HelloWorldClient { - - public static String result; - - @Reference - public HelloWorldServiceCallbackOnewayRemote helloWorldService; - - public String getGreetings(String s) { - helloWorldService.getGreetingsRemote(s); - return null; - } - - public String getGreetingsCallbackRemote(String s) { - result = "callback " + s; - return result; - } - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java deleted file mode 100644 index efc47aa94d..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java +++ /dev/null @@ -1,42 +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.binding.sca.axis2.helloworld.impl; - -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient; -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceCallbackRemote; -import org.oasisopen.sca.annotation.Reference; - -public class HelloWorldClientCallbackRemoteImpl implements HelloWorldClient { - - public static String result; - - @Reference - public HelloWorldServiceCallbackRemote helloWorldService; - - public String getGreetings(String s) { - return helloWorldService.getGreetingsRemote(s); - } - - public String getGreetingsCallbackRemote(String s) { - result = "callback " + s; - return result; - } - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java deleted file mode 100644 index 6ed813ff0a..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.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.binding.sca.axis2.helloworld.impl; - -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient; -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceLocal; -import org.oasisopen.sca.annotation.Reference; - -public class HelloWorldClientLocalImpl implements HelloWorldClient { - - @Reference - public HelloWorldServiceLocal helloWorldService; - - public String getGreetings(String s) { - return helloWorldService.getGreetingsLocal(s); - } - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java deleted file mode 100644 index ba70573efb..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.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.binding.sca.axis2.helloworld.impl; - -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient; -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote2; -import org.oasisopen.sca.annotation.Reference; - -public class HelloWorldClientRemote2Impl implements HelloWorldClient { - - @Reference - public HelloWorldServiceRemote2 helloWorldService; - - public String getGreetings(String s) { - return helloWorldService.getGreetingsRemote2(s); - } - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java deleted file mode 100644 index a87d6eb49a..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.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.binding.sca.axis2.helloworld.impl; - -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient; -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote; -import org.oasisopen.sca.annotation.Reference; - -public class HelloWorldClientRemoteImpl implements HelloWorldClient { - - @Reference - public HelloWorldServiceRemote helloWorldService; - - public String getGreetings(String s) { - return helloWorldService.getGreetingsRemote(s); - } - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java deleted file mode 100644 index 3dc0b12b82..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.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.binding.sca.axis2.helloworld.impl; - -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldCallbackRemote; -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceCallbackOnewayRemote; -import org.oasisopen.sca.annotation.Callback; - -public class HelloWorldServiceCallbackOnewayRemoteImpl implements HelloWorldServiceCallbackOnewayRemote { - - @Callback - protected HelloWorldCallbackRemote theCallback; - - public void getGreetingsRemote(String s) { - theCallback.getGreetingsCallbackRemote(s); - } - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java deleted file mode 100644 index b15d6dea80..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java +++ /dev/null @@ -1,39 +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.binding.sca.axis2.helloworld.impl; - -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldCallbackRemote; -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceCallbackRemote; -import org.oasisopen.sca.annotation.Callback; - -public class HelloWorldServiceCallbackRemoteImpl implements HelloWorldServiceCallbackRemote { - - @Callback - protected HelloWorldCallbackRemote theCallback; - - public HelloWorldServiceCallbackRemoteImpl() { - System.out.println("Constructor"); - } - - public String getGreetingsRemote(String s) { - return "Hello " + theCallback.getGreetingsCallbackRemote(s); - } - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java deleted file mode 100644 index c4347b084a..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java +++ /dev/null @@ -1,30 +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.binding.sca.axis2.helloworld.impl; - -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceLocal; - -public class HelloWorldServiceLocalImpl implements HelloWorldServiceLocal { - - public String getGreetingsLocal(String s) { - return "Hello " + s; - } - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java deleted file mode 100644 index 846bff02e1..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java +++ /dev/null @@ -1,41 +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.binding.sca.axis2.helloworld.impl; - -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceLocal; -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote; -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote2; -import org.oasisopen.sca.annotation.Service; - -@Service({HelloWorldServiceRemote.class, HelloWorldServiceRemote2.class, HelloWorldServiceLocal.class} ) -public class HelloWorldServiceMultipleServicesImpl implements HelloWorldServiceLocal, HelloWorldServiceRemote, HelloWorldServiceRemote2 { - - public String getGreetingsLocal(String s) { - return "Hello " + s; - } - - public String getGreetingsRemote(String s) { - return "Hello " + s; - } - - public String getGreetingsRemote2(String s) { - return "Hello " + s; - } -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java deleted file mode 100644 index d69f442879..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java +++ /dev/null @@ -1,30 +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.binding.sca.axis2.helloworld.impl; - -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote; - -public class HelloWorldServiceRemoteImpl implements HelloWorldServiceRemote { - - public String getGreetingsRemote(String s) { - return "Hello " + s; - } - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java deleted file mode 100644 index cbcc06056a..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java +++ /dev/null @@ -1,79 +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.binding.sca.rmi;
-
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldClient;
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldClientCallbackOnewayRemoteImpl;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class AsynchTestCase {
-
- public static Node nodeA;
- public static Node nodeB;
-
- @BeforeClass
- public static void init() throws Exception {
- System.out.println("Setting up nodes");
- // System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding", RMIBinding.TYPE.toString());
- try {
- // create and start nodes
- Contribution contrib = new Contribution("asynch", "./target/test-classes/rmi/asynchReference");
- nodeA = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
- nodeA.start();
-
- contrib = new Contribution("asynch", "./target/test-classes/rmi/asynchService");
- nodeB = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
- nodeB.start();
-
- } catch (Exception ex) {
- System.err.println("Exception when creating domain " + ex.getMessage());
- ex.printStackTrace(System.err);
- throw ex;
- }
- }
-
- @AfterClass
- public static void destroy() throws Exception {
- nodeA.stop();
- nodeB.stop();
- // System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");
- }
-
- @Test
- public void testHelloWorldAsynch() throws Exception {
- HelloWorldClient helloWorldClientB;
- helloWorldClientB = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientCallbackRemote");
- helloWorldClientB.getGreetings("fred");
- System.out.println("Sleeping ...");
- Thread.sleep(2000);
- System.out.println("... Done");
- Assert.assertEquals("callback fred", HelloWorldClientCallbackOnewayRemoteImpl.result );
-
- }
-
-
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java deleted file mode 100644 index dccd2dace8..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java +++ /dev/null @@ -1,84 +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.binding.sca.rmi;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldClient;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class CallbackTestCase {
-
- public static Node nodeA;
- public static Node nodeB;
-
- @BeforeClass
- public static void init() throws Exception {
- System.out.println("Setting up nodes");
- // System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding", RMIBinding.TYPE.toString());
-
- try {
- // create and start nodes
- Contribution contrib = new Contribution("reference", "./target/test-classes/rmi/callbackReference");
- nodeA = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
- nodeA.start();
-
- contrib = new Contribution("service", "./target/test-classes/rmi/callbackService");
- nodeB = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
- nodeB.start();
-
- } catch (Exception ex) {
- System.err.println("Exception when creating domain " + ex.getMessage());
- ex.printStackTrace(System.err);
- throw ex;
- }
- }
-
- @AfterClass
- public static void destroy() throws Exception {
- nodeA.stop();
- nodeB.stop();
- // System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");
- }
-
- //@Test
- public void testKeepServerRunning() throws Exception {
- System.out.println("press enter to continue");
- System.in.read();
- }
-
- @Test
- public void testHelloWorldCallbackLocal() throws Exception {
- HelloWorldClient helloWorldClientB;
- helloWorldClientB = nodeB.getService(HelloWorldClient.class, "BHelloWorldClientCallbackLocal");
- Assert.assertEquals("Hello callback fred", helloWorldClientB.getGreetings("fred"));
- }
-
- @Test
- public void testHelloWorldCallbackRemote() throws Exception {
- HelloWorldClient helloWorldClientA;
- helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientCallbackRemote");
- Assert.assertEquals("Hello callback fred", helloWorldClientA.getGreetings("fred"));
- }
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java deleted file mode 100644 index 7aac95a8ff..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java +++ /dev/null @@ -1,76 +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.binding.sca.rmi;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldClient;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class PromotionTestCase {
-
-
- public static Node nodeA;
- public static Node nodeB;
-
- @BeforeClass
- public static void init() throws Exception {
- System.out.println("Setting up nodes");
- System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding",
- "{http://tuscany.apache.org/xmlns/sca/1.1}binding.rmi");
-
- try {
- // create and start nodes
- Contribution contrib = new Contribution("reference", "./target/test-classes/rmi/promotionReference");
- nodeA = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
- nodeA.start();
-
- contrib = new Contribution("service", "./target/test-classes/rmi/promotionService");
- nodeB = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
- nodeB.start();
-
- } catch (Exception ex) {
- System.err.println("Exception when creating domain " + ex.getMessage());
- ex.printStackTrace(System.err);
- throw ex;
- }
- }
-
- @AfterClass
- public static void destroy() throws Exception {
- nodeA.stop();
- nodeB.stop();
- System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");
-
- }
-
- @Test
- public void testHelloWorldPromotion() throws Exception {
- HelloWorldClient helloWorldClientA;
- helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientRemotePromotion");
- Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello fred");
-
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java deleted file mode 100644 index f748beb6cb..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java +++ /dev/null @@ -1,116 +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.binding.sca.rmi;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldClient;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.oasisopen.sca.ServiceUnavailableException;
-
-public class SimpleTestCase {
-
- private static NodeFactory factory;
- public static Node nodeA;
- public static Node nodeB;
-
- @BeforeClass
- public static void init() throws Exception {
- System.out.println("Setting up nodes");
- System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding",
- "{http://tuscany.apache.org/xmlns/sca/1.1}binding.rmi");
-
- try {
- factory = NodeFactory.getInstance();
- // create and start nodes
- Contribution contrib = new Contribution("reference", "./target/test-classes/rmi/simpleReference");
- nodeA = factory.createNode("HelloWorld.composite", contrib);
- nodeA.start();
-
- contrib = new Contribution("service", "./target/test-classes/rmi/simpleService");
- nodeB = factory.createNode("HelloWorld.composite", contrib);
- nodeB.start();
-
- } catch (Exception ex) {
- System.err.println("Exception when creating domain " + ex.getMessage());
- ex.printStackTrace(System.err);
- throw ex;
- }
- }
-
- @AfterClass
- public static void destroy() throws Exception {
- nodeA.stop();
- nodeB.stop();
- factory.destroy();
- System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");
- }
-
- @Test
- public void testHelloWorldLocal() throws Exception {
- HelloWorldClient helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientLocal");
- Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello fred");
-
- }
-
- @Test
- public void testHelloWorldRemote() throws Exception {
-
- HelloWorldClient helloWorldClientA;
- helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientRemote");
-
- try {
- helloWorldClientA.getGreetings("fred");
- } catch (ServiceUnavailableException ex){
- Assert.fail();
- }
- }
-
- @Test
- public void testHelloWorldLocalAndRemote() throws Exception {
- HelloWorldClient helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientLocalAndRemote");
- HelloWorldClient helloWorldClientB = nodeB.getService(HelloWorldClient.class, "BHelloWorldClientLocalAndRemote");
- Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello fred");
- Assert.assertEquals(helloWorldClientB.getGreetings("fred"), "Hello fred");
- }
-
- @Test
- public void testHelloWorldMultipleServices() throws Exception {
- HelloWorldClient helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientMultipleServices");
- HelloWorldClient helloWorldClientA2 = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientMultipleServices2");
- HelloWorldClient helloWorldClientB = nodeB.getService(HelloWorldClient.class, "BHelloWorldClientMultipleServices");
- Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello fred");
- Assert.assertEquals(helloWorldClientA2.getGreetings("fred"), "Hello fred");
- Assert.assertEquals(helloWorldClientB.getGreetings("fred"), "Hello fred");
- }
-
- @Test
- public void testHelloWorldMultipleBindings() throws Exception {
- HelloWorldClient helloWorldClientA;
- helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientMultipleBindings");
- Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello fred");
-
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldCallbackRemote.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldCallbackRemote.java deleted file mode 100644 index 7c4cf4b0b7..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldCallbackRemote.java +++ /dev/null @@ -1,30 +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.binding.sca.rmi.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-
-@Remotable
-public interface HelloWorldCallbackRemote {
-
- String getGreetingsCallbackRemote(String s);
-
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldClient.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldClient.java deleted file mode 100644 index 017acee582..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldClient.java +++ /dev/null @@ -1,27 +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.binding.sca.rmi.helloworld;
-
-
-public interface HelloWorldClient {
-
- String getGreetings(String s);
-
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackOnewayRemote.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackOnewayRemote.java deleted file mode 100644 index 86f984e61a..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackOnewayRemote.java +++ /dev/null @@ -1,33 +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.binding.sca.rmi.helloworld;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.OneWay;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-@Callback(HelloWorldCallbackRemote.class)
-public interface HelloWorldServiceCallbackOnewayRemote {
-
- @OneWay
- void getGreetingsRemote(String s);
-
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackRemote.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackRemote.java deleted file mode 100644 index 8e19fd7382..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackRemote.java +++ /dev/null @@ -1,31 +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.binding.sca.rmi.helloworld;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-@Callback(HelloWorldCallbackRemote.class)
-public interface HelloWorldServiceCallbackRemote {
-
- String getGreetingsRemote(String s);
-
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceLocal.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceLocal.java deleted file mode 100644 index b0d623e2e4..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceLocal.java +++ /dev/null @@ -1,27 +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.binding.sca.rmi.helloworld;
-
-
-public interface HelloWorldServiceLocal {
-
- String getGreetingsLocal(String s);
-
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote.java deleted file mode 100644 index ccb44694d9..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote.java +++ /dev/null @@ -1,29 +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.binding.sca.rmi.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface HelloWorldServiceRemote {
-
- String getGreetingsRemote(String s);
-
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote2.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote2.java deleted file mode 100644 index 5c8bb13f43..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote2.java +++ /dev/null @@ -1,29 +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.binding.sca.rmi.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface HelloWorldServiceRemote2 {
-
- String getGreetingsRemote2(String s);
-
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java deleted file mode 100644 index 1ff1792bb7..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java +++ /dev/null @@ -1,43 +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.binding.sca.rmi.helloworld.impl;
-
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldClient;
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceCallbackOnewayRemote;
-import org.oasisopen.sca.annotation.Reference;
-
-public class HelloWorldClientCallbackOnewayRemoteImpl implements HelloWorldClient {
-
- public static String result;
-
- @Reference
- public HelloWorldServiceCallbackOnewayRemote helloWorldService;
-
- public String getGreetings(String s) {
- helloWorldService.getGreetingsRemote(s);
- return null;
- }
-
- public String getGreetingsCallbackRemote(String s) {
- result = "callback " + s;
- return result;
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java deleted file mode 100644 index b17d8e2016..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java +++ /dev/null @@ -1,42 +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.binding.sca.rmi.helloworld.impl;
-
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldClient;
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceCallbackRemote;
-import org.oasisopen.sca.annotation.Reference;
-
-public class HelloWorldClientCallbackRemoteImpl implements HelloWorldClient {
-
- public static String result;
-
- @Reference
- public HelloWorldServiceCallbackRemote helloWorldService;
-
- public String getGreetings(String s) {
- return helloWorldService.getGreetingsRemote(s);
- }
-
- public String getGreetingsCallbackRemote(String s) {
- result = "callback " + s;
- return result;
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientLocalImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientLocalImpl.java deleted file mode 100644 index e230326f5f..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientLocalImpl.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.binding.sca.rmi.helloworld.impl;
-
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldClient;
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceLocal;
-import org.oasisopen.sca.annotation.Reference;
-
-public class HelloWorldClientLocalImpl implements HelloWorldClient {
-
- @Reference
- public HelloWorldServiceLocal helloWorldService;
-
- public String getGreetings(String s) {
- return helloWorldService.getGreetingsLocal(s);
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemote2Impl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemote2Impl.java deleted file mode 100644 index 77df8c2c39..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemote2Impl.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.binding.sca.rmi.helloworld.impl;
-
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldClient;
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceRemote2;
-import org.oasisopen.sca.annotation.Reference;
-
-public class HelloWorldClientRemote2Impl implements HelloWorldClient {
-
- @Reference
- public HelloWorldServiceRemote2 helloWorldService;
-
- public String getGreetings(String s) {
- return helloWorldService.getGreetingsRemote2(s);
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemoteImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemoteImpl.java deleted file mode 100644 index 8effa3ac36..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemoteImpl.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.binding.sca.rmi.helloworld.impl;
-
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldClient;
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceRemote;
-import org.oasisopen.sca.annotation.Reference;
-
-public class HelloWorldClientRemoteImpl implements HelloWorldClient {
-
- @Reference
- public HelloWorldServiceRemote helloWorldService;
-
- public String getGreetings(String s) {
- return helloWorldService.getGreetingsRemote(s);
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java deleted file mode 100644 index 2467ddab88..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.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.binding.sca.rmi.helloworld.impl;
-
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldCallbackRemote;
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceCallbackOnewayRemote;
-import org.oasisopen.sca.annotation.Callback;
-
-public class HelloWorldServiceCallbackOnewayRemoteImpl implements HelloWorldServiceCallbackOnewayRemote {
-
- @Callback
- protected HelloWorldCallbackRemote theCallback;
-
- public void getGreetingsRemote(String s) {
- theCallback.getGreetingsCallbackRemote(s);
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java deleted file mode 100644 index d1b75d0a2c..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java +++ /dev/null @@ -1,39 +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.binding.sca.rmi.helloworld.impl;
-
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldCallbackRemote;
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceCallbackRemote;
-import org.oasisopen.sca.annotation.Callback;
-
-public class HelloWorldServiceCallbackRemoteImpl implements HelloWorldServiceCallbackRemote {
-
- @Callback
- protected HelloWorldCallbackRemote theCallback;
-
- public HelloWorldServiceCallbackRemoteImpl() {
- System.out.println("Constructor");
- }
-
- public String getGreetingsRemote(String s) {
- return "Hello " + theCallback.getGreetingsCallbackRemote(s);
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceLocalImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceLocalImpl.java deleted file mode 100644 index 44e7efc668..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceLocalImpl.java +++ /dev/null @@ -1,30 +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.binding.sca.rmi.helloworld.impl;
-
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceLocal;
-
-public class HelloWorldServiceLocalImpl implements HelloWorldServiceLocal {
-
- public String getGreetingsLocal(String s) {
- return "Hello " + s;
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java deleted file mode 100644 index 88440de023..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java +++ /dev/null @@ -1,41 +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.binding.sca.rmi.helloworld.impl;
-
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceLocal;
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceRemote;
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceRemote2;
-import org.oasisopen.sca.annotation.Service;
-
-@Service({HelloWorldServiceRemote.class, HelloWorldServiceRemote2.class, HelloWorldServiceLocal.class} )
-public class HelloWorldServiceMultipleServicesImpl implements HelloWorldServiceLocal, HelloWorldServiceRemote, HelloWorldServiceRemote2 {
-
- public String getGreetingsLocal(String s) {
- return "Hello " + s;
- }
-
- public String getGreetingsRemote(String s) {
- return "Hello " + s;
- }
-
- public String getGreetingsRemote2(String s) {
- return "Hello " + s;
- }
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceRemoteImpl.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceRemoteImpl.java deleted file mode 100644 index 06dc2c3f79..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceRemoteImpl.java +++ /dev/null @@ -1,30 +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.binding.sca.rmi.helloworld.impl;
-
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceRemote;
-
-public class HelloWorldServiceRemoteImpl implements HelloWorldServiceRemote {
-
- public String getGreetingsRemote(String s) {
- return "Hello " + s;
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/BindingSCATestCase.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/BindingSCATestCase.java deleted file mode 100644 index 05a8c3455c..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/BindingSCATestCase.java +++ /dev/null @@ -1,170 +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.itest.bindingsca; - -import java.io.File; - -import org.apache.tuscany.sca.assembly.SCABinding; -import org.apache.tuscany.sca.binding.ws.WebServiceBinding; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.apache.tuscany.sca.node.configuration.NodeConfiguration; -import org.junit.Assert; -import org.junit.Test; -import org.oasisopen.sca.ServiceRuntimeException; - -/** - * Test binding.sca in the same classloader - */ -public class BindingSCATestCase { - static final String DOMAIN_URI = "my-domain"; - private static final String REGISTRY_URI = "tribes://228.0.0.100:50000"; - private static final String PKG = "org/apache/tuscany/sca/itest/bindingsca/"; - private static final String CLIENT = "Client.composite"; - private static final String SERVICE = "Service.composite"; - private static final String ROOT = new File("target/classes/" + PKG).toURI().toString(); - - /** - * One NodeFactory and two nodes - */ - @Test - public void testOneFactoryTwoNodes() { - NodeFactory factory1 = NodeFactory.getInstance(); - Node node1 = createClientNode(factory1); - Node node2 = createServiceNode(factory1); - node1.start(); - node2.start(); - try { - runClient(node1); - } finally { - node2.stop(); - node1.stop(); - factory1.destroy(); - } - } - - /** - * Create the service node - * @param factory - * @return - */ - static Node createServiceNode(NodeFactory factory) { - NodeConfiguration config2 = - factory.createNodeConfiguration().setDomainURI(DOMAIN_URI).setURI("node2").addContribution("c2", ROOT) - .addDeploymentComposite("c2", SERVICE).setDomainRegistryURI(REGISTRY_URI) - .addBinding(WebServiceBinding.TYPE, "http://localhost:8085/").addBinding(SCABinding.TYPE, - "http://localhost:8085/"); - - Node node2 = factory.createNode(config2); - return node2; - } - - /** - * Create the client node - * @param factory - * @return - */ - static Node createClientNode(NodeFactory factory) { - NodeConfiguration config1 = - factory.createNodeConfiguration().setDomainURI(DOMAIN_URI).setURI("node1").addContribution("c1", ROOT) - .addDeploymentComposite("c1", CLIENT).setDomainRegistryURI(REGISTRY_URI) - .addBinding(WebServiceBinding.TYPE, "http://localhost:8085/").addBinding(SCABinding.TYPE, - "http://localhost:8085/"); - Node node1 = factory.createNode(config1); - return node1; - } - - /** - * Two node factories and two nodes - */ - @Test - public void testTwoFactoriesTwoNodes() throws Exception { - NodeFactory factory1 = NodeFactory.newInstance(); - Node node1 = createClientNode(factory1); - NodeFactory factory2 = NodeFactory.newInstance(); - Node node2 = createServiceNode(factory2); - node1.start(); - node2.start(); - Thread.sleep(1000); - try { - // This call doesn't require the Local service, it should be successful - createCustomer(node1); - try { - runClient(node1); - // We cannot make local call to remote endpoints - Assert.fail("ServiceRuntimeException should have been thrown."); - } catch (ServiceRuntimeException e) { - // ignore - } - } finally { - node2.stop(); - node1.stop(); - factory2.destroy(); - factory1.destroy(); - } - } - - /** - * Run the client - * @param node - */ - static void runClient(Node node) { - Client client = node.getService(Client.class, "ClientComponent/Client"); - runClient(client); - } - - static void runClient(Client client) { - String id = client.create("Ray"); - Assert.assertEquals("Ray", client.getName(id)); - } - - static void runClientNotFound(Client client) { - String id = "not-there"; - Assert.assertNull(client.getName(id)); - } - - static String createCustomer(Node node) { - Client client = node.getService(Client.class, "ClientComponent/Client"); - String id = client.create("John"); - Assert.assertNotNull(id); - return id; - } - - /** - * One node factory and one node for both composites - */ - @Test - public void testOneFactoryOneNode() { - NodeFactory factory = NodeFactory.getInstance(); - NodeConfiguration config1 = - factory.createNodeConfiguration().setDomainURI(DOMAIN_URI).setURI("node1").addContribution("c1", ROOT) - .addDeploymentComposite("c1", CLIENT).addDeploymentComposite("c1", SERVICE); - - Node node1 = factory.createNode(config1); - node1.start(); - try { - runClient(node1); - } finally { - node1.stop(); - factory.destroy(); - } - } - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedCustomerTestCase.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedCustomerTestCase.java deleted file mode 100644 index 7255697d4b..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedCustomerTestCase.java +++ /dev/null @@ -1,62 +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.itest.bindingsca; - -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * Running the client node and service node with two different classloaders that share the Customer class - */ -public class ClientNodeSharedCustomerTestCase { - private static Node clientNode; - private static TestCaseRunner runner; - private static NodeFactory factory; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - runner = new TestCaseRunner(ServiceNode.class, Remote.class.getName(), RemoteServiceImpl.class.getName()); - runner.beforeClass(); - factory = NodeFactory.getInstance(); - clientNode = BindingSCATestCase.createClientNode(factory).start(); - Thread.sleep(1000); - } - - @Test - public void testClient() throws Exception { - BindingSCATestCase.runClient(clientNode); - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - if (clientNode != null) { - clientNode.stop(); - } - if (runner != null) { - runner.afterClass(); - } - if (factory != null) { - factory.destroy(); - } - } -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedLocalTestCase.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedLocalTestCase.java deleted file mode 100644 index 51fafae32c..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedLocalTestCase.java +++ /dev/null @@ -1,62 +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.itest.bindingsca; - -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * Running the client node and service node with two different classloaders that share the Local class - * (but not Customer) - */ -public class ClientNodeSharedLocalTestCase { - private static Node clientNode; - private static TestCaseRunner runner; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - runner = - new TestCaseRunner(ServiceNode.class, Remote.class.getName(), RemoteServiceImpl.class.getName(), - Customer.class.getName()); - runner.beforeClass(); - NodeFactory factory = NodeFactory.getInstance(); - clientNode = BindingSCATestCase.createClientNode(factory).start(); - Thread.sleep(1000); - } - - @Test - public void testClient() throws Exception { - BindingSCATestCase.runClient(clientNode); - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - if (clientNode != null) { - clientNode.stop(); - } - if (runner != null) { - runner.afterClass(); - } - NodeFactory.getInstance().destroy(); - } -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedCustomerTestCase.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedCustomerTestCase.java deleted file mode 100644 index b8ff0c58ba..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedCustomerTestCase.java +++ /dev/null @@ -1,54 +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.itest.bindingsca; - -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * Running the client api and service node with two different classloaders that share the Customer class - */ -public class ClientSharedCustomerTestCase { - private static Client client; - private static TestCaseRunner runner; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - runner = new TestCaseRunner(ServiceNode.class, Remote.class.getName(), RemoteServiceImpl.class.getName()); - runner.beforeClass(); - client = new SCAClientImpl(BindingSCATestCase.DOMAIN_URI); - Thread.sleep(1000); - } - - @Test - public void testClient() throws Exception { - BindingSCATestCase.runClient(client); - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - if (runner != null) { - runner.afterClass(); - } - NodeFactory.getInstance().destroy(); - } -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedLocalTestCase.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedLocalTestCase.java deleted file mode 100644 index 633e1a767c..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedLocalTestCase.java +++ /dev/null @@ -1,63 +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.itest.bindingsca; - -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * Running the client api and service node with two different classloaders that share the Local class - * (but not Customer) - */ -public class ClientSharedLocalTestCase { - private static Client client; - private static TestCaseRunner runner; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - runner = - new TestCaseRunner(ServiceNode.class, Remote.class.getName(), RemoteServiceImpl.class.getName(), - Customer.class.getName(), CustomerNotFoundException.class.getName()); - runner.beforeClass(); - client = new SCAClientImpl(BindingSCATestCase.DOMAIN_URI); - Thread.sleep(1000); - } - - @Test - public void testClient() throws Exception { - BindingSCATestCase.runClient(client); - } - - @Test - public void testClientNotFound() throws Exception { - BindingSCATestCase.runClientNotFound(client); - } - - - @AfterClass - public static void tearDownAfterClass() throws Exception { - if (runner != null) { - runner.afterClass(); - } - NodeFactory.getInstance().destroy(); - } -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ServiceNode.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ServiceNode.java deleted file mode 100644 index 1cba2b57c2..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ServiceNode.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.itest.bindingsca; - -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; - -/** - * This shows how to test the Calculator service component. - */ -public class ServiceNode { - private static Node serviceNode; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - /* System.setProperty("org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint.enabled", - "false"); - */ - NodeFactory factory = NodeFactory.getInstance(); - serviceNode = BindingSCATestCase.createServiceNode(factory).start(); - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - if (serviceNode != null) { - serviceNode.stop(); - } - } -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/TestCaseRunner.java b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/TestCaseRunner.java deleted file mode 100644 index c0960ffe95..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/java/org/apache/tuscany/sca/itest/bindingsca/TestCaseRunner.java +++ /dev/null @@ -1,329 +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.itest.bindingsca; - -import java.lang.annotation.Annotation; -import java.lang.reflect.Constructor; -import java.lang.reflect.Method; -import java.net.URL; -import java.net.URLClassLoader; -import java.security.AccessController; -import java.security.PrivilegedAction; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; - -/** - * A helper class that can be used to run an SCA JUnit test case. The test case will run in an isolated class loader. - * - * @version $Rev$ $Date$ - */ -public class TestCaseRunner { - - private ClassLoader classLoader; - private Class<?> testSuiteClass; - private Object testSuite; - private Class<?> testResultClass; - private Class<?> testCaseClass; - private Object testCase; - - private Class<?> beforeAnnotation; - private Class<?> beforeClassAnnotation; - private Class<?> afterAnnotation; - private Class<?> afterClassAnnotation; - private Class<?> junit4AdapterClass; - private Class<?> junit3TestCaseClass; - - /** - * Constructs a new TestCase runner. - * - * @param testClass - */ - public TestCaseRunner(Class<?> testClass, String... isolatedClasses) { - try { - ClassLoader tccl = setupClassLoader(testClass, isolatedClasses); - - try { - // Thread.currentThread().setContextClassLoader(classLoader); - // Allow privileged access to set class loader. Requires RuntimePermission - // setContextClassLoader in security policy. - final ClassLoader finalClassLoader = classLoader; - AccessController.doPrivileged(new PrivilegedAction<Object>() { - public Object run() { - Thread.currentThread().setContextClassLoader(finalClassLoader); - return null; - } - }); - - testCaseClass = Class.forName(testClass.getName(), true, classLoader); - testCase = testCaseClass.newInstance(); - ClassLoader testClassLoader = testCaseClass.getClassLoader(); - - junit3TestCaseClass = Class.forName("junit.framework.TestCase", true, testClassLoader); - - testSuiteClass = Class.forName("junit.framework.TestSuite", true, testClassLoader); - Constructor<?> testSuiteConstructor = testSuiteClass.getConstructor(Class.class); - testSuite = testSuiteConstructor.newInstance(testCaseClass); - - testResultClass = Class.forName("junit.framework.TestResult", true, testClassLoader); - - try { - beforeAnnotation = Class.forName("org.junit.Before", true, testClassLoader); - afterAnnotation = Class.forName("org.junit.After", true, testClassLoader); - beforeClassAnnotation = Class.forName("org.junit.BeforeClass", true, testClassLoader); - afterClassAnnotation = Class.forName("org.junit.AfterClass", true, testClassLoader); - junit4AdapterClass = Class.forName("junit.framework.JUnit4TestAdapter", true, testClassLoader); - } catch (Exception e) { - // Unexpected - throw new AssertionError(e); - } - } catch (Throwable e) { - e.printStackTrace(); - } finally { - // Thread.currentThread().setContextClassLoader(tccl); - // Allow privileged access to set class loader. Requires RuntimePermission - // setContextClassLoader in security policy. - final ClassLoader finaltccl = tccl; - AccessController.doPrivileged(new PrivilegedAction<Object>() { - public Object run() { - Thread.currentThread().setContextClassLoader(finaltccl); - return null; - } - }); - } - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - private ClassLoader setupClassLoader(Class<?> testClass, String... isolatedClasses) { - ClassLoader tccl = Thread.currentThread().getContextClassLoader(); - classLoader = testClass.getClassLoader(); - if (classLoader instanceof URLClassLoader) { - URL[] urls = ((URLClassLoader)classLoader).getURLs(); - classLoader = new ClassLoaderImpl(urls, classLoader, isolatedClasses); - } else if (classLoader == tccl || classLoader.getParent() == tccl) { - classLoader = new URLClassLoader(new URL[0], classLoader); - } else { - classLoader = tccl; - } - return tccl; - } - - /** - * Run the test case - */ - public void run() { - ClassLoader tccl = Thread.currentThread().getContextClassLoader(); - try { - // Thread.currentThread().setContextClassLoader(classLoader); - // Allow privileged access to set class loader. Requires RuntimePermission - // setContextClassLoader in security policy. - final ClassLoader finalClassLoader = classLoader; - AccessController.doPrivileged(new PrivilegedAction<Object>() { - public Object run() { - Thread.currentThread().setContextClassLoader(finalClassLoader); - return null; - } - }); - - if (junit3TestCaseClass.isAssignableFrom(testCaseClass)) { - Object testResult = testResultClass.newInstance(); - Method runMethod = testSuiteClass.getMethod("run", testResultClass); - runMethod.invoke(testSuite, testResult); - } else { - Object junit4Adapter = junit4AdapterClass.getConstructor(Class.class).newInstance(testCaseClass); - Object testResult = testResultClass.newInstance(); - Method runMethod = junit4AdapterClass.getMethod("run", testResultClass); - runMethod.invoke(junit4Adapter, testResult); - } - } catch (Exception e) { - throw new RuntimeException(e); - } finally { - // Thread.currentThread().setContextClassLoader(tccl); - // Allow privileged access to set class loader. Requires RuntimePermission - // setContextClassLoader in security policy. - final ClassLoader finaltccl = tccl; - AccessController.doPrivileged(new PrivilegedAction<Object>() { - public Object run() { - Thread.currentThread().setContextClassLoader(finaltccl); - return null; - } - }); - } - } - - /** - * Invoke the setUp method - */ - public void setUp() { - execute("setUp"); - } - - /** - * Invoke the before methods - */ - public void before() { - execute(beforeAnnotation); - } - - /** - * Invoke the beforeClass methods - */ - public void beforeClass() { - execute(beforeClassAnnotation); - } - - /** - * Invoke the tearDown method - */ - public void tearDown() { - execute("tearDown"); - } - - /** - * Invoke the after methods - */ - public void after() { - execute(afterAnnotation); - } - - /** - * Invoke the afterClass methods - */ - public void afterClass() { - execute(afterClassAnnotation); - } - - /** - * Invoke the specified test method. - */ - public void run(String methodName) { - execute(methodName); - } - - /** - * Invoke the methods annotated with the specified annotation. - */ - private void execute(Class<?> annotationClass) { - if (annotationClass == null) { - throw new RuntimeException(new NoSuchMethodException()); - } - ClassLoader tccl = Thread.currentThread().getContextClassLoader(); - try { - // Thread.currentThread().setContextClassLoader(classLoader); - // Allow privileged access to set class loader. Requires RuntimePermission - // setContextClassLoader in security policy. - final ClassLoader finalClassLoader = classLoader; - AccessController.doPrivileged(new PrivilegedAction<Object>() { - public Object run() { - Thread.currentThread().setContextClassLoader(finalClassLoader); - return null; - } - }); - - for (Method method : testCaseClass.getDeclaredMethods()) { - for (Annotation annotation : method.getAnnotations()) { - if (annotation.annotationType() == annotationClass) { - method.invoke(testCase); - } - } - } - } catch (Exception e) { - throw new RuntimeException(e); - } finally { - // Thread.currentThread().setContextClassLoader(tccl); - // Allow privileged access to set class loader. Requires RuntimePermission - // setContextClassLoader in security policy. - final ClassLoader finaltccl = tccl; - AccessController.doPrivileged(new PrivilegedAction<Object>() { - public Object run() { - Thread.currentThread().setContextClassLoader(finaltccl); - return null; - } - }); - } - } - - /** - * Invoke the specified method - */ - private void execute(String methodName) { - ClassLoader tccl = Thread.currentThread().getContextClassLoader(); - try { - // Thread.currentThread().setContextClassLoader(classLoader); - // Allow privileged access to set class loader. Requires RuntimePermission - // setContextClassLoader in security policy. - final ClassLoader finalClassLoader = classLoader; - AccessController.doPrivileged(new PrivilegedAction<Object>() { - public Object run() { - Thread.currentThread().setContextClassLoader(finalClassLoader); - return null; - } - }); - Method setUpMethod = testCaseClass.getDeclaredMethod(methodName); - setUpMethod.setAccessible(true); - setUpMethod.invoke(testCase); - } catch (Exception e) { - throw new RuntimeException(e); - } finally { - // Thread.currentThread().setContextClassLoader(tccl); - // Allow privileged access to set class loader. Requires RuntimePermission - // setContextClassLoader in security policy. - final ClassLoader finaltccl = tccl; - AccessController.doPrivileged(new PrivilegedAction<Object>() { - public Object run() { - Thread.currentThread().setContextClassLoader(finaltccl); - return null; - } - }); - } - } - - public static class ClassLoaderImpl extends URLClassLoader { - private Set<String> isolatedClasses = new HashSet<String>(); - - /** - * @param urls - * @param parent - */ - public ClassLoaderImpl(URL[] urls, ClassLoader parent, String... sharedClasses) { - super(urls, parent); - this.isolatedClasses.addAll(Arrays.asList(sharedClasses)); - } - - @Override - protected synchronized Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException { - if (!isolatedClasses.contains(name)) { - return super.loadClass(name, resolve); - } else { - Class<?> cls = findLoadedClass(name); - if (cls == null) { - cls = findClass(name); - } - if (resolve) { - resolveClass(cls); - } - return cls; - } - } - - } - -} diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchReference/HelloWorld.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchReference/HelloWorld.composite deleted file mode 100644 index 8c825ca805..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchReference/HelloWorld.composite +++ /dev/null @@ -1,36 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="HelloWorld">
-
- <!-- callback remote wire -->
- <component name="AHelloWorldClientCallbackRemote">
- <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldClientCallbackOnewayRemoteImpl" />
- <reference name="helloWorldService" target="BHelloWorldServiceCallbackRemote">
- <binding.sca/>
- <callback>
- <binding.sca uri="http://localhost:8084/AHelloWorldClientCallbackRemote"/>
- </callback>
- </reference>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchReference/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchReference/META-INF/sca-contribution.xml deleted file mode 100644 index ab75f7d225..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchReference/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:sample="http://sample">
- <deployable composite="sample:HelloWorld"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchService/HelloWorld.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchService/HelloWorld.composite deleted file mode 100644 index 79b1a5d794..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchService/HelloWorld.composite +++ /dev/null @@ -1,38 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="HelloWorld">
-
-
- <!-- callback remote wire -->
- <component name="BHelloWorldServiceCallbackRemote">
- <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldServiceCallbackOnewayRemoteImpl" />
- <service name="HelloWorldServiceCallbackOnewayRemote">
- <binding.sca uri="http://localhost:8085/BHelloWorldServiceCallbackRemote"/>
- <callback>
- <binding.sca/>
- </callback>
- </service>
- </component>
-
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchService/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchService/META-INF/sca-contribution.xml deleted file mode 100644 index ab75f7d225..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/asynchService/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:sample="http://sample">
- <deployable composite="sample:HelloWorld"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackReference/HelloWorld.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackReference/HelloWorld.composite deleted file mode 100644 index e8924d2728..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackReference/HelloWorld.composite +++ /dev/null @@ -1,36 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="HelloWorld">
-
- <!-- callback remote wire -->
- <component name="AHelloWorldClientCallbackRemote">
- <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldClientCallbackRemoteImpl" />
- <reference name="helloWorldService" target="BHelloWorldServiceCallbackRemote">
- <binding.sca/>
- <callback>
- <binding.sca uri="http://localhost:8084/AHelloWorldClientCallbackRemote"/>
- </callback>
- </reference>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackReference/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackReference/META-INF/sca-contribution.xml deleted file mode 100644 index ab75f7d225..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackReference/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:sample="http://sample">
- <deployable composite="sample:HelloWorld"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackService/HelloWorld.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackService/HelloWorld.composite deleted file mode 100644 index 4edc8df5cd..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackService/HelloWorld.composite +++ /dev/null @@ -1,43 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="HelloWorld">
-
-
- <!-- callback remote wire -->
- <component name="BHelloWorldServiceCallbackRemote">
- <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldServiceCallbackRemoteImpl" />
- <service name="HelloWorldServiceCallbackRemote">
- <binding.sca uri="http://localhost:8085/BHelloWorldServiceCallbackRemote"/>
- <callback>
- <binding.sca/>
- </callback>
- </service>
- </component>
-
- <!-- callback local wire -->
- <component name="BHelloWorldClientCallbackLocal">
- <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldClientCallbackRemoteImpl" />
- <reference name="helloWorldService" target="BHelloWorldServiceCallbackRemote" />
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackService/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackService/META-INF/sca-contribution.xml deleted file mode 100644 index ab75f7d225..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/callbackService/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:sample="http://sample">
- <deployable composite="sample:HelloWorld"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionReference/HelloWorld.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionReference/HelloWorld.composite deleted file mode 100644 index 823cab4f56..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionReference/HelloWorld.composite +++ /dev/null @@ -1,33 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="HelloWorld">
-
-
- <!-- composite hierarchy -->
- <component name="AHelloWorldClientRemotePromotion">
- <implementation.composite name="sample:HelloWorldComponent" />
- <reference name="AHelloWorldClientRemoteReference" target="BHelloWorldServiceRemotePromotion"/>
- </component>
-
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionReference/HelloWorldComponent.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionReference/HelloWorldComponent.composite deleted file mode 100644 index 54fb359ba0..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionReference/HelloWorldComponent.composite +++ /dev/null @@ -1,37 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="HelloWorldComponent">
-
- <service name="AHelloWorldClientRemoteService" promote="AHelloWorldClientRemoteComponent">
- <interface.java interface="org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldClient"/>
- </service>
-
- <reference name="AHelloWorldClientRemoteReference" promote="AHelloWorldClientRemoteComponent/helloWorldService" multiplicity="1..1">
- <interface.java interface="org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceRemote"/>
- </reference>
-
- <component name="AHelloWorldClientRemoteComponent">
- <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldClientRemoteImpl"/>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionReference/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionReference/META-INF/sca-contribution.xml deleted file mode 100644 index ab75f7d225..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionReference/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:sample="http://sample">
- <deployable composite="sample:HelloWorld"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionService/HelloWorld.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionService/HelloWorld.composite deleted file mode 100644 index 454e9c55cf..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionService/HelloWorld.composite +++ /dev/null @@ -1,35 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="HelloWorld">
-
-
- <!-- composite hierarchy -->
- <component name="BHelloWorldServiceRemotePromotion">
- <implementation.composite name="sample:HelloWorldComponent" />
- <service name="BHelloWorldServiceRemoteService">
- <binding.sca uri="http://localhost:8085/BHelloWorldServiceRemotePromotion"/>
- </service>
- </component>
-
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionService/HelloWorldComponent.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionService/HelloWorldComponent.composite deleted file mode 100644 index a313fb8f68..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionService/HelloWorldComponent.composite +++ /dev/null @@ -1,37 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="HelloWorldComponent">
-
- <service name="BHelloWorldServiceRemoteService"
- promote="BHelloWorldServiceRemoteComponent/HelloWorldServiceRemote"/>
-
- <component name="BHelloWorldServiceRemoteComponent">
- <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldServiceRemoteImpl"/>
- </component>
-
- <component name="BHelloWorldServiceLocalAndRemoteNested">
- <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldServiceRemoteImpl" />
- </component>
-
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionService/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionService/META-INF/sca-contribution.xml deleted file mode 100644 index ab75f7d225..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/promotionService/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:sample="http://sample">
- <deployable composite="sample:HelloWorld"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleReference/HelloWorld.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleReference/HelloWorld.composite deleted file mode 100644 index 4151749523..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleReference/HelloWorld.composite +++ /dev/null @@ -1,67 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="HelloWorld">
-
-
- <!-- local only wire -->
- <component name="AHelloWorldClientLocal">
- <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldClientLocalImpl"/>
- <reference name="helloWorldService" target="AHelloWorldServiceLocal" />
- </component>
-
- <component name="AHelloWorldServiceLocal">
- <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldServiceLocalImpl" />
- </component>
-
- <!-- unresolved remote wire -->
- <component name="AHelloWorldClientRemote">
- <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldClientRemoteImpl" />
- <reference name="helloWorldService" target="BHelloWorldServiceRemote" />
- </component>
-
- <!-- local and remote wires -->
- <component name="AHelloWorldClientLocalAndRemote">
- <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldClientRemoteImpl" />
- <reference name="helloWorldService" target="BHelloWorldServiceLocalAndRemote"/>
- </component>
-
- <!-- multiple services -->
- <component name="AHelloWorldClientMultipleServices">
- <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldClientRemoteImpl" />
- <reference name="helloWorldService" target="BHelloWorldServiceMultipleServices/HelloWorldServiceRemote"/>
- </component>
-
- <component name="AHelloWorldClientMultipleServices2">
- <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldClientRemote2Impl" />
- <reference name="helloWorldService" target="BHelloWorldServiceMultipleServices/HelloWorldServiceRemote2"/>
- </component>
-
- <!-- multiple bindings -->
- <component name="AHelloWorldClientMultipleBindings">
- <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldClientRemoteImpl" />
- <reference name="helloWorldService" target="BHelloWorldMultipleBindings/HelloWorldServiceRemote/scaBinding">
- <interface.java interface="org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceRemote" />
- </reference>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleReference/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleReference/META-INF/sca-contribution.xml deleted file mode 100644 index ab75f7d225..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleReference/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:sample="http://sample">
- <deployable composite="sample:HelloWorld"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleService/HelloWorld.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleService/HelloWorld.composite deleted file mode 100644 index 37af7625ff..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleService/HelloWorld.composite +++ /dev/null @@ -1,85 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="HelloWorld">
-
-
- <!-- local only wire -->
-
-
- <!-- unresolved remote wire -->
- <component name="BHelloWorldServiceRemote">
- <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldServiceRemoteImpl" />
- <service name="HelloWorldServiceRemote">
- <binding.sca uri="http://localhost:8085/BHelloWorldServiceRemote"/>
- </service>
- </component>
-
- <!-- local and remote wires -->
- <component name="BHelloWorldServiceLocalAndRemote">
- <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldServiceRemoteImpl" />
- <service name="HelloWorldServiceRemote">
- <binding.sca uri="http://localhost:8085/BHelloWorldServiceLocalAndRemote"/>
- </service>
- </component>
-
- <component name="BHelloWorldClientLocalAndRemote">
- <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldClientRemoteImpl" />
- <reference name="helloWorldService" target="BHelloWorldServiceLocalAndRemote" />
- </component>
-
- <!-- multiple services -->
- <component name="BHelloWorldServiceMultipleServices">
- <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldServiceMultipleServicesImpl" />
- <service name="HelloWorldServiceLocal">
- </service>
- <service name="HelloWorldServiceRemote">
- <binding.sca uri="http://localhost:8085/BHelloWorldServiceMultipleServices/HelloWorldServiceRemote"/>
- </service>
- <service name="HelloWorldServiceRemote2">
- <binding.sca uri="http://localhost:8085/BHelloWorldServiceMultipleServices/HelloWorldServiceRemote2"/>
- </service>
- </component>
-
- <component name="BHelloWorldClientMultipleServices">
- <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldClientLocalImpl" />
- <reference name="helloWorldService" target="BHelloWorldServiceMultipleServices/HelloWorldServiceLocal" />
- </component>
-
- <!-- multiple bindings -->
- <component name="BHelloWorldMultipleBindings">
- <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldServiceRemoteImpl" />
- <service name="HelloWorldServiceRemote">
- <interface.java interface="org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceRemote" />
- <!-- tuscany:binding.rmi name="rmiBinding" uri="http://localhost:8085/BHelloWorldMultipleBindings/HelloWorldServiceRemote-wsbinding"/ -->
- <binding.sca name="scaBinding" uri="http://localhost:8085/BHelloWorldMultipleBindings/HelloWorldServiceRemote-scabinding"/>
- </service>
- </component>
-
-
- <!-- Dynamic interfaces -->
- <!--component name="BHelloWorldServiceScript">
- <implementation.script script="calculator/AddServiceImpl.js"/>
- </component-->
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleService/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleService/META-INF/sca-contribution.xml deleted file mode 100644 index ab75f7d225..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/rmi/simpleService/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:sample="http://sample">
- <deployable composite="sample:HelloWorld"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchReference/HelloWorld.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchReference/HelloWorld.composite deleted file mode 100644 index e797a0aa9c..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchReference/HelloWorld.composite +++ /dev/null @@ -1,36 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://sample" - xmlns:sample="http://sample" - name="HelloWorld"> - - <!-- callback remote wire --> - <component name="AHelloWorldClientCallbackRemote"> - <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientCallbackOnewayRemoteImpl" /> - <reference name="helloWorldService" target="BHelloWorldServiceCallbackRemote"> - <binding.sca/> - <callback> - <binding.sca uri="http://localhost:8084/AHelloWorldClientCallbackRemote"/> - </callback> - </reference> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchReference/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchReference/META-INF/sca-contribution.xml deleted file mode 100644 index e6ccae5c73..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchReference/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sample="http://sample"> - <deployable composite="sample:HelloWorld"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchService/HelloWorld.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchService/HelloWorld.composite deleted file mode 100644 index 079ee49380..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchService/HelloWorld.composite +++ /dev/null @@ -1,38 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://sample" - xmlns:sample="http://sample" - name="HelloWorld"> - - - <!-- callback remote wire --> - <component name="BHelloWorldServiceCallbackRemote"> - <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceCallbackOnewayRemoteImpl" /> - <service name="HelloWorldServiceCallbackOnewayRemote"> - <binding.sca uri="http://localhost:8085/BHelloWorldServiceCallbackRemote"/> - <callback> - <binding.sca/> - </callback> - </service> - </component> - - -</composite> diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchService/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchService/META-INF/sca-contribution.xml deleted file mode 100644 index e6ccae5c73..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/asynchService/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sample="http://sample"> - <deployable composite="sample:HelloWorld"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackReference/HelloWorld.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackReference/HelloWorld.composite deleted file mode 100644 index 1d5630f3d0..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackReference/HelloWorld.composite +++ /dev/null @@ -1,36 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://sample" - xmlns:sample="http://sample" - name="HelloWorld"> - - <!-- callback remote wire --> - <component name="AHelloWorldClientCallbackRemote"> - <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientCallbackRemoteImpl" /> - <reference name="helloWorldService" target="BHelloWorldServiceCallbackRemote"> - <binding.sca/> - <callback> - <binding.sca uri="http://localhost:8084/AHelloWorldClientCallbackRemote"/> - </callback> - </reference> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackReference/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackReference/META-INF/sca-contribution.xml deleted file mode 100644 index e6ccae5c73..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackReference/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sample="http://sample"> - <deployable composite="sample:HelloWorld"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackService/HelloWorld.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackService/HelloWorld.composite deleted file mode 100644 index ded3766d49..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackService/HelloWorld.composite +++ /dev/null @@ -1,43 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://sample" - xmlns:sample="http://sample" - name="HelloWorld"> - - - <!-- callback remote wire --> - <component name="BHelloWorldServiceCallbackRemote"> - <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceCallbackRemoteImpl" /> - <service name="HelloWorldServiceCallbackRemote"> - <binding.sca uri="http://localhost:8085/BHelloWorldServiceCallbackRemote"/> - <callback> - <binding.sca/> - </callback> - </service> - </component> - - <!-- callback local wire --> - <component name="BHelloWorldClientCallbackLocal"> - <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientCallbackRemoteImpl" /> - <reference name="helloWorldService" target="BHelloWorldServiceCallbackRemote" /> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackService/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackService/META-INF/sca-contribution.xml deleted file mode 100644 index e6ccae5c73..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/callbackService/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sample="http://sample"> - <deployable composite="sample:HelloWorld"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionReference/HelloWorld.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionReference/HelloWorld.composite deleted file mode 100644 index 4513f21acf..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionReference/HelloWorld.composite +++ /dev/null @@ -1,33 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://sample" - xmlns:sample="http://sample" - name="HelloWorld"> - - - <!-- composite hierarchy --> - <component name="AHelloWorldClientRemotePromotion"> - <implementation.composite name="sample:HelloWorldComponent" /> - <reference name="AHelloWorldClientRemoteReference" target="BHelloWorldServiceRemotePromotion"/> - </component> - - -</composite> diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionReference/HelloWorldComponent.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionReference/HelloWorldComponent.composite deleted file mode 100644 index 22c20ff94a..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionReference/HelloWorldComponent.composite +++ /dev/null @@ -1,37 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://sample" - xmlns:sample="http://sample" - name="HelloWorldComponent"> - - <service name="AHelloWorldClientRemoteService" promote="AHelloWorldClientRemoteComponent"> - <interface.java interface="org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient"/> - </service> - - <reference name="AHelloWorldClientRemoteReference" promote="AHelloWorldClientRemoteComponent/helloWorldService" multiplicity="1..1"> - <interface.java interface="org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote"/> - </reference> - - <component name="AHelloWorldClientRemoteComponent"> - <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientRemoteImpl"/> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionReference/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionReference/META-INF/sca-contribution.xml deleted file mode 100644 index e6ccae5c73..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionReference/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sample="http://sample"> - <deployable composite="sample:HelloWorld"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionService/HelloWorld.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionService/HelloWorld.composite deleted file mode 100644 index e6a7d776c9..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionService/HelloWorld.composite +++ /dev/null @@ -1,35 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://sample" - xmlns:sample="http://sample" - name="HelloWorld"> - - - <!-- composite hierarchy --> - <component name="BHelloWorldServiceRemotePromotion"> - <implementation.composite name="sample:HelloWorldComponent" /> - <service name="BHelloWorldServiceRemoteService"> - <binding.sca uri="http://localhost:8085/BHelloWorldServiceRemotePromotion"/> - </service> - </component> - - -</composite> diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionService/HelloWorldComponent.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionService/HelloWorldComponent.composite deleted file mode 100644 index 0393280625..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionService/HelloWorldComponent.composite +++ /dev/null @@ -1,37 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://sample" - xmlns:sample="http://sample" - name="HelloWorldComponent"> - - <service name="BHelloWorldServiceRemoteService" - promote="BHelloWorldServiceRemoteComponent/HelloWorldServiceRemote"/> - - <component name="BHelloWorldServiceRemoteComponent"> - <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceRemoteImpl"/> - </component> - - <component name="BHelloWorldServiceLocalAndRemoteNested"> - <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceRemoteImpl" /> - </component> - - -</composite> diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionService/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionService/META-INF/sca-contribution.xml deleted file mode 100644 index e6ccae5c73..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/promotionService/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sample="http://sample"> - <deployable composite="sample:HelloWorld"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleReference/HelloWorld.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleReference/HelloWorld.composite deleted file mode 100644 index f4d2789ff7..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleReference/HelloWorld.composite +++ /dev/null @@ -1,67 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://sample" - xmlns:sample="http://sample" - name="HelloWorld"> - - - <!-- local only wire --> - <component name="AHelloWorldClientLocal"> - <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientLocalImpl"/> - <reference name="helloWorldService" target="AHelloWorldServiceLocal" /> - </component> - - <component name="AHelloWorldServiceLocal"> - <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceLocalImpl" /> - </component> - - <!-- unresolved remote wire --> - <component name="AHelloWorldClientRemote"> - <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientRemoteImpl" /> - <reference name="helloWorldService" target="BHelloWorldServiceRemote" /> - </component> - - <!-- local and remote wires --> - <component name="AHelloWorldClientLocalAndRemote"> - <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientRemoteImpl" /> - <reference name="helloWorldService" target="BHelloWorldServiceLocalAndRemote"/> - </component> - - <!-- multiple services --> - <component name="AHelloWorldClientMultipleServices"> - <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientRemoteImpl" /> - <reference name="helloWorldService" target="BHelloWorldServiceMultipleServices/HelloWorldServiceRemote"/> - </component> - - <component name="AHelloWorldClientMultipleServices2"> - <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientRemote2Impl" /> - <reference name="helloWorldService" target="BHelloWorldServiceMultipleServices/HelloWorldServiceRemote2"/> - </component> - - <!-- multiple bindings --> - <component name="AHelloWorldClientMultipleBindings"> - <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientRemoteImpl" /> - <reference name="helloWorldService" target="BHelloWorldMultipleBindings/HelloWorldServiceRemote/scaBinding"> - <interface.java interface="org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote" /> - </reference> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleReference/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleReference/META-INF/sca-contribution.xml deleted file mode 100644 index e6ccae5c73..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleReference/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sample="http://sample"> - <deployable composite="sample:HelloWorld"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleService/HelloWorld.composite b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleService/HelloWorld.composite deleted file mode 100644 index 7e6311a22d..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleService/HelloWorld.composite +++ /dev/null @@ -1,84 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://sample" - xmlns:sample="http://sample" - name="HelloWorld"> - - - <!-- local only wire --> - - - <!-- unresolved remote wire --> - <component name="BHelloWorldServiceRemote"> - <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceRemoteImpl" /> - <service name="HelloWorldServiceRemote"> - <binding.sca uri="http://localhost:8085/BHelloWorldServiceRemote"/> - </service> - </component> - - <!-- local and remote wires --> - <component name="BHelloWorldServiceLocalAndRemote"> - <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceRemoteImpl" /> - <service name="HelloWorldServiceRemote"> - <binding.sca uri="http://localhost:8085/BHelloWorldServiceLocalAndRemote"/> - </service> - </component> - - <component name="BHelloWorldClientLocalAndRemote"> - <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientRemoteImpl" /> - <reference name="helloWorldService" target="BHelloWorldServiceLocalAndRemote" /> - </component> - - <!-- multiple services --> - <component name="BHelloWorldServiceMultipleServices"> - <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceMultipleServicesImpl" /> - <service name="HelloWorldServiceLocal"> - </service> - <service name="HelloWorldServiceRemote"> - <binding.sca uri="http://localhost:8085/BHelloWorldServiceMultipleServices/HelloWorldServiceRemote"/> - </service> - <service name="HelloWorldServiceRemote2"> - <binding.sca uri="http://localhost:8085/BHelloWorldServiceMultipleServices/HelloWorldServiceRemote2"/> - </service> - </component> - - <component name="BHelloWorldClientMultipleServices"> - <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientLocalImpl" /> - <reference name="helloWorldService" target="BHelloWorldServiceMultipleServices/HelloWorldServiceLocal" /> - </component> - - <!-- multiple bindings --> - <component name="BHelloWorldMultipleBindings"> - <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceRemoteImpl" /> - <service name="HelloWorldServiceRemote"> - <interface.java interface="org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote" /> - <binding.ws name="wsBinding" uri="http://localhost:8085/BHelloWorldMultipleBindings/HelloWorldServiceRemote-wsbinding"/> - <binding.sca name="scaBinding" uri="http://localhost:8085/BHelloWorldMultipleBindings/HelloWorldServiceRemote-scabinding"/> - </service> - </component> - - - <!-- Dynamic interfaces --> - <!--component name="BHelloWorldServiceScript"> - <implementation.script script="calculator/AddServiceImpl.js"/> - </component--> - -</composite> diff --git a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleService/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleService/META-INF/sca-contribution.xml deleted file mode 100644 index e6ccae5c73..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/binding-sca-tribes/src/test/resources/ws/simpleService/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sample="http://sample"> - <deployable composite="sample:HelloWorld"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/helloworld-client/pom.xml b/sca-java-2.x/trunk/itest/nodes/helloworld-client/pom.xml deleted file mode 100644 index 8367550f5a..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/helloworld-client/pom.xml +++ /dev/null @@ -1,44 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-nodes-helloworld-client</artifactId> - <name>Apache Tuscany SCA iTest Nodes Helloworld Client</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-nodes-helloworld-iface</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-sca-api</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - </dependencies> -</project> diff --git a/sca-java-2.x/trunk/itest/nodes/helloworld-client/src/main/java/itest/nodes/HelloworldImpl.java b/sca-java-2.x/trunk/itest/nodes/helloworld-client/src/main/java/itest/nodes/HelloworldImpl.java deleted file mode 100644 index 2619dc269b..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/helloworld-client/src/main/java/itest/nodes/HelloworldImpl.java +++ /dev/null @@ -1,43 +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 itest.nodes; - -import org.oasisopen.sca.annotation.EagerInit; -import org.oasisopen.sca.annotation.Init; -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Scope; - -@EagerInit -@Scope("COMPOSITE") -public class HelloworldImpl implements Helloworld { - - @Reference - public Helloworld service; - - @Init - public void initialize() throws Exception{ - System.out.println(">>>>>> " + sayHello("init")); - } - - public String sayHello(String name) throws Exception { - return "Hi " + service.sayHello(name); - } - -} diff --git a/sca-java-2.x/trunk/itest/nodes/helloworld-client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/nodes/helloworld-client/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 7e062cc14e..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/helloworld-client/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:itest="http://itest"> - <deployable composite="itest:HelloworldClient"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/helloworld-client/src/main/resources/helloworld-client.composite b/sca-java-2.x/trunk/itest/nodes/helloworld-client/src/main/resources/helloworld-client.composite deleted file mode 100644 index 3c4ed03448..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/helloworld-client/src/main/resources/helloworld-client.composite +++ /dev/null @@ -1,29 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://itest" - name="HelloworldClient"> - - <component name="HelloworldClient"> - <implementation.java class="itest.nodes.HelloworldImpl"/> - <reference name="service" target="HelloworldService"/> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/nodes/helloworld-iface/pom.xml b/sca-java-2.x/trunk/itest/nodes/helloworld-iface/pom.xml deleted file mode 100644 index 87b6a4fc51..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/helloworld-iface/pom.xml +++ /dev/null @@ -1,39 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-nodes-helloworld-iface</artifactId> - <name>Apache Tuscany SCA iTest Nodes Helloworld IFaces</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-sca-api</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - </dependencies> -</project> diff --git a/sca-java-2.x/trunk/itest/nodes/helloworld-iface/src/main/java/itest/nodes/Helloworld.java b/sca-java-2.x/trunk/itest/nodes/helloworld-iface/src/main/java/itest/nodes/Helloworld.java deleted file mode 100644 index a0710281c9..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/helloworld-iface/src/main/java/itest/nodes/Helloworld.java +++ /dev/null @@ -1,29 +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 itest.nodes; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface Helloworld { - - String sayHello(String name) throws Exception; - -} diff --git a/sca-java-2.x/trunk/itest/nodes/helloworld-service-a/pom.xml b/sca-java-2.x/trunk/itest/nodes/helloworld-service-a/pom.xml deleted file mode 100644 index e981d2dc4d..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/helloworld-service-a/pom.xml +++ /dev/null @@ -1,44 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-nodes-helloworld-service-a</artifactId> - <name>Apache Tuscany SCA iTest Nodes Helloworld Service A</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-nodes-helloworld-iface</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-sca-api</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - </dependencies> -</project> diff --git a/sca-java-2.x/trunk/itest/nodes/helloworld-service-a/src/main/java/itest/nodes/HelloworldImpl.java b/sca-java-2.x/trunk/itest/nodes/helloworld-service-a/src/main/java/itest/nodes/HelloworldImpl.java deleted file mode 100644 index 2619dc269b..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/helloworld-service-a/src/main/java/itest/nodes/HelloworldImpl.java +++ /dev/null @@ -1,43 +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 itest.nodes; - -import org.oasisopen.sca.annotation.EagerInit; -import org.oasisopen.sca.annotation.Init; -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Scope; - -@EagerInit -@Scope("COMPOSITE") -public class HelloworldImpl implements Helloworld { - - @Reference - public Helloworld service; - - @Init - public void initialize() throws Exception{ - System.out.println(">>>>>> " + sayHello("init")); - } - - public String sayHello(String name) throws Exception { - return "Hi " + service.sayHello(name); - } - -} diff --git a/sca-java-2.x/trunk/itest/nodes/helloworld-service-a/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/nodes/helloworld-service-a/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index bba92e6ca3..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/helloworld-service-a/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" - xmlns:itest="http://itest"> - <deployable composite="itest:ServiceA"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/helloworld-service-a/src/main/resources/service-a.composite b/sca-java-2.x/trunk/itest/nodes/helloworld-service-a/src/main/resources/service-a.composite deleted file mode 100644 index 55122d2d6c..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/helloworld-service-a/src/main/resources/service-a.composite +++ /dev/null @@ -1,29 +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://docs.oasis-open.org/ns/opencsa/sca/200903" - targetNamespace="http://itest" - name="ServiceA"> - - <component name="ServiceA"> - <implementation.java class="itest.nodes.HelloworldImpl"/> - <reference name="service" target="ServiceA"/> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/nodes/helloworld-service-and-client/pom.xml b/sca-java-2.x/trunk/itest/nodes/helloworld-service-and-client/pom.xml deleted file mode 100644 index 862475b534..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/helloworld-service-and-client/pom.xml +++ /dev/null @@ -1,39 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-nodes-helloworld-service-and-client</artifactId> - <name>Apache Tuscany SCA iTest Nodes Helloworld Service and Client</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-sca-api</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - </dependencies> -</project> diff --git a/sca-java-2.x/trunk/itest/nodes/helloworld-service-and-client/src/main/java/itest/nodes/sac/Helloworld.java b/sca-java-2.x/trunk/itest/nodes/helloworld-service-and-client/src/main/java/itest/nodes/sac/Helloworld.java deleted file mode 100644 index 1cb9b813f2..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/helloworld-service-and-client/src/main/java/itest/nodes/sac/Helloworld.java +++ /dev/null @@ -1,26 +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 itest.nodes.sac; - -public interface Helloworld { - - String sayHello(String name) throws Exception; - -} diff --git a/sca-java-2.x/trunk/itest/nodes/helloworld-service-and-client/src/main/java/itest/nodes/sac/HelloworldClientImpl.java b/sca-java-2.x/trunk/itest/nodes/helloworld-service-and-client/src/main/java/itest/nodes/sac/HelloworldClientImpl.java deleted file mode 100644 index d64536a998..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/helloworld-service-and-client/src/main/java/itest/nodes/sac/HelloworldClientImpl.java +++ /dev/null @@ -1,34 +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 itest.nodes.sac; - -import org.oasisopen.sca.annotation.Reference; - -public class HelloworldClientImpl implements Helloworld { - - @Reference - public Helloworld service; - - - public String sayHello(String name) throws Exception { - return "Hi " + service.sayHello(name); - } - -} diff --git a/sca-java-2.x/trunk/itest/nodes/helloworld-service-and-client/src/main/java/itest/nodes/sac/HelloworldServiceImpl.java b/sca-java-2.x/trunk/itest/nodes/helloworld-service-and-client/src/main/java/itest/nodes/sac/HelloworldServiceImpl.java deleted file mode 100644 index 728804b08c..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/helloworld-service-and-client/src/main/java/itest/nodes/sac/HelloworldServiceImpl.java +++ /dev/null @@ -1,30 +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 itest.nodes.sac; - -public class HelloworldServiceImpl implements Helloworld { - - public String sayHello(String name) { - String response = "Hello " + name; - System.out.println("At service - " + response); - return response; - } - -} diff --git a/sca-java-2.x/trunk/itest/nodes/helloworld-service-and-client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/nodes/helloworld-service-and-client/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 555824a94e..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/helloworld-service-and-client/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:itest="http://itest"> - <deployable composite="itest:HelloworldServiceAndClient"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/helloworld-service-and-client/src/main/resources/helloworld-service.composite b/sca-java-2.x/trunk/itest/nodes/helloworld-service-and-client/src/main/resources/helloworld-service.composite deleted file mode 100644 index 38ac479275..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/helloworld-service-and-client/src/main/resources/helloworld-service.composite +++ /dev/null @@ -1,33 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://itest" - name="HelloworldServiceAndClient"> - - <component name="HelloworldClient"> - <implementation.java class="itest.nodes.sac.HelloworldClientImpl"/> - <reference name="service" target="HelloworldService"/> - </component> - - <component name="HelloworldService"> - <implementation.java class="itest.nodes.sac.HelloworldServiceImpl"/> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/nodes/helloworld-service-b/pom.xml b/sca-java-2.x/trunk/itest/nodes/helloworld-service-b/pom.xml deleted file mode 100644 index 49fdb9b562..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/helloworld-service-b/pom.xml +++ /dev/null @@ -1,49 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-nodes-helloworld-service-b</artifactId> - <name>Apache Tuscany SCA iTest Nodes Helloworld Service B</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-nodes-helloworld-iface</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-sca-api</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-sca-api</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - </dependencies> -</project> diff --git a/sca-java-2.x/trunk/itest/nodes/helloworld-service-b/src/main/java/itest/nodes/HelloworldImpl.java b/sca-java-2.x/trunk/itest/nodes/helloworld-service-b/src/main/java/itest/nodes/HelloworldImpl.java deleted file mode 100644 index b1d5a8235a..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/helloworld-service-b/src/main/java/itest/nodes/HelloworldImpl.java +++ /dev/null @@ -1,33 +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 itest.nodes; - -import org.oasisopen.sca.annotation.Reference; - -public class HelloworldImpl implements Helloworld { - - @Reference - protected Helloworld service; - - public String sayHello(String name) throws Exception { - return service.sayHello(name); - } - -} diff --git a/sca-java-2.x/trunk/itest/nodes/helloworld-service-b/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/nodes/helloworld-service-b/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 4405cca18e..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/helloworld-service-b/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" - xmlns:itest="http://itest"> - <deployable composite="itest:ServiceB"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/helloworld-service-b/src/main/resources/service-b.composite b/sca-java-2.x/trunk/itest/nodes/helloworld-service-b/src/main/resources/service-b.composite deleted file mode 100644 index 02cff882a7..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/helloworld-service-b/src/main/resources/service-b.composite +++ /dev/null @@ -1,29 +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://docs.oasis-open.org/ns/opencsa/sca/200903" - targetNamespace="http://itest" - name="ServiceB"> - - <component name="ServiceB"> - <implementation.java class="itest.nodes.HelloworldImpl"/> - <reference name="service" target="ServiceC"/> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/nodes/helloworld-service-c/pom.xml b/sca-java-2.x/trunk/itest/nodes/helloworld-service-c/pom.xml deleted file mode 100644 index ef7068e0e8..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/helloworld-service-c/pom.xml +++ /dev/null @@ -1,49 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-nodes-helloworld-Serivce-c</artifactId> - <name>Apache Tuscany SCA iTest Nodes Helloworld Service C</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-nodes-helloworld-iface</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-sca-api</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-sca-api</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - </dependencies> -</project> diff --git a/sca-java-2.x/trunk/itest/nodes/helloworld-service-c/src/main/java/itest/nodes/HelloworldImpl.java b/sca-java-2.x/trunk/itest/nodes/helloworld-service-c/src/main/java/itest/nodes/HelloworldImpl.java deleted file mode 100644 index 81f7e1747d..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/helloworld-service-c/src/main/java/itest/nodes/HelloworldImpl.java +++ /dev/null @@ -1,28 +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 itest.nodes; - -public class HelloworldImpl implements Helloworld { - - public String sayHello(String name) { - return "Hello " + name; - } - -} diff --git a/sca-java-2.x/trunk/itest/nodes/helloworld-service-c/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/nodes/helloworld-service-c/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 3ff86f946b..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/helloworld-service-c/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" - xmlns:itest="http://itest"> - <deployable composite="itest:ServiceC"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/helloworld-service-c/src/main/resources/service-c.composite b/sca-java-2.x/trunk/itest/nodes/helloworld-service-c/src/main/resources/service-c.composite deleted file mode 100644 index d88db09b43..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/helloworld-service-c/src/main/resources/service-c.composite +++ /dev/null @@ -1,28 +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://docs.oasis-open.org/ns/opencsa/sca/200903" - targetNamespace="http://itest" - name="ServiceC"> - - <component name="ServiceC"> - <implementation.java class="itest.nodes.HelloworldImpl"/> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/nodes/helloworld-service/pom.xml b/sca-java-2.x/trunk/itest/nodes/helloworld-service/pom.xml deleted file mode 100644 index e5e84571cd..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/helloworld-service/pom.xml +++ /dev/null @@ -1,43 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-nodes-helloworld-service</artifactId> - <name>Apache Tuscany SCA iTest Nodes Helloworld Service</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-nodes-helloworld-iface</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-sca-api</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - </dependencies> -</project> diff --git a/sca-java-2.x/trunk/itest/nodes/helloworld-service/src/main/java/itest/nodes/HelloworldImpl.java b/sca-java-2.x/trunk/itest/nodes/helloworld-service/src/main/java/itest/nodes/HelloworldImpl.java deleted file mode 100644 index a27e752fd7..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/helloworld-service/src/main/java/itest/nodes/HelloworldImpl.java +++ /dev/null @@ -1,30 +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 itest.nodes; - -public class HelloworldImpl implements Helloworld { - - public String sayHello(String name) { - String response = "Hello " + name; - System.out.println("At service - " + response); - return response; - } - -} diff --git a/sca-java-2.x/trunk/itest/nodes/helloworld-service/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/nodes/helloworld-service/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 829ece9f7c..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/helloworld-service/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:itest="http://itest"> - <deployable composite="itest:HelloworldService"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/helloworld-service/src/main/resources/helloworld-service.composite b/sca-java-2.x/trunk/itest/nodes/helloworld-service/src/main/resources/helloworld-service.composite deleted file mode 100644 index 5334caeb55..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/helloworld-service/src/main/resources/helloworld-service.composite +++ /dev/null @@ -1,28 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://itest" - name="HelloworldService"> - - <component name="HelloworldService"> - <implementation.java class="itest.nodes.HelloworldImpl"/> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast-client/pom.xml b/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast-client/pom.xml deleted file mode 100644 index 30d509ecc6..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast-client/pom.xml +++ /dev/null @@ -1,70 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>itest-nodes-one-jvm-hazelcast-client</artifactId>
- <name>Apache Tuscany SCA iTest Nodes One JVM Using Hazelcast and client</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>itest-nodes-helloworld-iface</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-client-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-endpoint-hazelcast</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-hazelcast-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>com.hazelcast</groupId>
- <artifactId>hazelcast-client</artifactId>
- <version>1.8.3</version>
- </dependency>
- </dependencies>
- <build>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast-client/src/test/java/itest/ClientTestCase.java b/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast-client/src/test/java/itest/ClientTestCase.java deleted file mode 100644 index cf99c970db..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast-client/src/test/java/itest/ClientTestCase.java +++ /dev/null @@ -1,110 +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 itest;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.net.URI;
-
-import org.apache.tuscany.sca.core.assembly.impl.RuntimeEndpointImpl;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import com.hazelcast.client.HazelcastClient;
-import com.hazelcast.core.IMap;
-
-/**
- */
-public class ClientTestCase{
-
- private static String domainURI = "uri:OneNodeTestCase?bind=127.0.0.1:14829";
- private static Node node;
- private static HazelcastClient client;
-
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {
- node = NodeFactory.newInstance(domainURI).createNode((String)null, new String[]{"../helloworld-service/target/classes", "../helloworld-client/target/classes"});
- node.start();
- }
-
- @Test
- public void testNode() throws Exception {
-
- client = HazelcastClient.newHazelcastClient("OneNodeTestCase", "tuscany", "127.0.0.1:14829");
- IMap<Object, Object> map = client.getMap("OneNodeTestCase/Endpoints");
-
- assertNotNull(map);
- assertEquals(2, map.size());
- Object ep1 = map.get("HelloworldService#service-binding(Helloworld/Helloworld)");
-// System.out.println((RuntimeEndpointImpl)ep1);
- assertNotNull(ep1);
- assertTrue(ep1 instanceof RuntimeEndpointImpl);
- Object ep2 = map.get("HelloworldClient#service-binding(Helloworld/Helloworld)");
- assertNotNull(ep2);
- }
-
- //@Test
- public void testTime() throws Exception {
- long start = System.currentTimeMillis();
- long count = 100;
- for (int i=0; i<count; i++) {
- testNode();
- client.shutdown();
- }
- long avg = (System.currentTimeMillis() - start) / count;
- System.out.println("Average for " + count + " client connects " + avg);
- }
-
- @Test
- public void testBadPassword() throws Exception {
- try {
- client = HazelcastClient.newHazelcastClient("OneNodeTestCase", "IncorrectPassword", "127.0.0.1:14829");
- fail();
- } catch (Exception e) {
- //expected
- }
- }
-
- @Test
- public void testBadIP() throws Exception {
- try {
- client = HazelcastClient.newHazelcastClient("OneNodeTestCase", "IncorrectPassword", "127.0.0.99:9999");
- fail();
- } catch (Exception e) {
- //expected
- }
- }
-
- @AfterClass
- public static void tearDownAfterClass() throws Exception {
- if (client != null) {
- client.shutdown();
- }
- if (node != null) {
- node.stop();
- }
- }
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/pom.xml b/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/pom.xml deleted file mode 100644 index 4d5fb61d2b..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/pom.xml +++ /dev/null @@ -1,68 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-nodes-one-jvm-hazelcast</artifactId> - <name>Apache Tuscany SCA iTest Nodes One JVM Using Hazelcast Registry</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-nodes-helloworld-service-and-client</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-nodes-helloworld-iface</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-sca-client-impl</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-endpoint-hazelcast</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-hazelcast-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - </dependencies> -</project> diff --git a/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/src/test/java/itest/OneNodeOneContributionTestCase.java b/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/src/test/java/itest/OneNodeOneContributionTestCase.java deleted file mode 100644 index 3755d0b365..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/src/test/java/itest/OneNodeOneContributionTestCase.java +++ /dev/null @@ -1,64 +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 itest; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import itest.nodes.sac.Helloworld; - -import java.net.URI; - -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.oasisopen.sca.client.SCAClientFactory; - -/** - * This shows how to test the Calculator service component. - */ -public class OneNodeOneContributionTestCase{ - - private static URI domainURI = URI.create("tuscany:OneNodeTestCase"); - private static Node node; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - node = NodeFactory.getInstance().createNode(domainURI, "../helloworld-service-and-client/target/classes"); - node.start(); - } - - @Test - public void testNode() throws Exception { - - Helloworld client = node.getService(Helloworld.class, "HelloworldClient"); - assertNotNull(client); - assertEquals("Hi Hello Petra", client.sayHello("Petra")); - - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - if (node != null) { - node.stop(); - } - } -} diff --git a/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/src/test/java/itest/OneNodeTestCase.java b/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/src/test/java/itest/OneNodeTestCase.java deleted file mode 100644 index 1c6b2ce754..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/src/test/java/itest/OneNodeTestCase.java +++ /dev/null @@ -1,76 +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 itest; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import itest.nodes.Helloworld; - -import java.net.URI; - -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.oasisopen.sca.client.SCAClientFactory; - -/** - * This shows how to test the Calculator service component. - */ -public class OneNodeTestCase{ - - private static URI domainURI = URI.create("OneNodeTestCase"); - private static Node node; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - node = NodeFactory.getInstance().createNode(domainURI, "../helloworld-service/target/classes", "../helloworld-client/target/classes"); - node.start(); - } - - @Test - public void testNode() throws Exception { - - Helloworld service = node.getService(Helloworld.class, "HelloworldService"); - assertNotNull(service); - assertEquals("Hello Petra", service.sayHello("Petra")); - - Helloworld client = node.getService(Helloworld.class, "HelloworldClient"); - assertNotNull(client); - assertEquals("Hi Hello Petra", client.sayHello("Petra")); - - Helloworld scaClientService = SCAClientFactory.newInstance(domainURI).getService(Helloworld.class, "HelloworldService"); - assertNotNull(scaClientService); - assertEquals("Hello Petra", scaClientService.sayHello("Petra")); - - Helloworld scaClientClient = SCAClientFactory.newInstance(domainURI).getService(Helloworld.class, "HelloworldClient"); - assertNotNull(scaClientClient); - assertEquals("Hi Hello Petra", scaClientClient.sayHello("Petra")); - - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - if (node != null) { - node.stop(); - } - } -} diff --git a/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoNodeTestCase.java b/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoNodeTestCase.java deleted file mode 100644 index 558afda077..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoNodeTestCase.java +++ /dev/null @@ -1,82 +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 itest; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import itest.nodes.Helloworld; - -import java.net.URI; - -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.oasisopen.sca.client.SCAClientFactory; - -/** - * This shows how to test the Calculator service component. - */ -public class TwoNodeTestCase{ - - private static URI domainURI = URI.create("TwoNodeTestCase"); - private static Node serviceNode; - private static Node clientNode; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - serviceNode = NodeFactory.getInstance().createNode(domainURI, "../helloworld-service/target/classes"); - serviceNode.start(); - clientNode = NodeFactory.getInstance().createNode(domainURI, "../helloworld-client/target/classes"); - clientNode.start(); - } - - @Test - public void testNode() throws Exception { - - Helloworld service = serviceNode.getService(Helloworld.class, "HelloworldService"); - assertNotNull(service); - assertEquals("Hello Petra", service.sayHello("Petra")); - - Helloworld client = clientNode.getService(Helloworld.class, "HelloworldClient"); - assertNotNull(client); - assertEquals("Hi Hello Petra", client.sayHello("Petra")); - - Helloworld scaClientService = SCAClientFactory.newInstance(domainURI).getService(Helloworld.class, "HelloworldService"); - assertNotNull(scaClientService); - assertEquals("Hello Petra", scaClientService.sayHello("Petra")); - - Helloworld scaClientClient = SCAClientFactory.newInstance(domainURI).getService(Helloworld.class, "HelloworldClient"); - assertNotNull(scaClientClient); - assertEquals("Hi Hello Petra", scaClientClient.sayHello("Petra")); - - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - if (serviceNode != null) { - serviceNode.stop(); - } - if (clientNode != null) { - clientNode.stop(); - } - } -} diff --git a/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoRemoteNodesTestCase.java b/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoRemoteNodesTestCase.java deleted file mode 100644 index 841621964f..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/one-jvm-hazelcast/src/test/java/itest/TwoRemoteNodesTestCase.java +++ /dev/null @@ -1,82 +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 itest;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import itest.nodes.Helloworld;
-
-import java.net.URI;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.oasisopen.sca.client.SCAClientFactory;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class TwoRemoteNodesTestCase{
-
- private static Node serviceNode;
- private static Node clientNode;
-
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {
- serviceNode = NodeFactory.newInstance().createNode(URI.create("tuscany:TwoRemoteNodesTestCase"), "../helloworld-service/target/classes");
- serviceNode.start();
-
- clientNode = NodeFactory.getInstance().createNode(URI.create("tuscany:TwoRemoteNodesTestCase"), "../helloworld-client/target/classes");
- clientNode.start();
- }
-
- @Test
- public void testNode() throws Exception {
-
- Helloworld service = serviceNode.getService(Helloworld.class, "HelloworldService");
- assertNotNull(service);
- assertEquals("Hello Petra", service.sayHello("Petra"));
-
- Helloworld client = clientNode.getService(Helloworld.class, "HelloworldClient");
- assertNotNull(client);
- assertEquals("Hi Hello Petra", client.sayHello("Petra"));
-
- Helloworld scaClientService = SCAClientFactory.newInstance(URI.create("TwoRemoteNodesTestCase")).getService(Helloworld.class, "HelloworldService");
- assertNotNull(scaClientService);
- assertEquals("Hello Petra", scaClientService.sayHello("Petra"));
-
- Helloworld scaClientClient = SCAClientFactory.newInstance(URI.create("TwoRemoteNodesTestCase")).getService(Helloworld.class, "HelloworldClient");
- assertNotNull(scaClientClient);
- assertEquals("Hi Hello Petra", scaClientClient.sayHello("Petra"));
-
- }
-
- @AfterClass
- public static void tearDownAfterClass() throws Exception {
- if (serviceNode != null) {
- serviceNode.stop();
- }
- if (clientNode != null) {
- clientNode.stop();
- }
- }
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/one-jvm-tribes/pom.xml b/sca-java-2.x/trunk/itest/nodes/one-jvm-tribes/pom.xml deleted file mode 100644 index ff52b60103..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/one-jvm-tribes/pom.xml +++ /dev/null @@ -1,82 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>itest-nodes-one-jvm-tribes</artifactId>
- <name>Apache Tuscany SCA iTest Nodes One JVM Using Tribes Registry</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>itest-nodes-helloworld-iface</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-client-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-endpoint-tribes</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-rmi-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <includes>
- <include>**/*TestCase.java</include>
- </includes>
- <reportFormat>brief</reportFormat>
- <useFile>false</useFile>
- <forkMode>once</forkMode>
- <argLine>-ea -Xmx256m</argLine>
- <parallel>off</parallel>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/nodes/one-jvm-tribes/src/test/java/itest/OneNodeTestCase.java b/sca-java-2.x/trunk/itest/nodes/one-jvm-tribes/src/test/java/itest/OneNodeTestCase.java deleted file mode 100644 index e55e8f63e4..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/one-jvm-tribes/src/test/java/itest/OneNodeTestCase.java +++ /dev/null @@ -1,76 +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 itest;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import itest.nodes.Helloworld;
-
-import java.net.URI;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.oasisopen.sca.client.SCAClientFactory;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class OneNodeTestCase{
-
- private static URI domainURI = URI.create("OneNodeTestCase");
- private static Node node;
-
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {
- node = NodeFactory.getInstance().createNode(domainURI, "../helloworld-service/target/classes", "../helloworld-client/target/classes");
- node.start();
- }
-
- @Test
- public void testNode() throws Exception {
-
- Helloworld service = node.getService(Helloworld.class, "HelloworldService");
- assertNotNull(service);
- assertEquals("Hello Petra", service.sayHello("Petra"));
-
- Helloworld client = node.getService(Helloworld.class, "HelloworldClient");
- assertNotNull(client);
- assertEquals("Hi Hello Petra", client.sayHello("Petra"));
-
- Helloworld scaClientService = SCAClientFactory.newInstance(domainURI).getService(Helloworld.class, "HelloworldService");
- assertNotNull(scaClientService);
- assertEquals("Hello Petra", scaClientService.sayHello("Petra"));
-
- Helloworld scaClientClient = SCAClientFactory.newInstance(domainURI).getService(Helloworld.class, "HelloworldClient");
- assertNotNull(scaClientClient);
- assertEquals("Hi Hello Petra", scaClientClient.sayHello("Petra"));
-
- }
-
- @AfterClass
- public static void tearDownAfterClass() throws Exception {
- if (node != null) {
- node.stop();
- }
- }
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoNodeTestCase.java b/sca-java-2.x/trunk/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoNodeTestCase.java deleted file mode 100644 index 2d920c340a..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoNodeTestCase.java +++ /dev/null @@ -1,82 +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 itest;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import itest.nodes.Helloworld;
-
-import java.net.URI;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.oasisopen.sca.client.SCAClientFactory;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class TwoNodeTestCase{
-
- private static URI domainURI = URI.create("TwoNodeTestCase");
- private static Node serviceNode;
- private static Node clientNode;
-
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {
- serviceNode = NodeFactory.getInstance().createNode(domainURI, "../helloworld-service/target/classes");
- serviceNode.start();
- clientNode = NodeFactory.getInstance().createNode(domainURI, "../helloworld-client/target/classes");
- clientNode.start();
- }
-
- @Test
- public void testNode() throws Exception {
-
- Helloworld service = serviceNode.getService(Helloworld.class, "HelloworldService");
- assertNotNull(service);
- assertEquals("Hello Petra", service.sayHello("Petra"));
-
- Helloworld client = clientNode.getService(Helloworld.class, "HelloworldClient");
- assertNotNull(client);
- assertEquals("Hi Hello Petra", client.sayHello("Petra"));
-
- Helloworld scaClientService = SCAClientFactory.newInstance(domainURI).getService(Helloworld.class, "HelloworldService");
- assertNotNull(scaClientService);
- assertEquals("Hello Petra", scaClientService.sayHello("Petra"));
-
- Helloworld scaClientClient = SCAClientFactory.newInstance(domainURI).getService(Helloworld.class, "HelloworldClient");
- assertNotNull(scaClientClient);
- assertEquals("Hi Hello Petra", scaClientClient.sayHello("Petra"));
-
- }
-
- @AfterClass
- public static void tearDownAfterClass() throws Exception {
- if (serviceNode != null) {
- serviceNode.stop();
- }
- if (clientNode != null) {
- clientNode.stop();
- }
- }
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoRemoteNodesTestCase.java b/sca-java-2.x/trunk/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoRemoteNodesTestCase.java deleted file mode 100644 index 888b4df156..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/one-jvm-tribes/src/test/java/itest/TwoRemoteNodesTestCase.java +++ /dev/null @@ -1,83 +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 itest;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import itest.nodes.Helloworld;
-
-import java.net.URI;
-
-import org.apache.tuscany.sca.binding.rmi.RMIBinding;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.oasisopen.sca.client.SCAClientFactory;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class TwoRemoteNodesTestCase{
-
- private static Node serviceNode;
- private static Node clientNode;
-
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {
- serviceNode = NodeFactory.newInstance().createNode(URI.create("tuscany:TwoRemoteNodesTestCase"), "../helloworld-service/target/classes");
- serviceNode.start();
-
- clientNode = NodeFactory.getInstance().createNode(URI.create("tuscany:TwoRemoteNodesTestCase"), "../helloworld-client/target/classes");
- clientNode.start();
- }
-
- @Test
- public void testNode() throws Exception {
-
- Helloworld service = serviceNode.getService(Helloworld.class, "HelloworldService");
- assertNotNull(service);
- assertEquals("Hello Petra", service.sayHello("Petra"));
-
- Helloworld client = clientNode.getService(Helloworld.class, "HelloworldClient");
- assertNotNull(client);
- assertEquals("Hi Hello Petra", client.sayHello("Petra"));
-
-// Helloworld scaClientService = SCAClientFactory.newInstance(URI.create("TwoRemoteNodesTestCase")).getService(Helloworld.class, "HelloworldService");
-// assertNotNull(scaClientService);
-// assertEquals("Hello Petra", scaClientService.sayHello("Petra"));
-
- Helloworld scaClientClient = SCAClientFactory.newInstance(URI.create("TwoRemoteNodesTestCase")).getService(Helloworld.class, "HelloworldClient");
- assertNotNull(scaClientClient);
- assertEquals("Hi Hello Petra", scaClientClient.sayHello("Petra"));
-
- }
-
- @AfterClass
- public static void tearDownAfterClass() throws Exception {
- if (serviceNode != null) {
- serviceNode.stop();
- }
- if (clientNode != null) {
- clientNode.stop();
- }
- }
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/one-jvm/pom.xml b/sca-java-2.x/trunk/itest/nodes/one-jvm/pom.xml deleted file mode 100644 index 1edbfc3b99..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/one-jvm/pom.xml +++ /dev/null @@ -1,53 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-nodes-one-jvm</artifactId> - <name>Apache Tuscany SCA iTest Nodes One JVM</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-nodes-helloworld-iface</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-sca-client-impl</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - </dependencies> -</project> diff --git a/sca-java-2.x/trunk/itest/nodes/one-jvm/src/test/java/itest/OneNodeTestCase.java b/sca-java-2.x/trunk/itest/nodes/one-jvm/src/test/java/itest/OneNodeTestCase.java deleted file mode 100644 index 1c6b2ce754..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/one-jvm/src/test/java/itest/OneNodeTestCase.java +++ /dev/null @@ -1,76 +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 itest; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import itest.nodes.Helloworld; - -import java.net.URI; - -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.oasisopen.sca.client.SCAClientFactory; - -/** - * This shows how to test the Calculator service component. - */ -public class OneNodeTestCase{ - - private static URI domainURI = URI.create("OneNodeTestCase"); - private static Node node; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - node = NodeFactory.getInstance().createNode(domainURI, "../helloworld-service/target/classes", "../helloworld-client/target/classes"); - node.start(); - } - - @Test - public void testNode() throws Exception { - - Helloworld service = node.getService(Helloworld.class, "HelloworldService"); - assertNotNull(service); - assertEquals("Hello Petra", service.sayHello("Petra")); - - Helloworld client = node.getService(Helloworld.class, "HelloworldClient"); - assertNotNull(client); - assertEquals("Hi Hello Petra", client.sayHello("Petra")); - - Helloworld scaClientService = SCAClientFactory.newInstance(domainURI).getService(Helloworld.class, "HelloworldService"); - assertNotNull(scaClientService); - assertEquals("Hello Petra", scaClientService.sayHello("Petra")); - - Helloworld scaClientClient = SCAClientFactory.newInstance(domainURI).getService(Helloworld.class, "HelloworldClient"); - assertNotNull(scaClientClient); - assertEquals("Hi Hello Petra", scaClientClient.sayHello("Petra")); - - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - if (node != null) { - node.stop(); - } - } -} diff --git a/sca-java-2.x/trunk/itest/nodes/one-jvm/src/test/java/itest/TwoNodeTestCase.java b/sca-java-2.x/trunk/itest/nodes/one-jvm/src/test/java/itest/TwoNodeTestCase.java deleted file mode 100644 index 558afda077..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/one-jvm/src/test/java/itest/TwoNodeTestCase.java +++ /dev/null @@ -1,82 +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 itest; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import itest.nodes.Helloworld; - -import java.net.URI; - -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.oasisopen.sca.client.SCAClientFactory; - -/** - * This shows how to test the Calculator service component. - */ -public class TwoNodeTestCase{ - - private static URI domainURI = URI.create("TwoNodeTestCase"); - private static Node serviceNode; - private static Node clientNode; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - serviceNode = NodeFactory.getInstance().createNode(domainURI, "../helloworld-service/target/classes"); - serviceNode.start(); - clientNode = NodeFactory.getInstance().createNode(domainURI, "../helloworld-client/target/classes"); - clientNode.start(); - } - - @Test - public void testNode() throws Exception { - - Helloworld service = serviceNode.getService(Helloworld.class, "HelloworldService"); - assertNotNull(service); - assertEquals("Hello Petra", service.sayHello("Petra")); - - Helloworld client = clientNode.getService(Helloworld.class, "HelloworldClient"); - assertNotNull(client); - assertEquals("Hi Hello Petra", client.sayHello("Petra")); - - Helloworld scaClientService = SCAClientFactory.newInstance(domainURI).getService(Helloworld.class, "HelloworldService"); - assertNotNull(scaClientService); - assertEquals("Hello Petra", scaClientService.sayHello("Petra")); - - Helloworld scaClientClient = SCAClientFactory.newInstance(domainURI).getService(Helloworld.class, "HelloworldClient"); - assertNotNull(scaClientClient); - assertEquals("Hi Hello Petra", scaClientClient.sayHello("Petra")); - - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - if (serviceNode != null) { - serviceNode.stop(); - } - if (clientNode != null) { - clientNode.stop(); - } - } -} diff --git a/sca-java-2.x/trunk/itest/nodes/one-node-test/pom.xml b/sca-java-2.x/trunk/itest/nodes/one-node-test/pom.xml deleted file mode 100644 index d35761bc88..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/one-node-test/pom.xml +++ /dev/null @@ -1,48 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-nodes-one-node-test</artifactId> - <name>Apache Tuscany SCA iTest Nodes One Node Test</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-nodes-helloworld-iface</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - </dependencies> -</project> diff --git a/sca-java-2.x/trunk/itest/nodes/one-node-test/src/test/java/itest/OneNodeTestCase.java b/sca-java-2.x/trunk/itest/nodes/one-node-test/src/test/java/itest/OneNodeTestCase.java deleted file mode 100644 index 6d49b718ef..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/one-node-test/src/test/java/itest/OneNodeTestCase.java +++ /dev/null @@ -1,87 +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 itest; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import java.io.File; - -import itest.nodes.Helloworld; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * This shows how to test the Calculator service component. - */ -public class OneNodeTestCase{ - - private static Node node; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - System.setProperty("org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint.enabled", "false"); - NodeFactory factory = NodeFactory.newInstance(); - node = factory.createNode( - new Contribution("service", getJar("../helloworld-service/target")), - new Contribution("client", getJar("../helloworld-client/target"))); - node.start(); - } - - /** - * Get the jar in the target folder without being dependent on the version name to - * make tuscany releases easier - */ - private static String getJar(String targetDirectory) { - File f = new File(targetDirectory); - for (File file : f.listFiles()) { - if (file.getName().endsWith(".jar")) { - return file.toURI().toString(); - } - } - throw new IllegalStateException("Can't find jar in: " + targetDirectory); - } - - @Test - public void testCalculator() throws Exception { - - // Ideally this would use the SCAClient API but leaving that tillwe have the basics working - - Helloworld service = node.getService(Helloworld.class, "HelloworldService"); - assertNotNull(service); - assertEquals("Hello Petra", service.sayHello("Petra")); - - Helloworld client = node.getService(Helloworld.class, "HelloworldClient"); - assertNotNull(client); - assertEquals("Hi Hello Petra", client.sayHello("Petra")); - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - if (node != null) { - node.stop(); - } - } -} diff --git a/sca-java-2.x/trunk/itest/nodes/pom.xml b/sca-java-2.x/trunk/itest/nodes/pom.xml deleted file mode 100644 index 6a60de05da..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/pom.xml +++ /dev/null @@ -1,63 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <packaging>pom</packaging> - <artifactId>itest-nodes</artifactId> - <name>Apache Tuscany SCA iTest Nodes</name> - - <build> - <defaultGoal>install</defaultGoal> - </build> - - <modules> - <module>helloworld-iface</module> - <module>helloworld-service</module> - <module>helloworld-client</module> - <module>helloworld-service-and-client</module> -<!-- - <module>helloworld-service-a</module> - <module>helloworld-service-b</module> - <module>helloworld-service-c</module> ---> - <module>one-jvm</module> - <module>one-jvm-hazelcast</module> - <module>one-jvm-hazelcast-client</module> - <module>one-jvm-tribes</module> - <module>binding-sca-hazelcast</module> - <!-- module>binding-sca-tribes</module --> - <module>one-node-test</module> -<!-- failing now and then with RMI already bound problem - <module>two-nodes-two-vms-hazelcast</module> - <module>two-nodes-test</module> ---> - -<!-- - <module>three-nodes-three-vms-test</module> ---> - </modules> - -</project> diff --git a/sca-java-2.x/trunk/itest/nodes/three-nodes-three-vms-test/build.xml b/sca-java-2.x/trunk/itest/nodes/three-nodes-three-vms-test/build.xml deleted file mode 100644 index 3d77230541..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/three-nodes-three-vms-test/build.xml +++ /dev/null @@ -1,38 +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. ---> -<project name="itest-samples" default="run"> - - <target name="run"> - - <parallel failonany="true"> - - <daemons> - <ant antfile="server.xml"/> - </daemons> - - <sequential> - <sleep seconds="4"/> - <ant antfile="client.xml"/> - </sequential> - - </parallel> - - </target> - -</project> diff --git a/sca-java-2.x/trunk/itest/nodes/three-nodes-three-vms-test/client.xml b/sca-java-2.x/trunk/itest/nodes/three-nodes-three-vms-test/client.xml deleted file mode 100644 index 8e7c744940..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/three-nodes-three-vms-test/client.xml +++ /dev/null @@ -1,31 +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. ---> -<project name="server" default="run"> - - <!--echo>${runtime_classpath}</echo--> - - <target name="run"> - <java classpath="${runtime_classpath};./target/test-classes" - classname="itest.Client" - fork="true" - failonerror="true"> - </java> - </target> - -</project>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/three-nodes-three-vms-test/pom.xml b/sca-java-2.x/trunk/itest/nodes/three-nodes-three-vms-test/pom.xml deleted file mode 100644 index 337a4ba5c1..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/three-nodes-three-vms-test/pom.xml +++ /dev/null @@ -1,104 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-nodes-three-nodes-three-vms-test</artifactId> - <name>Apache Tuscany SCA iTest Nodes Three Nodes Three VMs Test</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-domain-node</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-endpoint-tribes</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-nodes-helloworld-iface</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-launcher</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-sca-client-impl</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-sca-runtime-rmi</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-jetty</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>run-samples</id> - <phase>test</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks unless="maven.test.skip"> - <property name="tuscany.version" value="${version}" /> - <property name="runtime_classpath" refid="maven.runtime.classpath"/> - <ant antfile="./build.xml" target="run"/> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> diff --git a/sca-java-2.x/trunk/itest/nodes/three-nodes-three-vms-test/server.xml b/sca-java-2.x/trunk/itest/nodes/three-nodes-three-vms-test/server.xml deleted file mode 100644 index dc18cc8ce0..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/three-nodes-three-vms-test/server.xml +++ /dev/null @@ -1,30 +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. ---> -<project name="server" default="run"> - - <!--echo>${runtime_classpath}</echo--> - - <target name="run"> - <java classpath="${runtime_classpath}" classname="org.apache.tuscany.sca.node.launcher.NodeMain" fork="true"> - <arg value="-node"/> - <arg value="./server-config.xml"/> - </java> - </target> - -</project>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/three-nodes-three-vms-test/service-a-config.xml b/sca-java-2.x/trunk/itest/nodes/three-nodes-three-vms-test/service-a-config.xml deleted file mode 100644 index 1f87322e80..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/three-nodes-three-vms-test/service-a-config.xml +++ /dev/null @@ -1,39 +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. ---> -<node xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" - xmlns="http://tuscany.apache.org/xmlns/sca/1.1" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" - uri="http://sample/nodes/TestNode1" - domain="http://domain1" - domainRegistry="tribes:default"> - - <!-- Configure the base URIs for a given binding --> - <!-- Each base URI is for a protocol supported by the binding --> - <binding name="sca:binding.sca" baseURIs="http://localhost:8081/sca https://localhost:8081/sca"/> - <binding name="sca:binding.ws" baseURIs="http://localhost:8082/ws https://localhost:8082/ws"/> - - <!-- Configure a list of contributions --> - <contribution uri="iface" location="../helloworld-iface/target/itest-nodes-helloworld-iface-2.0-SNAPSHOT.jar"/> - <contribution uri="client" location="../helloworld-service-a/target/itest-nodes-helloworld-service-a-2.0-SNAPSHOT.jar"> - <!-- doesn't pick up the deployable composite properly without this?--> - <deploymentComposite location="service-a.composite"/> - </contribution> - -</node>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/three-nodes-three-vms-test/service-b-config.xml b/sca-java-2.x/trunk/itest/nodes/three-nodes-three-vms-test/service-b-config.xml deleted file mode 100644 index d557a31b64..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/three-nodes-three-vms-test/service-b-config.xml +++ /dev/null @@ -1,39 +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. ---> -<node xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" - xmlns="http://tuscany.apache.org/xmlns/sca/1.1" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" - uri="http://sample/nodes/TestNode1" - domain="http://domain1" - domainRegistry="tribes:default"> - - <!-- Configure the base URIs for a given binding --> - <!-- Each base URI is for a protocol supported by the binding --> - <binding name="sca:binding.sca" baseURIs="http://localhost:8081/sca https://localhost:8081/sca"/> - <binding name="sca:binding.ws" baseURIs="http://localhost:8082/ws https://localhost:8082/ws"/> - - <!-- Configure a list of contributions --> - <contribution uri="iface" location="../helloworld-iface/target/classes"/> - <contribution uri="service" location="../helloworld-service-b/target/classes"> - <!-- doesn't pick up the deployable composite properly without this?--> - <deploymentComposite location="service-b.composite"/> - </contribution> - -</node>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/three-nodes-three-vms-test/service-c-config.xml b/sca-java-2.x/trunk/itest/nodes/three-nodes-three-vms-test/service-c-config.xml deleted file mode 100644 index ba642c5ed0..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/three-nodes-three-vms-test/service-c-config.xml +++ /dev/null @@ -1,39 +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. ---> -<node xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200903" - xmlns="http://tuscany.apache.org/xmlns/sca/1.1" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" - uri="http://sample/nodes/TestNode1" - domain="http://domain1" - domainRegistry="tribes:default"> - - <!-- Configure the base URIs for a given binding --> - <!-- Each base URI is for a protocol supported by the binding --> - <binding name="sca:binding.sca" baseURIs="http://localhost:8081/sca https://localhost:8081/sca"/> - <binding name="sca:binding.ws" baseURIs="http://localhost:8082/ws https://localhost:8082/ws"/> - - <!-- Configure a list of contributions --> - <contribution uri="iface" location="../helloworld-iface/target/classes"/> - <contribution uri="service" location="../helloworld-service-c/target/classes"> - <!-- doesn't pick up the deployable composite properly without this?--> - <deploymentComposite location="service-c.composite"/> - </contribution> - -</node>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/three-nodes-three-vms-test/src/test/java/itest/ServiceA.java b/sca-java-2.x/trunk/itest/nodes/three-nodes-three-vms-test/src/test/java/itest/ServiceA.java deleted file mode 100644 index 6ef30fe43f..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/three-nodes-three-vms-test/src/test/java/itest/ServiceA.java +++ /dev/null @@ -1,65 +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 itest; - -import java.io.File; - -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - - -public class ServiceA { - - private static Node sericeNode; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - NodeFactory factory = NodeFactory.newInstance(); - - sericeNode = factory.createNode(new File("service-a-config.xml").toURI().toURL()); - - try { - sericeNode.start(); - } catch (Exception ex){ - ex.printStackTrace(); - throw ex; - } - } - - @Test - public void testNothing() throws Exception { - - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - if (sericeNode != null) { - sericeNode.stop(); - } - } - - public static void main(String[] args) throws Exception { - ServiceA.setUpBeforeClass(); - ServiceA.tearDownAfterClass(); - } -} diff --git a/sca-java-2.x/trunk/itest/nodes/three-nodes-three-vms-test/src/test/java/itest/ServiceB.java b/sca-java-2.x/trunk/itest/nodes/three-nodes-three-vms-test/src/test/java/itest/ServiceB.java deleted file mode 100644 index 67a8e5d92e..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/three-nodes-three-vms-test/src/test/java/itest/ServiceB.java +++ /dev/null @@ -1,55 +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 itest; - -import java.io.File; - -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -public class ServiceB { - - private static Node serviceNode; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - NodeFactory factory = NodeFactory.newInstance(); - - serviceNode = factory.createNode(new File("service-b-config.xml").toURI().toURL()); - serviceNode.start(); - } - - @Test - public void testNothing() throws Exception { - synchronized (this) { - this.wait(); - } - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - if (serviceNode != null) { - serviceNode.stop(); - } - } -} diff --git a/sca-java-2.x/trunk/itest/nodes/three-nodes-three-vms-test/src/test/java/itest/ServiceC.java b/sca-java-2.x/trunk/itest/nodes/three-nodes-three-vms-test/src/test/java/itest/ServiceC.java deleted file mode 100644 index d716b5cd98..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/three-nodes-three-vms-test/src/test/java/itest/ServiceC.java +++ /dev/null @@ -1,55 +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 itest; - -import java.io.File; - -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -public class ServiceC { - - private static Node serviceNode; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - NodeFactory factory = NodeFactory.newInstance(); - - serviceNode = factory.createNode(new File("service-c-config.xml").toURI().toURL()); - serviceNode.start(); - } - - @Test - public void testNothing() throws Exception { - synchronized (this) { - this.wait(); - } - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - if (serviceNode != null) { - serviceNode.stop(); - } - } -} diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-test/pom.xml b/sca-java-2.x/trunk/itest/nodes/two-nodes-test/pom.xml deleted file mode 100644 index 091f5cbb9e..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/two-nodes-test/pom.xml +++ /dev/null @@ -1,59 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-nodes-two-nodes-test</artifactId> - <name>Apache Tuscany SCA iTest Nodes Two Nodes Test</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-nodes-helloworld-iface</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-sca-client-impl</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - </dependencies> - -</project> diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-test/src/test/java/itest/ClientNode.java b/sca-java-2.x/trunk/itest/nodes/two-nodes-test/src/test/java/itest/ClientNode.java deleted file mode 100644 index 6da4c1f7e1..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/two-nodes-test/src/test/java/itest/ClientNode.java +++ /dev/null @@ -1,93 +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 itest; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import itest.nodes.Helloworld; - -import java.io.File; -import java.net.URI; - -import javax.xml.namespace.QName; - -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.apache.tuscany.sca.node.configuration.NodeConfiguration; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; -import org.oasisopen.sca.client.SCAClientFactory; - -/** - * This shows how to test the Calculator service component. - */ -public class ClientNode { - private final static String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200912"; - private static Node clientNode; - private static TestCaseRunner runner; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - runner = new TestCaseRunner(ServiceNode.class); - runner.beforeClass(); - System.setProperty("org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint.enabled", - "false"); - NodeFactory factory = NodeFactory.newInstance(); - NodeConfiguration conf = - factory.createNodeConfiguration().setURI("clientNode"). - addBinding(new QName(SCA11_NS, "binding.sca"), "http://localhost:8085/sca https://localhost:9085/sca") - .addBinding(new QName(SCA11_NS, "binding.ws"), "http://localhost:8086/ws") - .addContribution("client", new File("../helloworld-client/target/classes").toURI().toString()); - clientNode = factory.createNode(conf).start(); - Thread.sleep(1000); - } - - @Test - public void testCalculator() throws Exception { - - Helloworld client = clientNode.getService(Helloworld.class, "HelloworldClient"); - assertNotNull(client); - assertEquals("Hi Hello Petra", client.sayHello("Petra")); - } - - @Test - @Ignore("SCAClient needs to leverage the EndpointRegistry to invoke services that are not hosted on the local node") - public void testCalculatorClientAPI() throws Exception { - Helloworld service = SCAClientFactory.newInstance(URI.create("default")).getService(Helloworld.class, "HelloworldService"); - assertNotNull(service); - assertEquals("Hello Petra", service.sayHello("Petra")); - - Helloworld client = SCAClientFactory.newInstance(URI.create("default")).getService(Helloworld.class, "HelloworldClient"); - assertNotNull(client); - assertEquals("Hi Hello Petra", client.sayHello("Petra")); - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - if (clientNode != null) { - clientNode.stop(); - } - if (runner != null) { - runner.afterClass(); - } - } -} diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-test/src/test/java/itest/ServiceNode.java b/sca-java-2.x/trunk/itest/nodes/two-nodes-test/src/test/java/itest/ServiceNode.java deleted file mode 100644 index 4b034d89e0..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/two-nodes-test/src/test/java/itest/ServiceNode.java +++ /dev/null @@ -1,58 +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 itest; - -import java.io.File; - -import javax.xml.namespace.QName; - -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.apache.tuscany.sca.node.configuration.NodeConfiguration; -import org.junit.AfterClass; -import org.junit.BeforeClass; - -/** - * This shows how to test the Calculator service component. - */ -public class ServiceNode { - private final static String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200912"; - private static Node serviceNode; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - System.setProperty("org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint.enabled", - "false"); - NodeFactory factory = NodeFactory.newInstance(); - NodeConfiguration conf = - factory.createNodeConfiguration().setURI("serviceNode") - .addBinding(new QName(SCA11_NS, "binding.sca"), "http://localhost:8087/sca") - .addBinding(new QName(SCA11_NS, "binding.ws"), "http://localhost:8088/ws") - .addContribution("service", new File("../helloworld-service/target/classes").toURI().toString()); - serviceNode = factory.createNode(conf).start(); - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - if (serviceNode != null) { - serviceNode.stop(); - } - } -} diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-test/src/test/java/itest/StopStartNodesTestCase.java b/sca-java-2.x/trunk/itest/nodes/two-nodes-test/src/test/java/itest/StopStartNodesTestCase.java deleted file mode 100644 index 998492734b..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/two-nodes-test/src/test/java/itest/StopStartNodesTestCase.java +++ /dev/null @@ -1,103 +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 itest;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-import itest.nodes.Helloworld;
-
-import java.io.File;
-
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.Test;
-
-/**
- * Tests using two nodes and stopping and restarting a service node.
- */
-public class StopStartNodesTestCase {
-
- private static Node serviceNode;
- private static Node clientNode;
-
- @Test
- public void testCalculator() throws Exception {
- NodeFactory factory = NodeFactory.newInstance();
- serviceNode = factory.createNode(new Contribution("service", getJar("../helloworld-service/target")));
- serviceNode.start();
- clientNode = factory.createNode(new Contribution("client", getJar("../helloworld-client/target")));
- clientNode.start();
-
- Helloworld service = serviceNode.getService(Helloworld.class, "HelloworldService");
- assertNotNull(service);
- assertEquals("Hello Petra", service.sayHello("Petra"));
-
- Helloworld client = clientNode.getService(Helloworld.class, "HelloworldClient");
- assertNotNull(client);
- assertEquals("Hi Hello Petra", client.sayHello("Petra"));
-
- serviceNode.stop();
-
- client = clientNode.getService(Helloworld.class, "HelloworldClient");
- assertNotNull(client);
-
- try {
- client.sayHello("Petra");
- fail();
- } catch (Exception e) {
- // expected
- // TODO: better exception than NPE
- }
-
- serviceNode = factory.createNode(new Contribution("service", getJar("../helloworld-service/target")));
- serviceNode.start();
-
- client = clientNode.getService(Helloworld.class, "HelloworldClient");
- assertNotNull(client);
- assertEquals("Hi Hello Petra", client.sayHello("Petra"));
- }
-
- /**
- * Get the jar in the target folder without being dependent on the version name to
- * make tuscany releases easier
- */
- private static String getJar(String targetDirectory) {
- File f = new File(targetDirectory);
- for (File file : f.listFiles()) {
- if (file.getName().endsWith(".jar")) {
- return file.toURI().toString();
- }
- }
- throw new IllegalStateException("Can't find jar in: " + targetDirectory);
- }
-
- @AfterClass
- public static void tearDownAfterClass() throws Exception {
- if (serviceNode != null) {
- serviceNode.stop();
- }
- if (clientNode != null) {
- clientNode.stop();
- }
- }
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-test/src/test/java/itest/TestCaseRunner.java b/sca-java-2.x/trunk/itest/nodes/two-nodes-test/src/test/java/itest/TestCaseRunner.java deleted file mode 100644 index 7dfa6e66cc..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/two-nodes-test/src/test/java/itest/TestCaseRunner.java +++ /dev/null @@ -1,292 +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 itest; - -import java.lang.annotation.Annotation; -import java.lang.reflect.Constructor; -import java.lang.reflect.Method; -import java.net.URL; -import java.net.URLClassLoader; -import java.security.AccessController; -import java.security.PrivilegedAction; - -/** - * A helper class that can be used to run an SCA JUnit test case. The test case will run in an isolated class loader. - * - * @version $Rev$ $Date$ - */ -public class TestCaseRunner { - - private ClassLoader classLoader; - private Class<?> testSuiteClass; - private Object testSuite; - private Class<?> testResultClass; - private Class<?> testCaseClass; - private Object testCase; - - private Class<?> beforeAnnotation; - private Class<?> beforeClassAnnotation; - private Class<?> afterAnnotation; - private Class<?> afterClassAnnotation; - private Class<?> junit4AdapterClass; - private Class<?> junit3TestCaseClass; - - /** - * Constructs a new TestCase runner. - * - * @param testClass - */ - public TestCaseRunner(Class<?> testClass) { - try { - ClassLoader tccl = Thread.currentThread().getContextClassLoader(); - classLoader = testClass.getClassLoader(); - if (classLoader instanceof URLClassLoader) { - URL[] urls = ((URLClassLoader)classLoader).getURLs(); - classLoader = new URLClassLoader(urls, classLoader.getParent()); - } else if (classLoader == tccl || classLoader.getParent() == tccl) { - classLoader = new URLClassLoader(new URL[0], classLoader); - } else { - classLoader = tccl; - } - - try { - // Thread.currentThread().setContextClassLoader(classLoader); - // Allow privileged access to set class loader. Requires RuntimePermission - // setContextClassLoader in security policy. - final ClassLoader finalClassLoader = classLoader; - AccessController.doPrivileged(new PrivilegedAction<Object>() { - public Object run() { - Thread.currentThread().setContextClassLoader(finalClassLoader); - return null; - } - }); - - testCaseClass = Class.forName(testClass.getName(), true, classLoader); - testCase = testCaseClass.newInstance(); - ClassLoader testClassLoader = testCaseClass.getClassLoader(); - - junit3TestCaseClass = Class.forName("junit.framework.TestCase", true, testClassLoader); - - testSuiteClass = Class.forName("junit.framework.TestSuite", true, testClassLoader); - Constructor<?> testSuiteConstructor = testSuiteClass.getConstructor(Class.class); - testSuite = testSuiteConstructor.newInstance(testCaseClass); - - testResultClass = Class.forName("junit.framework.TestResult", true, testClassLoader); - - try { - beforeAnnotation = Class.forName("org.junit.Before", true, testClassLoader); - afterAnnotation = Class.forName("org.junit.After", true, testClassLoader); - beforeClassAnnotation = Class.forName("org.junit.BeforeClass", true, testClassLoader); - afterClassAnnotation = Class.forName("org.junit.AfterClass", true, testClassLoader); - junit4AdapterClass = Class.forName("junit.framework.JUnit4TestAdapter", true, testClassLoader); - } catch (Exception e) { - // Unexpected - throw new AssertionError(e); - } - } catch (Throwable e) { - e.printStackTrace(); - } finally { - // Thread.currentThread().setContextClassLoader(tccl); - // Allow privileged access to set class loader. Requires RuntimePermission - // setContextClassLoader in security policy. - final ClassLoader finaltccl = tccl; - AccessController.doPrivileged(new PrivilegedAction<Object>() { - public Object run() { - Thread.currentThread().setContextClassLoader(finaltccl); - return null; - } - }); - } - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - /** - * Run the test case - */ - public void run() { - ClassLoader tccl = Thread.currentThread().getContextClassLoader(); - try { - // Thread.currentThread().setContextClassLoader(classLoader); - // Allow privileged access to set class loader. Requires RuntimePermission - // setContextClassLoader in security policy. - final ClassLoader finalClassLoader = classLoader; - AccessController.doPrivileged(new PrivilegedAction<Object>() { - public Object run() { - Thread.currentThread().setContextClassLoader(finalClassLoader); - return null; - } - }); - - if (junit3TestCaseClass.isAssignableFrom(testCaseClass)) { - Object testResult = testResultClass.newInstance(); - Method runMethod = testSuiteClass.getMethod("run", testResultClass); - runMethod.invoke(testSuite, testResult); - } else { - Object junit4Adapter = junit4AdapterClass.getConstructor(Class.class).newInstance(testCaseClass); - Object testResult = testResultClass.newInstance(); - Method runMethod = junit4AdapterClass.getMethod("run", testResultClass); - runMethod.invoke(junit4Adapter, testResult); - } - } catch (Exception e) { - throw new RuntimeException(e); - } finally { - // Thread.currentThread().setContextClassLoader(tccl); - // Allow privileged access to set class loader. Requires RuntimePermission - // setContextClassLoader in security policy. - final ClassLoader finaltccl = tccl; - AccessController.doPrivileged(new PrivilegedAction<Object>() { - public Object run() { - Thread.currentThread().setContextClassLoader(finaltccl); - return null; - } - }); - } - } - - /** - * Invoke the setUp method - */ - public void setUp() { - execute("setUp"); - } - - /** - * Invoke the before methods - */ - public void before() { - execute(beforeAnnotation); - } - - /** - * Invoke the beforeClass methods - */ - public void beforeClass() { - execute(beforeClassAnnotation); - } - - /** - * Invoke the tearDown method - */ - public void tearDown() { - execute("tearDown"); - } - - /** - * Invoke the after methods - */ - public void after() { - execute(afterAnnotation); - } - - /** - * Invoke the afterClass methods - */ - public void afterClass() { - execute(afterClassAnnotation); - } - - /** - * Invoke the specified test method. - */ - public void run(String methodName) { - execute(methodName); - } - - /** - * Invoke the methods annotated with the specified annotation. - */ - private void execute(Class<?> annotationClass) { - if (annotationClass == null) { - throw new RuntimeException(new NoSuchMethodException()); - } - ClassLoader tccl = Thread.currentThread().getContextClassLoader(); - try { - // Thread.currentThread().setContextClassLoader(classLoader); - // Allow privileged access to set class loader. Requires RuntimePermission - // setContextClassLoader in security policy. - final ClassLoader finalClassLoader = classLoader; - AccessController.doPrivileged(new PrivilegedAction<Object>() { - public Object run() { - Thread.currentThread().setContextClassLoader(finalClassLoader); - return null; - } - }); - - for (Method method : testCaseClass.getDeclaredMethods()) { - for (Annotation annotation : method.getAnnotations()) { - if (annotation.annotationType() == annotationClass) { - method.invoke(testCase); - } - } - } - } catch (Exception e) { - throw new RuntimeException(e); - } finally { - // Thread.currentThread().setContextClassLoader(tccl); - // Allow privileged access to set class loader. Requires RuntimePermission - // setContextClassLoader in security policy. - final ClassLoader finaltccl = tccl; - AccessController.doPrivileged(new PrivilegedAction<Object>() { - public Object run() { - Thread.currentThread().setContextClassLoader(finaltccl); - return null; - } - }); - } - } - - /** - * Invoke the specified method - */ - private void execute(String methodName) { - ClassLoader tccl = Thread.currentThread().getContextClassLoader(); - try { - // Thread.currentThread().setContextClassLoader(classLoader); - // Allow privileged access to set class loader. Requires RuntimePermission - // setContextClassLoader in security policy. - final ClassLoader finalClassLoader = classLoader; - AccessController.doPrivileged(new PrivilegedAction<Object>() { - public Object run() { - Thread.currentThread().setContextClassLoader(finalClassLoader); - return null; - } - }); - Method setUpMethod = testCaseClass.getDeclaredMethod(methodName); - setUpMethod.setAccessible(true); - setUpMethod.invoke(testCase); - } catch (Exception e) { - throw new RuntimeException(e); - } finally { - // Thread.currentThread().setContextClassLoader(tccl); - // Allow privileged access to set class loader. Requires RuntimePermission - // setContextClassLoader in security policy. - final ClassLoader finaltccl = tccl; - AccessController.doPrivileged(new PrivilegedAction<Object>() { - public Object run() { - Thread.currentThread().setContextClassLoader(finaltccl); - return null; - } - }); - } - } - -} - diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-test/src/test/java/itest/TwoNodesTestCase.java b/sca-java-2.x/trunk/itest/nodes/two-nodes-test/src/test/java/itest/TwoNodesTestCase.java deleted file mode 100644 index 80c36e5ee9..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/two-nodes-test/src/test/java/itest/TwoNodesTestCase.java +++ /dev/null @@ -1,106 +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 itest; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import itest.nodes.Helloworld; - -import java.io.File; -import java.net.URI; - -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.apache.tuscany.sca.node.configuration.NodeConfiguration; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.oasisopen.sca.client.SCAClientFactory; - -/** - * This shows how to test the Calculator service component. - */ -public class TwoNodesTestCase { - - private static Node serviceNode; - private static Node clientNode; - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - System.setProperty("org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint.enabled", - "false"); - NodeFactory factory = NodeFactory.getInstance(); - NodeConfiguration configuration1 = - factory.createNodeConfiguration().setURI("serviceNode") - .addContribution("service", getJar("../helloworld-service/target")); - serviceNode = factory.createNode(configuration1).start(); - - NodeConfiguration configuration2 = - factory.createNodeConfiguration().setURI("clientNode") - .addContribution("client", getJar("../helloworld-client/target")); - clientNode = factory.createNode(configuration2).start(); - } - - /** - * Get the jar in the target folder without being dependent on the version name to - * make tuscany releases easier - */ - private static String getJar(String targetDirectory) { - File f = new File(targetDirectory); - for (File file : f.listFiles()) { - if (file.getName().endsWith(".jar")) { - return file.toURI().toString(); - } - } - throw new IllegalStateException("Can't find jar in: " + targetDirectory); - } - - @Test - public void testCalculator() throws Exception { - Helloworld service = serviceNode.getService(Helloworld.class, "HelloworldService"); - assertNotNull(service); - assertEquals("Hello Petra", service.sayHello("Petra")); - - Helloworld client = clientNode.getService(Helloworld.class, "HelloworldClient"); - assertNotNull(client); - assertEquals("Hi Hello Petra", client.sayHello("Petra")); - } - - @Test - public void testCalculatorClientAPI() throws Exception { - Helloworld service = SCAClientFactory.newInstance(URI.create("default")).getService(Helloworld.class, "HelloworldService"); - assertNotNull(service); - assertEquals("Hello Petra", service.sayHello("Petra")); - - Helloworld client = SCAClientFactory.newInstance(URI.create("default")).getService(Helloworld.class, "HelloworldClient"); - assertNotNull(client); - assertEquals("Hi Hello Petra", client.sayHello("Petra")); - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - if (serviceNode != null) { - serviceNode.stop(); - } - if (clientNode != null) { - clientNode.stop(); - } - } -} diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/build.xml b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/build.xml deleted file mode 100644 index ad0476c6d1..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/build.xml +++ /dev/null @@ -1,39 +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.
--->
-<project name="itest-samples" default="run">
-
- <target name="run">
-
- <parallel failonany="true">
-
- <daemons>
- <ant antfile="server.xml"/>
- </daemons>
-
- <sequential>
- <sleep seconds="5"/>
- <ant antfile="client.xml"/>
- <ant antfile="scaclient.xml"/>
- </sequential>
-
- </parallel>
-
- </target>
-
-</project>
diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/client-config.xml b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/client-config.xml deleted file mode 100644 index a5e4a0b7c3..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/client-config.xml +++ /dev/null @@ -1,39 +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.
--->
-<node xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns="http://tuscany.apache.org/xmlns/sca/1.1"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- uri="http://sample/nodes/TestNode1"
- domain="default"
- domainRegistry="tuscany:default">
-
- <!-- Configure the base URIs for a given binding -->
- <!-- Each base URI is for a protocol supported by the binding -->
- <binding name="sca:binding.sca" baseURIs="http://localhost:8081/sca https://localhost:8081/sca"/>
- <binding name="sca:binding.ws" baseURIs="http://localhost:8082/ws https://localhost:8082/ws"/>
-
- <!-- Configure a list of contributions -->
- <contribution uri="iface" location="../helloworld-iface/target/itest-nodes-helloworld-iface-2.0-SNAPSHOT.jar"/>
- <contribution uri="client" location="../helloworld-client/target/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar">
- <!-- doesn't pick up the deployable composite properly without this?-->
- <deploymentComposite location="helloworld-client.composite"/>
- </contribution>
-
-</node>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/client.xml b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/client.xml deleted file mode 100644 index b7a0e63a48..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/client.xml +++ /dev/null @@ -1,55 +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.
--->
-<project name="client" default="run">
-
- <!--echo>${runtime_classpath}</echo-->
-
- <target name="run">
- <java classpath="${runtime_classpath};./target/test-classes"
- classname="itest.Client"
- fork="true"
- failonerror="true">
- </java>
- </target>
-
-
- <target name="run-cmdline">
- <java classpath="../../../distribution/all/target/apache-tuscany-sca-all-2.0-SNAPSHOT.dir/tuscany-sca-2.0-SNAPSHOT/features/tuscany-sca-manifest.jar:./target/test-classes:../helloworld-iface/target/classes"
- classname="itest.Client"
- fork="true"
- failonerror="true">
- </java>
- </target>
-
- <target name="run-cmdline-seq">
- <sequential>
- <antcall target="run-cmdline"/>
- <antcall target="run-cmdline"/>
- <antcall target="run-cmdline"/>
- </sequential>
- </target>
-
- <target name="run-cmdline-par">
- <parallel>
- <antcall target="run-cmdline"/>
- <antcall target="run-cmdline"/>
- <antcall target="run-cmdline"/>
- </parallel>
- </target>
-</project>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/pom.xml b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/pom.xml deleted file mode 100644 index 05fec4cb54..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/pom.xml +++ /dev/null @@ -1,114 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>itest-nodes-two-nodes-two-vms-hazelcast</artifactId>
- <name>Apache Tuscany SCA iTest Nodes Two Nodes Two VMs Test using Hazelcast registry</name>
-
- <dependencies>
- <!--dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-domain-node</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency-->
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-endpoint-hazelcast</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-endpoint-hazelcast-client</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>itest-nodes-helloworld-iface</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-launcher</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-client-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-sca-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-rmi-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-jetty</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>run-samples</id>
- <phase>test</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks unless="maven.test.skip">
- <property name="tuscany.version" value="${version}" />
- <property name="runtime_classpath" refid="maven.runtime.classpath"/>
- <ant antfile="./build.xml" target="run"/>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/scaclient.xml b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/scaclient.xml deleted file mode 100644 index b85d1a7915..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/scaclient.xml +++ /dev/null @@ -1,54 +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. ---> -<project name="scaclient" default="run"> - - <!--echo>${runtime_classpath}</echo--> - - <target name="run"> - <java classpath="${runtime_classpath};./target/test-classes" - classname="itest.SCAClient" - fork="true" - failonerror="true"> - </java> - </target> - - <target name="run-cmdline"> - <java classpath="../../../distribution/all/target/apache-tuscany-sca-all-2.0-SNAPSHOT.dir/tuscany-sca-2.0-SNAPSHOT/features/tuscany-sca-manifest.jar:./target/test-classes:../helloworld-iface/target/classes" - classname="itest.SCAClient" - fork="true" - failonerror="true"> - </java> - </target> - - <target name="run-cmdline-seq"> - <sequential> - <antcall target="run-cmdline"/> - <antcall target="run-cmdline"/> - <antcall target="run-cmdline"/> - </sequential> - </target> - - <target name="run-cmdline-par"> - <parallel> - <antcall target="run-cmdline"/> - <antcall target="run-cmdline"/> - <antcall target="run-cmdline"/> - </parallel> - </target> -</project>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/server-config.xml b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/server-config.xml deleted file mode 100644 index 841471f95f..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/server-config.xml +++ /dev/null @@ -1,39 +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.
--->
-<node xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns="http://tuscany.apache.org/xmlns/sca/1.1"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- uri="http://sample/nodes/TestNode2"
- domain="default"
- domainRegistry="tuscany:default?listen=127.0.0.1:14820">
-
- <!-- Configure the base URIs for a given binding -->
- <!-- Each base URI is for a protocol supported by the binding -->
- <binding name="sca:binding.sca" baseURIs="http://localhost:8081/sca https://localhost:8081/sca"/>
- <binding name="sca:binding.ws" baseURIs="http://localhost:8082/ws https://localhost:8082/ws"/>
-
- <!-- Configure a list of contributions -->
- <contribution uri="iface" location="../helloworld-iface/target/classes"/>
- <contribution uri="service" location="../helloworld-service/target/classes">
- <!-- doesn't pick up the deployable composite properly without this?-->
- <deploymentComposite location="helloworld-service.composite"/>
- </contribution>
-
-</node>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/server.xml b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/server.xml deleted file mode 100644 index 98474d2cf4..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/server.xml +++ /dev/null @@ -1,42 +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.
--->
-<project name="server" default="run">
-
- <!--echo>${runtime_classpath}</echo-->
-
- <target name="run">
- <java classpath="${runtime_classpath}" classname="org.apache.tuscany.sca.node.launcher.NodeMain" fork="true">
- <sysproperty key="org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding" value="{http://tuscany.apache.org/xmlns/sca/1.1}binding.rmi"/>
- <arg value="-node"/>
- <arg value="./server-config.xml"/>
- <!-- Give the server 60 seconds to stay -->
- <arg value="-ttl"/>
- <arg value="60000"/>
- </java>
- </target>
-
- <target name="run-cmdline">
- <java classpath="../../../distribution/all/target/apache-tuscany-sca-all-2.0-SNAPSHOT.dir/tuscany-sca-2.0-SNAPSHOT/features/tuscany-sca-manifest.jar:./target/test-classes:../helloworld-iface/target/classes"
- classname="itest.Service"
- fork="true"
- failonerror="true">
- </java>
- </target>
-
-</project>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Client.java b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Client.java deleted file mode 100644 index 5d884921fd..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Client.java +++ /dev/null @@ -1,56 +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 itest;
-
-import java.net.URI;
-
-import org.apache.tuscany.sca.binding.rmi.RMIBinding;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class Client {
-
- private static Node clientNode;
-
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {
- clientNode = NodeFactory.newInstance().createNode(URI.create("tuscany:default?listen=127.0.0.1:14821"), "../helloworld-client/target//classes");
- clientNode.start();
- }
-
- @Test
- public void testNothing() throws Exception {
- }
-
- @AfterClass
- public static void tearDownAfterClass() throws Exception {
- if (clientNode != null) {
- clientNode.stop();
- }
- }
-
- public static void main(String[] args) throws Exception {
- Client.setUpBeforeClass();
- Client.tearDownAfterClass();
- }
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/SCAClient.java b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/SCAClient.java deleted file mode 100644 index 81af1c6b5b..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/SCAClient.java +++ /dev/null @@ -1,66 +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 itest; - -import itest.nodes.Helloworld; - -import java.net.URI; - -import org.apache.tuscany.sca.binding.rmi.RMIBinding; -import org.apache.tuscany.sca.node.NodeFactory; -import org.oasisopen.sca.client.SCAClientFactory; - -public class SCAClient { - - public void testSCAClient() throws Exception { - // The configuration required when running with sca-client-rmi and endpoint-hazelcast-rmi - SCAClientFactory factory = SCAClientFactory.newInstance(URI.create("tuscanyclient:default?remotes=127.0.0.1:14820")); - - // The configuration required when running with sca-client-impl and endpoint-hazelcast - //SCAClientFactory factory = SCAClientFactory.newInstance(URI.create("tuscany:default")); - - // Sleep 3 seconds so that the endpoint is populated into the EndpointRegistry - //Thread.sleep(3000); - - Helloworld service = factory.getService(Helloworld.class, "HelloworldService"); - - String response = service.sayHello("test"); - if (response == null || !response.equals("Hello test")){ - throw new Exception("Test failed - expecting 'Hello test' got " + response); - } else { - System.out.println("Test success - " + response); - } - - //TODO - When using the hazelcast registry (or client) it causes the - // JVM to hang on shutdown as it created non-daemon threads - // So destroy the node factory here which should bring down - // the runtime and hence hazelcast. - // There's currently no interface on the client factory - // for doing this so we may need to talk to OASIS about adding one - // or just rely on the runtime hosting the classes using the SCAClient - // when it's on its way down - //NodeFactory.getInstance().destroy(); - } - - public static void main(String[] args) throws Exception { - SCAClient client = new SCAClient(); - client.testSCAClient(); - } -} diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Service.java b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Service.java deleted file mode 100644 index 0c9659b0ef..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-hazelcast/src/test/java/itest/Service.java +++ /dev/null @@ -1,59 +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 itest;
-
-import java.net.URI;
-
-import org.apache.tuscany.sca.binding.rmi.RMIBinding;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class Service {
-
- private static Node serviceNode;
-
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {
- serviceNode = NodeFactory.newInstance().createNode(URI.create("tuscany:default"), "../helloworld-service/target/classes");
- serviceNode.start();
- }
-
- @Test
- public void testNothing() throws Exception {
- // Stay for 1 min
- Thread.sleep(60000);
- }
-
- @AfterClass
- public static void tearDownAfterClass() throws Exception {
- if (serviceNode != null) {
- serviceNode.stop();
- }
- }
-
- public static void main(String[] args) throws Exception {
- Service.setUpBeforeClass();
- new Service().testNothing();
- Service.tearDownAfterClass();
- }
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/build.xml b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/build.xml deleted file mode 100644 index fa7e963e87..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/build.xml +++ /dev/null @@ -1,38 +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. ---> -<project name="itest-samples" default="run"> - - <target name="run"> - - <parallel failonany="true"> - - <daemons> - <ant antfile="server.xml"/> - </daemons> - - <sequential> - <sleep seconds="10"/> - <ant antfile="client.xml"/> - </sequential> - - </parallel> - - </target> - -</project> diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/client-config.xml b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/client-config.xml deleted file mode 100644 index 5afc1eddfa..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/client-config.xml +++ /dev/null @@ -1,39 +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. ---> -<node xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns="http://tuscany.apache.org/xmlns/sca/1.1" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" - uri="http://sample/nodes/TestNode1" - domainRegistry = "tribes://228.0.0.100:50000" - domain="http://domain1"> - - <!-- Configure the base URIs for a given binding --> - <!-- Each base URI is for a protocol supported by the binding --> - <binding name="sca:binding.sca" baseURIs="http://localhost:8081/sca https://localhost:8081/sca"/> - <binding name="sca:binding.ws" baseURIs="http://localhost:8082/ws https://localhost:8082/ws"/> - - <!-- Configure a list of contributions --> - <contribution uri="iface" location="../helloworld-iface/target/itest-nodes-helloworld-iface-2.0-SNAPSHOT.jar"/> - <contribution uri="client" location="../helloworld-client/target/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar"> - <!-- doesn't pick up the deployable composite properly without this?--> - <deploymentComposite location="helloworld-client.composite"/> - </contribution> - -</node>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/client.xml b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/client.xml deleted file mode 100644 index 8e7c744940..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/client.xml +++ /dev/null @@ -1,31 +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. ---> -<project name="server" default="run"> - - <!--echo>${runtime_classpath}</echo--> - - <target name="run"> - <java classpath="${runtime_classpath};./target/test-classes" - classname="itest.Client" - fork="true" - failonerror="true"> - </java> - </target> - -</project>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/pom.xml b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/pom.xml deleted file mode 100644 index 2f80274c47..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/pom.xml +++ /dev/null @@ -1,104 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-nodes-two-nodes-two-vms-test</artifactId> - <name>Apache Tuscany SCA iTest Nodes Two Nodes Two VMs Test</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-domain-node</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-endpoint-tribes</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-nodes-helloworld-iface</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-launcher</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-sca-client-impl</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-rmi-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-jetty</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>run-samples</id> - <phase>test</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks unless="maven.test.skip"> - <property name="tuscany.version" value="${version}" /> - <property name="runtime_classpath" refid="maven.runtime.classpath"/> - <ant antfile="./build.xml" target="run"/> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/server-config.xml b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/server-config.xml deleted file mode 100644 index 590cf3bddb..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/server-config.xml +++ /dev/null @@ -1,39 +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. ---> -<node xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns="http://tuscany.apache.org/xmlns/sca/1.1" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" - uri="http://sample/nodes/TestNode2" - domainRegistry = "tribes://228.0.0.100:50000" - domain="http://domain1"> - - <!-- Configure the base URIs for a given binding --> - <!-- Each base URI is for a protocol supported by the binding --> - <binding name="sca:binding.sca" baseURIs="http://localhost:8081/sca https://localhost:8081/sca"/> - <binding name="sca:binding.ws" baseURIs="http://localhost:8082/ws https://localhost:8082/ws"/> - - <!-- Configure a list of contributions --> - <contribution uri="iface" location="../helloworld-iface/target/classes"/> - <contribution uri="service" location="../helloworld-service/target/classes"> - <!-- doesn't pick up the deployable composite properly without this?--> - <deploymentComposite location="helloworld-service.composite"/> - </contribution> - -</node>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/server.xml b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/server.xml deleted file mode 100644 index 05a5aa16e9..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/server.xml +++ /dev/null @@ -1,33 +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. ---> -<project name="server" default="run"> - - <!--echo>${runtime_classpath}</echo--> - - <target name="run"> - <java classpath="${runtime_classpath}" classname="org.apache.tuscany.sca.node.launcher.NodeMain" fork="true"> - <sysproperty key="org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding" value="{http://tuscany.apache.org/xmlns/sca/1.1}binding.rmi"/> - <arg value="-node"/> - <arg value="./server-config.xml"/> - <arg value="-ttl"/> - <arg value="15000"/> - </java> - </target> - -</project>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Client.java b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Client.java deleted file mode 100644 index eef3362c10..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Client.java +++ /dev/null @@ -1,69 +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 itest;
-
-import java.io.File;
-
-import org.apache.tuscany.sca.binding.rmi.RMIBinding;
-import org.apache.tuscany.sca.domain.node.DomainNode;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class Client {
-
- private static Node clientNode;
-// private static DomainNode clientNode;
-
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {
- NodeFactory factory = NodeFactory.newInstance();
-
- clientNode = factory.createNode(new File("client-config.xml").toURI().toURL());
-
- try {
- clientNode.start();
- } catch (Exception ex){
- ex.printStackTrace();
- throw ex;
- }
-
-// clientNode = new DomainNode("tribes:default", new String []{"../helloworld-client/target/itest-nodes-helloworld-client-2.0-SNAPSHOT.jar"});
- }
-
- @Test
- public void testNothing() throws Exception {
-
- }
-
- @AfterClass
- public static void tearDownAfterClass() throws Exception {
- if (clientNode != null) {
- clientNode.stop();
- }
- }
-
- public static void main(String[] args) throws Exception {
- Client.setUpBeforeClass();
- Client.tearDownAfterClass();
- }
-}
diff --git a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Service.java b/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Service.java deleted file mode 100644 index 7323c2c122..0000000000 --- a/sca-java-2.x/trunk/itest/nodes/two-nodes-two-vms-test/src/test/java/itest/Service.java +++ /dev/null @@ -1,61 +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 itest;
-
-import java.io.File;
-
-import org.apache.tuscany.sca.binding.rmi.RMIBinding;
-import org.apache.tuscany.sca.domain.node.DomainNode;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class Service {
-
- private static Node serviceNode;
-// private static DomainNode serviceNode;
-
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {
- NodeFactory factory = NodeFactory.newInstance();
-
- serviceNode = factory.createNode(new File("server-config.xml").toURI().toURL());
- serviceNode.start();
-
-// serviceNode = new DomainNode("tribes:default", new String[]{"../helloworld-service/target/classes"});
-
- }
-
- @Test
- public void testNothing() throws Exception {
- synchronized (this) {
- this.wait();
- }
- }
-
- @AfterClass
- public static void tearDownAfterClass() throws Exception {
- if (serviceNode != null) {
- serviceNode.stop();
- }
- }
-}
diff --git a/sca-java-2.x/trunk/itest/oneway/build.xml b/sca-java-2.x/trunk/itest/oneway/build.xml deleted file mode 100644 index 79222717b9..0000000000 --- a/sca-java-2.x/trunk/itest/oneway/build.xml +++ /dev/null @@ -1,127 +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. ---> -<project name="oneway" default="runServer"> - - <property name="m2.repo" value="${user.home}\.m2\repository" /> - - <path id="repo.classpath"> - <pathelement location="target/classes"/> - <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-spi\2.0-SNAPSHOT\tuscany-core-spi-2.0-SNAPSHOT.jar"/> - <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-http\2.0-SNAPSHOT\tuscany-host-http-2.0-SNAPSHOT.jar"/> - <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-axis2\2.0-SNAPSHOT\tuscany-binding-ws-axis2-2.0-SNAPSHOT.jar"/> - <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy\2.0-SNAPSHOT\tuscany-policy-2.0-SNAPSHOT.jar"/> - <pathelement location="${m2.repo}\xerces\xercesImpl\2.8.1\xercesImpl-2.8.1.jar"/> - <pathelement location="${m2.repo}\org\mortbay\jetty\jetty-util\6.1.3\jetty-util-6.1.3.jar"/> - <pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-jms_1.1_spec\1.1\geronimo-jms_1.1_spec-1.1.jar"/> - <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java-runtime\2.0-SNAPSHOT\tuscany-implementation-java-runtime-2.0-SNAPSHOT.jar"/> - <pathelement location="${m2.repo}\wsdl4j\wsdl4j\1.6.2\wsdl4j-1.6.2.jar"/> - <pathelement location="${m2.repo}\commons-codec\commons-codec\1.3\commons-codec-1.3.jar"/> - <pathelement location="${m2.repo}\xml-apis\xml-apis\1.3.03\xml-apis-1.3.03.jar"/> - <pathelement location="${m2.repo}\org\apache\ws\security\wss4j\1.5.3\wss4j-1.5.3.jar"/> - <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-namespace\2.0-SNAPSHOT\tuscany-contribution-namespace-2.0-SNAPSHOT.jar"/> - <pathelement location="${m2.repo}\jdom\jdom\1.0\jdom-1.0.jar"/> - <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xsd\2.0-SNAPSHOT\tuscany-assembly-xsd-2.0-SNAPSHOT.jar"/> - <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly\2.0-SNAPSHOT\tuscany-assembly-2.0-SNAPSHOT.jar"/> - <pathelement location="${m2.repo}\org\apache\rampart\rampart-trust\1.3\rampart-trust-1.3.jar"/> - <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-databinding\2.0-SNAPSHOT\tuscany-core-databinding-2.0-SNAPSHOT.jar"/> - <pathelement location="${m2.repo}\dom4j\dom4j\1.6.1\dom4j-1.6.1.jar"/> - <pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-api\1.2.5\axiom-api-1.2.5.jar"/> - <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-xml\2.0-SNAPSHOT\tuscany-policy-xml-2.0-SNAPSHOT.jar"/> - <pathelement location="${m2.repo}\org\apache\axis2\axis2-kernel\1.3\axis2-kernel-1.3.jar"/> - <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-sca-api\2.0-SNAPSHOT\tuscany-sca-api-2.0-SNAPSHOT.jar"/> - <pathelement location="${m2.repo}\cglib\cglib-nodep\2.1_3\cglib-nodep-2.1_3.jar"/> - <pathelement location="${m2.repo}\org\apache\httpcomponents\httpcore\4.0-alpha5\httpcore-4.0-alpha5.jar"/> - <pathelement location="${m2.repo}\backport-util-concurrent\backport-util-concurrent\2.2\backport-util-concurrent-2.2.jar"/> - <pathelement location="${m2.repo}\commons-logging\commons-logging\1.1\commons-logging-1.1.jar"/> - <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-java\2.0-SNAPSHOT\tuscany-contribution-java-2.0-SNAPSHOT.jar"/> - <pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-activation_1.1_spec\1.0-M1\geronimo-activation_1.1_spec-1.0-M1.jar"/> - <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding\2.0-SNAPSHOT\tuscany-databinding-2.0-SNAPSHOT.jar"/> - <pathelement location="${m2.repo}\logkit\logkit\1.0.1\logkit-1.0.1.jar"/> - <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-xml\2.0-SNAPSHOT\tuscany-binding-ws-xml-2.0-SNAPSHOT.jar"/> - <pathelement location="${m2.repo}\commons-fileupload\commons-fileupload\1.1.1\commons-fileupload-1.1.1.jar"/> - <pathelement location="${m2.repo}\annogen\annogen\0.1.0\annogen-0.1.0.jar"/> - <pathelement location="${m2.repo}\javax\servlet\servlet-api\2.5\servlet-api-2.5.jar"/> - <pathelement location="${m2.repo}\org\apache\axis2\axis2-adb\1.3\axis2-adb-1.3.jar"/> - <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-security\2.0-SNAPSHOT\tuscany-policy-security-2.0-SNAPSHOT.jar"/> - <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xml\2.0-SNAPSHOT\tuscany-assembly-xml-2.0-SNAPSHOT.jar"/> - <pathelement location="${m2.repo}\org\apache\axis2\axis2-mtompolicy\1.3\axis2-mtompolicy-1.3.jar"/> - <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-domain\2.0-SNAPSHOT\tuscany-domain-2.0-SNAPSHOT.jar"/> - <pathelement location="${m2.repo}\commons-httpclient\commons-httpclient\3.0.1\commons-httpclient-3.0.1.jar"/> - <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java\2.0-SNAPSHOT\tuscany-interface-java-2.0-SNAPSHOT.jar"/> - <pathelement location="${m2.repo}\org\apache\axis2\axis2-java2wsdl\1.3\axis2-java2wsdl-1.3.jar"/> - <pathelement location="${m2.repo}\org\apache\httpcomponents\httpcore-nio\4.0-alpha5\httpcore-nio-4.0-alpha5.jar"/> - <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution\2.0-SNAPSHOT\tuscany-contribution-2.0-SNAPSHOT.jar"/> - <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java\2.0-SNAPSHOT\tuscany-implementation-java-2.0-SNAPSHOT.jar"/> - <pathelement location="${m2.repo}\xalan\xalan\2.7.0\xalan-2.7.0.jar"/> - <pathelement location="${m2.repo}\com\ibm\icu\icu4j\2.6.1\icu4j-2.6.1.jar"/> - <pathelement location="${m2.repo}\org\apache\rampart\rampart-core\1.3\rampart-core-1.3.jar"/> - <pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-commonj_1.1_spec\1.0\geronimo-commonj_1.1_spec-1.0.jar"/> - <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-domain-api\2.0-SNAPSHOT\tuscany-domain-api-2.0-SNAPSHOT.jar"/> - <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca\2.0-SNAPSHOT\tuscany-binding-sca-2.0-SNAPSHOT.jar"/> - <pathelement location="${m2.repo}\xom\xom\1.0\xom-1.0.jar"/> - <pathelement location="${m2.repo}\org\apache\ant\ant-launcher\1.7.0\ant-launcher-1.7.0.jar"/> - <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-jetty\2.0-SNAPSHOT\tuscany-host-jetty-2.0-SNAPSHOT.jar"/> - <pathelement location="${m2.repo}\org\apache\rampart\rampart-policy\1.3\rampart-policy-1.3.jar"/> - <pathelement location="${m2.repo}\org\apache\httpcomponents\httpcore-niossl\4.0-alpha5\httpcore-niossl-4.0-alpha5.jar"/> - <pathelement location="${m2.repo}\junit\junit\4.2\junit-4.2.jar"/> - <pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-impl\1.2.5\axiom-impl-1.2.5.jar"/> - <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java-xml\2.0-SNAPSHOT\tuscany-implementation-java-xml-2.0-SNAPSHOT.jar"/> - <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-xml\2.0-SNAPSHOT\tuscany-binding-sca-xml-2.0-SNAPSHOT.jar"/> - <pathelement location="${m2.repo}\org\apache\neethi\neethi\2.0.2\neethi-2.0.2.jar"/> - <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl\2.0-SNAPSHOT\tuscany-interface-wsdl-2.0-SNAPSHOT.jar"/> - <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws\2.0-SNAPSHOT\tuscany-binding-ws-2.0-SNAPSHOT.jar"/> - <pathelement location="${m2.repo}\javax\activation\activation\1.1\activation-1.1.jar"/> - <pathelement location="${m2.repo}\org\apache\ant\ant\1.7.0\ant-1.7.0.jar"/> - <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding-axiom\2.0-SNAPSHOT\tuscany-databinding-axiom-2.0-SNAPSHOT.jar"/> - <pathelement location="${m2.repo}\org\mortbay\jetty\jetty\6.1.3\jetty-6.1.3.jar"/> - <pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-javamail_1.4_spec\1.0-M1\geronimo-javamail_1.4_spec-1.0-M1.jar"/> - <pathelement location="${m2.repo}\avalon-framework\avalon-framework\4.1.3\avalon-framework-4.1.3.jar"/> - <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core\2.0-SNAPSHOT\tuscany-core-2.0-SNAPSHOT.jar"/> - <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl-xml\2.0-SNAPSHOT\tuscany-interface-wsdl-xml-2.0-SNAPSHOT.jar"/> - <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-impl\2.0-SNAPSHOT\tuscany-contribution-impl-2.0-SNAPSHOT.jar"/> - <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-node\2.0-SNAPSHOT\tuscany-node-2.0-SNAPSHOT.jar"/> - <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-definitions\2.0-SNAPSHOT\tuscany-definitions-2.0-SNAPSHOT.jar"/> - <pathelement location="${m2.repo}\org\apache\santuario\xmlsec\1.4.0\xmlsec-1.4.0.jar"/> - <pathelement location="${m2.repo}\jaxen\jaxen\1.1.1\jaxen-1.1.1.jar"/> - <pathelement location="${m2.repo}\commons-io\commons-io\1.2\commons-io-1.2.jar"/> - <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-embedded\2.0-SNAPSHOT\tuscany-host-embedded-2.0-SNAPSHOT.jar"/> - <pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-dom\1.2.5\axiom-dom-1.2.5.jar"/> - <pathelement location="${m2.repo}\log4j\log4j\1.2.12\log4j-1.2.12.jar"/> - <pathelement location="${m2.repo}\javax\mail\mail\1.4\mail-1.4.jar"/> - <pathelement location="${m2.repo}\org\apache\axis2\axis2-codegen\1.3\axis2-codegen-1.3.jar"/> - <pathelement location="${m2.repo}\org\codehaus\woodstox\wstx-asl\3.2.1\wstx-asl-3.2.1.jar"/> - <pathelement location="${m2.repo}\stax\stax-api\1.0.1\stax-api-1.0.1.jar"/> - <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java-xml\2.0-SNAPSHOT\tuscany-interface-java-xml-2.0-SNAPSHOT.jar"/> - <pathelement location="${m2.repo}\org\apache\ws\commons\schema\XmlSchema\1.3.2\XmlSchema-1.3.2.jar"/> - <pathelement location="${m2.repo}\xerces\xmlParserAPIs\2.6.2\xmlParserAPIs-2.6.2.jar"/> - <pathelement location="${m2.repo}\org\apache\woden\woden\1.0-incubating-M7b\woden-1.0-incubating-M7b.jar"/> - <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface\2.0-SNAPSHOT\tuscany-interface-2.0-SNAPSHOT.jar"/> - <pathelement location="${m2.repo}\org\easymock\easymock\2.2\easymock-2.2.jar"/> - </path> - - <target name="runServer"> - <java classname="org.apache.tuscany.sca.itest.oneway.impl.OneWayServer" - fork="true"> - <classpath> - <path refid="repo.classpath"/> - </classpath> - </java> - </target> - -</project> diff --git a/sca-java-2.x/trunk/itest/oneway/pom.xml b/sca-java-2.x/trunk/itest/oneway/pom.xml deleted file mode 100644 index b0ef9774e7..0000000000 --- a/sca-java-2.x/trunk/itest/oneway/pom.xml +++ /dev/null @@ -1,64 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-oneway</artifactId> - <name>Apache Tuscany SCA iTest OneWay</name> - <version>2.0-SNAPSHOT</version> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> - <version>${pom.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>${pom.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> - <version>${pom.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-jetty</artifactId> - <version>${pom.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>${pom.version}</version> - <scope>runtime</scope> - </dependency> - </dependencies> -</project> diff --git a/sca-java-2.x/trunk/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java b/sca-java-2.x/trunk/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java deleted file mode 100644 index ecd239d5fb..0000000000 --- a/sca-java-2.x/trunk/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java +++ /dev/null @@ -1,40 +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.itest.oneway; - -/** - * The client for the oneway itest. - * - * @version $Rev$ $Date$ - */ -public interface OneWayClient { - - /** - * This method will invoke the doSomething() @OneWay method on the OneWayService - * the specified number of times. - * - * @param count The number of times to invoke doSomething() on the OneWayService - */ - void doSomething(int count); - - /** - * This method will invoke a @OneWay method that throws an exception. - */ - void doSomethingWhichThrowsException(); -} diff --git a/sca-java-2.x/trunk/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java b/sca-java-2.x/trunk/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java deleted file mode 100644 index ba74b67d31..0000000000 --- a/sca-java-2.x/trunk/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java +++ /dev/null @@ -1,47 +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.itest.oneway; - - -import org.oasisopen.sca.annotation.OneWay; -import org.oasisopen.sca.annotation.Remotable; - - -/** - * The service interface used when testing @OneWay interactions. - * - * @version $Rev$ $Date$ - */ -@Remotable -public interface OneWayService { - - /** - * This OneWay method will increment the callCount by 1. - * - * @param count Not used - */ - @OneWay - void doSomething(int count); - - /** - * This one way method will throw a NullPointerException. - */ - @OneWay - void doSomethingWhichThrowsException(); -} diff --git a/sca-java-2.x/trunk/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java b/sca-java-2.x/trunk/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java deleted file mode 100644 index 8ed3c3d638..0000000000 --- a/sca-java-2.x/trunk/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java +++ /dev/null @@ -1,64 +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.itest.oneway.impl; - -import org.apache.tuscany.sca.itest.oneway.OneWayClient; -import org.apache.tuscany.sca.itest.oneway.OneWayService; -import org.junit.Assert; -import org.oasisopen.sca.annotation.Reference; - - -/** - * The client for the oneway itest. - * - * @version $Rev$ $Date$ - */ -public class OneWayClientImpl implements OneWayClient { - /** - * Injected reference to the OneWayService. - */ - @Reference - protected OneWayService oneWayService; - - /** - * Tracks the number of calls of the doSomething() method on the OneWayService. - */ - public static int callCount = 0; - - /** - * {@inheritDoc} - */ - public void doSomething(int count) { - callCount = callCount + count; - - for (int loopCount = 0; loopCount < count; loopCount++) { - //System.out.println("Client: doSomething " + loopCount); - //System.out.flush(); - oneWayService.doSomething(loopCount); - } - } - - /** - * {@inheritDoc} - */ - public void doSomethingWhichThrowsException() { - Assert.assertNotNull(oneWayService); - oneWayService.doSomethingWhichThrowsException(); - } -} diff --git a/sca-java-2.x/trunk/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java b/sca-java-2.x/trunk/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java deleted file mode 100644 index ef88c22baa..0000000000 --- a/sca-java-2.x/trunk/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java +++ /dev/null @@ -1,68 +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.itest.oneway.impl; - -import org.apache.tuscany.sca.itest.oneway.OneWayService; - -import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger; - -/** - * The service for the oneway itest. - * - * @version $Rev$ $Date$ - */ - - -public class OneWayServiceImpl implements OneWayService { - - /** - * This is the error message that will be in the Exception thrown by - * the doSomethingWhichThrowsException() method. - */ - public static final String EXCEPTION_MESSAGE = "Sample RuntimeException from a @OneWay method"; - - /** - * Counts the number of invocations to doSomething(). - */ - public static final AtomicInteger CALL_COUNT = new AtomicInteger(); - - /** - * Counts the number of invocations of the doSomethingWhichThrowsException() method. - */ - public static final AtomicInteger CALL_COUNT_FOR_THROWS_EXCEPTION_METHOD = new AtomicInteger(); - - /** - * {@inheritDoc} - */ - public void doSomething(int count) { - CALL_COUNT.incrementAndGet(); - - // System.out.println("Service: doSomething " + count + " callCount = " + callCount); - // System.out.flush(); - } - - /** - * {@inheritDoc} - */ - public void doSomethingWhichThrowsException() { - System.out.println("OneWay invoked. About to throw an Exception"); - CALL_COUNT_FOR_THROWS_EXCEPTION_METHOD.incrementAndGet(); - throw new NullPointerException(EXCEPTION_MESSAGE); - } -} diff --git a/sca-java-2.x/trunk/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite b/sca-java-2.x/trunk/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite deleted file mode 100644 index b375944bbd..0000000000 --- a/sca-java-2.x/trunk/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite +++ /dev/null @@ -1,57 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://oneway"
- name="OneWayITest">
-
- <component name="OneWayClientComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.oneway.impl.OneWayClientImpl"/>
- <reference name="oneWayService" target="OneWayServiceComponent">
- <interface.java interface="org.apache.tuscany.sca.itest.oneway.OneWayService" />
- </reference>
- </component>
-
- <component name="OneWayServiceComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.oneway.impl.OneWayServiceImpl"/>
- <service name="OneWayService">
- <interface.java interface="org.apache.tuscany.sca.itest.oneway.OneWayService" />
- <binding.ws uri="http://localhost:8085/OneWayServiceComponent"/>
- </service>
- </component>
-
-
- <!-- OneWay Client and Server Components that use the standard SCA Binding so we can validate -->
- <!-- that the NonBlockingInterceptor logs an message when an Exception is thrown by the code -->
- <!-- that is called. See TUSCANY-2225 -->
- <component name="OneWayClientComponentSCABinding">
- <implementation.java class="org.apache.tuscany.sca.itest.oneway.impl.OneWayClientImpl"/>
- <reference name="oneWayService" target="OneWayServiceComponentSCABinding">
- <interface.java interface="org.apache.tuscany.sca.itest.oneway.OneWayService" />
- </reference>
- </component>
-
- <component name="OneWayServiceComponentSCABinding">
- <implementation.java class="org.apache.tuscany.sca.itest.oneway.impl.OneWayServiceImpl"/>
- <service name="OneWayService">
- <interface.java interface="org.apache.tuscany.sca.itest.oneway.OneWayService" />
- </service>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java b/sca-java-2.x/trunk/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java deleted file mode 100644 index 1f771ea4ce..0000000000 --- a/sca-java-2.x/trunk/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java +++ /dev/null @@ -1,235 +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.itest.oneway; - -import java.io.File; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.logging.Handler; -import java.util.logging.Level; -import java.util.logging.LogRecord; -import java.util.logging.Logger; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.core.invocation.NonBlockingInterceptor; -import org.apache.tuscany.sca.itest.oneway.impl.OneWayClientImpl; -import org.apache.tuscany.sca.itest.oneway.impl.OneWayServiceImpl; -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -/** - * This test case will test invoking @OneWay operations. - * - * @version $Date$ $Revision$ - */ -public class OneWayTestCase { - /** - * Maximum period of time that we are prepared to wait for all the @OneWay - * method calls to complete in milliseconds. - */ - private static final int MAX_SLEEP_TIME = 10000; - - private Node node; - - /** - * Initialise the SCADomain. - * - * @throws Exception Failed to initialise the SCADomain - */ - @Before - public void setUp() throws Exception { - - NodeFactory factory = NodeFactory.newInstance(); - node = factory.createNode(new File("src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite").toURI().toURL().toString(), - new Contribution("TestContribution", new File("src/main/resources/OneWayContribution/META-INF/sca-deployables/").toURI().toURL().toString())); - node.start(); - - } - - /** - * This method will ensure that the SCADomain is shutdown. - * - * @throws Exception Failed to shutdown the SCADomain - */ - @After - public void tearDown() throws Exception { - node.stop(); - } - - /** - * This test will test repeatedly calling a @OneWay operation and ensure that the correct - * number of @OneWay operations are run. - * - * @throws Exception Test failed - */ - @Test - public void testOneWay() throws Exception { - OneWayClient client = - node.getService(OneWayClient.class, "OneWayClientComponent"); - - int count = 100; - - for (int i = 0; i < 10; i++) { - // System.out.println("Test: doSomething " + count); - // System.out.flush(); - client.doSomething(count); - - // TUSCANY-2192 - We need to sleep to allow the @OneWay method calls to complete. - // Note: This can take different periods depending on the speed and load - // on the computer where the test is being run. - // This loop will wait for the required number of @OneWay method calls to - // have taken place or MAX_SLEEP_TIME to have passed. - long startSleep = System.currentTimeMillis(); - while (OneWayClientImpl.callCount != OneWayServiceImpl.CALL_COUNT.get() - && System.currentTimeMillis() - startSleep < MAX_SLEEP_TIME) { - Thread.sleep(100); - // System.out.println("" + OneWayClientImpl.callCount + "," + OneWayServiceImpl.callCount); - } - - System.out.println("Finished callCount = " + OneWayServiceImpl.CALL_COUNT); - - Assert.assertEquals(OneWayClientImpl.callCount, OneWayServiceImpl.CALL_COUNT.get()); - } - } - - /** - * This method will invoke a @OneWay method that throws an exception - * when invoked over a SCA Binding which uses the NonBlockingInterceptor and - * ensure that the Exception is logged. - * See TUSCANY-2225 - */ - @Test - public void testOneWayUsingNonBlockingInterceptorThrowsAnException() { - OneWayClient client = - node.getService(OneWayClient.class, "OneWayClientComponentSCABinding"); - - // We need to modify the JDK Logger for the NonBlockingInterceptor so we - // can check that it logs a message for the @OneWay invocation that throws - // an Exception - Logger nbiLogger = Logger.getLogger(NonBlockingInterceptor.class.getName()); - DummyJDKHandler handler = new DummyJDKHandler(); - nbiLogger.addHandler(handler); - - // Add a message on the console to explain the stack dump that is going to be - // displayed and state that this is not a problem but expected behaviour - System.out.println(); - System.out.println("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-"); - System.out.println("IMPORTANT: The error message that appears on the console"); - System.out.println("below is an expected error if it is a NullPointerException"); - System.out.println(" with the message of:"); - System.out.println(" \"" + OneWayServiceImpl.EXCEPTION_MESSAGE + "\""); - System.out.println("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-"); - System.out.println(); - System.out.flush(); - - // Invoke the @OneWay method that throws an exception - client.doSomethingWhichThrowsException(); - - // The logging is done asynchronously so we will need to wait a bit before - // the log message appears. - long start = System.currentTimeMillis(); - boolean logged = false; - while (System.currentTimeMillis() - start < MAX_SLEEP_TIME && !logged) { - // Has the log message been logged? - if (handler.exceptionLogged.get()) { - logged = true; - } else { - try { - Thread.sleep(25); - } catch (InterruptedException ex) { - Assert.fail("Unexpected exception " + ex); - } - } - } - - // Add a message explaining that errors beyond this point should be reported - System.out.println(); - System.out.println("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-"); - System.out.println("End of expected exceptions. Any errors beyond this point are errors!"); - System.out.println("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-"); - System.out.println(); - System.out.flush(); - - // Remove the handler - nbiLogger.removeHandler(handler); - - // Make sure that the exception was logged - Assert.assertTrue(handler.exceptionLogged.get()); - } - - /** - * A handler that is added to the JDK Logging system to examine the log messages - * generated to ensure that a @OneWay method that throws an Exception will - * generate a log message. - */ - private class DummyJDKHandler extends Handler { - - /** - * Used to track whether the exception has been logged. - */ - private AtomicBoolean exceptionLogged = new AtomicBoolean(false); - - /** - * Constructor. - */ - private DummyJDKHandler() { - super.setLevel(Level.ALL); - } - - /** - * {@inheritDoc} - */ - @Override - public void close() throws SecurityException { - // Nothing to do - } - - /** - * {@inheritDoc} - */ - @Override - public void flush() { - // Nothing to do - } - - /** - * Examines the LogRecord and checks whether it matches the one we are looking for. - * If it matches, it will set exceptionLogged to True. - * - * @param record The Log Record that is being published - */ - @Override - public void publish(LogRecord record) { - // The log message we are looking for is Severe - if (record.getLevel() == Level.SEVERE) { - if (record.getThrown() != null - && record.getThrown().toString().indexOf( - OneWayServiceImpl.EXCEPTION_MESSAGE) != -1) { - // We have found our Exception. - exceptionLogged.set(true); - } - } - } - } -} diff --git a/sca-java-2.x/trunk/itest/operation-overloading/pom.xml b/sca-java-2.x/trunk/itest/operation-overloading/pom.xml deleted file mode 100644 index 48410a4b47..0000000000 --- a/sca-java-2.x/trunk/itest/operation-overloading/pom.xml +++ /dev/null @@ -1,53 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-operation-overloading</artifactId> - <name>Apache Tuscany SCA iTest Operation Overloading</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - </dependencies> -</project> diff --git a/sca-java-2.x/trunk/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java b/sca-java-2.x/trunk/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java deleted file mode 100644 index 1f589b44f4..0000000000 --- a/sca-java-2.x/trunk/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java +++ /dev/null @@ -1,61 +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.test.opoverload; - -/** - * This is an Interface which has methods declared but not implemented, These methods will be implemented in - * OverloadATarget Class and OverloadASource This class has methods with overloaded parameters. - */ - -//@AllowsPassByReference -public interface OverloadASourceTarget { - String opName = "operationA:"; - - /** - * Method with no parameters - */ - String operationA(); - - /** - * Method with one integer parameter - */ - String operationA(int parm1); - - /** - * Method with one integer parameter and one string parameter - */ - String operationA(int parm1, String parm2); - - /** - * Method with one one string parameter and one integer parameter - */ - String operationA(String parm1, int parm2); - - /** - * Method with one string parameter - */ - String operationA(String string); - - /** - * Method which throws an illegal argument exception in case of any exceptions. - */ - String[] operationAall(); - -} diff --git a/sca-java-2.x/trunk/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java b/sca-java-2.x/trunk/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java deleted file mode 100644 index a30d3611fb..0000000000 --- a/sca-java-2.x/trunk/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java +++ /dev/null @@ -1,113 +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.test.opoverload.impl; - -import java.util.ArrayList; - -import org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget; -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Service; - -/** - * This class Implements the interface OverloadASourceTarget, and gives implementation for all methods which are - * declared in the OverloadASourceTarget interface. - */ -@Service(OverloadASourceTarget.class) -public class OverloadASource implements OverloadASourceTarget { - public OverloadASourceTarget overloadASourceTarget; - - /** - * This is a default constructor - */ - public OverloadASource() { - - } - - /** - * @return - * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA() - */ - public String[] operationAall() { - assert overloadASourceTarget != null : "reference overloadASourceTarget is null"; - ArrayList<String> ret = new ArrayList<String>(); - ret.add(overloadASourceTarget.operationA()); - ret.add(overloadASourceTarget.operationA(11)); - ret.add(overloadASourceTarget.operationA("eleven")); - ret.add(overloadASourceTarget.operationA(3, "three")); - ret.add(overloadASourceTarget.operationA("four", 4)); - return (String[])ret.toArray(new String[ret.size()]); - } - - /** - * @return - * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA() - */ - public String operationA() { - assert overloadASourceTarget != null : "reference overloadASourceTarget is null"; - return overloadASourceTarget.operationA(); - } - - /** - * @param parm1 - * @return - * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA(int) - */ - public String operationA(int parm1) { - assert overloadASourceTarget != null : "reference overloadASourceTarget is null"; - return overloadASourceTarget.operationA(parm1); - } - - /** - * @param parm1 - * @param parm2 - * @return - * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA(int, java.lang.String) - */ - public String operationA(int parm1, String parm2) { - assert overloadASourceTarget != null : "reference overloadASourceTarget is null"; - return overloadASourceTarget.operationA(parm1, parm2); - } - - public String operationA(String string) { - assert overloadASourceTarget != null : "reference overloadASourceTarget is null"; - return overloadASourceTarget.operationA(string); - } - - /** - * @param parm1 - * @param parm2 - * @return - * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA(java.lang.String, int) - */ - public String operationA(String parm1, int parm2) { - assert overloadASourceTarget != null : "reference overloadASourceTarget is null"; - return overloadASourceTarget.operationA(parm1, parm2); - } - - /** - * This method which is used by all the overloaded functions to set the source target - */ - @Reference - public void setOverloadASourceTarget(OverloadASourceTarget overloadASourceTarget) { - assert overloadASourceTarget != null : "reference overloadASourceTarget is set tonull"; - this.overloadASourceTarget = overloadASourceTarget; - } - -} diff --git a/sca-java-2.x/trunk/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java b/sca-java-2.x/trunk/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java deleted file mode 100644 index 9ec60eb78f..0000000000 --- a/sca-java-2.x/trunk/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java +++ /dev/null @@ -1,99 +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.test.opoverload.impl; - -import org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget; -import org.oasisopen.sca.annotation.Service; - -/** - * This class Implements the interface OverloadASourceTarget, and gives implementation for all methods which are - * declared in the OverloadASourceTarget interface. - */ -@Service(OverloadASourceTarget.class) -public class OverloadATarget implements OverloadASourceTarget { - - /** - * This is a default Constructor - */ - public OverloadATarget() { - - } - - /* - * (non-Javadoc) - * - * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA(int) - */ - public String operationA(int parm1) { - final String ret = opName + parm1; - out(ret); - return ret; - - } - - /* - * (non-Javadoc) - * - * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA(int, java.lang.String) - */ - public String operationA(int parm1, String parm2) { - final String ret = opName + parm1 + parm2; - out(ret); - return ret; - - } - - /* - * (non-Javadoc) - * - * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA() - */ - public String operationA() { - out(opName); - return opName; - - } - - public String operationA(String parm1, int parm2) { - final String ret = opName + parm1 + parm2; - out(ret); - return ret; - } - - public String operationA(String parm1) { - final String ret = opName + parm1; - out(ret); - return ret; - } - - /** - * This method is used to print the message returned by all the overloaded functions - */ - private void out(String msg) { - - java.lang.System.out.println(msg); - } - - public String[] operationAall() { - throw new IllegalArgumentException("not supported"); - - } - -} diff --git a/sca-java-2.x/trunk/itest/operation-overloading/src/main/resources/OperationOverload.composite b/sca-java-2.x/trunk/itest/operation-overloading/src/main/resources/OperationOverload.composite deleted file mode 100644 index cbf5aa2078..0000000000 --- a/sca-java-2.x/trunk/itest/operation-overloading/src/main/resources/OperationOverload.composite +++ /dev/null @@ -1,34 +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://foo" - xmlns:foo="http://foo" - name="OperationOverload"> - - <component name="OverloadASourceComponent"> - <implementation.java class="org.apache.tuscany.sca.test.opoverload.impl.OverloadASource" /> - <reference name="overloadASourceTarget" target="OverloadATargetComponent"/> - </component> - - <component name="OverloadATargetComponent"> - <implementation.java class="org.apache.tuscany.sca.test.opoverload.impl.OverloadATarget" /> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java b/sca-java-2.x/trunk/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java deleted file mode 100644 index 62e5c14ce2..0000000000 --- a/sca-java-2.x/trunk/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java +++ /dev/null @@ -1,98 +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.test.opoverload.impl; - -import static org.junit.Assert.assertEquals; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -public class OverloadATestCase { - - private static Node node; - private static OverloadASourceTarget overloadA; - - /** - * Method prefixed with 'test' is a test method where testing logic is written using various assert methods. This - * test verifies the values compared are same as the values retrieved from the SCA runtime. - */ - @Test - public void testOperationAall() { - String[] result = overloadA.operationAall(); - assertEquals(5, result.length); - assertEquals(OverloadASourceTarget.opName, result[0]); - assertEquals(OverloadASourceTarget.opName + 11, result[1]); - assertEquals(OverloadASourceTarget.opName + "eleven", result[2]); - assertEquals(OverloadASourceTarget.opName + 3 + "three", result[3]); - assertEquals(OverloadASourceTarget.opName + "four" + 4, result[4]); - } - - @Test - public void testOperationAInt() { - String result = overloadA.operationA(29); - assertEquals(OverloadASourceTarget.opName + 29, result); - } - - @Test - public void testOperationAString() { - String result = overloadA.operationA("rick:-)"); - assertEquals(OverloadASourceTarget.opName + "rick:-)", result); - } - - @Test - public void testOperationAIntString() { - String result = overloadA.operationA(123, "Tuscany"); - assertEquals(OverloadASourceTarget.opName + 123 + "Tuscany", result); - } - - @Test - public void testOperationStringInt() { - String result = overloadA.operationA("StringInt", 77); - assertEquals(OverloadASourceTarget.opName + "StringInt" + 77, result); - } - - /** - * setUp() is a method in JUnit Frame Work which is executed before all others methods in the class extending - * unit.framework.TestCase. So this method is used to create a test Embedded SCA node, to start the SCA node and - * to get a reference to the contribution service - */ - - @BeforeClass - public static void setUp() throws Exception { - String location = ContributionLocationHelper.getContributionLocation("OperationOverload.composite"); - node = NodeFactory.newInstance().createNode("OperationOverload.composite", new Contribution("c1", location)); - node.start(); - overloadA = node.getService(OverloadASourceTarget.class, "OverloadASourceComponent"); - } - - /** - * tearDown() is a method in JUnit Frame Work which is executed after all other methods in the class extending - * unit.framework.TestCase. So this method is used to close the SCA node. - */ - - @AfterClass - public static void tearDown() throws Exception { - node.stop(); - } -} diff --git a/sca-java-2.x/trunk/itest/policies/pom.xml b/sca-java-2.x/trunk/itest/policies/pom.xml deleted file mode 100644 index daa3e395f5..0000000000 --- a/sca-java-2.x/trunk/itest/policies/pom.xml +++ /dev/null @@ -1,59 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-policies</artifactId> - <name>Apache Tuscany SCA iTest Policies</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-policy-logging</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - </dependencies> - -</project> diff --git a/sca-java-2.x/trunk/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CreditCard.java b/sca-java-2.x/trunk/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CreditCard.java deleted file mode 100644 index fd33be01d6..0000000000 --- a/sca-java-2.x/trunk/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CreditCard.java +++ /dev/null @@ -1,65 +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.itest.policies; - -import java.io.Serializable; - -/** - * Credit Card - */ -public class CreditCard implements Serializable { - private static final long serialVersionUID = -6107293191546007197L; - private String type; - private String number; - private String owner; - private int expMonth; - private int expYear; - - public String getType() { - return type; - } - public void setType(String type) { - this.type = type; - } - public String getNumber() { - return number; - } - public void setNumber(String number) { - this.number = number; - } - public String getOwner() { - return owner; - } - public void setOwner(String owner) { - this.owner = owner; - } - public int getExpMonth() { - return expMonth; - } - public void setExpMonth(int expMonth) { - this.expMonth = expMonth; - } - public int getExpYear() { - return expYear; - } - public void setExpYear(int expYear) { - this.expYear = expYear; - } -} diff --git a/sca-java-2.x/trunk/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CreditCardPayment.java b/sca-java-2.x/trunk/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CreditCardPayment.java deleted file mode 100644 index 368179dc29..0000000000 --- a/sca-java-2.x/trunk/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CreditCardPayment.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.itest.policies; - -import org.oasisopen.sca.annotation.Authentication; -import org.oasisopen.sca.annotation.Confidentiality; -import org.oasisopen.sca.annotation.Remotable; - -/** - * - */ -@Remotable -@Authentication -public interface CreditCardPayment { - String COMPLETED = "Completed"; - String REJECTED = "Rejected"; - - @Confidentiality - String authorize(CreditCard creditCard, float amount); -} diff --git a/sca-java-2.x/trunk/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/Customer.java b/sca-java-2.x/trunk/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/Customer.java deleted file mode 100644 index 05ea341466..0000000000 --- a/sca-java-2.x/trunk/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/Customer.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.itest.policies; - -import java.io.Serializable; - -/** - * Customer - */ -public class Customer implements Serializable { - private static final long serialVersionUID = 680227659536711695L; - private String id; - private String name; - private CreditCard creditCard; - - public String getId() { - return id; - } - public void setId(String id) { - this.id = id; - } - public String getName() { - return name; - } - public void setName(String name) { - this.name = name; - } - public CreditCard getCreditCard() { - return creditCard; - } - public void setCreditCard(CreditCard creditCard) { - this.creditCard = creditCard; - } -} diff --git a/sca-java-2.x/trunk/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CustomerRegistry.java b/sca-java-2.x/trunk/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CustomerRegistry.java deleted file mode 100644 index c9f50d08ee..0000000000 --- a/sca-java-2.x/trunk/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/CustomerRegistry.java +++ /dev/null @@ -1,27 +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.itest.policies; - -/** - * - */ -public interface CustomerRegistry { - Customer find(String id); -} diff --git a/sca-java-2.x/trunk/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/Payment.java b/sca-java-2.x/trunk/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/Payment.java deleted file mode 100644 index cc7c555aff..0000000000 --- a/sca-java-2.x/trunk/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/Payment.java +++ /dev/null @@ -1,30 +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.itest.policies; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * - */ -@Remotable -public interface Payment { - String charge(String customerID, float amount); -} diff --git a/sca-java-2.x/trunk/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/CreditCardPaymentImpl.java b/sca-java-2.x/trunk/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/CreditCardPaymentImpl.java deleted file mode 100644 index 01cc8ac636..0000000000 --- a/sca-java-2.x/trunk/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/CreditCardPaymentImpl.java +++ /dev/null @@ -1,40 +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.itest.policies.impl; - -import org.apache.tuscany.sca.itest.policies.CreditCard; -import org.apache.tuscany.sca.itest.policies.CreditCardPayment; - -/** - * - */ -public class CreditCardPaymentImpl implements CreditCardPayment { - - public String authorize(CreditCard creditCard, float amount) { - System.out.println(creditCard.getType() + " " + creditCard.getNumber()); - System.out.println(amount); - if (amount < 200f) { - return COMPLETED; - } else { - return REJECTED; - } - } - -} diff --git a/sca-java-2.x/trunk/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/CustomerRegistryImpl.java b/sca-java-2.x/trunk/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/CustomerRegistryImpl.java deleted file mode 100644 index 943720451f..0000000000 --- a/sca-java-2.x/trunk/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/CustomerRegistryImpl.java +++ /dev/null @@ -1,78 +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.itest.policies.impl; - -import java.util.HashMap; -import java.util.Map; - -import org.apache.tuscany.sca.itest.policies.CreditCard; -import org.apache.tuscany.sca.itest.policies.Customer; -import org.apache.tuscany.sca.itest.policies.CustomerRegistry; -import org.oasisopen.sca.annotation.Destroy; -import org.oasisopen.sca.annotation.Init; -import org.oasisopen.sca.annotation.Scope; -import org.oasisopen.sca.annotation.Service; - -/** - * - */ -@Service(CustomerRegistry.class) -@Scope("COMPOSITE") -public class CustomerRegistryImpl implements CustomerRegistry { - private Map<String, Customer> customers = new HashMap<String, Customer>(); - - - @Init - public void init() { - Customer c1 = new Customer(); - c1.setId("001"); - c1.setName("John Smith"); - CreditCard creditCard = new CreditCard(); - creditCard.setNumber("1234-5678-1234"); - creditCard.setType("Visa"); - creditCard.setOwner("John Smith"); - creditCard.setExpMonth(6); - creditCard.setExpYear(2015); - c1.setCreditCard(creditCard); - customers.put(c1.getId(), c1); - - Customer c2 = new Customer(); - c2.setId("002"); - c2.setName("Jane Smith"); - creditCard = new CreditCard(); - creditCard.setNumber("1234-5678-5678"); - creditCard.setType("MasterCard"); - creditCard.setOwner("Jane Smith"); - creditCard.setExpMonth(9); - creditCard.setExpYear(2012); - c2.setCreditCard(creditCard); - customers.put(c2.getId(), c2); - } - - public Customer find(String id) { - return customers.get(id); - } - - @Destroy - public void destroy() { - customers.clear(); - } - -} diff --git a/sca-java-2.x/trunk/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/PaymentImpl.java b/sca-java-2.x/trunk/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/PaymentImpl.java deleted file mode 100644 index b712b99388..0000000000 --- a/sca-java-2.x/trunk/itest/policies/src/main/java/org/apache/tuscany/sca/itest/policies/impl/PaymentImpl.java +++ /dev/null @@ -1,54 +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.itest.policies.impl; - -import org.apache.tuscany.sca.itest.policies.CreditCard; -import org.apache.tuscany.sca.itest.policies.CreditCardPayment; -import org.apache.tuscany.sca.itest.policies.Customer; -import org.apache.tuscany.sca.itest.policies.CustomerRegistry; -import org.apache.tuscany.sca.itest.policies.Payment; -import org.apache.tuscany.sca.policy.logging.Logging; -import org.oasisopen.sca.annotation.Authentication; -import org.oasisopen.sca.annotation.Confidentiality; -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Requires; - -/** - * - */ -@Logging -public class PaymentImpl implements Payment { - - @Reference - protected CustomerRegistry customerRegistry; - - @Reference - @Authentication - @Requires({Confidentiality.CONFIDENTIALITY_MESSAGE, Confidentiality.CONFIDENTIALITY_TRANSPORT}) - protected CreditCardPayment creditCardPayment; - - public String charge(String customerID, float amount) { - Customer customer = customerRegistry.find(customerID); - CreditCard creditCard = customer.getCreditCard(); - String status = creditCardPayment.authorize(creditCard, amount); - return status; - } - -} diff --git a/sca-java-2.x/trunk/itest/policies/src/main/resources/Customer.composite b/sca-java-2.x/trunk/itest/policies/src/main/resources/Customer.composite deleted file mode 100644 index 7c66c741f6..0000000000 --- a/sca-java-2.x/trunk/itest/policies/src/main/resources/Customer.composite +++ /dev/null @@ -1,34 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:c="http://customer" - targetNamespace="http://customer" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" - name="Customer"> - - <service name="Registry" promote="CustomerRegistry" requires="tuscany:logging"> - <binding.sca/> - </service> - - <component name="CustomerRegistry"> - <implementation.java class="org.apache.tuscany.sca.itest.policies.impl.CustomerRegistryImpl" /> - </component> - -</composite>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/policies/src/main/resources/LoggingMessages.properties b/sca-java-2.x/trunk/itest/policies/src/main/resources/LoggingMessages.properties deleted file mode 100644 index ada808be0e..0000000000 --- a/sca-java-2.x/trunk/itest/policies/src/main/resources/LoggingMessages.properties +++ /dev/null @@ -1,16 +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. diff --git a/sca-java-2.x/trunk/itest/policies/src/main/resources/META-INF/definitions.xml b/sca-java-2.x/trunk/itest/policies/src/main/resources/META-INF/definitions.xml deleted file mode 100644 index d607832554..0000000000 --- a/sca-java-2.x/trunk/itest/policies/src/main/resources/META-INF/definitions.xml +++ /dev/null @@ -1,82 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?> -<!-- - * 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. ---> -<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"> - - <policySet name="JDKLoggingPolicy" - provides="tuscany:logging" - appliesTo="//binding | //implementation"> - <tuscany:jdkLogger name="test.logger"> - <tuscany:logLevel>FINE</tuscany:logLevel> - <tuscany:resourceBundle>LoggingMessages.properties</tuscany:resourceBundle> - </tuscany:jdkLogger> - - </policySet> - - <policySet name="JDKLoggingImplPolicy" - provides="tuscany:logging" - appliesTo="//implementation.java" - attachTo="//sca:component[@name='CreditCardPayment']"> - <tuscany:jdkLogger name="test.logger"> - <tuscany:logLevel>INFO</tuscany:logLevel> - <tuscany:resourceBundle>LoggingMessages.properties</tuscany:resourceBundle> - </tuscany:jdkLogger> - - </policySet> - - <!-- A set of policy sets introduced just to ensure that intents are resolved --> - - <policySet name="SuspendsTransactionPolicy" - provides="sca:suspendsTransaction" - appliesTo="//binding.sca | //implementation.java" - attachTo="IntentRefs('sca:suspendsTransaction')"/> - - <policySet name="AuthorizationFineGrainPolicy" - provides="sca:authorization.fineGrain" - appliesTo="//binding.sca | //implementation.java" - attachTo="IntentRefs('sca:authorization') | IntentRefs('sca:authorization.fineGrain')"/> - - <policySet name="ConfidentialityTransportPolicy" - provides="sca:confidentiality.transport" - appliesTo="//binding.sca | //implementation.java" - attachTo="IntentRefs('sca:confidentiality.transport')"/> - - <policySet name="ConfidentialityMessagePolicy" - provides="sca:confidentiality.message" - appliesTo="//binding.sca | //implementation.java" - attachTo="IntentRefs('sca:confidentiality.message')"/> - - <policySet name="ClientAuthenticationTransportPolicy" - provides="sca:clientAuthentication.transport" - appliesTo="//binding.sca | //implementation.java" - attachTo="IntentRefs('sca:clientAuthentication.transport') | //sca:service[@name='CreditCardPayment']"/> - - <policySet name="IntegrityTransportPolicy" - provides="sca:integrity.transport" - appliesTo="//binding.sca | //implementation.java" - attachTo="IntentRefs('sca:integrity.transport')"/> - - <policySet name="ManagedTransactionGlobalPolicy" - provides="sca:managedTransaction.global" - appliesTo="//implementation.composite | //implementation.java" - attachTo="IntentRefs('sca:managedTransaction.global')"/> -</definitions>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/policies/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/policies/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index d5d1840754..0000000000 --- a/sca-java-2.x/trunk/itest/policies/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:p="http://payment"> - <deployable composite="p:Payment" /> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/policies/src/main/resources/Payment.composite b/sca-java-2.x/trunk/itest/policies/src/main/resources/Payment.composite deleted file mode 100644 index 20124467b0..0000000000 --- a/sca-java-2.x/trunk/itest/policies/src/main/resources/Payment.composite +++ /dev/null @@ -1,57 +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. ---> - -<!-- - NOTE - policy sets all defined at top level as external attach functions - not working yet so it's difficult to know precisely where to - attach policy to ---> -<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:p="http://payment" - xmlns:c="http://customer" - xmlns:sca = "http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" - requires = "sca:authorization" - targetNamespace="http://payment" - name="Payment" - policySets="tuscany:JDKLoggingPolicy tuscany:JDKLoggingImplPolicy tuscany:SuspendsTransactionPolicy tuscany:AuthorizationFineGrainPolicy tuscany:ConfidentialityTransportPolicy tuscany:ConfidentialityMessagePolicy tuscany:ClientAuthenticationTransportPolicy tuscany:IntegrityTransportPolicy"> - - <component name="Payment"> - <implementation.java class="org.apache.tuscany.sca.itest.policies.impl.PaymentImpl" /> - <reference name="creditCardPayment" target="CreditCardPayment"> - <binding.sca requires="sca:integrity tuscany:logging"> - </binding.sca> - </reference> - <reference name="customerRegistry" target="Customer/Registry" requires="sca:suspendsTransaction tuscany:logging"/> - </component> - - <component name="CreditCardPayment"> - <implementation.java class="org.apache.tuscany.sca.itest.policies.impl.CreditCardPaymentImpl" /> - <service name="CreditCardPayment" requires="tuscany:logging sca:confidentiality.message sca:confidentiality.transport"/> - </component> - - <component name="Customer" requires="tuscany:logging"> - <implementation.composite name="c:Customer" requires="sca:managedTransaction.global"/> - <service name="Registry" requires="sca:suspendsTransaction"> - <binding.sca/> - </service> - </component> - -</composite>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/policies/src/test/java/org/apache/tuscany/sca/itest/policies/PaymentTestCase.java b/sca-java-2.x/trunk/itest/policies/src/test/java/org/apache/tuscany/sca/itest/policies/PaymentTestCase.java deleted file mode 100644 index 3385ee9071..0000000000 --- a/sca-java-2.x/trunk/itest/policies/src/test/java/org/apache/tuscany/sca/itest/policies/PaymentTestCase.java +++ /dev/null @@ -1,69 +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.itest.policies; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; - -public class PaymentTestCase { - private static Node node; - - @BeforeClass - public static void init() throws Exception { - try { - String location = ContributionLocationHelper.getContributionLocation("Payment.composite"); - node = NodeFactory.newInstance().createNode(new Contribution("c1", location)); - node.start(); - } catch (Exception e) { - e.printStackTrace(); - throw e; - } - } - - @AfterClass - public static void destroy() throws Exception { - if (node != null) { - node.stop(); - } - } - - @Test - public void testPayment() { - Payment payment = node.getService(Payment.class, "Payment"); - String status = payment.charge("001", 100f); - Assert.assertEquals(CreditCardPayment.COMPLETED, status); - - status = payment.charge("002", 300f); - Assert.assertEquals(CreditCardPayment.REJECTED, status); - } - - public static void main(String[] args) throws Exception { - PaymentTestCase.init(); - PaymentTestCase tester = new PaymentTestCase(); - tester.testPayment(); - PaymentTestCase.destroy(); - } -} diff --git a/sca-java-2.x/trunk/itest/policy-transaction/pom.xml b/sca-java-2.x/trunk/itest/policy-transaction/pom.xml deleted file mode 100644 index d18e19e957..0000000000 --- a/sca-java-2.x/trunk/itest/policy-transaction/pom.xml +++ /dev/null @@ -1,72 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-policy-transaction</artifactId> - <name>Apache Tuscany SCA iTest Policy Transaction</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-policy-transaction-runtime-geronimo</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>1.5.3</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>1.5.3</version> - <scope>test</scope> - </dependency> - </dependencies> -</project> diff --git a/sca-java-2.x/trunk/itest/policy-transaction/src/main/java/customer/Customer.java b/sca-java-2.x/trunk/itest/policy-transaction/src/main/java/customer/Customer.java deleted file mode 100644 index b58547bf47..0000000000 --- a/sca-java-2.x/trunk/itest/policy-transaction/src/main/java/customer/Customer.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 customer; - -import java.io.Serializable; - -/** - * Customer - */ -public class Customer implements Serializable { - private static final long serialVersionUID = 680227659536711695L; - private String id; - private String name; - - public String getId() { - return id; - } - public void setId(String id) { - this.id = id; - } - public String getName() { - return name; - } - public void setName(String name) { - this.name = name; - } -} diff --git a/sca-java-2.x/trunk/itest/policy-transaction/src/main/java/customer/CustomerRegistry.java b/sca-java-2.x/trunk/itest/policy-transaction/src/main/java/customer/CustomerRegistry.java deleted file mode 100644 index 4a05f0d0a8..0000000000 --- a/sca-java-2.x/trunk/itest/policy-transaction/src/main/java/customer/CustomerRegistry.java +++ /dev/null @@ -1,30 +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 customer; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * - */ -@Remotable -public interface CustomerRegistry { - Customer find(String id); -} diff --git a/sca-java-2.x/trunk/itest/policy-transaction/src/main/java/customer/impl/CustomerRegistryImpl.java b/sca-java-2.x/trunk/itest/policy-transaction/src/main/java/customer/impl/CustomerRegistryImpl.java deleted file mode 100644 index d2d6aa1f44..0000000000 --- a/sca-java-2.x/trunk/itest/policy-transaction/src/main/java/customer/impl/CustomerRegistryImpl.java +++ /dev/null @@ -1,63 +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 customer.impl; - -import java.util.HashMap; -import java.util.Map; - -import org.oasisopen.sca.annotation.Destroy; -import org.oasisopen.sca.annotation.Init; -import org.oasisopen.sca.annotation.Scope; -import org.oasisopen.sca.annotation.Service; - -import customer.Customer; -import customer.CustomerRegistry; - -/** - * - */ -@Scope("COMPOSITE") -@Service(CustomerRegistry.class) -public class CustomerRegistryImpl implements CustomerRegistry { - private Map<String, Customer> customers = new HashMap<String, Customer>(); - - @Init - public void init() { - Customer c1 = new Customer(); - c1.setId("001"); - c1.setName("John Smith"); - customers.put(c1.getId(), c1); - - Customer c2 = new Customer(); - c2.setId("002"); - c2.setName("Jane Smith"); - customers.put(c2.getId(), c2); - } - - public Customer find(String id) { - return customers.get(id); - } - - @Destroy - public void destroy() { - customers.clear(); - } - -} diff --git a/sca-java-2.x/trunk/itest/policy-transaction/src/main/resources/Customer.composite b/sca-java-2.x/trunk/itest/policy-transaction/src/main/resources/Customer.composite deleted file mode 100644 index 7047de3663..0000000000 --- a/sca-java-2.x/trunk/itest/policy-transaction/src/main/resources/Customer.composite +++ /dev/null @@ -1,30 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:c="http://customer" - targetNamespace="http://customer" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" - name="CustomerTransaction"> - - <component name="CustomerRegistryComponent"> - <implementation.java class="customer.impl.CustomerRegistryImpl" requires="managedTransaction.local"/> - </component> - -</composite>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/policy-transaction/src/test/java/org/apache/tuscany/sca/itest/policy/transaction/CustomerTestCase.java b/sca-java-2.x/trunk/itest/policy-transaction/src/test/java/org/apache/tuscany/sca/itest/policy/transaction/CustomerTestCase.java deleted file mode 100644 index 2d83cd0ee5..0000000000 --- a/sca-java-2.x/trunk/itest/policy-transaction/src/test/java/org/apache/tuscany/sca/itest/policy/transaction/CustomerTestCase.java +++ /dev/null @@ -1,69 +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.itest.policy.transaction; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; - -import customer.Customer; -import customer.CustomerRegistry; - -public class CustomerTestCase { - private static Node node; - - @BeforeClass - public static void init() throws Exception { - try { - String location = ContributionLocationHelper.getContributionLocation("Customer.composite"); - node = NodeFactory.newInstance().createNode("Customer.composite",new Contribution("c1", location)); - node.start(); - } catch (Exception e) { - e.printStackTrace(); - throw e; - } - } - - @AfterClass - public static void destroy() throws Exception { - if (node != null) { - node.stop(); - } - } - - @Test - public void testCustomer() { - CustomerRegistry customerRegistry = node.getService(CustomerRegistry.class, "CustomerRegistryComponent"); - Customer customer = customerRegistry.find("001"); - Assert.assertEquals(customer.getName(), "John Smith"); - } - - public static void main(String[] args) throws Exception { - CustomerTestCase.init(); - CustomerTestCase tester = new CustomerTestCase(); - tester.testCustomer(); - CustomerTestCase.destroy(); - } -} diff --git a/sca-java-2.x/trunk/itest/policy/matching/pom.xml b/sca-java-2.x/trunk/itest/policy/matching/pom.xml deleted file mode 100644 index d3dca04a64..0000000000 --- a/sca-java-2.x/trunk/itest/policy/matching/pom.xml +++ /dev/null @@ -1,58 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>itest-policy-matching</artifactId> - <name>Apache Tuscany SCA iTest Policy Matching</name> - - <dependencies> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-feature-webservice</artifactId> - <version>2.0-SNAPSHOT</version> - <type>pom</type> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-policy-wspolicy</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-policy-logging</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - </dependencies> - - <build> - <finalName>${artifactId}</finalName> - </build> -</project> diff --git a/sca-java-2.x/trunk/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorld.java b/sca-java-2.x/trunk/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorld.java deleted file mode 100644 index 16db3fd9fc..0000000000 --- a/sca-java-2.x/trunk/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorld.java +++ /dev/null @@ -1,29 +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.policy.matching.helloworld; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface HelloWorld { - - String getGreetings(String s); - -} diff --git a/sca-java-2.x/trunk/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorldClient.java b/sca-java-2.x/trunk/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorldClient.java deleted file mode 100644 index d34591713b..0000000000 --- a/sca-java-2.x/trunk/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorldClient.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.policy.matching.helloworld; - -import org.oasisopen.sca.annotation.Reference; - -public class HelloWorldClient implements HelloWorld { - - @Reference - public HelloWorld helloWorld; - - public String getGreetings(String s) { - String response = helloWorld.getGreetings(s); - System.out.println("At client: " + response); - return response; - } - -} diff --git a/sca-java-2.x/trunk/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorldService.java deleted file mode 100644 index 31a2d2cb89..0000000000 --- a/sca-java-2.x/trunk/itest/policy/matching/src/main/java/org/apache/tuscany/sca/policy/matching/helloworld/HelloWorldService.java +++ /dev/null @@ -1,30 +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.policy.matching.helloworld; - -public class HelloWorldService implements HelloWorld { - - public String getGreetings(String s) { - String response = "Hello " + s; - System.out.println("At service: " + response); - return response; - } - -} diff --git a/sca-java-2.x/trunk/itest/policy/matching/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/policy/matching/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 6ae1c88c42..0000000000 --- a/sca-java-2.x/trunk/itest/policy/matching/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:itest="http://www.tuscany.apache.org/itests/policy"> - <deployable composite="itest:HelloWorld"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/policy/matching/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sca-java-2.x/trunk/itest/policy/matching/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions deleted file mode 100644 index 45b6be47b7..0000000000 --- a/sca-java-2.x/trunk/itest/policy/matching/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions +++ /dev/null @@ -1,17 +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.
-org/apache/tuscany/sca/policy/matching/helloworld/definitions.xml
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/definitions.xml b/sca-java-2.x/trunk/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/definitions.xml deleted file mode 100644 index f37b1ee739..0000000000 --- a/sca-java-2.x/trunk/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/definitions.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?> -<!-- - * 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. ---> -<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1" - xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"> - - <intent name="testIntent1" constrains="sca:binding" intentType="interaction"/> - - <intent name="testIntent2" constrains="sca:binding" intentType="interaction"/> - - <intent name="testIntent3" constrains="sca:binding" intentType="interaction" excludes="tuscany:testIntent1" /> - - <intent name="testIntent4" constrains="sca:binding" intentType="interaction"/> - - <intent name="testIntent5" constrains="sca:binding" intentType="interaction"/> - - <intent name="testIntent6" constrains="sca:binding" intentType="interaction"/> - - <policySet name="testPolicy1" - provides="tuscany:testIntent1" - appliesTo="//binding | //implementation"> - </policySet> - - <policySet name="testPolicy2" - provides="tuscany:testIntent4 tuscany:testIntent5" - appliesTo="//binding | //implementation"> - <tuscany:jdkLogger name="test.logger"> - <tuscany:logLevel>FINE</tuscany:logLevel> - <tuscany:resourceBundle>LoggingMessages.properties</tuscany:resourceBundle> - </tuscany:jdkLogger> - </policySet> - - <policySet name="testPolicy3" - provides="tuscany:testIntent6" - appliesTo="//binding | //implementation"> - <wsp:Policy> - <wsp:ExactlyOne> - <wsp:All> - <tuscany:jdkLogger name="test.logger"> - <tuscany:logLevel>FINE</tuscany:logLevel> - <tuscany:resourceBundle>LoggingMessages.properties</tuscany:resourceBundle> - </tuscany:jdkLogger> - </wsp:All> - </wsp:ExactlyOne> - </wsp:Policy> - </policySet> - -</definitions>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/helloworld.composite b/sca-java-2.x/trunk/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/helloworld.composite deleted file mode 100644 index 7dfe083bae..0000000000 --- a/sca-java-2.x/trunk/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/helloworld.composite +++ /dev/null @@ -1,86 +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. ---> - -<!-- - NOTE - not using external attachment yet in this test because the - policy xpath functions are not working yet ---> -<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://www.tuscany.apache.org/itests/policy" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" - name="HelloWorld"> - - <component name="HelloWorldClientMutuallyExclusiveIntents"> - <implementation.java class="org.apache.tuscany.sca.policy.matching.helloworld.HelloWorldClient"/> - <reference name="helloWorld" target="HelloWorldService2" requires="tuscany:testIntent3"/> - </component> - - <component name="HelloWorldClientNoIntentsOrPolicies"> - <implementation.java class="org.apache.tuscany.sca.policy.matching.helloworld.HelloWorldClient"/> - <reference name="helloWorld" target="HelloWorldService1" /> - </component> - - <component name="HelloUnresolvedIntentsOnReference"> - <implementation.java class="org.apache.tuscany.sca.policy.matching.helloworld.HelloWorldClient"/> - <reference name="helloWorld" target="HelloWorldService2" requires="tuscany:testIntent1 tuscany:testIntent2" policySets="tuscany:testPolicy1"/> - </component> - - <component name="HelloWorldClientIntentsButNoPolicies1"> - <implementation.java class="org.apache.tuscany.sca.policy.matching.helloworld.HelloWorldClient"/> - <reference name="helloWorld" target="HelloWorldService2" /> - </component> - - <component name="HelloWorldClientIntentsButNoPolicies2"> - <implementation.java class="org.apache.tuscany.sca.policy.matching.helloworld.HelloWorldClient"/> - <reference name="helloWorld" target="HelloWorldService2" requires="tuscany:testIntent1" policySets="tuscany:testPolicy1"/> - </component> - - <component name="HelloWorldClientSomePoliciesOnOneSideButNoneOnTheOther"> - <implementation.java class="org.apache.tuscany.sca.policy.matching.helloworld.HelloWorldClient"/> - <reference name="helloWorld" target="HelloWorldService3" /> - </component> - - <component name="HelloWorldClientPolicySetQNameMatch"> - <implementation.java class="org.apache.tuscany.sca.policy.matching.helloworld.HelloWorldClient"/> - <reference name="helloWorld" target="HelloWorldService3" requires="tuscany:testIntent5" policySets="tuscany:testPolicy2"/> - </component> - - <component name="HelloWorldClientDifferentPolicyLanguage"> - <implementation.java class="org.apache.tuscany.sca.policy.matching.helloworld.HelloWorldClient"/> - <reference name="helloWorld" target="HelloWorldService3" requires="tuscany:testIntent6" policySets="tuscany:testPolicy3"/> - </component> - - <component name="HelloWorldService1"> - <implementation.java class="org.apache.tuscany.sca.policy.matching.helloworld.HelloWorldService"/> - <service name="HelloWorld"/> - </component> - - <component name="HelloWorldService2"> - <implementation.java class="org.apache.tuscany.sca.policy.matching.helloworld.HelloWorldService"/> - <service name="HelloWorld" requires="tuscany:testIntent1" policySets="tuscany:testPolicy1"/> - </component> - - <component name="HelloWorldService3"> - <implementation.java class="org.apache.tuscany.sca.policy.matching.helloworld.HelloWorldService"/> - <service name="HelloWorld" requires="tuscany:testIntent4" policySets="tuscany:testPolicy2"/> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/helloworld.wsdl b/sca-java-2.x/trunk/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/helloworld.wsdl deleted file mode 100644 index a352696b8e..0000000000 --- a/sca-java-2.x/trunk/itest/policy/matching/src/main/resources/org/apache/tuscany/sca/policy/matching/helloworld/helloworld.wsdl +++ /dev/null @@ -1,90 +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. ---> -<wsdl:definitions targetNamespace="http://helloworld" - xmlns:tns="http://helloworld" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - name="helloworld"> - - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema"> - - <element name="getGreetings"> - <complexType> - <sequence> - <element name="name" type="xsd:string"/> - </sequence> - </complexType> - </element> - - <element name="getGreetingsResponse"> - <complexType> - <sequence> - <element name="getGreetingsReturn" type="xsd:string"/> - </sequence> - </complexType> - </element> - - </schema> - </wsdl:types> - - <wsdl:message name="getGreetingsRequest"> - <wsdl:part element="tns:getGreetings" name="parameters"/> - </wsdl:message> - - <wsdl:message name="getGreetingsResponse"> - <wsdl:part element="tns:getGreetingsResponse" name="parameters"/> - </wsdl:message> - - <wsdl:portType name="HelloWorld"> - <wsdl:operation name="getGreetings"> - <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/> - <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/> - </wsdl:operation> - </wsdl:portType> - - <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld"> - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="getGreetings"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="getGreetingsRequest"> - <wsdlsoap:body use="literal"/> - </wsdl:input> - <wsdl:output name="getGreetingsResponse"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - - </wsdl:binding> - - <wsdl:service name="HelloWorldService"> - <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort1"> - <wsdlsoap:address location="http://localhost:8085/services/HelloWorldWebService1"/> - </wsdl:port> - <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort2"> - <wsdlsoap:address location="http://localhost:8085/services/HelloWorldWebService2"/> - </wsdl:port> - <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort3"> - <wsdlsoap:address location="http://localhost:8085/services/HelloWorldWebService3"/> - </wsdl:port> - </wsdl:service> - -</wsdl:definitions> diff --git a/sca-java-2.x/trunk/itest/policy/matching/src/test/java/org/apache/tuscany/sca/policy/matching/MatchingTestCase.java b/sca-java-2.x/trunk/itest/policy/matching/src/test/java/org/apache/tuscany/sca/policy/matching/MatchingTestCase.java deleted file mode 100644 index d5112e5312..0000000000 --- a/sca-java-2.x/trunk/itest/policy/matching/src/test/java/org/apache/tuscany/sca/policy/matching/MatchingTestCase.java +++ /dev/null @@ -1,135 +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.policy.matching; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.apache.tuscany.sca.policy.matching.helloworld.HelloWorld; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -/* - * Test the various conditions in the matching algorithm - * 1 - FAIL if there are intents that are mutually exclusive between reference and service - * 2 - PASS if there are no intents or policies present at reference and service - * 3 - FAIL if there are unresolved intents (intents with no policy set) at the reference (service should have been checked previously) - * 4 - PASS if there are no policies at reference and service (now we know all intents are resolved) - * 5 - FAIL if there are some policies on one side but not on the other - * 6 - PASS if the QName of the policy sets on each side match - * 7 - FAIL if the policy languages on both sides are different - * 8 - Perform policy specific match - */ -public class MatchingTestCase { - - private static Node node; - - - @BeforeClass - public static void setUp() throws Exception { - try { - node = NodeFactory.newInstance().createNode(new Contribution("test", "target/classes")); - node.start(); - } catch (Exception ex) { - ex.printStackTrace(); - } - } - - @Test - public void testMutuallyExclusiveIntents() throws Exception { - HelloWorld helloWorld = node.getService(HelloWorld.class, "HelloWorldClientMutuallyExclusiveIntents"); - try { - helloWorld.getGreetings("petra"); - fail("Exception expected"); - } catch (Exception ex) { - assertTrue(ex.getMessage().indexOf("No match because the following intents are mutually exclusive {http://tuscany.apache.org/xmlns/sca/1.1}testIntent3 {http://tuscany.apache.org/xmlns/sca/1.1}testIntent1") > -1); - } - } - - @Test - public void testNoIntentsOrPolicies() throws Exception { - HelloWorld helloWorld = node.getService(HelloWorld.class, "HelloWorldClientNoIntentsOrPolicies"); - assertEquals("Hello petra", helloWorld.getGreetings("petra")); - } - - @Test - public void testUnresolvedIntentsOnReference() throws Exception { - HelloWorld helloWorld = node.getService(HelloWorld.class, "HelloUnresolvedIntentsOnReference"); - try { - helloWorld.getGreetings("petra"); - fail("Exception expected"); - } catch (Exception ex) { - assertTrue(ex.getMessage().indexOf("No match because there are unresolved intents [{http://tuscany.apache.org/xmlns/sca/1.1}testIntent2]") > -1); - } - } - - @Test - public void testIntentsButNoPolicies() throws Exception { - HelloWorld helloWorld = node.getService(HelloWorld.class, "HelloWorldClientIntentsButNoPolicies1"); - assertEquals("Hello petra", helloWorld.getGreetings("petra")); - - helloWorld = node.getService(HelloWorld.class, "HelloWorldClientIntentsButNoPolicies2"); - assertEquals("Hello petra", helloWorld.getGreetings("petra")); - } - - @Test - public void testSomePoliciesOnOneSideButNoneOnTheOther() throws Exception { - try { - HelloWorld helloWorld = node.getService(HelloWorld.class, "HelloWorldClientSomePoliciesOnOneSideButNoneOnTheOther"); - helloWorld.getGreetings("petra"); - fail("Exception expected"); - } catch (Exception ex) { - assertTrue(ex.getMessage().indexOf("No match because there are policy sets at the endpoint but not at the endpoint reference") > -1); - } - } - - @Test - public void testPolicySetQNameMatch() throws Exception { - HelloWorld helloWorld = node.getService(HelloWorld.class, "HelloWorldClientPolicySetQNameMatch"); - assertEquals("Hello petra", helloWorld.getGreetings("petra")); - } - - @Test - public void testDifferentPolicyLanguage() throws Exception { - try { - HelloWorld helloWorld = node.getService(HelloWorld.class, "HelloWorldClientDifferentPolicyLanguage"); - helloWorld.getGreetings("petra"); - fail("Exception expected"); - } catch (Exception ex) { - assertTrue(ex.getMessage().indexOf("No match because the policy sets on either side have policies in differnt languages {http://schemas.xmlsoap.org/ws/2004/09/policy}Policy and {http://tuscany.apache.org/xmlns/sca/1.1}jdkLogger") > -1); - } - } - - @Test - public void testPolicySpecificMatch() throws Exception { - // TODO - } - - @AfterClass - public static void tearDown() throws Exception { - node.stop(); - } - -} diff --git a/sca-java-2.x/trunk/itest/policy/pom.xml b/sca-java-2.x/trunk/itest/policy/pom.xml deleted file mode 100644 index 14335b254a..0000000000 --- a/sca-java-2.x/trunk/itest/policy/pom.xml +++ /dev/null @@ -1,37 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <packaging>pom</packaging> - <artifactId>itest-policy</artifactId> - <name>Apache Tuscany SCA iTest Policy</name> - - <modules> - <module>matching</module> - <module>wspolicy</module> - </modules> - -</project> diff --git a/sca-java-2.x/trunk/itest/policy/wspolicy/pom.xml b/sca-java-2.x/trunk/itest/policy/wspolicy/pom.xml deleted file mode 100644 index a0bf3de1a8..0000000000 --- a/sca-java-2.x/trunk/itest/policy/wspolicy/pom.xml +++ /dev/null @@ -1,58 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>itest-policy-wspolicy</artifactId> - <name>Apache Tuscany SCA iTest Policy WS-Policy</name> - - <dependencies> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-feature-webservice</artifactId> - <version>2.0-SNAPSHOT</version> - <type>pom</type> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-policy-wspolicy</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-policy-logging</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - </dependencies> - - <build> - <finalName>${artifactId}</finalName> - </build> -</project> diff --git a/sca-java-2.x/trunk/itest/policy/wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/helloworld/HelloWorld.java b/sca-java-2.x/trunk/itest/policy/wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/helloworld/HelloWorld.java deleted file mode 100644 index a9835199d0..0000000000 --- a/sca-java-2.x/trunk/itest/policy/wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/helloworld/HelloWorld.java +++ /dev/null @@ -1,29 +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.policy.wspolicy.helloworld; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface HelloWorld { - - String getGreetings(String s); - -} diff --git a/sca-java-2.x/trunk/itest/policy/wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/helloworld/HelloWorldClient.java b/sca-java-2.x/trunk/itest/policy/wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/helloworld/HelloWorldClient.java deleted file mode 100644 index 620adad638..0000000000 --- a/sca-java-2.x/trunk/itest/policy/wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/helloworld/HelloWorldClient.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.policy.wspolicy.helloworld; - -import org.oasisopen.sca.annotation.Reference; - -public class HelloWorldClient implements HelloWorld { - - @Reference - public HelloWorld helloWorldWS; - - public String getGreetings(String s) { - String response = helloWorldWS.getGreetings(s); - System.out.println("At client: " + response); - return response; - } - -} diff --git a/sca-java-2.x/trunk/itest/policy/wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/policy/wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/helloworld/HelloWorldService.java deleted file mode 100644 index b7955522f8..0000000000 --- a/sca-java-2.x/trunk/itest/policy/wspolicy/src/main/java/org/apache/tuscany/sca/policy/wspolicy/helloworld/HelloWorldService.java +++ /dev/null @@ -1,30 +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.policy.wspolicy.helloworld; - -public class HelloWorldService implements HelloWorld { - - public String getGreetings(String s) { - String response = "Hello " + s; - System.out.println("At service: " + response); - return response; - } - -} diff --git a/sca-java-2.x/trunk/itest/policy/wspolicy/src/main/resources/LoggingMessages.properties b/sca-java-2.x/trunk/itest/policy/wspolicy/src/main/resources/LoggingMessages.properties deleted file mode 100644 index ada808be0e..0000000000 --- a/sca-java-2.x/trunk/itest/policy/wspolicy/src/main/resources/LoggingMessages.properties +++ /dev/null @@ -1,16 +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. diff --git a/sca-java-2.x/trunk/itest/policy/wspolicy/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/policy/wspolicy/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 7e71dd465f..0000000000 --- a/sca-java-2.x/trunk/itest/policy/wspolicy/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:itest="http://www.tuscany.apache.org/itests/binding/ws/axis2"> - <deployable composite="itest:HelloWorld"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/policy/wspolicy/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sca-java-2.x/trunk/itest/policy/wspolicy/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions deleted file mode 100644 index 961fdeb602..0000000000 --- a/sca-java-2.x/trunk/itest/policy/wspolicy/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions +++ /dev/null @@ -1,17 +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.
-org/apache/tuscany/sca/policy/wspolicy/helloworld/definitions.xml
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/policy/wspolicy/src/main/resources/org/apache/tuscany/sca/policy/wspolicy/helloworld/definitions.xml b/sca-java-2.x/trunk/itest/policy/wspolicy/src/main/resources/org/apache/tuscany/sca/policy/wspolicy/helloworld/definitions.xml deleted file mode 100644 index 425f511273..0000000000 --- a/sca-java-2.x/trunk/itest/policy/wspolicy/src/main/resources/org/apache/tuscany/sca/policy/wspolicy/helloworld/definitions.xml +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?> -<!-- - * 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. ---> -<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1" - xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"> - - <policySet name="JDKLoggingPolicy" - provides="tuscany:logging" - appliesTo="//binding | //implementation" - attachTo="//sca:service | //sca:reference"> - <wsp:Policy> - <wsp:ExactlyOne> - <wsp:All> - <tuscany:jdkLogger name="test.logger"> - <tuscany:logLevel>FINE</tuscany:logLevel> - <tuscany:resourceBundle>LoggingMessages.properties</tuscany:resourceBundle> - </tuscany:jdkLogger> - </wsp:All> - </wsp:ExactlyOne> - </wsp:Policy> - </policySet> - -</definitions>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/policy/wspolicy/src/main/resources/org/apache/tuscany/sca/policy/wspolicy/helloworld/helloworld.composite b/sca-java-2.x/trunk/itest/policy/wspolicy/src/main/resources/org/apache/tuscany/sca/policy/wspolicy/helloworld/helloworld.composite deleted file mode 100644 index 5a3a8f09a8..0000000000 --- a/sca-java-2.x/trunk/itest/policy/wspolicy/src/main/resources/org/apache/tuscany/sca/policy/wspolicy/helloworld/helloworld.composite +++ /dev/null @@ -1,38 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://www.tuscany.apache.org/itests/binding/ws/axis2" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" - name="HelloWorld"> - - <component name="HelloWorldClient"> - <implementation.java class="org.apache.tuscany.sca.policy.wspolicy.helloworld.HelloWorldClient"/> - <reference name="helloWorldWS" target="HelloWorldService" requires="tuscany:logging"/> - </component> - - <component name="HelloWorldService"> - <implementation.java class="org.apache.tuscany.sca.policy.wspolicy.helloworld.HelloWorldService"/> - <service name="HelloWorld" requires="tuscany:logging"> - <binding.ws/> - </service> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/policy/wspolicy/src/main/resources/org/apache/tuscany/sca/policy/wspolicy/helloworld/helloworld.wsdl b/sca-java-2.x/trunk/itest/policy/wspolicy/src/main/resources/org/apache/tuscany/sca/policy/wspolicy/helloworld/helloworld.wsdl deleted file mode 100644 index a352696b8e..0000000000 --- a/sca-java-2.x/trunk/itest/policy/wspolicy/src/main/resources/org/apache/tuscany/sca/policy/wspolicy/helloworld/helloworld.wsdl +++ /dev/null @@ -1,90 +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. ---> -<wsdl:definitions targetNamespace="http://helloworld" - xmlns:tns="http://helloworld" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - name="helloworld"> - - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema"> - - <element name="getGreetings"> - <complexType> - <sequence> - <element name="name" type="xsd:string"/> - </sequence> - </complexType> - </element> - - <element name="getGreetingsResponse"> - <complexType> - <sequence> - <element name="getGreetingsReturn" type="xsd:string"/> - </sequence> - </complexType> - </element> - - </schema> - </wsdl:types> - - <wsdl:message name="getGreetingsRequest"> - <wsdl:part element="tns:getGreetings" name="parameters"/> - </wsdl:message> - - <wsdl:message name="getGreetingsResponse"> - <wsdl:part element="tns:getGreetingsResponse" name="parameters"/> - </wsdl:message> - - <wsdl:portType name="HelloWorld"> - <wsdl:operation name="getGreetings"> - <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/> - <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/> - </wsdl:operation> - </wsdl:portType> - - <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld"> - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="getGreetings"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="getGreetingsRequest"> - <wsdlsoap:body use="literal"/> - </wsdl:input> - <wsdl:output name="getGreetingsResponse"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - - </wsdl:binding> - - <wsdl:service name="HelloWorldService"> - <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort1"> - <wsdlsoap:address location="http://localhost:8085/services/HelloWorldWebService1"/> - </wsdl:port> - <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort2"> - <wsdlsoap:address location="http://localhost:8085/services/HelloWorldWebService2"/> - </wsdl:port> - <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort3"> - <wsdlsoap:address location="http://localhost:8085/services/HelloWorldWebService3"/> - </wsdl:port> - </wsdl:service> - -</wsdl:definitions> diff --git a/sca-java-2.x/trunk/itest/policy/wspolicy/src/test/java/org/apache/tuscany/sca/policy/wspolicy/WSPolicyTestCase.java b/sca-java-2.x/trunk/itest/policy/wspolicy/src/test/java/org/apache/tuscany/sca/policy/wspolicy/WSPolicyTestCase.java deleted file mode 100644 index 4d6921f8a1..0000000000 --- a/sca-java-2.x/trunk/itest/policy/wspolicy/src/test/java/org/apache/tuscany/sca/policy/wspolicy/WSPolicyTestCase.java +++ /dev/null @@ -1,50 +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.policy.wspolicy; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.apache.tuscany.sca.policy.wspolicy.helloworld.HelloWorld; - -public class WSPolicyTestCase extends TestCase { - - private Node node; - private HelloWorld helloWorld; - - public void testCalculator() throws Exception { - assertEquals("Hello petra", helloWorld.getGreetings("petra")); - } - - @Override - protected void setUp() throws Exception { - node = NodeFactory.newInstance().createNode(new Contribution("test", "target/classes")); - node.start(); - helloWorld = node.getService(HelloWorld.class, "HelloWorldClient"); - } - - @Override - protected void tearDown() throws Exception { - node.stop(); - } - -} diff --git a/sca-java-2.x/trunk/itest/pom.xml b/sca-java-2.x/trunk/itest/pom.xml deleted file mode 100644 index a016665cdb..0000000000 --- a/sca-java-2.x/trunk/itest/pom.xml +++ /dev/null @@ -1,111 +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. ---><project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-sca</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>tuscany-itest</artifactId> - <packaging>pom</packaging> - <name>Apache Tuscany SCA Integration Tests</name> - - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.1</version> - <scope>compile</scope> - </dependency> - </dependencies> - - <modules> - <module>base</module> - <module>builder</module> - <module>bpel</module> - <module>callback-api</module> - <module>callback-basic</module> - <module>callback-complex-type</module> - <module>callback-multiple-wires</module> - <module>callback-separatethread</module> - <module>callback-two-composites</module> - <module>callback-two-nodes</module> - <module>component-type</module> - <module>contribution-folder</module> - <module>contribution-zip</module> -<!-- why commented out? - <module>definitions-multiple</module> ---> - <module>databindings</module> - <module>distribution</module> - <module>exceptions</module> - <module>implementation-spring</module> - <module>import-export</module> - <module>interfaces</module> - <module>jms</module> - <module>nodes</module> - <module>node-launcher-equinox</module> - <module>oneway</module> -<!-- why commented out? - <module>operation-overloading</module> ---> - <module>policy</module> - <module>policies</module> - <module>policy-transaction</module> -<!-- wait until databinding-sdo is in - <module>properties</module> ---> - <module>recursive-multi-level</module> - <module>references</module> - <module>scaclient-api</module> -<!-- TUSCANY-3424 - SCAClient in JSE with OSGi runtime not yet supported - <module>scaclient-api-jse-osgi</module> ---> - <module>scaclient-api-osgi</module> - <module>scaclient-api-remote</module> - <module>scopes</module> - <module>scdl</module> - <module>services</module> - <module>service-reference</module> - <module>wires</module> - <module>ws</module> - <module>ws-jaxws</module> - <module>async-interactions</module> - </modules> - - <!-- We don't want to deploy any of the test modules --> - <properties> - <maven.deploy.skip>true</maven.deploy.skip> - </properties> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </build> - -</project> diff --git a/sca-java-2.x/trunk/itest/properties/pom.xml b/sca-java-2.x/trunk/itest/properties/pom.xml deleted file mode 100644 index ec04cdba99..0000000000 --- a/sca-java-2.x/trunk/itest/properties/pom.xml +++ /dev/null @@ -1,74 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-properties</artifactId> - <name>Apache Tuscany SCA iTest Properties</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <!-- XPathFactory --> - <dependency> - <groupId>xalan</groupId> - <artifactId>xalan</artifactId> - <version>2.7.1</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-core-databinding</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-jaxb</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - </dependencies> -</project> diff --git a/sca-java-2.x/trunk/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java b/sca-java-2.x/trunk/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java deleted file mode 100644 index b0fd64c9da..0000000000 --- a/sca-java-2.x/trunk/itest/properties/src/main/java/mysca/test/myservice/impl/MyService.java +++ /dev/null @@ -1,34 +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 mysca.test.myservice.impl; - -public interface MyService { - /** - * This is a method to get the location property value from the sca runtime environment. It is implemented in the - * class MyServiceImpl - */ - String getLocation(); - - /** - * This is a method to get the year property value from the sca runtime environment. It is implemented in the class - * MyServiceImpl - */ - String getYear(); -} diff --git a/sca-java-2.x/trunk/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java b/sca-java-2.x/trunk/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java deleted file mode 100644 index 7b44ef02e4..0000000000 --- a/sca-java-2.x/trunk/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java +++ /dev/null @@ -1,88 +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 mysca.test.myservice.impl; - -import java.util.logging.Logger; - -import org.oasisopen.sca.annotation.ComponentName; -import org.oasisopen.sca.annotation.Destroy; -import org.oasisopen.sca.annotation.Init; -import org.oasisopen.sca.annotation.Property; -import org.oasisopen.sca.annotation.Service; - -/** - * This class Implements the interface MyService and gives implementation for all methods which are declared in that - * interface. scope is specified as Composite using - * - * @scope annotation. - */ - -@Service(MyService.class) -public class MyServiceImpl implements MyService { - - @Property(name = "location") - protected String location = "RTP"; - - @Property(name = "year") - protected String year = "2006"; - - @ComponentName - protected String componentName; - - private Logger logger; - - /** - * @ to print the message in the log - */ - public MyServiceImpl() { - logger = Logger.getAnonymousLogger(); - logger.info("creating service instance..."); - } - - /** - * @Init annotation to Start the service. Which is executed all the time - */ - @Init - public void start() { - logger.info("Start service.."); - } - - /** - * @Destroy annotation to stop the service. Which is executed in the end - */ - @Destroy - public void stop() { - logger.info("Stop service.."); - - } - - public String getComponentName() { - return componentName; - } - - public String getLocation() { - return location; - } - - public String getYear() { - return year; - } - -} diff --git a/sca-java-2.x/trunk/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java b/sca-java-2.x/trunk/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java deleted file mode 100644 index e8c4341cf2..0000000000 --- a/sca-java-2.x/trunk/itest/properties/src/main/java/mysca/test/myservice/impl/MyTotalServiceImpl.java +++ /dev/null @@ -1,46 +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 mysca.test.myservice.impl; - -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Service; - -/** - * This class Implements the interface MyService and gives implementation for all methods which are declared in that - * interface. scope is specified as Composite using - * - * @scope annotation. - */ - -@Service(MyService.class) -public class MyTotalServiceImpl implements MyService { - - // default required==true so it is 1:1 - @Reference - public MyService myService; - - public String getLocation() { - return myService.getLocation(); - } - - public String getYear() { - return myService.getYear(); - } - -} diff --git a/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java deleted file mode 100644 index 68ce5a3cb6..0000000000 --- a/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponent.java +++ /dev/null @@ -1,50 +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.itest; - -/** - * It is an Interface which has method declarations. Methods which are to be accessed as a service are declared in this - * interface. Implementation for these methods is provided in ABCDComponentImpl Class - */ -public interface ABCDComponent { - - /** - * This is a method to get a string property value from the SCA runtime environment. It is implemented in the class - * ABCDComponentImpl - */ - String getA(); - - /** - * This is a method to get a string property value from the SCA runtime environment. It is implemented in the class - * ABCDComponentImpl - */ - String getB(); - - /** - * This is a method to get a string property value from the SCA runtime environment. It is implemented in the class - * ABCDComponentImpl - */ - String getC(); - - /** - * This is a method to get a string property value from the SCA runtime environment. It is implemented in the class - * ABCDComponentImpl - */ - String getD(); -} diff --git a/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java deleted file mode 100644 index c8d0d4cae4..0000000000 --- a/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABCDComponentImpl.java +++ /dev/null @@ -1,73 +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.itest; - -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Scope; - -/** - * This class Implements the interface ABCDComponent and gives implementation for all methods which are declared in that - * interface. scope is specified as Composite using - * - * @scope annotation. - */ -@Scope("COMPOSITE") -public class ABCDComponentImpl implements ABCDComponent { - private ABComponent abComponent; - private CDComponent cdComponent; - - /** - * It is a method which injects the property value to the variable 'abComponent' from the SCA runtime environment - * using - * - * @Property Annotations. - */ - @Reference - public void setAb(ABComponent component) { - this.abComponent = component; - } - - /** - * It is a method which injects the property value to the variable 'cdComponent' from the SCA runtime environment - * using - * - * @Property Annotations. - */ - @Reference - public void setCd(CDComponent component) { - this.cdComponent = component; - } - - public String getA() { - return this.abComponent.getA(); - } - - public String getB() { - return this.abComponent.getB(); - } - - public String getC() { - return this.cdComponent.getC(); - } - - public String getD() { - return this.cdComponent.getD(); - } -} diff --git a/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java deleted file mode 100644 index b727935bc1..0000000000 --- a/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponent.java +++ /dev/null @@ -1,75 +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.itest; - -import java.util.Collection; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * It is an Interface which has method declarations. Methods which are to be accessed as a service are declared in this - * interface. Implementation for these methods is provided in ABComponentImpl Class - */ -@Remotable -public interface ABComponent { - - /** - * This is a method to get a string property value from the SCA runtime environment. It is implemented in the class - * ABComponentImpl - */ - - String getA(); - - /** - * This is a method to get a string property value from the SCA runtime environment. It is implemented in the class - * ABComponentImpl - */ - String getB(); - - /** - * This is a method to get a string property value from the SCA runtime environment. It is implemented in the class - * ABComponentImpl - */ - String getZ(); - - /** - * This is a method to get an integer property value from the SCA runtime environment. It is implemented in the - * class ABComponentImpl - */ - int getIntValue(); - - /** - * This is a method to get a string property value from the SCA runtime environment. It is implemented in the class - * ABComponentImpl - */ - String getF(); - - /** - * This is a method to get collection of property values from the SCA runtime environment. It is implemented in the - * class ABComponentImpl - */ - Collection<String> getManyStringValues(); - - /** - * This is a method to get collection of property value from the SCA runtime environment. It is implemented in the - * class ABComponentImpl - */ - Collection<Integer> getManyIntegers(); -} diff --git a/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java deleted file mode 100644 index e402131ce2..0000000000 --- a/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ABComponentImpl.java +++ /dev/null @@ -1,131 +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.itest; - -import java.util.Collection; - -import org.oasisopen.sca.annotation.Property; - -/** - * This class Implements the interface ABComponent and gives implementation for all methods which are declared in that - * interface. - */ - -public class ABComponentImpl implements ABComponent { - - private String aProperty; - private String bProperty; - private int intValue; - private Collection<String> manyStringValues; - private Collection<Integer> manyIntegerValues; - private String zProperty; - private String fProperty; - - /** - * It is a method which injects the property value to the variable 'zProperty' from the SCA runtime environment - * using Annotations. - */ - @Property(name = "xpath") - public void setZProperty(final String value) { - this.zProperty = value; - } - - /** - * It is a method which injects collection of property values to the variable 'manyStringValues' from the SCA - * runtime environment using Annotations. - */ - @Property(name = "foobar") - public void setManyStringValues(final Collection<String> value) { - this.manyStringValues = value; - } - - /** - * It is a method which injects collection of integer property values to the variable 'manyIntegerValues' from the - * SCA runtime environment using Annotations. - */ - @Property(name = "fooInts") - public void setManyIntegers(final Collection<Integer> value) { - this.manyIntegerValues = value; - } - - /** - * It is a method which injects the property value to the variable 'aProperty' from the SCA runtime environment - * using Annotations. - */ - @Property - public void setA(final String A) { - this.aProperty = A; - } - - /** - * It is a method which injects the property value to the variable 'bProperty' from the SCA runtime environment - * using Annotations. - */ - @Property - public void setB(final String B) { - this.bProperty = B; - } - - /** - * It is a method which injects the property value to the variable 'fProperty' from the SCA runtime environment - * using Annotations. - */ - @Property - public void setF(final String F) { - this.fProperty = F; - } - - /** - * It is a method which injects integer property value to the variable 'intValue' from the SCA runtime environment - * using Annotations. - */ - @Property - public void setOne(final int value) { - this.intValue = value; - } - - public String getA() { - return this.aProperty; - } - - public String getB() { - return this.bProperty; - } - - public int getIntValue() { - return this.intValue; - } - - public String getZ() { - return this.zProperty; - } - - public String getF() { - return this.fProperty; - } - - public Collection<String> getManyStringValues() { - return manyStringValues; - } - - public Collection<Integer> getManyIntegers() { - return manyIntegerValues; - } -} diff --git a/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java deleted file mode 100644 index 52f9871d1b..0000000000 --- a/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponent.java +++ /dev/null @@ -1,71 +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.itest; - -import java.util.Collection; - -/** - * It is an Interface which has method declarations. Methods which are to be accessed as a service are declared in this - * interface. Implementation for these methods is provided in CDComponentImpl Class - */ -public interface CDComponent { - - /** - * This is a method to get a property value from the SCA runtime environment. It is implemented in the class - * CDComponentImpl Class - */ - String getC(); - - /** - * This is a method to get a property value from the SCA runtime environment. It is implemented in the class - * CDComponentImpl Class - */ - String getC2(); - - /** - * This is a method to get a property value from the SCA runtime environment. It is implemented in the class - * CDComponentImpl Class - */ - String getD(); - - /** - * This is a method to get a property value from the SCA runtime environment. It is implemented in the class - * CDComponentImpl Class - */ - String getNoSource(); - - /** - * This is a method to get a property value from the SCA runtime environment. It is implemented in the class - * CDComponentImpl Class - */ - String getFileProperty(); - - /** - * This is a method to get a property value from the SCA runtime environment. It is implemented in the class - * CDComponentImpl Class - */ - Collection<String> getManyValuesFileProperty(); - - /** - * This is a method to get a property value from the SCA runtime environment. It is implemented in the class - * CDComponentImpl Class - */ - int getOverrideValue(); -} diff --git a/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java deleted file mode 100644 index fceda9d9ae..0000000000 --- a/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/CDComponentImpl.java +++ /dev/null @@ -1,143 +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.itest; - -import java.util.Collection; - -import org.oasisopen.sca.annotation.Property; - -/** - * This class Implements the interface CDComponent and gives implementation for all methods which are declared in that - * interface. - */ -public class CDComponentImpl implements CDComponent { - - private String cProperty; - private String dProperty; - private String nosource; - private String fileProperty; - private Collection<String> manyValuesFileProperty; - private int overrideNumber; - private String cProperty2; - - /** - * It is a method which injects the property value to the variable 'cProperty2' from the SCA runtime environment - * using - * - * @Property Annotations. - */ - @Property(name = "nonFileProperty") - public void setC2(final String value) { - this.cProperty2 = value; - } - - /** - * It is a method which injects the property value to the variable 'overrideNumber' from the SCA runtime environment - * using - * - * @Property Annotations. - */ - @Property(name = "two") - public void setOverrideNumber(final int value) { - this.overrideNumber = value; - } - - /** - * It is a method which injects the property value to the variable 'fileProperty' from the SCA runtime environment - * using - * - * @Property Annotations. - */ - @Property(name = "fileProperty") - public void setFileProp(final String value) { - this.fileProperty = value; - } - - /** - * It is a method which injects the property value to the variable 'manyValuesFileProperty' from the SCA runtime - * environment using - * - * @Property Annotations. - */ - @Property(name = "manyValuesFileProperty") - public void setFileManyValueProp(final Collection<String> values) { - this.manyValuesFileProperty = values; - } - - /** - * It is a method which injects the property value to the variable 'cProperty' from the SCA runtime environment - * using - * - * @Property Annotations. - */ - @Property - public void setC(final String C) { - this.cProperty = C; - } - - /** - * It is a method which injects the property value to the variable 'dProperty' from the SCA runtime environment - * using - * - * @Property Annotations. - */ - @Property - public void setD(final String D) { - this.dProperty = D; - } - - /** - * It is a method which injects the property value to the variable 'nosource' from the SCA runtime environment using - * - * @Property Annotations. - */ - @Property - public void setNosource(final String value) { - this.nosource = value; - } - - public String getFileProperty() { - return this.fileProperty; - } - - public String getC() { - return this.cProperty; - } - - public String getC2() { - return this.cProperty2; - } - - public String getD() { - return this.dProperty; - } - - public String getNoSource() { - return this.nosource; - } - - public int getOverrideValue() { - return this.overrideNumber; - } - - public Collection<String> getManyValuesFileProperty() { - return this.manyValuesFileProperty; - } -} diff --git a/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java deleted file mode 100644 index 1642ab55f5..0000000000 --- a/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java +++ /dev/null @@ -1,151 +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.itest; - -/** - * This is a Java Bean which has setter and getter methods for for the variables used in the property tests. - */ -public class ComplexPropertyBean { - - /** - * Variable declarations - */ - protected int integerNumber = 25; - protected float floatNumber = 50; - protected double doubleNumber = 75; - protected int[] intArray = null; - protected double[] doubleArray = null; - protected String[] stringArray = null; - - ComplexPropertyBean numberSet; - protected ComplexPropertyBean[] numberSetArray = null; - - public ComplexPropertyBean() { - - } - - public double getDoubleNumber() { - return doubleNumber; - } - - /** - * It is a setter method to set a value for the variable doubleNumber - */ - public void setDoubleNumber(double doubleNumber) { - this.doubleNumber = doubleNumber; - } - - /** - * It is a getter method to get a value for the variable floatNumber - */ - public float getFloatNumber() { - return floatNumber; - } - - /** - * It is a setter method to set a value for the variable floatNumber - */ - public void setFloatNumber(float floatNumber) { - this.floatNumber = floatNumber; - } - - /** - * It is a getter method to get a value for the variable floatNumber - */ - public int getIntegerNumber() { - return integerNumber; - } - - /** - * It is a getter method to get a value for the variable integerNumber - */ - public void setIntegerNumber(int integerNumber) { - this.integerNumber = integerNumber; - } - - /** - * It is a getter method to set a value for the variable numberSet - */ - public ComplexPropertyBean getNumberSet() { - return numberSet; - } - - /** - * It is a setter method to set a value for the variable numberSet - */ - public void setNumberSet(ComplexPropertyBean numberSet) { - this.numberSet = numberSet; - } - - /** - * It is a method which implements toString() function - */ - - public String toString() { - return Double.toString(integerNumber) + " - " - + Double.toString(floatNumber) - + " - " - + Double.toString(doubleNumber) - + " \n" - + ((intArray == null) ? "" : intArray[0] + " - " + intArray[1] + " \n ") - + ((doubleArray == null) ? "" : doubleArray[0] + " - " + doubleArray[1] + " \n ") - + ((stringArray == null) ? "" : stringArray[0] + " - " + stringArray[1] + " \n ") - + ((numberSetArray == null) ? "" : numberSetArray[0] + " - " + numberSetArray[1] + " \n ") - + ((numberSet == null) ? "" : numberSet.toString()); - } - - /** - * It is a setter method to set values for the variable stringArray - */ - public String[] getStringArray() { - return stringArray; - } - - /** - * It is a setter method to set values for the variable stringArray - */ - public void setStringArray(String[] stringArray) { - this.stringArray = stringArray; - } - - public int[] getIntArray() { - return intArray; - } - - public void setIntArray(int[] intArray) { - this.intArray = intArray; - } - - public double[] getDoubleArray() { - return doubleArray; - } - - public void setDoubleArray(double[] doubleArray) { - this.doubleArray = doubleArray; - } - - public ComplexPropertyBean[] getNumberSetArray() { - return numberSetArray; - } - - public void setNumberSetArray(ComplexPropertyBean[] numberSetArray) { - this.numberSetArray = numberSetArray; - } -} diff --git a/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java deleted file mode 100644 index acd1f26670..0000000000 --- a/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideService.java +++ /dev/null @@ -1,27 +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.itest; - -/** - * This is an Interface for the services - */ -public interface OverrideService { - -} diff --git a/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java deleted file mode 100644 index 71dce41efc..0000000000 --- a/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/OverrideServiceImpl.java +++ /dev/null @@ -1,28 +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.itest; - -/** - * An implementation for the interface OverrideService. - */ - -public class OverrideServiceImpl implements OverrideService { - -} diff --git a/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java deleted file mode 100644 index 9c7e8c3447..0000000000 --- a/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java +++ /dev/null @@ -1,114 +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.itest; - -import java.util.Collection; - -import test.jaxb.props.ReturnCodeProperties; - -/** - * It is an Interface which has method declarations. Methods which are to be accessed as a service are declared in this - * interface. Implementation for these methods is provided in PropertyComponentImpl Class - */ -public interface PropertyComponent { - - /** - * This is a method to get a value for a property name 'location' from the SCA runtime environment. It is - * implemented in the class PropertyComponentImpl - */ - public String getLocation(); - - /** - * This is a method to get a value for a property name 'year' from the SCA runtime environment. It is implemented in - * the class PropertyComponentImpl - */ - public String getYear(); - - /** - * This method is used to test injecting a primitive String Array - * - * @return The injected array - */ - public String[] getDaysOfTheWeek(); - - /** - * This method is used to test injecting an Object Integer Array - * - * @return The injected array - */ - public Integer[] getIntegerNumbers(); - - /** - * This method is used to test injecting an int Array - * - * @return The injected array - */ - public int[] getIntNumbers(); - - /** - * This is a method to get a property value from the SCA runtime environment. It is implemented in the class - * PropertyComponentImpl - */ - - public ComplexPropertyBean getComplexPropertyOne(); - - /** - * This is a method to get a property value from the SCA runtime environment. It is implemented in the class - * PropertyComponentImpl - */ - public ComplexPropertyBean getComplexPropertyTwo(); - - /** - * This is a method to get a property value from the SCA runtime environment. It is implemented in the class - * PropertyComponentImpl - */ - public ComplexPropertyBean getComplexPropertyThree(); - - /** - * This is a method to get a property value from the SCA runtime environment. It is implemented in the class - * PropertyComponentImpl - */ - public Collection<ComplexPropertyBean> getComplexPropertyFour(); - - /** - * This is a method to get a property value from the SCA runtime environment. It is implemented in the class - * PropertyComponentImpl - */ - - public ComplexPropertyBean getComplexPropertyFive(); - - /** - * This is a method to get a property value from the SCA runtime environment. It is implemented in the class - * PropertyComponentImpl - */ - public ReturnCodeProperties getComplexJAXBPropertyOne(); - - /** - * This is a method to get a property value from the SCA runtime environment. It is implemented in the class - * PropertyComponentImpl - */ - public ReturnCodeProperties getComplexJAXBPropertyTwo(); - - /** - * @return - */ - public String getLocationFromComponentContext(); - -} diff --git a/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java deleted file mode 100644 index 64ca749e9f..0000000000 --- a/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java +++ /dev/null @@ -1,144 +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.itest; - -import java.util.Collection; - -import org.oasisopen.sca.ComponentContext; -import org.oasisopen.sca.annotation.Context; -import org.oasisopen.sca.annotation.Property; - -import test.jaxb.props.ReturnCodeProperties; - -/** - * This class Implements the interface PropertyComponent and gives implementation for all methods which are declared in - * that interface. - */ -public class PropertyComponentImpl implements PropertyComponent { - @Context - protected ComponentContext context; - - @Property - protected ComplexPropertyBean complexPropertyOne; - - @Property - protected ComplexPropertyBean complexPropertyTwo; - - @Property - protected ComplexPropertyBean complexPropertyThree; - - @Property - protected Collection<ComplexPropertyBean> complexPropertyFour; - - @Property - protected ComplexPropertyBean complexPropertyFive; - - @Property(name = "location") - protected String location; - - @Property(name = "year") - protected String year; - - @Property(name = "daysOfTheWeek") - protected String[] daysOfTheWeek; - - @Property(name = "integerNumbers") - protected Integer[] integerNumbers; - - @Property(name = "intNumbers") - protected int[] intNumbers; - - @Property - protected ReturnCodeProperties complexJAXBPropertyOne; - - @Property - protected ReturnCodeProperties complexJAXBPropertyTwo; - - public String getLocation() { - return location; - } - - public String getYear() { - return year; - } - - public ComplexPropertyBean getComplexPropertyOne() { - //System.out.println(complexPropertyOne); - return complexPropertyOne; - } - - public ComplexPropertyBean getComplexPropertyTwo() { - //System.out.println(complexPropertyTwo); - return complexPropertyTwo; - } - - public ComplexPropertyBean getComplexPropertyThree() { - //System.out.println(complexPropertyThree); - return complexPropertyThree; - } - - public Collection<ComplexPropertyBean> getComplexPropertyFour() { - //System.out.println(complexPropertyThree); - return complexPropertyFour; - } - - public ComplexPropertyBean getComplexPropertyFive() { - return complexPropertyFive; - } - - /** - * This method is used to test injecting an Array - * - * @return The injected array - */ - public String[] getDaysOfTheWeek() { - return daysOfTheWeek; - } - - /** - * This method is used to test injecting an Object Integer Array - * - * @return The injected array - */ - public Integer[] getIntegerNumbers() { - return integerNumbers; - } - - /** - * This method is used to test injecting an int Array - * - * @return The injected array - */ - public int[] getIntNumbers() { - return intNumbers; - } - - public String getLocationFromComponentContext() { - return context.getProperty(String.class, "location"); - } - - public ReturnCodeProperties getComplexJAXBPropertyOne() { - return complexJAXBPropertyOne; - } - - public ReturnCodeProperties getComplexJAXBPropertyTwo() { - return complexJAXBPropertyTwo; - } -} diff --git a/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java deleted file mode 100644 index a57ccd90c8..0000000000 --- a/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyService.java +++ /dev/null @@ -1,27 +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.itest; - -/** - * This is an Interface for the services. - */ -public interface PropertyService { - -} diff --git a/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java deleted file mode 100644 index c147a2affe..0000000000 --- a/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Bar.java +++ /dev/null @@ -1,23 +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.itest.cdi; - -public interface Bar { - public String getBar(); -} diff --git a/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java deleted file mode 100644 index f44fed7389..0000000000 --- a/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo1.java +++ /dev/null @@ -1,38 +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.itest.cdi; - -import org.oasisopen.sca.annotation.Constructor; -import org.oasisopen.sca.annotation.Property; -import org.oasisopen.sca.annotation.Service; - -@Service(Bar.class) -public class Foo1 implements Bar { - - protected String bar; - - @Constructor - public Foo1(@Property(name="bar") String b) { - this.bar = b; - } - - public String getBar() { - return this.bar; - } -} diff --git a/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java deleted file mode 100644 index 1d2e563095..0000000000 --- a/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo2.java +++ /dev/null @@ -1,39 +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.itest.cdi; - -import org.oasisopen.sca.annotation.Constructor; -import org.oasisopen.sca.annotation.Property; -import org.oasisopen.sca.annotation.Service; - -@Service(Bar.class) -public class Foo2 implements Bar { - - protected String bar; - - @Constructor - public Foo2(@Property(name = "bar") String b) { - this.bar = b; - } - - public String getBar() { - return this.bar; - } - -} diff --git a/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java b/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.java deleted file mode 100644 index 54082e297a..0000000000 --- a/sca-java-2.x/trunk/itest/properties/src/main/java/org/apache/tuscany/sca/itest/cdi/Foo3.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.itest.cdi; - -import org.oasisopen.sca.annotation.Constructor; -import org.oasisopen.sca.annotation.Property; -import org.oasisopen.sca.annotation.Service; - -@Service(Bar.class) -public class Foo3 implements Bar { - - protected String bar; - - @Constructor - public Foo3() { - this.bar = "bar"; - } - - public String getBar() { - return this.bar; - } - - @Property(name = "bar") - public void setBar(String b) { - this.bar = b; - } - -} diff --git a/sca-java-2.x/trunk/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java b/sca-java-2.x/trunk/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java deleted file mode 100644 index 15fb49ea4e..0000000000 --- a/sca-java-2.x/trunk/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java +++ /dev/null @@ -1,75 +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. - */ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.06.07 at 03:30:47 PM EDT -// -package test.jaxb.props; - -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlElementDecl; -import javax.xml.bind.annotation.XmlRegistry; -import javax.xml.namespace.QName; - -/** - * This object contains factory methods for each - * Java content interface and Java element interface - * generated in the test.jaxb.props package. - * <p>An ObjectFactory allows you to programatically - * construct new instances of the Java representation - * for XML content. The Java representation of XML - * content can consist of schema derived interfaces - * and classes representing the binding of schema - * type definitions, element declarations and model - * groups. Factory methods for each of these are - * provided in this class. - * - */ -@XmlRegistry -public class ObjectFactory { - - private final static QName _MyRCProps_QNAME = new QName("http://test.sca.jaxb/rcprops", "MyRCProps"); - - /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: test.jaxb.props - * - */ - public ObjectFactory() { - } - - /** - * Create an instance of {@link ReturnCodeProperties } - * - */ - public ReturnCodeProperties createReturnCodeProperties() { - return new ReturnCodeProperties(); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ReturnCodeProperties }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://test.sca.jaxb/rcprops", name = "MyRCProps") - public JAXBElement<ReturnCodeProperties> createMyRCProps(ReturnCodeProperties value) { - return new JAXBElement<ReturnCodeProperties>(_MyRCProps_QNAME, ReturnCodeProperties.class, null, value); - } - -} diff --git a/sca-java-2.x/trunk/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java b/sca-java-2.x/trunk/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java deleted file mode 100644 index 0a1d4a34a3..0000000000 --- a/sca-java-2.x/trunk/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java +++ /dev/null @@ -1,103 +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. - */ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.06.07 at 03:30:47 PM EDT -// -package test.jaxb.props; - -import java.math.BigInteger; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - -/** - * <p>Java class for ReturnCodeProperties complex type. - * - * <p>The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * <complexType name="ReturnCodeProperties"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element name="AInt" type="{http://www.w3.org/2001/XMLSchema}int"/> - * <element name="BInteger" type="{http://www.w3.org/2001/XMLSchema}integer"/> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </pre> - * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "ReturnCodeProperties", namespace = "http://test.sca.jaxb/rcprops", propOrder = {"a", "b"}) -public class ReturnCodeProperties { - - @XmlElement(name = "AInt") - protected int a; - @XmlElement(name = "BInteger", required = true) - protected BigInteger b; - - /** - * Gets the value of the a property. - * - */ - public int getA() { - return a; - } - - /** - * Sets the value of the a property. - * - */ - public void setA(int value) { - this.a = value; - } - - /** - * Gets the value of the b property. - * - * @return - * possible object is - * {@link BigInteger } - * - */ - public BigInteger getB() { - return b; - } - - /** - * Sets the value of the b property. - * - * @param value - * allowed object is - * {@link BigInteger } - * - */ - public void setB(BigInteger value) { - this.b = value; - } - -} diff --git a/sca-java-2.x/trunk/itest/properties/src/main/java/test/jaxb/props/package-info.java b/sca-java-2.x/trunk/itest/properties/src/main/java/test/jaxb/props/package-info.java deleted file mode 100644 index 6a6fdd00cc..0000000000 --- a/sca-java-2.x/trunk/itest/properties/src/main/java/test/jaxb/props/package-info.java +++ /dev/null @@ -1,27 +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. - */ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2008.06.07 at 03:30:47 PM EDT -// -@javax.xml.bind.annotation.XmlSchema(namespace = "http://test.sca.jaxb/rcprops", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) -package test.jaxb.props; - diff --git a/sca-java-2.x/trunk/itest/properties/src/main/resources/ConstructorPropertyInjection.composite b/sca-java-2.x/trunk/itest/properties/src/main/resources/ConstructorPropertyInjection.composite deleted file mode 100644 index e697cedd62..0000000000 --- a/sca-java-2.x/trunk/itest/properties/src/main/resources/ConstructorPropertyInjection.composite +++ /dev/null @@ -1,39 +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://docs.oasis-open.org/ns/opencsa/sca/200912" targetNamespace="http://foo" name="ConstructorPropertyInjection"> - - <component name="Foo1Component"> - <implementation.java class="org.apache.tuscany.sca.itest.cdi.Foo1" /> - <property name="bar" value="foobar" /> - </component> - - <component name="Foo2Component"> - <implementation.java class="org.apache.tuscany.sca.itest.cdi.Foo2" /> - <property name="bar">fubar</property> - </component> - - <component name="Foo3Component"> - <implementation.java class="org.apache.tuscany.sca.itest.cdi.Foo3" /> - <property name="bar"> - <value>fubar</value> - </property> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/properties/src/main/resources/Outer.composite b/sca-java-2.x/trunk/itest/properties/src/main/resources/Outer.composite deleted file mode 100644 index 93f164a1e7..0000000000 --- a/sca-java-2.x/trunk/itest/properties/src/main/resources/Outer.composite +++ /dev/null @@ -1,43 +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 - * 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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:foo="http://foo" xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xsi:schemaLocation="http://docs.oasis-open.org/ns/opencsa/sca/200912 http://docs.oasis-open.org/ns/opencsa/sca/200912" name="Iteration3Composite" - targetNamespace="http://foo" local="true" autowire="false"> - - <property name="newLocation" type="xsd:anyURI">Raleigh</property> - <property name="newYear" type="xsd:anyURI">2008</property> - <component name="MyServiceComponent"> - <implementation.java class="mysca.test.myservice.impl.MyServiceImpl" /> - </component> - <component name="MyServiceComponentNew"> - <implementation.java class="mysca.test.myservice.impl.MyServiceImpl" /> - <property name="location" source="$newLocation" /> - <property name="year" source="$newYear" /> - </component> - <component name="MyTotalServiceNewComponent"> - <implementation.java class="mysca.test.myservice.impl.MyTotalServiceImpl" /> - <reference name="myService" target="MyServiceComponentNew/MyService" /> - </component> - <component name="MySimpleServiceInRecursiveAnother"> - <implementation.composite name="foo:MySimpleService" /> - <property name="newLocation">Durham</property> - <property name="newYear">2009</property> - </component> -</composite> diff --git a/sca-java-2.x/trunk/itest/properties/src/main/resources/OuterPropertyTest.composite b/sca-java-2.x/trunk/itest/properties/src/main/resources/OuterPropertyTest.composite deleted file mode 100644 index 0c8714cbe1..0000000000 --- a/sca-java-2.x/trunk/itest/properties/src/main/resources/OuterPropertyTest.composite +++ /dev/null @@ -1,42 +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
- * 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://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:foo="http://foo"
- targetNamespace="http://foo"
- name="OuterPropertyTest"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <component name="OuterComponent">
- <implementation.composite name="foo:PropertyTest" />
- <property name="number">125</property>
- <property name="complex" type="foo:MyComplexType">
- <value>
- <foo:a>Overriden A</foo:a>
- <foo:b>Overriden B</foo:b>
- <foo:c>Overriden C</foo:c>
- <foo:d>Overriden D</foo:d>
- <foo:x>
- <foo:y>Overriden Y</foo:y>
- <foo:z>Overriden Z</foo:z>
- </foo:x>
- </value>
- </property>
- </component>
-</composite>
-
diff --git a/sca-java-2.x/trunk/itest/properties/src/main/resources/PropertyTest.composite b/sca-java-2.x/trunk/itest/properties/src/main/resources/PropertyTest.composite deleted file mode 100644 index 7c834d5e0b..0000000000 --- a/sca-java-2.x/trunk/itest/properties/src/main/resources/PropertyTest.composite +++ /dev/null @@ -1,260 +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 - * 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://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:foo="http://foo" - xmlns:cust="http://www.example.com/Customer" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:rcp="http://test.sca.jaxb/rcprops" - targetNamespace="http://foo" - name="PropertyTest" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - - <service name="ProperterTestService" promote="ABComponent"> - <interface.java interface="org.apache.tuscany.sca.itest.ABComponent"/> - </service> - - <property name="number" type="xsd:int">1</property> - <property name="complex" type="foo:MyComplexType" > - <value> - <foo:a>a</foo:a> - <foo:b>b</foo:b> - <foo:c>c</foo:c> - <foo:d>d</foo:d> - <foo:x> - <foo:y>y</foo:y> - <foo:z>z</foo:z> - </foo:x> - </value> - </property> - - <property name="moreComplex" type="foo:MyMoreComplexType"> - <value> - <numberSetArray> - <integerNumber>1</integerNumber> - <floatNumber>11</floatNumber> - <doubleNumber>111</doubleNumber> - </numberSetArray> - <numberSetArray> - <integerNumber>2</integerNumber> - <floatNumber>22</floatNumber> - <doubleNumber>222</doubleNumber> - </numberSetArray> - <stringArray>TestString_1</stringArray> - <stringArray>TestString_2</stringArray> - <intArray>10</intArray> - <intArray>20</intArray> - <integerNumber>27</integerNumber> - <floatNumber>79.34</floatNumber> - <doubleNumber>184.52</doubleNumber> - <doubleArray>50.05</doubleArray> - <doubleArray>25.52</doubleArray> - <numberSet> - <integerNumber>54</integerNumber> - <floatNumber>158.68</floatNumber> - <doubleNumber>369.04</doubleNumber> - </numberSet> - </value> - </property> - - <property name="complexFoo" type="foo:MyMoreComplexType"> - <value> - <stringArray>TestString_3</stringArray> - <stringArray>TestString_4</stringArray> - <intArray>100</intArray> - <intArray>200</intArray> - </value> - </property> - - <component name="ABCDComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.ABCDComponentImpl"/> - <reference name="ab" target="ABComponent"/> - <reference name="cd" target="CDComponent"/> - </component> - - <component name="ABComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.ABComponentImpl"/> - <property name="a" source="$complex/foo:a"/> - <property name="b" source="$complex/foo:b"/> - <property name="f" source="$complex/foo:a">f</property> - <property name="xpath" source="$complex/foo:x/*[local-name()='z']"/> - <property name="one" source="$number"/> - <property name="foobar" many="true"> - <value>Apache</value> - <value>Tuscany</value> - <value>Java SCA</value> - </property> - <property name="fooInts" many="true"> - <value>123</value> - <value>456</value> - <value>789</value> - </property> - </component> - - - <component name="CDComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.CDComponentImpl"/> - <property name="c" source="$complex/foo:c"/> - <property name="d" source="$complex/foo:d"/> - <property name="nosource">aValue</property> - <property name="fileProperty" file="fileProperty.txt"/> - <property name="manyValuesFileProperty" many="true" file="manyValuesFileProperty.txt"/> - <property name="nonFileProperty" file="fileProperty.txt" source="$complex/foo:c"/> - <property name="two" source="$number">25</property> - </component> - - <component name="PropertyComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.PropertyComponentImpl"/> - <property name="complexPropertyOne" source="$moreComplex"></property> - <property name="complexPropertyTwo" type="foo:MyMoreComplexType"> - <value> - <stringArray>TestString_1</stringArray> - <stringArray>TestString_2</stringArray> - <intArray>10</intArray> - <integerNumber>27</integerNumber> - <floatNumber>79.34</floatNumber> - <doubleArray>25.52</doubleArray> - <doubleNumber>184.52</doubleNumber> - <doubleArray>50.05</doubleArray> - <intArray>20</intArray> - <numberSetArray> - <integerNumber>1</integerNumber> - <floatNumber>11</floatNumber> - <doubleNumber>111</doubleNumber> - </numberSetArray> - <numberSetArray> - <integerNumber>2</integerNumber> - <floatNumber>22</floatNumber> - <doubleNumber>222</doubleNumber> - </numberSetArray> - <numberSet> - <integerNumber>54</integerNumber> - <floatNumber>158.68</floatNumber> - <doubleNumber>369.04</doubleNumber> - </numberSet> - </value> - </property> - <property name="complexPropertyThree" element="foo:PropertyThreeElement"> - <PropertyThreeElement xmlns="http://foo"> - <stringArray>TestElementString_1</stringArray> - <stringArray>TestElementString_2</stringArray> - <intArray>10</intArray> - <integerNumber>27</integerNumber> - <floatNumber>79.34</floatNumber> - <doubleArray>25.52</doubleArray> - <doubleNumber>184.52</doubleNumber> - <doubleArray>50.05</doubleArray> - <intArray>20</intArray> - <numberSetArray> - <integerNumber>1</integerNumber> - <floatNumber>11</floatNumber> - <doubleNumber>111</doubleNumber> - </numberSetArray> - <numberSetArray> - <integerNumber>2</integerNumber> - <floatNumber>22</floatNumber> - <doubleNumber>222</doubleNumber> - </numberSetArray> - <numberSet> - <integerNumber>54</integerNumber> - <floatNumber>158.68</floatNumber> - <doubleNumber>369.04</doubleNumber> - </numberSet> - </PropertyThreeElement> - </property> - <property name="complexPropertyFour" element="foo:PropertyFourElement" many="true"> - <PropertyFourElement xmlns="http://foo"> - <integerNumber>1</integerNumber> - <floatNumber>11.11</floatNumber> - <doubleNumber>111.111</doubleNumber> - <numberSet> - <integerNumber>11</integerNumber> - <floatNumber>1111.1111</floatNumber> - <doubleNumber>11111.11111</doubleNumber> - </numberSet> - </PropertyFourElement> - <PropertyFourElement xmlns="http://foo"> - <integerNumber>2</integerNumber> - <floatNumber>22.22</floatNumber> - <doubleNumber>222.222</doubleNumber> - <numberSet> - <integerNumber>22</integerNumber> - <floatNumber>2222.2222</floatNumber> - <doubleNumber>22222.22222</doubleNumber> - </numberSet> - </PropertyFourElement> - <PropertyFourElement xmlns="http://foo"> - <integerNumber>3</integerNumber> - <floatNumber>33.33</floatNumber> - <doubleNumber>333.333</doubleNumber> - <numberSet> - <integerNumber>33</integerNumber> - <floatNumber>3333.3333</floatNumber> - <doubleNumber>33333.33333</doubleNumber> - </numberSet> - </PropertyFourElement> - </property> - <property name="complexPropertyFive" source="$complexFoo"/> - <property name="location" type="xsd:string">RTP</property> - <property name="year" type="xsd:string">2006</property> - <property name="daysOfTheWeek" many="true" type="xsd:string"> - <value>Monday</value> - <value>Tuesday</value> - <value>Wednesday</value> - <value>Thursday</value> - <value>Friday</value> - <value>Saturday</value> - <value>Sunday</value> - </property> - <property name="integerNumbers" many="true" type="xsd:int"> - <value>1</value> - <value>2</value> - <value>3</value> - <value>4</value> - <value>5</value> - <value>6</value> - <value>7</value> - <value>8</value> - <value>9</value> - <value>10</value> - </property> - <property name="intNumbers" many="true" type="xsd:int"> - <value>10</value> - <value>9</value> - <value>8</value> - <value>7</value> - <value>6</value> - <value>5</value> - <value>4</value> - <value>3</value> - <value>2</value> - <value>1</value> - <value>0</value> - </property> - - <property name="complexJAXBPropertyOne" type="rcp:ReturnCodeProperties"> - <MyRCProps xmlns="http://test.sca.jaxb/rcprops"> - <AInt>10</AInt> - <BInteger>10</BInteger> - </MyRCProps> - </property> - <property name="complexJAXBPropertyTwo" type="rcp:ReturnCodeProperties" file="rcProps.txt"/> - </component> -</composite> - - diff --git a/sca-java-2.x/trunk/itest/properties/src/main/resources/customer.xsd b/sca-java-2.x/trunk/itest/properties/src/main/resources/customer.xsd deleted file mode 100644 index 7421750f1b..0000000000 --- a/sca-java-2.x/trunk/itest/properties/src/main/resources/customer.xsd +++ /dev/null @@ -1,30 +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. ---> -<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns="http://www.example.com/Customer" targetNamespace="http://www.example.com/Customer"> - - <xsd:element name="customer" type="Customer"/> - <xsd:complexType name="Customer"> - <xsd:sequence> - <xsd:element name="firstName" type="xsd:string"/> - <xsd:element name="middleName" type="xsd:string"/> - <xsd:element name="lastName" type="xsd:string"/> - </xsd:sequence> - </xsd:complexType> - </xsd:schema> diff --git a/sca-java-2.x/trunk/itest/properties/src/main/resources/fileProperty.txt b/sca-java-2.x/trunk/itest/properties/src/main/resources/fileProperty.txt deleted file mode 100644 index 7e932622ce..0000000000 --- a/sca-java-2.x/trunk/itest/properties/src/main/resources/fileProperty.txt +++ /dev/null @@ -1,21 +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. ---> - -<filePropertyTest>fileValue</filePropertyTest>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/properties/src/main/resources/foo.xsd b/sca-java-2.x/trunk/itest/properties/src/main/resources/foo.xsd deleted file mode 100644 index 6831f66cec..0000000000 --- a/sca-java-2.x/trunk/itest/properties/src/main/resources/foo.xsd +++ /dev/null @@ -1,40 +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.
--->
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns="http://foo"
- targetNamespace="http://foo"
- elementFormDefault="qualified">
-
- <xsd:complexType name="MyComplexType">
- <xsd:sequence>
- <xsd:element name="a" type="xsd:string"/>
- <xsd:element name="b" type="xsd:string"/>
- <xsd:element name="c" type="xsd:string"/>
- <xsd:element name="d" type="xsd:string"/>
- <xsd:element name="x">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="y" type="xsd:string"/>
- <xsd:element name="z" type="xsd:string"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:schema>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/properties/src/main/resources/manyValuesFileProperty.txt b/sca-java-2.x/trunk/itest/properties/src/main/resources/manyValuesFileProperty.txt deleted file mode 100644 index e037537d7d..0000000000 --- a/sca-java-2.x/trunk/itest/properties/src/main/resources/manyValuesFileProperty.txt +++ /dev/null @@ -1,25 +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.
--->
-<value>
- <manyFilePropertyValues>fileValueOne</manyFilePropertyValues>
- <manyFilePropertyValues>fileValueTwo</manyFilePropertyValues>
- <manyFilePropertyValues>fileValueThree</manyFilePropertyValues>
- <manyFilePropertyValues>fileValueFour</manyFilePropertyValues>
-</value>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/properties/src/main/resources/mySimpleService.composite b/sca-java-2.x/trunk/itest/properties/src/main/resources/mySimpleService.composite deleted file mode 100644 index 347990cca8..0000000000 --- a/sca-java-2.x/trunk/itest/properties/src/main/resources/mySimpleService.composite +++ /dev/null @@ -1,40 +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 autowire="false" local="true" name="MySimpleService" - targetNamespace="http://foo" xmlns:foo="http://foo" xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://docs.oasis-open.org/ns/opencsa/sca/200912 http://docs.oasis-open.org/ns/opencsa/sca/200912 "> - - - <service name="MyServiceNew1" promote="MyServiceComponentNew/MyService"> - <interface.java interface="mysca.test.myservice.impl.MyService" /> - </service> - - <property name="newLocation" type="xsd:anyURI">Raleigh</property> - <property name="newYear" type="xsd:anyURI">2008</property> - - - <component name="MyServiceComponentNew"> - <implementation.java class="mysca.test.myservice.impl.MyServiceImpl" /> - <property name="location" source="$newLocation" /> - <property name="year" source="$newYear" /> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/properties/src/main/resources/rcProps.txt b/sca-java-2.x/trunk/itest/properties/src/main/resources/rcProps.txt deleted file mode 100644 index 052c291fd0..0000000000 --- a/sca-java-2.x/trunk/itest/properties/src/main/resources/rcProps.txt +++ /dev/null @@ -1,22 +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 - * 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. ---> -<MyRCProps xmlns="http://test.sca.jaxb/rcprops"> - <AInt>20</AInt> - <BInteger>20</BInteger> -</MyRCProps> diff --git a/sca-java-2.x/trunk/itest/properties/src/main/resources/rcprops.xsd b/sca-java-2.x/trunk/itest/properties/src/main/resources/rcprops.xsd deleted file mode 100644 index 21289fa7b2..0000000000 --- a/sca-java-2.x/trunk/itest/properties/src/main/resources/rcprops.xsd +++ /dev/null @@ -1,55 +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 - * 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. ---> -<schema elementFormDefault="qualified" targetNamespace="http://test.sca.jaxb/rcprops" - xmlns:tns="http://test.sca.jaxb/rcprops" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" jaxb:version="2.0" - xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - - - <!-- Use some JAXB customizations --> - - <annotation> - <appinfo> - <jaxb:schemaBindings> - <jaxb:package name="test.jaxb.props" /> - </jaxb:schemaBindings> - </appinfo> - </annotation> - - <element name="MyRCProps" type="tns:ReturnCodeProperties" /> - - <complexType name="ReturnCodeProperties"> - <sequence> - <element name="AInt" type="xsd:int"> - <annotation> - <appinfo> - <jaxb:property name="a" /> - </appinfo> - </annotation> - </element> - <element name="BInteger" type="xsd:integer"> - <annotation> - <appinfo> - <jaxb:property name="b" /> - </appinfo> - </annotation> - </element> - </sequence> - </complexType> -</schema> - - diff --git a/sca-java-2.x/trunk/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java b/sca-java-2.x/trunk/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java deleted file mode 100644 index efc635c72b..0000000000 --- a/sca-java-2.x/trunk/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java +++ /dev/null @@ -1,104 +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.itest; - -import static org.junit.Assert.assertEquals; -import mysca.test.myservice.impl.MyService; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -public class MyTotalServiceTestCase { - private static MyService service1; - private static MyService service2; - private static MyService service3; - - private static Node node; - - /** - * Method annotated with - * - * @Test is a test method where testing logic is written using various assert methods. This test verifies the local - * property variables defined in the implementation file with the expected values 'RTP' and '2006' - */ - @Test - public void testPropertyDefault() { - assertEquals("RTP", service1.getLocation()); - assertEquals("2006", service1.getYear()); - } - - /** - * Method annotated with - * - * @Test is a test method where testing logic is written using various assert methods. This test verifies the - * property value obtained using service2 from the SCA runtime environment with the expected values 'Raleigh' - * and '2008'. This overrides the local property values - */ - @Test - public void testPropertyOverride() { - assertEquals("Raleigh", service2.getLocation()); - assertEquals("2008", service2.getYear()); - } - - /** - * Method annotated with - * - * @Test is a test method where testing logic is written using various assert methods. This test verifies the - * property value obtained using service3 from the SCA runtime environment with the expected values 'Durham' - * and '2009' - */ - @Test - public void testPropertyNestedOverride() { - assertEquals("Durham", service3.getLocation()); - assertEquals("2009", service3.getYear()); - } - - /** - * Method annotated with - * - * @BeforeClass is used for one time set Up, it executes before every tests. This method is used to create a test - * Embedded SCA node, to start the SCA node and to get a reference to the 'outerABService' service - */ - @BeforeClass - public static void setUp() throws Exception { - - String location = ContributionLocationHelper.getContributionLocation("Outer.composite"); - node = NodeFactory.newInstance().createNode("Outer.composite", new Contribution("c1", location)); - node.start(); - service1 = node.getService(MyService.class, "MyServiceComponent/MyService"); - service2 = node.getService(MyService.class, "MyServiceComponentNew/MyService"); - service3 = node.getService(MyService.class, "MySimpleServiceInRecursiveAnother"); - } - - /** - * Method annotated with - * - * @AfterClass is used for one time Tear Down, it executes after every tests. This method is used to close the - * node, close any previously opened connections etc - */ - @AfterClass - public static void tearDown() { - node.stop(); - } -} diff --git a/sca-java-2.x/trunk/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java b/sca-java-2.x/trunk/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java deleted file mode 100644 index 0906a45ab3..0000000000 --- a/sca-java-2.x/trunk/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java +++ /dev/null @@ -1,169 +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.itest; - -import static org.junit.Assert.assertEquals; - -import java.util.Iterator; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * This is a class which makes user of JUnit Framework, all tests are written using JUnit notation. These tests are used - * to test different property values returned from the SCA Runtime Environment which is initialized with the composite - * 'OuterPropertyTest.composite'. It basically tests the Simple type of property and Complex type of property from the - * SCA Runtime Environment. - */ -public class OuterPropertyTestCase { - - private static Node node; - private static ABComponent outerABService; - - /** - * Method annotated with - * - * @BeforeClass is used for one time set Up, it executes before every tests. This method is used to create a test - * Embedded SCA node, to start the SCA node and to get a reference to the 'outerABService' service - */ - @BeforeClass - public static void init() throws Exception { - String location = ContributionLocationHelper.getContributionLocation("OuterPropertyTest.composite"); - node = NodeFactory.newInstance().createNode("OuterPropertyTest.composite", new Contribution("c1", location)); - node.start(); - outerABService = node.getService(ABComponent.class, "OuterComponent"); - } - - /** - * Method annotated with - * - * @AfterClass is used for one time Tear Down, it executes after every tests. This method is used to close the - * node, close any previously opened connections etc - */ - @AfterClass - public static void destroy() throws Exception { - node.stop(); - } - - /** - * Method annotated with - * - * @Test is a test method where testing logic is written using various assert methods. This test verifies the - * property value obtained using a service from the SCA runtime environment with the expected value 'Overriden - * A' - */ - @Test - public void testOverridenA() { - assertEquals("Overriden A", outerABService.getA()); - } - - /** - * Method annotated with - * - * @Test is a test method where testing logic is written using various assert methods. This test verifies the - * property value obtained using a service from the SCA runtime environment with the expected value 'Overriden - * B' - */ - @Test - public void testOverridenB() { - assertEquals("Overriden B", outerABService.getB()); - } - - /** - * Method annotated with - * - * @Test is a test method where testing logic is written using various assert methods. This test verifies the - * property value obtained using a service from the SCA runtime environment with the expected value 'Overriden - * A' - */ - @Test - public void testOverridenF() { - assertEquals("Overriden A", outerABService.getF()); - } - - /** - * Method annotated with - * - * @Test is a test method where testing logic is written using various assert methods. This test verifies the - * property value obtained using a service from the SCA runtime environment with the expected value 'Overriden - * Z' - */ - @Test - public void testOverridenZ() { - assertEquals("Overriden Z", outerABService.getZ()); - } - - /** - * Method annotated with - * - * @Test is a test method where testing logic is written using various assert methods. This test verifies the - * property value obtained using a service from the SCA runtime environment with the expected value 125 - */ - @Test - public void testOverridenIntValue() { - assertEquals(125, outerABService.getIntValue()); - } - - /** - * Method annotated with - * - * @Test is a test method where testing logic is written using various assert methods. This test verifies the - * property value obtained using a service from the SCA runtime environment with the expected value 125 - */ - @Test - public void testDefaultValue() { - assertEquals(125, outerABService.getIntValue()); - } - - /** - * Method annotated with - * - * @Test is a test method where testing logic is written using various assert methods. This test verifies the - * property values obtained using a service from the SCA runtime environment with the expected values 'Apache' , - * 'Tuscany' and 'Java SCA' respectively . - */ - @Test - public void testManySimpleStringValues() { - Iterator<String> iterator = outerABService.getManyStringValues().iterator(); - assertEquals("Apache", iterator.next()); - assertEquals("Tuscany", iterator.next()); - assertEquals("Java SCA", iterator.next()); - } - - /** - * Method annotated with - * - * @Test is a test method where testing logic is written using various assert methods. This test verifies the - * property values obtained using a service from the SCA runtime environment with the expected values 123, 456 - * and 789 - */ - @Test - public void testManySimpleIntegerValues() { - Iterator<Integer> iterator = outerABService.getManyIntegers().iterator(); - assertEquals(123, iterator.next().intValue()); - assertEquals(456, iterator.next().intValue()); - assertEquals(789, iterator.next().intValue()); - } -} diff --git a/sca-java-2.x/trunk/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java b/sca-java-2.x/trunk/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java deleted file mode 100644 index eb217600db..0000000000 --- a/sca-java-2.x/trunk/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java +++ /dev/null @@ -1,422 +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.itest; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import java.math.BigInteger; -import java.util.Arrays; -import java.util.Iterator; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; - -import test.jaxb.props.ReturnCodeProperties; - -/** - * This is a class which makes user of JUnit Framework, all tests are written using JUnit notation. These tests are used - * to test different property values returned from the SCA Runtime Environment which is initialized with the composite - * 'PropertyTest.composite'. It basically tests all types of property values returned from SCA runtime environment. - */ -public class PropertyTestCase { - private static Node node; - private static ABComponent abService; - private static CDComponent cdService; - private static ABCDComponent abcdService; - private static PropertyComponent propertyService; - - /** - * Method annotated with - * - * @Test is a test method where testing logic is written using various assert methods. This test verifies the - * property value obtained using a service from the SCA runtime environment with the expected value 'a' - */ - @Test - public void testA() { - assertEquals("a", abService.getA()); - } - - /** - * Method annotated with - * - * @Test is a test method where testing logic is written using various assert methods. This test verifies the - * property value obtained using a service from the SCA runtime environment with the expected value 'b' - */ - @Test - public void testB() { - assertEquals("b", abService.getB()); - } - - /** - * Method annotated with - * - * @Test is a test method where testing logic is written using various assert methods. This test verifies the - * property value obtained using a service from the SCA runtime environment with the expected value 'c' - */ - @Test - public void testC() { - assertEquals("c", cdService.getC()); - } - - /** - * Method annotated with - * - * @Test is a test method where testing logic is written using various assert methods. This test verifies the - * property value obtained using a service from the SCA runtime environment with the expected value 'c' - */ - @Test - public void testC2() { - assertEquals("c", cdService.getC2()); - } - - /** - * Method annotated with - * - * @Test is a test method where testing logic is written using various assert methods. This test verifies the - * property value obtained using a service from the SCA runtime environment with the expected value 'd' - */ - @Test - public void testD() { - assertEquals("d", cdService.getD()); - } - - /** - * Method annotated with - * - * @Test is a test method where testing logic is written using various assert methods. This test verifies the - * property value obtained using a service from the SCA runtime environment with the expected value 'a' - */ - @Test - public void testF() { - assertEquals("a", abService.getF()); - } - - /** - * Method annotated with - * - * @Test is a test method where testing logic is written using various assert methods. This test verifies the - * property value obtained using a service from the SCA runtime environment with the expected value 'z' - */ - @Test - public void testZ() { - assertEquals("z", abService.getZ()); - } - - /** - * Method annotated with - * - * @Test is a test method where testing logic is written using various assert methods. This test verifies the - * property value obtained using a service from the SCA runtime environment with the expected value 1. - */ - @Test - public void testIntValue() { - assertEquals(1, abService.getIntValue()); - } - - /** - * Method annotated with - * - * @Test is a test method where testing logic is written using various assert methods. This test verifies the - * property value obtained using a service from the SCA runtime environment with the expected value 1. - */ - @Test - public void testDefaultValue() { - assertEquals(1, abService.getIntValue()); - } - - /** - * Method annotated with - * - * @Test is a test method where testing logic is written using various assert methods. This test verifies the - * property value obtained using a service from the SCA runtime environment with the expected value 1. - */ - @Test - public void testDefaultValueOverride() { - assertEquals(1, cdService.getOverrideValue()); - } - - /** - * Method annotated with - * - * @Test is a test method where testing logic is written using various assert methods. This test verifies the - * property value obtained using a service from the SCA runtime environment with the expected value 'aValue' - */ - @Test - public void testNoSource() { - assertEquals("aValue", cdService.getNoSource()); - } - - /** - * Method annotated with - * - * @Test is a test method where testing logic is written using various assert methods. This test verifies the - * property value obtained using a service from the SCA runtime environment with the expected value - * 'fileValue' - */ - @Test - public void testFileProperty() { - assertEquals("fileValue", cdService.getFileProperty()); - } - - /** - * Method annotated with - * - * @Test is a test method where testing logic is written using various assert methods. This test verifies the - * property values obtained using a service from the SCA runtime environment with the expected values 4 and - * 'fileValueTwo' respectively. - */ - @Test - public void testManyValuesFileProperty() { - Iterator<String> iterator = cdService.getManyValuesFileProperty().iterator(); - iterator.next(); - String secondValue = iterator.next(); - assertEquals(4, cdService.getManyValuesFileProperty().size()); - assertEquals("fileValueTwo", secondValue); - } - - /** - * Method annotated with - * - * @Test is a test method where testing logic is written using various assert methods. This test verifies the - * property values obtained using a service from the SCA runtime environment with the expected values 'a' , - * 'b', 'c' and 'd' respectively. - */ - @Test - public void testABCD() { - assertEquals("a", abcdService.getA()); - assertEquals("b", abcdService.getB()); - assertEquals("c", abcdService.getC()); - assertEquals("d", abcdService.getD()); - } - - /** - * Method annotated with - * - * @Test is a test method where testing logic is written using various assert methods. This test verifies the - * property values obtained using a service from the SCA runtime environment with the expected values 'RTP' - * and '2006' respectively - */ - @Test - public void testDefaultProperty() { - assertEquals("RTP", propertyService.getLocation()); - assertEquals("2006", propertyService.getYear()); - - } - - /** - * Method annotated with - * - * @Test is a test method where testing logic is written using various assert methods. This test verifies the - * property values obtained using a service from the SCA runtime environment with the expected values 'Apache' , - * 'Tuscany' and 'Java SCA' respectively . - */ - @Test - public void testManySimpleStringValues() { - Iterator<String> iterator = abService.getManyStringValues().iterator(); - assertEquals("Apache", iterator.next()); - assertEquals("Tuscany", iterator.next()); - assertEquals("Java SCA", iterator.next()); - } - - /** - * Method annotated with - * - * @Test is a test method where testing logic is written using various assert methods. This test verifies the - * property values obtained using a service from the SCA runtime environment with the expected values 123, 456 - * and 789 respectively. - */ - @Test - public void testManySimpleIntegerValues() { - Iterator<Integer> iterator = abService.getManyIntegers().iterator(); - assertEquals(123, iterator.next().intValue()); - assertEquals(456, iterator.next().intValue()); - assertEquals(789, iterator.next().intValue()); - } - - /** - * Method annotated with - * - * @Test is a test method where testing logic is written using various assert methods. This test verifies the - * property values obtained using a service from the SCA runtime environment with the expected values - * 'TestString_1' and 2 respectively. - */ - @Test - public void testComplexPropertyOne() { - ComplexPropertyBean propBean = propertyService.getComplexPropertyOne(); - assertNotNull(propBean); - assertEquals("TestString_1", propBean.getStringArray()[0]); - assertEquals(2, propBean.numberSetArray[1].integerNumber); - } - - /** - * Method annotated with - * - * @Test is a test method where testing logic is written using various assert methods. This test verifies the - * property values obtained using a service from the SCA runtime environment with the expected integer number - * and a float number - */ - @Test - public void testComplexPropertyTwo() { - ComplexPropertyBean propBean = propertyService.getComplexPropertyTwo(); - assertNotNull(propBean); - assertEquals(10, propBean.intArray[0]); - assertEquals((float)22, propBean.numberSetArray[1].floatNumber); - } - - /** - * Method annotated with - * - * @Test is a test method where testing logic is written using various assert methods. This test verifies the - * property values obtained using a service from the SCA runtime environment with the expected value first - * element in the string array and the float number - */ - @Test - public void testComplexPropertyThree() { - ComplexPropertyBean propBean = propertyService.getComplexPropertyThree(); - assertNotNull(propBean); - assertEquals("TestElementString_1", propBean.stringArray[0]); - assertEquals((float)22, propBean.numberSetArray[1].floatNumber); - } - - /** - * Method annotated with - * - * @Test is a test method where testing logic is written using various assert methods. This test verifies the - * complex property value obtained using a service from the SCA runtime environment with the expected values - * 1, 222.222 and 33 respectively. - */ - @Test - public void testComplexPropertyFour() { - Object[] propBeanCollection = propertyService.getComplexPropertyFour().toArray(); - assertNotNull(propBeanCollection); - assertEquals(1, ((ComplexPropertyBean)propBeanCollection[0]).getIntegerNumber()); - assertEquals(222.222, ((ComplexPropertyBean)propBeanCollection[1]).getDoubleNumber()); - assertEquals(33, ((ComplexPropertyBean)propBeanCollection[2]).getNumberSet().getIntegerNumber()); - } - - /** - * Method annotated with - * - * @Test is a test method where testing logic is written using various assert methods. This test verifies the - * property values obtained using a service from the SCA runtime environment with the expected values - * 'TestString_3', 'TestString_4', 100 and 200. - */ - @Test - public void testComplexPropertyFive() { - ComplexPropertyBean propBean = propertyService.getComplexPropertyFive(); - assertNotNull(propBean); - assertEquals("TestString_3", propBean.getStringArray()[0]); - assertEquals("TestString_4", propBean.getStringArray()[1]); - assertEquals(100, propBean.getIntArray()[0]); - assertEquals(200, propBean.getIntArray()[1]); - } - - @Test - public void testGetLocationFromComponentContext() { - String location = propertyService.getLocation(); - assertNotNull(location); - String locationFromCC = propertyService.getLocationFromComponentContext(); - assertNotNull(locationFromCC); - assertEquals(location, locationFromCC); - } - - @Test - public void testGetInjectedStringArrayProperty() { - String[] daysOfWeek = propertyService.getDaysOfTheWeek(); - assertNotNull(daysOfWeek); - - String[] expected = {"Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"}; - Assert.assertTrue(Arrays.equals(expected, daysOfWeek)); - } - - @Test - public void testGetInjectedIntegerArrayProperty() { - Integer[] numbers = propertyService.getIntegerNumbers(); - assertNotNull(numbers); - - Integer[] expected = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10}; - Assert.assertTrue(Arrays.equals(expected, numbers)); - } - - @Test - public void testGetInjectedIntArrayProperty() { - int[] numbers = propertyService.getIntNumbers(); - assertNotNull(numbers); - - int[] expected = {10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0}; - Assert.assertTrue(Arrays.equals(expected, numbers)); - } - - @Test - public void testComplexJAXBProperty() { - ReturnCodeProperties rc = propertyService.getComplexJAXBPropertyOne(); - assertEquals(10, rc.getA()); - assertEquals(new BigInteger("10"), rc.getB()); - } - - @Test - public void testComplexJAXBPropertyFromFile() { - ReturnCodeProperties rc = propertyService.getComplexJAXBPropertyTwo(); - System.out.println("SKSK: a =" + rc.getA()); - System.out.println("SKSK: b =" + rc.getB()); - assertEquals(20, rc.getA()); - assertEquals(new BigInteger("20"), rc.getB()); - } - - /** - * Method annotated with - * - * @BeforeClass is used for one time set Up, it executes before every tests. This method is used to create a test - * Embedded SCA node, to start the SCA node and to get a reference to 4 services namely 'abService' - * service, 'cdService' service, 'abcdService' service and 'propertyService' service - */ - @BeforeClass - public static void init() throws Exception { - try { - String location = ContributionLocationHelper.getContributionLocation("PropertyTest.composite"); - node = NodeFactory.newInstance().createNode("PropertyTest.composite", new Contribution("c1", location)); - node.start(); - } catch (Exception e) { - e.printStackTrace(); - } - abService = node.getService(ABComponent.class, "ABComponent"); - cdService = node.getService(CDComponent.class, "CDComponent"); - abcdService = node.getService(ABCDComponent.class, "ABCDComponent"); - propertyService = node.getService(PropertyComponent.class, "PropertyComponent"); - } - - /** - * Method annotated with - * - * @AfterClass is used for one time Tear Down, it executes after every tests. This method is used to close the - * node, close any previously opened connections etc - */ - @AfterClass - public static void destroy() throws Exception { - node.stop(); - } -} diff --git a/sca-java-2.x/trunk/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java b/sca-java-2.x/trunk/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java deleted file mode 100644 index a0213ced46..0000000000 --- a/sca-java-2.x/trunk/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java +++ /dev/null @@ -1,72 +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.itest.cdi; - -import static org.junit.Assert.assertEquals; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -public class ConstructorPropertyInjectionTestCase { - private static org.apache.tuscany.sca.node.Node node; - - @BeforeClass - public static void init() throws Exception { - try { - String location = ContributionLocationHelper.getContributionLocation("ConstructorPropertyInjection.composite"); - node = NodeFactory.newInstance().createNode("ConstructorPropertyInjection.composite", new Contribution("c1", location)); - node.start(); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Method annotated with - * - * @AfterClass is used for one time Tear Down, it executes after every tests. This method is used to close the - * node, close any previously opened connections etc - */ - @AfterClass - public static void destroy() throws Exception { - node.stop(); - } - - @Test - public void testFoo1() throws Exception { - Bar foo = node.getService(Bar.class, "Foo1Component"); - assertEquals("fubar", foo.getBar()); - } - - @Test - public void testFoo2() throws Exception { - Bar foo = node.getService(Bar.class, "Foo2Component"); - assertEquals("fubar", foo.getBar()); - } - - @Test - public void testFoo3() throws Exception { - Bar foo = node.getService(Bar.class, "Foo3Component"); - assertEquals("fubar", foo.getBar()); - } -} diff --git a/sca-java-2.x/trunk/itest/recursive-multi-level/pom.xml b/sca-java-2.x/trunk/itest/recursive-multi-level/pom.xml deleted file mode 100644 index 3130da271c..0000000000 --- a/sca-java-2.x/trunk/itest/recursive-multi-level/pom.xml +++ /dev/null @@ -1,61 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <!--relativePath>../pom.xml</relativePath--> - </parent> - <artifactId>itest-recursive-multi-level</artifactId> - <name>Apache Tuscany SCA iTest Builder Recusive Multi-Level</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <!-- XPathFactory --> - <dependency> - <groupId>xalan</groupId> - <artifactId>xalan</artifactId> - <version>2.7.1</version> - <scope>test</scope> - </dependency> - - </dependencies> -</project> diff --git a/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java b/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java deleted file mode 100644 index 986c8305dd..0000000000 --- a/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java +++ /dev/null @@ -1,26 +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 mysca.test.myservice; - -public interface MyService { - String getLocation(); - - String getYear(); -} diff --git a/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java b/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java deleted file mode 100644 index 6cad998042..0000000000 --- a/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java +++ /dev/null @@ -1,42 +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 mysca.test.myservice; - -import org.oasisopen.sca.annotation.Property; -import org.oasisopen.sca.annotation.Service; - -@Service(MyService.class) -public class MyServiceImpl implements MyService { - - @Property(name = "location") - protected String location = "ABC"; - - @Property(name = "year") - protected String year = "2006"; - - public String getLocation() { - return location; - } - - public String getYear() { - return year; - } - -} diff --git a/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java b/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java deleted file mode 100644 index a10a430473..0000000000 --- a/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java +++ /dev/null @@ -1,28 +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 mysca.test.myservice; - -public interface MySimpleTotalService { - String getLocation(); - - String getYear(); - - String getYear2(); -} diff --git a/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java b/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java deleted file mode 100644 index d00b016e34..0000000000 --- a/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java +++ /dev/null @@ -1,46 +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 mysca.test.myservice; - -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Service; - -@Service(MySimpleTotalService.class) -public class MySimpleTotalServiceImpl implements MySimpleTotalService { - // default required==true so it is 1:1 - @Reference - public MyService myService; - - @Reference - private MyService myService2; - - public String getLocation() { - return myService.getLocation(); - } - - public String getYear() { - return myService.getYear(); - } - - public String getYear2() { - return myService2.getYear(); - } - -} diff --git a/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite b/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite deleted file mode 100644 index 9ff53cca08..0000000000 --- a/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/resources/TotalService1Auto.composite +++ /dev/null @@ -1,53 +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:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:foo="http://foo" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xsi:schemaLocation="http://docs.oasis-open.org/ns/opencsa/sca/200912 http://docs.oasis-open.org/ns/opencsa/sca/200912" - name="TotalComposite1Auto" - targetNamespace="http://foo" - local="true" - autowire="false"> - - <property name="newLocation" type="xsd:anyURI">Level 1</property> - <property name="newYear" type="xsd:anyURI">2001</property> - - <component name="ServiceComponentLevel1Auto"> - <implementation.java class="mysca.test.myservice.MyServiceImpl"/> - <property name="location" source="$newLocation"/> - <property name="year" source="$newYear"/> - </component> - - <service name="MyServiceLevel1Auto" promote="TotalServiceComponentLevel1Auto/MySimpleTotalService"> - <interface.java interface="mysca.test.myservice.MySimpleTotalService"/> - </service> - - <component name="TotalServiceComponentLevel1Auto"> - <implementation.java class="mysca.test.myservice.MySimpleTotalServiceImpl"/> - <reference name="myService" autowire="true"/> - <reference name="myService2" target="ServiceComponentLevel1Auto"/> - </component> - - <reference name="myServiceReference1Auto" promote="TotalServiceComponentLevel1Auto/myService" multiplicity="1..1"> - <interface.java interface="mysca.test.myservice.MyService"/> - </reference> -</composite> - diff --git a/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite b/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite deleted file mode 100644 index cf8506b4e7..0000000000 --- a/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/resources/TotalService2Auto.composite +++ /dev/null @@ -1,49 +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:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:foo="http://foo" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xsi:schemaLocation="http://docs.oasis-open.org/ns/opencsa/sca/200912 http://docs.oasis-open.org/ns/opencsa/sca/200912" - name="TotalComposite2Auto" - targetNamespace="http://foo" - local="true" - autowire="false"> - - <property name="newLocation" type="xsd:anyURI">Level 2</property> - <property name="newYear" type="xsd:anyURI">2002</property> - - <component name="ServiceComponentLevel2Auto"> - <implementation.java class="mysca.test.myservice.MyServiceImpl"/> - <property name="location">Default 2</property> - <property name="year">1992</property> - </component> - - <service name="MyServiceLevel2Auto" promote="TotalServiceInRecursive2Auto/MyServiceLevel1Auto"/> - - <component name="TotalServiceInRecursive2Auto"> - <implementation.composite name="foo:TotalComposite1Auto"/> - <reference name="myServiceReference1Auto" autowire="true"/> - <property name="newLocation" source="$newLocation"/> - <property name="newYear" source="$newYear"/> - </component> - - <reference name="myServiceReference2Auto" promote="TotalServiceInRecursive2Auto/myServiceReference1Auto" multiplicity="1..1"/> -</composite>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite b/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite deleted file mode 100644 index 7386404e71..0000000000 --- a/sca-java-2.x/trunk/itest/recursive-multi-level/src/main/resources/TotalService3Auto.composite +++ /dev/null @@ -1,52 +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:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:foo="http://foo" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xsi:schemaLocation="http://docs.oasis-open.org/ns/opencsa/sca/200912 http://docs.oasis-open.org/ns/opencsa/sca/200912" - name="TotalComposite3Auto" - targetNamespace="http://foo" - local="true" - autowire="false"> - - <property name="newLocation" type="xsd:anyURI">Level 3</property> - <property name="newYear" type="xsd:anyURI">2003</property> - - <component name="ServiceComponentLevel3Auto"> - <implementation.java class="mysca.test.myservice.MyServiceImpl"/> - <property name="location">Default 3</property> - <property name="year">1993</property> - </component> - - <service name="MyServiceLevel3Auto" promote="TotalServiceInRecursive3Auto/MyServiceLevel2Auto"> - </service> - - <component name="TotalServiceInRecursive3Auto" autowire="true"> - <implementation.composite name="foo:TotalComposite2Auto"/> - <reference name="myServiceReference2Auto"/> - <property name="newLocation" source="$newLocation"/> - <property name="newYear" source="$newYear"/> - </component> - - <reference name="myServiceReference3Auto" promote="TotalServiceInRecursive3Auto/myServiceReference2Auto" multiplicity="1..1"> - </reference> - -</composite>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java b/sca-java-2.x/trunk/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java deleted file mode 100644 index 2dc13c4f42..0000000000 --- a/sca-java-2.x/trunk/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java +++ /dev/null @@ -1,92 +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 test.sca.tests; - -import static org.junit.Assert.assertEquals; -import mysca.test.myservice.MySimpleTotalService; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * Tests to make sure that autowiring and recusive composite work together - * - */ -public class MultiLevelTestCase { - private static Node node1; - private static Node node2; - private static Node node3; - private static MySimpleTotalService myService1; - private static MySimpleTotalService myService2; - private static MySimpleTotalService myService3; - - @BeforeClass - public static void setUp() throws Exception { - String location = ContributionLocationHelper.getContributionLocation("TotalService1Auto.composite"); - Contribution contribution = new Contribution("c1", location); - try { - node1 = NodeFactory.newInstance().createNode("TotalService1Auto.composite", contribution); - } catch (Exception e) { - e.printStackTrace(); - } - node2 = NodeFactory.newInstance().createNode("TotalService2Auto.composite", contribution); - node3 = NodeFactory.newInstance().createNode("TotalService3Auto.composite", contribution); - - node1.start(); - node2.start(); - node3.start(); - - myService1 = node1.getService(MySimpleTotalService.class, "TotalServiceComponentLevel1Auto"); - myService2 = node2.getService(MySimpleTotalService.class, "TotalServiceInRecursive2Auto/MyServiceLevel1Auto"); - myService3 = node3.getService(MySimpleTotalService.class, "TotalServiceInRecursive3Auto/MyServiceLevel2Auto"); - } - - @Test - public void testLevel1() { - assertEquals("Level 1", myService1.getLocation()); - assertEquals("2001", myService1.getYear()); - assertEquals("2001", myService1.getYear2()); - } - - @Test - public void testLevel2() { - assertEquals("Default 2", myService2.getLocation()); - assertEquals("1992", myService2.getYear()); - assertEquals("2002", myService2.getYear2()); - } - - @Test - public void testLevel3() { - assertEquals("Default 3", myService3.getLocation()); - assertEquals("1993", myService3.getYear()); - assertEquals("2003", myService3.getYear2()); - } - - @AfterClass - public static void tearDown() { - node1.stop(); - node2.stop(); - node3.stop(); - } -} diff --git a/sca-java-2.x/trunk/itest/recursive-ws/pom.xml b/sca-java-2.x/trunk/itest/recursive-ws/pom.xml deleted file mode 100644 index 46eeeafb18..0000000000 --- a/sca-java-2.x/trunk/itest/recursive-ws/pom.xml +++ /dev/null @@ -1,92 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-recursive-ws</artifactId> - <name>Apache Tuscany SCA iTest Recursive WS</name> - <version>2.0-SNAPSHOT</version> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> - <version>${pom.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>${pom.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>${pom.version}</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-interface-wsdl</artifactId> - <version>${pom.version}</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> - <version>${pom.version}</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-axiom</artifactId> - <version>${pom.version}</version> - <scope>runtime</scope> - </dependency> - </dependencies> - - <!-- Declare tuscany-host-jetty dependency in the default profile so that it can be replaced --> - <profiles> - <profile> - <id>default</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-jetty</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - </dependencies> - </profile> - </profiles> - -</project> diff --git a/sca-java-2.x/trunk/itest/recursive-ws/src/main/java/policy/Target.java b/sca-java-2.x/trunk/itest/recursive-ws/src/main/java/policy/Target.java deleted file mode 100644 index 2366f6542a..0000000000 --- a/sca-java-2.x/trunk/itest/recursive-ws/src/main/java/policy/Target.java +++ /dev/null @@ -1,26 +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 policy; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface Target { - String hello(String arg); -} diff --git a/sca-java-2.x/trunk/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java b/sca-java-2.x/trunk/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java deleted file mode 100644 index b2d59e925c..0000000000 --- a/sca-java-2.x/trunk/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java +++ /dev/null @@ -1,33 +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 policy; - -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Service; - -@Service(Target.class) -public class TargetClientImpl implements Target { - - @Reference - protected Target targetService; - - public String hello(String arg) { - return "Target: Hello " + targetService.hello(arg) + "!"; - } -} diff --git a/sca-java-2.x/trunk/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java b/sca-java-2.x/trunk/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java deleted file mode 100644 index 6f52dfb26e..0000000000 --- a/sca-java-2.x/trunk/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java +++ /dev/null @@ -1,29 +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 policy; - -import org.oasisopen.sca.annotation.Service; - -@Service(Target.class) -public class TargetServiceImpl implements Target { - - public String hello(String arg) { - return "Target: Hello " + arg + "!"; - } -} diff --git a/sca-java-2.x/trunk/itest/recursive-ws/src/main/java/recursive/Composer.java b/sca-java-2.x/trunk/itest/recursive-ws/src/main/java/recursive/Composer.java deleted file mode 100644 index 18486115ae..0000000000 --- a/sca-java-2.x/trunk/itest/recursive-ws/src/main/java/recursive/Composer.java +++ /dev/null @@ -1,26 +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 recursive; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface Composer { - public String Compose(String s); -}
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/recursive-ws/src/main/java/recursive/ComposerClient.java b/sca-java-2.x/trunk/itest/recursive-ws/src/main/java/recursive/ComposerClient.java deleted file mode 100644 index 13c306d9b1..0000000000 --- a/sca-java-2.x/trunk/itest/recursive-ws/src/main/java/recursive/ComposerClient.java +++ /dev/null @@ -1,43 +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 recursive; - -import java.io.File; - -import org.apache.tuscany.sca.node.Client; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.apache.tuscany.sca.node.Contribution; - -/** - * For testing purpose - */ -public class ComposerClient { - - public final static void main(String[] args) throws Exception { - NodeFactory factory = NodeFactory.newInstance(); - Node node = factory.createNode(new File("src/main/resources/Client.composite").toURI().toURL().toString(), - new Contribution("TestContribution", new File("src/main/resources/").toURI().toURL().toString())); - node.start(); - Composer composer = ((Client)node).getService(Composer.class, "ClientComponent/Composer"); - System.out.println(composer.Compose("ABC")); - node.stop(); - } - -} diff --git a/sca-java-2.x/trunk/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java b/sca-java-2.x/trunk/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java deleted file mode 100644 index 3c432bc26a..0000000000 --- a/sca-java-2.x/trunk/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java +++ /dev/null @@ -1,38 +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 recursive; - -import org.oasisopen.sca.annotation.Reference; - -/** - * @version $Rev$ $Date$ - */ -public class ComposerClientImpl implements Composer { - @Reference - protected Composer composerWS; - - /** - * @see recursive.Composer#Compose(java.lang.String) - */ - public String Compose(String s) { - return composerWS.Compose(s); - } - -} diff --git a/sca-java-2.x/trunk/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java b/sca-java-2.x/trunk/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java deleted file mode 100644 index 8b77484922..0000000000 --- a/sca-java-2.x/trunk/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java +++ /dev/null @@ -1,34 +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 recursive; - -/** - * Composer Component Implementation - * - */ - -public class ComposerImpl implements Composer { - - public String Compose(String s) { - System.out.println("Composing " + s + "..."); - return "Composed: " + s; - - } - -} diff --git a/sca-java-2.x/trunk/itest/recursive-ws/src/main/java/recursive/ComposerServer.java b/sca-java-2.x/trunk/itest/recursive-ws/src/main/java/recursive/ComposerServer.java deleted file mode 100644 index a123160d85..0000000000 --- a/sca-java-2.x/trunk/itest/recursive-ws/src/main/java/recursive/ComposerServer.java +++ /dev/null @@ -1,42 +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 recursive; - -import java.io.File; - -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.apache.tuscany.sca.node.Contribution; - -/** - * For testing purpose - */ -public class ComposerServer { - - public final static void main(String[] args) throws Exception { - NodeFactory factory = NodeFactory.newInstance(); - Node node = factory.createNode(new File("src/main/resources/Outer.composite").toURI().toURL().toString(), - new Contribution("TestContribution", new File("src/main/resources/").toURI().toURL().toString())); - node.start(); - System.out.println("Press Enter to exit..."); - System.in.read(); - node.stop(); - } - -} diff --git a/sca-java-2.x/trunk/itest/recursive-ws/src/main/resources/Client.composite b/sca-java-2.x/trunk/itest/recursive-ws/src/main/resources/Client.composite deleted file mode 100644 index 50cbaa5086..0000000000 --- a/sca-java-2.x/trunk/itest/recursive-ws/src/main/resources/Client.composite +++ /dev/null @@ -1,29 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://client" name="Client">
- <component name="ClientComponent">
- <implementation.java class="recursive.ComposerClientImpl" />
- <reference name="composerWS">
- <binding.ws uri="http://localhost:8085/OuterService"/>
- </reference>
- </component>
-</composite>
diff --git a/sca-java-2.x/trunk/itest/recursive-ws/src/main/resources/Inner.composite b/sca-java-2.x/trunk/itest/recursive-ws/src/main/resources/Inner.composite deleted file mode 100644 index df7130ba99..0000000000 --- a/sca-java-2.x/trunk/itest/recursive-ws/src/main/resources/Inner.composite +++ /dev/null @@ -1,27 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://inner" name="Inner">
- <component name="InnerComponent">
- <implementation.java class="recursive.ComposerImpl" />
- </component>
- <service name="OuterService" promote="InnerComponent"/>
-</composite>
diff --git a/sca-java-2.x/trunk/itest/recursive-ws/src/main/resources/Outer.composite b/sca-java-2.x/trunk/itest/recursive-ws/src/main/resources/Outer.composite deleted file mode 100644 index 1c7d49f1c0..0000000000 --- a/sca-java-2.x/trunk/itest/recursive-ws/src/main/resources/Outer.composite +++ /dev/null @@ -1,32 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://outer" xmlns:inner="http://inner"
- name="Outer">
- <component name="OuterComponent">
- <implementation.composite name="inner:Inner" />
- <service name="OuterService">
- <interface.java interface="recursive.Composer" />
- <binding.ws uri="http://localhost:8085/OuterService" />
- </service>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite b/sca-java-2.x/trunk/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite deleted file mode 100644 index cb6e0cc358..0000000000 --- a/sca-java-2.x/trunk/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite +++ /dev/null @@ -1,36 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://bindingoverride"
- xmlns:bindingoverride="http://bindingoverride"
- name="BindingOverrideInnerComposite">
-
- <service name="InnerService" promote="InnerServiceComponent">
- <interface.java interface="policy.Target"/>
- </service>
-
- <component name="InnerServiceComponent">
- <implementation.java class="policy.TargetServiceImpl"/>
- <service name="Target">
- <interface.java interface="policy.Target"/>
- </service>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite b/sca-java-2.x/trunk/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite deleted file mode 100644 index 3f76efb11b..0000000000 --- a/sca-java-2.x/trunk/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite +++ /dev/null @@ -1,38 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://bindingoverride"
- xmlns:bindingoverride="http://bindingoverride"
- name="BindingOverrideOuterComposite">
-
- <component name="OuterClientComponent">
- <implementation.java class="policy.TargetClientImpl"/>
- <reference name="targetService" target="OuterServiceComponent"/>
- </component>
-
- <component name="OuterServiceComponent">
- <implementation.composite name="bindingoverride:BindingOverrideInnerComposite"/>
- <service name="InnerService">
- <interface.java interface="policy.Target"/>
- <binding.ws uri="http://localhost:8085/OuterTargetServiceComponent"/>
- </service>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite b/sca-java-2.x/trunk/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite deleted file mode 100644 index 3e78eb4533..0000000000 --- a/sca-java-2.x/trunk/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite +++ /dev/null @@ -1,37 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://policy"
- xmlns:policy="http://policy"
- name="PolicyInnerComposite">
-
- <service name="TargetService" promote="TargetServiceComponent">
- <interface.java interface="policy.Target"/>
- </service>
-
- <component name="TargetServiceComponent">
- <implementation.java class="policy.TargetServiceImpl"/>
- <service name="Target">
- <interface.java interface="policy.Target"/>
- <binding.ws uri="http://localhost:8085/TargetServiceComponent"/>
- </service>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite b/sca-java-2.x/trunk/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite deleted file mode 100644 index 6e686a579f..0000000000 --- a/sca-java-2.x/trunk/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite +++ /dev/null @@ -1,39 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://policy"
- xmlns:policy="http://policy"
- name="PolicyOuterComposite"
- requires="policy:TestIntent_1">
-
- <component name="TargetClientComponent">
- <implementation.java class="policy.TargetClientImpl"/>
- <reference name="targetService" target="OuterTargetServiceComponent"/>
- </component>
-
- <component name="OuterTargetServiceComponent">
- <implementation.composite name="policy:PolicyInnerComposite"/>
- <service name="TargetService">
- <interface.java interface="policy.Target"/>
- <binding.ws uri="http://localhost:8085/OuterTargetServiceComponent"/>
- </service>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/recursive-ws/src/main/resources/policy/definitions.xml b/sca-java-2.x/trunk/itest/recursive-ws/src/main/resources/policy/definitions.xml deleted file mode 100644 index 923e1ad5f6..0000000000 --- a/sca-java-2.x/trunk/itest/recursive-ws/src/main/resources/policy/definitions.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?> -<!-- - * 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. ---> -<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://policy" - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" - xmlns:ip="http://policy" > - - <!-- Policy Intents --> - <sca:intent name="TestIntent_1" constrains="sca:binding.ws"> - <description>Test Intent One</description> - </sca:intent> - - <!-- Policy Sets --> - <sca:policySet name="TestPolicySet_1_binding" - provides="ip:TestIntent_1" - appliesTo="sca:binding.ws" - xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"> - <wsp:Policy /> - </sca:policySet> - -</definitions>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java b/sca-java-2.x/trunk/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java deleted file mode 100644 index a1b3eb3afa..0000000000 --- a/sca-java-2.x/trunk/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java +++ /dev/null @@ -1,65 +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 bindingoverride; - -import java.io.File; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.node.Client; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.apache.tuscany.sca.node.Contribution; - -import org.junit.After; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - -import policy.Target; - -public class BindingOverrideTestCase{ - - private Node node; - private Target targetClient; - - @Before - public void setUp() throws Exception { - try { - NodeFactory factory = NodeFactory.newInstance(); - node = factory.createNode(new File("src/main/resources/bindingoverride/OuterComposite.composite").toURI().toURL().toString(), - new Contribution("TestContribution", new File("src/main/resources/bindingoverride/").toURI().toURL().toString())); - node.start(); - targetClient = ((Client)node).getService(Target.class, "OuterClientComponent"); - } catch(Exception ex) { - System.out.println(ex.toString()); - } - } - - @After - public void tearDown() throws Exception { - node.stop(); - } - - @Test - //@Ignore("TUSCANY-2352") - public void test() throws Exception { - Assert.assertEquals("Target: Hello Target: Hello Fred!!", targetClient.hello("Fred")); - } -} diff --git a/sca-java-2.x/trunk/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java b/sca-java-2.x/trunk/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java deleted file mode 100644 index 821a437d12..0000000000 --- a/sca-java-2.x/trunk/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java +++ /dev/null @@ -1,81 +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 policy; - -import java.io.File; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.assembly.Component; -import org.apache.tuscany.sca.assembly.impl.CompositeImpl; -import org.apache.tuscany.sca.node.Client; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.impl.NodeImpl; -import org.apache.tuscany.sca.node.NodeFactory; -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.policy.PolicySet; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -public class PolicyTestCase{ - - private Node node; - private Target targetClient; - - @Before - public void setUp() throws Exception { - try { - NodeFactory factory = NodeFactory.newInstance(); - node = factory.createNode(new File("src/main/resources/policy/PolicyOuterComposite.composite").toURI().toURL().toString(), - new Contribution("TestContribution", new File("src/main/resources/policy/").toURI().toURL().toString())); - node.start(); - targetClient = ((Client)node).getService(Target.class, "TargetClientComponent"); - } catch(Exception ex) { - System.out.println(ex.toString()); - } - } - - @After - public void tearDown() throws Exception { - node.stop(); - } - - @Test - public void test() throws Exception { - //Check that the binding policy sets do flow down to the component but not down to the - //component inside implementation.composite - Component outerComponent = ((NodeImpl)node).getDomainComposite().getComponent("OuterTargetServiceComponent"); - - // The outer component service bindings should have policy sets attached - Assert.assertEquals(1, outerComponent.getServices().get(0).getPolicySets().size()); - - Component component = ((CompositeImpl)outerComponent.getImplementation()).getComponents().get(0); - - // The original inner component service binding should not have policy sets attached - Assert.assertEquals(0, ((PolicySet)component.getServices().get(0).getBindings().get(0)).getReferencedPolicySets().size()); - - // The promoted inner component service binding should have policy sets attached - Assert.assertEquals(1, ((PolicySet)component.getServices().get(1).getBindings().get(0)).getReferencedPolicySets().size()); - - String result = targetClient.hello("Fred"); - - System.out.println(result); - } -} diff --git a/sca-java-2.x/trunk/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java b/sca-java-2.x/trunk/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java deleted file mode 100644 index 3852947223..0000000000 --- a/sca-java-2.x/trunk/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java +++ /dev/null @@ -1,76 +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 recursive; - -import java.io.File; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.node.Client; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.apache.tuscany.sca.node.Contribution; -//import org.apache.tuscany.sca.host.embedded.SCATestCaseRunner; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import recursive.Composer; - -/** - * Test case for helloworld web service client - */ -public class ComposerClientTestCase { - - private Composer composer; - private Node node; - - //private SCATestCaseRunner server; - - @Before - public void startClient() throws Exception { - try { - NodeFactory factory = NodeFactory.newInstance(); - node = factory.createNode(new File("src/main/resources/Client.composite").toURI().toURL().toString(), - new Contribution("TestContribution", new File("src/main/resources/").toURI().toURL().toString())); - node.start(); - composer = ((Client)node).getService(Composer.class, "ClientComponent/Composer"); - - //server = new SCATestCaseRunner(ComposerTestServer.class); - //server.before(); - - } catch (Throwable e) { - e.printStackTrace(); - } - } - - @Test - public void testWSClient() throws Exception { - String msg = composer.Compose("ABC"); - Assert.assertEquals("Composed: ABC", msg); - } - - @After - public void stopClient() throws Exception { - //server.after(); - node.stop(); - } - -} diff --git a/sca-java-2.x/trunk/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java b/sca-java-2.x/trunk/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java deleted file mode 100644 index 6ceeb3e3eb..0000000000 --- a/sca-java-2.x/trunk/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java +++ /dev/null @@ -1,61 +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 recursive; - -import java.io.File; -import java.io.IOException; -import java.net.Socket; - -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.apache.tuscany.sca.node.Contribution; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -/** - * Starts up the SCA runtime which starts listening for service requests - */ -public class ComposerTestServer { - - private Node node; - - @Before - public void startServer() throws Exception { - try { - NodeFactory factory = NodeFactory.newInstance(); - node = factory.createNode(new File("src/main/resources/Outer.composite").toURI().toURL().toString(), - new Contribution("TestContribution", new File("src/main/resources/").toURI().toURL().toString())); - node.start(); - } catch (Exception e) { - e.printStackTrace(); - } - } - - @Test - public void testPing() throws IOException { - new Socket("127.0.0.1", 8085); - } - - @After - public void stopServer() throws Exception { - node.stop(); - } - -} diff --git a/sca-java-2.x/trunk/itest/references/pom.xml b/sca-java-2.x/trunk/itest/references/pom.xml deleted file mode 100644 index 9da71f2ee8..0000000000 --- a/sca-java-2.x/trunk/itest/references/pom.xml +++ /dev/null @@ -1,52 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-references</artifactId> - <name>Apache Tuscany SCA iTest References</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - </dependencies> -</project> diff --git a/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java b/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java deleted file mode 100644 index f8c0850118..0000000000 --- a/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponent.java +++ /dev/null @@ -1,40 +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.itest.references; - -public interface AComponent { - - String fooB(); - - String fooC(); - - String fooBC(); - - String fooD1(); - - String fooD2(); - - String fooMultipleD(); - - String fooMultipleDArray(); - - String fooMultipleDServiceRef(); - - DComponent getDReference(); -} diff --git a/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java b/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java deleted file mode 100644 index cd0aad3eea..0000000000 --- a/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java +++ /dev/null @@ -1,125 +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.itest.references; - -import java.util.Collection; -import java.util.List; - -import org.oasisopen.sca.ServiceReference; -import org.oasisopen.sca.annotation.Reference; - -public class AComponentImpl implements AComponent { - - @Reference(name = "bReference") - protected BComponent b; - - @Reference - private CComponent cReference; - - @Reference(required = false) - protected DComponent dReference; - - @Reference(name = "dReferences") - public Collection<DComponent> dReferences; - - @Reference(name = "dReferenceArray") - public DComponent[] dReferenceArray; - - @Reference(name = "dServiceReferences") - public List<ServiceReference<DComponent>> dServiceReferences; - - private DComponent dReference1; - - private DComponent dReference2; - - @Reference(name = "dReference1", required = false) - public void setDReference(DComponent dReference) { - this.dReference1 = dReference; - } - - @Reference - public void setDReference2(DComponent dReference2) { - this.dReference2 = dReference2; - } - - public String fooB() { - return b.bFoo(); - } - - public String fooC() { - return cReference.cFoo(); - } - - public String fooBC() { - return b.fooC(); - } - - public String fooD() { - return dReference1.dFoo(); - } - - public String fooD1() { - return dReference1.dFoo(); - } - - public String fooD2() { - return dReference2.dFoo(); - } - - public String fooMultipleDArray() { - StringBuffer str = new StringBuffer(); - for (DComponent d : dReferenceArray) { - str.append(d.getComponentName()); - str.append(','); - } - if (str.length() > 0) { - str.deleteCharAt(str.length() - 1); - } - return str.toString(); - } - - public String fooMultipleD() { - StringBuffer str = new StringBuffer(); - for (DComponent d : dReferences) { - str.append(d.getComponentName()); - str.append(','); - } - if (str.length() > 0) { - str.deleteCharAt(str.length() - 1); - } - return str.toString(); - } - - public String fooMultipleDServiceRef() { - StringBuffer str = new StringBuffer(); - for (ServiceReference<DComponent> d : dServiceReferences) { - str.append(d.getService().getComponentName()); - str.append(','); - } - if (str.length() > 0) { - str.deleteCharAt(str.length() - 1); - } - return str.toString(); - } - - public DComponent getDReference() { - return dReference; - } - -} diff --git a/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java b/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java deleted file mode 100644 index 785920bb2d..0000000000 --- a/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponent.java +++ /dev/null @@ -1,26 +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.itest.references; - -public interface BComponent { - - String bFoo(); - - String fooC(); -} diff --git a/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java b/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java deleted file mode 100644 index 211e6160f6..0000000000 --- a/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentImpl.java +++ /dev/null @@ -1,39 +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.itest.references; - -import org.oasisopen.sca.annotation.Reference; - -public class BComponentImpl implements BComponent { - - protected CComponent cReference; - - public BComponentImpl(@Reference(name = "cReference") CComponent cReference) { - this.cReference = cReference; - } - - public String bFoo() { - return "BComponent"; - } - - public String fooC() { - return "B" + cReference.cFoo(); - } - -} diff --git a/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java b/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java deleted file mode 100644 index 47a1f9bde8..0000000000 --- a/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/BComponentWrongTargetImpl.java +++ /dev/null @@ -1,39 +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.itest.references; - -import org.oasisopen.sca.annotation.Reference; - -public class BComponentWrongTargetImpl implements BComponent { - - protected CComponent cReference; - - public BComponentWrongTargetImpl(@Reference(name = "cReference") CComponent cReference) { - this.cReference = cReference; - } - - public String bFoo() { - return "BComponentWrongTarget"; - } - - public String fooC() { - return "B" + cReference.cFoo(); - } - -} diff --git a/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java b/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java deleted file mode 100644 index d436c28adc..0000000000 --- a/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponent.java +++ /dev/null @@ -1,24 +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.itest.references; - -public interface CComponent { - - String cFoo(); -} diff --git a/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java b/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java deleted file mode 100644 index a1823e1cdc..0000000000 --- a/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/CComponentImpl.java +++ /dev/null @@ -1,27 +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.itest.references; - -public class CComponentImpl implements CComponent { - - public String cFoo() { - return "CComponent"; - } - -} diff --git a/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java b/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java deleted file mode 100644 index 80617bdec2..0000000000 --- a/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java +++ /dev/null @@ -1,26 +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.itest.references; - -public interface DComponent { - - String dFoo(); - - String getComponentName(); -} diff --git a/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java b/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.java deleted file mode 100644 index d181ac96ca..0000000000 --- a/sca-java-2.x/trunk/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponentImpl.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.itest.references; - -import org.oasisopen.sca.annotation.ComponentName; - -public class DComponentImpl implements DComponent { - @ComponentName - public String name; - - public String dFoo() { - return "DComponent"; - } - - public String getComponentName() { - return name; - } - -} diff --git a/sca-java-2.x/trunk/itest/references/src/main/resources/AutoWiredReferencesTest.composite b/sca-java-2.x/trunk/itest/references/src/main/resources/AutoWiredReferencesTest.composite deleted file mode 100644 index 14899fce62..0000000000 --- a/sca-java-2.x/trunk/itest/references/src/main/resources/AutoWiredReferencesTest.composite +++ /dev/null @@ -1,61 +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 - * 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://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:foo="http://foo" targetNamespace="http://foo" - name="AutowireReferencesTest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" autowire="true"> - - <component name="AComponent" autowire="false"> - <implementation.java class="org.apache.tuscany.sca.itest.references.AComponentImpl" /> - <reference name="bReference" target="BComponent" /> - <reference name="cReference" autowire="true" /> - <reference name="dReference1" multiplicity="0..1"/> - <!-- - <reference name="dReference1" target="DComponent" /> - --> - <reference name="DReference2" target="DComponent" /> - <reference name="dReferences" autowire="true" /> - <reference name="dReferenceArray" autowire="true" /> - <reference name="dServiceReferences" target="DComponent DComponent1" /> - - </component> - - <component name="AComponentAutowire" autowire="true"> - <implementation.java class="org.apache.tuscany.sca.itest.references.AComponentImpl" /> - <reference name="bReference" target="BComponent" /> - </component> - - <component name="BComponentWrongTarget"> - <implementation.java class="org.apache.tuscany.sca.itest.references.BComponentWrongTargetImpl" /> - </component> - - <component name="BComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.references.BComponentImpl" /> - </component> - - <component name="CComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.references.CComponentImpl" /> - </component> - - <component name="DComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.references.DComponentImpl" /> - </component> - - <component name="DComponent1"> - <implementation.java class="org.apache.tuscany.sca.itest.references.DComponentImpl" /> - </component> -</composite>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/references/src/main/resources/InnerReferencesTest.composite b/sca-java-2.x/trunk/itest/references/src/main/resources/InnerReferencesTest.composite deleted file mode 100644 index 7048eaf371..0000000000 --- a/sca-java-2.x/trunk/itest/references/src/main/resources/InnerReferencesTest.composite +++ /dev/null @@ -1,51 +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 - * 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://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:foo="http://foo" targetNamespace="http://foo" - name="InnerReferencesTest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - - - <component name="AComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.references.AComponentImpl" /> - <reference name="bReference" target="BComponent" /> - <reference name="cReference" target="CComponent" /> - <reference name="dReference1" target="DComponent" /> - <reference name="DReference2" target="DComponent" /> - <reference name="dReferences" target="DComponent DComponent1" /> - <reference name="dReferenceArray" target="DComponent1" /> - <reference name="dServiceReferences" target="DComponent DComponent1" /> - </component> - - <component name="BComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.references.BComponentImpl" /> - <reference name="cReference" target="CComponent" /> - </component> - - <component name="CComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.references.CComponentImpl" /> - </component> - - <component name="DComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.references.DComponentImpl" /> - </component> - - <component name="DComponent1"> - <implementation.java class="org.apache.tuscany.sca.itest.references.DComponentImpl" /> - </component> - -</composite>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/references/src/main/resources/ManualWiredReferencesTest.composite b/sca-java-2.x/trunk/itest/references/src/main/resources/ManualWiredReferencesTest.composite deleted file mode 100644 index dbf72f67b6..0000000000 --- a/sca-java-2.x/trunk/itest/references/src/main/resources/ManualWiredReferencesTest.composite +++ /dev/null @@ -1,59 +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 - * 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://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:foo="http://foo" targetNamespace="http://foo" - name="ManualWiredReferencesTest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" autowire="true"> - - <component name="AComponent" > - <implementation.java class="org.apache.tuscany.sca.itest.references.AComponentImpl" /> - <reference name="bReference" target="BComponent" /> - <reference name="cReference" target="CComponent/CComponentImpl"> - <!-- reference name="cReference" target="CComponent"--> - </reference> - <reference name="dReference1" > - <binding.sca uri="DComponent"/> - </reference> - <reference name="DReference2" target="DComponent" > - <!-- binding.ws uri="DComponent"/--> - </reference> - <reference name="dReferences" target="DComponent DComponent1" /> - <reference name="dReferenceArray" target="DComponent DComponent1" /> - <reference name="dServiceReferences" target="DComponent DComponent1" /> - - </component> - - <component name="BComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.references.BComponentImpl" /> - </component> - - <component name="CComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.references.CComponentImpl" /> - </component> - - <component name="DComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.references.DComponentImpl" /> - <service name="DComponentImpl"> - <binding.sca/> - <!-- binding.ws/--> - </service> - </component> - - <component name="DComponent1"> - <implementation.java class="org.apache.tuscany.sca.itest.references.DComponentImpl" /> - </component> -</composite>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java b/sca-java-2.x/trunk/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java deleted file mode 100644 index 76264d308f..0000000000 --- a/sca-java-2.x/trunk/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java +++ /dev/null @@ -1,114 +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.itest.references; - -import static org.junit.Assert.assertEquals; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; -import org.oasisopen.sca.ServiceUnavailableException; - -public class AutoWiredReferenceTestCase { - private static Node node; - private static AComponent acomponent; - private static AComponent acomponentAutowire; - - @BeforeClass - public static void init() throws Exception { - try { - String location = ContributionLocationHelper.getContributionLocation("AutoWiredReferencesTest.composite"); - node = - NodeFactory.newInstance().createNode("AutoWiredReferencesTest.composite", - new Contribution("c1", location)); - node.start(); - acomponent = node.getService(AComponent.class, "AComponent"); - acomponentAutowire = node.getService(AComponent.class, "AComponentAutowire"); - } catch (Throwable e) { - e.printStackTrace(); - } - } - - @AfterClass - public static void destroy() throws Exception { - node.stop(); - } - - @Test - public void testBReference() { - assertEquals("BComponent", acomponent.fooB()); - } - - @Test - public void testCReference() { - assertEquals("CComponent", acomponent.fooC()); - } - - @Test - public void testBCReference() { - assertEquals("BCComponent", acomponent.fooBC()); - } - - @Test(expected = Exception.class) - public void testD1Reference() { - acomponent.fooD1(); - } - - @Test - public void testD2Reference() { - assertEquals("DComponent", acomponent.fooD2()); - } - - @Test - public void testMultiDReferenceArray() { - String components = acomponent.fooMultipleDArray(); - Assert.assertTrue(components.contains("DComponent1")); - } - - @Test - public void testMultiDServiceReference() { - String components = acomponent.fooMultipleDServiceRef(); - Assert.assertTrue(components.contains("DComponent")); - Assert.assertTrue(components.contains("DComponent1")); - } - - @Test - public void testRequiredFalseReference() { - try { - acomponent.getDReference().dFoo(); - } catch (Exception e) { - Assert.assertTrue(true); - } - } - - @Test - public void testTargetPrecendence() { - try { - assertEquals("BComponent", acomponentAutowire.fooB()); - } catch (Exception e) { - Assert.assertTrue(true); - } - } - -} diff --git a/sca-java-2.x/trunk/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java b/sca-java-2.x/trunk/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java deleted file mode 100644 index 6e4212fd9a..0000000000 --- a/sca-java-2.x/trunk/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java +++ /dev/null @@ -1,99 +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.itest.references; - -import static org.junit.Assert.assertEquals; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; - -public class InnerReferenceTestCase { - private static Node node; - private static AComponent acomponent; - - @BeforeClass - public static void init() throws Exception { - String location = ContributionLocationHelper.getContributionLocation("InnerReferencesTest.composite"); - node = NodeFactory.newInstance().createNode("InnerReferencesTest.composite", new Contribution("c1", location)); - node.start(); - acomponent = node.getService(AComponent.class, "AComponent"); - } - - @AfterClass - public static void destroy() throws Exception { - node.stop(); - } - - @Test - public void testBReference() { - assertEquals("BComponent", acomponent.fooB()); - } - - @Test - public void testCReference() { - assertEquals("CComponent", acomponent.fooC()); - } - - @Test - public void testBCReference() { - assertEquals("BCComponent", acomponent.fooBC()); - } - - @Test - public void testD1Reference() { - assertEquals("DComponent", acomponent.fooD1()); - } - - @Test - public void testD2Reference() { - assertEquals("DComponent", acomponent.fooD2()); - } - - @Test - public void testMultiDReference() { - String components = acomponent.fooMultipleD(); - Assert.assertTrue(components.contains("DComponent")); - Assert.assertTrue(components.contains("DComponent1")); - } - - @Test - public void testMultiDReferenceArray() { - String components = acomponent.fooMultipleDArray(); - Assert.assertTrue(components.equals("DComponent1")); - } - - @Test - public void testMultiDServiceReference() { - String components = acomponent.fooMultipleDServiceRef(); - Assert.assertTrue(components.contains("DComponent")); - Assert.assertTrue(components.contains("DComponent1")); - } - - @Test(expected = Exception.class) - public void testRequiredFalseReference() { - acomponent.getDReference().dFoo(); - } - -} diff --git a/sca-java-2.x/trunk/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java b/sca-java-2.x/trunk/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java deleted file mode 100644 index 2fce95401e..0000000000 --- a/sca-java-2.x/trunk/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java +++ /dev/null @@ -1,97 +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.itest.references; - -import static org.junit.Assert.assertEquals; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; - -public class ManualWiredReferenceTestCase { - private static Node node; - private static AComponent acomponent; - - @BeforeClass - public static void init() throws Exception { - String location = ContributionLocationHelper.getContributionLocation("ManualWiredReferencesTest.composite"); - node = NodeFactory.newInstance().createNode("ManualWiredReferencesTest.composite", new Contribution("c1", location)); - node.start(); - acomponent = node.getService(AComponent.class, "AComponent"); - } - - @AfterClass - public static void destroy() throws Exception { - node.stop(); - } - - @Test - public void testBReference() { - assertEquals("BComponent", acomponent.fooB()); - } - - @Test - public void testCReference() { - assertEquals("CComponent", acomponent.fooC()); - } - - @Test - public void testBCReference() { - assertEquals("BCComponent", acomponent.fooBC()); - } - - @Test - public void testD1Reference() { - acomponent.fooD1(); - } - - @Test - public void testD2Reference() { - assertEquals("DComponent", acomponent.fooD2()); - } - - @Test - public void testMultiDReferenceArray() { - String components = acomponent.fooMultipleDArray(); - Assert.assertTrue(components.contains("DComponent1")); - } - - @Test - public void testMultiDServiceReference() { - String components = acomponent.fooMultipleDServiceRef(); - Assert.assertTrue(components.contains("DComponent")); - Assert.assertTrue(components.contains("DComponent1")); - } - - @Test - public void testRequiredFalseReference() { - try { - acomponent.getDReference().dFoo(); - } catch (Exception e) { - Assert.assertTrue(true); - } - } - -} diff --git a/sca-java-2.x/trunk/itest/samples/helloworld/pom.xml b/sca-java-2.x/trunk/itest/samples/helloworld/pom.xml deleted file mode 100644 index c8817be0f2..0000000000 --- a/sca-java-2.x/trunk/itest/samples/helloworld/pom.xml +++ /dev/null @@ -1,38 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>itest-samples-helloworld</artifactId>
- <name>Apache Tuscany SCA iTest Samples Helloworld</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-domain-node</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
-</project>
diff --git a/sca-java-2.x/trunk/itest/samples/helloworld/src/test/java/itest/helloworld/Helloworld.java b/sca-java-2.x/trunk/itest/samples/helloworld/src/test/java/itest/helloworld/Helloworld.java deleted file mode 100644 index 38dc80bed3..0000000000 --- a/sca-java-2.x/trunk/itest/samples/helloworld/src/test/java/itest/helloworld/Helloworld.java +++ /dev/null @@ -1,27 +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 itest.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Helloworld {
- String sayHello(String name);
-}
diff --git a/sca-java-2.x/trunk/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldDomainNodeTestCase.java b/sca-java-2.x/trunk/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldDomainNodeTestCase.java deleted file mode 100644 index dd46d68547..0000000000 --- a/sca-java-2.x/trunk/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldDomainNodeTestCase.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 itest.helloworld;
-
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.domain.node.DomainNode;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.oasisopen.sca.NoSuchServiceException;
-
-public class HelloworldDomainNodeTestCase {
-
- DomainNode node;
-
- @Before
- public void setUp() throws Exception {
- node = new DomainNode("../../../samples/helloworld/target/sample-helloworld.zip");
- }
-
- @Test
- public void testHelloworld() throws NoSuchServiceException {
- assertEquals(1, node.getServiceNames().size());
- assertEquals("HelloworldComponent/Helloworld", node.getServiceNames().get(0));
- Helloworld service = node.getService(Helloworld.class, "HelloworldComponent");
- assertEquals("Hello petra", service.sayHello("petra"));
- }
-
- @After
- public void stop() {
- node.stop();
- }
-}
diff --git a/sca-java-2.x/trunk/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldNodeTestCase.java b/sca-java-2.x/trunk/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldNodeTestCase.java deleted file mode 100644 index 37950f1276..0000000000 --- a/sca-java-2.x/trunk/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldNodeTestCase.java +++ /dev/null @@ -1,49 +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 itest.helloworld;
-
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class HelloworldNodeTestCase {
-
- Node node;
-
- @Before
- public void setUp() throws Exception {
- node = NodeFactory.newInstance().createNode(null, new String[]{"../../../samples/helloworld/target/sample-helloworld.zip"}).start();
- }
-
- @Test
- public void testHelloworld() {
- Helloworld service = node.getService(Helloworld.class, "HelloworldComponent");
- assertEquals("Hello petra", service.sayHello("petra"));
- }
-
- @After
- public void stop() {
- node.stop();
- }
-}
diff --git a/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/pom.xml b/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/pom.xml deleted file mode 100644 index 2e0ff027b9..0000000000 --- a/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/pom.xml +++ /dev/null @@ -1,57 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-scaclient-api-jse-osgi</artifactId> - <name>Apache Tuscany SCA iTest SCAClient API JSE and OSGI</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-sca-api</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-launcher-equinox</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.1</version> - </dependency> - - </dependencies> -</project> diff --git a/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldService.java b/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldService.java deleted file mode 100644 index 1c7edaefb6..0000000000 --- a/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldService.java +++ /dev/null @@ -1,25 +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 itest; - -public interface HelloworldService { - - String sayHello(String name); - -} diff --git a/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldServiceImpl.java b/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldServiceImpl.java deleted file mode 100644 index 7793bdd544..0000000000 --- a/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/java/itest/HelloworldServiceImpl.java +++ /dev/null @@ -1,38 +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 itest; - -import org.oasisopen.sca.annotation.EagerInit; -import org.oasisopen.sca.annotation.Init; -import org.oasisopen.sca.annotation.Scope; - -@EagerInit -@Scope("COMPOSITE") -public class HelloworldServiceImpl implements HelloworldService { - - public String sayHello(String name) { - return "Hello " + name; - } - - @Init - public void init() { - System.out.println("Init - " + sayHello("world")); - } - -} diff --git a/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/resources/Helloworld.composite b/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/resources/Helloworld.composite deleted file mode 100644 index 2d5ae6a57c..0000000000 --- a/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/resources/Helloworld.composite +++ /dev/null @@ -1,29 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" - targetNamespace="http://itest" - name="Helloworld"> - - <component name="HelloworldComponent"> - <implementation.java class="itest.HelloworldServiceImpl"/> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 56e127b539..0000000000 --- a/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:itest="http://itest"> - <deployable composite="itest:Helloworld"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/test/java/test/scaclient/SCAClientTestCase.java b/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/test/java/test/scaclient/SCAClientTestCase.java deleted file mode 100644 index 8bf162dfd9..0000000000 --- a/sca-java-2.x/trunk/itest/scaclient-api-jse-osgi/src/test/java/test/scaclient/SCAClientTestCase.java +++ /dev/null @@ -1,63 +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 test.scaclient; - -import java.net.URI; - -import itest.HelloworldService; -import junit.framework.TestCase; - -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.equinox.launcher.Contribution; -import org.apache.tuscany.sca.node.equinox.launcher.NodeLauncher; -import org.oasisopen.sca.client.SCAClientFactory; - -/** - * Test SCADomain.newInstance and invocation of a service. - * - * @version $Rev$ $Date$ - */ -public class SCAClientTestCase extends TestCase { - - private static NodeLauncher launcher; - private static Node node; - - @Override - protected void setUp() throws Exception { - launcher = NodeLauncher.newInstance(); - node = launcher.createNode(null, new Contribution("test", "./target/classes")); - System.out.println("SCA Node API ClassLoader: " + node.getClass().getClassLoader()); - node.start(); - } - - public void testInvoke() throws Exception { - // At the moment the SCAClientFactory assumes that only one domain is active - // in a JVM. So we pass in null for the domain name and get what we're given - HelloworldService service = - SCAClientFactory.newInstance(URI.create("default")).getService(HelloworldService.class, "HelloworldComponent"); - assertEquals("Hello petra", service.sayHello("petra")); - } - - @Override - protected void tearDown() throws Exception { - node.stop(); - } - -} diff --git a/sca-java-2.x/trunk/itest/scaclient-api-osgi/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/itest/scaclient-api-osgi/META-INF/MANIFEST.MF deleted file mode 100644 index ae6704f97d..0000000000 --- a/sca-java-2.x/trunk/itest/scaclient-api-osgi/META-INF/MANIFEST.MF +++ /dev/null @@ -1,20 +0,0 @@ -Manifest-Version: 1.0
-Private-Package: helloworld;version="2.0.0"
-Tool: Bnd-0.0.255
-Bundle-Name: Apache Tuscany SCA SCAClient API OSGi itest
-Created-By: 1.6.0_07 (Sun Microsystems Inc.)
-Bundle-Vendor: The Apache Software Foundation
-Eclipse-LazyStart: false
-Bundle-Version: 2.0.0
-Bnd-LastModified: 1223949424781
-Bundle-ManifestVersion: 2
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Bundle-Description: Apache Tuscany SCA SCAClient API OSGi itest
-Import-Package: org.apache.tuscany.sca.node;version="2.0.0",
- org.oasisopen.sca;version="2.0.0",
- org.oasisopen.sca.annotation;version="2.0.0",
- org.oasisopen.sca.client;version="2.0.0",
- org.osgi.framework;version="1.4"
-Bundle-SymbolicName: itest-scaclient-apo-osgi
-Bundle-DocURL: http://www.apache.org/
-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6 diff --git a/sca-java-2.x/trunk/itest/scaclient-api-osgi/pom.xml b/sca-java-2.x/trunk/itest/scaclient-api-osgi/pom.xml deleted file mode 100644 index b75879bcad..0000000000 --- a/sca-java-2.x/trunk/itest/scaclient-api-osgi/pom.xml +++ /dev/null @@ -1,109 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-scaclient-api-osgi</artifactId> - <name>Apache Tuscany SCA iTest SCAClient API OSGi</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-feature-api</artifactId> - <version>2.0-SNAPSHOT</version> - <type>pom</type> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-feature-core</artifactId> - <version>2.0-SNAPSHOT</version> - <type>pom</type> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.1</version> - </dependency> - - </dependencies> - - <build> - <finalName>${artifactId}</finalName> - <plugins> - <plugin> - <artifactId>maven-eclipse-plugin</artifactId> - <version>2.5.1</version> - <configuration> - <buildcommands> - <buildcommand>org.eclipse.pde.ManifestBuilder</buildcommand> - <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand> - </buildcommands> - <projectnatures> - <projectnature>org.eclipse.jdt.core.javanature</projectnature> - <projectnature>org.eclipse.pde.PluginNature</projectnature> - </projectnatures> - <classpathContainers> - <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER - </classpathContainer> - </classpathContainers> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifestFile>${basedir}/META-INF/MANIFEST.MF</manifestFile> - </archive> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.tuscany.maven.plugins</groupId> - <artifactId>maven-osgi-junit-plugin</artifactId> - <version>1.0</version> - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-launcher-equinox</artifactId> - <version>${pom.version}</version> - </dependency> - </dependencies> - <executions> - <execution> - <id>osgi-test</id> - <phase>test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration></configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> diff --git a/sca-java-2.x/trunk/itest/scaclient-api-osgi/src/main/java/itest/HelloworldService.java b/sca-java-2.x/trunk/itest/scaclient-api-osgi/src/main/java/itest/HelloworldService.java deleted file mode 100644 index 1c7edaefb6..0000000000 --- a/sca-java-2.x/trunk/itest/scaclient-api-osgi/src/main/java/itest/HelloworldService.java +++ /dev/null @@ -1,25 +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 itest; - -public interface HelloworldService { - - String sayHello(String name); - -} diff --git a/sca-java-2.x/trunk/itest/scaclient-api-osgi/src/main/java/itest/HelloworldServiceImpl.java b/sca-java-2.x/trunk/itest/scaclient-api-osgi/src/main/java/itest/HelloworldServiceImpl.java deleted file mode 100644 index 3eecc59439..0000000000 --- a/sca-java-2.x/trunk/itest/scaclient-api-osgi/src/main/java/itest/HelloworldServiceImpl.java +++ /dev/null @@ -1,38 +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 itest; - -import org.oasisopen.sca.annotation.EagerInit; -import org.oasisopen.sca.annotation.Init; -import org.oasisopen.sca.annotation.Scope; - -@EagerInit -@Scope("COMPOSITE") -public class HelloworldServiceImpl implements HelloworldService { - - public String sayHello(String name) { - return "Hello " + name; - } - - @Init - public void init() { - System.out.println("Result from Init = " + sayHello("world")); - } - -} diff --git a/sca-java-2.x/trunk/itest/scaclient-api-osgi/src/main/resources/Helloworld.composite b/sca-java-2.x/trunk/itest/scaclient-api-osgi/src/main/resources/Helloworld.composite deleted file mode 100644 index 2d5ae6a57c..0000000000 --- a/sca-java-2.x/trunk/itest/scaclient-api-osgi/src/main/resources/Helloworld.composite +++ /dev/null @@ -1,29 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" - targetNamespace="http://itest" - name="Helloworld"> - - <component name="HelloworldComponent"> - <implementation.java class="itest.HelloworldServiceImpl"/> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/scaclient-api-osgi/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/scaclient-api-osgi/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 56e127b539..0000000000 --- a/sca-java-2.x/trunk/itest/scaclient-api-osgi/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:itest="http://itest"> - <deployable composite="itest:Helloworld"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/scaclient-api-osgi/src/test/java/test/scaclient/SCAClientTestCase.java b/sca-java-2.x/trunk/itest/scaclient-api-osgi/src/test/java/test/scaclient/SCAClientTestCase.java deleted file mode 100644 index 431b2995aa..0000000000 --- a/sca-java-2.x/trunk/itest/scaclient-api-osgi/src/test/java/test/scaclient/SCAClientTestCase.java +++ /dev/null @@ -1,65 +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 test.scaclient; - -import java.net.URI; - -import itest.HelloworldService; -import junit.framework.TestCase; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.oasisopen.sca.NoSuchDomainException; -import org.oasisopen.sca.NoSuchServiceException; -import org.oasisopen.sca.client.SCAClientFactory; - -/** - * Test SCADomain.newInstance and invocation of a service. - * - * @version $Rev$ $Date$ - */ -public class SCAClientTestCase extends TestCase { - - private static Node node; - - @Override - protected void setUp() throws Exception { - String location = ContributionLocationHelper.getContributionLocation(HelloworldService.class); - node = NodeFactory.getInstance().createNode("Helloworld.composite", new Contribution("test", "./target/classes")); - System.out.println("SCA Node API ClassLoader: " + node.getClass().getClassLoader()); - node.start(); - } - - public void testInvoke() throws NoSuchServiceException, NoSuchDomainException { - HelloworldService service = - SCAClientFactory.newInstance(URI.create("default")).getService(HelloworldService.class, "HelloworldComponent"); - String result = service.sayHello("petra"); - assertEquals("Hello petra", result); - System.out.println("Result from SCAClient call = " + result); - } - - @Override - protected void tearDown() throws Exception { - node.stop(); - } - -} diff --git a/sca-java-2.x/trunk/itest/scaclient-api-remote/pom.xml b/sca-java-2.x/trunk/itest/scaclient-api-remote/pom.xml deleted file mode 100644 index f807c9883f..0000000000 --- a/sca-java-2.x/trunk/itest/scaclient-api-remote/pom.xml +++ /dev/null @@ -1,64 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>itest-scaclient-api-remote</artifactId>
- <name>Apache Tuscany SCA iTest SCAClient API with Hazelcast client</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-client-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-hazelcast-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-endpoint-hazelcast</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-endpoint-hazelcast-client</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- </dependencies>
-</project>
diff --git a/sca-java-2.x/trunk/itest/scaclient-api-remote/src/main/java/itest/HelloworldService.java b/sca-java-2.x/trunk/itest/scaclient-api-remote/src/main/java/itest/HelloworldService.java deleted file mode 100644 index f97d2c3a83..0000000000 --- a/sca-java-2.x/trunk/itest/scaclient-api-remote/src/main/java/itest/HelloworldService.java +++ /dev/null @@ -1,28 +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 itest;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface HelloworldService {
-
- String sayHello(String name);
-
-}
diff --git a/sca-java-2.x/trunk/itest/scaclient-api-remote/src/main/java/itest/HelloworldServiceImpl.java b/sca-java-2.x/trunk/itest/scaclient-api-remote/src/main/java/itest/HelloworldServiceImpl.java deleted file mode 100644 index a04b40279f..0000000000 --- a/sca-java-2.x/trunk/itest/scaclient-api-remote/src/main/java/itest/HelloworldServiceImpl.java +++ /dev/null @@ -1,38 +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 itest;
-
-import org.oasisopen.sca.annotation.EagerInit;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Scope;
-
-@EagerInit
-@Scope("COMPOSITE")
-public class HelloworldServiceImpl implements HelloworldService {
-
- public String sayHello(String name) {
- return "Hello " + name;
- }
-
- @Init
- public void init() {
- System.out.println(sayHello("world"));
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/scaclient-api-remote/src/main/resources/Helloworld.composite b/sca-java-2.x/trunk/itest/scaclient-api-remote/src/main/resources/Helloworld.composite deleted file mode 100644 index d37c93857d..0000000000 --- a/sca-java-2.x/trunk/itest/scaclient-api-remote/src/main/resources/Helloworld.composite +++ /dev/null @@ -1,29 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- targetNamespace="http://itest"
- name="Helloworld">
-
- <component name="HelloworldComponent">
- <implementation.java class="itest.HelloworldServiceImpl"/>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/scaclient-api-remote/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/scaclient-api-remote/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index e178823296..0000000000 --- a/sca-java-2.x/trunk/itest/scaclient-api-remote/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://itest">
- <deployable composite="itest:Helloworld"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/scaclient-api-remote/src/test/java/test/scaclient/SCAClientTestCase.java b/sca-java-2.x/trunk/itest/scaclient-api-remote/src/test/java/test/scaclient/SCAClientTestCase.java deleted file mode 100644 index 432d51dc27..0000000000 --- a/sca-java-2.x/trunk/itest/scaclient-api-remote/src/test/java/test/scaclient/SCAClientTestCase.java +++ /dev/null @@ -1,121 +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 test.scaclient;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-import itest.HelloworldService;
-
-import java.net.URI;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.oasisopen.sca.NoSuchDomainException;
-import org.oasisopen.sca.client.SCAClientFactory;
-
-/**
- * Test SCADomain.newInstance and invocation of a service.
- *
- * @version $Rev: 904064 $ $Date: 2010-01-28 12:31:36 +0000 (Thu, 28 Jan 2010) $
- */
-public class SCAClientTestCase {
-
- private Node node;
-
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {
- }
-
- @AfterClass
- public static void tearDownAfterClass() throws Exception {
- }
-
- @Test
- public void testDefault() throws Exception {
-
- node = NodeFactory.newInstance().createNode((String)null, new String[] {"target/classes"});
- node.start();
-
- HelloworldService service = SCAClientFactory.newInstance(URI.create("default")).getService(HelloworldService.class, "HelloworldComponent");
- assertEquals("Hello petra", service.sayHello("petra"));
- }
-
- @Test
- public void testURIconfig() throws Exception {
-
- node = NodeFactory.newInstance("uri:somedomain").createNode((String)null, new String[] {"target/classes"});
- node.start();
-
- HelloworldService service = SCAClientFactory.newInstance(URI.create("somedomain")).getService(HelloworldService.class, "HelloworldComponent");
- assertEquals("Hello petra", service.sayHello("petra"));
- try {
- service = SCAClientFactory.newInstance(URI.create("nosuchdomain")).getService(HelloworldService.class, "HelloworldComponent");
- service.sayHello("petra");
- fail();
- } catch (NoSuchDomainException e) {
- //expected
- }
- }
-
- @Test
- public void testExplicit() throws Exception {
- node = NodeFactory.newInstance().createNode(URI.create("myFooDomain"), new String[] {"target/classes"});
- node.start();
-
- HelloworldService service = SCAClientFactory.newInstance(URI.create("myFooDomain")).getService(HelloworldService.class, "HelloworldComponent");
- assertEquals("Hello petra", service.sayHello("petra"));
- }
-
- @Test
- public void testExplicitRemote() throws Exception {
- node = NodeFactory.newInstance("uri:myFooDomain?bind=127.0.0.1:14821").createNode((String)null, new String[] {"target/classes"});
- node.start();
-
- // TUSCANY-3670 - why factory takes URI while node factory take configuration string?
- // hacked this for now to make the client domain name match the domain
- // name that's pulled out of the factory URI
- //HelloworldService service = SCAClientFactory.newInstance(URI.create("uri:myFooDomain?wka=127.0.0.1:14821")).getService(HelloworldService.class, "HelloworldComponent");
- HelloworldService service = SCAClientFactory.newInstance(URI.create("myFooDomain")).getService(HelloworldService.class, "HelloworldComponent");
- assertEquals("Hello petra", service.sayHello("petra"));
- }
-
- @Test
- public void testExplicitRemote2() throws Exception {
- node = NodeFactory.newInstance("uri:myFooDomain?bind=127.0.0.1:14821").createNode((String)null, new String[] {"target/classes"});
- node.start();
-
- // TUSCANY-3670 - why factory takes URI while node factory take configuration string?
- // hacked this for now to make the client domain name match the domain
- // name that's pulled out of the factory URI
- //HelloworldService service = SCAClientFactory.newInstance(URI.create("uri:myFooDomain?wka=127.0.0.1:14821")).getService(HelloworldService.class, "HelloworldComponent");
- HelloworldService service = SCAClientFactory.newInstance(URI.create("myFooDomain")).getService(HelloworldService.class, "HelloworldComponent");
- assertEquals("Hello petra", service.sayHello("petra"));
- }
-
- @After
- public void tearDown() throws Exception {
- node.stop();
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/scaclient-api/pom.xml b/sca-java-2.x/trunk/itest/scaclient-api/pom.xml deleted file mode 100644 index 795221292c..0000000000 --- a/sca-java-2.x/trunk/itest/scaclient-api/pom.xml +++ /dev/null @@ -1,46 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-scaclient-api</artifactId> - <name>Apache Tuscany SCA iTest SCAClient API</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-sca-client-impl</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - </dependencies> -</project> diff --git a/sca-java-2.x/trunk/itest/scaclient-api/src/main/java/itest/HelloworldService.java b/sca-java-2.x/trunk/itest/scaclient-api/src/main/java/itest/HelloworldService.java deleted file mode 100644 index 1c7edaefb6..0000000000 --- a/sca-java-2.x/trunk/itest/scaclient-api/src/main/java/itest/HelloworldService.java +++ /dev/null @@ -1,25 +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 itest; - -public interface HelloworldService { - - String sayHello(String name); - -} diff --git a/sca-java-2.x/trunk/itest/scaclient-api/src/main/java/itest/HelloworldServiceImpl.java b/sca-java-2.x/trunk/itest/scaclient-api/src/main/java/itest/HelloworldServiceImpl.java deleted file mode 100644 index 5af221313e..0000000000 --- a/sca-java-2.x/trunk/itest/scaclient-api/src/main/java/itest/HelloworldServiceImpl.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 itest; - -import org.oasisopen.sca.annotation.EagerInit; -import org.oasisopen.sca.annotation.Init; -import org.oasisopen.sca.annotation.Scope; -import org.oasisopen.sca.annotation.Service; - -@EagerInit -@Scope("COMPOSITE") -@Service({HelloworldService.class, RemoteHelloworldService.class}) -public class HelloworldServiceImpl implements HelloworldService, RemoteHelloworldService { - - public String sayHello(String name) { - return "Hello " + name; - } - - public String sayHelloRemote(String name) { - return "Hello " + name; - } - - @Init - public void init() { - System.out.println(sayHello("world")); - } - -} diff --git a/sca-java-2.x/trunk/itest/scaclient-api/src/main/java/itest/RemoteHelloworldService.java b/sca-java-2.x/trunk/itest/scaclient-api/src/main/java/itest/RemoteHelloworldService.java deleted file mode 100644 index a8640bf484..0000000000 --- a/sca-java-2.x/trunk/itest/scaclient-api/src/main/java/itest/RemoteHelloworldService.java +++ /dev/null @@ -1,28 +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 itest; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface RemoteHelloworldService { - - String sayHelloRemote(String name); - -} diff --git a/sca-java-2.x/trunk/itest/scaclient-api/src/main/resources/Helloworld.composite b/sca-java-2.x/trunk/itest/scaclient-api/src/main/resources/Helloworld.composite deleted file mode 100644 index 2d5ae6a57c..0000000000 --- a/sca-java-2.x/trunk/itest/scaclient-api/src/main/resources/Helloworld.composite +++ /dev/null @@ -1,29 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" - targetNamespace="http://itest" - name="Helloworld"> - - <component name="HelloworldComponent"> - <implementation.java class="itest.HelloworldServiceImpl"/> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/scaclient-api/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/scaclient-api/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 56e127b539..0000000000 --- a/sca-java-2.x/trunk/itest/scaclient-api/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:itest="http://itest"> - <deployable composite="itest:Helloworld"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/scaclient-api/src/test/java/test/scaclient/SCAClientTestCase.java b/sca-java-2.x/trunk/itest/scaclient-api/src/test/java/test/scaclient/SCAClientTestCase.java deleted file mode 100644 index c64350eb2a..0000000000 --- a/sca-java-2.x/trunk/itest/scaclient-api/src/test/java/test/scaclient/SCAClientTestCase.java +++ /dev/null @@ -1,125 +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 test.scaclient; - -import itest.HelloworldService; -import itest.RemoteHelloworldService; - -import java.net.URI; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.Test; -import org.oasisopen.sca.NoSuchDomainException; -import org.oasisopen.sca.NoSuchServiceException; -import org.oasisopen.sca.client.SCAClientFactory; - -/** - * Test SCADomain.newInstance and invocation of a service. - * - * @version $Rev$ $Date$ - */ -public class SCAClientTestCase extends TestCase { - - private Node node; - - @Test - public void testDefault() throws Exception { - - node = NodeFactory.getInstance().createNode((String)null, new String[] {"target/classes"}); - node.start(); - - SCAClientFactory clientFactory = SCAClientFactory.newInstance(URI.create("default")); - HelloworldService service = clientFactory.getService(HelloworldService.class, "HelloworldComponent/HelloworldService"); - assertEquals("Hello petra", service.sayHello("petra")); - - RemoteHelloworldService remoteService = clientFactory.getService(RemoteHelloworldService.class, "HelloworldComponent/RemoteHelloworldService"); - assertEquals("Hello petra", remoteService.sayHelloRemote("petra")); - - } - - @Test - public void testExplicit() throws Exception { - node = NodeFactory.getInstance().createNode(URI.create("myFooDomain"), new String[] {"target/classes"}); - node.start(); - - SCAClientFactory clientFactory = SCAClientFactory.newInstance(URI.create("myFooDomain")); - HelloworldService service = clientFactory.getService(HelloworldService.class, "HelloworldComponent/HelloworldService"); - assertEquals("Hello petra", service.sayHello("petra")); - - RemoteHelloworldService remoteService = clientFactory.getService(RemoteHelloworldService.class, "HelloworldComponent/RemoteHelloworldService"); - assertEquals("Hello petra", remoteService.sayHelloRemote("petra")); - assertEquals("Hello petra", service.sayHello("petra")); - } - -// @Test -// public void testWithoutServiceName() throws Exception { -// node = NodeFactory.getInstance().createNode(URI.create("myFooDomain"), new String[] {"target/classes"}); -// node.start(); -// -// SCAClientFactory clientFactory = SCAClientFactory.newInstance(URI.create("myFooDomain")); -// HelloworldService service = clientFactory.getService(HelloworldService.class, "HelloworldComponent"); -// assertEquals("Hello petra", service.sayHello("petra")); -// } - - @Test - public void testWithBadServiceName() throws Exception { - node = NodeFactory.getInstance().createNode(URI.create("myFooDomain"), new String[] {"target/classes"}); - node.start(); - - SCAClientFactory clientFactory = SCAClientFactory.newInstance(URI.create("myFooDomain")); - try { - clientFactory.getService(HelloworldService.class, "HelloworldComponent/foo"); - fail(); - } catch (NoSuchServiceException e) { - // expected - } - } - - @Test - public void testWithBadDomainName() throws Exception { - node = NodeFactory.getInstance().createNode(URI.create("myFooDomain"), new String[] {"target/classes"}); - node.start(); - - try { - SCAClientFactory clientFactory = SCAClientFactory.newInstance(URI.create("someBadDomainName")); - fail(); - } catch (NoSuchDomainException e) { - // expected - } - } - - // @Test @Ignore -// public void testHTTPURI() throws Exception { -// node = NodeFactory.getInstance().createNode(URI.create("http://defaultDomain"), new String[] {"target/classes"}); -// node.start(); -// -// HelloworldService service = SCAClientFactory.newInstance(URI.create("http://defaultDomain")).getService(HelloworldService.class, "HelloworldComponent"); -// assertEquals("Hello petra", service.sayHello("petra")); -// } - - @Override - protected void tearDown() throws Exception { - node.stop(); - } - -} diff --git a/sca-java-2.x/trunk/itest/scdl/pom.xml b/sca-java-2.x/trunk/itest/scdl/pom.xml deleted file mode 100644 index 54e1c132ec..0000000000 --- a/sca-java-2.x/trunk/itest/scdl/pom.xml +++ /dev/null @@ -1,79 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-scdl</artifactId>
- <name>Apache Tuscany SCA iTest SCDL</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-deployment</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jsonp</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-rmi</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jms</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <!-- Copy all the dependencies so the test can verify only the expected ones get dragged in -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy</id>
- <phase>compile</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/sca-java-2.x/trunk/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java b/sca-java-2.x/trunk/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java deleted file mode 100644 index 82aa047c2d..0000000000 --- a/sca-java-2.x/trunk/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ContributionTestCase.java +++ /dev/null @@ -1,80 +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.itest.scdl;
-
-import java.io.File;
-import java.net.URL;
-import java.util.Arrays;
-import java.util.List;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.Implementation;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.deployment.DefaultDeployer;
-import org.apache.tuscany.sca.deployment.Deployer;
-import org.apache.tuscany.sca.implementation.java.JavaImplementation;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Test case for reading and writing SCDL
- */
-public class ContributionTestCase {
-
- @Test
- public void testRead() throws Exception {
- Deployer deployer = new DefaultDeployer();
- File file = new File("../../samples/learning-more/binding-sca/calculator-contribution/target/sample-contribution-binding-sca-calculator.jar");
- URL url = file.toURI().toURL();
- Monitor monitor = deployer.createMonitor();
- Contribution contribution = deployer.loadContribution(url.toURI(), url, monitor);
- deployer.build(Arrays.asList(contribution), Arrays.asList(contribution), null, monitor);
-
- // Ferkle around in the contribution verifying it looks as expected
- Assert.assertNotNull(contribution);
- List<Composite> deployables = contribution.getDeployables();
- Assert.assertEquals(2, deployables.size());
- Composite calculatorComposte = deployables.get(0);
- Assert.assertEquals("Calculator", calculatorComposte.getName().getLocalPart());
- Assert.assertEquals(5, calculatorComposte.getComponents().size());
- Component calcComp = calculatorComposte.getComponent("CalculatorServiceComponent");
- Assert.assertNotNull(calcComp);
- Assert.assertEquals(4, calcComp.getReferences().size());
- Reference ref = calcComp.getReference("addService");
- Assert.assertEquals("AddServiceComponent", ref.getTargets().get(0).getName());
- Implementation impl = calcComp.getImplementation();
- Assert.assertTrue(impl instanceof JavaImplementation);
- Assert.assertEquals("calculator.CalculatorServiceImpl", ((JavaImplementation)impl).getJavaClass().getName());
- }
-
- @Before
- public void setUp() throws Exception {
- }
-
- @After
- public void tearDown() throws Exception {
- }
-}
diff --git a/sca-java-2.x/trunk/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/SCDLTestCase.java b/sca-java-2.x/trunk/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/SCDLTestCase.java deleted file mode 100644 index 7dd52c5942..0000000000 --- a/sca-java-2.x/trunk/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/SCDLTestCase.java +++ /dev/null @@ -1,109 +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.itest.scdl;
-
-import java.net.URI;
-import java.net.URL;
-import java.util.Arrays;
-
-import javax.xml.stream.XMLStreamException;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.binding.jms.JMSBinding;
-import org.apache.tuscany.sca.binding.jsonp.JSONPBinding;
-import org.apache.tuscany.sca.binding.rmi.RMIBinding;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.deployment.Deployer;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.junit.Test;
-
-/**
- * Test case for reading and writing a composite
- */
-public class SCDLTestCase {
-
- @Test
- public void testRead() throws ContributionReadException, XMLStreamException {
- ExtensionPointRegistry registry = new DefaultExtensionPointRegistry();
- Deployer deployer = registry.getExtensionPoint(UtilityExtensionPoint.class).getUtility(Deployer.class);
-
- URL r = getClass().getResource("/test.composite");
- Composite composite = deployer.loadXMLDocument(r, null);
- Assert.assertNotNull(composite);
-
- Component JavaComp = composite.getComponent("JavaComponent");
- Assert.assertNotNull(JavaComp);
-
- Component bpelComp = composite.getComponent("BPELComponent");
- Assert.assertNotNull(bpelComp);
-
- Service jsonpService = composite.getService("JSONPService");
- Assert.assertNotNull(jsonpService);
- Assert.assertEquals(1, jsonpService.getBindings().size());
- JSONPBinding jsonpBinding = jsonpService.getBinding(JSONPBinding.class);
- Assert.assertNotNull(jsonpBinding);
-
- Service jmsService = composite.getService("JMSService");
- Assert.assertNotNull(jmsService);
- Assert.assertEquals(1, jmsService.getBindings().size());
- JMSBinding jmsBinding = jmsService.getBinding(JMSBinding.class);
- Assert.assertNotNull(jmsBinding);
-
- Service rmiService = composite.getService("RMIService");
- Assert.assertNotNull(rmiService);
- Assert.assertEquals(1, rmiService.getBindings().size());
- RMIBinding rmiBinding = rmiService.getBinding(RMIBinding.class);
- Assert.assertNotNull(rmiBinding);
-
-// TODO: WS binding drags in entire runtime
-// Service wsService = composite.getService("WSService");
-// Assert.assertNotNull(wsService);
-// Assert.assertEquals(1, wsService.getBindings().size());
-// WSBinding wsBinding = wsService.getBinding(WSBinding.class);
-// Assert.assertNotNull(wsBinding);
- }
-
- @Test
- public void testBuild() throws Exception {
- ExtensionPointRegistry registry = new DefaultExtensionPointRegistry();
- Deployer deployer = registry.getExtensionPoint(UtilityExtensionPoint.class).getUtility(Deployer.class);
- URL r = getClass().getResource("/test.composite");
- r = new URL(r, "../");
- Monitor monitor = deployer.createMonitor();
- Contribution contribution = deployer.loadContribution(URI.create("c1"), r, monitor);
- deployer.build(Arrays.asList(contribution), Arrays.asList(contribution), null, monitor);
- int i = 0;
- for (Problem p : monitor.getProblems()) {
- System.err.println(i + ": " + p);
- i++;
- }
- Assert.assertTrue(i > 0);
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java b/sca-java-2.x/trunk/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.java deleted file mode 100644 index 7923492776..0000000000 --- a/sca-java-2.x/trunk/itest/scdl/src/test/java/org/apache/tuscany/sca/itest/scdl/ValidateDependenciesTestCase.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.itest.scdl;
-
-import java.io.File;
-
-import junit.framework.Assert;
-
-import org.junit.Test;
-
-/**
- * Test case for verifying only SCDL jars are needed
- *
- * Uses maven-dependency-plugin config in the pom.xml
- *
- * Current required jars are:
- *
- * activation-1.1.jar
- * asm-3.1.jar
- * geronimo-stax-api_1.0_spec-1.0.1.jar
- * jaxb-api-2.1.jar
- * jaxb-impl-2.1.12.jar
- * jaxws-api-2.1.jar
- * jsr181-api-1.0-MR1.jar
- * jsr250-api-1.0.jar
- * junit-4.8.1.jar
- * tuscany-assembly-2.0-SNAPSHOT.jar
- * tuscany-assembly-xml-2.0-SNAPSHOT.jar
- * tuscany-assembly-xsd-2.0-SNAPSHOT.jar
- * tuscany-binding-http-2.0-SNAPSHOT.jar
- * tuscany-binding-jms-2.0-SNAPSHOT.jar
- * tuscany-binding-jsonp-2.0-SNAPSHOT.jar
- * tuscany-binding-rmi-2.0-SNAPSHOT.jar
- * tuscany-binding-ws-2.0-SNAPSHOT.jar
- * tuscany-builder-2.0-SNAPSHOT.jar
- * tuscany-common-java-2.0-SNAPSHOT.jar
- * tuscany-common-xml-2.0-SNAPSHOT.jar
- * tuscany-contribution-2.0-SNAPSHOT.jar
- * tuscany-core-spi-2.0-SNAPSHOT.jar
- * tuscany-databinding-2.0-SNAPSHOT.jar
- * tuscany-databinding-jaxb-2.0-SNAPSHOT.jar
- * tuscany-deployment-2.0-SNAPSHOT.jar
- * tuscany-extensibility-2.0-SNAPSHOT.jar
- * tuscany-implementation-java-2.0-SNAPSHOT.jar
- * tuscany-interface-java-2.0-SNAPSHOT.jar
- * tuscany-interface-java-jaxws-2.0-SNAPSHOT.jar
- * tuscany-interface-wsdl-2.0-SNAPSHOT.jar
- * tuscany-monitor-2.0-SNAPSHOT.jar
- * tuscany-sca-api-2.0-SNAPSHOT.jar
- * tuscany-xsd-2.0-SNAPSHOT.jar
- * wsdl4j-1.6.2.jar
- * wstx-asl-3.2.4.jar
- * XmlSchema-1.4.3.jar
- *
- * TODO: WS binding drags in all runtime
- */
-public class ValidateDependenciesTestCase {
-
- @Test
- public void countDependencies() {
-
- File dependenciesDir = new File("target/dependency");
- Assert.assertTrue(dependenciesDir.exists());
-
- File[] dependencyFiles = dependenciesDir.listFiles();
- Assert.assertEquals(36, dependencyFiles.length);
- }
-}
diff --git a/sca-java-2.x/trunk/itest/scdl/src/test/resources/test.composite b/sca-java-2.x/trunk/itest/scdl/src/test/resources/test.composite deleted file mode 100644 index c0bb2bbc40..0000000000 --- a/sca-java-2.x/trunk/itest/scdl/src/test/resources/test.composite +++ /dev/null @@ -1,51 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://itest"
- xmlns:hns="http://tuscany.apache.org/implementation/bpel/example/helloworld"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- name="SCDLTest">
-
- <component name="JavaComponent">
- <implementation.java class="itest.FooImpl"/>
- </component>
-
- <component name="BPELComponent">
- <implementation.bpel process="hns:HelloWorld"/>
- </component>
-
- <service name="JSONPService" promote="JavaComponent">
- <tuscany:binding.jsonp/>
- </service>
-
- <service name="JMSService" promote="JavaComponent">
- <binding.jms/>
- </service>
-
- <service name="RMIService" promote="JavaComponent">
- <tuscany:binding.rmi/>
- </service>
-
-<!-- TODO: leave out WS binding for now as it drags in entire runtime
- <service name="WSService" promote="JavaComponent">
- <binding.ws/>
- </service>
--->
-</composite>
diff --git a/sca-java-2.x/trunk/itest/scopes/pom.xml b/sca-java-2.x/trunk/itest/scopes/pom.xml deleted file mode 100644 index 4ba97f3062..0000000000 --- a/sca-java-2.x/trunk/itest/scopes/pom.xml +++ /dev/null @@ -1,54 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <name>Apache Tuscany SCA iTest Scopes</name> - <artifactId>itest-scopes</artifactId> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - </dependencies> - -</project> diff --git a/sca-java-2.x/trunk/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java b/sca-java-2.x/trunk/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java deleted file mode 100644 index 208ac3ba44..0000000000 --- a/sca-java-2.x/trunk/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java +++ /dev/null @@ -1,46 +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.itest.scopes; - -import org.oasisopen.sca.annotation.Scope; - -/** - * Test Composite scope - */ -@Scope("COMPOSITE") -public class CompositeScopeStateVerifierImpl implements StateVerifier { - - // State data for this module (composite). - // In order to support thread-based state verification, - // the module state needs to be a ThreadLocal. - ThreadLocal<Integer> moduleState; - - public CompositeScopeStateVerifierImpl() { - moduleState = new ThreadLocal<Integer>(); - } - - public void setState(int i) { - moduleState.set(i); - } - - public boolean checkState(int i) { - return (moduleState.get() == i); - } - -} diff --git a/sca-java-2.x/trunk/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java b/sca-java-2.x/trunk/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java deleted file mode 100644 index e6bf08ccf2..0000000000 --- a/sca-java-2.x/trunk/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java +++ /dev/null @@ -1,25 +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.itest.scopes; - -public interface StateVerifier { - void setState(int i); - - boolean checkState(int i); -} diff --git a/sca-java-2.x/trunk/itest/scopes/src/main/resources/scopes.composite b/sca-java-2.x/trunk/itest/scopes/src/main/resources/scopes.composite deleted file mode 100644 index ed67bf5953..0000000000 --- a/sca-java-2.x/trunk/itest/scopes/src/main/resources/scopes.composite +++ /dev/null @@ -1,29 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://Scopes" - name="Scopes"> - - <!-- Components used to test scopes. --> - <component name="ModuleScopeComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.scopes.CompositeScopeStateVerifierImpl"/> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java b/sca-java-2.x/trunk/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java deleted file mode 100644 index 594bdd5038..0000000000 --- a/sca-java-2.x/trunk/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java +++ /dev/null @@ -1,89 +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.test; - -import static org.junit.Assert.fail; - -import org.apache.tuscany.sca.itest.scopes.StateVerifier; -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -public class ScopeTestCase { - - /** - * Number of threads to drive each scope container. - */ - private static final int NUM_THREADS = 4; - - /** - * Number of iterations per thread. - */ - private static final int ITERATIONS = 200; - - private Node node; - - @Before - public void setUp() throws Exception { - String location = ContributionLocationHelper.getContributionLocation("scopes.composite"); - node = NodeFactory.newInstance().createNode("scopes.composite", new Contribution("c1", location)); - node.start(); - } - - @After - public void tearDown() throws Exception { - node.stop(); - } - - @Test - public void testScopes() throws InterruptedException { - - Thread[] moduleScopeThreadTable = new Thread[NUM_THREADS]; - - for (int i = 0; i < NUM_THREADS; i++) { - moduleScopeThreadTable[i] = new ModuleScopeTestThread(); - } - for (int j = 0; j < NUM_THREADS; j++) { - moduleScopeThreadTable[j].start(); - } - for (int k = 0; k < NUM_THREADS; k++) { - moduleScopeThreadTable[k].join(); - } - } - - private class ModuleScopeTestThread extends Thread { - - public void run() { - StateVerifier moduleScopeService = node.getService(StateVerifier.class, "ModuleScopeComponent"); - for (int i = 1; i <= ITERATIONS; i++) { - moduleScopeService.setState(i); - if (!moduleScopeService.checkState(i)) { - fail("The module scope service lost its state on iteration " + i); - } - } - } - } - - - -} diff --git a/sca-java-2.x/trunk/itest/service-reference/pom.xml b/sca-java-2.x/trunk/itest/service-reference/pom.xml deleted file mode 100644 index ffd8d14fe6..0000000000 --- a/sca-java-2.x/trunk/itest/service-reference/pom.xml +++ /dev/null @@ -1,66 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-service-reference</artifactId> - <name>Apache Tuscany SCA iTest ServiceReference</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-jetty</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - </dependencies> -</project> diff --git a/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/AComponent.java b/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/AComponent.java deleted file mode 100644 index 8b5cf4d29a..0000000000 --- a/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/AComponent.java +++ /dev/null @@ -1,39 +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.itest.serviceref; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface AComponent { - String foo(); - - String fooB(); - String fooB1(); - - String fooC(); - String fooC1(); - - String fooStringD(); - String fooD(); - - String fooBC(); - - String invokeDReference(); -} diff --git a/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/AComponentImpl.java b/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/AComponentImpl.java deleted file mode 100644 index 3f68ac828a..0000000000 --- a/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/AComponentImpl.java +++ /dev/null @@ -1,112 +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.itest.serviceref; - -import java.io.ByteArrayOutputStream; -import java.io.ObjectOutputStream; - -import org.oasisopen.sca.ComponentContext; -import org.oasisopen.sca.ServiceReference; -import org.oasisopen.sca.annotation.Context; -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Service; - -@Service(AComponent.class) -public class AComponentImpl implements AComponent { - - @Context - protected ComponentContext componentContext; - - @Reference(name = "bReference") - protected BComponent b; - - @Reference - protected CComponent cReference; - - @Reference - protected ServiceReference<CComponent> cServiceReference; - - @Reference(required=false) - protected DComponent dReference; - - protected DComponent dReference1; - - @Reference(name = "dReference1") - public void setDReference(DComponent dReference) { - this.dReference1 = dReference; - } - - public String foo() { - return "AComponent"; - } - - public String fooB() { - return b.foo(); - } - - public String fooB1() { - ServiceReference<BComponent> bRef = componentContext.cast(b); - return bRef.getService().foo(); - } - - public String fooC() { - return cReference.foo(); - } - - public String fooC1() { - return cServiceReference.getService().foo(); - } - - public String fooBC() { - ServiceReference<CComponent> cReference = componentContext.getServiceReference(CComponent.class, "cReference"); - return b.fooC(cReference); - } - - public String fooD() { - ServiceReference<AComponent> aReference = componentContext.createSelfReference(AComponent.class); - return dReference1.foo(aReference); - } - - /** - * A test case to work out what needs to be done in a transformer to get the - * CallableReference across the wire. Left here for interest in case anyone - * is looking for how to get at the innards of CallableReferences - */ - public String fooStringD() { - ServiceReference<AComponent> aReference = componentContext.createSelfReference(AComponent.class); - ByteArrayOutputStream bos = null; - - try { - bos = new ByteArrayOutputStream(); - ObjectOutputStream oos = new ObjectOutputStream(bos); - oos.writeObject(aReference); - } catch (Exception ex) { - System.out.println(ex.toString()); - return null; - } - - String aReferenceString = Base64Binary.encode(bos.toByteArray()); - return dReference1.fooString(aReferenceString); - } - - public String invokeDReference() { - return dReference.foo(null); - } - -} diff --git a/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/BComponent.java b/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/BComponent.java deleted file mode 100644 index 18242cd594..0000000000 --- a/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/BComponent.java +++ /dev/null @@ -1,31 +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.itest.serviceref; - -import org.oasisopen.sca.ServiceReference; -import org.oasisopen.sca.annotation.Remotable; - - -@Remotable -public interface BComponent { - - String foo(); - - String fooC(ServiceReference<CComponent> cComponent); -} diff --git a/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/BComponentImpl.java b/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/BComponentImpl.java deleted file mode 100644 index dd143df036..0000000000 --- a/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/BComponentImpl.java +++ /dev/null @@ -1,38 +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.itest.serviceref; - -import org.oasisopen.sca.ServiceReference; -import org.oasisopen.sca.annotation.Service; - -@Service(BComponent.class) -public class BComponentImpl implements BComponent { - - public BComponentImpl() { - } - - public String foo() { - return "BComponent"; - } - - public String fooC(ServiceReference<CComponent> cReference) { - return "B" + cReference.getService().foo(); - } - -} diff --git a/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/Base64Binary.java b/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/Base64Binary.java deleted file mode 100644 index fb436ae10c..0000000000 --- a/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/Base64Binary.java +++ /dev/null @@ -1,297 +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.itest.serviceref; - -import java.io.IOException; -import java.io.OutputStream; -import java.io.Writer; - -/** - * - */ - -public final class Base64Binary { - private static final char[] S_BASE64CHAR = - {'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', - 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', - 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/'}; - - private static final char S_BASE64PAD = '='; - - private static final byte[] S_DECODETABLE = new byte[128]; - - static { - for (int i = 0; i < S_DECODETABLE.length; i++) { - S_DECODETABLE[i] = Byte.MAX_VALUE; // 127 - } - for (int i = 0; i < S_BASE64CHAR.length; i++) { - // 0 to 63 - S_DECODETABLE[S_BASE64CHAR[i]] = (byte)i; - } - } - - private Base64Binary() { - } - - /** - * - */ - public static byte[] decode(char[] data, int off, int len) { - char[] ibuf = new char[4]; - int ibufcount = 0; - byte[] obuf = new byte[len / 4 * 3 + 3]; - int obufcount = 0; - for (int i = off; i < off + len; i++) { - char ch = data[i]; - if (ch == S_BASE64PAD || ch < S_DECODETABLE.length && S_DECODETABLE[ch] != Byte.MAX_VALUE) { - ibuf[ibufcount++] = ch; - if (ibufcount == ibuf.length) { - ibufcount = 0; - obufcount += decode0(ibuf, obuf, obufcount); - } - } - } - if (obufcount == obuf.length) { - return obuf; - } - byte[] ret = new byte[obufcount]; - System.arraycopy(obuf, 0, ret, 0, obufcount); - return ret; - } - - /** - * - */ - public static void decode(char[] data, int off, int len, OutputStream ostream) throws IOException { - char[] ibuf = new char[4]; - int ibufcount = 0; - byte[] obuf = new byte[3]; - for (int i = off; i < off + len; i++) { - char ch = data[i]; - if (ch == S_BASE64PAD || ch < S_DECODETABLE.length && S_DECODETABLE[ch] != Byte.MAX_VALUE) { - ibuf[ibufcount++] = ch; - if (ibufcount == ibuf.length) { - ibufcount = 0; - int obufcount = decode0(ibuf, obuf, 0); - ostream.write(obuf, 0, obufcount); - } - } - } - } - - /** - * - */ - public static byte[] decode(String data) { - char[] ibuf = new char[4]; - int ibufcount = 0; - byte[] obuf = new byte[data.length() / 4 * 3 + 3]; - int obufcount = 0; - for (int i = 0; i < data.length(); i++) { - char ch = data.charAt(i); - if (ch == S_BASE64PAD || ch < S_DECODETABLE.length && S_DECODETABLE[ch] != Byte.MAX_VALUE) { - ibuf[ibufcount++] = ch; - if (ibufcount == ibuf.length) { - ibufcount = 0; - obufcount += decode0(ibuf, obuf, obufcount); - } - } - } - if (obufcount == obuf.length) { - return obuf; - } - byte[] ret = new byte[obufcount]; - System.arraycopy(obuf, 0, ret, 0, obufcount); - return ret; - } - - /** - * - */ - public static void decode(String data, OutputStream ostream) throws IOException { - char[] ibuf = new char[4]; - int ibufcount = 0; - byte[] obuf = new byte[3]; - for (int i = 0; i < data.length(); i++) { - char ch = data.charAt(i); - if (ch == S_BASE64PAD || ch < S_DECODETABLE.length && S_DECODETABLE[ch] != Byte.MAX_VALUE) { - ibuf[ibufcount++] = ch; - if (ibufcount == ibuf.length) { - ibufcount = 0; - int obufcount = decode0(ibuf, obuf, 0); - ostream.write(obuf, 0, obufcount); - } - } - } - } - - private static int decode0(char[] ibuf, byte[] obuf, int index) { - int wp = index; - int outlen = 3; - if (ibuf[3] == S_BASE64PAD) { - outlen = 2; - } - if (ibuf[2] == S_BASE64PAD) { - outlen = 1; - } - int b0 = S_DECODETABLE[ibuf[0]]; - int b1 = S_DECODETABLE[ibuf[1]]; - int b2 = S_DECODETABLE[ibuf[2]]; - int b3 = S_DECODETABLE[ibuf[3]]; - switch (outlen) { - case 1: - obuf[wp] = (byte)(b0 << 2 & 0xfc | b1 >> 4 & 0x3); - return 1; - case 2: - obuf[wp++] = (byte)(b0 << 2 & 0xfc | b1 >> 4 & 0x3); - obuf[wp] = (byte)(b1 << 4 & 0xf0 | b2 >> 2 & 0xf); - return 2; - case 3: - obuf[wp++] = (byte)(b0 << 2 & 0xfc | b1 >> 4 & 0x3); - obuf[wp++] = (byte)(b1 << 4 & 0xf0 | b2 >> 2 & 0xf); - obuf[wp] = (byte)(b2 << 6 & 0xc0 | b3 & 0x3f); - return 3; - default: - throw new IllegalArgumentException("The character sequence is not base64 encoded."); - } - } - - /** - * Returns base64 representation of specified byte array. - */ - public static String encode(byte[] data) { - return encode(data, 0, data.length); - } - - /** - * Returns base64 representation of specified byte array. - */ - public static String encode(byte[] data, int off, int len) { - if (len <= 0) { - return ""; - } - char[] out = new char[len / 3 * 4 + 4]; - int rindex = off; - int windex = 0; - int rest = len - off; - while (rest >= 3) { - int i = ((data[rindex] & 0xff) << 16) + ((data[rindex + 1] & 0xff) << 8) + (data[rindex + 2] & 0xff); - out[windex++] = S_BASE64CHAR[i >> 18]; - out[windex++] = S_BASE64CHAR[(i >> 12) & 0x3f]; - out[windex++] = S_BASE64CHAR[(i >> 6) & 0x3f]; - out[windex++] = S_BASE64CHAR[i & 0x3f]; - rindex += 3; - rest -= 3; - } - if (rest == 1) { - int i = data[rindex] & 0xff; - out[windex++] = S_BASE64CHAR[i >> 2]; - out[windex++] = S_BASE64CHAR[(i << 4) & 0x3f]; - out[windex++] = S_BASE64PAD; - out[windex++] = S_BASE64PAD; - } else if (rest == 2) { - int i = ((data[rindex] & 0xff) << 8) + (data[rindex + 1] & 0xff); - out[windex++] = S_BASE64CHAR[i >> 10]; - out[windex++] = S_BASE64CHAR[(i >> 4) & 0x3f]; - out[windex++] = S_BASE64CHAR[(i << 2) & 0x3f]; - out[windex++] = S_BASE64PAD; - } - return new String(out, 0, windex); - } - - /** - * Outputs base64 representation of the specified byte array to a byte stream. - */ - public static void encode(byte[] data, int off, int len, OutputStream ostream) throws IOException { - if (len <= 0) { - return; - } - byte[] out = new byte[4]; - int rindex = off; - int rest = len - off; - while (rest >= 3) { - int i = ((data[rindex] & 0xff) << 16) + ((data[rindex + 1] & 0xff) << 8) + (data[rindex + 2] & 0xff); - out[0] = (byte)S_BASE64CHAR[i >> 18]; - out[1] = (byte)S_BASE64CHAR[(i >> 12) & 0x3f]; - out[2] = (byte)S_BASE64CHAR[(i >> 6) & 0x3f]; - out[3] = (byte)S_BASE64CHAR[i & 0x3f]; - ostream.write(out, 0, 4); - rindex += 3; - rest -= 3; - } - if (rest == 1) { - int i = data[rindex] & 0xff; - out[0] = (byte)S_BASE64CHAR[i >> 2]; - out[1] = (byte)S_BASE64CHAR[(i << 4) & 0x3f]; - out[2] = (byte)S_BASE64PAD; - out[3] = (byte)S_BASE64PAD; - ostream.write(out, 0, 4); - } else if (rest == 2) { - int i = ((data[rindex] & 0xff) << 8) + (data[rindex + 1] & 0xff); - out[0] = (byte)S_BASE64CHAR[i >> 10]; - out[1] = (byte)S_BASE64CHAR[(i >> 4) & 0x3f]; - out[2] = (byte)S_BASE64CHAR[(i << 2) & 0x3f]; - out[3] = (byte)S_BASE64PAD; - ostream.write(out, 0, 4); - } - } - - /** - * Outputs base64 representation of the specified byte array to a character stream. - */ - public static void encode(byte[] data, int off, int len, Writer writer) throws IOException { - if (len <= 0) { - return; - } - char[] out = new char[4]; - int rindex = off; - int rest = len - off; - int output = 0; - while (rest >= 3) { - int i = ((data[rindex] & 0xff) << 16) + ((data[rindex + 1] & 0xff) << 8) + (data[rindex + 2] & 0xff); - out[0] = S_BASE64CHAR[i >> 18]; - out[1] = S_BASE64CHAR[(i >> 12) & 0x3f]; - out[2] = S_BASE64CHAR[(i >> 6) & 0x3f]; - out[3] = S_BASE64CHAR[i & 0x3f]; - writer.write(out, 0, 4); - rindex += 3; - rest -= 3; - output += 4; - if (output % 76 == 0) { - writer.write("\n"); - } - } - if (rest == 1) { - int i = data[rindex] & 0xff; - out[0] = S_BASE64CHAR[i >> 2]; - out[1] = S_BASE64CHAR[(i << 4) & 0x3f]; - out[2] = S_BASE64PAD; - out[3] = S_BASE64PAD; - writer.write(out, 0, 4); - } else if (rest == 2) { - int i = ((data[rindex] & 0xff) << 8) + (data[rindex + 1] & 0xff); - out[0] = S_BASE64CHAR[i >> 10]; - out[1] = S_BASE64CHAR[(i >> 4) & 0x3f]; - out[2] = S_BASE64CHAR[(i << 2) & 0x3f]; - out[3] = S_BASE64PAD; - writer.write(out, 0, 4); - } - } -} diff --git a/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/CComponent.java b/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/CComponent.java deleted file mode 100644 index fc15b632d2..0000000000 --- a/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/CComponent.java +++ /dev/null @@ -1,27 +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.itest.serviceref; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface CComponent { - - String foo(); -} diff --git a/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/CComponentImpl.java b/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/CComponentImpl.java deleted file mode 100644 index 276093b69f..0000000000 --- a/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/CComponentImpl.java +++ /dev/null @@ -1,30 +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.itest.serviceref; - -import org.oasisopen.sca.annotation.Service; - -@Service(CComponent.class) -public class CComponentImpl implements CComponent { - - public String foo() { - return "CComponent"; - } - -} diff --git a/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/DComponent.java b/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/DComponent.java deleted file mode 100644 index 84e15b5eb2..0000000000 --- a/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/DComponent.java +++ /dev/null @@ -1,30 +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.itest.serviceref; - -import org.oasisopen.sca.ServiceReference; -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface DComponent { - - String foo(ServiceReference<AComponent> aReference); - - String fooString(String aReferenceString); -} diff --git a/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/DComponentImpl.java b/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/DComponentImpl.java deleted file mode 100644 index db99472385..0000000000 --- a/sca-java-2.x/trunk/itest/service-reference/src/main/java/org/apache/tuscany/sca/itest/serviceref/DComponentImpl.java +++ /dev/null @@ -1,64 +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.itest.serviceref; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; - -import org.oasisopen.sca.RequestContext; -import org.oasisopen.sca.ServiceReference; -import org.oasisopen.sca.annotation.Context; -import org.oasisopen.sca.annotation.Service; - -@Service(DComponent.class) -public class DComponentImpl implements DComponent { - - @Context - protected RequestContext requestContext; - - public String foo(ServiceReference<AComponent> aReference) { - try { - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - ObjectOutputStream oos = new ObjectOutputStream(bos); - oos.writeObject(aReference); - ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(bos.toByteArray())); - Object obj = ois.readObject(); - aReference = (ServiceReference<AComponent>) obj; - } catch (Exception e) { - e.printStackTrace(); - } - System.out.println("Invoking service: " + requestContext.getServiceName()); - return "D" + aReference.getService().foo(); - } - - public String fooString(String aReferenceString) { - ServiceReference<AComponent> aReference = null; - try { - ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(Base64Binary.decode(aReferenceString))); - Object obj = ois.readObject(); - aReference = (ServiceReference<AComponent>) obj; - } catch (Exception e) { - e.printStackTrace(); - } - System.out.println("Invoking service: " + requestContext.getServiceName()); - return "D" + aReference.getService().foo(); - } -} diff --git a/sca-java-2.x/trunk/itest/service-reference/src/main/resources/nodeA/CompositeA.composite b/sca-java-2.x/trunk/itest/service-reference/src/main/resources/nodeA/CompositeA.composite deleted file mode 100644 index 9a1fa0a7f7..0000000000 --- a/sca-java-2.x/trunk/itest/service-reference/src/main/resources/nodeA/CompositeA.composite +++ /dev/null @@ -1,44 +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 - * 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://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:foo="http://foo" - targetNamespace="http://foo" - name="CompositeA" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - - <component name="AComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.serviceref.AComponentImpl" /> - <service name="AComponent"> - <binding.ws uri="http://localhost:8084/AComponent"/> - </service> - <reference name="bReference"> - <binding.ws uri="http://localhost:8085/BComponent" /> - </reference> - <reference name="cReference"> - <binding.ws uri="http://localhost:8085/CComponent" /> - </reference> - <reference name="cServiceReference"> - <binding.ws uri="http://localhost:8085/CComponent" /> - </reference> - <reference name="dReference1"> - <binding.ws uri="http://localhost:8085/DComponent" /> - </reference> - </component> - -</composite>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/service-reference/src/main/resources/nodeB/CompositeB.composite b/sca-java-2.x/trunk/itest/service-reference/src/main/resources/nodeB/CompositeB.composite deleted file mode 100644 index a72f5949ed..0000000000 --- a/sca-java-2.x/trunk/itest/service-reference/src/main/resources/nodeB/CompositeB.composite +++ /dev/null @@ -1,46 +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 - * 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://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:foo="http://foo" - targetNamespace="http://foo" - name="CompositeB" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - - <component name="BComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.serviceref.BComponentImpl" /> - <service name="BComponent"> - <binding.ws uri="http://localhost:8085/BComponent"/> - </service> - </component> - - <component name="CComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.serviceref.CComponentImpl" /> - <service name="CComponent"> - <binding.ws uri="http://localhost:8085/CComponent"/> - </service> - </component> - - <component name="DComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.serviceref.DComponentImpl" /> - <service name="DComponent"> - <binding.ws uri="http://localhost:8085/DComponent"/> - </service> - </component> - -</composite>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/service-reference/src/main/resources/servicereference/ServiceReferenceTest.composite b/sca-java-2.x/trunk/itest/service-reference/src/main/resources/servicereference/ServiceReferenceTest.composite deleted file mode 100644 index bc5ede7605..0000000000 --- a/sca-java-2.x/trunk/itest/service-reference/src/main/resources/servicereference/ServiceReferenceTest.composite +++ /dev/null @@ -1,48 +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 - * 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://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:foo="http://foo" - targetNamespace="http://foo" - name="InnerReferencesTest" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - - <service name="AComponent" promote="AComponent"> - <interface.java interface="org.apache.tuscany.sca.itest.serviceref.AComponent" /> - </service> - - <component name="AComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.serviceref.AComponentImpl" /> - <reference name="bReference" target="BComponent" /> - <reference name="cReference" target="CComponent" /> - <reference name="cServiceReference" target="CComponent" /> - <reference name="dReference1" target="DComponent" /> - </component> - - <component name="BComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.serviceref.BComponentImpl" /> - </component> - - <component name="CComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.serviceref.CComponentImpl" /> - </component> - - <component name="DComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.serviceref.DComponentImpl" /> - </component> -</composite>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/service-reference/src/test/java/org/apache/tuscany/sca/itest/serviceref/CallableReferenceRemoteTestCase.java b/sca-java-2.x/trunk/itest/service-reference/src/test/java/org/apache/tuscany/sca/itest/serviceref/CallableReferenceRemoteTestCase.java deleted file mode 100644 index 843afe207c..0000000000 --- a/sca-java-2.x/trunk/itest/service-reference/src/test/java/org/apache/tuscany/sca/itest/serviceref/CallableReferenceRemoteTestCase.java +++ /dev/null @@ -1,139 +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.itest.serviceref; - -import static junit.framework.Assert.assertEquals; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.itest.serviceref.AComponent; -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; - - -/** - * Runs a distributed domain in a single VM by using and in memory - * implementation of the distributed domain - */ -public class CallableReferenceRemoteTestCase { - - private static Node nodeA; - private static Node nodeB; - - private static AComponent acomponent; - - @BeforeClass - public static void init() throws Exception { - - try { - - System.out.println("Setting up nodes"); - - NodeFactory nodeFactory = NodeFactory.newInstance(); - - nodeA = nodeFactory.createNode("nodeA/CompositeA.composite", new Contribution("contrib","target/classes")); - nodeA.start(); - - nodeB = nodeFactory.createNode("nodeB/CompositeB.composite", new Contribution("contrib","target/classes")); - nodeB.start(); - - acomponent = nodeA.getService(AComponent.class, "AComponent/AComponent"); - - } catch (Throwable ex) { - System.out.println(ex.toString()); - // Print detailed cause information. - ex.printStackTrace(); - StringBuffer sb = new StringBuffer(); - Throwable cause = ex.getCause(); - while ( cause != null ) { - sb.append( " " ); - System.out.println( sb.toString() + "Cause: " + cause ); - if (cause instanceof java.lang.reflect.InvocationTargetException) - System.out.println( sb.toString() + "Target Exception: " + ((java.lang.reflect.InvocationTargetException)cause).getTargetException() ); - cause = cause.getCause(); - } - } - } - - @AfterClass - public static void destroy() throws Exception { - // stop the nodes and hence the domains they contain - nodeA.stop(); - nodeB.stop(); - } - - //@Test - public void testKeepServerRunning1() throws Exception { - System.out.println("press enter to continue"); - System.in.read(); - } - - @Test - public void testBReference() { - assertEquals("BComponent", acomponent.fooB()); - } - - @Test - public void testBCast() { - assertEquals("BComponent", acomponent.fooB1()); - } - - @Test - public void testCReference() { - assertEquals("CComponent", acomponent.fooC()); - } - - @Test - public void testCServiceReference() { - assertEquals("CComponent", acomponent.fooC1()); - } - - @Test - public void testDReferenceString() { - assertEquals("DAComponent", acomponent.fooStringD()); - } - - @Test - @Ignore - public void testDReference() { - assertEquals("DAComponent", acomponent.fooD()); - } - - - @Test - @Ignore - public void testBCReference() { - assertEquals("BCComponent", acomponent.fooBC()); - } - - @Test - public void testRequiredFalseReference() { - try { - acomponent.invokeDReference(); - } catch (Exception e) { - Assert.assertTrue(true); - } - } - -} diff --git a/sca-java-2.x/trunk/itest/service-reference/src/test/java/org/apache/tuscany/sca/itest/serviceref/ServiceReferenceTestCase.java b/sca-java-2.x/trunk/itest/service-reference/src/test/java/org/apache/tuscany/sca/itest/serviceref/ServiceReferenceTestCase.java deleted file mode 100644 index 1a454c939a..0000000000 --- a/sca-java-2.x/trunk/itest/service-reference/src/test/java/org/apache/tuscany/sca/itest/serviceref/ServiceReferenceTestCase.java +++ /dev/null @@ -1,88 +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.itest.serviceref; - -import static junit.framework.Assert.assertEquals; -import junit.framework.Assert; - -import org.apache.tuscany.sca.itest.serviceref.AComponent; -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -public class ServiceReferenceTestCase { - private static Node node; - private static AComponent acomponent; - - @BeforeClass - public static void init() throws Exception { - node = NodeFactory.newInstance().createNode("ServiceReferenceTest.composite", - new Contribution("contrib","src/main/resources/servicereference")); - node.start(); - acomponent = node.getService(AComponent.class, "AComponent"); - } - - @AfterClass - public static void destroy() throws Exception { - node.stop(); - } - - @Test - public void testBReference() { - assertEquals("BComponent", acomponent.fooB()); - } - - @Test - public void testBCast() { - assertEquals("BComponent", acomponent.fooB1()); - } - - @Test - public void testCReference() { - assertEquals("CComponent", acomponent.fooC()); - } - - @Test - public void testCServiceReference() { - assertEquals("CComponent", acomponent.fooC1()); - } - - @Test - public void testDReference() { - assertEquals("DAComponent", acomponent.fooD()); - } - - @Test - public void testBCReference() { - assertEquals("BCComponent", acomponent.fooBC()); - } - - @Test - public void testRequiredFalseReference() { - try { - acomponent.invokeDReference(); - } catch (Exception e) { - Assert.assertTrue(true); - } - } - -} diff --git a/sca-java-2.x/trunk/itest/services/pom.xml b/sca-java-2.x/trunk/itest/services/pom.xml deleted file mode 100644 index 7564ee1c9a..0000000000 --- a/sca-java-2.x/trunk/itest/services/pom.xml +++ /dev/null @@ -1,53 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-services</artifactId> - <name>Apache Tuscany SCA iTest Services</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - </dependencies> - -</project> diff --git a/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java b/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java deleted file mode 100644 index 26e58dc530..0000000000 --- a/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java +++ /dev/null @@ -1,27 +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.itest.services; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface AComponent { - String foo(); -} diff --git a/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java b/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java deleted file mode 100644 index 627ff4976f..0000000000 --- a/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java +++ /dev/null @@ -1,28 +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.itest.services; - -public class AComponentImpl implements AComponent { - - public String foo() { - return "AComponent"; - } - -} diff --git a/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java b/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java deleted file mode 100644 index d04bd1b985..0000000000 --- a/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java +++ /dev/null @@ -1,25 +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.itest.services; - -public interface BComponent { - - String foo(); -} diff --git a/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java b/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java deleted file mode 100644 index 01df89a8fa..0000000000 --- a/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java +++ /dev/null @@ -1,31 +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.itest.services; - -import org.oasisopen.sca.annotation.Service; - -@Service(BComponent.class) -public class BComponentImpl implements BComponent { - - public String foo() { - return "BComponent"; - } - -} diff --git a/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java b/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java deleted file mode 100644 index 07397e4502..0000000000 --- a/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponent.java +++ /dev/null @@ -1,27 +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.itest.services; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface CComponent { - String foo(); -} diff --git a/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java b/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java deleted file mode 100644 index 8713e5ab22..0000000000 --- a/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/CComponentImpl.java +++ /dev/null @@ -1,28 +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.itest.services; - -public class CComponentImpl implements CComponent { - - public String foo() { - return "CComponent"; - } - -} diff --git a/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java b/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java deleted file mode 100644 index 842a85e000..0000000000 --- a/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java +++ /dev/null @@ -1,24 +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.itest.services; - -public interface D1Component { - String foo1(); -} diff --git a/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java b/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java deleted file mode 100644 index 8a3923b351..0000000000 --- a/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java +++ /dev/null @@ -1,24 +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.itest.services; - -public interface DComponent { - String foo(); -} diff --git a/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java b/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java deleted file mode 100644 index e52692fbf4..0000000000 --- a/sca-java-2.x/trunk/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponentImpl.java +++ /dev/null @@ -1,34 +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.itest.services; - -import org.oasisopen.sca.annotation.Service; - -@Service({DComponent.class, D1Component.class}) -public class DComponentImpl implements DComponent, D1Component { - - public String foo() { - return "DComponent"; - } - - public String foo1() { - return "DComponent"; - } -} diff --git a/sca-java-2.x/trunk/itest/services/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/services/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index a687b3481a..0000000000 --- a/sca-java-2.x/trunk/itest/services/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:foo="http://foo"> - <deployable composite="foo:InnerServicesTest" /> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/services/src/main/resources/ServicesTest.composite b/sca-java-2.x/trunk/itest/services/src/main/resources/ServicesTest.composite deleted file mode 100644 index 49fdf02f4b..0000000000 --- a/sca-java-2.x/trunk/itest/services/src/main/resources/ServicesTest.composite +++ /dev/null @@ -1,70 +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://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:foo="http://foo" targetNamespace="http://foo" - name="InnerServicesTest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - - <component name="AComponent1"> - <implementation.java class="org.apache.tuscany.sca.itest.services.AComponentImpl" /> - </component> - - <component name="AComponent2"> - <implementation.java class="org.apache.tuscany.sca.itest.services.AComponentImpl" /> - <service name="AComponent"> - <interface.java interface="org.apache.tuscany.sca.itest.services.AComponent" /> - </service> - </component> - - <component name="BComponent1"> - <implementation.java class="org.apache.tuscany.sca.itest.services.BComponentImpl" /> - </component> - - <component name="BComponent2"> - <implementation.java class="org.apache.tuscany.sca.itest.services.BComponentImpl" /> - <service name="BComponent"> - <interface.java interface="org.apache.tuscany.sca.itest.services.BComponent" /> - </service> - </component> - - <component name="CComponent1"> - <implementation.java class="org.apache.tuscany.sca.itest.services.CComponentImpl" /> - </component> - - <component name="CComponent2"> - <implementation.java class="org.apache.tuscany.sca.itest.services.CComponentImpl" /> - <service name="CComponent"> - <interface.java interface="org.apache.tuscany.sca.itest.services.CComponent" /> - </service> - </component> - - <component name="DComponent1"> - <implementation.java class="org.apache.tuscany.sca.itest.services.DComponentImpl" /> - </component> - - <component name="DComponent2"> - <implementation.java class="org.apache.tuscany.sca.itest.services.DComponentImpl" /> - <service name="DComponent"> - <interface.java interface="org.apache.tuscany.sca.itest.services.DComponent" /> - </service> - <service name="D1Component"> - <interface.java interface="org.apache.tuscany.sca.itest.services.D1Component" /> - </service> - </component> - -</composite>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java b/sca-java-2.x/trunk/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java deleted file mode 100644 index da779b2c54..0000000000 --- a/sca-java-2.x/trunk/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java +++ /dev/null @@ -1,108 +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.itest.services; - -import static org.junit.Assert.assertEquals; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; -import org.oasisopen.sca.ServiceRuntimeException; - -public class ServicesTestCase { - private static Node node; - - @BeforeClass - public static void init() throws Exception { - String location = ContributionLocationHelper.getContributionLocation("ServicesTest.composite"); - node = NodeFactory.newInstance().createNode("ServicesTest.composite", new Contribution("c1", location)); - node.start(); - } - - @AfterClass - public static void destroy() throws Exception { - node.stop(); - } - - @Test - public void testAService() { - AComponent a1 = node.getService(AComponent.class, "AComponent1"); - assertEquals("AComponent", a1.foo()); - - AComponent a2 = node.getService(AComponent.class, "AComponent2/AComponent"); - assertEquals("AComponent", a2.foo()); - } - - @Test - public void testBService() { - BComponent a1 = node.getService(BComponent.class, "BComponent1"); - assertEquals("BComponent", a1.foo()); - - BComponent a2 = node.getService(BComponent.class, "BComponent2/BComponent"); - assertEquals("BComponent", a2.foo()); - } - - @Test - public void testCService() { - CComponent a1 = node.getService(CComponent.class, "CComponent1"); - assertEquals("CComponent", a1.foo()); - - CComponent a2 = node.getService(CComponent.class, "CComponent2/CComponent"); - assertEquals("CComponent", a2.foo()); - } - - @Test - public void testDService() { - DComponent a1 = node.getService(DComponent.class, "DComponent1/DComponent"); - assertEquals("DComponent", a1.foo()); - - D1Component a2 = node.getService(D1Component.class, "DComponent1/D1Component"); - assertEquals("DComponent", a2.foo1()); - - try { - node.getService(DComponent.class, "DComponent1"); - Assert.fail("The service name is required"); - } catch (ServiceRuntimeException e) { - Assert.assertTrue("The service name is required", true); - } - - DComponent a3 = node.getService(DComponent.class, "DComponent2/DComponent"); - assertEquals("DComponent", a3.foo()); - - D1Component a4 = node.getService(D1Component.class, "DComponent2/D1Component"); - assertEquals("DComponent", a4.foo1()); - - } - - public static void main(String[] args) throws Exception { - ServicesTestCase.init(); - ServicesTestCase tester = new ServicesTestCase(); - tester.testAService(); - tester.testBService(); - tester.testCService(); - tester.testDService(); - ServicesTestCase.destroy(); - } -} diff --git a/sca-java-2.x/trunk/itest/wires/pom.xml b/sca-java-2.x/trunk/itest/wires/pom.xml deleted file mode 100644 index 73868c649e..0000000000 --- a/sca-java-2.x/trunk/itest/wires/pom.xml +++ /dev/null @@ -1,53 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-wires</artifactId> - <name>Apache Tuscany SCA iTest Wires Basic</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - </dependencies> -</project> diff --git a/sca-java-2.x/trunk/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java b/sca-java-2.x/trunk/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java deleted file mode 100644 index f5a4337254..0000000000 --- a/sca-java-2.x/trunk/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClient.java +++ /dev/null @@ -1,34 +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.itest; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * This is the client interface for the wires tests - */ -@Remotable -public interface WireClient { - - /** - * This tests the wires. - */ - void runTests(); -} diff --git a/sca-java-2.x/trunk/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java b/sca-java-2.x/trunk/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java deleted file mode 100644 index 82f0e26d58..0000000000 --- a/sca-java-2.x/trunk/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.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.itest; - -import org.junit.Assert; -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Service; - -/** - * This is the client implementation for the wires tests - */ -@Service(WireClient.class) -public class WireClientImpl implements WireClient { - /** - * This is our injected reference to the WireService - */ - @Reference - protected WireService aWireService; - - /** - * This tests the wire reference - */ - public void runTests() { - // Make sure the wire has injected a reference - Assert.assertNotNull(aWireService); - - // Test the injected reference - String msg = aWireService.sayHello("MCC"); - - // Validate the response - Assert.assertNotNull(msg); - Assert.assertEquals("Hello MCC", msg); - } -} diff --git a/sca-java-2.x/trunk/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java b/sca-java-2.x/trunk/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java deleted file mode 100644 index 67df1e3a52..0000000000 --- a/sca-java-2.x/trunk/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireService.java +++ /dev/null @@ -1,36 +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.itest; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * Sample Wire Service - */ -@Remotable -public interface WireService { - /** - * Returns "Hello " + aName - * - * @param aName The name to say hello - * @return "Hello " + aName - */ - String sayHello(String aName); -} diff --git a/sca-java-2.x/trunk/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java b/sca-java-2.x/trunk/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java deleted file mode 100644 index f0308252ba..0000000000 --- a/sca-java-2.x/trunk/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireServiceImpl.java +++ /dev/null @@ -1,39 +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.itest; - -import org.oasisopen.sca.annotation.Service; - -/** - * Sample WireService Implementation - */ -@Service(WireService.class) -public class WireServiceImpl implements WireService { - - /** - * Returns "Hello " + aName - * - * @param aName The name to say hello - * @return "Hello " + aName - */ - public String sayHello(String aName) { - return "Hello " + aName; - } -} diff --git a/sca-java-2.x/trunk/itest/wires/src/main/resources/WireTest.composite b/sca-java-2.x/trunk/itest/wires/src/main/resources/WireTest.composite deleted file mode 100644 index e697726a73..0000000000 --- a/sca-java-2.x/trunk/itest/wires/src/main/resources/WireTest.composite +++ /dev/null @@ -1,39 +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://docs.oasis-open.org/ns/opencsa/sca/200912" targetNamespace="http://wires" name="WireTest"> - - <component name="WireClient"> - <implementation.java class="org.apache.tuscany.sca.itest.WireClientImpl"/> -<!-- We are not using a reference - we are using a wire - see below --> -<!-- The equivalent reference for the wire would be as follows --> -<!-- <reference name="aWireService" target="WireService"/>--> - </component> - - <component name="AnotherWireClient"> - <implementation.java class="org.apache.tuscany.sca.itest.WireClientImpl"/> - </component> - - <component name="WireServiceComponent"> - <implementation.java class="org.apache.tuscany.sca.itest.WireServiceImpl"/> - </component> - - <wire source="WireClient/aWireService" target="WireServiceComponent"/> - <wire source="AnotherWireClient/aWireService" target="WireServiceComponent/WireService"/> -</composite> diff --git a/sca-java-2.x/trunk/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java b/sca-java-2.x/trunk/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java deleted file mode 100644 index 2a0095cabc..0000000000 --- a/sca-java-2.x/trunk/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java +++ /dev/null @@ -1,78 +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.itest; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -/** - * This test case will attempt to use a wire - */ -public class WireTestCase { - - /** - * The Node we are using - */ - private Node node; - - /** - * The client the tests should use - */ - private WireClient aWireClient; - - /** - * Run the wire tests - */ - @Test - public void testWire() { - aWireClient.runTests(); - } - - /** - * Load the Wire composite and look up the client. - */ - - @Before - public void setUp() throws Exception { - String location = ContributionLocationHelper.getContributionLocation("WireTest.composite"); - node = NodeFactory.newInstance().createNode("WireTest.composite", new Contribution("c1", location)); - node.start(); - aWireClient = node.getService(WireClient.class, "WireClient"); - Assert.assertNotNull(aWireClient); - - aWireClient = node.getService(WireClient.class, "AnotherWireClient"); - Assert.assertNotNull(aWireClient); - } - - /** - * Shutdown the SCA node - */ - - @After - public void tearDown() throws Exception { - node.stop(); - } -} diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/README b/sca-java-2.x/trunk/itest/ws-jaxws/README deleted file mode 100644 index cf635e78d0..0000000000 --- a/sca-java-2.x/trunk/itest/ws-jaxws/README +++ /dev/null @@ -1,83 +0,0 @@ - -Scenarios -========= - -General Patterns ----------------- - -For simple synchronous tests: - -Jaxws client -> (b.ws service) SCA Component (b.ws reference) -> Jaxws Service - -For callback or asynchronous tests - -JUnit client -> SCA Component (b.ws reference) -> (b.ws service) SCA component - -Java First ----------- -scratch java component impl -interface jaave (simple + JAXB + SDO ) -?wsdl - gens wsdl - -Java First with JAX-WS annotations ----------------------------------- -WSDL -> wsimport -> Java component impl -interface java -?wsdl - re-gens wsdl - -WSDL first ----------- -Java component impl -> wsgen -> wsdl -interface wsdl -?wsld - provided wsdl - -Policy ------- -ws-policy (aac) - -Java First - WSpolicy from Policy set in definitions.xml - ?wsdl - gens wsdl + policy -WSDL first - WSpolicy from WSDL - ?wsld - uses wsdl + policy - Policy signing - -alternative bindings --------------------- -SOAP/HTTP -SOAP/HTTPS -SOAP/JMS - How to retrieve WSDL for non-http bindings (a SHOULD in the spec) - -asynchInvocation Intent ------------------------ - Service - Client - -noListener Intent ------------------ - ws-makeconnetion? - - -SOAP1.1 intent --------------- - - -SOAP1.2 intent --------------- - -MTOM intent --------------- - -callback --------- -new OASIS protocol -WSCallback ws policy - -JAXWS Asynch APIs ------------------ - -Streaming ---------- -Do we need to support? diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/contribution-java-first/pom.xml b/sca-java-2.x/trunk/itest/ws-jaxws/contribution-java-first/pom.xml deleted file mode 100644 index afdfac7a95..0000000000 --- a/sca-java-2.x/trunk/itest/ws-jaxws/contribution-java-first/pom.xml +++ /dev/null @@ -1,123 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>itest-ws-jaxws-contribution-java-first</artifactId> - <name>Apache Tuscany SCA iTest WS JAXWS Contribution Java First </name> - - <dependencies> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-feature-core</artifactId> - <type>pom</type> - <version>2.0-SNAPSHOT</version> - </dependency> - - </dependencies> - - <build> - <finalName>${artifactId}</finalName> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.0</version> - <executions> - <execution> - <id>add-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-test-source</goal> - </goals> - <configuration> - <sources> - <source>target/jaxws-source</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jaxws-maven-plugin</artifactId> - <version>1.12</version> - <!-- Explicitly add the transitive dependencies for jaxws-api - http://jira.codehaus.org/browse/MEV-498 - --> - <dependencies> - <dependency> - <groupId>javax.jws</groupId> - <artifactId>jsr181-api</artifactId> - <version>1.0-MR1</version> - </dependency> - <dependency> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - <version>1.0</version> - </dependency> - </dependencies> - <executions> - <execution> - <id>wsgen1</id> - <phase>process-classes</phase> - <goals> - <goal>wsgen</goal> - </goals> - <configuration> - <sei>org.apache.tuscany.sca.binding.ws.jaxws.HelloWorldImpl</sei> - <genWsdl>true</genWsdl> - <staleFile>${project.build.directory}/jaxws/stale/.wsgen1StaleFlag</staleFile> - </configuration> - </execution> - <execution> - <id>wsimport1</id> - <phase>process-resources</phase> - <goals> - <goal>wsimport</goal> - </goals> - <configuration> - <packageName>org.apache.tuscany.sca.binding.ws.jaxws.external.service.jaxws</packageName> - <wsdlDirectory>${basedir}/target/classes</wsdlDirectory> - <wsdlFiles> - <wsdlFile>helloworld-external-service.wsdl</wsdlFile> - </wsdlFiles> - <staleFile>${project.build.directory}/jaxws/stale/.wsimport1StaleFlag</staleFile> - </configuration> - </execution> - </executions> - <configuration> - <target>2.1</target> - <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir> - <resourceDestDir>${project.build.directory}/jaxws-source</resourceDestDir> - <verbose>true</verbose> - <xnocompile>true</xnocompile> - </configuration> - </plugin> - </plugins> - </build> -</project> diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Bar.java b/sca-java-2.x/trunk/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Bar.java deleted file mode 100644 index e712ec8b53..0000000000 --- a/sca-java-2.x/trunk/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Bar.java +++ /dev/null @@ -1,58 +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.binding.ws.jaxws; - -import java.io.Serializable; - -public class Bar implements Serializable { - private static final long serialVersionUID = 1249963611910502668L; - - private String s; - private int x; - private Integer y; - - private Boolean b; - - public Boolean getB() { - return b; - } - public void setB(Boolean b) { - this.b = b; - } - public String getS() { - return s; - } - public void setS(String s) { - this.s = s; - } - public int getX() { - return x; - } - public void setX(int x) { - this.x = x; - } - public Integer getY() { - return y; - } - public void setY(Integer y) { - this.y = y; - } - -} diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Foo.java b/sca-java-2.x/trunk/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Foo.java deleted file mode 100644 index d09b2af230..0000000000 --- a/sca-java-2.x/trunk/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/Foo.java +++ /dev/null @@ -1,36 +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.binding.ws.jaxws; - -import java.io.Serializable; - -public class Foo implements Serializable { - private static final long serialVersionUID = 4879476066850018458L; - - private Bar[] bars; - - public Bar[] getBars() { - return bars; - } - - public void setBars(Bar[] bars) { - this.bars = bars; - } -} diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/HelloWorld.java b/sca-java-2.x/trunk/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/HelloWorld.java deleted file mode 100644 index 652f7b53c4..0000000000 --- a/sca-java-2.x/trunk/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/HelloWorld.java +++ /dev/null @@ -1,31 +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.binding.ws.jaxws; - -import org.oasisopen.sca.ServiceRuntimeException; -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface HelloWorld { - - String getGreetings(String s); - String getGreetingsException(String s) throws ServiceRuntimeException; - Foo getGreetingsComplex(Foo foo); -} diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/HelloWorldImpl.java b/sca-java-2.x/trunk/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/HelloWorldImpl.java deleted file mode 100644 index 85e55888c6..0000000000 --- a/sca-java-2.x/trunk/itest/ws-jaxws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/HelloWorldImpl.java +++ /dev/null @@ -1,53 +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.binding.ws.jaxws; - -import javax.jws.WebService; - -import org.apache.tuscany.sca.binding.ws.jaxws.external.service.jaxws.HelloWorldService; -import org.oasisopen.sca.ServiceRuntimeException; -import org.oasisopen.sca.annotation.Reference; - -@WebService -public class HelloWorldImpl implements HelloWorld { - - @Reference - public HelloWorldService helloWorldExternal; - - public String getGreetings(String s) { - System.out.println("Entering SCA HelloWorld.getGreetings: " + s); - String response = helloWorldExternal.getGreetings(s); - System.out.println("Leaving SCA HelloWorld.getGreetings: " + response); - return response; - } - - public String getGreetingsException(String s) throws ServiceRuntimeException { - System.out.println("Entering SCA HelloWorld.getGreetingsException: " + s); - String response = helloWorldExternal.getGreetings(s); - System.out.println("Leaving SCA HelloWorld.getGreetings: " + response); - throw new ServiceRuntimeException(response); - } - - public Foo getGreetingsComplex(Foo foo){ - Foo response = null;//helloWorldExternal.getGreetingsComplex(foo); - System.out.println("At client: " + response.getBars()[0].getS()); - return response; - } -} diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/contribution-java-first/src/main/resources/HelloWorldServiceService_schema1.xsd b/sca-java-2.x/trunk/itest/ws-jaxws/contribution-java-first/src/main/resources/HelloWorldServiceService_schema1.xsd deleted file mode 100644 index 51f6dd4d51..0000000000 --- a/sca-java-2.x/trunk/itest/ws-jaxws/contribution-java-first/src/main/resources/HelloWorldServiceService_schema1.xsd +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<!-- - * 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. ---> -<xs:schema version="1.0" targetNamespace="http://helloworld/external" xmlns:tns="http://helloworld/external" xmlns:xs="http://www.w3.org/2001/XMLSchema"> - - <xs:element name="getGreetings" type="tns:getGreetings"/> - - <xs:element name="getGreetingsResponse" type="tns:getGreetingsResponse"/> - - <xs:complexType name="getGreetings"> - <xs:sequence> - <xs:element name="name" type="xs:string" form="qualified" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - - <xs:complexType name="getGreetingsResponse"> - <xs:sequence> - <xs:element name="getGreetingsReturn" type="xs:string" form="qualified" minOccurs="0"/> - </xs:sequence> - </xs:complexType> -</xs:schema> - diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/contribution-java-first/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/ws-jaxws/contribution-java-first/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 7e71dd465f..0000000000 --- a/sca-java-2.x/trunk/itest/ws-jaxws/contribution-java-first/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:itest="http://www.tuscany.apache.org/itests/binding/ws/axis2"> - <deployable composite="itest:HelloWorld"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/contribution-java-first/src/main/resources/helloworld-external-service.wsdl b/sca-java-2.x/trunk/itest/ws-jaxws/contribution-java-first/src/main/resources/helloworld-external-service.wsdl deleted file mode 100644 index 67236a5f98..0000000000 --- a/sca-java-2.x/trunk/itest/ws-jaxws/contribution-java-first/src/main/resources/helloworld-external-service.wsdl +++ /dev/null @@ -1,57 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<!-- - * 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. ---> -<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.7-b01-. --> -<definitions targetNamespace="http://helloworld/external" name="HelloWorldServiceService" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://helloworld/external" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> - <types> - <xsd:schema> - <xsd:import namespace="http://helloworld/external" schemaLocation="HelloWorldServiceService_schema1.xsd"/> - </xsd:schema> - </types> - <message name="getGreetings"> - <part name="parameters" element="tns:getGreetings"/> - </message> - <message name="getGreetingsResponse"> - <part name="parameters" element="tns:getGreetingsResponse"/> - </message> - <portType name="HelloWorldService"> - <operation name="getGreetings"> - <input message="tns:getGreetings"/> - <output message="tns:getGreetingsResponse"/> - </operation> - </portType> - <binding name="HelloWorldServicePortBinding" type="tns:HelloWorldService"> - <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/> - <operation name="getGreetings"> - <soap:operation soapAction=""/> - <input> - <soap:body use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - </operation> - </binding> - <service name="HelloWorldServiceService"> - <port name="HelloWorldServicePort" binding="tns:HelloWorldServicePortBinding"> - <soap:address location="http://localhost:8086/External/HelloWorld"/> - </port> - </service> -</definitions> - diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/contribution-java-first/src/main/resources/helloworld.composite b/sca-java-2.x/trunk/itest/ws-jaxws/contribution-java-first/src/main/resources/helloworld.composite deleted file mode 100644 index 0188dc0d41..0000000000 --- a/sca-java-2.x/trunk/itest/ws-jaxws/contribution-java-first/src/main/resources/helloworld.composite +++ /dev/null @@ -1,35 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://www.tuscany.apache.org/itests/binding/ws/axis2" - name="HelloWorld"> - - <component name="HelloWorldService"> - <implementation.java class="org.apache.tuscany.sca.binding.ws.jaxws.HelloWorldImpl"/> - <service name="HelloWorld"> - <binding.ws uri="http://localhost:8085/HelloWorldService/HelloWorld"/> - </service> - <reference name="helloWorldExternal"> - <binding.ws uri="http://localhost:8086/External/HelloWorld"/> - </reference> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/contribution-wsdl-first/pom.xml b/sca-java-2.x/trunk/itest/ws-jaxws/contribution-wsdl-first/pom.xml deleted file mode 100644 index 0bab07d102..0000000000 --- a/sca-java-2.x/trunk/itest/ws-jaxws/contribution-wsdl-first/pom.xml +++ /dev/null @@ -1,125 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>itest-ws-jaxws-contribution-wsdl-first</artifactId> - <name>Apache Tuscany SCA iTest WS JAXWS Contribution WSDL First</name> - - <dependencies> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-feature-core</artifactId> - <type>pom</type> - <version>2.0-SNAPSHOT</version> - </dependency> - - </dependencies> - - <build> - <finalName>${artifactId}</finalName> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.0</version> - <executions> - <execution> - <id>add-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-test-source</goal> - </goals> - <configuration> - <sources> - <source>target/jaxws-source</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jaxws-maven-plugin</artifactId> - <version>1.12</version> - <!-- Explicitly add the transitive dependencies for jaxws-api - http://jira.codehaus.org/browse/MEV-498 - --> - <dependencies> - <dependency> - <groupId>javax.jws</groupId> - <artifactId>jsr181-api</artifactId> - <version>1.0-MR1</version> - </dependency> - <dependency> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - <version>1.0</version> - </dependency> - </dependencies> - <executions> - <execution> - <id>wsimport1</id> - <phase>process-resources</phase> - <goals> - <goal>wsimport</goal> - </goals> - <configuration> - <packageName>org.apache.tuscany.sca.binding.ws.jaxws</packageName> - <wsdlDirectory>${basedir}/target/classes</wsdlDirectory> - <wsdlFiles> - <wsdlFile>helloworld-sca.wsdl</wsdlFile> - </wsdlFiles> - <staleFile>${project.build.directory}/jaxws/stale/.wsimport1StaleFlag</staleFile> - </configuration> - </execution> - <execution> - <id>wsimport2</id> - <phase>process-resources</phase> - <goals> - <goal>wsimport</goal> - </goals> - <configuration> - <packageName>org.apache.tuscany.sca.binding.ws.jaxws.external.service</packageName> - <wsdlDirectory>${basedir}/target/classes</wsdlDirectory> - <wsdlFiles> - <wsdlFile>helloworld-external.wsdl</wsdlFile> - </wsdlFiles> - <staleFile>${project.build.directory}/jaxws/stale/.wsimport2StaleFlag</staleFile> - </configuration> - </execution> - </executions> - <configuration> - <target>2.1</target> - <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir> - <verbose>true</verbose> - <xnocompile>true</xnocompile> - </configuration> - </plugin> - </plugins> - </build> -</project> diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/impl/HelloWorldImpl.java b/sca-java-2.x/trunk/itest/ws-jaxws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/impl/HelloWorldImpl.java deleted file mode 100644 index 7c63fd5ba9..0000000000 --- a/sca-java-2.x/trunk/itest/ws-jaxws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/impl/HelloWorldImpl.java +++ /dev/null @@ -1,43 +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.binding.ws.jaxws.impl; - -import org.apache.tuscany.sca.binding.ws.jaxws.HelloWorld; -import org.oasisopen.sca.annotation.Reference; - -public class HelloWorldImpl implements HelloWorld { - - @Reference - public org.apache.tuscany.sca.binding.ws.jaxws.external.service.HelloWorld helloWorldExternal; - - public String getGreetings(String s) { - System.out.println("Entering SCA HelloWorld.getGreetings: " + s); - String response = helloWorldExternal.getGreetings(s); - System.out.println("Leaving SCA HelloWorld.getGreetings: " + response); - return response; - } -/* - public Foo getGreetingsComplex(Foo foo){ - Foo response = null;//helloWorldExternal.getGreetingsComplex(foo); - System.out.println("At client: " + response.getBars()[0].getS()); - return response; - } -*/ -} diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 7e71dd465f..0000000000 --- a/sca-java-2.x/trunk/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:itest="http://www.tuscany.apache.org/itests/binding/ws/axis2"> - <deployable composite="itest:HelloWorld"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld-external.wsdl b/sca-java-2.x/trunk/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld-external.wsdl deleted file mode 100644 index 78d8077bcd..0000000000 --- a/sca-java-2.x/trunk/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld-external.wsdl +++ /dev/null @@ -1,84 +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. ---> -<wsdl:definitions targetNamespace="http://helloworld/external" - xmlns:tns="http://helloworld/external" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - name="helloworld"> - - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://helloworld/external" xmlns="http://www.w3.org/2001/XMLSchema"> - - <element name="getGreetings"> - <complexType> - <sequence> - <element name="name" type="xsd:string"/> - </sequence> - </complexType> - </element> - - <element name="getGreetingsResponse"> - <complexType> - <sequence> - <element name="getGreetingsReturn" type="xsd:string"/> - </sequence> - </complexType> - </element> - - </schema> - </wsdl:types> - - <wsdl:message name="getGreetingsRequest"> - <wsdl:part element="tns:getGreetings" name="parameters"/> - </wsdl:message> - - <wsdl:message name="getGreetingsResponse"> - <wsdl:part element="tns:getGreetingsResponse" name="parameters"/> - </wsdl:message> - - <wsdl:portType name="HelloWorld"> - <wsdl:operation name="getGreetings"> - <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/> - <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/> - </wsdl:operation> - </wsdl:portType> - - <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld"> - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="getGreetings"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="getGreetingsRequest"> - <wsdlsoap:body use="literal"/> - </wsdl:input> - <wsdl:output name="getGreetingsResponse"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - - </wsdl:binding> - - <wsdl:service name="HelloWorldService"> - <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort"> - <wsdlsoap:address location="http://localhost:8086/External/HelloWorld"/> - </wsdl:port> - </wsdl:service> - -</wsdl:definitions> diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld-sca.wsdl b/sca-java-2.x/trunk/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld-sca.wsdl deleted file mode 100644 index 0e6a10cc62..0000000000 --- a/sca-java-2.x/trunk/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld-sca.wsdl +++ /dev/null @@ -1,84 +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. ---> -<wsdl:definitions targetNamespace="http://helloworld" - xmlns:tns="http://helloworld" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - name="helloworld"> - - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema"> - - <element name="getGreetings"> - <complexType> - <sequence> - <element name="name" type="xsd:string"/> - </sequence> - </complexType> - </element> - - <element name="getGreetingsResponse"> - <complexType> - <sequence> - <element name="getGreetingsReturn" type="xsd:string"/> - </sequence> - </complexType> - </element> - - </schema> - </wsdl:types> - - <wsdl:message name="getGreetingsRequest"> - <wsdl:part element="tns:getGreetings" name="parameters"/> - </wsdl:message> - - <wsdl:message name="getGreetingsResponse"> - <wsdl:part element="tns:getGreetingsResponse" name="parameters"/> - </wsdl:message> - - <wsdl:portType name="HelloWorld"> - <wsdl:operation name="getGreetings"> - <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/> - <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/> - </wsdl:operation> - </wsdl:portType> - - <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld"> - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="getGreetings"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="getGreetingsRequest"> - <wsdlsoap:body use="literal"/> - </wsdl:input> - <wsdl:output name="getGreetingsResponse"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - - </wsdl:binding> - - <wsdl:service name="HelloWorldService"> - <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort"> - <wsdlsoap:address location="http://localhost:8085/HelloWorldService/HelloWorld"/> - </wsdl:port> - </wsdl:service> - -</wsdl:definitions> diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld.composite b/sca-java-2.x/trunk/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld.composite deleted file mode 100644 index 0cd2b4419d..0000000000 --- a/sca-java-2.x/trunk/itest/ws-jaxws/contribution-wsdl-first/src/main/resources/helloworld.composite +++ /dev/null @@ -1,35 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://www.tuscany.apache.org/itests/binding/ws/axis2" - name="HelloWorld"> - - <component name="HelloWorldService"> - <implementation.java class="org.apache.tuscany.sca.binding.ws.jaxws.impl.HelloWorldImpl"/> - <service name="HelloWorld"> - <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/> - </service> - <reference name="helloWorldExternal"> - <binding.ws wsdlElement="http://helloworld/external#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/> - </reference> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/external-client/pom.xml b/sca-java-2.x/trunk/itest/ws-jaxws/external-client/pom.xml deleted file mode 100644 index b613a4ad3b..0000000000 --- a/sca-java-2.x/trunk/itest/ws-jaxws/external-client/pom.xml +++ /dev/null @@ -1,122 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>itest-ws-jaxws-external-client</artifactId> - <name>Apache Tuscany SCA iTest WS JAXWS External Client</name> - - <dependencies> - - <!-- Core distribution --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-feature-core</artifactId> - <type>pom</type> - <version>2.0-SNAPSHOT</version> - </dependency> - - <!-- Bindings --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-runtime-jaxws-ri</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - - </dependencies> - - <build> - <finalName>${artifactId}</finalName> - - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.0</version> - <executions> - <execution> - <id>add-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-test-source</goal> - </goals> - <configuration> - <sources> - <source>target/jaxws-source</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jaxws-maven-plugin</artifactId> - <version>1.12</version> - <!-- Explicitly add the transitive dependencies for jaxws-api - http://jira.codehaus.org/browse/MEV-498 - --> - <dependencies> - <dependency> - <groupId>javax.jws</groupId> - <artifactId>jsr181-api</artifactId> - <version>1.0-MR1</version> - </dependency> - <dependency> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - <version>1.0</version> - </dependency> - </dependencies> - <executions> - <execution> - <id>wsimport1</id> - <phase>process-resources</phase> - <goals> - <goal>wsimport</goal> - </goals> - <configuration> - <packageName>org.apache.tuscany.sca.binding.ws.jaxws.sca</packageName> - <wsdlDirectory>${basedir}/target/classes</wsdlDirectory> - <wsdlFiles> - <wsdlFile>HelloWorldImplService.wsdl</wsdlFile> - </wsdlFiles> - <staleFile>${project.build.directory}/jaxws/stale/.wsimport1StaleFlag</staleFile> - </configuration> - </execution> - </executions> - <configuration> - <target>2.1</target> - <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir> - <resourceDestDir>${project.build.directory}/jaxws-source</resourceDestDir> - <verbose>true</verbose> - <xnocompile>true</xnocompile> - </configuration> - </plugin> - </plugins> - </build> - -</project> diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/external-client/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/client/HelloWorldClientLauncher.java b/sca-java-2.x/trunk/itest/ws-jaxws/external-client/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/client/HelloWorldClientLauncher.java deleted file mode 100644 index da40a7f442..0000000000 --- a/sca-java-2.x/trunk/itest/ws-jaxws/external-client/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/client/HelloWorldClientLauncher.java +++ /dev/null @@ -1,73 +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.binding.ws.jaxws.external.client; - -import java.io.File; -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import org.apache.tuscany.sca.binding.ws.jaxws.sca.Exception_Exception; -import org.apache.tuscany.sca.binding.ws.jaxws.sca.HelloWorldImpl; - -public class HelloWorldClientLauncher { - - public HelloWorldImpl wsProxy; - - public HelloWorldClientLauncher(){ - } - - public void createClient() throws Exception{ - System.out.println(">>> Starting external JAXWS client "); - - // default JVM JAXWS support - QName serviceName = new QName("http://jaxws.ws.binding.sca.tuscany.apache.org/", "HelloWorldImplService"); - QName portName = new QName("http://jaxws.ws.binding.sca.tuscany.apache.org/", "HelloWorldImplPort"); - //URL wsdlLocation = new File("../external-client/target/classes/helloworld-sca.wsdl").toURL(); - URL wsdlLocation = new File("../external-client/target/classes/HelloWorldImplService.wsdl").toURL(); - javax.xml.ws.Service webService = Service.create(wsdlLocation, serviceName); - wsProxy = (HelloWorldImpl) webService.getPort(portName, HelloWorldImpl.class); - } - - public void destroyClient(){ - System.out.println(">>> Stopping external JAXWS client: "); - // TODO - } - - public String getGreetings(String name){ - System.out.println("Entering External Client HelloWorld.getGreetings: " + name); - String response = wsProxy.getGreetings(name); - System.out.println("Leaving External Client HelloWorld.getGreetings: " + response); - return response; - } - - public String getGreetingsException(String name) throws Exception_Exception { - return wsProxy.getGreetingsException(name); - } - - public static void main(String[] args) throws Exception { - HelloWorldClientLauncher launcher = new HelloWorldClientLauncher(); - launcher.createClient(); - launcher.getGreetings("Fred"); - launcher.destroyClient(); - } - -} diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/external-client/src/main/resources/HelloWorldImplService.wsdl b/sca-java-2.x/trunk/itest/ws-jaxws/external-client/src/main/resources/HelloWorldImplService.wsdl deleted file mode 100644 index 11ed0a3353..0000000000 --- a/sca-java-2.x/trunk/itest/ws-jaxws/external-client/src/main/resources/HelloWorldImplService.wsdl +++ /dev/null @@ -1,104 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<!-- - * 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. ---> -<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.7-b01-. --> -<definitions targetNamespace="http://jaxws.ws.binding.sca.tuscany.apache.org/" name="HelloWorldImplService" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://jaxws.ws.binding.sca.tuscany.apache.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> - <types> - <xsd:schema> - <xsd:import namespace="http://jaxws.ws.binding.sca.tuscany.apache.org/" schemaLocation="HelloWorldImplService_schema1.xsd"/> - </xsd:schema> - </types> - <message name="getGreetings"> - <part name="parameters" element="tns:getGreetings"/> - </message> - <message name="getGreetingsResponse"> - <part name="parameters" element="tns:getGreetingsResponse"/> - </message> - <message name="getGreetingsException"> - <part name="parameters" element="tns:getGreetingsException"/> - </message> - <message name="getGreetingsExceptionResponse"> - <part name="parameters" element="tns:getGreetingsExceptionResponse"/> - </message> - <message name="Exception"> - <part name="fault" element="tns:Exception"/> - </message> - <message name="getGreetingsComplex"> - <part name="parameters" element="tns:getGreetingsComplex"/> - </message> - <message name="getGreetingsComplexResponse"> - <part name="parameters" element="tns:getGreetingsComplexResponse"/> - </message> - <portType name="HelloWorldImpl"> - <operation name="getGreetings"> - <input message="tns:getGreetings"/> - <output message="tns:getGreetingsResponse"/> - </operation> - <operation name="getGreetingsException"> - <input message="tns:getGreetingsException"/> - <output message="tns:getGreetingsExceptionResponse"/> - <fault message="tns:Exception" name="Exception"/> - </operation> - <operation name="getGreetingsComplex"> - <input message="tns:getGreetingsComplex"/> - <output message="tns:getGreetingsComplexResponse"/> - </operation> - </portType> - <binding name="HelloWorldImplPortBinding" type="tns:HelloWorldImpl"> - <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/> - <operation name="getGreetings"> - <soap:operation soapAction=""/> - <input> - <soap:body use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - </operation> - <operation name="getGreetingsException"> - <soap:operation soapAction=""/> - <input> - <soap:body use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - <fault name="Exception"> - <soap:fault name="Exception" use="literal"/> - </fault> - </operation> - <operation name="getGreetingsComplex"> - <soap:operation soapAction=""/> - <input> - <soap:body use="literal"/> - </input> - <output> - <soap:body use="literal"/> - </output> - </operation> - </binding> - <service name="HelloWorldImplService"> - <port name="HelloWorldImplPort" binding="tns:HelloWorldImplPortBinding"> - <soap:address location="http://localhost:8085/HelloWorldService/HelloWorld"/> - </port> - </service> -</definitions> - - - diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/external-client/src/main/resources/HelloWorldImplService_schema1.xsd b/sca-java-2.x/trunk/itest/ws-jaxws/external-client/src/main/resources/HelloWorldImplService_schema1.xsd deleted file mode 100644 index 3c347570a0..0000000000 --- a/sca-java-2.x/trunk/itest/ws-jaxws/external-client/src/main/resources/HelloWorldImplService_schema1.xsd +++ /dev/null @@ -1,93 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<!-- - * 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. ---> -<xs:schema version="1.0" targetNamespace="http://jaxws.ws.binding.sca.tuscany.apache.org/" xmlns:tns="http://jaxws.ws.binding.sca.tuscany.apache.org/" xmlns:xs="http://www.w3.org/2001/XMLSchema"> - - <xs:element name="Exception" type="tns:Exception"/> - - <xs:element name="getGreetings" type="tns:getGreetings"/> - - <xs:element name="getGreetingsComplex" type="tns:getGreetingsComplex"/> - - <xs:element name="getGreetingsComplexResponse" type="tns:getGreetingsComplexResponse"/> - - <xs:element name="getGreetingsException" type="tns:getGreetingsException"/> - - <xs:element name="getGreetingsExceptionResponse" type="tns:getGreetingsExceptionResponse"/> - - <xs:element name="getGreetingsResponse" type="tns:getGreetingsResponse"/> - - <xs:complexType name="getGreetingsException"> - <xs:sequence> - <xs:element name="arg0" type="xs:string" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - - <xs:complexType name="getGreetingsExceptionResponse"> - <xs:sequence> - <xs:element name="return" type="xs:string" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - - <xs:complexType name="Exception"> - <xs:sequence> - <xs:element name="message" type="xs:string" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - - <xs:complexType name="getGreetings"> - <xs:sequence> - <xs:element name="arg0" type="xs:string" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - - <xs:complexType name="getGreetingsResponse"> - <xs:sequence> - <xs:element name="return" type="xs:string" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - - <xs:complexType name="getGreetingsComplex"> - <xs:sequence> - <xs:element name="arg0" type="tns:foo" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - - <xs:complexType name="foo"> - <xs:sequence> - <xs:element name="bars" type="tns:bar" nillable="true" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - </xs:complexType> - - <xs:complexType name="bar"> - <xs:sequence> - <xs:element name="b" type="xs:boolean" minOccurs="0"/> - <xs:element name="s" type="xs:string" minOccurs="0"/> - <xs:element name="x" type="xs:int"/> - <xs:element name="y" type="xs:int" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - - <xs:complexType name="getGreetingsComplexResponse"> - <xs:sequence> - <xs:element name="return" type="tns:foo" minOccurs="0"/> - </xs:sequence> - </xs:complexType> -</xs:schema> - diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/external-service/pom.xml b/sca-java-2.x/trunk/itest/ws-jaxws/external-service/pom.xml deleted file mode 100644 index e64f40273f..0000000000 --- a/sca-java-2.x/trunk/itest/ws-jaxws/external-service/pom.xml +++ /dev/null @@ -1,104 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>itest-ws-jaxws-external-service</artifactId> - <name>Apache Tuscany SCA iTest WS JAXWS External Service</name> - - <dependencies> - - - </dependencies> - - <build> - <finalName>${artifactId}</finalName> - - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.0</version> - <executions> - <execution> - <id>add-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-test-source</goal> - </goals> - <configuration> - <sources> - <source>target/jaxws-source</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jaxws-maven-plugin</artifactId> - <version>1.12</version> - <!-- Explicitly add the transitive dependencies for jaxws-api - http://jira.codehaus.org/browse/MEV-498 - --> - <dependencies> - <dependency> - <groupId>javax.jws</groupId> - <artifactId>jsr181-api</artifactId> - <version>1.0-MR1</version> - </dependency> - <dependency> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - <version>1.0</version> - </dependency> - </dependencies> - <executions> - <execution> - <id>wsgen1</id> - <phase>process-classes</phase> - <goals> - <goal>wsgen</goal> - </goals> - <configuration> - <sei>org.apache.tuscany.sca.binding.ws.jaxws.external.service.HelloWorldService</sei> - <genWsdl>true</genWsdl> - <staleFile>${project.build.directory}/jaxws/stale/.wsgen1StaleFlag</staleFile> - </configuration> - </execution> - </executions> - <configuration> - <target>2.1</target> - <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir> - <resourceDestDir>${project.build.directory}/jaxws-source</resourceDestDir> - <verbose>true</verbose> - <xnocompile>true</xnocompile> - </configuration> - </plugin> - </plugins> - </build> - -</project> diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldService.java b/sca-java-2.x/trunk/itest/ws-jaxws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldService.java deleted file mode 100644 index 796ef82792..0000000000 --- a/sca-java-2.x/trunk/itest/ws-jaxws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldService.java +++ /dev/null @@ -1,57 +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.binding.ws.jaxws.external.service; - -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebResult; -import javax.jws.WebService; -import javax.xml.ws.RequestWrapper; -import javax.xml.ws.ResponseWrapper; - -@WebService(name = "HelloWorldService", targetNamespace = "http://helloworld/external") -public class HelloWorldService { - - @WebMethod - @WebResult(name = "getGreetingsReturn", targetNamespace = "http://helloworld/external") - @RequestWrapper(localName = "getGreetings", targetNamespace = "http://helloworld/external", className = "org.apache.tuscany.sca.binding.ws.jaxws.external.service.GetGreetings") - @ResponseWrapper(localName = "getGreetingsResponse", targetNamespace = "http://helloworld/external", className = "org.apache.tuscany.sca.binding.ws.jaxws.external.service.GetGreetingsResponse") - public String getGreetings( @WebParam(name = "name", targetNamespace = "http://helloworld/external") - String name) { - System.out.println("Entering External Service HelloWorld.getGreetings: " + name); - String response = "Hello " + name; - System.out.println("Leaving External Service HelloWorld.getGreetings: " + response); - return response; - } - -/* - public Foo getGreetingsComplex(Foo foo){ - Foo response = foo; - Bar b3 = new Bar(); - b3.setS("simon"); - b3.setX(4); - b3.setY(new Integer(5)); - b3.setB(Boolean.TRUE); - response.getBars()[1] = b3; - System.out.println("At sevice: " + response.getBars()[0].getS()); - return response; - } -*/ -} diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldServiceLauncher.java b/sca-java-2.x/trunk/itest/ws-jaxws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldServiceLauncher.java deleted file mode 100644 index ba7e033f63..0000000000 --- a/sca-java-2.x/trunk/itest/ws-jaxws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldServiceLauncher.java +++ /dev/null @@ -1,49 +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.binding.ws.jaxws.external.service; - -import javax.xml.ws.Endpoint; - -public class HelloWorldServiceLauncher { - - public Endpoint endpoint; - - public HelloWorldServiceLauncher(){ - - } - - public void createService(){ - System.out.println(">>> Starting external JAXWS service at http://localhost:8086/External/HelloWorld"); - - // default JVM JAXWS support. - endpoint= Endpoint.publish("http://localhost:8086/External/HelloWorld", - new HelloWorldService()); - } - - public void destoryService(){ - System.out.println(">>> Stopping external JAXWS service at http://localhost:8086/External/HelloWorld"); - endpoint.stop(); - } - - public static void main(String[] args) throws Exception { - HelloWorldServiceLauncher launcher = new HelloWorldServiceLauncher(); - launcher.createService(); - } -} diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/launcher-ri/pom.xml b/sca-java-2.x/trunk/itest/ws-jaxws/launcher-ri/pom.xml deleted file mode 100644 index b78095f01a..0000000000 --- a/sca-java-2.x/trunk/itest/ws-jaxws/launcher-ri/pom.xml +++ /dev/null @@ -1,114 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>itest-ws-jaxws-launcher-ri</artifactId> - <name>Apache Tuscany SCA iTest WS JAXWS Launcher RI</name> - - <dependencies> -<!-- ws feature dependencies copied below so that we can use the - binding-ws-runtime-jaxws implementation while it's under development - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-feature-webservice</artifactId> - <version>2.0-SNAPSHOT</version> - <type>pom</type> - </dependency> ---> - - <!-- Core distribution --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-feature-core</artifactId> - <type>pom</type> - <version>2.0-SNAPSHOT</version> - </dependency> - - <!-- Bindings --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-runtime-jaxws-ri</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-wsdlgen</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <!-- Databindings --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-axiom</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-jaxb-axiom</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <!-- - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-sdo</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-sdo-axiom</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - --> - - <!-- Hosts --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-jetty</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <!-- Test resources --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-ws-jaxws-external-client</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-ws-jaxws-external-service</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - </dependencies> - - <build> - <finalName>${artifactId}</finalName> - - </build> - -</project> diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/launcher-ri/src/test/java/org/apache/tuscany/sca/binding/ws/jaxws/launcher/JavaFirstTestCase.java b/sca-java-2.x/trunk/itest/ws-jaxws/launcher-ri/src/test/java/org/apache/tuscany/sca/binding/ws/jaxws/launcher/JavaFirstTestCase.java deleted file mode 100644 index 3c14218118..0000000000 --- a/sca-java-2.x/trunk/itest/ws-jaxws/launcher-ri/src/test/java/org/apache/tuscany/sca/binding/ws/jaxws/launcher/JavaFirstTestCase.java +++ /dev/null @@ -1,119 +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.binding.ws.jaxws.launcher; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - -import org.apache.tuscany.sca.binding.ws.jaxws.external.client.HelloWorldClientLauncher; -import org.apache.tuscany.sca.binding.ws.jaxws.external.service.HelloWorldServiceLauncher; -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -public class JavaFirstTestCase { - - private Node node; - private HelloWorldServiceLauncher externalService; - private HelloWorldClientLauncher externalClient; - - @Before - public void setUp() throws Exception { - // Start the external service - externalService = new HelloWorldServiceLauncher(); - externalService.createService(); - - // Start the SCA contribution - node = NodeFactory.newInstance().createNode(new Contribution("java-first", "../contribution-java-first/target/classes")); - node.start(); - - // start the external client - try { - externalClient = new HelloWorldClientLauncher(); - externalClient.createClient(); - } catch (Exception ex) { - ex.printStackTrace(); - throw ex; - } - } - -/* - public void testWait() throws Exception { - System.out.println("Press a key"); - System.in.read(); - } -*/ - - @Test - public void testGetGreetings() throws Exception { - assertEquals("Hello Fred", externalClient.getGreetings("Fred")); - } - - @Test - public void testGetGreetingsException() throws Exception { - try { - externalClient.getGreetingsException("Fred"); - } catch (Exception ex) { - return; - } - - fail("expecting exception"); - } - - public void testGetGreetingsComplex() throws Exception { - -/* - Foo f = new Foo(); - Bar b1 = new Bar(); - b1.setS("petra"); - b1.setX(1); - b1.setY(new Integer(2)); - b1.setB(Boolean.TRUE); - Bar b2 = new Bar(); - b2.setS("beate"); - b2.setX(3); - b2.setY(new Integer(4)); - b2.setB(Boolean.FALSE); - f.setBars(new Bar[] { b1, b2} ); - - Foo f2 = helloWorld.getGreetingsComplex(f); - - assertEquals("petra", f2.getBars()[0].getS()); - assertEquals(1, f2.getBars()[0].getX()); - assertEquals(2, f2.getBars()[0].getY().intValue()); - assertTrue(f2.getBars()[0].getB().booleanValue()); - assertEquals("simon", f2.getBars()[1].getS()); - assertEquals(4, f2.getBars()[1].getX()); - assertEquals(5, f2.getBars()[1].getY().intValue()); - assertTrue(f2.getBars()[1].getB().booleanValue()); -*/ - } - - @After - public void tearDown() throws Exception { - node.stop(); - externalClient.destroyClient(); - externalService.destoryService(); - } - -} diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/launcher-ri/src/test/java/org/apache/tuscany/sca/binding/ws/jaxws/launcher/WSDLFirstTestCaseOFF.java b/sca-java-2.x/trunk/itest/ws-jaxws/launcher-ri/src/test/java/org/apache/tuscany/sca/binding/ws/jaxws/launcher/WSDLFirstTestCaseOFF.java deleted file mode 100644 index a69fe483bf..0000000000 --- a/sca-java-2.x/trunk/itest/ws-jaxws/launcher-ri/src/test/java/org/apache/tuscany/sca/binding/ws/jaxws/launcher/WSDLFirstTestCaseOFF.java +++ /dev/null @@ -1,143 +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.binding.ws.jaxws.launcher; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.binding.ws.jaxws.external.client.HelloWorldClientLauncher; -import org.apache.tuscany.sca.binding.ws.jaxws.external.service.HelloWorldServiceLauncher; -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; - -public class WSDLFirstTestCaseOFF extends TestCase { - - private Node node; - - @Override - protected void setUp() throws Exception { - // Start the external service - HelloWorldServiceLauncher.main(null); - - // Start the SCA contribution - node = NodeFactory.newInstance().createNode(new Contribution("common", "../common-contribution/target/classes"), - new Contribution("wsdl-first", "../wsdl-first-contribution/target/classes")); - node.start(); - } - - public void testCalculator() throws Exception { - HelloWorldClientLauncher.main(null); - } - -/* - public void testWait1() throws Exception { - System.out.println("Press a key"); - System.in.read(); - } - - public void testCalculator1() throws Exception { - HelloWorldClientLauncher.main(null); - } - - public void testCalculator2() throws Exception { - HelloWorldClientLauncher.main(null); - } - - public void testCalculator3() throws Exception { - HelloWorldClientLauncher.main(null); - } - - public void testCalculator4() throws Exception { - HelloWorldClientLauncher.main(null); - } - - public void testCalculator5() throws Exception { - HelloWorldClientLauncher.main(null); - } - - public void testCalculator6() throws Exception { - HelloWorldClientLauncher.main(null); - } - - public void testCalculator7() throws Exception { - HelloWorldClientLauncher.main(null); - } - - public void testCalculator8() throws Exception { - HelloWorldClientLauncher.main(null); - } - - public void testCalculator9() throws Exception { - HelloWorldClientLauncher.main(null); - } - - public void testCalculator10() throws Exception { - HelloWorldClientLauncher.main(null); - } - - public void testCalculator11() throws Exception { - HelloWorldClientLauncher.main(null); - } - - public void testCalculator12() throws Exception { - HelloWorldClientLauncher.main(null); - } - - public void testCalculator13() throws Exception { - HelloWorldClientLauncher.main(null); - } - - public void testCalculator14() throws Exception { - HelloWorldClientLauncher.main(null); - } - - public void testCalculator15() throws Exception { - HelloWorldClientLauncher.main(null); - } - - public void testCalculator16() throws Exception { - HelloWorldClientLauncher.main(null); - } - - public void testCalculator17() throws Exception { - HelloWorldClientLauncher.main(null); - } - - public void testCalculator18() throws Exception { - HelloWorldClientLauncher.main(null); - } - - public void testCalculator19() throws Exception { - HelloWorldClientLauncher.main(null); - } - - public void testCalculator20() throws Exception { - HelloWorldClientLauncher.main(null); - } -*/ - - - @Override - protected void tearDown() throws Exception { - node.stop(); - node = null; - } - -} diff --git a/sca-java-2.x/trunk/itest/ws-jaxws/pom.xml b/sca-java-2.x/trunk/itest/ws-jaxws/pom.xml deleted file mode 100644 index f8c19205e9..0000000000 --- a/sca-java-2.x/trunk/itest/ws-jaxws/pom.xml +++ /dev/null @@ -1,41 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <packaging>pom</packaging> - <artifactId>itest-ws-jaxws</artifactId> - <name>Apache Tuscany SCA iTest WS JAXWS</name> - - <modules> - <module>contribution-java-first</module> - <module>contribution-wsdl-first</module> - <module>external-client</module> - <module>external-service</module> - <module>launcher-ri</module> - <!--module>launcher-axis2</module--> - </modules> - -</project> diff --git a/sca-java-2.x/trunk/itest/ws/README b/sca-java-2.x/trunk/itest/ws/README deleted file mode 100644 index 0efac242c2..0000000000 --- a/sca-java-2.x/trunk/itest/ws/README +++ /dev/null @@ -1,135 +0,0 @@ -
-Features/Tests
-==============
-
-General Patterns
-----------------
-For simple synchronous tests:
-
-Jaxws client -> (b.ws service) SCA Component (b.ws reference) -> Jaxws Service
- /\ /\ |
- | use | use | gen
- | | \/
-Java Interface<------------------Java Interface<---------gen----------WSDL
-
-
-For message format the external service don't get involved in the varying message formats,
-They are still doing doc/lit/wrapped:
-
-TODO - we could extend testing to include JAXWS edpoints thatunderstand the different formats
-
-JUnit client -> SCA Component (b.ws reference) -> (b.ws service) SCA component -> Jaxws Service
- /\ /\ /\ /\ |
- | | config | config | |
- | use | | | use | gen
- | -----------WSDL------- | |
- | | \/
-Java Interface<-------------------------------------------------Java Interface<----gen---WSDL
-
-For SCA callback or asynchronous tests the external services don't get involved in the
-callback or aysnc request:
-
-JUnit client -> SCA Component (b.ws reference) -> (b.ws service) SCA component -> Jaxws Service
-
-
-Java First
-----------
-implemenation.java
-interface.java
- simple
- JAXB
- SDO - TODO
-?wsdl - gens wsdl
-
-Java First with JAX-WS annotations
-----------------------------------
-WSDL -> wsimport -> implemenation.java
-interface.java
-?wsdl - re-gens wsdl
-
-WSDL first
-----------
-implemenation.java -> wsgen -> wsdl
-interface.wsdl
-?wsld - provided wsdl
-
-Callback
---------
-Various combinations of specified callback and default configuration
-WSCallback ws policy - TODO
-
-WSDL Styles
------------
-
-rpc-lit - supported
- WSDL configuration where
- message parts use types - <part name="s" type="xsd:string"/>
- binding style set to rpc - <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/>
- body uses literal - <soap:body use="literal" namespace="http://ws.binding.sca.tuscany.apache.org/rpclit/getGreetingsNamespace" />
- Note the use of a namespace on the body element to set the namespace of the wrapper child of the body element
-doc-lit(or bare) - supported (however see note below)
- WS-I BP1.1 4.7.6 states that an operation signature is a
- "fully qualified name of the child element of SOAP body of the SOAP input message"
- to make this true for doc-lit encoding you have to design the WSDL to wrap the parameters
- in an appropriate type. Hence doc-literal-wrapped is supported which encompasses this wrapping style.
- For bare style interfaces you have to mark the Java service interface as follows
- SOAP binding is set to - @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
- WSDL configuration where
- message parts use elements - <part name="parameters" element="tns:getGreetings"/>
- the elements are directly implemented by the operation parameter type
- binding style set to document - <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
- body uses literal - <soap:body use="literal"/>
-doc-lit-wrapped - supported
- WSDL configuration where
- message parts use elements - <part name="parameters" element="tns:getGreetings"/>
- the elements are implemented by wrapper types following the name of the operation
- binding style set to document - <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
- body uses literal - <soap:body use="literal"/>
-rpc-encoded - not supported
- not WS-I compliant
-doc-encoded - not supported
- not WS-I compliant
-
-================================== TODO below =========================
-
-Policy
-------
-ws-policy (aac)
-
-Java First
- WSpolicy from Policy set in definitions.xml
- ?wsdl - gens wsdl + policy
-WSDL first
- WSpolicy from WSDL
- ?wsld - uses wsdl + policy
- Policy signing
-
-alternative bindings
---------------------
-SOAP/HTTP
-SOAP/HTTPS
-SOAP/JMS
- How to retrieve WSDL for non-http bindings (a SHOULD in the spec)
-
-asynchInvocation Intent
------------------------
- Service
- Client
-
-noListener Intent
------------------
- ws-makeconnetion?
-
-
-SOAP1.1 intent
---------------
-
-SOAP1.2 intent
---------------
-
-MTOM intent
---------------
-
-Streaming
----------
-Do we need to support?
diff --git a/sca-java-2.x/trunk/itest/ws/authentication-basic/pom.xml b/sca-java-2.x/trunk/itest/ws/authentication-basic/pom.xml deleted file mode 100644 index 211cf97ceb..0000000000 --- a/sca-java-2.x/trunk/itest/ws/authentication-basic/pom.xml +++ /dev/null @@ -1,47 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>itest-ws-authentication-basic</artifactId> - <name>Apache Tuscany SCA iTest WS with Authentication Basic</name> - - <dependencies> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-feature-webservice</artifactId> - <version>2.0-SNAPSHOT</version> - <type>pom</type> - </dependency> - - - </dependencies> - - <build> - <finalName>${artifactId}</finalName> - </build> -</project> diff --git a/sca-java-2.x/trunk/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java b/sca-java-2.x/trunk/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java deleted file mode 100644 index 98eb6e361b..0000000000 --- a/sca-java-2.x/trunk/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java +++ /dev/null @@ -1,29 +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.binding.ws.axis2.helloworld; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface HelloWorld { - - String getGreetings(String s); - -} diff --git a/sca-java-2.x/trunk/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java b/sca-java-2.x/trunk/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java deleted file mode 100644 index 2c6c4fc92c..0000000000 --- a/sca-java-2.x/trunk/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.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.binding.ws.axis2.helloworld; - -import org.oasisopen.sca.annotation.Reference; - -public class HelloWorldClient implements HelloWorld { - - @Reference - public HelloWorld helloWorldWS; - - public String getGreetings(String s) { - String response = helloWorldWS.getGreetings(s); - System.out.println("At client: " + response); - return response; - } - -} diff --git a/sca-java-2.x/trunk/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java deleted file mode 100644 index 885844260a..0000000000 --- a/sca-java-2.x/trunk/itest/ws/authentication-basic/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.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.binding.ws.axis2.helloworld; - -import javax.security.auth.Subject; - -import org.oasisopen.sca.RequestContext; -import org.oasisopen.sca.annotation.Context; - -public class HelloWorldService implements HelloWorld { - - @Context - protected RequestContext requestContext; - - public String getGreetings(String name) { - Subject subject = requestContext.getSecuritySubject(); - String response = "Hello " + name + " "; - - if (subject == null){ - response += "null subject"; - } else { - response += subject.getPrincipals().iterator().next().getName(); - } - - System.out.println("At service: " + response); - return response; - } -} diff --git a/sca-java-2.x/trunk/itest/ws/authentication-basic/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/ws/authentication-basic/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 7e71dd465f..0000000000 --- a/sca-java-2.x/trunk/itest/ws/authentication-basic/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:itest="http://www.tuscany.apache.org/itests/binding/ws/axis2"> - <deployable composite="itest:HelloWorld"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/ws/authentication-basic/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sca-java-2.x/trunk/itest/ws/authentication-basic/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions deleted file mode 100644 index 04fe620be4..0000000000 --- a/sca-java-2.x/trunk/itest/ws/authentication-basic/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions +++ /dev/null @@ -1,17 +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.
-org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml b/sca-java-2.x/trunk/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml deleted file mode 100644 index d4e651b271..0000000000 --- a/sca-java-2.x/trunk/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?> -<!-- - * 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. ---> -<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://www.tuscany.apache.org/itests/binding/ws/axis2" - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" - xmlns:itest="http://www.tuscany.apache.org/itests/binding/ws/axis2" > - - - <sca:policySet name="BasicAuthenticationPolicySet" - attachTo="//sca:binding.ws" - provides="clientAuthentication.transport" - appliesTo="//sca:binding.ws"> - <tuscany:basicAuthentication> - <tuscany:userName>myname</tuscany:userName> - <tuscany:password>mypassword</tuscany:password> - </tuscany:basicAuthentication> - </sca:policySet> - - <sca:policySet name="ImplementationIdentityPolicySet" - attachTo="//sca:implementation.java" - provides="tuscany:identity" - appliesTo="//sca:implementation.java"> - <tuscany:securityIdentity> - <tuscany:useCallerIdentity/> - </tuscany:securityIdentity> - </sca:policySet> - -</definitions>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite b/sca-java-2.x/trunk/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite deleted file mode 100644 index 166565baa0..0000000000 --- a/sca-java-2.x/trunk/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite +++ /dev/null @@ -1,45 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://www.tuscany.apache.org/itests/binding/ws/axis2" - name="HelloWorld"> - - <component name="HelloWorldClient"> - <implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.helloworld.HelloWorldClient"/> - <reference name="helloWorldWS" requires="authentication"> - <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" /> - <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort1)"/> - </reference> - </component> - - <component name="HelloWorldService" requires="authentication"> - <implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.helloworld.HelloWorldService"/> - <service name="HelloWorld"> - <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" /> - <binding.ws wsdlElement="http://helloworld#wsdl.binding(HelloWorldSoapBinding)"> - <wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing"> - <wsa:Address>http://localhost:8085/services/HelloWorldWebService1</wsa:Address> - </wsa:EndpointReference> - </binding.ws> - </service> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl b/sca-java-2.x/trunk/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl deleted file mode 100644 index a352696b8e..0000000000 --- a/sca-java-2.x/trunk/itest/ws/authentication-basic/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl +++ /dev/null @@ -1,90 +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. ---> -<wsdl:definitions targetNamespace="http://helloworld" - xmlns:tns="http://helloworld" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - name="helloworld"> - - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema"> - - <element name="getGreetings"> - <complexType> - <sequence> - <element name="name" type="xsd:string"/> - </sequence> - </complexType> - </element> - - <element name="getGreetingsResponse"> - <complexType> - <sequence> - <element name="getGreetingsReturn" type="xsd:string"/> - </sequence> - </complexType> - </element> - - </schema> - </wsdl:types> - - <wsdl:message name="getGreetingsRequest"> - <wsdl:part element="tns:getGreetings" name="parameters"/> - </wsdl:message> - - <wsdl:message name="getGreetingsResponse"> - <wsdl:part element="tns:getGreetingsResponse" name="parameters"/> - </wsdl:message> - - <wsdl:portType name="HelloWorld"> - <wsdl:operation name="getGreetings"> - <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/> - <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/> - </wsdl:operation> - </wsdl:portType> - - <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld"> - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="getGreetings"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="getGreetingsRequest"> - <wsdlsoap:body use="literal"/> - </wsdl:input> - <wsdl:output name="getGreetingsResponse"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - - </wsdl:binding> - - <wsdl:service name="HelloWorldService"> - <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort1"> - <wsdlsoap:address location="http://localhost:8085/services/HelloWorldWebService1"/> - </wsdl:port> - <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort2"> - <wsdlsoap:address location="http://localhost:8085/services/HelloWorldWebService2"/> - </wsdl:port> - <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort3"> - <wsdlsoap:address location="http://localhost:8085/services/HelloWorldWebService3"/> - </wsdl:port> - </wsdl:service> - -</wsdl:definitions> diff --git a/sca-java-2.x/trunk/itest/ws/authentication-basic/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloworldTestCase.java b/sca-java-2.x/trunk/itest/ws/authentication-basic/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloworldTestCase.java deleted file mode 100644 index 380fc5b0f5..0000000000 --- a/sca-java-2.x/trunk/itest/ws/authentication-basic/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloworldTestCase.java +++ /dev/null @@ -1,52 +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.binding.ws.axis2; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.binding.ws.axis2.helloworld.HelloWorld; -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.Ignore; - -//@Ignore("TUSCANY-3631") -public class HelloworldTestCase extends TestCase { - - private Node node; - private HelloWorld helloWorld; - - public void testCalculator() throws Exception { - assertEquals("Hello fred myname", helloWorld.getGreetings("fred")); - } - - @Override - protected void setUp() throws Exception { - node = NodeFactory.newInstance().createNode(new Contribution("test", "target/classes")); - node.start(); - helloWorld = node.getService(HelloWorld.class, "HelloWorldClient"); - } - - @Override - protected void tearDown() throws Exception { - node.stop(); - } - -} diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback-forwardspec/pom.xml b/sca-java-2.x/trunk/itest/ws/contribution-callback-forwardspec/pom.xml deleted file mode 100644 index ff868b9bd3..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-callback-forwardspec/pom.xml +++ /dev/null @@ -1,123 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-ws-contribution-callback-forwardspec</artifactId>
- <name>Apache Tuscany SCA iTest WS Contribution Callback Forward Bindings Specified</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-feature-core</artifactId>
- <type>pom</type>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>target/jaxws-source</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxws-maven-plugin</artifactId>
- <version>1.12</version>
- <!-- Explicitly add the transitive dependencies for jaxws-api
- http://jira.codehaus.org/browse/MEV-498
- -->
- <dependencies>
- <dependency>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- <version>1.0-MR1</version>
- </dependency>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>wsgen1</id>
- <phase>process-classes</phase>
- <goals>
- <goal>wsgen</goal>
- </goals>
- <configuration>
- <sei>org.apache.tuscany.sca.binding.ws.HelloWorldImpl</sei>
- <genWsdl>true</genWsdl>
- <staleFile>${project.build.directory}/jaxws/stale/.wsgen1StaleFlag</staleFile>
- </configuration>
- </execution>
- <execution>
- <id>wsimport1</id>
- <phase>process-resources</phase>
- <goals>
- <goal>wsimport</goal>
- </goals>
- <configuration>
- <packageName>org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface</packageName>
- <wsdlDirectory>${basedir}/target/classes</wsdlDirectory>
- <wsdlFiles>
- <wsdlFile>helloworld-external-service.wsdl</wsdlFile>
- </wsdlFiles>
- <staleFile>${project.build.directory}/jaxws/stale/.wsimport1StaleFlag</staleFile>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <target>2.1</target>
- <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
- <resourceDestDir>${project.build.directory}/jaxws-source</resourceDestDir>
- <verbose>true</verbose>
- <xnocompile>true</xnocompile>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java b/sca-java-2.x/trunk/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java deleted file mode 100644 index 6bc67db5fc..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java +++ /dev/null @@ -1,32 +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.binding.ws;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface HelloWorld {
-
- String getGreetings(String s);
- String getGreetingsException(String s) throws ServiceRuntimeException;
- Foo getGreetingsComplex(Foo foo);
-}
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java b/sca-java-2.x/trunk/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java deleted file mode 100644 index ba117c8cfd..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java +++ /dev/null @@ -1,31 +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.binding.ws;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface HelloWorldCallback {
-
- String getGreetingsCallback(String s);
- Foo getGreetingsComplexCallback(Foo foo);
-
-}
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java b/sca-java-2.x/trunk/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java deleted file mode 100644 index 3521fa5624..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java +++ /dev/null @@ -1,34 +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.binding.ws;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-@Callback(HelloWorldCallback.class)
-public interface HelloWorldCallbackService {
-
- String getGreetings(String s);
- String getGreetingsException(String s) throws ServiceRuntimeException;
- Foo getGreetingsComplex(Foo foo);
-}
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java b/sca-java-2.x/trunk/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java deleted file mode 100644 index 057b884bc9..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java +++ /dev/null @@ -1,53 +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.binding.ws;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(HelloWorldCallbackService.class)
-public class HelloWorldCallbackServiceImpl implements HelloWorldCallbackService {
-
- @Callback
- protected HelloWorldCallback helloWorldCallback;
-
- public String getGreetings(String s) {
- System.out.println("Entering SCA HelloWorldCallbackService.getGreetings: " + s);
- String response = helloWorldCallback.getGreetingsCallback(s);
- System.out.println("Leaving SCA HelloWorldCallbackService.getGreetings: " + response);
- return response;
- }
-
- public String getGreetingsException(String s) throws ServiceRuntimeException {
- System.out.println("Entering SCA HelloWorldCallbackService.getGreetingsException: " + s);
- String response = helloWorldCallback.getGreetingsCallback(s);
- System.out.println("Leaving SCA HelloWorldCallbackService.getGreetings: " + response);
- throw new ServiceRuntimeException(response);
- }
-
- public Foo getGreetingsComplex(Foo foo){
- System.out.println("Entering SCA HelloWorldCallbackService.getGreetingsComplex: " + foo.getBars().get(0).getS());
- Foo response = helloWorldCallback.getGreetingsComplexCallback(foo);
- System.out.println("Leaving SCA HelloWorldCallbackService.getGreetingsComplex: " + foo.getBars().get(0).getS());
- return response;
- }
-}
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java b/sca-java-2.x/trunk/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java deleted file mode 100644 index 1ff58a29b0..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-callback-forwardspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java +++ /dev/null @@ -1,84 +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.binding.ws;
-
-import javax.jws.WebService;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo;
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.HelloWorldService;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Reference;
-
-@WebService
-public class HelloWorldImpl implements HelloWorld, HelloWorldCallback {
-
- @Reference
- public HelloWorldService helloWorldExternal;
-
- @Reference
- public HelloWorldCallbackService helloWorldCallbackService;
-
- // HelloWorld operations
-
- public String getGreetings(String s) {
- System.out.println("Entering SCA HelloWorld.getGreetings: " + s);
- String response = helloWorldCallbackService.getGreetings(s);
- System.out.println("Leaving SCA HelloWorld.getGreetings: " + response);
- return response;
- }
-
- public String getGreetingsException(String s) throws ServiceRuntimeException {
- System.out.println("Entering SCA HelloWorld.getGreetingsException: " + s);
- String response = helloWorldCallbackService.getGreetings(s);
- System.out.println("Leaving SCA HelloWorld.getGreetings: " + response);
- throw new ServiceRuntimeException(response);
- }
-
- public Foo getGreetingsComplex(Foo foo){
- System.out.println("Entering SCA HelloWorld.getGreetingsComplex: " + foo.getBars().get(0).getS());
- Foo response = helloWorldCallbackService.getGreetingsComplex(foo);
- System.out.println("Leaving SCA HelloWorld.getGreetingsComplex: " + foo.getBars().get(0).getS());
- return response;
- }
-
- // HelloWorldCallback operations
-
- public String getGreetingsCallback(String s) {
- System.out.println("Entering SCA HelloWorld.getGreetingsCallback: " + s);
- String response = helloWorldExternal.getGreetings(s);
- System.out.println("Leaving SCA HelloWorld.getGreetingsCallback: " + response);
- return response;
- }
-
- public String getGreetingsExceptionCallback(String s) throws ServiceRuntimeException {
- System.out.println("Entering SCA HelloWorld.getGreetingsExceptionCallback: " + s);
- String response = helloWorldExternal.getGreetings(s);
- System.out.println("Leaving SCA HelloWorld.getGreetingsCallback: " + response);
- throw new ServiceRuntimeException(response);
- }
-
- public Foo getGreetingsComplexCallback(Foo foo){
- System.out.println("Entering SCA HelloWorld.getGreetingsComplexCallback: " + foo.getBars().get(0).getS());
- Foo response = helloWorldExternal.getGreetingsComplex(foo);
- System.out.println("Leaving SCA HelloWorld.getGreetingsComplexCallback: " + foo.getBars().get(0).getS());
- return response;
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback-forwardspec/src/main/resources/HelloWorldServiceService_schema1.xsd b/sca-java-2.x/trunk/itest/ws/contribution-callback-forwardspec/src/main/resources/HelloWorldServiceService_schema1.xsd deleted file mode 100644 index acdfcaaaa5..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-callback-forwardspec/src/main/resources/HelloWorldServiceService_schema1.xsd +++ /dev/null @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- * 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.
--->
-<xs:schema version="1.0" targetNamespace="http://helloworld/external" xmlns:tns="http://helloworld/external" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:element name="getGreetings" type="tns:getGreetings"/>
-
- <xs:element name="getGreetingsComplex" type="tns:getGreetingsComplex"/>
-
- <xs:element name="getGreetingsComplexResponse" type="tns:getGreetingsComplexResponse"/>
-
- <xs:element name="getGreetingsResponse" type="tns:getGreetingsResponse"/>
-
- <xs:complexType name="getGreetings">
- <xs:sequence>
- <xs:element name="name" type="xs:string" form="qualified" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetingsResponse">
- <xs:sequence>
- <xs:element name="getGreetingsReturn" type="xs:string" form="qualified" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetingsComplex">
- <xs:sequence>
- <xs:element name="arg0" type="tns:foo" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="foo">
- <xs:sequence>
- <xs:element name="bars" type="tns:bar" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="bar">
- <xs:sequence>
- <xs:element name="b" type="xs:boolean" minOccurs="0"/>
- <xs:element name="s" type="xs:string" minOccurs="0"/>
- <xs:element name="x" type="xs:int"/>
- <xs:element name="y" type="xs:int" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetingsComplexResponse">
- <xs:sequence>
- <xs:element name="return" type="tns:foo" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
-
-
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback-forwardspec/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/ws/contribution-callback-forwardspec/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 350ad6be96..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-callback-forwardspec/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://www.tuscany.apache.org/itests/binding/ws/axis2">
- <deployable composite="itest:HelloWorld"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback-forwardspec/src/main/resources/helloworld-external-service.wsdl b/sca-java-2.x/trunk/itest/ws/contribution-callback-forwardspec/src/main/resources/helloworld-external-service.wsdl deleted file mode 100644 index 837bcb059e..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-callback-forwardspec/src/main/resources/helloworld-external-service.wsdl +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- * 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.
--->
-<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.7-b01-. -->
-<definitions targetNamespace="http://helloworld/external" name="HelloWorldServiceService" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://helloworld/external" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
- <types>
- <xsd:schema>
- <xsd:import namespace="http://helloworld/external" schemaLocation="HelloWorldServiceService_schema1.xsd"/>
- </xsd:schema>
- </types>
- <message name="getGreetings">
- <part name="parameters" element="tns:getGreetings"/>
- </message>
- <message name="getGreetingsResponse">
- <part name="parameters" element="tns:getGreetingsResponse"/>
- </message>
- <message name="getGreetingsComplex">
- <part name="parameters" element="tns:getGreetingsComplex"/>
- </message>
- <message name="getGreetingsComplexResponse">
- <part name="parameters" element="tns:getGreetingsComplexResponse"/>
- </message>
- <portType name="HelloWorldService">
- <operation name="getGreetings">
- <input message="tns:getGreetings"/>
- <output message="tns:getGreetingsResponse"/>
- </operation>
- <operation name="getGreetingsComplex">
- <input message="tns:getGreetingsComplex"/>
- <output message="tns:getGreetingsComplexResponse"/>
- </operation>
- </portType>
- <binding name="HelloWorldServicePortBinding" type="tns:HelloWorldService">
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
- <operation name="getGreetings">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- <operation name="getGreetingsComplex">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- </binding>
- <service name="HelloWorldServiceService">
- <port name="HelloWorldServicePort" binding="tns:HelloWorldServicePortBinding">
- <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
- </port>
- </service>
-</definitions>
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback-forwardspec/src/main/resources/helloworld.composite b/sca-java-2.x/trunk/itest/ws/contribution-callback-forwardspec/src/main/resources/helloworld.composite deleted file mode 100644 index 2be7fd7315..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-callback-forwardspec/src/main/resources/helloworld.composite +++ /dev/null @@ -1,45 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://www.tuscany.apache.org/itests/binding/ws/axis2"
- name="HelloWorld">
-
- <component name="HelloWorldService">
- <implementation.java class="org.apache.tuscany.sca.binding.ws.HelloWorldImpl"/>
- <service name="HelloWorld">
- <binding.ws uri="http://localhost:8085/HelloWorldService/HelloWorld"/>
- </service>
- <reference name="helloWorldExternal">
- <binding.ws uri="http://localhost:8086/External/HelloWorld"/>
- </reference>
- <reference name="helloWorldCallbackService">
- <binding.ws uri="http://localhost:8085/HelloWorldCallbackService"/>
- </reference>
- </component>
-
- <component name="HelloWorldCallbackService">
- <implementation.java class="org.apache.tuscany.sca.binding.ws.HelloWorldCallbackServiceImpl"/>
- <service name="HelloWorldCallbackService">
- <binding.ws uri="http://localhost:8085/HelloWorldCallbackService"/>
- </service>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback-fullspec/pom.xml b/sca-java-2.x/trunk/itest/ws/contribution-callback-fullspec/pom.xml deleted file mode 100644 index 68273c819b..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-callback-fullspec/pom.xml +++ /dev/null @@ -1,123 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-ws-contribution-callback-fullspec</artifactId>
- <name>Apache Tuscany SCA iTest WS Contribution Callback Fully Specified</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-feature-core</artifactId>
- <type>pom</type>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>target/jaxws-source</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxws-maven-plugin</artifactId>
- <version>1.12</version>
- <!-- Explicitly add the transitive dependencies for jaxws-api
- http://jira.codehaus.org/browse/MEV-498
- -->
- <dependencies>
- <dependency>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- <version>1.0-MR1</version>
- </dependency>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>wsgen1</id>
- <phase>process-classes</phase>
- <goals>
- <goal>wsgen</goal>
- </goals>
- <configuration>
- <sei>org.apache.tuscany.sca.binding.ws.HelloWorldImpl</sei>
- <genWsdl>true</genWsdl>
- <staleFile>${project.build.directory}/jaxws/stale/.wsgen1StaleFlag</staleFile>
- </configuration>
- </execution>
- <execution>
- <id>wsimport1</id>
- <phase>process-resources</phase>
- <goals>
- <goal>wsimport</goal>
- </goals>
- <configuration>
- <packageName>org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface</packageName>
- <wsdlDirectory>${basedir}/target/classes</wsdlDirectory>
- <wsdlFiles>
- <wsdlFile>helloworld-external-service.wsdl</wsdlFile>
- </wsdlFiles>
- <staleFile>${project.build.directory}/jaxws/stale/.wsimport1StaleFlag</staleFile>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <target>2.1</target>
- <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
- <resourceDestDir>${project.build.directory}/jaxws-source</resourceDestDir>
- <verbose>true</verbose>
- <xnocompile>true</xnocompile>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java b/sca-java-2.x/trunk/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java deleted file mode 100644 index 6bc67db5fc..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java +++ /dev/null @@ -1,32 +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.binding.ws;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface HelloWorld {
-
- String getGreetings(String s);
- String getGreetingsException(String s) throws ServiceRuntimeException;
- Foo getGreetingsComplex(Foo foo);
-}
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java b/sca-java-2.x/trunk/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java deleted file mode 100644 index ba117c8cfd..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java +++ /dev/null @@ -1,31 +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.binding.ws;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface HelloWorldCallback {
-
- String getGreetingsCallback(String s);
- Foo getGreetingsComplexCallback(Foo foo);
-
-}
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java b/sca-java-2.x/trunk/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java deleted file mode 100644 index 3521fa5624..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java +++ /dev/null @@ -1,34 +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.binding.ws;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-@Callback(HelloWorldCallback.class)
-public interface HelloWorldCallbackService {
-
- String getGreetings(String s);
- String getGreetingsException(String s) throws ServiceRuntimeException;
- Foo getGreetingsComplex(Foo foo);
-}
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java b/sca-java-2.x/trunk/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java deleted file mode 100644 index 057b884bc9..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java +++ /dev/null @@ -1,53 +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.binding.ws;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(HelloWorldCallbackService.class)
-public class HelloWorldCallbackServiceImpl implements HelloWorldCallbackService {
-
- @Callback
- protected HelloWorldCallback helloWorldCallback;
-
- public String getGreetings(String s) {
- System.out.println("Entering SCA HelloWorldCallbackService.getGreetings: " + s);
- String response = helloWorldCallback.getGreetingsCallback(s);
- System.out.println("Leaving SCA HelloWorldCallbackService.getGreetings: " + response);
- return response;
- }
-
- public String getGreetingsException(String s) throws ServiceRuntimeException {
- System.out.println("Entering SCA HelloWorldCallbackService.getGreetingsException: " + s);
- String response = helloWorldCallback.getGreetingsCallback(s);
- System.out.println("Leaving SCA HelloWorldCallbackService.getGreetings: " + response);
- throw new ServiceRuntimeException(response);
- }
-
- public Foo getGreetingsComplex(Foo foo){
- System.out.println("Entering SCA HelloWorldCallbackService.getGreetingsComplex: " + foo.getBars().get(0).getS());
- Foo response = helloWorldCallback.getGreetingsComplexCallback(foo);
- System.out.println("Leaving SCA HelloWorldCallbackService.getGreetingsComplex: " + foo.getBars().get(0).getS());
- return response;
- }
-}
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java b/sca-java-2.x/trunk/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java deleted file mode 100644 index 1ff58a29b0..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-callback-fullspec/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java +++ /dev/null @@ -1,84 +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.binding.ws;
-
-import javax.jws.WebService;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo;
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.HelloWorldService;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Reference;
-
-@WebService
-public class HelloWorldImpl implements HelloWorld, HelloWorldCallback {
-
- @Reference
- public HelloWorldService helloWorldExternal;
-
- @Reference
- public HelloWorldCallbackService helloWorldCallbackService;
-
- // HelloWorld operations
-
- public String getGreetings(String s) {
- System.out.println("Entering SCA HelloWorld.getGreetings: " + s);
- String response = helloWorldCallbackService.getGreetings(s);
- System.out.println("Leaving SCA HelloWorld.getGreetings: " + response);
- return response;
- }
-
- public String getGreetingsException(String s) throws ServiceRuntimeException {
- System.out.println("Entering SCA HelloWorld.getGreetingsException: " + s);
- String response = helloWorldCallbackService.getGreetings(s);
- System.out.println("Leaving SCA HelloWorld.getGreetings: " + response);
- throw new ServiceRuntimeException(response);
- }
-
- public Foo getGreetingsComplex(Foo foo){
- System.out.println("Entering SCA HelloWorld.getGreetingsComplex: " + foo.getBars().get(0).getS());
- Foo response = helloWorldCallbackService.getGreetingsComplex(foo);
- System.out.println("Leaving SCA HelloWorld.getGreetingsComplex: " + foo.getBars().get(0).getS());
- return response;
- }
-
- // HelloWorldCallback operations
-
- public String getGreetingsCallback(String s) {
- System.out.println("Entering SCA HelloWorld.getGreetingsCallback: " + s);
- String response = helloWorldExternal.getGreetings(s);
- System.out.println("Leaving SCA HelloWorld.getGreetingsCallback: " + response);
- return response;
- }
-
- public String getGreetingsExceptionCallback(String s) throws ServiceRuntimeException {
- System.out.println("Entering SCA HelloWorld.getGreetingsExceptionCallback: " + s);
- String response = helloWorldExternal.getGreetings(s);
- System.out.println("Leaving SCA HelloWorld.getGreetingsCallback: " + response);
- throw new ServiceRuntimeException(response);
- }
-
- public Foo getGreetingsComplexCallback(Foo foo){
- System.out.println("Entering SCA HelloWorld.getGreetingsComplexCallback: " + foo.getBars().get(0).getS());
- Foo response = helloWorldExternal.getGreetingsComplex(foo);
- System.out.println("Leaving SCA HelloWorld.getGreetingsComplexCallback: " + foo.getBars().get(0).getS());
- return response;
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback-fullspec/src/main/resources/HelloWorldServiceService_schema1.xsd b/sca-java-2.x/trunk/itest/ws/contribution-callback-fullspec/src/main/resources/HelloWorldServiceService_schema1.xsd deleted file mode 100644 index acdfcaaaa5..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-callback-fullspec/src/main/resources/HelloWorldServiceService_schema1.xsd +++ /dev/null @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- * 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.
--->
-<xs:schema version="1.0" targetNamespace="http://helloworld/external" xmlns:tns="http://helloworld/external" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:element name="getGreetings" type="tns:getGreetings"/>
-
- <xs:element name="getGreetingsComplex" type="tns:getGreetingsComplex"/>
-
- <xs:element name="getGreetingsComplexResponse" type="tns:getGreetingsComplexResponse"/>
-
- <xs:element name="getGreetingsResponse" type="tns:getGreetingsResponse"/>
-
- <xs:complexType name="getGreetings">
- <xs:sequence>
- <xs:element name="name" type="xs:string" form="qualified" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetingsResponse">
- <xs:sequence>
- <xs:element name="getGreetingsReturn" type="xs:string" form="qualified" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetingsComplex">
- <xs:sequence>
- <xs:element name="arg0" type="tns:foo" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="foo">
- <xs:sequence>
- <xs:element name="bars" type="tns:bar" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="bar">
- <xs:sequence>
- <xs:element name="b" type="xs:boolean" minOccurs="0"/>
- <xs:element name="s" type="xs:string" minOccurs="0"/>
- <xs:element name="x" type="xs:int"/>
- <xs:element name="y" type="xs:int" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetingsComplexResponse">
- <xs:sequence>
- <xs:element name="return" type="tns:foo" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
-
-
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback-fullspec/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/ws/contribution-callback-fullspec/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 350ad6be96..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-callback-fullspec/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://www.tuscany.apache.org/itests/binding/ws/axis2">
- <deployable composite="itest:HelloWorld"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback-fullspec/src/main/resources/helloworld-external-service.wsdl b/sca-java-2.x/trunk/itest/ws/contribution-callback-fullspec/src/main/resources/helloworld-external-service.wsdl deleted file mode 100644 index 837bcb059e..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-callback-fullspec/src/main/resources/helloworld-external-service.wsdl +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- * 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.
--->
-<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.7-b01-. -->
-<definitions targetNamespace="http://helloworld/external" name="HelloWorldServiceService" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://helloworld/external" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
- <types>
- <xsd:schema>
- <xsd:import namespace="http://helloworld/external" schemaLocation="HelloWorldServiceService_schema1.xsd"/>
- </xsd:schema>
- </types>
- <message name="getGreetings">
- <part name="parameters" element="tns:getGreetings"/>
- </message>
- <message name="getGreetingsResponse">
- <part name="parameters" element="tns:getGreetingsResponse"/>
- </message>
- <message name="getGreetingsComplex">
- <part name="parameters" element="tns:getGreetingsComplex"/>
- </message>
- <message name="getGreetingsComplexResponse">
- <part name="parameters" element="tns:getGreetingsComplexResponse"/>
- </message>
- <portType name="HelloWorldService">
- <operation name="getGreetings">
- <input message="tns:getGreetings"/>
- <output message="tns:getGreetingsResponse"/>
- </operation>
- <operation name="getGreetingsComplex">
- <input message="tns:getGreetingsComplex"/>
- <output message="tns:getGreetingsComplexResponse"/>
- </operation>
- </portType>
- <binding name="HelloWorldServicePortBinding" type="tns:HelloWorldService">
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
- <operation name="getGreetings">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- <operation name="getGreetingsComplex">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- </binding>
- <service name="HelloWorldServiceService">
- <port name="HelloWorldServicePort" binding="tns:HelloWorldServicePortBinding">
- <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
- </port>
- </service>
-</definitions>
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback-fullspec/src/main/resources/helloworld.composite b/sca-java-2.x/trunk/itest/ws/contribution-callback-fullspec/src/main/resources/helloworld.composite deleted file mode 100644 index 31414beb47..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-callback-fullspec/src/main/resources/helloworld.composite +++ /dev/null @@ -1,51 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://www.tuscany.apache.org/itests/binding/ws/axis2"
- name="HelloWorld">
-
- <component name="HelloWorldService">
- <implementation.java class="org.apache.tuscany.sca.binding.ws.HelloWorldImpl"/>
- <service name="HelloWorld">
- <binding.ws uri="http://localhost:8085/HelloWorldService/HelloWorld"/>
- </service>
- <reference name="helloWorldExternal">
- <binding.ws uri="http://localhost:8086/External/HelloWorld"/>
- </reference>
- <reference name="helloWorldCallbackService">
- <binding.ws uri="http://localhost:8084/HelloWorldCallbackService"/>
- <callback>
- <binding.ws uri="http://localhost:8085/HelloWorldService/HelloWorldCallback"/>
- </callback>
- </reference>
- </component>
-
- <component name="HelloWorldCallbackService">
- <implementation.java class="org.apache.tuscany.sca.binding.ws.HelloWorldCallbackServiceImpl"/>
- <service name="HelloWorldCallbackService">
- <binding.ws uri="http://localhost:8084/HelloWorldCallbackService"/>
- <callback>
- <binding.ws/>
- </callback>
- </service>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback-promotion/pom.xml b/sca-java-2.x/trunk/itest/ws/contribution-callback-promotion/pom.xml deleted file mode 100644 index dcada2d5ad..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-callback-promotion/pom.xml +++ /dev/null @@ -1,123 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-ws-contribution-callback-promotion</artifactId>
- <name>Apache Tuscany SCA iTest WS Contribution Callback Promotion</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-feature-core</artifactId>
- <type>pom</type>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>target/jaxws-source</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxws-maven-plugin</artifactId>
- <version>1.12</version>
- <!-- Explicitly add the transitive dependencies for jaxws-api
- http://jira.codehaus.org/browse/MEV-498
- -->
- <dependencies>
- <dependency>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- <version>1.0-MR1</version>
- </dependency>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>wsgen1</id>
- <phase>process-classes</phase>
- <goals>
- <goal>wsgen</goal>
- </goals>
- <configuration>
- <sei>org.apache.tuscany.sca.binding.ws.HelloWorldImpl</sei>
- <genWsdl>true</genWsdl>
- <staleFile>${project.build.directory}/jaxws/stale/.wsgen1StaleFlag</staleFile>
- </configuration>
- </execution>
- <execution>
- <id>wsimport1</id>
- <phase>process-resources</phase>
- <goals>
- <goal>wsimport</goal>
- </goals>
- <configuration>
- <packageName>org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface</packageName>
- <wsdlDirectory>${basedir}/target/classes</wsdlDirectory>
- <wsdlFiles>
- <wsdlFile>helloworld-external-service.wsdl</wsdlFile>
- </wsdlFiles>
- <staleFile>${project.build.directory}/jaxws/stale/.wsimport1StaleFlag</staleFile>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <target>2.1</target>
- <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
- <resourceDestDir>${project.build.directory}/jaxws-source</resourceDestDir>
- <verbose>true</verbose>
- <xnocompile>true</xnocompile>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java b/sca-java-2.x/trunk/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java deleted file mode 100644 index 6bc67db5fc..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java +++ /dev/null @@ -1,32 +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.binding.ws;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface HelloWorld {
-
- String getGreetings(String s);
- String getGreetingsException(String s) throws ServiceRuntimeException;
- Foo getGreetingsComplex(Foo foo);
-}
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java b/sca-java-2.x/trunk/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java deleted file mode 100644 index ba117c8cfd..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java +++ /dev/null @@ -1,31 +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.binding.ws;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface HelloWorldCallback {
-
- String getGreetingsCallback(String s);
- Foo getGreetingsComplexCallback(Foo foo);
-
-}
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java b/sca-java-2.x/trunk/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java deleted file mode 100644 index 3521fa5624..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java +++ /dev/null @@ -1,34 +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.binding.ws;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-@Callback(HelloWorldCallback.class)
-public interface HelloWorldCallbackService {
-
- String getGreetings(String s);
- String getGreetingsException(String s) throws ServiceRuntimeException;
- Foo getGreetingsComplex(Foo foo);
-}
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java b/sca-java-2.x/trunk/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java deleted file mode 100644 index 057b884bc9..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java +++ /dev/null @@ -1,53 +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.binding.ws;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(HelloWorldCallbackService.class)
-public class HelloWorldCallbackServiceImpl implements HelloWorldCallbackService {
-
- @Callback
- protected HelloWorldCallback helloWorldCallback;
-
- public String getGreetings(String s) {
- System.out.println("Entering SCA HelloWorldCallbackService.getGreetings: " + s);
- String response = helloWorldCallback.getGreetingsCallback(s);
- System.out.println("Leaving SCA HelloWorldCallbackService.getGreetings: " + response);
- return response;
- }
-
- public String getGreetingsException(String s) throws ServiceRuntimeException {
- System.out.println("Entering SCA HelloWorldCallbackService.getGreetingsException: " + s);
- String response = helloWorldCallback.getGreetingsCallback(s);
- System.out.println("Leaving SCA HelloWorldCallbackService.getGreetings: " + response);
- throw new ServiceRuntimeException(response);
- }
-
- public Foo getGreetingsComplex(Foo foo){
- System.out.println("Entering SCA HelloWorldCallbackService.getGreetingsComplex: " + foo.getBars().get(0).getS());
- Foo response = helloWorldCallback.getGreetingsComplexCallback(foo);
- System.out.println("Leaving SCA HelloWorldCallbackService.getGreetingsComplex: " + foo.getBars().get(0).getS());
- return response;
- }
-}
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java b/sca-java-2.x/trunk/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java deleted file mode 100644 index 1ff58a29b0..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-callback-promotion/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java +++ /dev/null @@ -1,84 +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.binding.ws;
-
-import javax.jws.WebService;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo;
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.HelloWorldService;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Reference;
-
-@WebService
-public class HelloWorldImpl implements HelloWorld, HelloWorldCallback {
-
- @Reference
- public HelloWorldService helloWorldExternal;
-
- @Reference
- public HelloWorldCallbackService helloWorldCallbackService;
-
- // HelloWorld operations
-
- public String getGreetings(String s) {
- System.out.println("Entering SCA HelloWorld.getGreetings: " + s);
- String response = helloWorldCallbackService.getGreetings(s);
- System.out.println("Leaving SCA HelloWorld.getGreetings: " + response);
- return response;
- }
-
- public String getGreetingsException(String s) throws ServiceRuntimeException {
- System.out.println("Entering SCA HelloWorld.getGreetingsException: " + s);
- String response = helloWorldCallbackService.getGreetings(s);
- System.out.println("Leaving SCA HelloWorld.getGreetings: " + response);
- throw new ServiceRuntimeException(response);
- }
-
- public Foo getGreetingsComplex(Foo foo){
- System.out.println("Entering SCA HelloWorld.getGreetingsComplex: " + foo.getBars().get(0).getS());
- Foo response = helloWorldCallbackService.getGreetingsComplex(foo);
- System.out.println("Leaving SCA HelloWorld.getGreetingsComplex: " + foo.getBars().get(0).getS());
- return response;
- }
-
- // HelloWorldCallback operations
-
- public String getGreetingsCallback(String s) {
- System.out.println("Entering SCA HelloWorld.getGreetingsCallback: " + s);
- String response = helloWorldExternal.getGreetings(s);
- System.out.println("Leaving SCA HelloWorld.getGreetingsCallback: " + response);
- return response;
- }
-
- public String getGreetingsExceptionCallback(String s) throws ServiceRuntimeException {
- System.out.println("Entering SCA HelloWorld.getGreetingsExceptionCallback: " + s);
- String response = helloWorldExternal.getGreetings(s);
- System.out.println("Leaving SCA HelloWorld.getGreetingsCallback: " + response);
- throw new ServiceRuntimeException(response);
- }
-
- public Foo getGreetingsComplexCallback(Foo foo){
- System.out.println("Entering SCA HelloWorld.getGreetingsComplexCallback: " + foo.getBars().get(0).getS());
- Foo response = helloWorldExternal.getGreetingsComplex(foo);
- System.out.println("Leaving SCA HelloWorld.getGreetingsComplexCallback: " + foo.getBars().get(0).getS());
- return response;
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback-promotion/src/main/resources/HelloWorldServiceService_schema1.xsd b/sca-java-2.x/trunk/itest/ws/contribution-callback-promotion/src/main/resources/HelloWorldServiceService_schema1.xsd deleted file mode 100644 index acdfcaaaa5..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-callback-promotion/src/main/resources/HelloWorldServiceService_schema1.xsd +++ /dev/null @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- * 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.
--->
-<xs:schema version="1.0" targetNamespace="http://helloworld/external" xmlns:tns="http://helloworld/external" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:element name="getGreetings" type="tns:getGreetings"/>
-
- <xs:element name="getGreetingsComplex" type="tns:getGreetingsComplex"/>
-
- <xs:element name="getGreetingsComplexResponse" type="tns:getGreetingsComplexResponse"/>
-
- <xs:element name="getGreetingsResponse" type="tns:getGreetingsResponse"/>
-
- <xs:complexType name="getGreetings">
- <xs:sequence>
- <xs:element name="name" type="xs:string" form="qualified" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetingsResponse">
- <xs:sequence>
- <xs:element name="getGreetingsReturn" type="xs:string" form="qualified" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetingsComplex">
- <xs:sequence>
- <xs:element name="arg0" type="tns:foo" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="foo">
- <xs:sequence>
- <xs:element name="bars" type="tns:bar" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="bar">
- <xs:sequence>
- <xs:element name="b" type="xs:boolean" minOccurs="0"/>
- <xs:element name="s" type="xs:string" minOccurs="0"/>
- <xs:element name="x" type="xs:int"/>
- <xs:element name="y" type="xs:int" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetingsComplexResponse">
- <xs:sequence>
- <xs:element name="return" type="tns:foo" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
-
-
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback-promotion/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/ws/contribution-callback-promotion/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 350ad6be96..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-callback-promotion/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://www.tuscany.apache.org/itests/binding/ws/axis2">
- <deployable composite="itest:HelloWorld"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback-promotion/src/main/resources/helloworld-external-service.wsdl b/sca-java-2.x/trunk/itest/ws/contribution-callback-promotion/src/main/resources/helloworld-external-service.wsdl deleted file mode 100644 index 837bcb059e..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-callback-promotion/src/main/resources/helloworld-external-service.wsdl +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- * 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.
--->
-<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.7-b01-. -->
-<definitions targetNamespace="http://helloworld/external" name="HelloWorldServiceService" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://helloworld/external" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
- <types>
- <xsd:schema>
- <xsd:import namespace="http://helloworld/external" schemaLocation="HelloWorldServiceService_schema1.xsd"/>
- </xsd:schema>
- </types>
- <message name="getGreetings">
- <part name="parameters" element="tns:getGreetings"/>
- </message>
- <message name="getGreetingsResponse">
- <part name="parameters" element="tns:getGreetingsResponse"/>
- </message>
- <message name="getGreetingsComplex">
- <part name="parameters" element="tns:getGreetingsComplex"/>
- </message>
- <message name="getGreetingsComplexResponse">
- <part name="parameters" element="tns:getGreetingsComplexResponse"/>
- </message>
- <portType name="HelloWorldService">
- <operation name="getGreetings">
- <input message="tns:getGreetings"/>
- <output message="tns:getGreetingsResponse"/>
- </operation>
- <operation name="getGreetingsComplex">
- <input message="tns:getGreetingsComplex"/>
- <output message="tns:getGreetingsComplexResponse"/>
- </operation>
- </portType>
- <binding name="HelloWorldServicePortBinding" type="tns:HelloWorldService">
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
- <operation name="getGreetings">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- <operation name="getGreetingsComplex">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- </binding>
- <service name="HelloWorldServiceService">
- <port name="HelloWorldServicePort" binding="tns:HelloWorldServicePortBinding">
- <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
- </port>
- </service>
-</definitions>
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback-promotion/src/main/resources/helloworld.composite b/sca-java-2.x/trunk/itest/ws/contribution-callback-promotion/src/main/resources/helloworld.composite deleted file mode 100644 index 0d66bb105f..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-callback-promotion/src/main/resources/helloworld.composite +++ /dev/null @@ -1,43 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://www.tuscany.apache.org/itests/binding/ws/axis2"
- xmlns:tns="http://www.tuscany.apache.org/itests/binding/ws/axis2"
- name="HelloWorld">
-
- <component name="HelloWorldService">
- <implementation.composite name="tns:HelloWorldService"/>
- <service name="HelloWorld">
- <binding.ws uri="http://localhost:8085/HelloWorldService/HelloWorld"/>
- </service>
- <reference name="HelloWorldCallbackService">
- <binding.ws uri="http://localhost:8085/HelloWorldService/HelloWorldCallbackService"/>
- </reference>
- </component>
-
- <component name="HelloWorldCallbackService">
- <implementation.composite name="tns:HelloWorldCallbackService"/>
- <service name="HelloWorldCallbackService">
- <binding.ws uri="http://localhost:8085/HelloWorldService/HelloWorldCallbackService"/>
- </service>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback-promotion/src/main/resources/helloworldcallbackservice-bottom.composite b/sca-java-2.x/trunk/itest/ws/contribution-callback-promotion/src/main/resources/helloworldcallbackservice-bottom.composite deleted file mode 100644 index e522c6c151..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-callback-promotion/src/main/resources/helloworldcallbackservice-bottom.composite +++ /dev/null @@ -1,34 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://www.tuscany.apache.org/itests/binding/ws/axis2"
- name="HelloWorldCallbackService">
-
- <service name="HelloWorldCallbackService" promote="HelloWorldCallbackService/HelloWorldCallbackService"/>
-
- <component name="HelloWorldCallbackService">
- <implementation.java class="org.apache.tuscany.sca.binding.ws.HelloWorldCallbackServiceImpl"/>
- <service name="HelloWorldCallbackService">
- <!-- configured at the top level -->
- </service>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback-promotion/src/main/resources/helloworldservice-bottom.composite b/sca-java-2.x/trunk/itest/ws/contribution-callback-promotion/src/main/resources/helloworldservice-bottom.composite deleted file mode 100644 index aea84ad56e..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-callback-promotion/src/main/resources/helloworldservice-bottom.composite +++ /dev/null @@ -1,40 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://www.tuscany.apache.org/itests/binding/ws/axis2"
- name="HelloWorldService">
-
- <service name="HelloWorld" promote="HelloWorldService/HelloWorld"/>
- <reference name="HelloWorldCallbackService" multiplicity="1..1" promote="HelloWorldService/helloWorldCallbackService"/>
-
- <component name="HelloWorldService">
- <implementation.java class="org.apache.tuscany.sca.binding.ws.HelloWorldImpl"/>
- <service name="HelloWorld">
- <!-- configured at the top level -->
- </service>
- <reference name="helloWorldExternal">
- <binding.ws uri="http://localhost:8086/External/HelloWorld"/>
- </reference>
- <reference name="helloWorldCallbackService">
- <!-- configured at the top level -->
- </reference>
- </component>
-</composite>
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback/pom.xml b/sca-java-2.x/trunk/itest/ws/contribution-callback/pom.xml deleted file mode 100644 index efdd580b18..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-callback/pom.xml +++ /dev/null @@ -1,123 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-ws-contribution-callback</artifactId>
- <name>Apache Tuscany SCA iTest WS Contribution Callback </name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-feature-core</artifactId>
- <type>pom</type>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>target/jaxws-source</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxws-maven-plugin</artifactId>
- <version>1.12</version>
- <!-- Explicitly add the transitive dependencies for jaxws-api
- http://jira.codehaus.org/browse/MEV-498
- -->
- <dependencies>
- <dependency>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- <version>1.0-MR1</version>
- </dependency>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>wsgen1</id>
- <phase>process-classes</phase>
- <goals>
- <goal>wsgen</goal>
- </goals>
- <configuration>
- <sei>org.apache.tuscany.sca.binding.ws.HelloWorldImpl</sei>
- <genWsdl>true</genWsdl>
- <staleFile>${project.build.directory}/jaxws/stale/.wsgen1StaleFlag</staleFile>
- </configuration>
- </execution>
- <execution>
- <id>wsimport1</id>
- <phase>process-resources</phase>
- <goals>
- <goal>wsimport</goal>
- </goals>
- <configuration>
- <packageName>org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface</packageName>
- <wsdlDirectory>${basedir}/target/classes</wsdlDirectory>
- <wsdlFiles>
- <wsdlFile>helloworld-external-service.wsdl</wsdlFile>
- </wsdlFiles>
- <staleFile>${project.build.directory}/jaxws/stale/.wsimport1StaleFlag</staleFile>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <target>2.1</target>
- <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
- <resourceDestDir>${project.build.directory}/jaxws-source</resourceDestDir>
- <verbose>true</verbose>
- <xnocompile>true</xnocompile>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java b/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java deleted file mode 100644 index 6bc67db5fc..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java +++ /dev/null @@ -1,32 +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.binding.ws;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface HelloWorld {
-
- String getGreetings(String s);
- String getGreetingsException(String s) throws ServiceRuntimeException;
- Foo getGreetingsComplex(Foo foo);
-}
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java b/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java deleted file mode 100644 index ba117c8cfd..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallback.java +++ /dev/null @@ -1,31 +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.binding.ws;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface HelloWorldCallback {
-
- String getGreetingsCallback(String s);
- Foo getGreetingsComplexCallback(Foo foo);
-
-}
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java b/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java deleted file mode 100644 index 3521fa5624..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackService.java +++ /dev/null @@ -1,34 +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.binding.ws;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-@Callback(HelloWorldCallback.class)
-public interface HelloWorldCallbackService {
-
- String getGreetings(String s);
- String getGreetingsException(String s) throws ServiceRuntimeException;
- Foo getGreetingsComplex(Foo foo);
-}
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java b/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java deleted file mode 100644 index 057b884bc9..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldCallbackServiceImpl.java +++ /dev/null @@ -1,53 +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.binding.ws;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(HelloWorldCallbackService.class)
-public class HelloWorldCallbackServiceImpl implements HelloWorldCallbackService {
-
- @Callback
- protected HelloWorldCallback helloWorldCallback;
-
- public String getGreetings(String s) {
- System.out.println("Entering SCA HelloWorldCallbackService.getGreetings: " + s);
- String response = helloWorldCallback.getGreetingsCallback(s);
- System.out.println("Leaving SCA HelloWorldCallbackService.getGreetings: " + response);
- return response;
- }
-
- public String getGreetingsException(String s) throws ServiceRuntimeException {
- System.out.println("Entering SCA HelloWorldCallbackService.getGreetingsException: " + s);
- String response = helloWorldCallback.getGreetingsCallback(s);
- System.out.println("Leaving SCA HelloWorldCallbackService.getGreetings: " + response);
- throw new ServiceRuntimeException(response);
- }
-
- public Foo getGreetingsComplex(Foo foo){
- System.out.println("Entering SCA HelloWorldCallbackService.getGreetingsComplex: " + foo.getBars().get(0).getS());
- Foo response = helloWorldCallback.getGreetingsComplexCallback(foo);
- System.out.println("Leaving SCA HelloWorldCallbackService.getGreetingsComplex: " + foo.getBars().get(0).getS());
- return response;
- }
-}
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java b/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java deleted file mode 100644 index 1ff58a29b0..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java +++ /dev/null @@ -1,84 +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.binding.ws;
-
-import javax.jws.WebService;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo;
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.HelloWorldService;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Reference;
-
-@WebService
-public class HelloWorldImpl implements HelloWorld, HelloWorldCallback {
-
- @Reference
- public HelloWorldService helloWorldExternal;
-
- @Reference
- public HelloWorldCallbackService helloWorldCallbackService;
-
- // HelloWorld operations
-
- public String getGreetings(String s) {
- System.out.println("Entering SCA HelloWorld.getGreetings: " + s);
- String response = helloWorldCallbackService.getGreetings(s);
- System.out.println("Leaving SCA HelloWorld.getGreetings: " + response);
- return response;
- }
-
- public String getGreetingsException(String s) throws ServiceRuntimeException {
- System.out.println("Entering SCA HelloWorld.getGreetingsException: " + s);
- String response = helloWorldCallbackService.getGreetings(s);
- System.out.println("Leaving SCA HelloWorld.getGreetings: " + response);
- throw new ServiceRuntimeException(response);
- }
-
- public Foo getGreetingsComplex(Foo foo){
- System.out.println("Entering SCA HelloWorld.getGreetingsComplex: " + foo.getBars().get(0).getS());
- Foo response = helloWorldCallbackService.getGreetingsComplex(foo);
- System.out.println("Leaving SCA HelloWorld.getGreetingsComplex: " + foo.getBars().get(0).getS());
- return response;
- }
-
- // HelloWorldCallback operations
-
- public String getGreetingsCallback(String s) {
- System.out.println("Entering SCA HelloWorld.getGreetingsCallback: " + s);
- String response = helloWorldExternal.getGreetings(s);
- System.out.println("Leaving SCA HelloWorld.getGreetingsCallback: " + response);
- return response;
- }
-
- public String getGreetingsExceptionCallback(String s) throws ServiceRuntimeException {
- System.out.println("Entering SCA HelloWorld.getGreetingsExceptionCallback: " + s);
- String response = helloWorldExternal.getGreetings(s);
- System.out.println("Leaving SCA HelloWorld.getGreetingsCallback: " + response);
- throw new ServiceRuntimeException(response);
- }
-
- public Foo getGreetingsComplexCallback(Foo foo){
- System.out.println("Entering SCA HelloWorld.getGreetingsComplexCallback: " + foo.getBars().get(0).getS());
- Foo response = helloWorldExternal.getGreetingsComplex(foo);
- System.out.println("Leaving SCA HelloWorld.getGreetingsComplexCallback: " + foo.getBars().get(0).getS());
- return response;
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/resources/HelloWorldServiceService_schema1.xsd b/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/resources/HelloWorldServiceService_schema1.xsd deleted file mode 100644 index acdfcaaaa5..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/resources/HelloWorldServiceService_schema1.xsd +++ /dev/null @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- * 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.
--->
-<xs:schema version="1.0" targetNamespace="http://helloworld/external" xmlns:tns="http://helloworld/external" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:element name="getGreetings" type="tns:getGreetings"/>
-
- <xs:element name="getGreetingsComplex" type="tns:getGreetingsComplex"/>
-
- <xs:element name="getGreetingsComplexResponse" type="tns:getGreetingsComplexResponse"/>
-
- <xs:element name="getGreetingsResponse" type="tns:getGreetingsResponse"/>
-
- <xs:complexType name="getGreetings">
- <xs:sequence>
- <xs:element name="name" type="xs:string" form="qualified" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetingsResponse">
- <xs:sequence>
- <xs:element name="getGreetingsReturn" type="xs:string" form="qualified" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetingsComplex">
- <xs:sequence>
- <xs:element name="arg0" type="tns:foo" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="foo">
- <xs:sequence>
- <xs:element name="bars" type="tns:bar" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="bar">
- <xs:sequence>
- <xs:element name="b" type="xs:boolean" minOccurs="0"/>
- <xs:element name="s" type="xs:string" minOccurs="0"/>
- <xs:element name="x" type="xs:int"/>
- <xs:element name="y" type="xs:int" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetingsComplexResponse">
- <xs:sequence>
- <xs:element name="return" type="tns:foo" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
-
-
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 350ad6be96..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://www.tuscany.apache.org/itests/binding/ws/axis2">
- <deployable composite="itest:HelloWorld"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/resources/helloworld-external-service.wsdl b/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/resources/helloworld-external-service.wsdl deleted file mode 100644 index 837bcb059e..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/resources/helloworld-external-service.wsdl +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- * 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.
--->
-<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.7-b01-. -->
-<definitions targetNamespace="http://helloworld/external" name="HelloWorldServiceService" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://helloworld/external" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
- <types>
- <xsd:schema>
- <xsd:import namespace="http://helloworld/external" schemaLocation="HelloWorldServiceService_schema1.xsd"/>
- </xsd:schema>
- </types>
- <message name="getGreetings">
- <part name="parameters" element="tns:getGreetings"/>
- </message>
- <message name="getGreetingsResponse">
- <part name="parameters" element="tns:getGreetingsResponse"/>
- </message>
- <message name="getGreetingsComplex">
- <part name="parameters" element="tns:getGreetingsComplex"/>
- </message>
- <message name="getGreetingsComplexResponse">
- <part name="parameters" element="tns:getGreetingsComplexResponse"/>
- </message>
- <portType name="HelloWorldService">
- <operation name="getGreetings">
- <input message="tns:getGreetings"/>
- <output message="tns:getGreetingsResponse"/>
- </operation>
- <operation name="getGreetingsComplex">
- <input message="tns:getGreetingsComplex"/>
- <output message="tns:getGreetingsComplexResponse"/>
- </operation>
- </portType>
- <binding name="HelloWorldServicePortBinding" type="tns:HelloWorldService">
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
- <operation name="getGreetings">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- <operation name="getGreetingsComplex">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- </binding>
- <service name="HelloWorldServiceService">
- <port name="HelloWorldServicePort" binding="tns:HelloWorldServicePortBinding">
- <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
- </port>
- </service>
-</definitions>
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/resources/helloworld.composite b/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/resources/helloworld.composite deleted file mode 100644 index cb257d22dd..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-callback/src/main/resources/helloworld.composite +++ /dev/null @@ -1,43 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://www.tuscany.apache.org/itests/binding/ws/axis2"
- name="HelloWorld">
-
- <component name="HelloWorldService">
- <implementation.java class="org.apache.tuscany.sca.binding.ws.HelloWorldImpl"/>
- <service name="HelloWorld">
- <binding.ws uri="http://localhost:8085/HelloWorldService/HelloWorld"/>
- </service>
- <reference name="helloWorldExternal">
- <binding.ws uri="http://localhost:8086/External/HelloWorld"/>
- </reference>
- <reference name="helloWorldCallbackService" target="HelloWorldCallbackService"/>
- </component>
-
- <component name="HelloWorldCallbackService">
- <implementation.java class="org.apache.tuscany.sca.binding.ws.HelloWorldCallbackServiceImpl"/>
- <service name="HelloWorldCallbackService">
- <binding.ws uri="http://localhost:8085/HelloWorldService/HelloWorldCallbackService"/>
- </service>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/pom.xml b/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/pom.xml deleted file mode 100644 index c14b5cda66..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/pom.xml +++ /dev/null @@ -1,123 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-ws-contribution-doc-lit-wrapped</artifactId>
- <name>Apache Tuscany SCA iTest WS Contribution Doc Lit Wrapped </name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-feature-core</artifactId>
- <type>pom</type>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>target/jaxws-source</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxws-maven-plugin</artifactId>
- <version>1.12</version>
- <!-- Explicitly add the transitive dependencies for jaxws-api
- http://jira.codehaus.org/browse/MEV-498
- -->
- <dependencies>
- <dependency>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- <version>1.0-MR1</version>
- </dependency>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>wsgen1</id>
- <phase>process-classes</phase>
- <goals>
- <goal>wsgen</goal>
- </goals>
- <configuration>
- <sei>org.apache.tuscany.sca.binding.ws.HelloWorld1Impl</sei>
- <genWsdl>true</genWsdl>
- <staleFile>${project.build.directory}/jaxws/stale/.wsgen1StaleFlag</staleFile>
- </configuration>
- </execution>
- <execution>
- <id>wsimport1</id>
- <phase>process-resources</phase>
- <goals>
- <goal>wsimport</goal>
- </goals>
- <configuration>
- <packageName>org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface</packageName>
- <wsdlDirectory>${basedir}/target/classes</wsdlDirectory>
- <wsdlFiles>
- <wsdlFile>helloworld-external-service.wsdl</wsdlFile>
- </wsdlFiles>
- <staleFile>${project.build.directory}/jaxws/stale/.wsimport1StaleFlag</staleFile>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <target>2.1</target>
- <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
- <resourceDestDir>${project.build.directory}/jaxws-source</resourceDestDir>
- <verbose>true</verbose>
- <xnocompile>true</xnocompile>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java b/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java deleted file mode 100644 index 6bc67db5fc..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java +++ /dev/null @@ -1,32 +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.binding.ws;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface HelloWorld {
-
- String getGreetings(String s);
- String getGreetingsException(String s) throws ServiceRuntimeException;
- Foo getGreetingsComplex(Foo foo);
-}
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java b/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java deleted file mode 100644 index 27471f87c6..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java +++ /dev/null @@ -1,54 +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.binding.ws;
-
-import javax.jws.WebService;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Reference;
-
-@WebService
-public class HelloWorld1Impl implements HelloWorld {
-
- @Reference
- public HelloWorld helloWorld2;
-
- public String getGreetings(String s) {
- System.out.println("Entering SCA HelloWorld1.getGreetings: " + s);
- String response = helloWorld2.getGreetings(s);
- System.out.println("Leaving SCA HelloWorld1.getGreetings: " + response);
- return response;
- }
-
- public String getGreetingsException(String s) throws ServiceRuntimeException {
- System.out.println("Entering SCA HelloWorld1.getGreetingsException: " + s);
- String response = helloWorld2.getGreetings(s);
- System.out.println("Leaving SCA HelloWorld1.getGreetings: " + response);
- throw new ServiceRuntimeException(response);
- }
-
- public Foo getGreetingsComplex(Foo foo){
- System.out.println("Entering SCA HelloWorld1.getGreetingsComplex: " + foo.getBars().get(0).getS());
- Foo response = helloWorld2.getGreetingsComplex(foo);
- System.out.println("Leaving SCA HelloWorld1.getGreetingsComplex: " + foo.getBars().get(0).getS());
- return response;
- }
-}
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld2Impl.java b/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld2Impl.java deleted file mode 100644 index 6f3b430d6d..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld2Impl.java +++ /dev/null @@ -1,55 +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.binding.ws;
-
-import javax.jws.WebService;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo;
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.HelloWorldService;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Reference;
-
-@WebService
-public class HelloWorld2Impl implements HelloWorld {
-
- @Reference
- public HelloWorldService helloWorldExternal;
-
- public String getGreetings(String s) {
- System.out.println("Entering SCA HelloWorld2.getGreetings: " + s);
- String response = helloWorldExternal.getGreetings(s);
- System.out.println("Leaving SCA HelloWorld2.getGreetings: " + response);
- return response;
- }
-
- public String getGreetingsException(String s) throws ServiceRuntimeException {
- System.out.println("Entering SCA HelloWorld2.getGreetingsException: " + s);
- String response = helloWorldExternal.getGreetings(s);
- System.out.println("Leaving SCA HelloWorld2.getGreetings: " + response);
- throw new ServiceRuntimeException(response);
- }
-
- public Foo getGreetingsComplex(Foo foo){
- System.out.println("Entering SCA HelloWorld2.getGreetingsComplex: " + foo.getBars().get(0).getS());
- Foo response = helloWorldExternal.getGreetingsComplex(foo);
- System.out.println("Leaving SCA HelloWorld2.getGreetingsComplex: " + foo.getBars().get(0).getS());
- return response;
- }
-}
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit.wsdl b/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit.wsdl deleted file mode 100644 index f5a25b39f8..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit.wsdl +++ /dev/null @@ -1,109 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- * 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.
--->
-<definitions targetNamespace="http://ws.binding.sca.tuscany.apache.org/doclit"
- name="HelloWorldImplService"
- xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:tns="http://ws.binding.sca.tuscany.apache.org/doclit"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
- <types>
- <xsd:schema>
- <xsd:import namespace="http://ws.binding.sca.tuscany.apache.org/doclit"
- schemaLocation="HelloWorldImplService_doclit1.xsd"/>
- </xsd:schema>
- </types>
- <message name="getGreetings">
- <part name="parameters" element="tns:getGreetings"/>
- </message>
- <message name="getGreetingsResponse">
- <part name="parameters" element="tns:getGreetingsResponse"/>
- </message>
- <message name="getGreetingsException">
- <part name="parameters" element="tns:getGreetingsException"/>
- </message>
- <message name="getGreetingsExceptionResponse">
- <part name="parameters" element="tns:getGreetingsExceptionResponse"/>
- </message>
- <message name="Exception">
- <part name="fault" element="tns:Exception"/>
- </message>
- <message name="getGreetingsComplex">
- <part name="parameters" element="tns:getGreetingsComplex"/>
- </message>
- <message name="getGreetingsComplexResponse">
- <part name="parameters" element="tns:getGreetingsComplexResponse"/>
- </message>
- <portType name="HelloWorldImpl">
- <operation name="getGreetings">
- <input message="tns:getGreetings"/>
- <output message="tns:getGreetingsResponse"/>
- </operation>
- <operation name="getGreetingsException">
- <input message="tns:getGreetingsException"/>
- <output message="tns:getGreetingsExceptionResponse"/>
- <fault message="tns:Exception" name="Exception"/>
- </operation>
- <operation name="getGreetingsComplex">
- <input message="tns:getGreetingsComplex"/>
- <output message="tns:getGreetingsComplexResponse"/>
- </operation>
- </portType>
- <binding name="HelloWorldImplPortBinding" type="tns:HelloWorldImpl">
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
- <operation name="getGreetings">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- <operation name="getGreetingsException">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- <fault name="Exception">
- <soap:fault name="Exception" use="literal"/>
- </fault>
- </operation>
- <operation name="getGreetingsComplex">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- </binding>
- <service name="HelloWorldImplService">
- <port name="HelloWorldImplPort" binding="tns:HelloWorldImplPortBinding">
- <soap:address location="http://localhost:8085/HelloWorldService/HelloWorld-doclit"/>
- </port>
- </service>
-</definitions>
-
-
-
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit1.xsd b/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit1.xsd deleted file mode 100644 index 545820a07d..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit1.xsd +++ /dev/null @@ -1,83 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- * 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.
--->
-<xs:schema version="1.0" targetNamespace="http://ws.binding.sca.tuscany.apache.org/doclit"
- xmlns:tns="http://ws.binding.sca.tuscany.apache.org/doclit"
- xmlns:tns2="http://helloworld/external"
- xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:import namespace="http://helloworld/external" schemaLocation="./HelloWorldImplService-doclit2.xsd"/>
-
- <xs:element name="Exception" type="tns:Exception"/>
-
- <xs:element name="getGreetings" type="tns:getGreetings"/>
-
- <xs:element name="getGreetingsComplex" type="tns:getGreetingsComplex"/>
-
- <xs:element name="getGreetingsComplexResponse" type="tns:getGreetingsComplexResponse"/>
-
- <xs:element name="getGreetingsException" type="tns:getGreetingsException"/>
-
- <xs:element name="getGreetingsExceptionResponse" type="tns:getGreetingsExceptionResponse"/>
-
- <xs:element name="getGreetingsResponse" type="tns:getGreetingsResponse"/>
-
- <xs:complexType name="getGreetingsException">
- <xs:sequence>
- <xs:element name="arg0" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetingsExceptionResponse">
- <xs:sequence>
- <xs:element name="return" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="Exception">
- <xs:sequence>
- <xs:element name="message" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetings">
- <xs:sequence>
- <xs:element name="arg0" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetingsResponse">
- <xs:sequence>
- <xs:element name="return" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetingsComplex">
- <xs:sequence>
- <xs:element name="arg0" type="tns2:foo" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetingsComplexResponse">
- <xs:sequence>
- <xs:element name="return" type="tns2:foo" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
-
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit2.xsd b/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit2.xsd deleted file mode 100644 index d955cc2af4..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldImplService-doclit2.xsd +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- * 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.
--->
-<xs:schema version="1.0" targetNamespace="http://helloworld/external"
- xmlns:tns="http://helloworld/external"
- xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:complexType name="foo">
- <xs:sequence>
- <xs:element name="bars" type="tns:bar" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="bar">
- <xs:sequence>
- <xs:element name="b" type="xs:boolean" minOccurs="0"/>
- <xs:element name="s" type="xs:string" minOccurs="0"/>
- <xs:element name="x" type="xs:int"/>
- <xs:element name="y" type="xs:int" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
-</xs:schema>
-
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldServiceService_schema1.xsd b/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldServiceService_schema1.xsd deleted file mode 100644 index acdfcaaaa5..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/resources/HelloWorldServiceService_schema1.xsd +++ /dev/null @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- * 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.
--->
-<xs:schema version="1.0" targetNamespace="http://helloworld/external" xmlns:tns="http://helloworld/external" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:element name="getGreetings" type="tns:getGreetings"/>
-
- <xs:element name="getGreetingsComplex" type="tns:getGreetingsComplex"/>
-
- <xs:element name="getGreetingsComplexResponse" type="tns:getGreetingsComplexResponse"/>
-
- <xs:element name="getGreetingsResponse" type="tns:getGreetingsResponse"/>
-
- <xs:complexType name="getGreetings">
- <xs:sequence>
- <xs:element name="name" type="xs:string" form="qualified" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetingsResponse">
- <xs:sequence>
- <xs:element name="getGreetingsReturn" type="xs:string" form="qualified" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetingsComplex">
- <xs:sequence>
- <xs:element name="arg0" type="tns:foo" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="foo">
- <xs:sequence>
- <xs:element name="bars" type="tns:bar" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="bar">
- <xs:sequence>
- <xs:element name="b" type="xs:boolean" minOccurs="0"/>
- <xs:element name="s" type="xs:string" minOccurs="0"/>
- <xs:element name="x" type="xs:int"/>
- <xs:element name="y" type="xs:int" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetingsComplexResponse">
- <xs:sequence>
- <xs:element name="return" type="tns:foo" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
-
-
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 350ad6be96..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://www.tuscany.apache.org/itests/binding/ws/axis2">
- <deployable composite="itest:HelloWorld"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/resources/helloworld-external-service.wsdl b/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/resources/helloworld-external-service.wsdl deleted file mode 100644 index 837bcb059e..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/resources/helloworld-external-service.wsdl +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- * 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.
--->
-<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.7-b01-. -->
-<definitions targetNamespace="http://helloworld/external" name="HelloWorldServiceService" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://helloworld/external" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
- <types>
- <xsd:schema>
- <xsd:import namespace="http://helloworld/external" schemaLocation="HelloWorldServiceService_schema1.xsd"/>
- </xsd:schema>
- </types>
- <message name="getGreetings">
- <part name="parameters" element="tns:getGreetings"/>
- </message>
- <message name="getGreetingsResponse">
- <part name="parameters" element="tns:getGreetingsResponse"/>
- </message>
- <message name="getGreetingsComplex">
- <part name="parameters" element="tns:getGreetingsComplex"/>
- </message>
- <message name="getGreetingsComplexResponse">
- <part name="parameters" element="tns:getGreetingsComplexResponse"/>
- </message>
- <portType name="HelloWorldService">
- <operation name="getGreetings">
- <input message="tns:getGreetings"/>
- <output message="tns:getGreetingsResponse"/>
- </operation>
- <operation name="getGreetingsComplex">
- <input message="tns:getGreetingsComplex"/>
- <output message="tns:getGreetingsComplexResponse"/>
- </operation>
- </portType>
- <binding name="HelloWorldServicePortBinding" type="tns:HelloWorldService">
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
- <operation name="getGreetings">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- <operation name="getGreetingsComplex">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- </binding>
- <service name="HelloWorldServiceService">
- <port name="HelloWorldServicePort" binding="tns:HelloWorldServicePortBinding">
- <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
- </port>
- </service>
-</definitions>
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/resources/helloworld.composite b/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/resources/helloworld.composite deleted file mode 100644 index e00e130c32..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit-wrapped/src/main/resources/helloworld.composite +++ /dev/null @@ -1,44 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://www.tuscany.apache.org/itests/binding/ws/axis2"
- name="HelloWorld">
-
- <component name="HelloWorldService1">
- <implementation.java class="org.apache.tuscany.sca.binding.ws.HelloWorld1Impl"/>
- <service name="HelloWorld">
- <binding.ws uri="http://localhost:8085/HelloWorldService/HelloWorld"/>
- </service>
- <reference name="helloWorld2">
- <binding.ws uri="http://localhost:8085/HelloWorldService/HelloWorld-doclit" wsdlElement="http://ws.binding.sca.tuscany.apache.org/doclit#wsdl.binding(HelloWorldImplPortBinding)"/>
- </reference>
- </component>
-
- <component name="HelloWorldService2">
- <implementation.java class="org.apache.tuscany.sca.binding.ws.HelloWorld2Impl"/>
- <service name="HelloWorld">
- <binding.ws wsdlElement="http://ws.binding.sca.tuscany.apache.org/doclit#wsdl.port(HelloWorldImplService/HelloWorldImplPort)"/>
- </service>
- <reference name="helloWorldExternal">
- <binding.ws uri="http://localhost:8086/External/HelloWorld"/>
- </reference>
- </component>
-</composite>
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit/pom.xml b/sca-java-2.x/trunk/itest/ws/contribution-doc-lit/pom.xml deleted file mode 100644 index 562fd47ab6..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit/pom.xml +++ /dev/null @@ -1,123 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-ws-contribution-doc-lit</artifactId>
- <name>Apache Tuscany SCA iTest WS Contribution Doc Lit(sometimes called Bare) </name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-feature-core</artifactId>
- <type>pom</type>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>target/jaxws-source</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxws-maven-plugin</artifactId>
- <version>1.12</version>
- <!-- Explicitly add the transitive dependencies for jaxws-api
- http://jira.codehaus.org/browse/MEV-498
- -->
- <dependencies>
- <dependency>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- <version>1.0-MR1</version>
- </dependency>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>wsgen1</id>
- <phase>process-classes</phase>
- <goals>
- <goal>wsgen</goal>
- </goals>
- <configuration>
- <sei>org.apache.tuscany.sca.binding.ws.HelloWorld1Impl</sei>
- <genWsdl>true</genWsdl>
- <staleFile>${project.build.directory}/jaxws/stale/.wsgen1StaleFlag</staleFile>
- </configuration>
- </execution>
- <execution>
- <id>wsimport1</id>
- <phase>process-resources</phase>
- <goals>
- <goal>wsimport</goal>
- </goals>
- <configuration>
- <packageName>org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface</packageName>
- <wsdlDirectory>${basedir}/target/classes</wsdlDirectory>
- <wsdlFiles>
- <wsdlFile>helloworld-external-service.wsdl</wsdlFile>
- </wsdlFiles>
- <staleFile>${project.build.directory}/jaxws/stale/.wsimport1StaleFlag</staleFile>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <target>2.1</target>
- <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
- <resourceDestDir>${project.build.directory}/jaxws-source</resourceDestDir>
- <verbose>true</verbose>
- <xnocompile>true</xnocompile>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java b/sca-java-2.x/trunk/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java deleted file mode 100644 index 9196530db7..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java +++ /dev/null @@ -1,36 +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.binding.ws;
-
-import javax.jws.soap.SOAPBinding;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface HelloWorld {
-
- String getGreetings(String s);
- String getGreetingsException(String s) throws ServiceRuntimeException;
-/* TUSCANY-3621
- Foo getGreetingsComplex(Foo foo);
-*/
-}
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java b/sca-java-2.x/trunk/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java deleted file mode 100644 index c8bad91339..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java +++ /dev/null @@ -1,55 +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.binding.ws;
-
-import javax.jws.WebService;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Reference;
-
-@WebService
-public class HelloWorld1Impl implements HelloWorld {
-
- @Reference
- public HelloWorldBare helloWorld2;
-
- public String getGreetings(String s) {
- System.out.println("Entering SCA HelloWorld1.getGreetings: " + s);
- String response = helloWorld2.getGreetings(s);
- System.out.println("Leaving SCA HelloWorld1.getGreetings: " + response);
- return response;
- }
-
- public String getGreetingsException(String s) throws ServiceRuntimeException {
- System.out.println("Entering SCA HelloWorld1.getGreetingsException: " + s);
- String response = helloWorld2.getGreetings(s);
- System.out.println("Leaving SCA HelloWorld1.getGreetings: " + response);
- throw new ServiceRuntimeException(response);
- }
-/* TUSCANY-3621
- public Foo getGreetingsComplex(Foo foo){
- System.out.println("Entering SCA HelloWorld1.getGreetingsComplex: " + foo.getBars().get(0).getS());
- Foo response = helloWorld2.getGreetingsComplex(foo);
- System.out.println("Leaving SCA HelloWorld1.getGreetingsComplex: " + foo.getBars().get(0).getS());
- return response;
- }
-*/
-}
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld2Impl.java b/sca-java-2.x/trunk/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld2Impl.java deleted file mode 100644 index deb4dfc09d..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld2Impl.java +++ /dev/null @@ -1,56 +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.binding.ws;
-
-import javax.jws.WebService;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo;
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.HelloWorldService;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Reference;
-
-@WebService
-public class HelloWorld2Impl implements HelloWorldBare {
-
- @Reference
- public HelloWorldService helloWorldExternal;
-
- public String getGreetings(String s) {
- System.out.println("Entering SCA HelloWorld2.getGreetings: " + s);
- String response = helloWorldExternal.getGreetings(s);
- System.out.println("Leaving SCA HelloWorld2.getGreetings: " + response);
- return response;
- }
-
- public String getGreetingsException(String s) throws ServiceRuntimeException {
- System.out.println("Entering SCA HelloWorld2.getGreetingsException: " + s);
- String response = helloWorldExternal.getGreetings(s);
- System.out.println("Leaving SCA HelloWorld2.getGreetings: " + response);
- throw new ServiceRuntimeException(response);
- }
-/* TUSCANY-3621
- public Foo getGreetingsComplex(Foo foo){
- System.out.println("Entering SCA HelloWorld2.getGreetingsComplex: " + foo.getBars().get(0).getS());
- Foo response = helloWorldExternal.getGreetingsComplex(foo);
- System.out.println("Leaving SCA HelloWorld2.getGreetingsComplex: " + foo.getBars().get(0).getS());
- return response;
- }
-*/
-}
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldBare.java b/sca-java-2.x/trunk/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldBare.java deleted file mode 100644 index e37ff1aef3..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldBare.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.binding.ws;
-
-import javax.jws.soap.SOAPBinding;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
-public interface HelloWorldBare {
-
- String getGreetings(String s);
- String getGreetingsException(String s) throws ServiceRuntimeException;
-/* TUSCANY-3621
- Foo getGreetingsComplex(Foo foo);
-*/
-}
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldImplService-doclit.wsdl b/sca-java-2.x/trunk/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldImplService-doclit.wsdl deleted file mode 100644 index 03e0a8c93c..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldImplService-doclit.wsdl +++ /dev/null @@ -1,113 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- * 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.
--->
-<definitions targetNamespace="http://ws.binding.sca.tuscany.apache.org/doclit"
- name="HelloWorldImplService"
- xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:tns="http://ws.binding.sca.tuscany.apache.org/doclit"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
- <types>
- <xsd:schema>
- <xsd:import namespace="http://ws.binding.sca.tuscany.apache.org/doclit"
- schemaLocation="HelloWorldImplService_doclit1.xsd"/>
- </xsd:schema>
- </types>
- <message name="getGreetings">
- <part name="parameters" element="tns:getGreetings"/>
- </message>
- <message name="getGreetingsResponse">
- <part name="parameters" element="tns:getGreetingsResponse"/>
- </message>
- <message name="getGreetingsException">
- <part name="parameters" element="tns:getGreetingsException"/>
- </message>
- <message name="getGreetingsExceptionResponse">
- <part name="parameters" element="tns:getGreetingsExceptionResponse"/>
- </message>
- <message name="Exception">
- <part name="fault" element="tns:Exception"/>
- </message>
- <message name="getGreetingsComplex">
- <part name="parameters" element="tns:getGreetingsComplex"/>
- </message>
- <message name="getGreetingsComplexResponse">
- <part name="parameters" element="tns:getGreetingsComplexResponse"/>
- </message>
- <portType name="HelloWorldImpl">
- <operation name="getGreetings">
- <input message="tns:getGreetings"/>
- <output message="tns:getGreetingsResponse"/>
- </operation>
- <operation name="getGreetingsException">
- <input message="tns:getGreetingsException"/>
- <output message="tns:getGreetingsExceptionResponse"/>
- <fault message="tns:Exception" name="Exception"/>
- </operation>
-<!-- TUSCANY-3621
- <operation name="getGreetingsComplex">
- <input message="tns:getGreetingsComplex"/>
- <output message="tns:getGreetingsComplexResponse"/>
- </operation>
--->
- </portType>
- <binding name="HelloWorldImplPortBinding" type="tns:HelloWorldImpl">
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
- <operation name="getGreetings">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- <operation name="getGreetingsException">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- <fault name="Exception">
- <soap:fault name="Exception" use="literal"/>
- </fault>
- </operation>
-<!-- TUSCANY-3621
- <operation name="getGreetingsComplex">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
--->
- </binding>
- <service name="HelloWorldImplService">
- <port name="HelloWorldImplPort" binding="tns:HelloWorldImplPortBinding">
- <soap:address location="http://localhost:8085/HelloWorldService/HelloWorld-doclit"/>
- </port>
- </service>
-</definitions>
-
-
-
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldImplService-doclit1.xsd b/sca-java-2.x/trunk/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldImplService-doclit1.xsd deleted file mode 100644 index 6238bf2f45..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldImplService-doclit1.xsd +++ /dev/null @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- * 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.
--->
-<xs:schema version="1.0" targetNamespace="http://ws.binding.sca.tuscany.apache.org/doclit"
- xmlns:tns="http://ws.binding.sca.tuscany.apache.org/doclit"
- xmlns:tns2="http://helloworld/external"
- xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:import namespace="http://helloworld/external" schemaLocation="./HelloWorldImplService-doclit2.xsd"/>
-
- <xs:element name="Exception" type="tns:Exception"/>
-
- <xs:element name="getGreetings" type="xs:string"/>
-
- <xs:element name="getGreetingsResponse" type="xs:string"/>
-
- <xs:element name="getGreetingsComplex" type="tns2:foo"/>
-
- <xs:element name="getGreetingsComplexResponse" type="tns2:foo"/>
-
- <xs:element name="getGreetingsException" type="xs:string"/>
-
- <xs:element name="getGreetingsExceptionResponse" type="xs:string"/>
-
- <xs:complexType name="Exception">
- <xs:sequence>
- <xs:element name="message" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
-</xs:schema>
-
-
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldImplService-doclit2.xsd b/sca-java-2.x/trunk/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldImplService-doclit2.xsd deleted file mode 100644 index d955cc2af4..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldImplService-doclit2.xsd +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- * 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.
--->
-<xs:schema version="1.0" targetNamespace="http://helloworld/external"
- xmlns:tns="http://helloworld/external"
- xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:complexType name="foo">
- <xs:sequence>
- <xs:element name="bars" type="tns:bar" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="bar">
- <xs:sequence>
- <xs:element name="b" type="xs:boolean" minOccurs="0"/>
- <xs:element name="s" type="xs:string" minOccurs="0"/>
- <xs:element name="x" type="xs:int"/>
- <xs:element name="y" type="xs:int" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
-</xs:schema>
-
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldServiceService_schema1.xsd b/sca-java-2.x/trunk/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldServiceService_schema1.xsd deleted file mode 100644 index acdfcaaaa5..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit/src/main/resources/HelloWorldServiceService_schema1.xsd +++ /dev/null @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- * 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.
--->
-<xs:schema version="1.0" targetNamespace="http://helloworld/external" xmlns:tns="http://helloworld/external" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:element name="getGreetings" type="tns:getGreetings"/>
-
- <xs:element name="getGreetingsComplex" type="tns:getGreetingsComplex"/>
-
- <xs:element name="getGreetingsComplexResponse" type="tns:getGreetingsComplexResponse"/>
-
- <xs:element name="getGreetingsResponse" type="tns:getGreetingsResponse"/>
-
- <xs:complexType name="getGreetings">
- <xs:sequence>
- <xs:element name="name" type="xs:string" form="qualified" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetingsResponse">
- <xs:sequence>
- <xs:element name="getGreetingsReturn" type="xs:string" form="qualified" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetingsComplex">
- <xs:sequence>
- <xs:element name="arg0" type="tns:foo" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="foo">
- <xs:sequence>
- <xs:element name="bars" type="tns:bar" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="bar">
- <xs:sequence>
- <xs:element name="b" type="xs:boolean" minOccurs="0"/>
- <xs:element name="s" type="xs:string" minOccurs="0"/>
- <xs:element name="x" type="xs:int"/>
- <xs:element name="y" type="xs:int" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetingsComplexResponse">
- <xs:sequence>
- <xs:element name="return" type="tns:foo" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
-
-
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/ws/contribution-doc-lit/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 350ad6be96..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://www.tuscany.apache.org/itests/binding/ws/axis2">
- <deployable composite="itest:HelloWorld"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit/src/main/resources/helloworld-external-service.wsdl b/sca-java-2.x/trunk/itest/ws/contribution-doc-lit/src/main/resources/helloworld-external-service.wsdl deleted file mode 100644 index 837bcb059e..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit/src/main/resources/helloworld-external-service.wsdl +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- * 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.
--->
-<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.7-b01-. -->
-<definitions targetNamespace="http://helloworld/external" name="HelloWorldServiceService" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://helloworld/external" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
- <types>
- <xsd:schema>
- <xsd:import namespace="http://helloworld/external" schemaLocation="HelloWorldServiceService_schema1.xsd"/>
- </xsd:schema>
- </types>
- <message name="getGreetings">
- <part name="parameters" element="tns:getGreetings"/>
- </message>
- <message name="getGreetingsResponse">
- <part name="parameters" element="tns:getGreetingsResponse"/>
- </message>
- <message name="getGreetingsComplex">
- <part name="parameters" element="tns:getGreetingsComplex"/>
- </message>
- <message name="getGreetingsComplexResponse">
- <part name="parameters" element="tns:getGreetingsComplexResponse"/>
- </message>
- <portType name="HelloWorldService">
- <operation name="getGreetings">
- <input message="tns:getGreetings"/>
- <output message="tns:getGreetingsResponse"/>
- </operation>
- <operation name="getGreetingsComplex">
- <input message="tns:getGreetingsComplex"/>
- <output message="tns:getGreetingsComplexResponse"/>
- </operation>
- </portType>
- <binding name="HelloWorldServicePortBinding" type="tns:HelloWorldService">
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
- <operation name="getGreetings">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- <operation name="getGreetingsComplex">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- </binding>
- <service name="HelloWorldServiceService">
- <port name="HelloWorldServicePort" binding="tns:HelloWorldServicePortBinding">
- <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
- </port>
- </service>
-</definitions>
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit/src/main/resources/helloworld.composite b/sca-java-2.x/trunk/itest/ws/contribution-doc-lit/src/main/resources/helloworld.composite deleted file mode 100644 index 5ae9e78823..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-doc-lit/src/main/resources/helloworld.composite +++ /dev/null @@ -1,44 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://www.tuscany.apache.org/itests/binding/ws/axis2"
- name="HelloWorld">
-
- <component name="HelloWorldService1">
- <implementation.java class="org.apache.tuscany.sca.binding.ws.HelloWorld1Impl"/>
- <service name="HelloWorld">
- <binding.ws uri="http://localhost:8085/HelloWorldService/HelloWorld"/>
- </service>
- <reference name="helloWorld2">
- <binding.ws uri="http://localhost:8085/HelloWorldService/HelloWorld-doclit" wsdlElement="http://ws.binding.sca.tuscany.apache.org/doclit#wsdl.binding(HelloWorldImplPortBinding)"/>
- </reference>
- </component>
-
- <component name="HelloWorldService2">
- <implementation.java class="org.apache.tuscany.sca.binding.ws.HelloWorld2Impl"/>
- <service name="HelloWorldBare">
- <binding.ws wsdlElement="http://ws.binding.sca.tuscany.apache.org/doclit#wsdl.port(HelloWorldImplService/HelloWorldImplPort)"/>
- </service>
- <reference name="helloWorldExternal">
- <binding.ws uri="http://localhost:8086/External/HelloWorld"/>
- </reference>
- </component>
-</composite>
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-java-first/pom.xml b/sca-java-2.x/trunk/itest/ws/contribution-java-first/pom.xml deleted file mode 100644 index de8041888b..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-java-first/pom.xml +++ /dev/null @@ -1,123 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-ws-contribution-java-first</artifactId>
- <name>Apache Tuscany SCA iTest WS Contribution Java First </name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-feature-core</artifactId>
- <type>pom</type>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>target/jaxws-source</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxws-maven-plugin</artifactId>
- <version>1.12</version>
- <!-- Explicitly add the transitive dependencies for jaxws-api
- http://jira.codehaus.org/browse/MEV-498
- -->
- <dependencies>
- <dependency>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- <version>1.0-MR1</version>
- </dependency>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>wsgen1</id>
- <phase>process-classes</phase>
- <goals>
- <goal>wsgen</goal>
- </goals>
- <configuration>
- <sei>org.apache.tuscany.sca.binding.ws.HelloWorldImpl</sei>
- <genWsdl>true</genWsdl>
- <staleFile>${project.build.directory}/jaxws/stale/.wsgen1StaleFlag</staleFile>
- </configuration>
- </execution>
- <execution>
- <id>wsimport1</id>
- <phase>process-resources</phase>
- <goals>
- <goal>wsimport</goal>
- </goals>
- <configuration>
- <packageName>org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface</packageName>
- <wsdlDirectory>${basedir}/target/classes</wsdlDirectory>
- <wsdlFiles>
- <wsdlFile>helloworld-external-service.wsdl</wsdlFile>
- </wsdlFiles>
- <staleFile>${project.build.directory}/jaxws/stale/.wsimport1StaleFlag</staleFile>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <target>2.1</target>
- <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
- <resourceDestDir>${project.build.directory}/jaxws-source</resourceDestDir>
- <verbose>true</verbose>
- <xnocompile>true</xnocompile>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java b/sca-java-2.x/trunk/itest/ws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java deleted file mode 100644 index 6bc67db5fc..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java +++ /dev/null @@ -1,32 +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.binding.ws;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface HelloWorld {
-
- String getGreetings(String s);
- String getGreetingsException(String s) throws ServiceRuntimeException;
- Foo getGreetingsComplex(Foo foo);
-}
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java b/sca-java-2.x/trunk/itest/ws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java deleted file mode 100644 index 8f57680d47..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-java-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java +++ /dev/null @@ -1,55 +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.binding.ws;
-
-import javax.jws.WebService;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo;
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.HelloWorldService;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Reference;
-
-@WebService
-public class HelloWorldImpl implements HelloWorld {
-
- @Reference
- public HelloWorldService helloWorldExternal;
-
- public String getGreetings(String s) {
- System.out.println("Entering SCA HelloWorld.getGreetings: " + s);
- String response = helloWorldExternal.getGreetings(s);
- System.out.println("Leaving SCA HelloWorld.getGreetings: " + response);
- return response;
- }
-
- public String getGreetingsException(String s) throws ServiceRuntimeException {
- System.out.println("Entering SCA HelloWorld.getGreetingsException: " + s);
- String response = helloWorldExternal.getGreetings(s);
- System.out.println("Leaving SCA HelloWorld.getGreetings: " + response);
- throw new ServiceRuntimeException(response);
- }
-
- public Foo getGreetingsComplex(Foo foo){
- System.out.println("Entering SCA HelloWorld.getGreetingsComplex: " + foo.getBars().get(0).getS());
- Foo response = helloWorldExternal.getGreetingsComplex(foo);
- System.out.println("Leaving SCA HelloWorld.getGreetingsComplex: " + foo.getBars().get(0).getS());
- return response;
- }
-}
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-java-first/src/main/resources/HelloWorldServiceService_schema1.xsd b/sca-java-2.x/trunk/itest/ws/contribution-java-first/src/main/resources/HelloWorldServiceService_schema1.xsd deleted file mode 100644 index acdfcaaaa5..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-java-first/src/main/resources/HelloWorldServiceService_schema1.xsd +++ /dev/null @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- * 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.
--->
-<xs:schema version="1.0" targetNamespace="http://helloworld/external" xmlns:tns="http://helloworld/external" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:element name="getGreetings" type="tns:getGreetings"/>
-
- <xs:element name="getGreetingsComplex" type="tns:getGreetingsComplex"/>
-
- <xs:element name="getGreetingsComplexResponse" type="tns:getGreetingsComplexResponse"/>
-
- <xs:element name="getGreetingsResponse" type="tns:getGreetingsResponse"/>
-
- <xs:complexType name="getGreetings">
- <xs:sequence>
- <xs:element name="name" type="xs:string" form="qualified" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetingsResponse">
- <xs:sequence>
- <xs:element name="getGreetingsReturn" type="xs:string" form="qualified" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetingsComplex">
- <xs:sequence>
- <xs:element name="arg0" type="tns:foo" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="foo">
- <xs:sequence>
- <xs:element name="bars" type="tns:bar" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="bar">
- <xs:sequence>
- <xs:element name="b" type="xs:boolean" minOccurs="0"/>
- <xs:element name="s" type="xs:string" minOccurs="0"/>
- <xs:element name="x" type="xs:int"/>
- <xs:element name="y" type="xs:int" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetingsComplexResponse">
- <xs:sequence>
- <xs:element name="return" type="tns:foo" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
-
-
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-java-first/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/ws/contribution-java-first/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 350ad6be96..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-java-first/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://www.tuscany.apache.org/itests/binding/ws/axis2">
- <deployable composite="itest:HelloWorld"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/ws/contribution-java-first/src/main/resources/helloworld-external-service.wsdl b/sca-java-2.x/trunk/itest/ws/contribution-java-first/src/main/resources/helloworld-external-service.wsdl deleted file mode 100644 index 837bcb059e..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-java-first/src/main/resources/helloworld-external-service.wsdl +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- * 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.
--->
-<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.7-b01-. -->
-<definitions targetNamespace="http://helloworld/external" name="HelloWorldServiceService" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://helloworld/external" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
- <types>
- <xsd:schema>
- <xsd:import namespace="http://helloworld/external" schemaLocation="HelloWorldServiceService_schema1.xsd"/>
- </xsd:schema>
- </types>
- <message name="getGreetings">
- <part name="parameters" element="tns:getGreetings"/>
- </message>
- <message name="getGreetingsResponse">
- <part name="parameters" element="tns:getGreetingsResponse"/>
- </message>
- <message name="getGreetingsComplex">
- <part name="parameters" element="tns:getGreetingsComplex"/>
- </message>
- <message name="getGreetingsComplexResponse">
- <part name="parameters" element="tns:getGreetingsComplexResponse"/>
- </message>
- <portType name="HelloWorldService">
- <operation name="getGreetings">
- <input message="tns:getGreetings"/>
- <output message="tns:getGreetingsResponse"/>
- </operation>
- <operation name="getGreetingsComplex">
- <input message="tns:getGreetingsComplex"/>
- <output message="tns:getGreetingsComplexResponse"/>
- </operation>
- </portType>
- <binding name="HelloWorldServicePortBinding" type="tns:HelloWorldService">
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
- <operation name="getGreetings">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- <operation name="getGreetingsComplex">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- </binding>
- <service name="HelloWorldServiceService">
- <port name="HelloWorldServicePort" binding="tns:HelloWorldServicePortBinding">
- <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
- </port>
- </service>
-</definitions>
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-java-first/src/main/resources/helloworld.composite b/sca-java-2.x/trunk/itest/ws/contribution-java-first/src/main/resources/helloworld.composite deleted file mode 100644 index e6cdb94dfb..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-java-first/src/main/resources/helloworld.composite +++ /dev/null @@ -1,35 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://www.tuscany.apache.org/itests/binding/ws/axis2"
- name="HelloWorld">
-
- <component name="HelloWorldService">
- <implementation.java class="org.apache.tuscany.sca.binding.ws.HelloWorldImpl"/>
- <service name="HelloWorld">
- <binding.ws uri="http://localhost:8085/HelloWorldService/HelloWorld"/>
- </service>
- <reference name="helloWorldExternal">
- <binding.ws uri="http://localhost:8086/External/HelloWorld"/>
- </reference>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/README b/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/README deleted file mode 100644 index fe73646e78..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/README +++ /dev/null @@ -1,254 +0,0 @@ -RPC Literal WSDL Style
-======================
-
-Interface
----------
-
-@Remotable
-public interface HelloWorld {
- String getGreetings(String s);
- String getGreetingsException(String s) throws ServiceRuntimeException;
- Foo getGreetingsComplex(Foo foo);
-}
-
-WSDL
-----
-
- <types>
- <xsd:schema>
- <xsd:import namespace="http://ws.binding.sca.tuscany.apache.org/rpclit"
- schemaLocation="HelloWorldImplService-rpclit.xsd"/>
- </xsd:schema>
- </types>
- <message name="getGreetings">
- <part name="s" type="xsd:string"/>
- </message>
- <message name="getGreetingsResponse">
- <part name="s" type="xsd:string"/>
- </message>
- <message name="getGreetingsException">
- <part name="s" type="xsd:string"/>
- </message>
- <message name="getGreetingsExceptionResponse">
- <part name="s" type="xsd:string"/>
- </message>
- <message name="Exception">
- <part name="fault" element="tns:Exception"/>
- </message>
- <message name="getGreetingsComplex">
- <part name="foo" type="tns:foo"/>
- </message>
- <message name="getGreetingsComplexResponse">
- <part name="foo" type="tns:foo"/>
- </message>
- <portType name="HelloWorldImpl">
- <operation name="getGreetings">
- <input message="tns:getGreetings"/>
- <output message="tns:getGreetingsResponse"/>
- </operation>
- <operation name="getGreetingsException">
- <input message="tns:getGreetingsException"/>
- <output message="tns:getGreetingsExceptionResponse"/>
- <fault message="tns:Exception" name="Exception"/>
- </operation>
- <operation name="getGreetingsComplex">
- <input message="tns:getGreetingsComplex"/>
- <output message="tns:getGreetingsComplexResponse"/>
- </operation>
- </portType>
- <binding name="HelloWorldImplPortBinding" type="tns:HelloWorldImpl">
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/>
- <operation name="getGreetings">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal" namespace="http://ws.binding.sca.tuscany.apache.org/rpclit/getGreetingsNamespace"/>
- </input>
- <output>
- <soap:body use="literal" namespace="http://ws.binding.sca.tuscany.apache.org/rpclit/getGreetingsNamespace"/>
- </output>
- </operation>
- <operation name="getGreetingsException">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal" namespace="http://ws.binding.sca.tuscany.apache.org/rpclit/getGreetingsExceptionNamespace"/>
- </input>
- <output>
- <soap:body use="literal" namespace="http://ws.binding.sca.tuscany.apache.org/rpclit/getGreetingsExceptionNamespace"/>
- </output>
- <fault name="Exception">
- <soap:fault name="Exception" use="literal"/>
- </fault>
- </operation>
- <operation name="getGreetingsComplex">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- </binding>
-
-getGreetings SOAP Request/Response
-----------------------------------
-
-POST /HelloWorldService/HelloWorld-rpclit-porttype HTTP/1.1
-Content-Type: text/xml; charset=UTF-8
-SOAPAction: ""
-User-Agent: Axis2
-Host: localhost:8088
-Content-Length: 480
-
-<?xml version='1.0' encoding='UTF-8'?>
-<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">
- <soape nv:Body>
- <axis2ns1:getGreetings
- xmlns:axis2ns1="http://ws.binding.sca.tuscany.apache.org/rpclit/getGreetingsNamespace">
- <s xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ns2="http://ws.binding.sca.tuscany.apache.org/"
- xsi:type="xs:string">Fred
- </s>
- </axis2ns1:getGreetings>
- </soapenv:Body>
-</soapenv:Envelope>
-
-HTTP/1.1 200 OK
-Content-Type: text/xml; charset=utf-8
-Transfer-Encoding: chunked
-
-1FE
-<?xml version='1.0' encoding='UTF-8'?>
-<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">
- <soape nv:Body>
- <axis2ns4:getGreetingsResponse
- xmlns:axis2ns4="http://ws.binding.sca.tuscany.apache.org/rpclit/getGreetingsResponseNamespace">
- <s xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ns2="http://ws.binding.sca.tuscany.apache.org/"
- xsi:type="xs:string">Hello Fred</s>
- </axis2ns4:getGreetingsResponse>
- </soapenv:Body>
-</soapenv:Envelope>
-
-
-getGreetingsException SOAP Request/Response
--------------------------------------------
-
-POST /HelloWorldService/HelloWorld-rpclit-porttype HTTP/1.1
-Content-Type: text/xml; charset=UTF-8
-SOAPAction: ""
-User-Agent: Axis2
-Host: localhost:8088
-Content-Length: 507
-
-<?xml version='1.0' encoding='UTF-8'?>
-<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">
- <soape nv:Body>
- <axis2ns5:getGreetingsException
- xmlns:axis2ns5="http://ws.binding.sca.tuscany.apache.org/rpclit/getGreetingsExceptionNamespace">
- <s xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ns2="http://ws.binding.sca.tuscany.apache.org/"
- xsi:type="xs:string">Fred
- </s>
- </axis2ns5:getGreetingsException>
- </soapenv:Body>
-</soapenv:Envelope>
-
-HTTP/1.1 500 Internal Server Error
-Content-Type: text/xml; charset=utf-8
-Transfer-Encoding: chunked
-
-133C
-<?xml version='1.0' encoding='UTF-8'?>
-<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">
- <soape nv:Body>
- <soapenv:Fault>
- <faultcode>soapenv:Server</faultcode>
- <faultstring>org.apache.tuscany.sca.interfacedef.util.FaultE
- xception cannot be cast to org.apache.axiom.om.OMElement</faultstring>
- <detail>
- ...
- </Exception>
- </detail>
- </soapenv:Fault>
- </soapenv:Body>
-</soapenv:Envelope>
-
-TODO - exception is wrong
-
-getGreetingsComplex SOAP Request/Response
------------------------------------------
-
-POST /HelloWorldService/HelloWorld-rpclit-porttype HTTP/1.1
-Content-Type: text/xml; charset=UTF-8
-SOAPAction: ""
-User-Agent: Axis2
-Host: localhost:8088
-Content-Length: 570
-
-<?xml version='1.0' encoding='UTF-8'?>
-<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">
- <soape nv:Body>
- <axis2ns7:getGreetingsComplex
- xmlns:axis2ns7="http://ws.binding.sca.tuscany.apache.org/rpclit">
- <foo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ns3="http://ws.binding.sca.tuscany.apache.org/"
- xmlns:ns2="http://helloworld/external"
- xsi:type="ns2:foo">
- <bars>
- <b>true</b>
- <s>petra</s>
- <x>1</x>
- <y>2</y>
- </bars>
- <bars>
- <b>false</b>
- <s>beate</s>
- <x>3</x>
- <y>4</y>
- </bars>
- </foo>
- </axis2ns7:getGreetingsComplex>
- </soapenv:Body>
-</soapenv:Envelope>
-
-HTTP/1.1 200 OK
-Content-Type: text/xml; charset=utf-8
-Transfer-Encoding: chunked
-
-281
-<?xml version='1.0' encoding='UTF-8'?>
-<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">
- <soape nv:Body>
- <axis2ns10:getGreetingsComplexResponse
- xmlns:axis2ns10="http://ws.binding.sca.tuscany.apache.org/rpclit">
- <foo xm lns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ns3="http://ws.binding.sca.tuscany.apache.org/"
- xmlns:ns2="http://helloworld/external"
- xsi:type="ns2:foo">
- <bars>
- <b>true</b>
- <s>petra</s>
- <x>1</x>
- <y>2</y>
- </bars>
- <bars>
- <b>false</b>
- <s>bea
- te</s>
- <x>3</x>
- <y>4</y>
- </bars>
- <bars>
- <b>true</b>
- <s>simon</s>
- <x>7</x>
- <y>8</y>
- </bars>
- </foo>
- </axis2ns10:getGreetingsComplexResponse>
- </soapenv:Body>
-</soapenv:Envelope>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/pom.xml b/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/pom.xml deleted file mode 100644 index 400b89ad7c..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/pom.xml +++ /dev/null @@ -1,123 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-ws-contribution-rpc-lit</artifactId>
- <name>Apache Tuscany SCA iTest WS Contribution RPC Lit</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-feature-core</artifactId>
- <type>pom</type>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>target/jaxws-source</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxws-maven-plugin</artifactId>
- <version>1.12</version>
- <!-- Explicitly add the transitive dependencies for jaxws-api
- http://jira.codehaus.org/browse/MEV-498
- -->
- <dependencies>
- <dependency>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- <version>1.0-MR1</version>
- </dependency>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>wsgen1</id>
- <phase>process-classes</phase>
- <goals>
- <goal>wsgen</goal>
- </goals>
- <configuration>
- <sei>org.apache.tuscany.sca.binding.ws.HelloWorld1Impl</sei>
- <genWsdl>true</genWsdl>
- <staleFile>${project.build.directory}/jaxws/stale/.wsgen1StaleFlag</staleFile>
- </configuration>
- </execution>
- <execution>
- <id>wsimport1</id>
- <phase>process-resources</phase>
- <goals>
- <goal>wsimport</goal>
- </goals>
- <configuration>
- <packageName>org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface</packageName>
- <wsdlDirectory>${basedir}/target/classes</wsdlDirectory>
- <wsdlFiles>
- <wsdlFile>helloworld-external-service.wsdl</wsdlFile>
- </wsdlFiles>
- <staleFile>${project.build.directory}/jaxws/stale/.wsimport1StaleFlag</staleFile>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <target>2.1</target>
- <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
- <resourceDestDir>${project.build.directory}/jaxws-source</resourceDestDir>
- <verbose>true</verbose>
- <xnocompile>true</xnocompile>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java b/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java deleted file mode 100644 index 6bc67db5fc..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java +++ /dev/null @@ -1,32 +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.binding.ws;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface HelloWorld {
-
- String getGreetings(String s);
- String getGreetingsException(String s) throws ServiceRuntimeException;
- Foo getGreetingsComplex(Foo foo);
-}
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java b/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java deleted file mode 100644 index 9ee8373468..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld1Impl.java +++ /dev/null @@ -1,54 +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.binding.ws;
-
-import javax.jws.WebService;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Reference;
-
-@WebService
-public class HelloWorld1Impl implements HelloWorld {
-
- @Reference
- public HelloWorld helloWorld2;
-
- public String getGreetings(String s) {
- System.out.println("Entering SCA HelloWorld1.getGreetings: " + s);
- String response = helloWorld2.getGreetings(s);
- System.out.println("Leaving SCA HelloWorld1.getGreetings: " + response);
- return response;
- }
-
- public String getGreetingsException(String s) throws ServiceRuntimeException {
- System.out.println("Entering SCA HelloWorld1.getGreetingsException: " + s);
- String response = helloWorld2.getGreetingsException(s);
- System.out.println("Leaving SCA HelloWorld1.getGreetings: " + response);
- throw new ServiceRuntimeException(response);
- }
-
- public Foo getGreetingsComplex(Foo foo){
- System.out.println("Entering SCA HelloWorld1.getGreetingsComplex: " + foo.getBars().get(0).getS());
- Foo response = helloWorld2.getGreetingsComplex(foo);
- System.out.println("Leaving SCA HelloWorld1.getGreetingsComplex: " + foo.getBars().get(0).getS());
- return response;
- }
-}
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld2Impl.java b/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld2Impl.java deleted file mode 100644 index 6f3b430d6d..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld2Impl.java +++ /dev/null @@ -1,55 +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.binding.ws;
-
-import javax.jws.WebService;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo;
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.HelloWorldService;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Reference;
-
-@WebService
-public class HelloWorld2Impl implements HelloWorld {
-
- @Reference
- public HelloWorldService helloWorldExternal;
-
- public String getGreetings(String s) {
- System.out.println("Entering SCA HelloWorld2.getGreetings: " + s);
- String response = helloWorldExternal.getGreetings(s);
- System.out.println("Leaving SCA HelloWorld2.getGreetings: " + response);
- return response;
- }
-
- public String getGreetingsException(String s) throws ServiceRuntimeException {
- System.out.println("Entering SCA HelloWorld2.getGreetingsException: " + s);
- String response = helloWorldExternal.getGreetings(s);
- System.out.println("Leaving SCA HelloWorld2.getGreetings: " + response);
- throw new ServiceRuntimeException(response);
- }
-
- public Foo getGreetingsComplex(Foo foo){
- System.out.println("Entering SCA HelloWorld2.getGreetingsComplex: " + foo.getBars().get(0).getS());
- Foo response = helloWorldExternal.getGreetingsComplex(foo);
- System.out.println("Leaving SCA HelloWorld2.getGreetingsComplex: " + foo.getBars().get(0).getS());
- return response;
- }
-}
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit.wsdl b/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit.wsdl deleted file mode 100644 index 0c11e6a8f4..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit.wsdl +++ /dev/null @@ -1,110 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- * 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.
--->
-<definitions targetNamespace="http://ws.binding.sca.tuscany.apache.org/rpclit"
- name="HelloWorldImplService"
- xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:tns="http://ws.binding.sca.tuscany.apache.org/rpclit"
- xmlns:tns2="http://helloworld/external"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
- <types>
- <xsd:schema>
- <xsd:import namespace="http://ws.binding.sca.tuscany.apache.org/rpclit"
- schemaLocation="HelloWorldImplService-rpclit1.xsd"/>
- </xsd:schema>
- </types>
- <message name="getGreetings">
- <part name="s" type="xsd:string"/>
- </message>
- <message name="getGreetingsResponse">
- <part name="s" type="xsd:string"/>
- </message>
- <message name="getGreetingsException">
- <part name="s" type="xsd:string"/>
- </message>
- <message name="getGreetingsExceptionResponse">
- <part name="s" type="xsd:string"/>
- </message>
- <message name="Exception">
- <part name="fault" element="tns:Exception"/>
- </message>
- <message name="getGreetingsComplex">
- <part name="foo" type="tns2:foo"/>
- </message>
- <message name="getGreetingsComplexResponse">
- <part name="foo" type="tns2:foo"/>
- </message>
- <portType name="HelloWorldImpl">
- <operation name="getGreetings">
- <input message="tns:getGreetings"/>
- <output message="tns:getGreetingsResponse"/>
- </operation>
- <operation name="getGreetingsException">
- <input message="tns:getGreetingsException"/>
- <output message="tns:getGreetingsExceptionResponse"/>
- <fault message="tns:Exception" name="Exception"/>
- </operation>
- <operation name="getGreetingsComplex">
- <input message="tns:getGreetingsComplex"/>
- <output message="tns:getGreetingsComplexResponse"/>
- </operation>
- </portType>
- <binding name="HelloWorldImplPortBinding" type="tns:HelloWorldImpl">
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/>
- <operation name="getGreetings">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal" namespace="http://ws.binding.sca.tuscany.apache.org/rpclit/getGreetingsNamespace" />
- </input>
- <output>
- <soap:body use="literal" namespace="http://ws.binding.sca.tuscany.apache.org/rpclit/getGreetingsResponseNamespace"/>
- </output>
- </operation>
- <operation name="getGreetingsException">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal" namespace="http://ws.binding.sca.tuscany.apache.org/rpclit/getGreetingsExceptionNamespace"/>
- </input>
- <output>
- <soap:body use="literal" namespace="http://ws.binding.sca.tuscany.apache.org/rpclit/getGreetingsExceptionResponseNamespace"/>
- </output>
- <fault name="Exception">
- <soap:fault name="Exception" use="literal"/>
- </fault>
- </operation>
- <operation name="getGreetingsComplex">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- </binding>
- <service name="HelloWorldImplService">
- <port name="HelloWorldImplPort" binding="tns:HelloWorldImplPortBinding">
- <soap:address location="http://localhost:8087/HelloWorldService/HelloWorld-rpclit"/>
- </port>
- </service>
-</definitions>
-
-
-
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit1.xsd b/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit1.xsd deleted file mode 100644 index 8841f0dcf2..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit1.xsd +++ /dev/null @@ -1,83 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- * 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.
--->
-<xs:schema version="1.0" targetNamespace="http://ws.binding.sca.tuscany.apache.org/rpclit"
- xmlns:tns="http://ws.binding.sca.tuscany.apache.org/rpclit"
- xmlns:tns2="http://helloworld/external"
- xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:import namespace="http://helloworld/external" schemaLocation="./HelloWorldImplService-rpclit2.xsd"/>
-
- <xs:element name="Exception" type="tns:Exception"/>
-
- <xs:element name="getGreetings" type="tns:getGreetings"/>
-
- <xs:element name="getGreetingsComplex" type="tns:getGreetingsComplex"/>
-
- <xs:element name="getGreetingsComplexResponse" type="tns:getGreetingsComplexResponse"/>
-
- <xs:element name="getGreetingsException" type="tns:getGreetingsException"/>
-
- <xs:element name="getGreetingsExceptionResponse" type="tns:getGreetingsExceptionResponse"/>
-
- <xs:element name="getGreetingsResponse" type="tns:getGreetingsResponse"/>
-
- <xs:complexType name="getGreetingsException">
- <xs:sequence>
- <xs:element name="arg0" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetingsExceptionResponse">
- <xs:sequence>
- <xs:element name="return" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="Exception">
- <xs:sequence>
- <xs:element name="message" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetings">
- <xs:sequence>
- <xs:element name="arg0" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetingsResponse">
- <xs:sequence>
- <xs:element name="return" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetingsComplex">
- <xs:sequence>
- <xs:element name="arg0" type="tns2:foo" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetingsComplexResponse">
- <xs:sequence>
- <xs:element name="return" type="tns2:foo" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
-
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit2.xsd b/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit2.xsd deleted file mode 100644 index d955cc2af4..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldImplService-rpclit2.xsd +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- * 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.
--->
-<xs:schema version="1.0" targetNamespace="http://helloworld/external"
- xmlns:tns="http://helloworld/external"
- xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:complexType name="foo">
- <xs:sequence>
- <xs:element name="bars" type="tns:bar" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="bar">
- <xs:sequence>
- <xs:element name="b" type="xs:boolean" minOccurs="0"/>
- <xs:element name="s" type="xs:string" minOccurs="0"/>
- <xs:element name="x" type="xs:int"/>
- <xs:element name="y" type="xs:int" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
-</xs:schema>
-
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldServiceService_schema1.xsd b/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldServiceService_schema1.xsd deleted file mode 100644 index acdfcaaaa5..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/HelloWorldServiceService_schema1.xsd +++ /dev/null @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- * 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.
--->
-<xs:schema version="1.0" targetNamespace="http://helloworld/external" xmlns:tns="http://helloworld/external" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:element name="getGreetings" type="tns:getGreetings"/>
-
- <xs:element name="getGreetingsComplex" type="tns:getGreetingsComplex"/>
-
- <xs:element name="getGreetingsComplexResponse" type="tns:getGreetingsComplexResponse"/>
-
- <xs:element name="getGreetingsResponse" type="tns:getGreetingsResponse"/>
-
- <xs:complexType name="getGreetings">
- <xs:sequence>
- <xs:element name="name" type="xs:string" form="qualified" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetingsResponse">
- <xs:sequence>
- <xs:element name="getGreetingsReturn" type="xs:string" form="qualified" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetingsComplex">
- <xs:sequence>
- <xs:element name="arg0" type="tns:foo" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="foo">
- <xs:sequence>
- <xs:element name="bars" type="tns:bar" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="bar">
- <xs:sequence>
- <xs:element name="b" type="xs:boolean" minOccurs="0"/>
- <xs:element name="s" type="xs:string" minOccurs="0"/>
- <xs:element name="x" type="xs:int"/>
- <xs:element name="y" type="xs:int" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetingsComplexResponse">
- <xs:sequence>
- <xs:element name="return" type="tns:foo" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
-
-
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 350ad6be96..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://www.tuscany.apache.org/itests/binding/ws/axis2">
- <deployable composite="itest:HelloWorld"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/helloworld-external-service.wsdl b/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/helloworld-external-service.wsdl deleted file mode 100644 index 837bcb059e..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/helloworld-external-service.wsdl +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- * 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.
--->
-<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.7-b01-. -->
-<definitions targetNamespace="http://helloworld/external" name="HelloWorldServiceService" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://helloworld/external" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
- <types>
- <xsd:schema>
- <xsd:import namespace="http://helloworld/external" schemaLocation="HelloWorldServiceService_schema1.xsd"/>
- </xsd:schema>
- </types>
- <message name="getGreetings">
- <part name="parameters" element="tns:getGreetings"/>
- </message>
- <message name="getGreetingsResponse">
- <part name="parameters" element="tns:getGreetingsResponse"/>
- </message>
- <message name="getGreetingsComplex">
- <part name="parameters" element="tns:getGreetingsComplex"/>
- </message>
- <message name="getGreetingsComplexResponse">
- <part name="parameters" element="tns:getGreetingsComplexResponse"/>
- </message>
- <portType name="HelloWorldService">
- <operation name="getGreetings">
- <input message="tns:getGreetings"/>
- <output message="tns:getGreetingsResponse"/>
- </operation>
- <operation name="getGreetingsComplex">
- <input message="tns:getGreetingsComplex"/>
- <output message="tns:getGreetingsComplexResponse"/>
- </operation>
- </portType>
- <binding name="HelloWorldServicePortBinding" type="tns:HelloWorldService">
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
- <operation name="getGreetings">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- <operation name="getGreetingsComplex">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- </binding>
- <service name="HelloWorldServiceService">
- <port name="HelloWorldServicePort" binding="tns:HelloWorldServicePortBinding">
- <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
- </port>
- </service>
-</definitions>
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/helloworld.composite b/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/helloworld.composite deleted file mode 100644 index 28dedef44c..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-rpc-lit/src/main/resources/helloworld.composite +++ /dev/null @@ -1,64 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://www.tuscany.apache.org/itests/binding/ws/axis2"
- name="HelloWorld">
-
- <component name="HelloWorldService1">
- <implementation.java class="org.apache.tuscany.sca.binding.ws.HelloWorld1Impl"/>
- <service name="HelloWorld">
- <binding.ws uri="http://localhost:8085/HelloWorldService/HelloWorld"/>
- </service>
- <reference name="helloWorld2">
- <interface.wsdl interface="http://ws.binding.sca.tuscany.apache.org/rpclit#wsdl.porttype(HelloWorldImpl)"/>
- <binding.ws uri="http://localhost:8087/HelloWorldService/HelloWorld-rpclit-porttype"
- wsdlElement="http://ws.binding.sca.tuscany.apache.org/rpclit#wsdl.binding(HelloWorldImplPortBinding)"/>
- <!--
- note that it's not necessary to have interface.wsdl here but I left it in after
- I added the wsdlElement on the binding in order to configure the binding with the
- wrapper element namespace that appears in the binding configuration
- -->
- </reference>
- </component>
-
- <component name="HelloWorldService1a">
- <implementation.java class="org.apache.tuscany.sca.binding.ws.HelloWorld1Impl"/>
- <service name="HelloWorld">
- <binding.ws uri="http://localhost:8087/HelloWorldService/HelloWorld-rpclit-porttype"
- wsdlElement="http://ws.binding.sca.tuscany.apache.org/rpclit#wsdl.binding(HelloWorldImplPortBinding)"/>
- </service>
- <reference name="helloWorld2">
- <binding.ws uri="http://localhost:8087/HelloWorldService/HelloWorld-rpclit"
- wsdlElement="http://ws.binding.sca.tuscany.apache.org/rpclit#wsdl.binding(HelloWorldImplPortBinding)"/>
- </reference>
- </component>
-
- <component name="HelloWorldService2">
- <implementation.java class="org.apache.tuscany.sca.binding.ws.HelloWorld2Impl"/>
- <service name="HelloWorld">
- <binding.ws wsdlElement="http://ws.binding.sca.tuscany.apache.org/rpclit#wsdl.port(HelloWorldImplService/HelloWorldImplPort)"/>
- </service>
- <reference name="helloWorldExternal">
- <binding.ws uri="http://localhost:8086/External/HelloWorld"/>
- </reference>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/pom.xml b/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/pom.xml deleted file mode 100644 index 52945adcf8..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/pom.xml +++ /dev/null @@ -1,125 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-ws-contribution-wsdl-first</artifactId>
- <name>Apache Tuscany SCA iTest WS Contribution WSDL First</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-feature-core</artifactId>
- <type>pom</type>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>target/jaxws-source</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxws-maven-plugin</artifactId>
- <version>1.12</version>
- <!-- Explicitly add the transitive dependencies for jaxws-api
- http://jira.codehaus.org/browse/MEV-498
- -->
- <dependencies>
- <dependency>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- <version>1.0-MR1</version>
- </dependency>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
- <executions>
- <!-- execution>
- <id>wsimport1</id>
- <phase>process-resources</phase>
- <goals>
- <goal>wsimport</goal>
- </goals>
- <configuration>
- <packageName>org.apache.tuscany.sca.binding.ws.sca</packageName>
- <wsdlDirectory>${basedir}/target/classes</wsdlDirectory>
- <wsdlFiles>
- <wsdlFile>HelloWorldImplService.wsdl</wsdlFile>
- </wsdlFiles>
- <staleFile>${project.build.directory}/jaxws/stale/.wsimport1StaleFlag</staleFile>
- </configuration>
- </execution-->
- <execution>
- <id>wsimport2</id>
- <phase>process-resources</phase>
- <goals>
- <goal>wsimport</goal>
- </goals>
- <configuration>
- <packageName>org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface</packageName>
- <wsdlDirectory>${basedir}/target/classes</wsdlDirectory>
- <wsdlFiles>
- <wsdlFile>helloworld-external-service.wsdl</wsdlFile>
- </wsdlFiles>
- <staleFile>${project.build.directory}/jaxws/stale/.wsimport2StaleFlag</staleFile>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <target>2.1</target>
- <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
- <verbose>true</verbose>
- <xnocompile>true</xnocompile>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java b/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.java deleted file mode 100644 index c9c1038ea3..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorld.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.binding.ws;
-
-import javax.jws.WebMethod;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface HelloWorld {
-
- String getGreetings(String s);
- String getGreetingsException(String s) throws ServiceRuntimeException;
- Foo getGreetingsComplex(Foo foo);
-
- @WebMethod(operationName = "GetGreetingsCaps")
- String getGreetingsCaps(String s);
-}
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java b/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java deleted file mode 100644 index d88a765682..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/java/org/apache/tuscany/sca/binding/ws/HelloWorldImpl.java +++ /dev/null @@ -1,60 +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.binding.ws;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.Foo;
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.iface.HelloWorldService;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.oasisopen.sca.annotation.Reference;
-
-public class HelloWorldImpl implements HelloWorld {
-
- @Reference
- public HelloWorldService helloWorldExternal;
-
- public String getGreetings(String s) {
- System.out.println("Entering SCA HelloWorld.getGreetings: " + s);
- String response = helloWorldExternal.getGreetings(s);
- System.out.println("Leaving SCA HelloWorld.getGreetings: " + response);
- return response;
- }
-
- public String getGreetingsException(String s) throws ServiceRuntimeException {
- System.out.println("Entering SCA HelloWorld.getGreetingsException: " + s);
- String response = helloWorldExternal.getGreetings(s);
- System.out.println("Leaving SCA HelloWorld.getGreetings: " + response);
- throw new ServiceRuntimeException(response);
- }
-
- public Foo getGreetingsComplex(Foo foo){
- System.out.println("Entering SCA HelloWorld.getGreetingsComplex: " + foo.getBars().get(0).getS());
- Foo response = helloWorldExternal.getGreetingsComplex(foo);
- System.out.println("Leaving SCA HelloWorld.getGreetingsComplex: " + foo.getBars().get(0).getS());
- return response;
- }
-
- public String getGreetingsCaps(String s) {
- System.out.println("Entering SCA HelloWorld.getGreetingsCaps: " + s);
- String response = helloWorldExternal.getGreetingsCaps(s);
- System.out.println("Leaving SCA HelloWorld.getGreetingsCaps: " + response);
- return response;
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService.wsdl b/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService.wsdl deleted file mode 100644 index 59fce9d849..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService.wsdl +++ /dev/null @@ -1,128 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- * 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.
--->
-<definitions targetNamespace="http://ws.binding.sca.tuscany.apache.org/"
- name="HelloWorldImplService"
- xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:tns="http://ws.binding.sca.tuscany.apache.org/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
- <types>
- <xsd:schema>
- <xsd:import namespace="http://ws.binding.sca.tuscany.apache.org/"
- schemaLocation="HelloWorldImplService_schema1.xsd"/>
- </xsd:schema>
- </types>
- <message name="getGreetings">
- <part name="parameters" element="tns:getGreetings"/>
- </message>
- <message name="getGreetingsResponse">
- <part name="parameters" element="tns:getGreetingsResponse"/>
- </message>
- <message name="getGreetingsException">
- <part name="parameters" element="tns:getGreetingsException"/>
- </message>
- <message name="getGreetingsExceptionResponse">
- <part name="parameters" element="tns:getGreetingsExceptionResponse"/>
- </message>
- <message name="Exception">
- <part name="fault" element="tns:Exception"/>
- </message>
- <message name="getGreetingsComplex">
- <part name="parameters" element="tns:getGreetingsComplex"/>
- </message>
- <message name="getGreetingsComplexResponse">
- <part name="parameters" element="tns:getGreetingsComplexResponse"/>
- </message>
- <message name="GetGreetingsCaps">
- <part name="parameters" element="tns:GetGreetingsCaps"/>
- </message>
- <message name="GetGreetingsCapsResponse">
- <part name="parameters" element="tns:GetGreetingsCapsResponse"/>
- </message>
- <portType name="HelloWorldImpl">
- <operation name="getGreetings">
- <input message="tns:getGreetings"/>
- <output message="tns:getGreetingsResponse"/>
- </operation>
- <operation name="getGreetingsException">
- <input message="tns:getGreetingsException"/>
- <output message="tns:getGreetingsExceptionResponse"/>
- <fault message="tns:Exception" name="Exception"/>
- </operation>
- <operation name="getGreetingsComplex">
- <input message="tns:getGreetingsComplex"/>
- <output message="tns:getGreetingsComplexResponse"/>
- </operation>
- <operation name="GetGreetingsCaps">
- <input message="tns:GetGreetingsCaps"/>
- <output message="tns:GetGreetingsCapsResponse"/>
- </operation>
- </portType>
- <binding name="HelloWorldImplPortBinding" type="tns:HelloWorldImpl">
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
- <operation name="getGreetings">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- <operation name="getGreetingsException">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- <fault name="Exception">
- <soap:fault name="Exception" use="literal"/>
- </fault>
- </operation>
- <operation name="getGreetingsComplex">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- <operation name="GetGreetingsCaps">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- </binding>
- <service name="HelloWorldImplService">
- <port name="HelloWorldImplPort" binding="tns:HelloWorldImplPortBinding">
- <soap:address location="http://localhost:8085/HelloWorldService/HelloWorld"/>
- </port>
- </service>
-</definitions>
-
-
-
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema1.xsd b/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema1.xsd deleted file mode 100644 index 2d8adf3d73..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema1.xsd +++ /dev/null @@ -1,99 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- * 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.
--->
-<xs:schema version="1.0" targetNamespace="http://ws.binding.sca.tuscany.apache.org/"
- xmlns:tns="http://ws.binding.sca.tuscany.apache.org/"
- xmlns:tns2="http://helloworld/external"
- xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:import namespace="http://helloworld/external" schemaLocation="./HelloWorldImplService_schema2.xsd"/>
-
- <xs:element name="Exception" type="tns:Exception"/>
-
- <xs:element name="getGreetings" type="tns:getGreetings"/>
-
- <xs:element name="getGreetingsComplex" type="tns:getGreetingsComplex"/>
-
- <xs:element name="getGreetingsComplexResponse" type="tns:getGreetingsComplexResponse"/>
-
- <xs:element name="getGreetingsException" type="tns:getGreetingsException"/>
-
- <xs:element name="getGreetingsExceptionResponse" type="tns:getGreetingsExceptionResponse"/>
-
- <xs:element name="getGreetingsResponse" type="tns:getGreetingsResponse"/>
-
- <xs:element name="GetGreetingsCaps" type="tns:GetGreetingsCaps"/>
-
- <xs:element name="GetGreetingsCapsResponse" type="tns:GetGreetingsCapsResponse"/>
-
- <xs:complexType name="getGreetingsException">
- <xs:sequence>
- <xs:element name="arg0" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetingsExceptionResponse">
- <xs:sequence>
- <xs:element name="return" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="Exception">
- <xs:sequence>
- <xs:element name="message" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetings">
- <xs:sequence>
- <xs:element name="arg0" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetingsResponse">
- <xs:sequence>
- <xs:element name="return" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetingsComplex">
- <xs:sequence>
- <xs:element name="arg0" type="tns2:foo" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetingsComplexResponse">
- <xs:sequence>
- <xs:element name="return" type="tns2:foo" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="GetGreetingsCaps">
- <xs:sequence>
- <xs:element name="arg0" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="GetGreetingsCapsResponse">
- <xs:sequence>
- <xs:element name="return" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
-
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema2.xsd b/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema2.xsd deleted file mode 100644 index d955cc2af4..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldImplService_schema2.xsd +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- * 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.
--->
-<xs:schema version="1.0" targetNamespace="http://helloworld/external"
- xmlns:tns="http://helloworld/external"
- xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:complexType name="foo">
- <xs:sequence>
- <xs:element name="bars" type="tns:bar" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="bar">
- <xs:sequence>
- <xs:element name="b" type="xs:boolean" minOccurs="0"/>
- <xs:element name="s" type="xs:string" minOccurs="0"/>
- <xs:element name="x" type="xs:int"/>
- <xs:element name="y" type="xs:int" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
-</xs:schema>
-
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldServiceService_schema1.xsd b/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldServiceService_schema1.xsd deleted file mode 100644 index 467eeb90c5..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/HelloWorldServiceService_schema1.xsd +++ /dev/null @@ -1,86 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- * 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.
--->
-<xs:schema version="1.0" targetNamespace="http://helloworld/external" xmlns:tns="http://helloworld/external" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:element name="getGreetings" type="tns:getGreetings"/>
-
- <xs:element name="getGreetingsResponse" type="tns:getGreetingsResponse"/>
-
- <xs:element name="getGreetingsComplex" type="tns:getGreetingsComplex"/>
-
- <xs:element name="getGreetingsComplexResponse" type="tns:getGreetingsComplexResponse"/>
-
- <xs:element name="GetGreetingsCaps" type="tns:GetGreetingsCaps"/>
-
- <xs:element name="GetGreetingsCapsResponse" type="tns:GetGreetingsCapsResponse"/>
-
- <xs:complexType name="getGreetings">
- <xs:sequence>
- <xs:element name="name" type="xs:string" form="qualified" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetingsResponse">
- <xs:sequence>
- <xs:element name="getGreetingsReturn" type="xs:string" form="qualified" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetingsComplex">
- <xs:sequence>
- <xs:element name="arg0" type="tns:foo" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="foo">
- <xs:sequence>
- <xs:element name="bars" type="tns:bar" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="bar">
- <xs:sequence>
- <xs:element name="b" type="xs:boolean" minOccurs="0"/>
- <xs:element name="s" type="xs:string" minOccurs="0"/>
- <xs:element name="x" type="xs:int"/>
- <xs:element name="y" type="xs:int" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetingsComplexResponse">
- <xs:sequence>
- <xs:element name="return" type="tns:foo" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="GetGreetingsCaps">
- <xs:sequence>
- <xs:element name="arg0" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="GetGreetingsCapsResponse">
- <xs:sequence>
- <xs:element name="return" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
-
-
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 350ad6be96..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:itest="http://www.tuscany.apache.org/itests/binding/ws/axis2">
- <deployable composite="itest:HelloWorld"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/helloworld-external-service.wsdl b/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/helloworld-external-service.wsdl deleted file mode 100644 index c38f629e4f..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/helloworld-external-service.wsdl +++ /dev/null @@ -1,99 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- * 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.
--->
-<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.7-b01-. -->
-<definitions targetNamespace="http://helloworld/external" name="HelloWorldServiceService" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://helloworld/external" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
- <types>
- <xsd:schema>
- <xsd:import namespace="http://helloworld/external" schemaLocation="HelloWorldServiceService_schema1.xsd"/>
- </xsd:schema>
- </types>
- <message name="getGreetings">
- <part name="parameters" element="tns:getGreetings"/>
- </message>
- <message name="getGreetingsResponse">
- <part name="parameters" element="tns:getGreetingsResponse"/>
- </message>
- <message name="getGreetingsComplex">
- <part name="parameters" element="tns:getGreetingsComplex"/>
- </message>
- <message name="getGreetingsComplexResponse">
- <part name="parameters" element="tns:getGreetingsComplexResponse"/>
- </message>
- <message name="GetGreetingsCaps">
- <part name="parameters" element="tns:GetGreetingsCaps"/>
- </message>
- <message name="GetGreetingsCapsResponse">
- <part name="parameters" element="tns:GetGreetingsCapsResponse"/>
- </message>
- <portType name="HelloWorldService">
- <operation name="getGreetings">
- <input message="tns:getGreetings"/>
- <output message="tns:getGreetingsResponse"/>
- </operation>
- <operation name="getGreetingsComplex">
- <input message="tns:getGreetingsComplex"/>
- <output message="tns:getGreetingsComplexResponse"/>
- </operation>
- <operation name="GetGreetingsCaps">
- <input message="tns:GetGreetingsCaps"/>
- <output message="tns:GetGreetingsCapsResponse"/>
- </operation>
- </portType>
- <binding name="HelloWorldServicePortBinding" type="tns:HelloWorldService">
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
- <operation name="getGreetings">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- <operation name="getGreetingsComplex">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- <operation name="GetGreetingsCaps">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- </binding>
- <service name="HelloWorldServiceService">
- <port name="HelloWorldServicePort" binding="tns:HelloWorldServicePortBinding">
- <soap:address location="http://localhost:8086/External/HelloWorld"/>
- </port>
- </service>
- <service name="HelloWorldImplService">
- <port name="HelloWorldImplPort" binding="tns:HelloWorldServicePortBinding">
- <soap:address location="http://localhost:8085/HelloWorldService/HelloWorld"/>
- </port>
- </service>
-</definitions>
diff --git a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/helloworld.composite b/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/helloworld.composite deleted file mode 100644 index 8d0c7bf9ff..0000000000 --- a/sca-java-2.x/trunk/itest/ws/contribution-wsdl-first/src/main/resources/helloworld.composite +++ /dev/null @@ -1,35 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://www.tuscany.apache.org/itests/binding/ws/axis2"
- name="HelloWorld">
-
- <component name="HelloWorldService">
- <implementation.java class="org.apache.tuscany.sca.binding.ws.HelloWorldImpl"/>
- <service name="HelloWorld">
- <binding.ws wsdlElement="http://ws.binding.sca.tuscany.apache.org/#wsdl.port(HelloWorldImplService/HelloWorldImplPort)"/>
- </service>
- <reference name="helloWorldExternal">
- <binding.ws wsdlElement="http://helloworld/external#wsdl.port(HelloWorldServiceService/HelloWorldServicePort)"/>
- </reference>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/ws/defaults/pom.xml b/sca-java-2.x/trunk/itest/ws/defaults/pom.xml deleted file mode 100644 index 2107b1fc3e..0000000000 --- a/sca-java-2.x/trunk/itest/ws/defaults/pom.xml +++ /dev/null @@ -1,47 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>itest-ws-defaults</artifactId> - <name>Apache Tuscany SCA iTest WS with Defaults</name> - - <dependencies> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-feature-webservice</artifactId> - <version>2.0-SNAPSHOT</version> - <type>pom</type> - </dependency> - - - </dependencies> - - <build> - <finalName>${artifactId}</finalName> - </build> -</project> diff --git a/sca-java-2.x/trunk/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Bar.java b/sca-java-2.x/trunk/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Bar.java deleted file mode 100644 index a1233f6d25..0000000000 --- a/sca-java-2.x/trunk/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Bar.java +++ /dev/null @@ -1,58 +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.binding.ws.axis2; - -import java.io.Serializable; - -public class Bar implements Serializable { - private static final long serialVersionUID = 1249963611910502668L; - - private String s; - private int x; - private Integer y; - - private Boolean b; - - public Boolean getB() { - return b; - } - public void setB(Boolean b) { - this.b = b; - } - public String getS() { - return s; - } - public void setS(String s) { - this.s = s; - } - public int getX() { - return x; - } - public void setX(int x) { - this.x = x; - } - public Integer getY() { - return y; - } - public void setY(Integer y) { - this.y = y; - } - -} diff --git a/sca-java-2.x/trunk/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Foo.java b/sca-java-2.x/trunk/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Foo.java deleted file mode 100644 index 0695ace7f4..0000000000 --- a/sca-java-2.x/trunk/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Foo.java +++ /dev/null @@ -1,36 +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.binding.ws.axis2; - -import java.io.Serializable; - -public class Foo implements Serializable { - private static final long serialVersionUID = 4879476066850018458L; - - private Bar[] bars; - - public Bar[] getBars() { - return bars; - } - - public void setBars(Bar[] bars) { - this.bars = bars; - } -} diff --git a/sca-java-2.x/trunk/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java b/sca-java-2.x/trunk/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java deleted file mode 100644 index f39566ccbf..0000000000 --- a/sca-java-2.x/trunk/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java +++ /dev/null @@ -1,29 +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.binding.ws.axis2; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface HelloWorld { - - String getGreetings(String s); - Foo getGreetingsComplex(Foo foo); -} diff --git a/sca-java-2.x/trunk/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldClient.java b/sca-java-2.x/trunk/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldClient.java deleted file mode 100644 index 332f825a51..0000000000 --- a/sca-java-2.x/trunk/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldClient.java +++ /dev/null @@ -1,40 +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.binding.ws.axis2; - -import org.oasisopen.sca.annotation.Reference; - -public class HelloWorldClient implements HelloWorld { - - @Reference - public HelloWorld helloWorldWS; - - public String getGreetings(String s) { - String response = helloWorldWS.getGreetings(s); - System.out.println("At client: " + response); - return response; - } - - public Foo getGreetingsComplex(Foo foo){ - Foo response = helloWorldWS.getGreetingsComplex(foo); - System.out.println("At client: " + response.getBars()[0].getS()); - return response; - } -} diff --git a/sca-java-2.x/trunk/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java b/sca-java-2.x/trunk/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java deleted file mode 100644 index 3bbf50a728..0000000000 --- a/sca-java-2.x/trunk/itest/ws/defaults/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java +++ /dev/null @@ -1,42 +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.binding.ws.axis2; - -public class HelloWorldService implements HelloWorld { - - public String getGreetings(String s) { - String response = "Hello " + s; - System.out.println("At service: " + response); - return response; - } - - public Foo getGreetingsComplex(Foo foo){ - Foo response = foo; - Bar b3 = new Bar(); - b3.setS("simon"); - b3.setX(4); - b3.setY(new Integer(5)); - b3.setB(Boolean.TRUE); - response.getBars()[1] = b3; - System.out.println("At sevice: " + response.getBars()[0].getS()); - return response; - } - -} diff --git a/sca-java-2.x/trunk/itest/ws/defaults/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/ws/defaults/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 7e71dd465f..0000000000 --- a/sca-java-2.x/trunk/itest/ws/defaults/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:itest="http://www.tuscany.apache.org/itests/binding/ws/axis2"> - <deployable composite="itest:HelloWorld"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/ws/defaults/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.composite b/sca-java-2.x/trunk/itest/ws/defaults/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.composite deleted file mode 100644 index cae74697f1..0000000000 --- a/sca-java-2.x/trunk/itest/ws/defaults/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.composite +++ /dev/null @@ -1,41 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://www.tuscany.apache.org/itests/binding/ws/axis2" - name="HelloWorld"> - - <!-- - Test the ws binding with default settings for simple and complex parameters - --> - - <component name="HelloWorldClient"> - <implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.HelloWorldClient"/> - <reference name="helloWorldWS" target="HelloWorldService"/> - </component> - - <component name="HelloWorldService"> - <implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.HelloWorldService"/> - <service name="HelloWorld"> - <binding.ws/> - </service> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/ws/defaults/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl b/sca-java-2.x/trunk/itest/ws/defaults/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl deleted file mode 100644 index a352696b8e..0000000000 --- a/sca-java-2.x/trunk/itest/ws/defaults/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl +++ /dev/null @@ -1,90 +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. ---> -<wsdl:definitions targetNamespace="http://helloworld" - xmlns:tns="http://helloworld" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - name="helloworld"> - - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema"> - - <element name="getGreetings"> - <complexType> - <sequence> - <element name="name" type="xsd:string"/> - </sequence> - </complexType> - </element> - - <element name="getGreetingsResponse"> - <complexType> - <sequence> - <element name="getGreetingsReturn" type="xsd:string"/> - </sequence> - </complexType> - </element> - - </schema> - </wsdl:types> - - <wsdl:message name="getGreetingsRequest"> - <wsdl:part element="tns:getGreetings" name="parameters"/> - </wsdl:message> - - <wsdl:message name="getGreetingsResponse"> - <wsdl:part element="tns:getGreetingsResponse" name="parameters"/> - </wsdl:message> - - <wsdl:portType name="HelloWorld"> - <wsdl:operation name="getGreetings"> - <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/> - <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/> - </wsdl:operation> - </wsdl:portType> - - <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld"> - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="getGreetings"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="getGreetingsRequest"> - <wsdlsoap:body use="literal"/> - </wsdl:input> - <wsdl:output name="getGreetingsResponse"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - - </wsdl:binding> - - <wsdl:service name="HelloWorldService"> - <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort1"> - <wsdlsoap:address location="http://localhost:8085/services/HelloWorldWebService1"/> - </wsdl:port> - <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort2"> - <wsdlsoap:address location="http://localhost:8085/services/HelloWorldWebService2"/> - </wsdl:port> - <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort3"> - <wsdlsoap:address location="http://localhost:8085/services/HelloWorldWebService3"/> - </wsdl:port> - </wsdl:service> - -</wsdl:definitions> diff --git a/sca-java-2.x/trunk/itest/ws/defaults/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultsTestCase.java b/sca-java-2.x/trunk/itest/ws/defaults/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultsTestCase.java deleted file mode 100644 index 1e4c1fcbff..0000000000 --- a/sca-java-2.x/trunk/itest/ws/defaults/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultsTestCase.java +++ /dev/null @@ -1,74 +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.binding.ws.axis2; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.binding.ws.axis2.HelloWorld; -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; - -public class DefaultsTestCase extends TestCase { - - private Node node; - private HelloWorld helloWorld; - - @Override - protected void setUp() throws Exception { - node = NodeFactory.newInstance().createNode(new Contribution("test", "target/classes")); - node.start(); - helloWorld = node.getService(HelloWorld.class, "HelloWorldClient"); - } - - public void testCalculator() throws Exception { - assertEquals("Hello petra", helloWorld.getGreetings("petra")); - - Foo f = new Foo(); - Bar b1 = new Bar(); - b1.setS("petra"); - b1.setX(1); - b1.setY(new Integer(2)); - b1.setB(Boolean.TRUE); - Bar b2 = new Bar(); - b2.setS("beate"); - b2.setX(3); - b2.setY(new Integer(4)); - b2.setB(Boolean.FALSE); - f.setBars(new Bar[] { b1, b2} ); - - Foo f2 = helloWorld.getGreetingsComplex(f); - - assertEquals("petra", f2.getBars()[0].getS()); - assertEquals(1, f2.getBars()[0].getX()); - assertEquals(2, f2.getBars()[0].getY().intValue()); - assertTrue(f2.getBars()[0].getB().booleanValue()); - assertEquals("simon", f2.getBars()[1].getS()); - assertEquals(4, f2.getBars()[1].getX()); - assertEquals(5, f2.getBars()[1].getY().intValue()); - assertTrue(f2.getBars()[1].getB().booleanValue()); - } - - @Override - protected void tearDown() throws Exception { - node.stop(); - } - -} diff --git a/sca-java-2.x/trunk/itest/ws/endpoint-references/pom.xml b/sca-java-2.x/trunk/itest/ws/endpoint-references/pom.xml deleted file mode 100644 index 99aabcbec0..0000000000 --- a/sca-java-2.x/trunk/itest/ws/endpoint-references/pom.xml +++ /dev/null @@ -1,47 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>itest-ws-endpoint-references</artifactId> - <name>Apache Tuscany SCA iTest WS Endpoint References</name> - - <dependencies> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-feature-webservice</artifactId> - <version>2.0-SNAPSHOT</version> - <type>pom</type> - </dependency> - - - </dependencies> - - <build> - <finalName>${artifactId}</finalName> - </build> -</project> diff --git a/sca-java-2.x/trunk/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java b/sca-java-2.x/trunk/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java deleted file mode 100644 index d6db1c2d0b..0000000000 --- a/sca-java-2.x/trunk/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java +++ /dev/null @@ -1,29 +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.binding.ws.axis2; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface HelloWorld { - - String getGreetings(String s); - -} diff --git a/sca-java-2.x/trunk/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldComponent.java b/sca-java-2.x/trunk/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldComponent.java deleted file mode 100644 index 4ba7e67de2..0000000000 --- a/sca-java-2.x/trunk/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldComponent.java +++ /dev/null @@ -1,33 +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.binding.ws.axis2; - -import org.oasisopen.sca.annotation.Reference; - -public class HelloWorldComponent implements HelloWorld { - - @Reference - public HelloWorld helloWorldWS; - - public String getGreetings(String s) { - return helloWorldWS.getGreetings(s); - } - -} diff --git a/sca-java-2.x/trunk/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java b/sca-java-2.x/trunk/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java deleted file mode 100644 index 052b49ff55..0000000000 --- a/sca-java-2.x/trunk/itest/ws/endpoint-references/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java +++ /dev/null @@ -1,28 +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.binding.ws.axis2; - -public class HelloWorldService implements HelloWorld { - - public String getGreetings(String s) { - return "Hello " + s; - } - -} diff --git a/sca-java-2.x/trunk/itest/ws/endpoint-references/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.composite b/sca-java-2.x/trunk/itest/ws/endpoint-references/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.composite deleted file mode 100644 index 1b0af55874..0000000000 --- a/sca-java-2.x/trunk/itest/ws/endpoint-references/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.composite +++ /dev/null @@ -1,48 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://www.tuscany.apache.org/tests/binding/ws/axis2" - name="HelloWorld2"> - - <component name="HelloWorldService"> - <implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.HelloWorldService"/> - <service name="HelloWorld"> - <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" /> - <binding.ws> - <wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing"> - <wsa:Address>http://localhost:8085/myService</wsa:Address> - </wsa:EndpointReference> - </binding.ws> - </service> - </component> - - <component name="HelloWorldComponent"> - <implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.HelloWorldComponent"/> - <reference name="helloWorldWS"> - <binding.ws> - <wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing"> - <wsa:Address>http://localhost:8085/myService</wsa:Address> - </wsa:EndpointReference> - </binding.ws> - </reference> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/ws/endpoint-references/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl b/sca-java-2.x/trunk/itest/ws/endpoint-references/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl deleted file mode 100644 index 1a2272d7ee..0000000000 --- a/sca-java-2.x/trunk/itest/ws/endpoint-references/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl +++ /dev/null @@ -1,86 +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. ---> -<wsdl:definitions targetNamespace="http://helloworld" xmlns:tns="http://helloworld" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" - name="helloworld"> - - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema"> - - <element name="getGreetings"> - <complexType> - <sequence> - <element name="name" type="xsd:string"/> - </sequence> - </complexType> - </element> - - <element name="getGreetingsResponse"> - <complexType> - <sequence> - <element name="getGreetingsReturn" type="xsd:string"/> - </sequence> - </complexType> - </element> - - </schema> - </wsdl:types> - - <wsdl:message name="getGreetingsRequest"> - <wsdl:part element="tns:getGreetings" name="parameters"/> - </wsdl:message> - - <wsdl:message name="getGreetingsResponse"> - <wsdl:part element="tns:getGreetingsResponse" name="parameters"/> - </wsdl:message> - - <wsdl:portType name="HelloWorld"> - <wsdl:operation name="getGreetings"> - <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/> - <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/> - </wsdl:operation> - </wsdl:portType> - - <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld"> - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="getGreetings"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="getGreetingsRequest"> - <wsdlsoap:body use="literal"/> - </wsdl:input> - <wsdl:output name="getGreetingsResponse"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - - </wsdl:binding> - - <wsdl:service name="HelloWorldService"> - <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort"> - <wsdlsoap:address location="http://localhost:8085/services/HelloWorldWebService"/> - </wsdl:port> - <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort2"> - <wsdlsoap:address location="http://localhost:8085/services/HelloWorldWebService2"/> - </wsdl:port> - <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort3"> - <wsdlsoap:address location="http://localhost:8085/services/HelloWorldWebService3"/> - </wsdl:port> - </wsdl:service> - -</wsdl:definitions> diff --git a/sca-java-2.x/trunk/itest/ws/endpoint-references/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldTestCase.java b/sca-java-2.x/trunk/itest/ws/endpoint-references/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldTestCase.java deleted file mode 100644 index f1cfe30475..0000000000 --- a/sca-java-2.x/trunk/itest/ws/endpoint-references/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldTestCase.java +++ /dev/null @@ -1,52 +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.binding.ws.axis2; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.binding.ws.axis2.HelloWorld; -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; - -public class HelloWorldTestCase extends TestCase { - - private Node node; - private HelloWorld helloWorld; - - public void testCalculator() throws Exception { - assertEquals("Hello petra", helloWorld.getGreetings("petra")); - } - - @Override - protected void setUp() throws Exception { - String contribution = "target/classes"; - node = NodeFactory.newInstance().createNode("org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.composite", new Contribution("test", contribution)); - node.start(); - helloWorld = node.getService(HelloWorld.class, "HelloWorldComponent"); - } - - @Override - protected void tearDown() throws Exception { - node.stop(); - } - -} diff --git a/sca-java-2.x/trunk/itest/ws/endpoints/pom.xml b/sca-java-2.x/trunk/itest/ws/endpoints/pom.xml deleted file mode 100644 index 84da8f9ab6..0000000000 --- a/sca-java-2.x/trunk/itest/ws/endpoints/pom.xml +++ /dev/null @@ -1,47 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>itest-ws-endpoints</artifactId> - <name>Apache Tuscany SCA iTest WS Endpoints</name> - - <dependencies> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-feature-webservice</artifactId> - <version>2.0-SNAPSHOT</version> - <type>pom</type> - </dependency> - - - </dependencies> - - <build> - <finalName>${artifactId}</finalName> - </build> -</project> diff --git a/sca-java-2.x/trunk/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldMultiService.java b/sca-java-2.x/trunk/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldMultiService.java deleted file mode 100644 index 8f77c63213..0000000000 --- a/sca-java-2.x/trunk/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldMultiService.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.binding.ws.axis2; - -import org.apache.axiom.om.OMAbstractFactory; -import org.apache.axiom.om.OMElement; -import org.apache.axiom.om.OMFactory; - -public class HelloWorldMultiService implements HelloWorldOM, HelloWorldOM2 { - - public OMElement getGreetings(OMElement requestOM) { - String name = requestOM.getFirstElement().getText(); - - OMFactory omFactory = OMAbstractFactory.getOMFactory(); - OMElement responseOM = omFactory.createOMElement("getGreetingsResponse", "http://helloworld-om", "helloworld"); - OMElement param = omFactory.createOMElement("getGreetingsReturn", "http://helloworld-om", "helloworld"); - responseOM.addChild(param); - param.addChild(omFactory.createOMText("Hello " + name)); - - return responseOM; - } - - public OMElement getGreetings2(OMElement requestOM) { - String name = requestOM.getFirstElement().getText(); - - OMFactory omFactory = OMAbstractFactory.getOMFactory(); - OMElement responseOM = omFactory.createOMElement("getGreetingsResponse", "http://helloworld-om", "helloworld"); - OMElement param = omFactory.createOMElement("getGreetingsReturn", "http://helloworld-om", "helloworld"); - responseOM.addChild(param); - param.addChild(omFactory.createOMText("Hello2 " + name)); - - return responseOM; - } -} diff --git a/sca-java-2.x/trunk/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM.java b/sca-java-2.x/trunk/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM.java deleted file mode 100644 index e248815805..0000000000 --- a/sca-java-2.x/trunk/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM.java +++ /dev/null @@ -1,30 +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.binding.ws.axis2; - -import org.apache.axiom.om.OMElement; -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface HelloWorldOM { - - OMElement getGreetings(OMElement parmE); - -} diff --git a/sca-java-2.x/trunk/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM2.java b/sca-java-2.x/trunk/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM2.java deleted file mode 100644 index 9d0a4ce5b4..0000000000 --- a/sca-java-2.x/trunk/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM2.java +++ /dev/null @@ -1,30 +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.binding.ws.axis2; - -import org.apache.axiom.om.OMElement; -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface HelloWorldOM2 { - - OMElement getGreetings2(OMElement parmE); - -} diff --git a/sca-java-2.x/trunk/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMComponent.java b/sca-java-2.x/trunk/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMComponent.java deleted file mode 100644 index 8439696fa8..0000000000 --- a/sca-java-2.x/trunk/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMComponent.java +++ /dev/null @@ -1,34 +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.binding.ws.axis2; - -import org.apache.axiom.om.OMElement; -import org.oasisopen.sca.annotation.Reference; - -public class HelloWorldOMComponent implements HelloWorldOM { - - @Reference - public HelloWorldOM helloWorldWS; - - public OMElement getGreetings(OMElement om) { - return helloWorldWS.getGreetings(om); - } - -} diff --git a/sca-java-2.x/trunk/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMService.java b/sca-java-2.x/trunk/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMService.java deleted file mode 100644 index 5b8578c816..0000000000 --- a/sca-java-2.x/trunk/itest/ws/endpoints/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMService.java +++ /dev/null @@ -1,41 +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.binding.ws.axis2; - -import org.apache.axiom.om.OMAbstractFactory; -import org.apache.axiom.om.OMElement; -import org.apache.axiom.om.OMFactory; - -public class HelloWorldOMService implements HelloWorldOM { - - public OMElement getGreetings(OMElement requestOM) { - System.out.println(" **** getGreetings **** "); - String name = requestOM.getFirstElement().getText(); - - OMFactory omFactory = OMAbstractFactory.getOMFactory(); - OMElement responseOM = omFactory.createOMElement("getGreetingsResponse", "http://helloworld-om", "helloworld"); - OMElement param = omFactory.createOMElement("getGreetingsReturn", "http://helloworld-om", "helloworld"); - responseOM.addChild(param); - param.addChild(omFactory.createOMText("Hello " + name)); - - return responseOM; - } - -} diff --git a/sca-java-2.x/trunk/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/DefaultMultiService.composite b/sca-java-2.x/trunk/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/DefaultMultiService.composite deleted file mode 100644 index c7863a5ff8..0000000000 --- a/sca-java-2.x/trunk/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/DefaultMultiService.composite +++ /dev/null @@ -1,53 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://www.tuscany.apache.org/tests/binding/ws/axis2" - name="DefaultMultiService"> - - <!-- - exposing a component which has multiple services with a WS binding, - endpoint should be <componentURI>/<serviceName> so for this composite: - http://localhost:8085/HelloWorldService/service1 - --> - - - - <component name="HelloWorldService"> - <implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.HelloWorldMultiService"/> - <service name="HelloWorldOM"> - <interface.wsdl interface="http://helloworld-om#wsdl.interface(HelloWorld)" /> - <binding.ws uri="http://localhost:8085/HelloWorldService/helloWorld" - wsdlElement="http://helloworld-om#wsdl.binding(HelloWorldSoapBinding)"/> - </service> - </component> - - <component name="HelloWorldComponent"> - <implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.HelloWorldOMComponent"/> - <reference name="helloWorldWS"> - <interface.wsdl interface="http://helloworld-om#wsdl.interface(HelloWorld)" /> - <binding.ws wsdlElement="http://helloworld-om#wsdl.binding(HelloWorldSoapBinding)" - uri="http://localhost:8085/HelloWorldService/helloWorld"/> - </reference> - </component> - - - -</composite> diff --git a/sca-java-2.x/trunk/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/DefaultSingleService.composite b/sca-java-2.x/trunk/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/DefaultSingleService.composite deleted file mode 100644 index 63c6a89cfb..0000000000 --- a/sca-java-2.x/trunk/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/DefaultSingleService.composite +++ /dev/null @@ -1,51 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://www.tuscany.apache.org/tests/binding/ws/axis2" - name="DefaultSingleService"> - - <!-- - exposing a component with a WS binding, endpoint should be <componentURI>/<serviceName> - unless the component has just a single service in which case its just <componentURI> - so for this composite: http://localhost:8085/HelloWorldService - --> - - <component name="HelloWorldService"> - <implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.HelloWorldOMService"/> - <service name="HelloWorldOM"> - <interface.wsdl interface="http://helloworld-om#wsdl.interface(HelloWorld)" /> - <binding.ws uri="http://localhost:8085/HelloWorldService/helloWorld" - wsdlElement="http://helloworld-om#wsdl.binding(HelloWorldSoapBinding)"/> - </service> - </component> - - <component name="HelloWorldComponent"> - <implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.HelloWorldOMComponent"/> - <reference name="helloWorldWS"> - <interface.wsdl interface="http://helloworld-om#wsdl.interface(HelloWorld)" /> - <binding.ws wsdlElement="http://helloworld-om#wsdl.binding(HelloWorldSoapBinding)" - uri="http://localhost:8085/HelloWorldService/helloWorld"/> - </reference> - </component> - - - -</composite> diff --git a/sca-java-2.x/trunk/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/WSDLExplicitURI.composite b/sca-java-2.x/trunk/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/WSDLExplicitURI.composite deleted file mode 100644 index 9991a415f9..0000000000 --- a/sca-java-2.x/trunk/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/WSDLExplicitURI.composite +++ /dev/null @@ -1,50 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://www.tuscany.apache.org/tests/binding/ws/axis2" - name="endpoint3"> - - <!-- - exposing a component with a WS binding using a WSDL port with an explicit URL - so for this composite the service is: http://localhost:8085/myExplicitURI - --> - - - <component name="HelloWorldService"> - <implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.HelloWorldOMService"/> - <service name="HelloWorldOM"> - <interface.wsdl interface="http://helloworld-om-uri#wsdl.interface(HelloWorld)" /> - <binding.ws wsdlElement="http://helloworld-om-uri#wsdl.port(HelloWorldService/HelloWorldSoapPort)" /> - </service> - </component> - - <component name="HelloWorldComponent"> - <implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.HelloWorldOMComponent"/> - <reference name="helloWorldWS"> - <interface.wsdl interface="http://helloworld-om-uri#wsdl.interface(HelloWorld)" /> - <binding.ws wsdlElement="http://helloworld-om-uri#wsdl.binding(HelloWorldSoapBinding)" - uri="http://localhost:8085/myExplicitURI"/> - </reference> - </component> - - - -</composite> diff --git a/sca-java-2.x/trunk/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/WSDLRelativeURI.composite b/sca-java-2.x/trunk/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/WSDLRelativeURI.composite deleted file mode 100644 index 1ea7ab5a36..0000000000 --- a/sca-java-2.x/trunk/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/WSDLRelativeURI.composite +++ /dev/null @@ -1,51 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://www.tuscany.apache.org/tests/binding/ws/axis2" - name="endpoint4"> - - <!-- - exposing a component with a WS binding using a WSDL port with a relative URL - so for this composite the service is: http://localhost:8085/HelloWorldService/myRelativeURI - --> - - - - <component name="HelloWorldService"> - <implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.HelloWorldOMService"/> - <service name="HelloWorldOM"> - <interface.wsdl interface="http://helloworld-om-relative-uri#wsdl.interface(HelloWorld)" /> - <binding.ws wsdlElement="http://helloworld-om-relative-uri#wsdl.port(HelloWorldService/HelloWorldSoapPort)" /> - </service> - </component> - - <component name="HelloWorldComponent"> - <implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.HelloWorldOMComponent"/> - <reference name="helloWorldWS"> - <interface.wsdl interface="http://helloworld-om-relative-uri#wsdl.interface(HelloWorld)" /> - <binding.ws wsdlElement="http://helloworld-om-relative-uri#wsdl.binding(HelloWorldSoapBinding)" - uri="http://localhost:8085/HelloWorldService/helloWorld/myRelativeURI"/> - </reference> - </component> - - - -</composite> diff --git a/sca-java-2.x/trunk/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-relative-uri.wsdl b/sca-java-2.x/trunk/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-relative-uri.wsdl deleted file mode 100644 index fe68755c47..0000000000 --- a/sca-java-2.x/trunk/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-relative-uri.wsdl +++ /dev/null @@ -1,78 +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. ---> -<wsdl:definitions targetNamespace="http://helloworld-om-relative-uri" xmlns:tns="http://helloworld-om-relative-uri" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" - name="helloworld-om"> - - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://helloworld-om-relative-uri" xmlns="http://www.w3.org/2001/XMLSchema"> - - <element name="getGreetings"> - <complexType> - <sequence> - <element name="name" type="xsd:string"/> - </sequence> - </complexType> - </element> - - <element name="getGreetingsResponse"> - <complexType> - <sequence> - <element name="getGreetingsReturn" type="xsd:string"/> - </sequence> - </complexType> - </element> - </schema> - </wsdl:types> - - <wsdl:message name="getGreetingsRequest"> - <wsdl:part element="tns:getGreetings" name="parameters"/> - </wsdl:message> - - <wsdl:message name="getGreetingsResponse"> - <wsdl:part element="tns:getGreetingsResponse" name="parameters"/> - </wsdl:message> - - <wsdl:portType name="HelloWorld"> - <wsdl:operation name="getGreetings"> - <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/> - <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/> - </wsdl:operation> - </wsdl:portType> - - <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld"> - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="getGreetings"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="getGreetingsRequest"> - <wsdlsoap:body use="literal"/> - </wsdl:input> - <wsdl:output name="getGreetingsResponse"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - - <wsdl:service name="HelloWorldService"> - <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort"> - <wsdlsoap:address location="http://localhost:8085/HelloWorldService/helloWorld/myRelativeURI"/> - </wsdl:port> - </wsdl:service> - -</wsdl:definitions> diff --git a/sca-java-2.x/trunk/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-uri.wsdl b/sca-java-2.x/trunk/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-uri.wsdl deleted file mode 100644 index baa223f41c..0000000000 --- a/sca-java-2.x/trunk/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-uri.wsdl +++ /dev/null @@ -1,78 +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. ---> -<wsdl:definitions targetNamespace="http://helloworld-om-uri" xmlns:tns="http://helloworld-om-uri" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" - name="helloworld-om"> - - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://helloworld-om-uri" xmlns="http://www.w3.org/2001/XMLSchema"> - - <element name="getGreetings"> - <complexType> - <sequence> - <element name="name" type="xsd:string"/> - </sequence> - </complexType> - </element> - - <element name="getGreetingsResponse"> - <complexType> - <sequence> - <element name="getGreetingsReturn" type="xsd:string"/> - </sequence> - </complexType> - </element> - </schema> - </wsdl:types> - - <wsdl:message name="getGreetingsRequest"> - <wsdl:part element="tns:getGreetings" name="parameters"/> - </wsdl:message> - - <wsdl:message name="getGreetingsResponse"> - <wsdl:part element="tns:getGreetingsResponse" name="parameters"/> - </wsdl:message> - - <wsdl:portType name="HelloWorld"> - <wsdl:operation name="getGreetings"> - <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/> - <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/> - </wsdl:operation> - </wsdl:portType> - - <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld"> - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="getGreetings"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="getGreetingsRequest"> - <wsdlsoap:body use="literal"/> - </wsdl:input> - <wsdl:output name="getGreetingsResponse"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - - <wsdl:service name="HelloWorldService"> - <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort"> - <wsdlsoap:address location="http://localhost:8085/myExplicitURI"/> - </wsdl:port> - </wsdl:service> - -</wsdl:definitions> diff --git a/sca-java-2.x/trunk/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om.wsdl b/sca-java-2.x/trunk/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om.wsdl deleted file mode 100644 index 73ca02246d..0000000000 --- a/sca-java-2.x/trunk/itest/ws/endpoints/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om.wsdl +++ /dev/null @@ -1,78 +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. ---> -<wsdl:definitions targetNamespace="http://helloworld-om" xmlns:tns="http://helloworld-om" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" - name="helloworld-om"> - - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://helloworld-om" xmlns="http://www.w3.org/2001/XMLSchema"> - - <element name="getGreetings"> - <complexType> - <sequence> - <element name="name" type="xsd:string"/> - </sequence> - </complexType> - </element> - - <element name="getGreetingsResponse"> - <complexType> - <sequence> - <element name="getGreetingsReturn" type="xsd:string"/> - </sequence> - </complexType> - </element> - </schema> - </wsdl:types> - - <wsdl:message name="getGreetingsRequest"> - <wsdl:part element="tns:getGreetings" name="parameters"/> - </wsdl:message> - - <wsdl:message name="getGreetingsResponse"> - <wsdl:part element="tns:getGreetingsResponse" name="parameters"/> - </wsdl:message> - - <wsdl:portType name="HelloWorld"> - <wsdl:operation name="getGreetings"> - <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/> - <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/> - </wsdl:operation> - </wsdl:portType> - - <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld"> - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="getGreetings"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="getGreetingsRequest"> - <wsdlsoap:body use="literal"/> - </wsdl:input> - <wsdl:output name="getGreetingsResponse"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - - <wsdl:service name="HelloWorldService"> - <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort"> - <wsdlsoap:address location="http://endpoint.not.used"/> - </wsdl:port> - </wsdl:service> - -</wsdl:definitions> diff --git a/sca-java-2.x/trunk/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/AbstractHelloWorldOMTestCase.java b/sca-java-2.x/trunk/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/AbstractHelloWorldOMTestCase.java deleted file mode 100644 index bad94bbbc3..0000000000 --- a/sca-java-2.x/trunk/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/AbstractHelloWorldOMTestCase.java +++ /dev/null @@ -1,68 +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.binding.ws.axis2; - -import junit.framework.Assert; -import junit.framework.TestCase; - -import org.apache.axiom.om.OMAbstractFactory; -import org.apache.axiom.om.OMElement; -import org.apache.axiom.om.OMFactory; -import org.apache.axiom.om.OMText; -import org.apache.tuscany.sca.binding.ws.axis2.HelloWorldOM; -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; - -public abstract class AbstractHelloWorldOMTestCase extends TestCase { - - private Node node; - private HelloWorldOM helloWorld; - - @Override - protected void setUp() throws Exception { - String contribution = "target/classes"; - node = NodeFactory.newInstance().createNode(getCompositeName(), new Contribution("test", contribution)); - node.start(); - helloWorld = node.getService(HelloWorldOM.class, "HelloWorldComponent"); - } - - public void testCalculator() throws Exception { - OMFactory fac = OMAbstractFactory.getOMFactory(); - OMElement requestOM = fac.createOMElement("getGreetings", "http://helloworld-om", "helloworld"); - OMElement parmE = fac.createOMElement("name", "http://helloworld-om", "helloworld"); - requestOM.addChild(parmE); - parmE.addChild(fac.createOMText("petra")); - OMElement responseOM = helloWorld.getGreetings(requestOM); - OMElement child = (OMElement)responseOM.getFirstElement(); - Assert.assertEquals("Hello petra", ((OMText)child.getFirstOMChild()).getText()); - } - - @Override - protected void tearDown() throws Exception { - node.stop(); - } - - protected String getCompositeName() { - String className = this.getClass().getName(); - return className.substring(0, className.length() - 8).replace('.', '/') + ".composite"; - } - -} diff --git a/sca-java-2.x/trunk/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultMultiServiceTestCase.java b/sca-java-2.x/trunk/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultMultiServiceTestCase.java deleted file mode 100644 index 4ecf016e5a..0000000000 --- a/sca-java-2.x/trunk/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultMultiServiceTestCase.java +++ /dev/null @@ -1,24 +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.binding.ws.axis2; - -public class DefaultMultiServiceTestCase extends AbstractHelloWorldOMTestCase { - // super class does it all getting composite based on this class name -} diff --git a/sca-java-2.x/trunk/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultSingleServiceTestCase.java b/sca-java-2.x/trunk/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultSingleServiceTestCase.java deleted file mode 100644 index 13163d62ab..0000000000 --- a/sca-java-2.x/trunk/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/DefaultSingleServiceTestCase.java +++ /dev/null @@ -1,24 +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.binding.ws.axis2; - -public class DefaultSingleServiceTestCase extends AbstractHelloWorldOMTestCase { - // super class does it all getting composite based on this class name -} diff --git a/sca-java-2.x/trunk/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLExplicitURITestCase.java b/sca-java-2.x/trunk/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLExplicitURITestCase.java deleted file mode 100644 index bb492557d4..0000000000 --- a/sca-java-2.x/trunk/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLExplicitURITestCase.java +++ /dev/null @@ -1,24 +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.binding.ws.axis2; - -public class WSDLExplicitURITestCase extends AbstractHelloWorldOMTestCase { - // super class does it all getting composite based on this class name -} diff --git a/sca-java-2.x/trunk/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLRelativeURITestCase.java b/sca-java-2.x/trunk/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLRelativeURITestCase.java deleted file mode 100644 index e038cc3116..0000000000 --- a/sca-java-2.x/trunk/itest/ws/endpoints/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/WSDLRelativeURITestCase.java +++ /dev/null @@ -1,24 +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.binding.ws.axis2; - -public class WSDLRelativeURITestCase extends AbstractHelloWorldOMTestCase { - // super class does it all getting composite based on this class name -} diff --git a/sca-java-2.x/trunk/itest/ws/external-client/pom.xml b/sca-java-2.x/trunk/itest/ws/external-client/pom.xml deleted file mode 100644 index 1a75336754..0000000000 --- a/sca-java-2.x/trunk/itest/ws/external-client/pom.xml +++ /dev/null @@ -1,112 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-ws-external-client</artifactId>
- <name>Apache Tuscany SCA iTest WS External Client</name>
-
- <dependencies>
-
- <dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-rt</artifactId>
- <version>2.1.7</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
-
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>target/jaxws-source</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxws-maven-plugin</artifactId>
- <version>1.12</version>
- <!-- Explicitly add the transitive dependencies for jaxws-api
- http://jira.codehaus.org/browse/MEV-498
- -->
- <dependencies>
- <dependency>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- <version>1.0-MR1</version>
- </dependency>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>wsimport1</id>
- <phase>process-resources</phase>
- <goals>
- <goal>wsimport</goal>
- </goals>
- <configuration>
- <packageName>org.apache.tuscany.sca.binding.ws.jaxws.sca</packageName>
- <wsdlDirectory>${basedir}/target/classes</wsdlDirectory>
- <wsdlFiles>
- <wsdlFile>HelloWorldImplService.wsdl</wsdlFile>
- </wsdlFiles>
- <staleFile>${project.build.directory}/jaxws/stale/.wsimport1StaleFlag</staleFile>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <target>2.1</target>
- <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
- <resourceDestDir>${project.build.directory}/jaxws-source</resourceDestDir>
- <verbose>true</verbose>
- <xnocompile>true</xnocompile>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/sca-java-2.x/trunk/itest/ws/external-client/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/client/HelloWorldClientLauncher.java b/sca-java-2.x/trunk/itest/ws/external-client/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/client/HelloWorldClientLauncher.java deleted file mode 100644 index ccecf5695f..0000000000 --- a/sca-java-2.x/trunk/itest/ws/external-client/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/client/HelloWorldClientLauncher.java +++ /dev/null @@ -1,91 +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.binding.ws.jaxws.external.client;
-
-import java.io.File;
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.sca.Exception_Exception;
-import org.apache.tuscany.sca.binding.ws.jaxws.sca.Foo;
-import org.apache.tuscany.sca.binding.ws.jaxws.sca.HelloWorldImpl;
-
-public class HelloWorldClientLauncher {
-
- public HelloWorldImpl wsProxy;
-
- public HelloWorldClientLauncher(){
- }
-
- public void createClient() throws Exception{
- System.out.println(">>> Starting external JAXWS client ");
-
- // default JVM JAXWS support
- QName serviceName = new QName("http://ws.binding.sca.tuscany.apache.org/", "HelloWorldImplService");
- QName portName = new QName("http://ws.binding.sca.tuscany.apache.org/", "HelloWorldImplPort");
- //URL wsdlLocation = new File("../external-client/target/classes/helloworld-sca.wsdl").toURL();
- URL wsdlLocation = new File("../external-client/target/classes/HelloWorldImplService.wsdl").toURL();
- javax.xml.ws.Service webService = Service.create(wsdlLocation, serviceName);
- wsProxy = (HelloWorldImpl) webService.getPort(portName, HelloWorldImpl.class);
- }
-
- public void destroyClient(){
- System.out.println(">>> Stopping external JAXWS client: ");
- // TODO
- }
-
- public String getGreetings(String name){
- System.out.println("Entering External Client HelloWorld.getGreetings: " + name);
- String response = wsProxy.getGreetings(name);
- System.out.println("Leaving External Client HelloWorld.getGreetings: " + response);
- return response;
- }
-
- public String getGreetingsException(String name) throws Exception_Exception {
- System.out.println("Entering External Client HelloWorld.getGreetingsException: " + name);
- String response = wsProxy.getGreetingsException(name);
- System.out.println("Leaving External Client HelloWorld.getGreetingsException: " + response);
- return response;
- }
-
- public Foo getGreetingsComplex(Foo f) throws Exception_Exception {
- System.out.println("Entering External Client HelloWorld.getGreetingsComplex: " + f.getBars().get(0).getS());
- Foo response = wsProxy.getGreetingsComplex(f);
- System.out.println("Leaving External Client HelloWorld.getGreetingsComplex: " + response.getBars().get(0).getS());
- return response;
- }
-
- public String getGreetingsCaps(String s) throws Exception_Exception {
- System.out.println("Entering External Client HelloWorld.getGreetingsCaps: " + s);
- String response = wsProxy.getGreetingsCaps(s);
- System.out.println("Leaving External Client HelloWorld.getGreetingsCaps: " + response);
- return response;
- }
-
- public static void main(String[] args) throws Exception {
- HelloWorldClientLauncher launcher = new HelloWorldClientLauncher();
- launcher.createClient();
- launcher.getGreetings("Fred");
- launcher.destroyClient();
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/ws/external-client/src/main/resources/HelloWorldImplService.wsdl b/sca-java-2.x/trunk/itest/ws/external-client/src/main/resources/HelloWorldImplService.wsdl deleted file mode 100644 index d175589d7b..0000000000 --- a/sca-java-2.x/trunk/itest/ws/external-client/src/main/resources/HelloWorldImplService.wsdl +++ /dev/null @@ -1,128 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- * 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.
--->
-<definitions targetNamespace="http://ws.binding.sca.tuscany.apache.org/"
- name="HelloWorldImplService"
- xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:tns="http://ws.binding.sca.tuscany.apache.org/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
- <types>
- <xsd:schema>
- <xsd:import namespace="http://ws.binding.sca.tuscany.apache.org/"
- schemaLocation="HelloWorldImplService_schema1.xsd"/>
- </xsd:schema>
- </types>
- <message name="getGreetings">
- <part name="parameters" element="tns:getGreetings"/>
- </message>
- <message name="getGreetingsResponse">
- <part name="parameters" element="tns:getGreetingsResponse"/>
- </message>
- <message name="getGreetingsException">
- <part name="parameters" element="tns:getGreetingsException"/>
- </message>
- <message name="getGreetingsExceptionResponse">
- <part name="parameters" element="tns:getGreetingsExceptionResponse"/>
- </message>
- <message name="Exception">
- <part name="fault" element="tns:Exception"/>
- </message>
- <message name="getGreetingsComplex">
- <part name="parameters" element="tns:getGreetingsComplex"/>
- </message>
- <message name="getGreetingsComplexResponse">
- <part name="parameters" element="tns:getGreetingsComplexResponse"/>
- </message>
- <message name="GetGreetingsCaps">
- <part name="parameters" element="tns:GetGreetingsCaps"/>
- </message>
- <message name="GetGreetingsCapsResponse">
- <part name="parameters" element="tns:GetGreetingsCapsResponse"/>
- </message>
- <portType name="HelloWorldImpl">
- <operation name="getGreetings">
- <input message="tns:getGreetings"/>
- <output message="tns:getGreetingsResponse"/>
- </operation>
- <operation name="getGreetingsException">
- <input message="tns:getGreetingsException"/>
- <output message="tns:getGreetingsExceptionResponse"/>
- <fault message="tns:Exception" name="Exception"/>
- </operation>
- <operation name="getGreetingsComplex">
- <input message="tns:getGreetingsComplex"/>
- <output message="tns:getGreetingsComplexResponse"/>
- </operation>
- <operation name="GetGreetingsCaps">
- <input message="tns:GetGreetingsCaps"/>
- <output message="tns:GetGreetingsCapsResponse"/>
- </operation>
- </portType>
- <binding name="HelloWorldImplPortBinding" type="tns:HelloWorldImpl">
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
- <operation name="getGreetings">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- <operation name="getGreetingsException">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- <fault name="Exception">
- <soap:fault name="Exception" use="literal"/>
- </fault>
- </operation>
- <operation name="getGreetingsComplex">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- <operation name="GetGreetingsCaps">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- </binding>
- <service name="HelloWorldImplService">
- <port name="HelloWorldImplPort" binding="tns:HelloWorldImplPortBinding">
- <soap:address location="http://localhost:8085/HelloWorldService/HelloWorld"/>
- </port>
- </service>
-</definitions>
-
-
-
diff --git a/sca-java-2.x/trunk/itest/ws/external-client/src/main/resources/HelloWorldImplService_schema1.xsd b/sca-java-2.x/trunk/itest/ws/external-client/src/main/resources/HelloWorldImplService_schema1.xsd deleted file mode 100644 index c9c0acb038..0000000000 --- a/sca-java-2.x/trunk/itest/ws/external-client/src/main/resources/HelloWorldImplService_schema1.xsd +++ /dev/null @@ -1,111 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- * 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.
--->
-<xs:schema version="1.0" targetNamespace="http://ws.binding.sca.tuscany.apache.org/"
- xmlns:tns="http://ws.binding.sca.tuscany.apache.org/"
- xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:element name="Exception" type="tns:Exception"/>
-
- <xs:element name="getGreetings" type="tns:getGreetings"/>
-
- <xs:element name="getGreetingsComplex" type="tns:getGreetingsComplex"/>
-
- <xs:element name="getGreetingsComplexResponse" type="tns:getGreetingsComplexResponse"/>
-
- <xs:element name="getGreetingsException" type="tns:getGreetingsException"/>
-
- <xs:element name="getGreetingsExceptionResponse" type="tns:getGreetingsExceptionResponse"/>
-
- <xs:element name="getGreetingsResponse" type="tns:getGreetingsResponse"/>
-
- <xs:element name="GetGreetingsCaps" type="tns:GetGreetingsCaps"/>
-
- <xs:element name="GetGreetingsCapsResponse" type="tns:GetGreetingsCapsResponse"/>
-
- <xs:complexType name="getGreetingsException">
- <xs:sequence>
- <xs:element name="arg0" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetingsExceptionResponse">
- <xs:sequence>
- <xs:element name="return" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="Exception">
- <xs:sequence>
- <xs:element name="message" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetings">
- <xs:sequence>
- <xs:element name="arg0" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetingsResponse">
- <xs:sequence>
- <xs:element name="return" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetingsComplex">
- <xs:sequence>
- <xs:element name="arg0" type="tns:foo" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="foo">
- <xs:sequence>
- <xs:element name="bars" type="tns:bar" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="bar">
- <xs:sequence>
- <xs:element name="b" type="xs:boolean" minOccurs="0"/>
- <xs:element name="s" type="xs:string" minOccurs="0"/>
- <xs:element name="x" type="xs:int"/>
- <xs:element name="y" type="xs:int" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="getGreetingsComplexResponse">
- <xs:sequence>
- <xs:element name="return" type="tns:foo" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="GetGreetingsCaps">
- <xs:sequence>
- <xs:element name="arg0" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="GetGreetingsCapsResponse">
- <xs:sequence>
- <xs:element name="return" type="xs:string" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
-
diff --git a/sca-java-2.x/trunk/itest/ws/external-service/pom.xml b/sca-java-2.x/trunk/itest/ws/external-service/pom.xml deleted file mode 100644 index f789844419..0000000000 --- a/sca-java-2.x/trunk/itest/ws/external-service/pom.xml +++ /dev/null @@ -1,104 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-ws-external-service</artifactId>
- <name>Apache Tuscany SCA iTest WS External Service</name>
-
- <dependencies>
-
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
-
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>target/jaxws-source</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxws-maven-plugin</artifactId>
- <version>1.12</version>
- <!-- Explicitly add the transitive dependencies for jaxws-api
- http://jira.codehaus.org/browse/MEV-498
- -->
- <dependencies>
- <dependency>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- <version>1.0-MR1</version>
- </dependency>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>wsgen1</id>
- <phase>process-classes</phase>
- <goals>
- <goal>wsgen</goal>
- </goals>
- <configuration>
- <sei>org.apache.tuscany.sca.binding.ws.jaxws.external.service.HelloWorldService</sei>
- <genWsdl>true</genWsdl>
- <staleFile>${project.build.directory}/jaxws/stale/.wsgen1StaleFlag</staleFile>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <target>2.1</target>
- <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
- <resourceDestDir>${project.build.directory}/jaxws-source</resourceDestDir>
- <verbose>true</verbose>
- <xnocompile>true</xnocompile>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/sca-java-2.x/trunk/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/Bar.java b/sca-java-2.x/trunk/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/Bar.java deleted file mode 100644 index 1f330aa441..0000000000 --- a/sca-java-2.x/trunk/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/Bar.java +++ /dev/null @@ -1,152 +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.binding.ws.jaxws.external.service;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for bar complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="bar">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="b" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
- * <element name="s" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="x" type="{http://www.w3.org/2001/XMLSchema}int"/>
- * <element name="y" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "bar", propOrder = {
- "b",
- "s",
- "x",
- "y"
-})
-public class Bar {
-
- protected Boolean b;
- protected String s;
- protected int x;
- protected Integer y;
-
- /**
- * Gets the value of the b property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- public Boolean isB() {
- return b;
- }
-
- /**
- * Sets the value of the b property.
- *
- * @param value
- * allowed object is
- * {@link Boolean }
- *
- */
- public void setB(Boolean value) {
- this.b = value;
- }
-
- /**
- * Gets the value of the s property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getS() {
- return s;
- }
-
- /**
- * Sets the value of the s property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setS(String value) {
- this.s = value;
- }
-
- /**
- * Gets the value of the x property.
- *
- */
- public int getX() {
- return x;
- }
-
- /**
- * Sets the value of the x property.
- *
- */
- public void setX(int value) {
- this.x = value;
- }
-
- /**
- * Gets the value of the y property.
- *
- * @return
- * possible object is
- * {@link Integer }
- *
- */
- public Integer getY() {
- return y;
- }
-
- /**
- * Sets the value of the y property.
- *
- * @param value
- * allowed object is
- * {@link Integer }
- *
- */
- public void setY(Integer value) {
- this.y = value;
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/Foo.java b/sca-java-2.x/trunk/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/Foo.java deleted file mode 100644 index 1b22153169..0000000000 --- a/sca-java-2.x/trunk/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/Foo.java +++ /dev/null @@ -1,88 +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.binding.ws.jaxws.external.service;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for foo complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="foo">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="bars" type="{http://ws.binding.sca.tuscany.apache.org/}bar" maxOccurs="unbounded" minOccurs="0"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "foo", propOrder = {
- "bars"
-})
-public class Foo {
-
- @XmlElement(nillable = true)
- protected List<Bar> bars;
-
- /**
- * Gets the value of the bars property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the bars property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getBars().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link Bar }
- *
- *
- */
- public List<Bar> getBars() {
- if (bars == null) {
- bars = new ArrayList<Bar>();
- }
- return this.bars;
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldService.java b/sca-java-2.x/trunk/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldService.java deleted file mode 100644 index 129365b5e4..0000000000 --- a/sca-java-2.x/trunk/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldService.java +++ /dev/null @@ -1,64 +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.binding.ws.jaxws.external.service;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-
-@WebService(name = "HelloWorldService", targetNamespace = "http://helloworld/external")
-public class HelloWorldService {
-
- @WebMethod
- @WebResult(name = "getGreetingsReturn", targetNamespace = "http://helloworld/external")
- @RequestWrapper(localName = "getGreetings", targetNamespace = "http://helloworld/external", className = "org.apache.tuscany.sca.binding.ws.jaxws.external.service.GetGreetings")
- @ResponseWrapper(localName = "getGreetingsResponse", targetNamespace = "http://helloworld/external", className = "org.apache.tuscany.sca.binding.ws.jaxws.external.service.GetGreetingsResponse")
- public String getGreetings( @WebParam(name = "name", targetNamespace = "http://helloworld/external")
- String name) {
- System.out.println("Entering External Service HelloWorld.getGreetings: " + name);
- String response = "Hello " + name;
- System.out.println("Leaving External Service HelloWorld.getGreetings: " + response);
- return response;
- }
-
- public Foo getGreetingsComplex(Foo foo){
- System.out.println("Entering External Service HelloWorld.getGreetingsComplex: " + foo.getBars().get(0).getS());
- Foo response = foo;
- Bar b3 = new Bar();
- b3.setS("simon");
- b3.setX(7);
- b3.setY(new Integer(8));
- b3.setB(Boolean.TRUE);
- response.getBars().add(b3);
- System.out.println("Leaving External Service HelloWorld.getGreetingsComplex: " + foo.getBars().get(0).getS());
- return response;
- }
-
- public String GetGreetingsCaps(String name) {
- System.out.println("Entering External Service HelloWorld.GetGreetingsCaps: " + name);
- String response = "Hello " + name;
- System.out.println("Leaving External Service HelloWorld.GetGreetingsCaps: " + response);
- return response;
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldServiceLauncher.java b/sca-java-2.x/trunk/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldServiceLauncher.java deleted file mode 100644 index 3a6266f1ef..0000000000 --- a/sca-java-2.x/trunk/itest/ws/external-service/src/main/java/org/apache/tuscany/sca/binding/ws/jaxws/external/service/HelloWorldServiceLauncher.java +++ /dev/null @@ -1,49 +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.binding.ws.jaxws.external.service;
-
-import javax.xml.ws.Endpoint;
-
-public class HelloWorldServiceLauncher {
-
- public Endpoint endpoint;
-
- public HelloWorldServiceLauncher(){
-
- }
-
- public void createService(){
- System.out.println(">>> Starting external JAXWS service at http://localhost:8086/External/HelloWorld");
-
- // default JVM JAXWS support.
- endpoint= Endpoint.publish("http://localhost:8086/External/HelloWorld",
- new HelloWorldService());
- }
-
- public void destoryService(){
- System.out.println(">>> Stopping external JAXWS service at http://localhost:8086/External/HelloWorld");
- endpoint.stop();
- }
-
- public static void main(String[] args) throws Exception {
- HelloWorldServiceLauncher launcher = new HelloWorldServiceLauncher();
- launcher.createService();
- }
-}
diff --git a/sca-java-2.x/trunk/itest/ws/http-ssl/README b/sca-java-2.x/trunk/itest/ws/http-ssl/README deleted file mode 100644 index 41dcb8680b..0000000000 --- a/sca-java-2.x/trunk/itest/ws/http-ssl/README +++ /dev/null @@ -1,68 +0,0 @@ -The module tests web service communications running over HTTPS. HTTPS is configured -in this embedded test environment by adding the confidentiality intent to both -reference and service and by configuring reference and service side policy sets -to configure the web service binding appropriately to enable SSL. - -When running the web service binding in a container that itself is configured -to provide SSL support these policy sets are not required. TODO can they themselves -detect that they are not required. - -The SSL configuration depends on public/private key pairs and a keystore. This is how -they are organized and generated - - -Generate Private/Public keys into a keystore for use at the server ------------------------------------------------------------------- - -keytool -genkey -keyalg RSA -sigalg MD5withRSA -keysize 1024 -alias TuscanyUser -dname "CN=Tuscany Service, OU=Tuscany, O=Apache, L=Hursley, S=Hampshire, C=UK" -storetype JKS -keystore tuscany.jks -validity 9999 -keypass tuscany -storepass tuscany - -View the contents of the key store that result ----------------------------------------------- - -keytool -list -v -keystore tuscany.jks -storepass tuscany - -Keystore type: JKS -Keystore provider: SUN - -Your keystore contains 1 entry - -Alias name: tuscanyuser -Creation date: 26-Feb-2010 -Entry type: PrivateKeyEntry -Certificate chain length: 1 -Certificate[1]: -Owner: CN=Tuscany Service, OU=Tuscany, O=Apache, L=Hursley, ST=Hampshire, C=UK -Issuer: CN=Tuscany Service, OU=Tuscany, O=Apache, L=Hursley, ST=Hampshire, C=UK -Serial number: 4b87b4d7 -Valid from: Fri Feb 26 11:47:35 GMT 2010 until: Mon Jul 13 12:47:35 BST 2037 -Certificate fingerprints: - MD5: C3:0C:D6:DF:F6:27:26:47:AD:41:44:CA:D7:98:FA:41 - SHA1: 2E:82:AD:F6:54:E0:C6:A5:47:5C:8C:9F:3B:5A:65:8E:F9:5A:40:07 - Signature algorithm name: MD5withRSA - Version: 3 - - -IN THIS EMBEDDED TEST THE FOLLOWING ARE NOT REQUIRED AS BOTH REFERENCE AND SERVICES -ARE RUNNING IN THE SAME JVM AND HAVE ACCESS TO THE SERVICE SIDE KEY STORE - -Generate the client side certificate ------------------------------------- - -keytool -export -alias TuscanyUser -file tuscany.cer -keystore tuscany.jks -storepass tuscany - -Print the contents of the generated certificate file ----------------------------------------------------- - -keytool -printcert -v -file tuscany.cer - -Owner: CN=Tuscany Service, OU=Tuscany, O=Apache, L=Hursley, ST=Hampshire, C=UK -Issuer: CN=Tuscany Service, OU=Tuscany, O=Apache, L=Hursley, ST=Hampshire, C=UK -Serial number: 4b87b4d7 -Valid from: Fri Feb 26 11:47:35 GMT 2010 until: Mon Jul 13 12:47:35 BST 2037 -Certificate fingerprints: - MD5: C3:0C:D6:DF:F6:27:26:47:AD:41:44:CA:D7:98:FA:41 - SHA1: 2E:82:AD:F6:54:E0:C6:A5:47:5C:8C:9F:3B:5A:65:8E:F9:5A:40:07 - Signature algorithm name: MD5withRSA - Version: 3 - -
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/ws/http-ssl/pom.xml b/sca-java-2.x/trunk/itest/ws/http-ssl/pom.xml deleted file mode 100644 index 05f96f4a25..0000000000 --- a/sca-java-2.x/trunk/itest/ws/http-ssl/pom.xml +++ /dev/null @@ -1,52 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>itest-ws-http-ssl</artifactId> - <name>Apache Tuscany SCA iTest WS HTTP SSL</name> - - <dependencies> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-feature-webservice</artifactId> - <version>2.0-SNAPSHOT</version> - <type>pom</type> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-policy-security</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - </dependencies> - - <build> - <finalName>${artifactId}</finalName> - </build> -</project> diff --git a/sca-java-2.x/trunk/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java b/sca-java-2.x/trunk/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java deleted file mode 100644 index 98eb6e361b..0000000000 --- a/sca-java-2.x/trunk/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorld.java +++ /dev/null @@ -1,29 +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.binding.ws.axis2.helloworld; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface HelloWorld { - - String getGreetings(String s); - -} diff --git a/sca-java-2.x/trunk/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java b/sca-java-2.x/trunk/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.java deleted file mode 100644 index 2c6c4fc92c..0000000000 --- a/sca-java-2.x/trunk/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldClient.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.binding.ws.axis2.helloworld; - -import org.oasisopen.sca.annotation.Reference; - -public class HelloWorldClient implements HelloWorld { - - @Reference - public HelloWorld helloWorldWS; - - public String getGreetings(String s) { - String response = helloWorldWS.getGreetings(s); - System.out.println("At client: " + response); - return response; - } - -} diff --git a/sca-java-2.x/trunk/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java deleted file mode 100644 index 3662007984..0000000000 --- a/sca-java-2.x/trunk/itest/ws/http-ssl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/helloworld/HelloWorldService.java +++ /dev/null @@ -1,30 +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.binding.ws.axis2.helloworld; - -public class HelloWorldService implements HelloWorld { - - public String getGreetings(String s) { - String response = "Hello " + s; - System.out.println("At service: " + response); - return response; - } - -} diff --git a/sca-java-2.x/trunk/itest/ws/http-ssl/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/ws/http-ssl/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 7e71dd465f..0000000000 --- a/sca-java-2.x/trunk/itest/ws/http-ssl/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:itest="http://www.tuscany.apache.org/itests/binding/ws/axis2"> - <deployable composite="itest:HelloWorld"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/ws/http-ssl/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sca-java-2.x/trunk/itest/ws/http-ssl/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions deleted file mode 100644 index 04fe620be4..0000000000 --- a/sca-java-2.x/trunk/itest/ws/http-ssl/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions +++ /dev/null @@ -1,17 +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.
-org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml b/sca-java-2.x/trunk/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml deleted file mode 100644 index d7251590ba..0000000000 --- a/sca-java-2.x/trunk/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/definitions.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?> -<!-- - * 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. ---> -<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://www.tuscany.apache.org/itests/binding/ws/axis2" - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" - xmlns:itest="http://www.tuscany.apache.org/itests/binding/ws/axis2" > - - <sca:policySet name="HTTPSPolicySet" - provides="confidentiality.transport" - appliesTo="//sca:reference | //sca:binding.ws"> - <tuscany:https> - <tuscany:keyStore type="JKS" file="target/classes/org/apache/tuscany/sca/binding/ws/axis2/helloworld/tuscany.jks" password="tuscany"/> - <tuscany:trustStore type="JKS" file="target/classes/org/apache/tuscany/sca/binding/ws/axis2/helloworld/tuscany.jks" password="tuscany"/> - </tuscany:https> - </sca:policySet> - -</definitions>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite b/sca-java-2.x/trunk/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite deleted file mode 100644 index aa21221b30..0000000000 --- a/sca-java-2.x/trunk/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.composite +++ /dev/null @@ -1,59 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:itest="http://www.tuscany.apache.org/itests/binding/ws/axis2" - targetNamespace="http://www.tuscany.apache.org/itests/binding/ws/axis2" - name="HelloWorld" - policySets="itest:HTTPSPolicySet"> - - <component name="HelloWorldClient"> - <implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.helloworld.HelloWorldClient"/> - <reference name="helloWorldWS" requires="confidentiality"> - <binding.ws uri="https://localhost:8443/HelloWorldService/HelloWorld" /> - </reference> - </component> - - <component name="HelloWorldService"> - <implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.helloworld.HelloWorldService"/> - <service name="HelloWorld" requires="confidentiality"> - <binding.ws uri="https://0.0.0.0:8443/HelloWorldService/HelloWorld" /> - </service> - </component> - - <component name="HelloWorldClient2"> - <implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.helloworld.HelloWorldClient"/> - <reference name="helloWorldWS" requires="confidentiality"> - <binding.ws uri="https://localhost:8443/HelloWorldService2/HelloWorld" /> - </reference> - </component> - - <component name="HelloWorldService2"> - <implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.helloworld.HelloWorldService"/> - <service name="HelloWorld" requires="confidentiality"> - <binding.ws/> - </service> - </component> - - <component name="HelloWorldClient3"> - <implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.helloworld.HelloWorldClient"/> - <reference name="helloWorldWS" target="HelloWorldService2"/> - </component> -</composite> diff --git a/sca-java-2.x/trunk/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl b/sca-java-2.x/trunk/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl deleted file mode 100644 index a352696b8e..0000000000 --- a/sca-java-2.x/trunk/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/helloworld.wsdl +++ /dev/null @@ -1,90 +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. ---> -<wsdl:definitions targetNamespace="http://helloworld" - xmlns:tns="http://helloworld" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - name="helloworld"> - - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema"> - - <element name="getGreetings"> - <complexType> - <sequence> - <element name="name" type="xsd:string"/> - </sequence> - </complexType> - </element> - - <element name="getGreetingsResponse"> - <complexType> - <sequence> - <element name="getGreetingsReturn" type="xsd:string"/> - </sequence> - </complexType> - </element> - - </schema> - </wsdl:types> - - <wsdl:message name="getGreetingsRequest"> - <wsdl:part element="tns:getGreetings" name="parameters"/> - </wsdl:message> - - <wsdl:message name="getGreetingsResponse"> - <wsdl:part element="tns:getGreetingsResponse" name="parameters"/> - </wsdl:message> - - <wsdl:portType name="HelloWorld"> - <wsdl:operation name="getGreetings"> - <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/> - <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/> - </wsdl:operation> - </wsdl:portType> - - <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld"> - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="getGreetings"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="getGreetingsRequest"> - <wsdlsoap:body use="literal"/> - </wsdl:input> - <wsdl:output name="getGreetingsResponse"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - - </wsdl:binding> - - <wsdl:service name="HelloWorldService"> - <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort1"> - <wsdlsoap:address location="http://localhost:8085/services/HelloWorldWebService1"/> - </wsdl:port> - <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort2"> - <wsdlsoap:address location="http://localhost:8085/services/HelloWorldWebService2"/> - </wsdl:port> - <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort3"> - <wsdlsoap:address location="http://localhost:8085/services/HelloWorldWebService3"/> - </wsdl:port> - </wsdl:service> - -</wsdl:definitions> diff --git a/sca-java-2.x/trunk/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/tuscany.jks b/sca-java-2.x/trunk/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/tuscany.jks Binary files differdeleted file mode 100644 index d67bccdf8b..0000000000 --- a/sca-java-2.x/trunk/itest/ws/http-ssl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld/tuscany.jks +++ /dev/null diff --git a/sca-java-2.x/trunk/itest/ws/http-ssl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HTTPSTestCase.java b/sca-java-2.x/trunk/itest/ws/http-ssl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HTTPSTestCase.java deleted file mode 100644 index d58f761b79..0000000000 --- a/sca-java-2.x/trunk/itest/ws/http-ssl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HTTPSTestCase.java +++ /dev/null @@ -1,59 +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.binding.ws.axis2; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.binding.ws.axis2.helloworld.HelloWorld; -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.Ignore; - -@Ignore("TUSCANY-3632") -public class HTTPSTestCase extends TestCase { - - private Node node; - private HelloWorld helloWorld; - private HelloWorld helloWorld2; - private HelloWorld helloWorld3; - - @Override - protected void setUp() throws Exception { - node = NodeFactory.newInstance().createNode(new Contribution("test", "target/classes")); - node.start(); - helloWorld = node.getService(HelloWorld.class, "HelloWorldClient"); - helloWorld2 = node.getService(HelloWorld.class, "HelloWorldClient2"); - helloWorld3 = node.getService(HelloWorld.class, "HelloWorldClient3"); - } - - public void testCalculator() throws Exception { - assertEquals("Hello petra", helloWorld.getGreetings("petra")); - assertEquals("Hello petra", helloWorld2.getGreetings("petra")); - // TODO - check policy matching for unconfigure reference - //assertEquals("Hello petra", helloWorld3.getGreetings("petra")); - } - - @Override - protected void tearDown() throws Exception { - node.stop(); - } - -} diff --git a/sca-java-2.x/trunk/itest/ws/launcher-axis2/pom.xml b/sca-java-2.x/trunk/itest/ws/launcher-axis2/pom.xml deleted file mode 100644 index cb917ea9d6..0000000000 --- a/sca-java-2.x/trunk/itest/ws/launcher-axis2/pom.xml +++ /dev/null @@ -1,67 +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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-ws-launcher-axis2</artifactId>
- <name>Apache Tuscany SCA iTest WS Launcher Axis2</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-feature-webservice</artifactId>
- <version>2.0-SNAPSHOT</version>
- <type>pom</type>
- </dependency>
-
- <!-- Hosts -->
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-jetty</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <!-- Test resources -->
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>itest-ws-external-client</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>itest-ws-external-service</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
-
- </build>
-
-</project>
diff --git a/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackForwardSpecTestCase.java b/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackForwardSpecTestCase.java deleted file mode 100644 index aaf9504116..0000000000 --- a/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackForwardSpecTestCase.java +++ /dev/null @@ -1,114 +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.binding.ws.launcher.axis2;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.client.HelloWorldClientLauncher;
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.HelloWorldServiceLauncher;
-import org.apache.tuscany.sca.binding.ws.jaxws.sca.Bar;
-import org.apache.tuscany.sca.binding.ws.jaxws.sca.Foo;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-public class CallbackForwardSpecTestCase {
-
- private Node node;
- private HelloWorldServiceLauncher externalService;
- private HelloWorldClientLauncher externalClient;
-
- @Before
- public void setUp() throws Exception {
- // Start the external service
- externalService = new HelloWorldServiceLauncher();
- externalService.createService();
-
- // Start the SCA contribution
- node = NodeFactory.newInstance().createNode(new Contribution("java-first", "../contribution-callback-forwardspec/target/itest-ws-contribution-callback-forwardspec.jar"));
- node.start();
-
- // start the external client
- try {
- externalClient = new HelloWorldClientLauncher();
- externalClient.createClient();
- } catch (Exception ex) {
- ex.printStackTrace();
- throw ex;
- }
- }
-
- @Test
- @Ignore
- public void testWait() throws Exception {
- System.out.println("Press a key");
- System.in.read();
- }
-
- // Test may be causing build hang problems: temporarily ignore
- // see dev list 16th July '10
- @Test
- @Ignore
- public void testGetGreetings() throws Exception {
- assertEquals("Hello Fred", externalClient.getGreetings("Fred"));
- }
-
- @Test
- public void testGetGreetingsComplex() throws Exception {
- Foo f = new Foo();
- Bar b1 = new Bar();
- b1.setS("petra");
- b1.setX(1);
- b1.setY(new Integer(2));
- b1.setB(Boolean.TRUE);
- Bar b2 = new Bar();
- b2.setS("beate");
- b2.setX(3);
- b2.setY(new Integer(4));
- b2.setB(Boolean.FALSE);
- f.getBars().add(b1);
- f.getBars().add(b2);
-
- Foo f2 = externalClient.getGreetingsComplex(f);
-
- assertEquals("petra", f2.getBars().get(0).getS());
- assertEquals(1, f2.getBars().get(0).getX());
- assertEquals(2, f2.getBars().get(0).getY().intValue());
- assertTrue(f2.getBars().get(0).isB());
- assertEquals("simon", f2.getBars().get(2).getS());
- assertEquals(7, f2.getBars().get(2).getX());
- assertEquals(8, f2.getBars().get(2).getY().intValue());
- assertTrue(f2.getBars().get(2).isB().booleanValue());
- }
-
- @After
- public void tearDown() throws Exception {
- node.stop();
- externalClient.destroyClient();
- externalService.destoryService();
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackFullSpecTestCase.java b/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackFullSpecTestCase.java deleted file mode 100644 index a8980c8031..0000000000 --- a/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackFullSpecTestCase.java +++ /dev/null @@ -1,111 +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.binding.ws.launcher.axis2;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.client.HelloWorldClientLauncher;
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.HelloWorldServiceLauncher;
-import org.apache.tuscany.sca.binding.ws.jaxws.sca.Bar;
-import org.apache.tuscany.sca.binding.ws.jaxws.sca.Foo;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-public class CallbackFullSpecTestCase {
-
- private Node node;
- private HelloWorldServiceLauncher externalService;
- private HelloWorldClientLauncher externalClient;
-
- @Before
- public void setUp() throws Exception {
- // Start the external service
- externalService = new HelloWorldServiceLauncher();
- externalService.createService();
-
- // Start the SCA contribution
- node = NodeFactory.newInstance().createNode(new Contribution("java-first", "../contribution-callback-fullspec/target/itest-ws-contribution-callback-fullspec.jar"));
- node.start();
-
- // start the external client
- try {
- externalClient = new HelloWorldClientLauncher();
- externalClient.createClient();
- } catch (Exception ex) {
- ex.printStackTrace();
- throw ex;
- }
- }
-
- @Test
- @Ignore
- public void testWait() throws Exception {
- System.out.println("Press a key");
- System.in.read();
- }
-
-
- @Test
- public void testGetGreetings() throws Exception {
- assertEquals("Hello Fred", externalClient.getGreetings("Fred"));
- }
-
- @Test
- public void testGetGreetingsComplex() throws Exception {
- Foo f = new Foo();
- Bar b1 = new Bar();
- b1.setS("petra");
- b1.setX(1);
- b1.setY(new Integer(2));
- b1.setB(Boolean.TRUE);
- Bar b2 = new Bar();
- b2.setS("beate");
- b2.setX(3);
- b2.setY(new Integer(4));
- b2.setB(Boolean.FALSE);
- f.getBars().add(b1);
- f.getBars().add(b2);
-
- Foo f2 = externalClient.getGreetingsComplex(f);
-
- assertEquals("petra", f2.getBars().get(0).getS());
- assertEquals(1, f2.getBars().get(0).getX());
- assertEquals(2, f2.getBars().get(0).getY().intValue());
- assertTrue(f2.getBars().get(0).isB());
- assertEquals("simon", f2.getBars().get(2).getS());
- assertEquals(7, f2.getBars().get(2).getX());
- assertEquals(8, f2.getBars().get(2).getY().intValue());
- assertTrue(f2.getBars().get(2).isB().booleanValue());
- }
-
- @After
- public void tearDown() throws Exception {
- node.stop();
- externalClient.destroyClient();
- externalService.destoryService();
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackPromotionTestCase.java b/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackPromotionTestCase.java deleted file mode 100644 index 8c26e5c54a..0000000000 --- a/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackPromotionTestCase.java +++ /dev/null @@ -1,112 +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.binding.ws.launcher.axis2;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.client.HelloWorldClientLauncher;
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.HelloWorldServiceLauncher;
-import org.apache.tuscany.sca.binding.ws.jaxws.sca.Bar;
-import org.apache.tuscany.sca.binding.ws.jaxws.sca.Foo;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-public class CallbackPromotionTestCase {
-
- private Node node;
- private HelloWorldServiceLauncher externalService;
- private HelloWorldClientLauncher externalClient;
-
- @Before
- public void setUp() throws Exception {
- // Start the external service
- externalService = new HelloWorldServiceLauncher();
- externalService.createService();
-
- // Start the SCA contribution
- node = NodeFactory.newInstance().createNode(new Contribution("java-first", "../contribution-callback-promotion/target/itest-ws-contribution-callback-promotion.jar"));
- node.start();
-
- // start the external client
- try {
- externalClient = new HelloWorldClientLauncher();
- externalClient.createClient();
- } catch (Exception ex) {
- ex.printStackTrace();
- throw ex;
- }
- }
-
- @Test
- @Ignore
- public void testWait() throws Exception {
- System.out.println("Press a key");
- System.in.read();
- }
-
-
- @Test
- public void testGetGreetings() throws Exception {
- assertEquals("Hello Fred", externalClient.getGreetings("Fred"));
- }
-
- @Test
- public void testGetGreetingsComplex() throws Exception {
- Foo f = new Foo();
- Bar b1 = new Bar();
- b1.setS("petra");
- b1.setX(1);
- b1.setY(new Integer(2));
- b1.setB(Boolean.TRUE);
- Bar b2 = new Bar();
- b2.setS("beate");
- b2.setX(3);
- b2.setY(new Integer(4));
- b2.setB(Boolean.FALSE);
- f.getBars().add(b1);
- f.getBars().add(b2);
-
- Foo f2 = externalClient.getGreetingsComplex(f);
-
- assertEquals("petra", f2.getBars().get(0).getS());
- assertEquals(1, f2.getBars().get(0).getX());
- assertEquals(2, f2.getBars().get(0).getY().intValue());
- assertTrue(f2.getBars().get(0).isB());
- assertEquals("simon", f2.getBars().get(2).getS());
- assertEquals(7, f2.getBars().get(2).getX());
- assertEquals(8, f2.getBars().get(2).getY().intValue());
- assertTrue(f2.getBars().get(2).isB().booleanValue());
- }
-
- @After
- public void tearDown() throws Exception {
- node.stop();
- externalClient.destroyClient();
- externalService.destoryService();
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackTestCase.java b/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackTestCase.java deleted file mode 100644 index 3bd65d549a..0000000000 --- a/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/CallbackTestCase.java +++ /dev/null @@ -1,112 +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.binding.ws.launcher.axis2;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.client.HelloWorldClientLauncher;
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.HelloWorldServiceLauncher;
-import org.apache.tuscany.sca.binding.ws.jaxws.sca.Bar;
-import org.apache.tuscany.sca.binding.ws.jaxws.sca.Foo;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-public class CallbackTestCase {
-
- private Node node;
- private HelloWorldServiceLauncher externalService;
- private HelloWorldClientLauncher externalClient;
-
- @Before
- public void setUp() throws Exception {
- // Start the external service
- externalService = new HelloWorldServiceLauncher();
- externalService.createService();
-
- // Start the SCA contribution
- node = NodeFactory.newInstance().createNode(new Contribution("java-first", "../contribution-callback/target/itest-ws-contribution-callback.jar"));
- node.start();
-
- // start the external client
- try {
- externalClient = new HelloWorldClientLauncher();
- externalClient.createClient();
- } catch (Exception ex) {
- ex.printStackTrace();
- throw ex;
- }
- }
-
-/*
- @Test
- public void testWait() throws Exception {
- System.out.println("Press a key");
- System.in.read();
- }
-*/
-
- @Test
- public void testGetGreetings() throws Exception {
- assertEquals("Hello Fred", externalClient.getGreetings("Fred"));
- }
-
- @Test
- public void testGetGreetingsComplex() throws Exception {
- Foo f = new Foo();
- Bar b1 = new Bar();
- b1.setS("petra");
- b1.setX(1);
- b1.setY(new Integer(2));
- b1.setB(Boolean.TRUE);
- Bar b2 = new Bar();
- b2.setS("beate");
- b2.setX(3);
- b2.setY(new Integer(4));
- b2.setB(Boolean.FALSE);
- f.getBars().add(b1);
- f.getBars().add(b2);
-
- Foo f2 = externalClient.getGreetingsComplex(f);
-
- assertEquals("petra", f2.getBars().get(0).getS());
- assertEquals(1, f2.getBars().get(0).getX());
- assertEquals(2, f2.getBars().get(0).getY().intValue());
- assertTrue(f2.getBars().get(0).isB());
- assertEquals("simon", f2.getBars().get(2).getS());
- assertEquals(7, f2.getBars().get(2).getX());
- assertEquals(8, f2.getBars().get(2).getY().intValue());
- assertTrue(f2.getBars().get(2).isB().booleanValue());
- }
-
- @After
- public void tearDown() throws Exception {
- node.stop();
- externalClient.destroyClient();
- externalService.destoryService();
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/DocLitTestCase.java b/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/DocLitTestCase.java deleted file mode 100644 index a7fb6d6125..0000000000 --- a/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/DocLitTestCase.java +++ /dev/null @@ -1,124 +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.binding.ws.launcher.axis2;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.client.HelloWorldClientLauncher;
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.HelloWorldServiceLauncher;
-import org.apache.tuscany.sca.binding.ws.jaxws.sca.Bar;
-import org.apache.tuscany.sca.binding.ws.jaxws.sca.Foo;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-public class DocLitTestCase {
-
- private Node node;
- private HelloWorldServiceLauncher externalService;
- private HelloWorldClientLauncher externalClient;
-
- @Before
- public void setUp() throws Exception {
- // Start the external service
- externalService = new HelloWorldServiceLauncher();
- externalService.createService();
-
- // Start the SCA contribution
- node = NodeFactory.newInstance().createNode(new Contribution("doc-lit", "../contribution-doc-lit/target/itest-ws-contribution-doc-lit.jar"));
- node.start();
-
- // start the external client
- try {
- externalClient = new HelloWorldClientLauncher();
- externalClient.createClient();
- } catch (Exception ex) {
- ex.printStackTrace();
- throw ex;
- }
- }
-
-/*
- @Test
- public void testWait() throws Exception {
- System.out.println("Press a key");
- System.in.read();
- }
-*/
-
- @Test
- public void testGetGreetings() throws Exception {
- assertEquals("Hello Fred", externalClient.getGreetings("Fred"));
- }
-
- @Test
- public void testGetGreetingsException() throws Exception {
- try {
- externalClient.getGreetingsException("Fred");
- } catch (Exception ex) {
- return;
- }
-
- fail("expecting exception");
- }
-
- @Test
- @Ignore("TUSCANY-3621")
- public void testGetGreetingsComplex() throws Exception {
- Foo f = new Foo();
- Bar b1 = new Bar();
- b1.setS("petra");
- b1.setX(1);
- b1.setY(new Integer(2));
- b1.setB(Boolean.TRUE);
- Bar b2 = new Bar();
- b2.setS("beate");
- b2.setX(3);
- b2.setY(new Integer(4));
- b2.setB(Boolean.FALSE);
- f.getBars().add(b1);
- f.getBars().add(b2);
-
- Foo f2 = externalClient.getGreetingsComplex(f);
-
- assertEquals("petra", f2.getBars().get(0).getS());
- assertEquals(1, f2.getBars().get(0).getX());
- assertEquals(2, f2.getBars().get(0).getY().intValue());
- assertTrue(f2.getBars().get(0).isB());
- assertEquals("simon", f2.getBars().get(2).getS());
- assertEquals(7, f2.getBars().get(2).getX());
- assertEquals(8, f2.getBars().get(2).getY().intValue());
- assertTrue(f2.getBars().get(2).isB().booleanValue());
- }
-
- @After
- public void tearDown() throws Exception {
- node.stop();
- externalClient.destroyClient();
- externalService.destoryService();
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/DocLitWrappedTestCase.java b/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/DocLitWrappedTestCase.java deleted file mode 100644 index 95e61ccc1b..0000000000 --- a/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/DocLitWrappedTestCase.java +++ /dev/null @@ -1,122 +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.binding.ws.launcher.axis2;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.client.HelloWorldClientLauncher;
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.HelloWorldServiceLauncher;
-import org.apache.tuscany.sca.binding.ws.jaxws.sca.Bar;
-import org.apache.tuscany.sca.binding.ws.jaxws.sca.Foo;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class DocLitWrappedTestCase {
-
- private Node node;
- private HelloWorldServiceLauncher externalService;
- private HelloWorldClientLauncher externalClient;
-
- @Before
- public void setUp() throws Exception {
- // Start the external service
- externalService = new HelloWorldServiceLauncher();
- externalService.createService();
-
- // Start the SCA contribution
- node = NodeFactory.newInstance().createNode(new Contribution("doc-lit-wrapped", "../contribution-doc-lit-wrapped/target/itest-ws-contribution-doc-lit-wrapped.jar"));
- node.start();
-
- // start the external client
- try {
- externalClient = new HelloWorldClientLauncher();
- externalClient.createClient();
- } catch (Exception ex) {
- ex.printStackTrace();
- throw ex;
- }
- }
-
-/*
- @Test
- public void testWait() throws Exception {
- System.out.println("Press a key");
- System.in.read();
- }
-*/
-
- @Test
- public void testGetGreetings() throws Exception {
- assertEquals("Hello Fred", externalClient.getGreetings("Fred"));
- }
-
- @Test
- public void testGetGreetingsException() throws Exception {
- try {
- externalClient.getGreetingsException("Fred");
- } catch (Exception ex) {
- return;
- }
-
- fail("expecting exception");
- }
-
- @Test
- public void testGetGreetingsComplex() throws Exception {
- Foo f = new Foo();
- Bar b1 = new Bar();
- b1.setS("petra");
- b1.setX(1);
- b1.setY(new Integer(2));
- b1.setB(Boolean.TRUE);
- Bar b2 = new Bar();
- b2.setS("beate");
- b2.setX(3);
- b2.setY(new Integer(4));
- b2.setB(Boolean.FALSE);
- f.getBars().add(b1);
- f.getBars().add(b2);
-
- Foo f2 = externalClient.getGreetingsComplex(f);
-
- assertEquals("petra", f2.getBars().get(0).getS());
- assertEquals(1, f2.getBars().get(0).getX());
- assertEquals(2, f2.getBars().get(0).getY().intValue());
- assertTrue(f2.getBars().get(0).isB());
- assertEquals("simon", f2.getBars().get(2).getS());
- assertEquals(7, f2.getBars().get(2).getX());
- assertEquals(8, f2.getBars().get(2).getY().intValue());
- assertTrue(f2.getBars().get(2).isB().booleanValue());
- }
-
- @After
- public void tearDown() throws Exception {
- node.stop();
- externalClient.destroyClient();
- externalService.destoryService();
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/JavaFirstTestCase.java b/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/JavaFirstTestCase.java deleted file mode 100644 index 77418f331f..0000000000 --- a/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/JavaFirstTestCase.java +++ /dev/null @@ -1,123 +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.binding.ws.launcher.axis2;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.client.HelloWorldClientLauncher;
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.HelloWorldServiceLauncher;
-import org.apache.tuscany.sca.binding.ws.jaxws.sca.Bar;
-import org.apache.tuscany.sca.binding.ws.jaxws.sca.Foo;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-public class JavaFirstTestCase {
-
- private Node node;
- private HelloWorldServiceLauncher externalService;
- private HelloWorldClientLauncher externalClient;
-
- @Before
- public void setUp() throws Exception {
- // Start the external service
- externalService = new HelloWorldServiceLauncher();
- externalService.createService();
-
- // Start the SCA contribution
- node = NodeFactory.newInstance().createNode(new Contribution("java-first", "../contribution-java-first/target/itest-ws-contribution-java-first.jar"));
- node.start();
-
- // start the external client
- try {
- externalClient = new HelloWorldClientLauncher();
- externalClient.createClient();
- } catch (Exception ex) {
- ex.printStackTrace();
- throw ex;
- }
- }
-
-/*
- @Test
- public void testWait() throws Exception {
- System.out.println("Press a key");
- System.in.read();
- }
-*/
-
- @Test
- public void testGetGreetings() throws Exception {
- assertEquals("Hello Fred", externalClient.getGreetings("Fred"));
- }
-
- @Test
- public void testGetGreetingsException() throws Exception {
- try {
- externalClient.getGreetingsException("Fred");
- } catch (Exception ex) {
- return;
- }
-
- fail("expecting exception");
- }
-
- @Test
- public void testGetGreetingsComplex() throws Exception {
- Foo f = new Foo();
- Bar b1 = new Bar();
- b1.setS("petra");
- b1.setX(1);
- b1.setY(new Integer(2));
- b1.setB(Boolean.TRUE);
- Bar b2 = new Bar();
- b2.setS("beate");
- b2.setX(3);
- b2.setY(new Integer(4));
- b2.setB(Boolean.FALSE);
- f.getBars().add(b1);
- f.getBars().add(b2);
-
- Foo f2 = externalClient.getGreetingsComplex(f);
-
- assertEquals("petra", f2.getBars().get(0).getS());
- assertEquals(1, f2.getBars().get(0).getX());
- assertEquals(2, f2.getBars().get(0).getY().intValue());
- assertTrue(f2.getBars().get(0).isB());
- assertEquals("simon", f2.getBars().get(2).getS());
- assertEquals(7, f2.getBars().get(2).getX());
- assertEquals(8, f2.getBars().get(2).getY().intValue());
- assertTrue(f2.getBars().get(2).isB().booleanValue());
- }
-
- @After
- public void tearDown() throws Exception {
- node.stop();
- externalClient.destroyClient();
- externalService.destoryService();
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/RpcLitTestCase.java b/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/RpcLitTestCase.java deleted file mode 100644 index 9f74dd47b8..0000000000 --- a/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/RpcLitTestCase.java +++ /dev/null @@ -1,122 +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.binding.ws.launcher.axis2;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.client.HelloWorldClientLauncher;
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.HelloWorldServiceLauncher;
-import org.apache.tuscany.sca.binding.ws.jaxws.sca.Bar;
-import org.apache.tuscany.sca.binding.ws.jaxws.sca.Foo;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class RpcLitTestCase {
-
- private Node node;
- private HelloWorldServiceLauncher externalService;
- private HelloWorldClientLauncher externalClient;
-
- @Before
- public void setUp() throws Exception {
- // Start the external service
- externalService = new HelloWorldServiceLauncher();
- externalService.createService();
-
- // Start the SCA contribution
- node = NodeFactory.newInstance().createNode(new Contribution("rpc-lit", "../contribution-rpc-lit/target/itest-ws-contribution-rpc-lit.jar"));
- node.start();
-
- // start the external client
- try {
- externalClient = new HelloWorldClientLauncher();
- externalClient.createClient();
- } catch (Exception ex) {
- ex.printStackTrace();
- throw ex;
- }
- }
-
-/*
- @Test
- public void testWait() throws Exception {
- System.out.println("Press a key");
- System.in.read();
- }
-*/
-
- @Test
- public void testGetGreetings() throws Exception {
- assertEquals("Hello Fred", externalClient.getGreetings("Fred"));
- }
-
- @Test
- public void testGetGreetingsException() throws Exception {
- try {
- externalClient.getGreetingsException("Fred");
- } catch (Exception ex) {
- return;
- }
-
- fail("expecting exception");
- }
-
- @Test
- public void testGetGreetingsComplex() throws Exception {
- Foo f = new Foo();
- Bar b1 = new Bar();
- b1.setS("petra");
- b1.setX(1);
- b1.setY(new Integer(2));
- b1.setB(Boolean.TRUE);
- Bar b2 = new Bar();
- b2.setS("beate");
- b2.setX(3);
- b2.setY(new Integer(4));
- b2.setB(Boolean.FALSE);
- f.getBars().add(b1);
- f.getBars().add(b2);
-
- Foo f2 = externalClient.getGreetingsComplex(f);
-
- assertEquals("petra", f2.getBars().get(0).getS());
- assertEquals(1, f2.getBars().get(0).getX());
- assertEquals(2, f2.getBars().get(0).getY().intValue());
- assertTrue(f2.getBars().get(0).isB());
- assertEquals("simon", f2.getBars().get(2).getS());
- assertEquals(7, f2.getBars().get(2).getX());
- assertEquals(8, f2.getBars().get(2).getY().intValue());
- assertTrue(f2.getBars().get(2).isB().booleanValue());
- }
-
- @After
- public void tearDown() throws Exception {
- node.stop();
- externalClient.destroyClient();
- externalService.destoryService();
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/WSDLFirstTestCase.java b/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/WSDLFirstTestCase.java deleted file mode 100644 index 7ed4829d85..0000000000 --- a/sca-java-2.x/trunk/itest/ws/launcher-axis2/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/axis2/WSDLFirstTestCase.java +++ /dev/null @@ -1,130 +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.binding.ws.launcher.axis2;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.client.HelloWorldClientLauncher;
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.HelloWorldServiceLauncher;
-import org.apache.tuscany.sca.binding.ws.jaxws.sca.Bar;
-import org.apache.tuscany.sca.binding.ws.jaxws.sca.Foo;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-public class WSDLFirstTestCase extends TestCase {
-
- private Node node;
- private HelloWorldServiceLauncher externalService;
- private HelloWorldClientLauncher externalClient;
-
- @Before
- public void setUp() throws Exception {
- // Start the external service
- externalService = new HelloWorldServiceLauncher();
- externalService.createService();
-
- // Start the SCA contribution
- node = NodeFactory.newInstance().createNode(new Contribution("wsdl-first", "../contribution-wsdl-first/target/itest-ws-contribution-wsdl-first.jar"));
- node.start();
-
- // start the external client
- try {
- externalClient = new HelloWorldClientLauncher();
- externalClient.createClient();
- } catch (Exception ex) {
- ex.printStackTrace();
- throw ex;
- }
- }
-
-/*
- @Test
- public void testWait() throws Exception {
- System.out.println("Press a key");
- System.in.read();
- }
-*/
-
- @Test
- public void testGetGreetings() throws Exception {
- assertEquals("Hello Fred", externalClient.getGreetings("Fred"));
- }
-
- @Test
- @Ignore
- public void testGetGreetingsException() throws Exception {
- try {
- externalClient.getGreetingsException("Fred");
- } catch (Exception ex) {
- return;
- }
-
- fail("expecting exception");
- }
-
- @Test
- public void testGetGreetingsComplex() throws Exception {
- Foo f = new Foo();
- Bar b1 = new Bar();
- b1.setS("petra");
- b1.setX(1);
- b1.setY(new Integer(2));
- b1.setB(Boolean.TRUE);
- Bar b2 = new Bar();
- b2.setS("beate");
- b2.setX(3);
- b2.setY(new Integer(4));
- b2.setB(Boolean.FALSE);
- f.getBars().add(b1);
- f.getBars().add(b2);
-
- Foo f2 = externalClient.getGreetingsComplex(f);
-
- assertEquals("petra", f2.getBars().get(0).getS());
- assertEquals(1, f2.getBars().get(0).getX());
- assertEquals(2, f2.getBars().get(0).getY().intValue());
- assertTrue(f2.getBars().get(0).isB());
- assertEquals("simon", f2.getBars().get(2).getS());
- assertEquals(7, f2.getBars().get(2).getX());
- assertEquals(8, f2.getBars().get(2).getY().intValue());
- assertTrue(f2.getBars().get(2).isB().booleanValue());
- }
-
- @Test
- public void testGetGreetingsCaps() throws Exception {
- assertEquals("Hello Fred", externalClient.getGreetingsCaps("Fred"));
- }
-
- @After
- public void tearDown() throws Exception {
- node.stop();
- externalClient.destroyClient();
- externalService.destoryService();
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/ws/launcher-base/pom.xml b/sca-java-2.x/trunk/itest/ws/launcher-base/pom.xml deleted file mode 100644 index bc78b9a0b4..0000000000 --- a/sca-java-2.x/trunk/itest/ws/launcher-base/pom.xml +++ /dev/null @@ -1,59 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>itest-ws-launcher-base</artifactId> - <name>Apache Tuscany SCA iTest WS Launcher Base</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca.shades</groupId> - <artifactId>tuscany-base</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <!-- Test resources --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-ws-external-client</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>itest-ws-external-service</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - </dependencies> - - <build> - <finalName>${artifactId}</finalName> - - </build> - -</project> diff --git a/sca-java-2.x/trunk/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackForwardSpecTestCase.java b/sca-java-2.x/trunk/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackForwardSpecTestCase.java deleted file mode 100644 index d349e450c2..0000000000 --- a/sca-java-2.x/trunk/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackForwardSpecTestCase.java +++ /dev/null @@ -1,112 +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.binding.ws.launcher.base; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import org.apache.tuscany.sca.binding.ws.jaxws.external.client.HelloWorldClientLauncher; -import org.apache.tuscany.sca.binding.ws.jaxws.external.service.HelloWorldServiceLauncher; -import org.apache.tuscany.sca.binding.ws.jaxws.sca.Bar; -import org.apache.tuscany.sca.binding.ws.jaxws.sca.Foo; -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.After; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - -public class CallbackForwardSpecTestCase { - - private Node node; - private HelloWorldServiceLauncher externalService; - private HelloWorldClientLauncher externalClient; - - @Before - public void setUp() throws Exception { - // Start the external service - externalService = new HelloWorldServiceLauncher(); - externalService.createService(); - - // Start the SCA contribution - node = NodeFactory.newInstance().createNode(new Contribution("java-first", "../contribution-callback-forwardspec/target/itest-ws-contribution-callback-forwardspec.jar")); - node.start(); - - // start the external client - try { - externalClient = new HelloWorldClientLauncher(); - externalClient.createClient(); - } catch (Exception ex) { - ex.printStackTrace(); - throw ex; - } - } - - @Test - @Ignore - public void testWait() throws Exception { - System.out.println("Press a key"); - System.in.read(); - } - - - @Test - public void testGetGreetings() throws Exception { - assertEquals("Hello Fred", externalClient.getGreetings("Fred")); - } - - @Test - public void testGetGreetingsComplex() throws Exception { - Foo f = new Foo(); - Bar b1 = new Bar(); - b1.setS("petra"); - b1.setX(1); - b1.setY(new Integer(2)); - b1.setB(Boolean.TRUE); - Bar b2 = new Bar(); - b2.setS("beate"); - b2.setX(3); - b2.setY(new Integer(4)); - b2.setB(Boolean.FALSE); - f.getBars().add(b1); - f.getBars().add(b2); - - Foo f2 = externalClient.getGreetingsComplex(f); - - assertEquals("petra", f2.getBars().get(0).getS()); - assertEquals(1, f2.getBars().get(0).getX()); - assertEquals(2, f2.getBars().get(0).getY().intValue()); - assertTrue(f2.getBars().get(0).isB()); - assertEquals("simon", f2.getBars().get(2).getS()); - assertEquals(7, f2.getBars().get(2).getX()); - assertEquals(8, f2.getBars().get(2).getY().intValue()); - assertTrue(f2.getBars().get(2).isB().booleanValue()); - } - - @After - public void tearDown() throws Exception { - node.stop(); - externalClient.destroyClient(); - externalService.destoryService(); - } - -} diff --git a/sca-java-2.x/trunk/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackFullSpecTestCase.java b/sca-java-2.x/trunk/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackFullSpecTestCase.java deleted file mode 100644 index 0e0e6e93ba..0000000000 --- a/sca-java-2.x/trunk/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackFullSpecTestCase.java +++ /dev/null @@ -1,111 +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.binding.ws.launcher.base; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import org.apache.tuscany.sca.binding.ws.jaxws.external.client.HelloWorldClientLauncher; -import org.apache.tuscany.sca.binding.ws.jaxws.external.service.HelloWorldServiceLauncher; -import org.apache.tuscany.sca.binding.ws.jaxws.sca.Bar; -import org.apache.tuscany.sca.binding.ws.jaxws.sca.Foo; -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.After; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - -public class CallbackFullSpecTestCase { - - private Node node; - private HelloWorldServiceLauncher externalService; - private HelloWorldClientLauncher externalClient; - - @Before - public void setUp() throws Exception { - // Start the external service - externalService = new HelloWorldServiceLauncher(); - externalService.createService(); - - // Start the SCA contribution - node = NodeFactory.newInstance().createNode(new Contribution("java-first", "../contribution-callback-fullspec/target/itest-ws-contribution-callback-fullspec.jar")); - node.start(); - - // start the external client - try { - externalClient = new HelloWorldClientLauncher(); - externalClient.createClient(); - } catch (Exception ex) { - ex.printStackTrace(); - throw ex; - } - } - - @Test - @Ignore - public void testWait() throws Exception { - System.out.println("Press a key"); - System.in.read(); - } - - - @Test - public void testGetGreetings() throws Exception { - assertEquals("Hello Fred", externalClient.getGreetings("Fred")); - } - - @Test - public void testGetGreetingsComplex() throws Exception { - Foo f = new Foo(); - Bar b1 = new Bar(); - b1.setS("petra"); - b1.setX(1); - b1.setY(new Integer(2)); - b1.setB(Boolean.TRUE); - Bar b2 = new Bar(); - b2.setS("beate"); - b2.setX(3); - b2.setY(new Integer(4)); - b2.setB(Boolean.FALSE); - f.getBars().add(b1); - f.getBars().add(b2); - - Foo f2 = externalClient.getGreetingsComplex(f); - - assertEquals("petra", f2.getBars().get(0).getS()); - assertEquals(1, f2.getBars().get(0).getX()); - assertEquals(2, f2.getBars().get(0).getY().intValue()); - assertTrue(f2.getBars().get(0).isB()); - assertEquals("simon", f2.getBars().get(2).getS()); - assertEquals(7, f2.getBars().get(2).getX()); - assertEquals(8, f2.getBars().get(2).getY().intValue()); - assertTrue(f2.getBars().get(2).isB().booleanValue()); - } - - @After - public void tearDown() throws Exception { - node.stop(); - externalClient.destroyClient(); - externalService.destoryService(); - } - -} diff --git a/sca-java-2.x/trunk/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackPromotionTestCase.java b/sca-java-2.x/trunk/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackPromotionTestCase.java deleted file mode 100644 index 09697f82ba..0000000000 --- a/sca-java-2.x/trunk/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackPromotionTestCase.java +++ /dev/null @@ -1,112 +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.binding.ws.launcher.base; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import org.apache.tuscany.sca.binding.ws.jaxws.external.client.HelloWorldClientLauncher; -import org.apache.tuscany.sca.binding.ws.jaxws.external.service.HelloWorldServiceLauncher; -import org.apache.tuscany.sca.binding.ws.jaxws.sca.Bar; -import org.apache.tuscany.sca.binding.ws.jaxws.sca.Foo; -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.After; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - -public class CallbackPromotionTestCase { - - private Node node; - private HelloWorldServiceLauncher externalService; - private HelloWorldClientLauncher externalClient; - - @Before - public void setUp() throws Exception { - // Start the external service - externalService = new HelloWorldServiceLauncher(); - externalService.createService(); - - // Start the SCA contribution - node = NodeFactory.newInstance().createNode(new Contribution("java-first", "../contribution-callback-promotion/target/itest-ws-contribution-callback-promotion.jar")); - node.start(); - - // start the external client - try { - externalClient = new HelloWorldClientLauncher(); - externalClient.createClient(); - } catch (Exception ex) { - ex.printStackTrace(); - throw ex; - } - } - - @Test - @Ignore - public void testWait() throws Exception { - System.out.println("Press a key"); - System.in.read(); - } - - - @Test - public void testGetGreetings() throws Exception { - assertEquals("Hello Fred", externalClient.getGreetings("Fred")); - } - - @Test - public void testGetGreetingsComplex() throws Exception { - Foo f = new Foo(); - Bar b1 = new Bar(); - b1.setS("petra"); - b1.setX(1); - b1.setY(new Integer(2)); - b1.setB(Boolean.TRUE); - Bar b2 = new Bar(); - b2.setS("beate"); - b2.setX(3); - b2.setY(new Integer(4)); - b2.setB(Boolean.FALSE); - f.getBars().add(b1); - f.getBars().add(b2); - - Foo f2 = externalClient.getGreetingsComplex(f); - - assertEquals("petra", f2.getBars().get(0).getS()); - assertEquals(1, f2.getBars().get(0).getX()); - assertEquals(2, f2.getBars().get(0).getY().intValue()); - assertTrue(f2.getBars().get(0).isB()); - assertEquals("simon", f2.getBars().get(2).getS()); - assertEquals(7, f2.getBars().get(2).getX()); - assertEquals(8, f2.getBars().get(2).getY().intValue()); - assertTrue(f2.getBars().get(2).isB().booleanValue()); - } - - @After - public void tearDown() throws Exception { - node.stop(); - externalClient.destroyClient(); - externalService.destoryService(); - } - -} diff --git a/sca-java-2.x/trunk/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackTestCase.java b/sca-java-2.x/trunk/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackTestCase.java deleted file mode 100644 index 49ba20c20b..0000000000 --- a/sca-java-2.x/trunk/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/CallbackTestCase.java +++ /dev/null @@ -1,112 +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.binding.ws.launcher.base; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import org.apache.tuscany.sca.binding.ws.jaxws.external.client.HelloWorldClientLauncher; -import org.apache.tuscany.sca.binding.ws.jaxws.external.service.HelloWorldServiceLauncher; -import org.apache.tuscany.sca.binding.ws.jaxws.sca.Bar; -import org.apache.tuscany.sca.binding.ws.jaxws.sca.Foo; -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.After; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - -public class CallbackTestCase { - - private Node node; - private HelloWorldServiceLauncher externalService; - private HelloWorldClientLauncher externalClient; - - @Before - public void setUp() throws Exception { - // Start the external service - externalService = new HelloWorldServiceLauncher(); - externalService.createService(); - - // Start the SCA contribution - node = NodeFactory.newInstance().createNode(new Contribution("java-first", "../contribution-callback/target/itest-ws-contribution-callback.jar")); - node.start(); - - // start the external client - try { - externalClient = new HelloWorldClientLauncher(); - externalClient.createClient(); - } catch (Exception ex) { - ex.printStackTrace(); - throw ex; - } - } - -/* - @Test - public void testWait() throws Exception { - System.out.println("Press a key"); - System.in.read(); - } -*/ - - @Test - public void testGetGreetings() throws Exception { - assertEquals("Hello Fred", externalClient.getGreetings("Fred")); - } - - @Test - public void testGetGreetingsComplex() throws Exception { - Foo f = new Foo(); - Bar b1 = new Bar(); - b1.setS("petra"); - b1.setX(1); - b1.setY(new Integer(2)); - b1.setB(Boolean.TRUE); - Bar b2 = new Bar(); - b2.setS("beate"); - b2.setX(3); - b2.setY(new Integer(4)); - b2.setB(Boolean.FALSE); - f.getBars().add(b1); - f.getBars().add(b2); - - Foo f2 = externalClient.getGreetingsComplex(f); - - assertEquals("petra", f2.getBars().get(0).getS()); - assertEquals(1, f2.getBars().get(0).getX()); - assertEquals(2, f2.getBars().get(0).getY().intValue()); - assertTrue(f2.getBars().get(0).isB()); - assertEquals("simon", f2.getBars().get(2).getS()); - assertEquals(7, f2.getBars().get(2).getX()); - assertEquals(8, f2.getBars().get(2).getY().intValue()); - assertTrue(f2.getBars().get(2).isB().booleanValue()); - } - - @After - public void tearDown() throws Exception { - node.stop(); - externalClient.destroyClient(); - externalService.destoryService(); - } - -} diff --git a/sca-java-2.x/trunk/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/DocLitWrappedTestCase.java b/sca-java-2.x/trunk/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/DocLitWrappedTestCase.java deleted file mode 100644 index a85007e019..0000000000 --- a/sca-java-2.x/trunk/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/DocLitWrappedTestCase.java +++ /dev/null @@ -1,122 +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.binding.ws.launcher.base;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import org.apache.tuscany.sca.binding.ws.jaxws.external.client.HelloWorldClientLauncher;
-import org.apache.tuscany.sca.binding.ws.jaxws.external.service.HelloWorldServiceLauncher;
-import org.apache.tuscany.sca.binding.ws.jaxws.sca.Bar;
-import org.apache.tuscany.sca.binding.ws.jaxws.sca.Foo;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class DocLitWrappedTestCase {
-
- private Node node;
- private HelloWorldServiceLauncher externalService;
- private HelloWorldClientLauncher externalClient;
-
- @Before
- public void setUp() throws Exception {
- // Start the external service
- externalService = new HelloWorldServiceLauncher();
- externalService.createService();
-
- // Start the SCA contribution
- node = NodeFactory.newInstance().createNode(new Contribution("doc-lit-wrapped", "../contribution-doc-lit-wrapped/target/itest-ws-contribution-doc-lit-wrapped.jar"));
- node.start();
-
- // start the external client
- try {
- externalClient = new HelloWorldClientLauncher();
- externalClient.createClient();
- } catch (Exception ex) {
- ex.printStackTrace();
- throw ex;
- }
- }
-
-/*
- @Test
- public void testWait() throws Exception {
- System.out.println("Press a key");
- System.in.read();
- }
-*/
-
- @Test
- public void testGetGreetings() throws Exception {
- assertEquals("Hello Fred", externalClient.getGreetings("Fred"));
- }
-
- @Test
- public void testGetGreetingsException() throws Exception {
- try {
- externalClient.getGreetingsException("Fred");
- } catch (Exception ex) {
- return;
- }
-
- fail("expecting exception");
- }
-
- @Test
- public void testGetGreetingsComplex() throws Exception {
- Foo f = new Foo();
- Bar b1 = new Bar();
- b1.setS("petra");
- b1.setX(1);
- b1.setY(new Integer(2));
- b1.setB(Boolean.TRUE);
- Bar b2 = new Bar();
- b2.setS("beate");
- b2.setX(3);
- b2.setY(new Integer(4));
- b2.setB(Boolean.FALSE);
- f.getBars().add(b1);
- f.getBars().add(b2);
-
- Foo f2 = externalClient.getGreetingsComplex(f);
-
- assertEquals("petra", f2.getBars().get(0).getS());
- assertEquals(1, f2.getBars().get(0).getX());
- assertEquals(2, f2.getBars().get(0).getY().intValue());
- assertTrue(f2.getBars().get(0).isB());
- assertEquals("simon", f2.getBars().get(2).getS());
- assertEquals(7, f2.getBars().get(2).getX());
- assertEquals(8, f2.getBars().get(2).getY().intValue());
- assertTrue(f2.getBars().get(2).isB().booleanValue());
- }
-
- @After
- public void tearDown() throws Exception {
- node.stop();
- externalClient.destroyClient();
- externalService.destoryService();
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/JavaFirstTestCase.java b/sca-java-2.x/trunk/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/JavaFirstTestCase.java deleted file mode 100644 index 0aa6a71db4..0000000000 --- a/sca-java-2.x/trunk/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/JavaFirstTestCase.java +++ /dev/null @@ -1,123 +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.binding.ws.launcher.base; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import org.apache.tuscany.sca.binding.ws.jaxws.external.client.HelloWorldClientLauncher; -import org.apache.tuscany.sca.binding.ws.jaxws.external.service.HelloWorldServiceLauncher; -import org.apache.tuscany.sca.binding.ws.jaxws.sca.Bar; -import org.apache.tuscany.sca.binding.ws.jaxws.sca.Foo; -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.After; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - -public class JavaFirstTestCase { - - private Node node; - private HelloWorldServiceLauncher externalService; - private HelloWorldClientLauncher externalClient; - - @Before - public void setUp() throws Exception { - // Start the external service - externalService = new HelloWorldServiceLauncher(); - externalService.createService(); - - // Start the SCA contribution - node = NodeFactory.newInstance().createNode(new Contribution("java-first", "../contribution-java-first/target/itest-ws-contribution-java-first.jar")); - node.start(); - - // start the external client - try { - externalClient = new HelloWorldClientLauncher(); - externalClient.createClient(); - } catch (Exception ex) { - ex.printStackTrace(); - throw ex; - } - } - -/* - @Test - public void testWait() throws Exception { - System.out.println("Press a key"); - System.in.read(); - } -*/ - - @Test - public void testGetGreetings() throws Exception { - assertEquals("Hello Fred", externalClient.getGreetings("Fred")); - } - - @Test - public void testGetGreetingsException() throws Exception { - try { - externalClient.getGreetingsException("Fred"); - } catch (Exception ex) { - return; - } - - fail("expecting exception"); - } - - @Test - public void testGetGreetingsComplex() throws Exception { - Foo f = new Foo(); - Bar b1 = new Bar(); - b1.setS("petra"); - b1.setX(1); - b1.setY(new Integer(2)); - b1.setB(Boolean.TRUE); - Bar b2 = new Bar(); - b2.setS("beate"); - b2.setX(3); - b2.setY(new Integer(4)); - b2.setB(Boolean.FALSE); - f.getBars().add(b1); - f.getBars().add(b2); - - Foo f2 = externalClient.getGreetingsComplex(f); - - assertEquals("petra", f2.getBars().get(0).getS()); - assertEquals(1, f2.getBars().get(0).getX()); - assertEquals(2, f2.getBars().get(0).getY().intValue()); - assertTrue(f2.getBars().get(0).isB()); - assertEquals("simon", f2.getBars().get(2).getS()); - assertEquals(7, f2.getBars().get(2).getX()); - assertEquals(8, f2.getBars().get(2).getY().intValue()); - assertTrue(f2.getBars().get(2).isB().booleanValue()); - } - - @After - public void tearDown() throws Exception { - node.stop(); - externalClient.destroyClient(); - externalService.destoryService(); - } - -} diff --git a/sca-java-2.x/trunk/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/WSDLFirstTestCase.java b/sca-java-2.x/trunk/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/WSDLFirstTestCase.java deleted file mode 100644 index c8566bfa3b..0000000000 --- a/sca-java-2.x/trunk/itest/ws/launcher-base/src/test/java/org/apache/tuscany/sca/binding/ws/launcher/base/WSDLFirstTestCase.java +++ /dev/null @@ -1,125 +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.binding.ws.launcher.base; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import junit.framework.TestCase; - -import org.apache.tuscany.sca.binding.ws.jaxws.external.client.HelloWorldClientLauncher; -import org.apache.tuscany.sca.binding.ws.jaxws.external.service.HelloWorldServiceLauncher; -import org.apache.tuscany.sca.binding.ws.jaxws.sca.Bar; -import org.apache.tuscany.sca.binding.ws.jaxws.sca.Foo; -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.After; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - -public class WSDLFirstTestCase extends TestCase { - - private Node node; - private HelloWorldServiceLauncher externalService; - private HelloWorldClientLauncher externalClient; - - @Before - public void setUp() throws Exception { - // Start the external service - externalService = new HelloWorldServiceLauncher(); - externalService.createService(); - - // Start the SCA contribution - node = NodeFactory.newInstance().createNode(new Contribution("wsdl-first", "../contribution-wsdl-first/target/itest-ws-contribution-wsdl-first.jar")); - node.start(); - - // start the external client - try { - externalClient = new HelloWorldClientLauncher(); - externalClient.createClient(); - } catch (Exception ex) { - ex.printStackTrace(); - throw ex; - } - } - -/* - @Test - public void testWait() throws Exception { - System.out.println("Press a key"); - System.in.read(); - } -*/ - - @Test - public void testGetGreetings() throws Exception { - assertEquals("Hello Fred", externalClient.getGreetings("Fred")); - } - - @Test - @Ignore - public void testGetGreetingsException() throws Exception { - try { - externalClient.getGreetingsException("Fred"); - } catch (Exception ex) { - return; - } - - fail("expecting exception"); - } - - @Test - public void testGetGreetingsComplex() throws Exception { - Foo f = new Foo(); - Bar b1 = new Bar(); - b1.setS("petra"); - b1.setX(1); - b1.setY(new Integer(2)); - b1.setB(Boolean.TRUE); - Bar b2 = new Bar(); - b2.setS("beate"); - b2.setX(3); - b2.setY(new Integer(4)); - b2.setB(Boolean.FALSE); - f.getBars().add(b1); - f.getBars().add(b2); - - Foo f2 = externalClient.getGreetingsComplex(f); - - assertEquals("petra", f2.getBars().get(0).getS()); - assertEquals(1, f2.getBars().get(0).getX()); - assertEquals(2, f2.getBars().get(0).getY().intValue()); - assertTrue(f2.getBars().get(0).isB()); - assertEquals("simon", f2.getBars().get(2).getS()); - assertEquals(7, f2.getBars().get(2).getX()); - assertEquals(8, f2.getBars().get(2).getY().intValue()); - assertTrue(f2.getBars().get(2).isB().booleanValue()); - } - - @After - public void tearDown() throws Exception { - node.stop(); - externalClient.destroyClient(); - externalService.destoryService(); - } - -} diff --git a/sca-java-2.x/trunk/itest/ws/pom.xml b/sca-java-2.x/trunk/itest/ws/pom.xml deleted file mode 100644 index 526bbe76ea..0000000000 --- a/sca-java-2.x/trunk/itest/ws/pom.xml +++ /dev/null @@ -1,61 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <packaging>pom</packaging> - <artifactId>itest-ws</artifactId> - <name>Apache Tuscany SCA iTest WS</name> - - <modules> - <module>defaults</module> - <module>authentication-basic</module> - <module>http-ssl</module> - <module>wsdl</module> - <module>endpoints</module> - <module>endpoint-references</module> -<!-- - <module>jms</module> - <module>mtom</module> - <module>authentication-wssecurity</module> - <module>autherization-wssecurity</module> - <module>confidentiality-wssecurity</module> ---> - <!-- separate test contributions from launcher --> - <module>contribution-java-first</module> - <module>contribution-wsdl-first</module> - <module>contribution-callback</module> - <module>contribution-callback-forwardspec</module> - <module>contribution-callback-fullspec</module> - <module>contribution-callback-promotion</module> - <module>contribution-doc-lit</module> - <module>contribution-doc-lit-wrapped</module> - <module>contribution-rpc-lit</module> - <module>external-client</module> - <module>external-service</module> - <module>launcher-axis2</module> - </modules> - -</project> diff --git a/sca-java-2.x/trunk/itest/ws/wsdl/pom.xml b/sca-java-2.x/trunk/itest/ws/wsdl/pom.xml deleted file mode 100644 index cac59f85b4..0000000000 --- a/sca-java-2.x/trunk/itest/ws/wsdl/pom.xml +++ /dev/null @@ -1,47 +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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-itest</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>itest-ws-wsdl</artifactId> - <name>Apache Tuscany SCA iTest WS WSDL</name> - - <dependencies> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-feature-webservice</artifactId> - <version>2.0-SNAPSHOT</version> - <type>pom</type> - </dependency> - - - </dependencies> - - <build> - <finalName>${artifactId}</finalName> - </build> -</project> diff --git a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Account.java b/sca-java-2.x/trunk/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Account.java deleted file mode 100644 index 963712c0c2..0000000000 --- a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Account.java +++ /dev/null @@ -1,34 +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.binding.ws.axis2; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * Test ?wsdl works and that the returned WSDL has the correct endpoint - * - * @version $Rev$ $Date$ - */ -@Remotable -public interface Account { - - CustomerProfileData getCustomerProfile(String loginID); - -} diff --git a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AccountService.java b/sca-java-2.x/trunk/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AccountService.java deleted file mode 100644 index ab5fc0f873..0000000000 --- a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/AccountService.java +++ /dev/null @@ -1,33 +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.binding.ws.axis2; - -/** - * Test ?wsdl works and that the returned WSDL has the correct endpoint - * - * @version $Rev$ $Date$ - */ -public class AccountService implements Account { - - public CustomerProfileData getCustomerProfile(String loginID) { - return new CustomerProfileData(loginID); - } - -} diff --git a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/CustomerProfileData.java b/sca-java-2.x/trunk/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/CustomerProfileData.java deleted file mode 100644 index 6f6a374450..0000000000 --- a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/CustomerProfileData.java +++ /dev/null @@ -1,113 +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.binding.ws.axis2; - -/** - * Test ?wsdl works and that the returned WSDL has the correct endpoint - * - * @version $Rev$ $Date$ - */ -public class CustomerProfileData { - - private String firstName; - private String lastName; - private String address; - private String email; - private String loginID; - private String password; - private int id; - - public CustomerProfileData() { - firstName = "John"; - lastName = "Doe"; - address = "345 Main Street"; - email = "john@doe.org"; - this.loginID = "DefaultloginID"; - password = "hello"; - id = 1234; - } - - public CustomerProfileData(String loginID) { - firstName = "John"; - lastName = "Doe"; - address = "345 Main Street"; - email = "john@doe.org"; - this.loginID = loginID; - password = "hello"; - id = 1234; - } - - public String getFirstName() { - return firstName; - } - - public void setFirstName(String firstName) { - this.firstName = firstName; - } - - public String getLastName() { - return lastName; - } - - public void setLastName(String lastName) { - this.lastName = lastName; - } - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public String getLoginID() { - return loginID; - } - - public void setLoginID(String loginID) { - this.loginID = loginID; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - -} diff --git a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java b/sca-java-2.x/trunk/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java deleted file mode 100644 index d6db1c2d0b..0000000000 --- a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorld.java +++ /dev/null @@ -1,29 +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.binding.ws.axis2; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface HelloWorld { - - String getGreetings(String s); - -} diff --git a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM.java b/sca-java-2.x/trunk/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM.java deleted file mode 100644 index e248815805..0000000000 --- a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOM.java +++ /dev/null @@ -1,30 +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.binding.ws.axis2; - -import org.apache.axiom.om.OMElement; -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface HelloWorldOM { - - OMElement getGreetings(OMElement parmE); - -} diff --git a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMComponent.java b/sca-java-2.x/trunk/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMComponent.java deleted file mode 100644 index 8439696fa8..0000000000 --- a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMComponent.java +++ /dev/null @@ -1,34 +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.binding.ws.axis2; - -import org.apache.axiom.om.OMElement; -import org.oasisopen.sca.annotation.Reference; - -public class HelloWorldOMComponent implements HelloWorldOM { - - @Reference - public HelloWorldOM helloWorldWS; - - public OMElement getGreetings(OMElement om) { - return helloWorldWS.getGreetings(om); - } - -} diff --git a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMService.java b/sca-java-2.x/trunk/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMService.java deleted file mode 100644 index 5b8578c816..0000000000 --- a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldOMService.java +++ /dev/null @@ -1,41 +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.binding.ws.axis2; - -import org.apache.axiom.om.OMAbstractFactory; -import org.apache.axiom.om.OMElement; -import org.apache.axiom.om.OMFactory; - -public class HelloWorldOMService implements HelloWorldOM { - - public OMElement getGreetings(OMElement requestOM) { - System.out.println(" **** getGreetings **** "); - String name = requestOM.getFirstElement().getText(); - - OMFactory omFactory = OMAbstractFactory.getOMFactory(); - OMElement responseOM = omFactory.createOMElement("getGreetingsResponse", "http://helloworld-om", "helloworld"); - OMElement param = omFactory.createOMElement("getGreetingsReturn", "http://helloworld-om", "helloworld"); - responseOM.addChild(param); - param.addChild(omFactory.createOMText("Hello " + name)); - - return responseOM; - } - -} diff --git a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java b/sca-java-2.x/trunk/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java deleted file mode 100644 index 052b49ff55..0000000000 --- a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldService.java +++ /dev/null @@ -1,28 +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.binding.ws.axis2; - -public class HelloWorldService implements HelloWorld { - - public String getGreetings(String s) { - return "Hello " + s; - } - -} diff --git a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/package-info.java b/sca-java-2.x/trunk/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/package-info.java deleted file mode 100644 index 805a515382..0000000000 --- a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/package-info.java +++ /dev/null @@ -1,21 +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.
- */
-
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://accounts")
-package org.apache.tuscany.sca.binding.ws.axis2;
diff --git a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerdata.xsd b/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerdata.xsd deleted file mode 100644 index 2479f3dbe5..0000000000 --- a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerdata.xsd +++ /dev/null @@ -1,36 +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. ---> -<xsd:schema elementFormDefault="qualified" - targetNamespace="http://accounts" - xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - - <xsd:complexType name="customerProfileData"> - <xsd:sequence> - <xsd:element name="firstName" type="xsd:string" /> - <xsd:element name="lastName" type="xsd:string" /> - <xsd:element name="address" type="xsd:string" /> - <xsd:element name="email" type="xsd:string" /> - <xsd:element name="loginID" type="xsd:string" /> - <xsd:element name="password" type="xsd:string" /> - <xsd:element name="id" type="xsd:int" /> - </xsd:sequence> - </xsd:complexType> - -</xsd:schema> diff --git a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerdefs.xsd b/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerdefs.xsd deleted file mode 100644 index 24cf3eebad..0000000000 --- a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerdefs.xsd +++ /dev/null @@ -1,27 +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. ---> -<xsd:schema elementFormDefault="qualified" - targetNamespace="http://accounts" - xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - - <xsd:include schemaLocation="customerdata.xsd" /> - <xsd:include schemaLocation="/org/apache/tuscany/sca/binding/ws/axis2/customerinfo.xsd" /> - -</xsd:schema> diff --git a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerinfo.xsd b/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerinfo.xsd deleted file mode 100644 index b78909142f..0000000000 --- a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/customerinfo.xsd +++ /dev/null @@ -1,31 +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. ---> -<xsd:schema elementFormDefault="qualified" - targetNamespace="http://accounts" - xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - - <xsd:complexType name="CustomerProfileInfo"> - <xsd:sequence> - <xsd:element name="firstName" type="xsd:string" /> - <xsd:element name="lastName" type="xsd:string" /> - </xsd:sequence> - </xsd:complexType> - -</xsd:schema> diff --git a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-merged.composite b/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-merged.composite deleted file mode 100644 index c520d2e3b2..0000000000 --- a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-merged.composite +++ /dev/null @@ -1,43 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://www.tuscany.apache.org/tests/binding/ws/axis2" - name="HelloWorldOM-Merged"> - - - <component name="HelloWorldMergedService"> - <implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.HelloWorldOMService"/> - <service name="HelloWorldOM"> - <interface.wsdl interface="http://helloworld-om-merged#wsdl.interface(HelloWorld)" /> - <binding.ws uri="http://localhost:8085/HelloWorldService/helloWorld"/> - </service> - </component> - - <component name="HelloWorldWSDLMergedComponent"> - <implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.HelloWorldOMComponent"/> - <reference name="helloWorldWS"> - <interface.wsdl interface="http://helloworld-om-merged#wsdl.interface(HelloWorld)" /> - <binding.ws uri="http://localhost:8085/HelloWorldService/helloWorld" /> - </reference> - </component> - - -</composite> diff --git a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-merged.wsdl b/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-merged.wsdl deleted file mode 100644 index 29be66fb71..0000000000 --- a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-merged.wsdl +++ /dev/null @@ -1,59 +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. ---> -<wsdl:definitions targetNamespace="http://helloworld-om-merged" xmlns:tns="http://helloworld-om-merged" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" - name="helloworld-om-porttype"> - - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://helloworld-om-merged" xmlns="http://www.w3.org/2001/XMLSchema"> - - <element name="getGreetings"> - <complexType> - <sequence> - <element name="name" type="xsd:string"/> - </sequence> - </complexType> - </element> - - <element name="getGreetingsResponse"> - <complexType> - <sequence> - <element name="getGreetingsReturn" type="xsd:string"/> - </sequence> - </complexType> - </element> - </schema> - </wsdl:types> - - <wsdl:message name="getGreetingsRequest"> - <wsdl:part element="tns:getGreetings" name="parameters"/> - </wsdl:message> - - <wsdl:message name="getGreetingsResponse"> - <wsdl:part element="tns:getGreetingsResponse" name="parameters"/> - </wsdl:message> - - <wsdl:portType name="HelloWorld"> - <wsdl:operation name="getGreetings"> - <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/> - <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/> - </wsdl:operation> - </wsdl:portType> - -</wsdl:definitions> diff --git a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl b/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl deleted file mode 100644 index 1a2272d7ee..0000000000 --- a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/helloworld.wsdl +++ /dev/null @@ -1,86 +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. ---> -<wsdl:definitions targetNamespace="http://helloworld" xmlns:tns="http://helloworld" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" - name="helloworld"> - - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema"> - - <element name="getGreetings"> - <complexType> - <sequence> - <element name="name" type="xsd:string"/> - </sequence> - </complexType> - </element> - - <element name="getGreetingsResponse"> - <complexType> - <sequence> - <element name="getGreetingsReturn" type="xsd:string"/> - </sequence> - </complexType> - </element> - - </schema> - </wsdl:types> - - <wsdl:message name="getGreetingsRequest"> - <wsdl:part element="tns:getGreetings" name="parameters"/> - </wsdl:message> - - <wsdl:message name="getGreetingsResponse"> - <wsdl:part element="tns:getGreetingsResponse" name="parameters"/> - </wsdl:message> - - <wsdl:portType name="HelloWorld"> - <wsdl:operation name="getGreetings"> - <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/> - <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/> - </wsdl:operation> - </wsdl:portType> - - <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld"> - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="getGreetings"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="getGreetingsRequest"> - <wsdlsoap:body use="literal"/> - </wsdl:input> - <wsdl:output name="getGreetingsResponse"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - - </wsdl:binding> - - <wsdl:service name="HelloWorldService"> - <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort"> - <wsdlsoap:address location="http://localhost:8085/services/HelloWorldWebService"/> - </wsdl:port> - <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort2"> - <wsdlsoap:address location="http://localhost:8085/services/HelloWorldWebService2"/> - </wsdl:port> - <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort3"> - <wsdlsoap:address location="http://localhost:8085/services/HelloWorldWebService3"/> - </wsdl:port> - </wsdl:service> - -</wsdl:definitions> diff --git a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-import-nested.wsdl b/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-import-nested.wsdl deleted file mode 100644 index 686b08a1d4..0000000000 --- a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-import-nested.wsdl +++ /dev/null @@ -1,70 +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. ---> -<wsdl:definitions targetNamespace="http://account3" - xmlns:tns="http://account3" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - name="questionmark-import-nested"> - - <wsdl:types> - <xsd:schema elementFormDefault="qualified" - targetNamespace="http://account3" - xmlns:account="http://accounts" - xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - - <xsd:import namespace="http://accounts" schemaLocation="customerdefs.xsd" /> - - <xsd:element name="getCustomerProfile"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="loginID" type="xsd:string" /> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - - <xsd:element name="getCustomerProfileResponse"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="customerProfile" - type="account:CustomerProfileData" /> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - - </xsd:schema> - </wsdl:types> - - <wsdl:message name="getCustomerProfileRequest"> - <wsdl:part element="tns:getCustomerProfile" name="parameters" /> - </wsdl:message> - - <wsdl:message name="getCustomerProfileResponse"> - <wsdl:part element="tns:getCustomerProfileResponse" name="parameters" /> - </wsdl:message> - - <wsdl:portType name="Account"> - <wsdl:operation name="getCustomerProfile"> - <wsdl:input message="tns:getCustomerProfileRequest" name="getCustomerProfileRequest" /> - <wsdl:output message="tns:getCustomerProfileResponse" name="getCustomerProfileResponse" /> - </wsdl:operation> - </wsdl:portType> - -</wsdl:definitions> diff --git a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-import.wsdl b/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-import.wsdl deleted file mode 100644 index 105c82a411..0000000000 --- a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-import.wsdl +++ /dev/null @@ -1,49 +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. ---> -<wsdl:definitions targetNamespace="http://account2" - xmlns:tns="http://account2" - xmlns:account3="http://account3" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - name="questionmark-import"> - - <wsdl:import namespace="http://account3" location="/org/apache/tuscany/sca/binding/ws/axis2/questionmark-import-nested.wsdl" /> - - <wsdl:binding name="AccountSoapBinding" type="account3:Account"> - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" /> - <wsdl:operation name="getCustomerProfile"> - <wsdlsoap:operation soapAction="" /> - <wsdl:input name="getCustomerProfileRequest"> - <wsdlsoap:body use="literal" /> - </wsdl:input> - <wsdl:output name="getCustomerProfileResponse"> - <wsdlsoap:body use="literal" /> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - - <wsdl:service name="AccountService"> - <wsdl:port binding="tns:AccountSoapBinding" name="AccountSoapPort"> - <wsdlsoap:address location="http://localhost:8086/AccountService" /> - </wsdl:port> - </wsdl:service> - -</wsdl:definitions> diff --git a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-include.wsdl b/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-include.wsdl deleted file mode 100644 index 7a7a4033ce..0000000000 --- a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-include.wsdl +++ /dev/null @@ -1,90 +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. ---> -<wsdl:definitions targetNamespace="http://accounts" - xmlns:tns="http://accounts" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - name="questionmark-include"> - - <wsdl:types> - <xsd:schema elementFormDefault="qualified" - targetNamespace="http://accounts" - xmlns:account="http://accounts" - xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - - <xsd:include schemaLocation="/org/apache/tuscany/sca/binding/ws/axis2/customerdata.xsd" /> - - <xsd:element name="getCustomerProfile"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="loginID" type="xsd:string" /> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - - <xsd:element name="getCustomerProfileResponse"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="customerProfile" - type="account:customerProfileData" /> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - - </xsd:schema> - </wsdl:types> - - <wsdl:message name="getCustomerProfileRequest"> - <wsdl:part element="tns:getCustomerProfile" name="parameters" /> - </wsdl:message> - - <wsdl:message name="getCustomerProfileResponse"> - <wsdl:part element="tns:getCustomerProfileResponse" name="parameters" /> - </wsdl:message> - - <wsdl:portType name="Account"> - <wsdl:operation name="getCustomerProfile"> - <wsdl:input message="tns:getCustomerProfileRequest" name="getCustomerProfileRequest" /> - <wsdl:output message="tns:getCustomerProfileResponse" name="getCustomerProfileResponse" /> - </wsdl:operation> - </wsdl:portType> - - <wsdl:binding name="AccountSoapBinding" type="tns:Account"> - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" /> - <wsdl:operation name="getCustomerProfile"> - <wsdlsoap:operation soapAction="" /> - <wsdl:input name="getCustomerProfileRequest"> - <wsdlsoap:body use="literal" /> - </wsdl:input> - <wsdl:output name="getCustomerProfileResponse"> - <wsdlsoap:body use="literal" /> - </wsdl:output> - </wsdl:operation> - - </wsdl:binding> - - <wsdl:service name="AccountService"> - <wsdl:port binding="tns:AccountSoapBinding" name="AccountSoapPort"> - <wsdlsoap:address location="http://localhost:8085/AccountService" /> - </wsdl:port> - </wsdl:service> - -</wsdl:definitions> diff --git a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-import.composite b/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-import.composite deleted file mode 100644 index 65270b8d6c..0000000000 --- a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-import.composite +++ /dev/null @@ -1,31 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://www.tuscany.apache.org/tests/binding/ws/axis2" - name="QuestionMarkWSDLImport"> - - <component name="AccountService"> - <implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.AccountService" /> - <service name="Account"> - <binding.ws uri="http://localhost:8086/AccountService" wsdlElement="http://account2#wsdl.binding(AccountSoapBinding)" /> - </service> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-include.composite b/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-include.composite deleted file mode 100644 index 02395c4615..0000000000 --- a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-include.composite +++ /dev/null @@ -1,31 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://www.tuscany.apache.org/tests/binding/ws/axis2" - name="QuestionMarkWSDLInclude"> - - <component name="AccountService"> - <implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.AccountService" /> - <service name="Account"> - <binding.ws uri="http://localhost:8085/AccountService" wsdlElement="http://accounts#wsdl.binding(AccountSoapBinding)" /> - </service> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl.composite b/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl.composite deleted file mode 100644 index 6b06cec722..0000000000 --- a/sca-java-2.x/trunk/itest/ws/wsdl/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl.composite +++ /dev/null @@ -1,33 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://www.tuscany.apache.org/tests/binding/ws/axis2" - name="QuestionMarkWSDLTests"> - - <component name="HelloWorldService"> - <implementation.java class="org.apache.tuscany.sca.binding.ws.axis2.HelloWorldService"/> - <service name="HelloWorld"> - <binding.ws name="ep1" uri="http://localhost:8085/foo/bar" /> - <binding.ws name="ep2" uri="http://localhost:8085/services/HelloWorldWebService2" wsdlElement="http://helloworld#wsdl.binding(HelloWorldSoapBinding)"/> - </service> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldWSDLMergedTestCase.java b/sca-java-2.x/trunk/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldWSDLMergedTestCase.java deleted file mode 100644 index b79ee7d254..0000000000 --- a/sca-java-2.x/trunk/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/HelloWorldWSDLMergedTestCase.java +++ /dev/null @@ -1,62 +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.binding.ws.axis2; - -import junit.framework.Assert; -import junit.framework.TestCase; - -import org.apache.axiom.om.OMAbstractFactory; -import org.apache.axiom.om.OMElement; -import org.apache.axiom.om.OMFactory; -import org.apache.axiom.om.OMText; -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; - -public class HelloWorldWSDLMergedTestCase extends TestCase { - - private Node node; - private HelloWorldOM helloWorld; - - @Override - protected void setUp() throws Exception { - String contribution = "target/classes"; - node = NodeFactory.newInstance().createNode("org/apache/tuscany/sca/binding/ws/axis2/helloworld-om-merged.composite", new Contribution("test", contribution)); - node.start(); - helloWorld = node.getService(HelloWorldOM.class, "HelloWorldWSDLMergedComponent"); - } - - public void testHelloWorld() throws Exception { - OMFactory fac = OMAbstractFactory.getOMFactory(); - OMElement requestOM = fac.createOMElement("getGreetings", "http://helloworld-om", "helloworld"); - OMElement parmE = fac.createOMElement("name", "http://helloworld-om", "helloworld"); - requestOM.addChild(parmE); - parmE.addChild(fac.createOMText("petra")); - OMElement responseOM = helloWorld.getGreetings(requestOM); - OMElement child = (OMElement)responseOM.getFirstElement(); - Assert.assertEquals("Hello petra", ((OMText)child.getFirstOMChild()).getText()); - } - - @Override - protected void tearDown() throws Exception { - node.stop(); - } - -} diff --git a/sca-java-2.x/trunk/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLImportTestCase.java b/sca-java-2.x/trunk/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLImportTestCase.java deleted file mode 100644 index 76ea53681f..0000000000 --- a/sca-java-2.x/trunk/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLImportTestCase.java +++ /dev/null @@ -1,99 +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.binding.ws.axis2; - -import java.io.BufferedReader; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.net.URL; -import java.util.List; - -import javax.wsdl.Definition; -import javax.wsdl.Port; -import javax.wsdl.Service; -import javax.wsdl.extensions.soap.SOAPAddress; -import javax.wsdl.factory.WSDLFactory; -import javax.wsdl.xml.WSDLReader; -import javax.xml.namespace.QName; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; - -/** - * Test ?wsdl works and that the returned WSDL has the correct endpoint - * - * @version $Rev$ $Date$ - */ -public class QuestionMarkWSDLImportTestCase extends TestCase { - - private Node node; - - /** - * Tests ?wsdl works and returns the correct port endpoint from the WSDL - */ - public void testWSDLImportPortEndpoint() throws Exception { - InputStream inp = new URL("http://localhost:8086/AccountService?wsdl").openStream(); - BufferedReader br = new BufferedReader(new InputStreamReader(inp)); - String line; - while((line = br.readLine()) != null) { - System.out.println(line); - } - br.close(); - - WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader(); - wsdlReader.setFeature("javax.wsdl.verbose", false); - wsdlReader.setFeature("javax.wsdl.importDocuments", true); - - Definition definition = wsdlReader.readWSDL("http://localhost:8086/AccountService?wsdl"); - assertNotNull(definition); - Service service = definition.getService(new QName("http://account2/AccountService/Account", "AccountService")); - Port port = service.getPort("AccountPort"); - - String endpoint = getEndpoint(port); - // String ip = HttpUtils.getIpAddress(); - assertEquals("http://localhost:8086/AccountService", endpoint); - } - - private String getEndpoint(Port port) { - List wsdlPortExtensions = port.getExtensibilityElements(); - for (final Object extension : wsdlPortExtensions) { - if (extension instanceof SOAPAddress) { - return ((SOAPAddress) extension).getLocationURI(); - } - } - throw new RuntimeException("no SOAPAddress"); - } - - @Override - protected void setUp() throws Exception { - String contribution = "target/classes"; - node = NodeFactory.newInstance().createNode("org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-import.composite", new Contribution("test", contribution)); - node.start(); - } - - @Override - protected void tearDown() throws Exception { - node.stop(); - } - -} diff --git a/sca-java-2.x/trunk/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLIncludeTestCase.java b/sca-java-2.x/trunk/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLIncludeTestCase.java deleted file mode 100644 index 54a40afc63..0000000000 --- a/sca-java-2.x/trunk/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLIncludeTestCase.java +++ /dev/null @@ -1,98 +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.binding.ws.axis2; - -import java.io.BufferedReader; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.net.URL; -import java.util.List; - -import javax.wsdl.Definition; -import javax.wsdl.Port; -import javax.wsdl.Service; -import javax.wsdl.extensions.soap.SOAPAddress; -import javax.wsdl.factory.WSDLFactory; -import javax.wsdl.xml.WSDLReader; -import javax.xml.namespace.QName; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; - -/** - * Test ?wsdl works and that the returned WSDL has the correct endpoint - * - * @version $Rev$ $Date$ - */ -public class QuestionMarkWSDLIncludeTestCase extends TestCase { - - private Node node; - - /** - * Tests ?wsdl works and returns the correct port endpoint from the WSDL - */ - public void testWSDLIncludePortEndpoint() throws Exception { - InputStream inp = new URL("http://localhost:8085/AccountService?wsdl").openStream(); - BufferedReader br = new BufferedReader(new InputStreamReader(inp)); - String line; - while((line = br.readLine()) != null) { - System.out.println(line); - } - br.close(); - - WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader(); - wsdlReader.setFeature("javax.wsdl.verbose", false); - wsdlReader.setFeature("javax.wsdl.importDocuments", true); - - Definition definition = wsdlReader.readWSDL("http://localhost:8085/AccountService?wsdl"); - assertNotNull(definition); - Service service = definition.getService(new QName("http://accounts/AccountService/Account", "AccountService")); - Port port = service.getPort("AccountPort"); - - String endpoint = getEndpoint(port); - assertEquals("http://localhost:8085/AccountService", endpoint); - } - - private String getEndpoint(Port port) { - List wsdlPortExtensions = port.getExtensibilityElements(); - for (final Object extension : wsdlPortExtensions) { - if (extension instanceof SOAPAddress) { - return ((SOAPAddress) extension).getLocationURI(); - } - } - throw new RuntimeException("no SOAPAddress"); - } - - @Override - protected void setUp() throws Exception { - String contribution = "target/classes"; - node = NodeFactory.newInstance().createNode("org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl-include.composite", new Contribution("test", contribution)); - node.start(); - } - - @Override - protected void tearDown() throws Exception { - node.stop(); - } - -} diff --git a/sca-java-2.x/trunk/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLTestCase.java b/sca-java-2.x/trunk/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLTestCase.java deleted file mode 100644 index 0148460b5c..0000000000 --- a/sca-java-2.x/trunk/itest/ws/wsdl/src/test/java/org/apache/tuscany/sca/binding/ws/axis2/QuestionMarkWSDLTestCase.java +++ /dev/null @@ -1,126 +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.binding.ws.axis2; - -import java.io.BufferedReader; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.net.URL; -import java.util.List; - -import javax.wsdl.Definition; -import javax.wsdl.Port; -import javax.wsdl.Service; -import javax.wsdl.extensions.soap.SOAPAddress; -import javax.wsdl.factory.WSDLFactory; -import javax.wsdl.xml.WSDLReader; -import javax.xml.namespace.QName; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; - -/** - * Test ?wsdl works and that the returned WSDL has the correct endpoint - * - * @version $Rev$ $Date$ - */ -public class QuestionMarkWSDLTestCase extends TestCase { - - private Node node; - - /** - * Tests ?wsdl works and returns the correct port endpoint from the WSDL - */ - public void testWSDLPortEndpoint() throws Exception { - InputStream inp = new URL("http://localhost:8085/services/HelloWorldWebService2?wsdl").openStream(); - BufferedReader br = new BufferedReader(new InputStreamReader(inp)); - String line; - while((line = br.readLine()) != null) { - System.out.println(line); - } - br.close(); - - WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader(); - wsdlReader.setFeature("javax.wsdl.verbose",false); - wsdlReader.setFeature("javax.wsdl.importDocuments",true); - - Definition definition = wsdlReader.readWSDL("http://localhost:8085/services/HelloWorldWebService2?wsdl"); - assertNotNull(definition); - Service service = definition.getService(new QName("http://helloworld/HelloWorldService/HelloWorld", - "HelloWorldService")); - Port port = service.getPort("HelloWorldPort"); - - String endpoint = getEndpoint(port); - assertEquals("http://localhost:8085/services/HelloWorldWebService2", endpoint); - } - - /** - * Tests ?wsdl works and returns the correct port endpoint from binding.ws with a custom URI - */ - public void testCustomEndpoint() throws Exception { - InputStream inp = new URL("http://localhost:8085/foo/bar?wsdl").openStream(); - BufferedReader br = new BufferedReader(new InputStreamReader(inp)); - String line; - while((line = br.readLine()) != null) { - System.out.println(line); - } - br.close(); - - WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader(); - wsdlReader.setFeature("javax.wsdl.verbose",false); - wsdlReader.setFeature("javax.wsdl.importDocuments",true); - - Definition definition = wsdlReader.readWSDL("http://localhost:8085/foo/bar?wsdl"); - assertNotNull(definition); - Service service = definition.getService(new QName("http://axis2.ws.binding.sca.tuscany.apache.org/", - "HelloWorldService")); - Port port = service.getPort("HelloWorldPort"); - - String endpoint = getEndpoint(port); - // TODO - used to get the real host here but WSDL seems to have localhost in it atm? - assertEquals("http://localhost:8085/foo/bar", endpoint); - } - - protected String getEndpoint(Port port) { - List wsdlPortExtensions = port.getExtensibilityElements(); - for (final Object extension : wsdlPortExtensions) { - if (extension instanceof SOAPAddress) { - return ((SOAPAddress) extension).getLocationURI(); - } - } - throw new RuntimeException("no SOAPAddress"); - } - - @Override - protected void setUp() throws Exception { - String contribution = "target/classes"; - node = NodeFactory.newInstance().createNode("org/apache/tuscany/sca/binding/ws/axis2/questionmark-wsdl.composite", new Contribution("test", contribution)); - node.start(); - } - - @Override - protected void tearDown() throws Exception { - node.stop(); - } - -} |