summaryrefslogtreecommitdiffstats
path: root/tags/java/sca/1.5-RC0/itest/contribution-jee-samples
diff options
context:
space:
mode:
Diffstat (limited to 'tags/java/sca/1.5-RC0/itest/contribution-jee-samples')
-rw-r--r--tags/java/sca/1.5-RC0/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml90
-rw-r--r--tags/java/sca/1.5-RC0/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite35
-rw-r--r--tags/java/sca/1.5-RC0/itest/contribution-jee-samples/ear-nonenhanced/pom.xml90
-rw-r--r--tags/java/sca/1.5-RC0/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml68
-rw-r--r--tags/java/sca/1.5-RC0/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java33
-rw-r--r--tags/java/sca/1.5-RC0/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldServiceBean.java35
-rw-r--r--tags/java/sca/1.5-RC0/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml32
-rw-r--r--tags/java/sca/1.5-RC0/itest/contribution-jee-samples/pom.xml52
-rw-r--r--tags/java/sca/1.5-RC0/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml72
-rw-r--r--tags/java/sca/1.5-RC0/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java33
-rw-r--r--tags/java/sca/1.5-RC0/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient.java25
-rw-r--r--tags/java/sca/1.5-RC0/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java34
-rw-r--r--tags/java/sca/1.5-RC0/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite34
-rw-r--r--tags/java/sca/1.5-RC0/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml72
-rw-r--r--tags/java/sca/1.5-RC0/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java33
-rw-r--r--tags/java/sca/1.5-RC0/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java25
-rw-r--r--tags/java/sca/1.5-RC0/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java34
-rw-r--r--tags/java/sca/1.5-RC0/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite34
-rw-r--r--tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml66
-rw-r--r--tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java66
-rw-r--r--tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java33
-rw-r--r--tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml49
-rw-r--r--tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite32
-rw-r--r--tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml41
-rw-r--r--tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html50
-rw-r--r--tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-nonenhanced/pom.xml66
-rw-r--r--tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java63
-rw-r--r--tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java33
-rw-r--r--tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml49
-rw-r--r--tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml41
-rw-r--r--tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html50
31 files changed, 0 insertions, 1470 deletions
diff --git a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml b/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml
deleted file mode 100644
index dc826df50f..0000000000
--- a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>itest-contribution-jee-samples</artifactId>
- <version>1.5</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-contribution-jee-samples-29-ear-appcomp-contrib-implicit</artifactId>
- <name>Apache Tuscany SCA iTest Contribution Java EE Samples 29</name>
- <packaging>ear</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>1.5</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.0_spec</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>itest-contribution-jee-samples-7-ejb-nonenhanced</artifactId>
- <version>1.5</version>
- <type>ejb</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>itest-contribution-jee-samples-1-war-nonenhanced</artifactId>
- <version>1.5</version>
- <type>war</type>
- <scope>provided</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ear-plugin</artifactId>
- <configuration>
- <modules>
- <ejbModule>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>itest-contribution-jee-samples-7-ejb-nonenhanced</artifactId>
- <bundleDir>/</bundleDir>
- </ejbModule>
- <webModule>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>itest-contribution-jee-samples-1-war-nonenhanced</artifactId>
- <bundleDir>/</bundleDir>
- </webModule>
- </modules>
- </configuration>
- </plugin>
- </plugins>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite b/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite
deleted file mode 100644
index fa9a66af7f..0000000000
--- a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="Calculator">
-
- <component name="HelloworldServiceComponent">
- <implementation.ejb ejb-link="itest-contribution-jee-samples-7-ejb-nonenhanced.jar#HelloworldServiceBean"/>
- <service name="HelloworldService">
- <interface.java interface="sample.ejb3.HelloworldService"/>
- <binding.sca/>
- </service>
- </component>
-
- <service name="TheService" promote="HelloworldServiceComponent/HelloworldService"/>
-
-</composite>
diff --git a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/ear-nonenhanced/pom.xml b/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/ear-nonenhanced/pom.xml
deleted file mode 100644
index 5672a1a8b2..0000000000
--- a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/ear-nonenhanced/pom.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>itest-contribution-jee-samples</artifactId>
- <version>1.5</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-contribution-jee-samples-13-ear-nonenhanced</artifactId>
- <name>Apache Tuscany SCA iTest Contribution Java EE Samples 13</name>
- <packaging>ear</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>1.5</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.0_spec</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>itest-contribution-jee-samples-7-ejb-nonenhanced</artifactId>
- <version>1.5</version>
- <type>ejb</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>itest-contribution-jee-samples-1-war-nonenhanced</artifactId>
- <version>1.5</version>
- <type>war</type>
- <scope>provided</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ear-plugin</artifactId>
- <configuration>
- <modules>
- <ejbModule>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>itest-contribution-jee-samples-7-ejb-nonenhanced</artifactId>
- <bundleDir>/</bundleDir>
- </ejbModule>
- <webModule>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>itest-contribution-jee-samples-1-war-nonenhanced</artifactId>
- <bundleDir>/</bundleDir>
- </webModule>
- </modules>
- </configuration>
- </plugin>
- </plugins>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml b/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml
deleted file mode 100644
index 86e579d0ed..0000000000
--- a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>itest-contribution-jee-samples</artifactId>
- <version>1.5</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-contribution-jee-samples-7-ejb-nonenhanced</artifactId>
- <name>Apache Tuscany SCA iTest Contribution Java EE Samples 7</name>
- <packaging>ejb</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>1.5</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.0_spec</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.0_spec</artifactId>
- <version>1.1.1</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ejb-plugin</artifactId>
- <configuration>
- <ejbVersion>3.0</ejbVersion>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java b/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
deleted file mode 100644
index 0194d1870c..0000000000
--- a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package sample.ejb3;
-
-import javax.ejb.Remote;
-
-/**
- * HelloworldService EJB interface.
- *
- * @version $Rev$ $Date$
- */
-
-@Remote
-public interface HelloworldService {
- String getGreetings(String name);
-}
diff --git a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldServiceBean.java b/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldServiceBean.java
deleted file mode 100644
index 1bf293ec85..0000000000
--- a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldServiceBean.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package sample.ejb3;
-
-import javax.ejb.Stateless;
-
-/**
- * HelloworldService EJB implementation with no SCA enhancement
-
- */
-@Stateless
-public class HelloworldServiceBean implements HelloworldService {
-
- public String getGreetings(String name) {
- String greeting = "Hello " + name;
- System.out.println(greeting);
- return greeting;
- }
-
-}
diff --git a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml b/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml
deleted file mode 100644
index 7428735903..0000000000
--- a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml
+++ /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"src/main/resources/META-INF/application.xml"
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<ejb:openejb-jar xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ejb="http://openejb.apache.org/xml/ns/openejb-jar-2.2">
- <dep:environment>
- <dep:moduleId>
- <dep:groupId>test</dep:groupId>
- <dep:artifactId>itest-contribution-jee-samples-7-ejb-nonenhanced</dep:artifactId>
- <dep:version>1.0</dep:version>
- <dep:type>jar</dep:type>
- </dep:moduleId>
- <dep:dependencies/>
- <dep:hidden-classes/>
- <dep:non-overridable-classes/>
- </dep:environment>
-</ejb:openejb-jar>
diff --git a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/pom.xml b/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/pom.xml
deleted file mode 100644
index 7516390f90..0000000000
--- a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/pom.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>1.5</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-contribution-jee-samples</artifactId>
- <name>Apache Tuscany SCA iTest Contribution Java EE Samples</name>
-
- <packaging>pom</packaging>
-
- <profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>war-nonenhanced</module>
- <module>war-appcomp-contrib-implicit</module>
- <module>ejb-nonenhanced</module>
- <module>ear-nonenhanced</module>
- <module>ear-appcomp-contrib-implicit</module>
- <module>scajar-ear-nonenhanced</module>
- <module>scajar-ear-appcomp</module>
- </modules>
- </profile>
- </profiles>
-</project>
diff --git a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml b/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml
deleted file mode 100644
index 006ce972a4..0000000000
--- a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>1.5</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>itest-contribution-jee-samples-41-scajar-ear-appcomp</artifactId>
- <name>Apache Tuscany SCA iTest Contribution Java EE Samples 41</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-sca-api</artifactId>
- <version>1.5</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.5</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.0_spec</artifactId>
- <version>1.0</version>
- <scope>provided</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/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java b/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java
deleted file mode 100644
index 0194d1870c..0000000000
--- a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package sample.ejb3;
-
-import javax.ejb.Remote;
-
-/**
- * HelloworldService EJB interface.
- *
- * @version $Rev$ $Date$
- */
-
-@Remote
-public interface HelloworldService {
- String getGreetings(String name);
-}
diff --git a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient.java b/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient.java
deleted file mode 100644
index 6f37c9b272..0000000000
--- a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package sample.pojo;
-
-public interface HelloworldClient {
-
- String getGreetings(String name);
-
-}
diff --git a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java b/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java
deleted file mode 100644
index a38c4a773f..0000000000
--- a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package sample.pojo;
-
-import org.osoa.sca.annotations.Reference;
-
-import sample.ejb3.HelloworldService;
-
-public class HelloworldClientImpl implements HelloworldClient {
-
- @Reference
- protected HelloworldService hwService;
-
- public String getGreetings(String name){
- return hwService.getGreetings(name);
- }
-
-}
diff --git a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite b/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite
deleted file mode 100644
index c847c24c57..0000000000
--- a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="Calculator">
-
- <component name="HelloworlClientComponent">
- <implementation.java class="sample.pojo.HelloworldClientImpl"/>
- <reference name="hwService" target="HelloworlderviceComponent" />
- </component>
-
- <component name="HelloworldServiceComponent">
- <implementation.jee archive="itest-contribution-jee-samples-29-ear-appcomp-contrib-implicit.ear"/>
- </component>
-
-</composite>
diff --git a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml b/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml
deleted file mode 100644
index 0c6fb8daee..0000000000
--- a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>1.5</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>itest-contribution-jee-samples-35-scajar-ear-nonenhanced</artifactId>
- <name>Apache Tuscany SCA iTest Contribution Java EE Samples 35</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-sca-api</artifactId>
- <version>1.5</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.5</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.0_spec</artifactId>
- <version>1.0</version>
- <scope>provided</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/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java b/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
deleted file mode 100644
index 0194d1870c..0000000000
--- a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package sample.ejb3;
-
-import javax.ejb.Remote;
-
-/**
- * HelloworldService EJB interface.
- *
- * @version $Rev$ $Date$
- */
-
-@Remote
-public interface HelloworldService {
- String getGreetings(String name);
-}
diff --git a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java b/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java
deleted file mode 100644
index 6f37c9b272..0000000000
--- a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package sample.pojo;
-
-public interface HelloworldClient {
-
- String getGreetings(String name);
-
-}
diff --git a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java b/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java
deleted file mode 100644
index a38c4a773f..0000000000
--- a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package sample.pojo;
-
-import org.osoa.sca.annotations.Reference;
-
-import sample.ejb3.HelloworldService;
-
-public class HelloworldClientImpl implements HelloworldClient {
-
- @Reference
- protected HelloworldService hwService;
-
- public String getGreetings(String name){
- return hwService.getGreetings(name);
- }
-
-}
diff --git a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite b/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite
deleted file mode 100644
index 068b92dab8..0000000000
--- a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="Calculator">
-
- <component name="HelloworlClientComponent">
- <implementation.java class="sample.pojo.HelloworldClientImpl"/>
- <reference name="hwService" target="HelloworlderviceComponent" />
- </component>
-
- <component name="HelloworldServiceComponent">
- <implementation.jee archive="itest-contribution-jee-samples-13-ear-nonenhanced.ear"/>
- </component>
-
-</composite>
diff --git a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml b/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml
deleted file mode 100644
index 18b3c3921f..0000000000
--- a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>itest-contribution-jee-samples</artifactId>
- <version>1.5</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-contribution-jee-samples-6-war-appcomp-contrib-implicit</artifactId>
- <name>Apache Tuscany SCA iTest Contribution Java EE Samples 6</name>
- <packaging>war</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>1.5</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.0_spec</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- </plugin>
- </plugins>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java b/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java
deleted file mode 100644
index ae8613f8db..0000000000
--- a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/HelloworldEjbServlet.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package sample;
-
-import java.io.IOException;
-import java.io.Writer;
-
-import javax.ejb.EJB;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.osoa.sca.annotations.Reference;
-
-import sample.ejb3.HelloworldService;
-
-/**
- * A servlet that invokes HelloworldService which is an SCA enhanced stateless EJB.
- *
- * @version $Rev$ $Date$
- */
-public class HelloworldEjbServlet extends HttpServlet {
- private static final long serialVersionUID = -4448818871934180718L;
-
- @EJB
- private HelloworldService service;
-
- @Reference
- protected HelloworldService helloworldSca;
-
- @Override
- protected void service(HttpServletRequest request, HttpServletResponse response) throws IOException {
- String name = request.getParameter("name");
- String greeting = service.getGreetings(name);
- String greeting2 = helloworldSca.getGreetings(name.toUpperCase());
-
- Writer out = response.getWriter();
- out.write("<html><head><title>Apache Tuscany Helloworld Web Sample</title></head><body>");
- out.write("<h2>Apache Tuscany Helloworld Web Sample</h2>");
- out.write("This page displays the response got from HelloworldServiceBean, which is a Stateless EJB.");
- out.write("<br>Parameter sent to HelloworldService.getGreeting: "+name);
- out.write(greeting);
- out.write("The following is got by invoking the HelloworldService SCA service provided by the HelloworldServiceBean");
- out.write("<br>Parameter sent to HelloworldService.getGreeting: "+name.toUpperCase());
- out.write(greeting2);
- out.write("</body></html>");
- out.flush();
- out.close();
- }
-}
diff --git a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java b/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java
deleted file mode 100644
index 0194d1870c..0000000000
--- a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package sample.ejb3;
-
-import javax.ejb.Remote;
-
-/**
- * HelloworldService EJB interface.
- *
- * @version $Rev$ $Date$
- */
-
-@Remote
-public interface HelloworldService {
- String getGreetings(String name);
-}
diff --git a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml b/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml
deleted file mode 100644
index 2563c8b7c8..0000000000
--- a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/geronimo-web.xml
+++ /dev/null
@@ -1,49 +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.
--->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2">
- <environment>
- <moduleId>
- <groupId>test</groupId>
- <artifactId>helloworld-web</artifactId>
- <version>1.0</version>
- <type>car</type>
- </moduleId>
- <dependencies>
- <dependency>
- <groupId>test</groupId>
- <artifactId>helloworld-ejb</artifactId>
- <version>1.0</version>
- <type>jar</type>
- </dependency>
- </dependencies>
- <hidden-classes />
- <non-overridable-classes />
- </environment>
- <context-root>helloworld-web</context-root>
- <nam:ejb-ref xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.2">
- <nam:ref-name>ejb/HelloworldServiceBean</nam:ref-name>
- <nam:pattern>
- <nam:groupId>test</nam:groupId>
- <nam:artifactId>helloworld-ejb</nam:artifactId>
- <nam:version>1.0</nam:version>
- <nam:name>HelloworldServiceBean</nam:name>
- </nam:pattern>
- </nam:ejb-ref>
-</web-app> \ No newline at end of file
diff --git a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite b/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.composite
deleted file mode 100644
index 29898fe006..0000000000
--- a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.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"
- targetNamespace="http://sample"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- name="Helloworld-web">
-
- <component name="helloworldWebComponent">
- <implementation.web web-uri="helloworld-web.war"/>
- <reference name="helloworldSca" target="helloworldEjbComponent/HelloworldService">
- <interface.java interface="sample.ejb3.HelloworldService"/>
- </reference>
- </component>
-</composite>
-
diff --git a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml b/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 628588a974..0000000000
--- a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,41 +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>Helloworld Web Sample</display-name>
-
- <servlet>
- <servlet-name>HelloworldEjbServlet</servlet-name>
- <servlet-class>sample.HelloworldEjbServlet</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>HelloworldEjbServlet</servlet-name>
- <url-pattern>/HelloworldEjbServlet</url-pattern>
- </servlet-mapping>
-
- <welcome-file-list id="WelcomeFileList">
- <welcome-file>hello.html</welcome-file>
- </welcome-file-list>
-
-</web-app>
diff --git a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html b/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html
deleted file mode 100644
index 69473543c9..0000000000
--- a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-appcomp-contrib-implicit/src/main/webapp/hello.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<html>
-
-<head>
-<title>Apache Tuscany Helloworld Web Sample</title>
-</head>
-
-<body>
-
-<h2>Apache Tuscany Helloworld Web Sample</h2>
-
-This web page posts the data to <b>HelloworldEjbServlet</b>. The servlet invokes <b>HelloworldServiceBean</b>, which is a Stateless EJB.
-The EJB in turn invokes <b>Helloworld</b> SCA service through proxies injected into EJB fields.
-
-<br/><br/>
-
-<form action="HelloworldEjbServlet" method="post">
- <table>
- <tr>
- <td>Enter your name:</td>
- <td>
- <input type="text" name="name" width="10">
- </td>
- </tr>
- <tr>
- <td align="left" colspan="2">
- <button name="submit" type="submit">getGreeting</button>
- </td>
- </tr>
- </table>
-</form>
-</body>
-</html>
diff --git a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-nonenhanced/pom.xml b/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-nonenhanced/pom.xml
deleted file mode 100644
index a5dcf0a8bd..0000000000
--- a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-nonenhanced/pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>itest-contribution-jee-samples</artifactId>
- <version>1.5</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>itest-contribution-jee-samples-1-war-nonenhanced</artifactId>
- <name>Apache Tuscany SCA iTest Contribution Java EE Samples 1</name>
- <packaging>war</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>1.5</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.0_spec</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- </plugin>
- </plugins>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java b/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java
deleted file mode 100644
index 71055bbdfe..0000000000
--- a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package sample;
-
-import java.io.IOException;
-import java.io.Writer;
-
-import javax.ejb.EJB;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.osoa.sca.annotations.Reference;
-
-import sample.ejb3.HelloworldService;
-
-/**
- * A servlet that invokes HelloworldService which is an SCA enhanced stateless EJB.
- *
- * @version $Rev$ $Date$
- */
-public class HelloworldEjbServlet extends HttpServlet {
- private static final long serialVersionUID = -4448818871934180718L;
-
- @EJB
- private HelloworldService service;
-
- @Override
- protected void service(HttpServletRequest request, HttpServletResponse response) throws IOException {
- String name = request.getParameter("name");
- String greeting = service.getGreetings(name);
- //String greeting2 = helloworldSca.getGreetings(name.toUpperCase());
-
- Writer out = response.getWriter();
- out.write("<html><head><title>Apache Tuscany Helloworld Web Sample</title></head><body>");
- out.write("<h2>Apache Tuscany Helloworld Web Sample</h2>");
- out.write("This page displays the response got from HelloworldServiceBean, which is a Stateless EJB.");
- out.write("<br>Parameter sent to HelloworldService.getGreeting: "+name);
- out.write(greeting);
- out.write("The following is got by invoking the HelloworldService SCA service provided by the HelloworldServiceBean");
- out.write("<br>Parameter sent to HelloworldService.getGreeting: "+name.toUpperCase());
- //out.write(greeting2);
- out.write("</body></html>");
- out.flush();
- out.close();
- }
-}
diff --git a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java b/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
deleted file mode 100644
index 0194d1870c..0000000000
--- a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package sample.ejb3;
-
-import javax.ejb.Remote;
-
-/**
- * HelloworldService EJB interface.
- *
- * @version $Rev$ $Date$
- */
-
-@Remote
-public interface HelloworldService {
- String getGreetings(String name);
-}
diff --git a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml b/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml
deleted file mode 100644
index 2563c8b7c8..0000000000
--- a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml
+++ /dev/null
@@ -1,49 +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.
--->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2">
- <environment>
- <moduleId>
- <groupId>test</groupId>
- <artifactId>helloworld-web</artifactId>
- <version>1.0</version>
- <type>car</type>
- </moduleId>
- <dependencies>
- <dependency>
- <groupId>test</groupId>
- <artifactId>helloworld-ejb</artifactId>
- <version>1.0</version>
- <type>jar</type>
- </dependency>
- </dependencies>
- <hidden-classes />
- <non-overridable-classes />
- </environment>
- <context-root>helloworld-web</context-root>
- <nam:ejb-ref xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.2">
- <nam:ref-name>ejb/HelloworldServiceBean</nam:ref-name>
- <nam:pattern>
- <nam:groupId>test</nam:groupId>
- <nam:artifactId>helloworld-ejb</nam:artifactId>
- <nam:version>1.0</nam:version>
- <nam:name>HelloworldServiceBean</nam:name>
- </nam:pattern>
- </nam:ejb-ref>
-</web-app> \ No newline at end of file
diff --git a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml b/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 628588a974..0000000000
--- a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,41 +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>Helloworld Web Sample</display-name>
-
- <servlet>
- <servlet-name>HelloworldEjbServlet</servlet-name>
- <servlet-class>sample.HelloworldEjbServlet</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>HelloworldEjbServlet</servlet-name>
- <url-pattern>/HelloworldEjbServlet</url-pattern>
- </servlet-mapping>
-
- <welcome-file-list id="WelcomeFileList">
- <welcome-file>hello.html</welcome-file>
- </welcome-file-list>
-
-</web-app>
diff --git a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html b/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html
deleted file mode 100644
index 69473543c9..0000000000
--- a/tags/java/sca/1.5-RC0/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<html>
-
-<head>
-<title>Apache Tuscany Helloworld Web Sample</title>
-</head>
-
-<body>
-
-<h2>Apache Tuscany Helloworld Web Sample</h2>
-
-This web page posts the data to <b>HelloworldEjbServlet</b>. The servlet invokes <b>HelloworldServiceBean</b>, which is a Stateless EJB.
-The EJB in turn invokes <b>Helloworld</b> SCA service through proxies injected into EJB fields.
-
-<br/><br/>
-
-<form action="HelloworldEjbServlet" method="post">
- <table>
- <tr>
- <td>Enter your name:</td>
- <td>
- <input type="text" name="name" width="10">
- </td>
- </tr>
- <tr>
- <td align="left" colspan="2">
- <button name="submit" type="submit">getGreeting</button>
- </td>
- </tr>
- </table>
-</form>
-</body>
-</html>