Author: slaws
Date: Sat May 2 11:20:22 2009
New Revision: 770928
URL: http://svn.apache.org/viewvc?rev=770928&view=rev
Log:
TUSCANY-2978 - Add some more sample archives based on the scenarios here
http://cwiki.apache.org/confluence/display/TUSCANYWIKI/Java+EE+Integration
Added:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/
(with props)
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml
(with props)
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite
(with props)
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/
(with props)
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml
(with props)
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java
(with props)
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient.java
(with props)
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java
(with props)
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite
(with props)
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/test/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/test/java/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/
(with props)
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml
(with props)
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
(with props)
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java
(with props)
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java
(with props)
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite
(with props)
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/test/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/test/java/
Removed:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/src/main/resources/
Modified:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/pom.xml
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/pom.xml
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat May 2 11:20:22 2009
@@ -0,0 +1,3 @@
+.project
+.settings
+target
Added:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml?rev=770928&view=auto
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml
(added)
+++
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml
Sat May 2 11:20:22 2009
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.6-SNAPSHOT</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.6-SNAPSHOT</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.6-SNAPSHOT</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.6-SNAPSHOT</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>
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite?rev=770928&view=auto
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite
(added)
+++
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite
Sat May 2 11:20:22 2009
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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>
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/pom.xml?rev=770928&r1=770927&r2=770928&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/pom.xml
(original)
+++
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/pom.xml
Sat May 2 11:20:22 2009
@@ -50,6 +50,7 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>itest-contribution-jee-samples-7-ejb-nonenhanced</artifactId>
<version>1.6-SNAPSHOT</version>
+ <type>ejb</type>
<scope>provided</scope>
</dependency>
@@ -70,11 +71,11 @@
<artifactId>maven-ear-plugin</artifactId>
<configuration>
<modules>
- <jarModule>
+ <ejbModule>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>itest-contribution-jee-samples-7-ejb-nonenhanced</artifactId>
<bundleDir>/</bundleDir>
- </jarModule>
+ </ejbModule>
<webModule>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>itest-contribution-jee-samples-1-war-nonenhanced</artifactId>
Modified:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml?rev=770928&r1=770927&r2=770928&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml
(original)
+++
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml
Sat May 2 11:20:22 2009
@@ -29,6 +29,7 @@
<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>
@@ -51,14 +52,17 @@
<scope>provided</scope>
</dependency>
</dependencies>
-
+
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- </plugin>
+ <finalName>${artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ejb-plugin</artifactId>
+ <configuration>
+ <ejbVersion>3.0</ejbVersion>
+ </configuration>
+ </plugin>
</plugins>
- <finalName>${artifactId}</finalName>
</build>
</project>
Modified:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml?rev=770928&r1=770927&r2=770928&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml
(original)
+++
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml
Sat May 2 11:20:22 2009
@@ -12,7 +12,7 @@
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * "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.
@@ -21,7 +21,7 @@
<dep:environment>
<dep:moduleId>
<dep:groupId>test</dep:groupId>
- <dep:artifactId>helloworld-ejb</dep:artifactId>
+
<dep:artifactId>itest-contribution-jee-samples-7-ejb-nonenhanced</dep:artifactId>
<dep:version>1.0</dep:version>
<dep:type>jar</dep:type>
</dep:moduleId>
Modified: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/pom.xml?rev=770928&r1=770927&r2=770928&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/pom.xml
(original)
+++ tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/pom.xml Sat
May 2 11:20:22 2009
@@ -43,6 +43,9 @@
<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>
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat May 2 11:20:22 2009
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Added:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml?rev=770928&view=auto
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml
(added)
+++
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml
Sat May 2 11:20:22 2009
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.6-SNAPSHOT</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.6-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-java-runtime</artifactId>
+ <version>1.6-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.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>
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java?rev=770928&view=auto
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java
(added)
+++
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java
Sat May 2 11:20:22 2009
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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);
+}
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/ejb3/HelloworldService.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient.java?rev=770928&view=auto
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient.java
(added)
+++
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient.java
Sat May 2 11:20:22 2009
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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);
+
+}
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java?rev=770928&view=auto
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java
(added)
+++
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java
Sat May 2 11:20:22 2009
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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);
+ }
+
+}
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite?rev=770928&view=auto
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite
(added)
+++
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite
Sat May 2 11:20:22 2009
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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>
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat May 2 11:20:22 2009
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Added:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml?rev=770928&view=auto
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml
(added)
+++
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml
Sat May 2 11:20:22 2009
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.6-SNAPSHOT</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.6-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-java-runtime</artifactId>
+ <version>1.6-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.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>
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java?rev=770928&view=auto
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
(added)
+++
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
Sat May 2 11:20:22 2009
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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);
+}
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java?rev=770928&view=auto
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java
(added)
+++
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java
Sat May 2 11:20:22 2009
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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);
+
+}
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClient.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java?rev=770928&view=auto
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java
(added)
+++
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java
Sat May 2 11:20:22 2009
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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);
+ }
+
+}
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/java/sample/pojo/HelloworldClientImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite?rev=770928&view=auto
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite
(added)
+++
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite
Sat May 2 11:20:22 2009
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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>
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java?rev=770928&r1=770927&r2=770928&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java
(original)
+++
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java
Sat May 2 11:20:22 2009
@@ -41,14 +41,11 @@
@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());
+ //String greeting2 = helloworldSca.getGreetings(name.toUpperCase());
Writer out = response.getWriter();
out.write("<html><head><title>Apache Tuscany Helloworld Web
Sample</title></head><body>");
@@ -58,7 +55,7 @@
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(greeting2);
out.write("</body></html>");
out.flush();
out.close();
