summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.4/samples
diff options
context:
space:
mode:
authorramkumar <ramkumar@13f79535-47bb-0310-9956-ffa450edef68>2008-12-04 07:03:44 +0000
committerramkumar <ramkumar@13f79535-47bb-0310-9956-ffa450edef68>2008-12-04 07:03:44 +0000
commit67b27ddbd08aced56d969c3abcb22573cb710e8d (patch)
treee0381eea26362ca368b00747a35d8b4125a297ea /branches/sca-java-1.4/samples
parent8d4370a11f701a919715e7b9df1f69ca71574c3a (diff)
removing sample modules
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@723225 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-java-1.4/samples')
-rw-r--r--branches/sca-java-1.4/samples/helloworld-bpel-ws/pom.xml410
-rw-r--r--branches/sca-java-1.4/samples/helloworld-bpel/pom.xml2
-rw-r--r--branches/sca-java-1.4/samples/helloworld-web-callback/pom.xml68
-rw-r--r--branches/sca-java-1.4/samples/helloworld-web-callback/src/main/java/sample/HelloworldCallback.java30
-rw-r--r--branches/sca-java-1.4/samples/helloworld-web-callback/src/main/java/sample/HelloworldService.java14
-rw-r--r--branches/sca-java-1.4/samples/helloworld-web-callback/src/main/java/sample/HelloworldServiceImpl.java27
-rw-r--r--branches/sca-java-1.4/samples/helloworld-web-callback/src/main/webapp/META-INF/sca-deployables/web.composite45
-rw-r--r--branches/sca-java-1.4/samples/helloworld-web-callback/src/main/webapp/WEB-INF/web.xml42
-rw-r--r--branches/sca-java-1.4/samples/helloworld-web-callback/src/main/webapp/hello.html63
-rw-r--r--branches/sca-java-1.4/samples/helloworld-web/pom.xml68
-rw-r--r--branches/sca-java-1.4/samples/helloworld-web/src/main/java/sample/HelloworldService.java7
-rw-r--r--branches/sca-java-1.4/samples/helloworld-web/src/main/java/sample/HelloworldServiceImpl.java12
-rw-r--r--branches/sca-java-1.4/samples/helloworld-web/src/main/webapp/META-INF/sca-deployables/web.composite39
-rw-r--r--branches/sca-java-1.4/samples/helloworld-web/src/main/webapp/WEB-INF/web.xml42
-rw-r--r--branches/sca-java-1.4/samples/helloworld-web/src/main/webapp/hello.html62
-rw-r--r--branches/sca-java-1.4/samples/helloworld-ws-deep-webapp/README1
-rw-r--r--branches/sca-java-1.4/samples/helloworld-ws-deep-webapp/build.xml158
-rw-r--r--branches/sca-java-1.4/samples/helloworld-ws-deep-webapp/pom.xml45
-rw-r--r--branches/sca-java-1.4/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldImpl.java33
-rw-r--r--branches/sca-java-1.4/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldService.java30
-rw-r--r--branches/sca-java-1.4/samples/helloworld-ws-deep-webapp/src/main/resources/META-INF/sca-deployables/helloworldws.composite32
-rw-r--r--branches/sca-java-1.4/samples/helloworld-ws-deep-webapp/src/main/resources/wsdl/helloworld.wsdl79
-rw-r--r--branches/sca-java-1.4/samples/helloworld-ws-deep-webapp/src/main/webapp/WEB-INF/web.xml27
-rw-r--r--branches/sca-java-1.4/samples/helloworld-ws-reference-lean/README178
-rw-r--r--branches/sca-java-1.4/samples/helloworld-ws-reference-lean/helloworld-ws-reference.pngbin7549 -> 0 bytes
-rw-r--r--branches/sca-java-1.4/samples/helloworld-ws-reference-lean/helloworld-ws-reference.svg150
-rw-r--r--branches/sca-java-1.4/samples/helloworld-ws-reference-lean/pom.xml79
-rw-r--r--branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient.java47
-rw-r--r--branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient2.java53
-rw-r--r--branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient3.java47
-rw-r--r--branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient4.java52
-rw-r--r--branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient5.java47
-rw-r--r--branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldService.java29
-rw-r--r--branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient.composite33
-rw-r--r--branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient2.composite33
-rw-r--r--branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient3.composite33
-rw-r--r--branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient4.composite34
-rw-r--r--branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient5.composite33
-rw-r--r--branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/resources/logging.properties30
-rw-r--r--branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/resources/wsdl/helloworld.wsdl92
-rw-r--r--branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldClientTestCase.java58
-rw-r--r--branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldTestServer.java55
-rw-r--r--branches/sca-java-1.4/samples/pom.xml3
43 files changed, 207 insertions, 2215 deletions
diff --git a/branches/sca-java-1.4/samples/helloworld-bpel-ws/pom.xml b/branches/sca-java-1.4/samples/helloworld-bpel-ws/pom.xml
index 63f5a4a445..46e38f6a92 100644
--- a/branches/sca-java-1.4/samples/helloworld-bpel-ws/pom.xml
+++ b/branches/sca-java-1.4/samples/helloworld-bpel-ws/pom.xml
@@ -1,205 +1,205 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT 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>1.4</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-helloworld-bpel-ws</artifactId>
- <name>Apache Tuscany SCA HelloWorld BPEL as Webservice Sample</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-host-embedded</artifactId>
- <version>1.4</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.4</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-bpel-ode</artifactId>
- <version>1.4</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
- <version>1.4</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-jetty</artifactId>
- <version>1.4</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-impl</artifactId>
- <version>1.1-incubating</version>
- </dependency>
-
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.8.1</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
- <!-- dependencies that must be present in order that the build scripts work -->
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-wsdl2java</artifactId>
- <version>1.4</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-tools</artifactId>
- <version>1.1-incubating</version>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <version>3.2.1</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.1.7</version>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.stream</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- </exclusions>
- </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-incubating</version>
- <executions>
- <execution>
- <id>generate-bpel-helloworld</id>
- <phase>generate-sources</phase>
- <configuration>
- <schemaFile>${basedir}/src/main/resources/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.4</version>
- <executions>
- <execution>
- <configuration>
- <wsdlFile>${basedir}/src/main/resources/helloworld.wsdl</wsdlFile>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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>1.4</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <artifactId>sample-helloworld-bpel-ws</artifactId>
+ <name>Apache Tuscany SCA HelloWorld BPEL as Webservice Sample</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-host-embedded</artifactId>
+ <version>1.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-java-runtime</artifactId>
+ <version>1.4</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-bpel-ode</artifactId>
+ <version>1.4</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <version>1.4</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-jetty</artifactId>
+ <version>1.4</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sdo</groupId>
+ <artifactId>tuscany-sdo-impl</artifactId>
+ <version>1.1-incubating</version>
+ </dependency>
+
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.8.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.2</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- dependencies that must be present in order that the build scripts work -->
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-wsdl2java</artifactId>
+ <version>1.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sdo</groupId>
+ <artifactId>tuscany-sdo-tools</artifactId>
+ <version>1.1-incubating</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <version>3.2.1</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.1.7</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.stream</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </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.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-incubating</version>
+ <executions>
+ <execution>
+ <id>generate-bpel-helloworld</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <schemaFile>${basedir}/src/main/resources/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.4</version>
+ <executions>
+ <execution>
+ <configuration>
+ <wsdlFile>${basedir}/src/main/resources/helloworld.wsdl</wsdlFile>
+ </configuration>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/branches/sca-java-1.4/samples/helloworld-bpel/pom.xml b/branches/sca-java-1.4/samples/helloworld-bpel/pom.xml
index d3ebc1152e..f54ea4fe31 100644
--- a/branches/sca-java-1.4/samples/helloworld-bpel/pom.xml
+++ b/branches/sca-java-1.4/samples/helloworld-bpel/pom.xml
@@ -156,7 +156,7 @@
<artifactItem>
<groupId>org.apache.ode</groupId>
<artifactId>ode-dao-jpa-ojpa-derby</artifactId>
- <version>1.1</version>
+ <version>1.1.1</version>
<type>zip</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/test-classes/</outputDirectory>
diff --git a/branches/sca-java-1.4/samples/helloworld-web-callback/pom.xml b/branches/sca-java-1.4/samples/helloworld-web-callback/pom.xml
deleted file mode 100644
index 1cb35195c2..0000000000
--- a/branches/sca-java-1.4/samples/helloworld-web-callback/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-sca</artifactId>
- <version>1.4</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-helloworld-web-callback</artifactId>
- <packaging>war</packaging>
- <name>Apache Tuscany SCA Web 2.0 Callbacks Sample</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>1.4</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-web-runtime</artifactId>
- <version>1.4</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-webapp</artifactId>
- <version>1.4</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-dwr</artifactId>
- <version>1.4</version>
- <scope>runtime</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-
-</project>
diff --git a/branches/sca-java-1.4/samples/helloworld-web-callback/src/main/java/sample/HelloworldCallback.java b/branches/sca-java-1.4/samples/helloworld-web-callback/src/main/java/sample/HelloworldCallback.java
deleted file mode 100644
index 661f703dc8..0000000000
--- a/branches/sca-java-1.4/samples/helloworld-web-callback/src/main/java/sample/HelloworldCallback.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 sample;
-
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface HelloworldCallback {
-
- @OneWay
- void sayHelloCallback(String reply);
-}
diff --git a/branches/sca-java-1.4/samples/helloworld-web-callback/src/main/java/sample/HelloworldService.java b/branches/sca-java-1.4/samples/helloworld-web-callback/src/main/java/sample/HelloworldService.java
deleted file mode 100644
index d2c1fc2def..0000000000
--- a/branches/sca-java-1.4/samples/helloworld-web-callback/src/main/java/sample/HelloworldService.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package sample;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-@Callback(HelloworldCallback.class)
-public interface HelloworldService {
-
- @OneWay
- void sayHello(String name);
-
-}
diff --git a/branches/sca-java-1.4/samples/helloworld-web-callback/src/main/java/sample/HelloworldServiceImpl.java b/branches/sca-java-1.4/samples/helloworld-web-callback/src/main/java/sample/HelloworldServiceImpl.java
deleted file mode 100644
index 8b52e42754..0000000000
--- a/branches/sca-java-1.4/samples/helloworld-web-callback/src/main/java/sample/HelloworldServiceImpl.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package sample;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Service;
-
-@Service(HelloworldService.class)
-public class HelloworldServiceImpl implements HelloworldService {
-
- @Callback
- public HelloworldCallback callback;
-
- public void sayHello(final String name) {
- Thread t = new Thread(new Runnable() {
- public void run() {
- for (int i=0; i<5; i++) {
- callback.sayHelloCallback(i + "Hello " + name);
- try {
- Thread.sleep(5000);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- }});
- t.start();
- }
-
-}
diff --git a/branches/sca-java-1.4/samples/helloworld-web-callback/src/main/webapp/META-INF/sca-deployables/web.composite b/branches/sca-java-1.4/samples/helloworld-web-callback/src/main/webapp/META-INF/sca-deployables/web.composite
deleted file mode 100644
index fdd5a95f58..0000000000
--- a/branches/sca-java-1.4/samples/helloworld-web-callback/src/main/webapp/META-INF/sca-deployables/web.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"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://samples"
- name="Helloworld">
-
- <component name="WebClient">
- <implementation.web web-uri=""/>
- <reference name="service" target="HelloworldService">
- <tuscany:binding.dwr />
- <callback>
- <tuscany:binding.dwr />
- </callback>
- </reference>
- </component>
-
- <component name="HelloworldService">
- <implementation.java class="sample.HelloworldServiceImpl"/>
- <service name="HelloworldService">
- <tuscany:binding.dwr />
- <callback>
- <tuscany:binding.dwr />
- </callback>
- </service>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.4/samples/helloworld-web-callback/src/main/webapp/WEB-INF/web.xml b/branches/sca-java-1.4/samples/helloworld-web-callback/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index f29262a147..0000000000
--- a/branches/sca-java-1.4/samples/helloworld-web-callback/src/main/webapp/WEB-INF/web.xml
+++ /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
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<web-app version="2.4"
- xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >
-
- <display-name>Apache Tuscany Helloworld Servlet Sample</display-name>
-
- <filter>
- <filter-name>tuscany</filter-name>
- <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>tuscany</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
- <welcome-file-list id="WelcomeFileList">
- <welcome-file>hello.html</welcome-file>
- </welcome-file-list>
-
-</web-app>
diff --git a/branches/sca-java-1.4/samples/helloworld-web-callback/src/main/webapp/hello.html b/branches/sca-java-1.4/samples/helloworld-web-callback/src/main/webapp/hello.html
deleted file mode 100644
index 6d4c17626b..0000000000
--- a/branches/sca-java-1.4/samples/helloworld-web-callback/src/main/webapp/hello.html
+++ /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.
--->
-<html>
-
- <head>
- <title>Apache Tuscany Helloworld Web2.0 Callbacks Sample</title>
- <script type="text/javascript" src="org.osoa.sca.componentContext.js"></script>
-
- <script language="JavaScript">
-
- componentContext.getService("service").sayHelloCallback =
- function(reply) {
- document.getElementById('result').innerHTML=reply;
- };
-
- function callSayHello() {
- componentContext.getService("service").sayHello(document.getElementById('name').value);
- }
-
- </script>
-
- </head>
- <body >
-
- <h2>Apache Tuscany Helloworld Web2.0 Callbacks Sample</h2>
-
- <table>
- <tr>
- <td>Enter your name:</td>
- <td>
- <input type="text" id="name" width="10">
- </td>
- </tr>
- <tr>
- <td align="left" colspan="2">
- <button name="submit" onclick="callSayHello()">Say hello</button>
- </td>
- </tr>
- <tr>
- <td>
- <div id='result'></div>
- </td>
- </tr>
- </table>
-
- </body>
-</html>
diff --git a/branches/sca-java-1.4/samples/helloworld-web/pom.xml b/branches/sca-java-1.4/samples/helloworld-web/pom.xml
deleted file mode 100644
index a137b39273..0000000000
--- a/branches/sca-java-1.4/samples/helloworld-web/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-sca</artifactId>
- <version>1.4</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-helloworld-web</artifactId>
- <packaging>war</packaging>
- <name>Apache Tuscany SCA Helloworld Web Sample</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>1.4</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-web-runtime</artifactId>
- <version>1.4</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-webapp</artifactId>
- <version>1.4</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
- <version>1.4</version>
- <scope>runtime</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-
-</project>
diff --git a/branches/sca-java-1.4/samples/helloworld-web/src/main/java/sample/HelloworldService.java b/branches/sca-java-1.4/samples/helloworld-web/src/main/java/sample/HelloworldService.java
deleted file mode 100644
index 2b92fd4661..0000000000
--- a/branches/sca-java-1.4/samples/helloworld-web/src/main/java/sample/HelloworldService.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package sample;
-
-public interface HelloworldService {
-
- String sayHello(String name);
-
-}
diff --git a/branches/sca-java-1.4/samples/helloworld-web/src/main/java/sample/HelloworldServiceImpl.java b/branches/sca-java-1.4/samples/helloworld-web/src/main/java/sample/HelloworldServiceImpl.java
deleted file mode 100644
index be83d3b407..0000000000
--- a/branches/sca-java-1.4/samples/helloworld-web/src/main/java/sample/HelloworldServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package sample;
-
-import org.osoa.sca.annotations.Service;
-
-@Service(HelloworldService.class)
-public class HelloworldServiceImpl implements HelloworldService {
-
- public String sayHello(String name) {
- return "Hello " + name;
- }
-
-}
diff --git a/branches/sca-java-1.4/samples/helloworld-web/src/main/webapp/META-INF/sca-deployables/web.composite b/branches/sca-java-1.4/samples/helloworld-web/src/main/webapp/META-INF/sca-deployables/web.composite
deleted file mode 100644
index 20cebc2d53..0000000000
--- a/branches/sca-java-1.4/samples/helloworld-web/src/main/webapp/META-INF/sca-deployables/web.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"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://samples"
- name="Helloworld">
-
- <component name="WebClient">
- <implementation.web web-uri=""/>
- <reference name="service" target="HelloworldService">
- <tuscany:binding.jsonrpc />
- </reference>
- </component>
-
- <component name="HelloworldService">
- <implementation.java class="sample.HelloworldServiceImpl"/>
- <service name="HelloworldService">
- <tuscany:binding.jsonrpc />
- </service>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.4/samples/helloworld-web/src/main/webapp/WEB-INF/web.xml b/branches/sca-java-1.4/samples/helloworld-web/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index f29262a147..0000000000
--- a/branches/sca-java-1.4/samples/helloworld-web/src/main/webapp/WEB-INF/web.xml
+++ /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
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<web-app version="2.4"
- xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >
-
- <display-name>Apache Tuscany Helloworld Servlet Sample</display-name>
-
- <filter>
- <filter-name>tuscany</filter-name>
- <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>tuscany</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
- <welcome-file-list id="WelcomeFileList">
- <welcome-file>hello.html</welcome-file>
- </welcome-file-list>
-
-</web-app>
diff --git a/branches/sca-java-1.4/samples/helloworld-web/src/main/webapp/hello.html b/branches/sca-java-1.4/samples/helloworld-web/src/main/webapp/hello.html
deleted file mode 100644
index 83ac0ae576..0000000000
--- a/branches/sca-java-1.4/samples/helloworld-web/src/main/webapp/hello.html
+++ /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.
--->
-<html>
-
- <head>
- <title>Apache Tuscany Helloworld Web Sample</title>
- <script type="text/javascript" src="org.osoa.sca.componentContext.js"></script>
-
- <script language="JavaScript">
-
- function callSayHello() {
- componentContext.getService("service").sayHello(document.getElementById('name').value,
- function(reply) {
- document.getElementById('result').innerHTML=reply;
- }
- );
- }
-
- </script>
-
- </head>
- <body >
-
- <h2>Apache Tuscany Helloworld Web Sample</h2>
-
- <table>
- <tr>
- <td>Enter your name:</td>
- <td>
- <input type="text" id="name" width="10">
- </td>
- </tr>
- <tr>
- <td align="left" colspan="2">
- <button name="submit" onclick="callSayHello()">Say hello</button>
- </td>
- </tr>
- <tr>
- <td>
- <div id='result'></div>
- </td>
- </tr>
- </table>
-
- </body>
-</html>
diff --git a/branches/sca-java-1.4/samples/helloworld-ws-deep-webapp/README b/branches/sca-java-1.4/samples/helloworld-ws-deep-webapp/README
deleted file mode 100644
index 66040004f8..0000000000
--- a/branches/sca-java-1.4/samples/helloworld-ws-deep-webapp/README
+++ /dev/null
@@ -1 +0,0 @@
-http://localhost:8080/sample-helloworld-ws-service-webapp/SCA/HelloWorldService?wsdl
diff --git a/branches/sca-java-1.4/samples/helloworld-ws-deep-webapp/build.xml b/branches/sca-java-1.4/samples/helloworld-ws-deep-webapp/build.xml
deleted file mode 100644
index a89ed5504e..0000000000
--- a/branches/sca-java-1.4/samples/helloworld-ws-deep-webapp/build.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT 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="sample-helloworld-ws-service-webapp" default="package">
- <property file="${user.home}/tuscany/build.properties" />
- <property file="${user.home}/build.properties" />
-
- <property name="tuscany.sca.manifest.location" value="../../lib/tuscany-sca-manifest.jar"/>
- <property name="tuscany.sca.lib.location" value="../../lib"/>
- <property name="tuscany.sca.modules.location" value="../../modules"/>
-
- <path id="project.classpath">
- <pathelement path="target/classes"/>
- <pathelement path="target/sdo-source"/>
- <pathelement location="${tuscany.sca.manifest.location}"/>
- </path>
-
- <target name="init">
- <mkdir dir="target/classes"/>
- <mkdir dir="target/sdo-source"/>
- </target>
-
-
- <target name="compile" depends="init">
- <javac destdir="target/classes"
- debug="on"
- source="1.5"
- target="1.5">
- <src location="src/main/java"/>
- <src location="target/sdo-source"/>
- <classpath refid="project.classpath"/>
- </javac>
- <copy todir="target/classes">
- <fileset dir="src/main/resources"/>
- <fileset dir="target/sdo-source"/>
- </copy>
- </target>
-
- <target name="package" depends="compile">
- <war destfile="target/sample-helloworld-ws-service-webapp.war"
- webxml="src/main/webapp/WEB-INF/web.xml">
- <fileset dir="src/main/webapp"/>
- <zipfileset dir="${tuscany.sca.modules.location}" prefix="WEB-INF/lib">
- <include name="sca-api-1.4.jar"/>
- <include name="tuscany-assembly-1.4.jar"/>
- <include name="tuscany-assembly-xml-1.4.jar"/>
- <include name="tuscany-binding-feed-1.4.jar"/>
- <include name="tuscany-binding-jsonrpc-1.4.jar"/>
- <include name="tuscany-binding-sca-1.4.jar"/>
- <include name="tuscany-binding-sca-xml-1.4.jar"/>
- <include name="tuscany-binding-ws-1.4.jar"/>
- <include name="tuscany-binding-ws-axis2-1.4.jar"/>
- <include name="tuscany-binding-ws-xml-1.4.jar"/>
- <include name="tuscany-contribution-1.4.jar"/>
- <include name="tuscany-contribution-impl-1.4.jar"/>
- <include name="tuscany-contribution-java-1.4.jar"/>
- <include name="tuscany-contribution-namespace-1.4.jar"/>
- <include name="tuscany-core-1.4.jar"/>
- <include name="tuscany-core-databinding-1.4.jar"/>
- <include name="tuscany-core-spi-1.4.jar"/>
- <include name="tuscany-databinding-1.4.jar"/>
- <include name="tuscany-databinding-axiom-1.4.jar"/>
- <include name="tuscany-databinding-jaxb-1.4.jar"/>
- <include name="tuscany-databinding-sdo-1.4.jar"/>
- <include name="tuscany-distributed-1.4.jar"/>
- <include name="tuscany-extension-helper-1.4.jar"/>
- <include name="tuscany-host-embedded-1.4.jar"/>
- <include name="tuscany-host-http-1.4.jar"/>
- <include name="tuscany-host-webapp-1.4.jar"/>
- <include name="tuscany-implementation-java-1.4.jar"/>
- <include name="tuscany-implementation-java-runtime-1.4.jar"/>
- <include name="tuscany-implementation-java-xml-1.4.jar"/>
- <include name="tuscany-interface-1.4.jar"/>
- <include name="tuscany-interface-java-1.4.jar"/>
- <include name="tuscany-interface-java-xml-1.4.jar"/>
- <include name="tuscany-interface-wsdl-1.4.jar"/>
- <include name="tuscany-interface-wsdl-runtime-1.4.jar"/>
- <include name="tuscany-interface-wsdl-xml-1.4.jar"/>
- <include name="tuscany-policy-1.4.jar"/>
- <include name="tuscany-policy-xml-1.4.jar"/>
- </zipfileset>
- <lib dir="${tuscany.sca.lib.location}">
- <include name="XmlSchema-1.3.1.jar"/>
- <include name="activation-1.1.jar"/>
- <include name="annogen-0.1.0.jar"/>
- <include name="ant-1.7.0.jar"/>
- <include name="ant-launcher-1.7.0.jar"/>
- <include name="axiom-api-1.2.4.jar"/>
- <include name="axiom-dom-1.2.4.jar"/>
- <include name="axiom-impl-1.2.4.jar"/>
- <include name="axis2-java2wsdl-1.2.jar"/>
- <include name="axis2-kernel-1.2.jar"/>
- <include name="backport-util-concurrent-2.2.jar"/>
- <include name="backport-util-concurrent-3.0.jar"/>
- <include name="cglib-nodep-2.1_3.jar"/>
- <include name="common-2.2.3.jar"/>
- <include name="commons-codec-1.3.jar"/>
- <include name="commons-fileupload-1.1.1.jar"/>
- <include name="commons-httpclient-3.1.jar"/>
- <include name="commons-io-1.1.jar"/>
- <include name="commons-logging-1.1.jar"/>
- <include name="ecore-2.2.3.jar"/>
- <include name="ecore-change-2.2.3.jar"/>
- <include name="ecore-xmi-2.2.3.jar"/>
- <include name="geronimo-commonj_1.1_spec-1.0.jar"/>
- <include name="geronimo-jms_1.1_spec-1.1.jar"/>
- <include name="jakarta-httpcore-4.0-alpha4.jar"/>
- <include name="jaxb-api-2.1.jar"/>
- <include name="jaxb-impl-2.1.4.jar"/>
- <include name="jaxen-1.1-beta-9.jar"/>
- <include name="jaxws-api-2.1.jar"/>
- <include name="jdom-1.0.jar"/>
- <include name="json-rpc-1.0.jar"/>
- <include name="jsr181-api-1.0-MR1.jar"/>
- <include name="jsr250-api-1.0.jar"/>
- <include name="mail-1.4.jar"/>
- <include name="neethi-2.0.1.jar"/>
- <include name="rome-0.9.jar"/>
- <include name="saaj-api-1.3.jar"/>
- <include name="sca-api-1.4.jar"/>
- <include name="stax-api-1.0-2.jar"/>
- <include name="stax-api-1.0.1.jar"/>
- <include name="woden-1.0-incubating-M7a.jar"/>
- <include name="wsdl4j-1.6.2.jar"/>
- <include name="wstx-asl-3.2.1.jar"/>
- <include name="xercesImpl-2.8.1.jar"/>
- <include name="xml-apis-1.3.03.jar"/>
- <include name="xsd-2.2.3.jar"/>
- <include name="tuscany-sdo-api-r2.1-1.4.jar"/>
- <include name="tuscany-sdo-impl-1.4.jar"/>
- <include name="tuscany-sdo-lib-1.4.jar"/>
- </lib>
- <classes dir="target/classes"/>
- <classes dir="target/sdo-source"/>
- </war>
- </target>
-
- <target name="clean">
- <delete quiet="true" includeemptydirs="true">
- <fileset dir="target"/>
- </delete>
- </target>
-</project>
diff --git a/branches/sca-java-1.4/samples/helloworld-ws-deep-webapp/pom.xml b/branches/sca-java-1.4/samples/helloworld-ws-deep-webapp/pom.xml
deleted file mode 100644
index 8b069d7c8f..0000000000
--- a/branches/sca-java-1.4/samples/helloworld-ws-deep-webapp/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-sca</artifactId>
- <version>1.4</version>
- </parent>
-
- <artifactId>sample-helloworld-ws-service-webapp</artifactId>
- <name>Apache Tuscany SCA HelloWorld Web Service Sample Webapp</name>
- <packaging>war</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>1.4</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-
-</project>
diff --git a/branches/sca-java-1.4/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldImpl.java b/branches/sca-java-1.4/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 0de3c70303..0000000000
--- a/branches/sca-java-1.4/samples/helloworld-ws-deep-webapp/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/branches/sca-java-1.4/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldService.java b/branches/sca-java-1.4/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 268d90e910..0000000000
--- a/branches/sca-java-1.4/samples/helloworld-ws-deep-webapp/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/branches/sca-java-1.4/samples/helloworld-ws-deep-webapp/src/main/resources/META-INF/sca-deployables/helloworldws.composite b/branches/sca-java-1.4/samples/helloworld-ws-deep-webapp/src/main/resources/META-INF/sca-deployables/helloworldws.composite
deleted file mode 100644
index 114608e4d8..0000000000
--- a/branches/sca-java-1.4/samples/helloworld-ws-deep-webapp/src/main/resources/META-INF/sca-deployables/helloworldws.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://www.osoa.org/xmlns/sca/1.0"
- name="helloworldws">
-
- <service name="HelloWorldService" promote="HelloWorldComponent">
- <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
- <binding.ws />
- </service>
-
- <component name="HelloWorldComponent">
- <implementation.java class="helloworld.HelloWorldImpl" />
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.4/samples/helloworld-ws-deep-webapp/src/main/resources/wsdl/helloworld.wsdl b/branches/sca-java-1.4/samples/helloworld-ws-deep-webapp/src/main/resources/wsdl/helloworld.wsdl
deleted file mode 100644
index 0b95fbd14f..0000000000
--- a/branches/sca-java-1.4/samples/helloworld-ws-deep-webapp/src/main/resources/wsdl/helloworld.wsdl
+++ /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.
--->
-<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:8080/services/HelloWorldWebService"/>
- </wsdl:port>
- </wsdl:service>
-
-</wsdl:definitions>
diff --git a/branches/sca-java-1.4/samples/helloworld-ws-deep-webapp/src/main/webapp/WEB-INF/web.xml b/branches/sca-java-1.4/samples/helloworld-ws-deep-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 182fd38fd9..0000000000
--- a/branches/sca-java-1.4/samples/helloworld-ws-deep-webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
-Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-
- <display-name>Apache Tuscany HelloWorld Web Service Sample</display-name>
-
-</web-app>
diff --git a/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/README b/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/README
deleted file mode 100644
index 13c89ab2f6..0000000000
--- a/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/README
+++ /dev/null
@@ -1,178 +0,0 @@
-Hello World Web Service References Sample
-=========================================
-This sample demonstrates an SCA reference that uses a web service binding.
-
-The README in the samples directory (the directory above this) provides
-general instructions about building and running samples. Take a look there
-first.
-
-If you just want to run it to see what happens you need to run the server first
-so open a command prompt, navigate to the helloworld-ws-service sample directory
-and do
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-helloworld-ws-service.jar helloworld.HelloWorldServer
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-helloworld-ws-service.jar helloworld.HelloWorldServer
-
-
-Once the server is running open a command prompt, navigate to this sample
-directory and do:
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-helloworld-ws-reference.jar helloworld.HelloWorldClient
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-helloworld-ws-reference.jar helloworld.HelloWorldClient
-
-
-Sample Overview
----------------
-The sample provides a single component that is wired to a reference with a
-web service binding. The binding refers to WSDL that identifies the service
-exposed by the helloworld-ws-service sample.
-
-helloworld-ws-reference/
- src/
- main/
- java/
- helloworld/
- HelloWorldService.java - interface description for
- HelloWorldServiceComponent
- HelloWorldServiceComponent.java - component implementation
- HelloWorldClient.java - starts the SCA Runtime and
- deploys the helloworldwsclient
- .composite. It then calls the
- HelloWorldServiceComponent
- resources/
- wsdl
- helloworld.wsdl - the service description that the
- SCA reference uses to bind to
- helloworldwsclient.composite - the SCA assembly for this sample
- logging.properties - log4j configuration file
- test/
- java/
- helloworld/
- HelloWorldClientTestCase.java - JUnit test case
- HelloWorldServerTest.java - starts the Web service
- helloworld-ws-reference.png - a pictorial representation of the
- sample .composite file
- build.xml - the Ant build file
- pom.xml - the Maven build file
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant. Before
-you do this start up the service that the reference will talk to. To do this
-run up the helloworld-ws-service test. Take a look at the README in that sample
-and you will see you need the following commands
-
-cd helloworld-ws-service
-ant run
-
-Once done you can now compile and run this sample using the following commands;
-
-cd helloworld-ws-reference
-ant compile
-ant run
-
-You should see the following output from the run target.
-
-run:
- [java] Injected helloWorldService
- [java] Called getGreetings
- [java] Hello World
-
-Building And Running The Sample Using Maven
--------------------------------------------
-With either the binary or source distributions the sample can be built and run
-using Maven as follows. When using Maven you don't need to run the helloworld-
-ws-service sample first as Maven does this for you.
-
-cd helloworld-ws-reference
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running helloworld.HelloWorldClientTestCase
-14-Jan-2008 14:06:12 org.apache.catalina.core.StandardEngine start
-INFO: Starting Servlet Engine: Apache Tomcat/6.0.10
-14-Jan-2008 14:06:12 org.apache.catalina.startup.ContextConfig defaultWebConfig
-INFO: No default web.xml
-14-Jan-2008 14:06:12 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/resources/j2ee_1_4.xsd
-14-Jan-2008 14:06:12 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/resources/xml.xsd
-14-Jan-2008 14:06:12 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/jsp/resources/jsp_2_0.xsd
-14-Jan-2008 14:06:12 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_2_
-0.xsd
-14-Jan-2008 14:06:12 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/resources/web-app_2_4.xsd
-14-Jan-2008 14:06:12 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/resources/j2ee_web_services_1_1.xs
-d
-14-Jan-2008 14:06:12 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/resources/j2ee_web_services_client
-_1_1.xsd
-14-Jan-2008 14:06:12 org.apache.coyote.http11.Http11Protocol init
-INFO: Initializing Coyote HTTP/1.1 on http-8085
-14-Jan-2008 14:06:12 org.apache.coyote.http11.Http11Protocol start
-INFO: Starting Coyote HTTP/1.1 on http-8085
-14-Jan-2008 14:06:12 org.apache.tuscany.sca.http.tomcat.TomcatServer addServletM
-apping
-INFO: Added Servlet mapping: http://L3AW203:8085/HelloWorldService
-Injected helloWorldService
-Called getGreetings
-14-Jan-2008 14:06:14 org.apache.coyote.http11.Http11Protocol destroy
-INFO: Stopping Coyote HTTP/1.1 on http-8085
-14-Jan-2008 14:06:17 org.apache.catalina.core.StandardEngine start
-INFO: Starting Servlet Engine: Apache Tomcat/6.0.10
-14-Jan-2008 14:06:17 org.apache.catalina.loader.WebappLoader start
-INFO: Dual registration of jndi stream handler: factory already defined
-14-Jan-2008 14:06:17 org.apache.catalina.startup.ContextConfig defaultWebConfig
-INFO: No default web.xml
-14-Jan-2008 14:06:17 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/resources/j2ee_1_4.xsd
-14-Jan-2008 14:06:17 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/resources/xml.xsd
-14-Jan-2008 14:06:17 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/jsp/resources/jsp_2_0.xsd
-14-Jan-2008 14:06:17 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_2_
-0.xsd
-14-Jan-2008 14:06:17 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/resources/web-app_2_4.xsd
-14-Jan-2008 14:06:17 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/resources/j2ee_web_services_1_1.xs
-d
-14-Jan-2008 14:06:17 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/resources/j2ee_web_services_client
-_1_1.xsd
-14-Jan-2008 14:06:17 org.apache.coyote.http11.Http11Protocol init
-INFO: Initializing Coyote HTTP/1.1 on http-8085
-14-Jan-2008 14:06:17 org.apache.coyote.http11.Http11Protocol start
-INFO: Starting Coyote HTTP/1.1 on http-8085
-14-Jan-2008 14:06:17 org.apache.tuscany.sca.http.tomcat.TomcatServer addServletM
-apping
-INFO: Added Servlet mapping: http://L3AW203:8085/HelloWorldService
-Injected helloWorldService
-Called getGreetings
-14-Jan-2008 14:06:18 org.apache.coyote.http11.Http11Protocol destroy
-INFO: Stopping Coyote HTTP/1.1 on http-8085
-Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 13.625 sec
-
-This shows that the Junit test cases have run successfully.
diff --git a/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/helloworld-ws-reference.png b/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/helloworld-ws-reference.png
deleted file mode 100644
index bd2bba41db..0000000000
--- a/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/helloworld-ws-reference.png
+++ /dev/null
Binary files differ
diff --git a/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/helloworld-ws-reference.svg b/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/helloworld-ws-reference.svg
deleted file mode 100644
index 354ffbae8f..0000000000
--- a/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/helloworld-ws-reference.svg
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="1052.3622"
- height="744.09448"
- id="svg2"
- sodipodi:version="0.32"
- inkscape:version="0.44"
- sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-ws-reference"
- sodipodi:docname="helloworld-ws-reference.svg"
- version="1.0"
- inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-ws-reference\helloworld-ws-reference.png"
- inkscape:export-xdpi="52.84"
- inkscape:export-ydpi="52.84">
- <defs
- id="defs4" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- gridtolerance="10000"
- guidetolerance="10"
- objecttolerance="10"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1.4"
- inkscape:cx="519.38407"
- inkscape:cy="414.63224"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- inkscape:window-width="1054"
- inkscape:window-height="721"
- inkscape:window-x="85"
- inkscape:window-y="295" />
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1">
- <g
- id="g2997"
- transform="matrix(0.991389,0,0,1,2.215655,0)">
- <rect
- rx="13.79423"
- ry="12.692303"
- y="192.00233"
- x="258.3114"
- height="299.99988"
- width="446.72086"
- id="rect2067"
- style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.00866628;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
- <flowRoot
- id="flowRoot2954"
- xml:space="preserve"><flowRegion
- id="flowRegion2956"><rect
- y="212.66591"
- x="281.42856"
- height="61.42857"
- width="170"
- id="rect2958" /></flowRegion><flowPara
- id="flowPara2960">helloworldwsclient</flowPara></flowRoot> </g>
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect2988"
- width="115.66247"
- height="85.862968"
- x="432.05917"
- y="307.1676"
- rx="6.9961648"
- ry="7.1230249" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot2966"
- transform="translate(172.4684,115.2291)"><flowRegion
- id="flowRegion2968"><rect
- id="rect2970"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara2972">HelloWorld</flowPara><flowPara
- id="flowPara1883">Service</flowPara><flowPara
- id="flowPara1885">Component</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 414.90867,339.0146 L 448.24371,339.0146 L 454.30462,352.14658 L 447.23356,364.26842 L 414.90867,364.26842 L 422.48482,352.14658 L 414.90867,339.0146 z "
- id="path3017" />
- <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 528.16111,337.17632 L 561.49615,337.17632 L 567.55706,350.3083 L 560.486,362.43014 L 528.16111,362.43014 L 535.73726,350.3083 L 528.16111,337.17632 z "
- id="path3019" />
- <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 651.01647,320.75333 L 718.80207,320.75333 L 731.12672,349.11387 L 716.74797,375.29287 L 651.01647,375.29287 L 666.4223,349.11387 L 651.01647,320.75333 z "
- id="path1887" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot1889"
- transform="translate(388.9491,122.6895)"
- style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
- id="flowRegion1891"><rect
- id="rect1893"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591"
- style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara1895">HelloWorld</flowPara><flowPara
- id="flowPara1897">Service</flowPara><flowPara
- id="flowPara1899" /></flowRoot> <path
- style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 567.85714,349.09448 C 666.42857,348.3802 666.42857,348.3802 666.42857,348.3802"
- id="path1901" />
- </g>
-</svg>
diff --git a/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/pom.xml b/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/pom.xml
deleted file mode 100644
index b7ee15cfec..0000000000
--- a/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/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-sca</artifactId>
- <version>1.4</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-helloworld-ws-reference-lean</artifactId>
- <name>Apache Tuscany SCA Sample HelloWorld Web Service 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-host-embedded</artifactId>
- <version>1.4</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.4</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
- <version>1.4</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>sample-helloworld-ws-service</artifactId>
- <version>1.4</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.5</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-
-</project>
diff --git a/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient.java b/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient.java
deleted file mode 100644
index f8d66876fa..0000000000
--- a/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient.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 org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.osoa.sca.annotations.EagerInit;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-
-/**
- * The HelloWorld client implementation
- */
-@Scope("COMPOSITE") @EagerInit
-public class HelloWorldClient {
-
- static HelloWorldService helloWorldService;
-
- @Reference
- public void setHelloWorldService(HelloWorldService service) {
- helloWorldService = service;
- }
-
- public final static void main(String[] args) throws Exception {
- SCADomain scaDomain = SCADomain.newInstance("helloworldwsclient.composite");
-
- String value = helloWorldService.getGreetings("World");
- System.out.println(value);
-
- scaDomain.close();
- }
-} \ No newline at end of file
diff --git a/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient2.java b/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient2.java
deleted file mode 100644
index 13a31b6391..0000000000
--- a/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient2.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 helloworld;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.osoa.sca.annotations.EagerInit;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-
-/**
- * The HelloWorld client implementation
- */
-@Scope("COMPOSITE") @EagerInit
-public class HelloWorldClient2 {
-
- private static HelloWorldClient2 client;
-
- @Reference
- public HelloWorldService helloWorldService;
-
- public HelloWorldClient2() {
- client = this;
- }
-
- public final static void main(String[] args) throws Exception {
- SCADomain scaDomain = SCADomain.newInstance("helloworldwsclient2.composite");
-
- client.doit(args);
-
- scaDomain.close();
- }
-
- void doit(String[] args) {
- String value = helloWorldService.getGreetings("World");
- System.out.println(value);
- }
-} \ No newline at end of file
diff --git a/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient3.java b/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient3.java
deleted file mode 100644
index 6d1722095b..0000000000
--- a/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient3.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 org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.osoa.sca.annotations.EagerInit;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-
-/**
- * The HelloWorld client implementation
- */
-@Scope("COMPOSITE") @EagerInit
-public class HelloWorldClient3 {
-
- @Reference
- public HelloWorldService helloWorldService;
-
- public final static void main(String[] args) throws Exception {
- SCADomain scaDomain = SCADomain.newInstance("helloworldwsclient3.composite");
-
- scaDomain.getService(HelloWorldClient3.class, "HelloWorldClient3").doit(args);
-
- scaDomain.close();
- }
-
- public void doit(String[] args) {
- String value = helloWorldService.getGreetings("World");
- System.out.println(value);
- }
-} \ No newline at end of file
diff --git a/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient4.java b/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient4.java
deleted file mode 100644
index 3def5194a5..0000000000
--- a/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient4.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 helloworld;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.EagerInit;
-import org.osoa.sca.annotations.Scope;
-
-/**
- * The HelloWorld client implementation
- */
-@Scope("COMPOSITE") @EagerInit
-public class HelloWorldClient4 {
-
- static ComponentContext clientContext;
-
- @Context
- public void setContext(ComponentContext context) {
- clientContext = context;
- }
-
- public final static void main(String[] args) throws Exception {
- SCADomain scaDomain = SCADomain.newInstance("helloworldwsclient4.composite");
-
- HelloWorldService helloWorldService = clientContext.getService(HelloWorldService.class, "helloWorldService");
- String value = helloWorldService.getGreetings("World");
- System.out.println(value);
-
- scaDomain.close();
- }
-
- public void doit(String[] args) {
- }
-} \ No newline at end of file
diff --git a/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient5.java b/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient5.java
deleted file mode 100644
index 7c1853566f..0000000000
--- a/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient5.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 org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.osoa.sca.annotations.EagerInit;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-
-/**
- * The HelloWorld client implementation
- */
-@Scope("COMPOSITE") @EagerInit
-public class HelloWorldClient5 {
-
- @Reference
- public HelloWorldService helloWorldService;
-
- public final static void main(String[] args) throws Exception {
- SCADomain scaDomain = SCADomain.newInstance("helloworldwsclient5.composite");
-
- scaDomain.close();
- }
-
- @Init
- public void doit() {
- String value = helloWorldService.getGreetings("World");
- System.out.println(value);
- }
-} \ No newline at end of file
diff --git a/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldService.java b/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index db0c947cf7..0000000000
--- a/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/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.osoa.sca.annotations.Remotable;
-
-/**
- * The interface for the helloworld service
- */
-@Remotable
-public interface HelloWorldService {
- public String getGreetings(String name);
-}
diff --git a/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient.composite b/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient.composite
deleted file mode 100644
index 991e4b4881..0000000000
--- a/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient.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="helloworldwsclient">
-
- <!-- A component representing the client program -->
- <component name="HelloWorldClient">
- <implementation.java class="helloworld.HelloWorldClient"/>
- <reference name="helloWorldService">
- <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/>
- </reference>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient2.composite b/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient2.composite
deleted file mode 100644
index 6ea14602b3..0000000000
--- a/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient2.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="helloworldwsclient">
-
- <!-- A component representing the client program -->
- <component name="HelloWorldClient2">
- <implementation.java class="helloworld.HelloWorldClient2"/>
- <reference name="helloWorldService">
- <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/>
- </reference>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient3.composite b/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient3.composite
deleted file mode 100644
index 3d6364f55f..0000000000
--- a/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient3.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="helloworldwsclient">
-
- <!-- A component representing the client program -->
- <component name="HelloWorldClient3">
- <implementation.java class="helloworld.HelloWorldClient3"/>
- <reference name="helloWorldService">
- <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/>
- </reference>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient4.composite b/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient4.composite
deleted file mode 100644
index 106e9db988..0000000000
--- a/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient4.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://helloworld"
- xmlns:hw="http://helloworld"
- name="helloworldwsclient">
-
- <!-- A component representing the client program -->
- <component name="HelloWorldClient4">
- <implementation.java class="helloworld.HelloWorldClient4"/>
- <reference name="helloWorldService">
- <interface.java interface="helloworld.HelloWorldService"/>
- <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/>
- </reference>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient5.composite b/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient5.composite
deleted file mode 100644
index bbac4c3703..0000000000
--- a/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient5.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="helloworldwsclient">
-
- <!-- A component representing the client program -->
- <component name="HelloWorldClient5">
- <implementation.java class="helloworld.HelloWorldClient5"/>
- <reference name="helloWorldService">
- <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/>
- </reference>
- </component>
-
-</composite>
diff --git a/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/resources/logging.properties b/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/resources/logging.properties
deleted file mode 100644
index 3dca310cdb..0000000000
--- a/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/resources/logging.properties
+++ /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.
-#
-# $Rev$ $Date$
-#
-
-# Custom logging configuration for Tuscany samples
-# By default, only INFO level logging is enabled and ALL messages get sent to the console
-# For more messages from the runtime, uncomment specific settings at the end of this file
-handlers = java.util.logging.ConsoleHandler
-java.util.logging.ConsoleHandler.level = ALL
-java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
-.level=INFO
-
-# Uncomment the next setting to get all Tuscany messages (this will be a lot)
-#org.apache.tuscany.level=FINEST
diff --git a/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/resources/wsdl/helloworld.wsdl b/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/resources/wsdl/helloworld.wsdl
deleted file mode 100644
index 662c9affac..0000000000
--- a/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/main/resources/wsdl/helloworld.wsdl
+++ /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.
--->
-<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: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/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldClientTestCase.java b/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldClientTestCase.java
deleted file mode 100644
index 51b70f47c2..0000000000
--- a/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldClientTestCase.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 helloworld;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.host.embedded.SCATestCaseRunner;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Test case for helloworld web service client
- */
-public class HelloWorldClientTestCase extends HelloWorldClient {
-
- private SCADomain scaDomain;
- private SCATestCaseRunner server;
-
- @Before
- public void startClient() throws Exception {
- scaDomain = SCADomain.newInstance("helloworldwsclient.composite");
-
- server = new SCATestCaseRunner(HelloWorldTestServer.class);
- server.before();
- }
-
- @Test
- public void testWSClient() throws Exception {
- String msg = helloWorldService.getGreetings("Smith");
- Assert.assertEquals("Hello Smith", msg);
- }
-
- @After
- public void stopClient() throws Exception {
- server.after();
- scaDomain.close();
- }
-
-}
diff --git a/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldTestServer.java b/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldTestServer.java
deleted file mode 100644
index 8226ec884e..0000000000
--- a/branches/sca-java-1.4/samples/helloworld-ws-reference-lean/src/test/java/helloworld/HelloWorldTestServer.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 helloworld;
-
-import java.io.IOException;
-import java.net.Socket;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-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 HelloWorldTestServer {
-
- private SCADomain scaDomain;
-
- @Before
- public void startServer() throws Exception {
- try {
- scaDomain = SCADomain.newInstance("META-INF/sca-deployables/helloworldws.composite");
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- @Test
- public void testPing() throws IOException {
- new Socket("127.0.0.1", 8085);
- }
-
- @After
- public void stopServer() throws Exception {
- scaDomain.close();
- }
-
-}
diff --git a/branches/sca-java-1.4/samples/pom.xml b/branches/sca-java-1.4/samples/pom.xml
index dbee1d94d6..1d5a361c76 100644
--- a/branches/sca-java-1.4/samples/pom.xml
+++ b/branches/sca-java-1.4/samples/pom.xml
@@ -66,11 +66,11 @@
<module>customer-dojo</module>
<module>customer-dojo-webapp</module>
<module>databinding-echo</module>
- <!--module>domain-webapp</module-->
<module>domain-management</module>
<module>feed-aggregator</module>
<module>feed-aggregator-webapp</module>
<module>helloworld-bpel</module>
+ <module>helloworld-bpel-ws</module>
<module>helloworld-dojo-webapp</module>
<module>helloworld-jms-webapp</module>
<module>helloworld-jsonrpc-webapp</module>
@@ -80,7 +80,6 @@
<module>helloworld-ws-service-jms</module>
<module>helloworld-ws-service-secure</module>
<module>helloworld-ws-reference</module>
- <module>helloworld-ws-reference-lean</module>
<module>helloworld-ws-reference-jms</module>
<module>helloworld-ws-reference-secure</module>
<module>helloworld-ws-sdo</module>