You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2009/04/21 12:40:48 UTC
svn commit: r767108 - in
/tuscany/branches/sca-java-1.x/itest/contribution-jee-samples: ./
ear-nonenhanced/ ear-nonenhanced/src/ ear-nonenhanced/src/main/
ear-nonenhanced/src/main/resources/
ear-nonenhanced/src/main/resources/META-INF/ ejb-nonenhanced/...
Author: slaws
Date: Tue Apr 21 10:40:47 2009
New Revision: 767108
URL: http://svn.apache.org/viewvc?rev=767108&view=rev
Log:
Start adding some more JEE samples. No guarantee that these actually work yet as I haven't run them in a JEE runtime but a place to start.
Added:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/ (with props)
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/pom.xml (with props)
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/src/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/src/main/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/src/main/resources/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/src/main/resources/META-INF/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/src/main/resources/META-INF/application.xml (with props)
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/src/main/resources/META-INF/geronimo-application.xml (with props)
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/ (with props)
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml (with props)
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java (with props)
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldServiceBean.java (with props)
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml (with props)
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/ (with props)
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/pom.xml (with props)
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/java/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java (with props)
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java (with props)
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml (with props)
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml (with props)
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html (with props)
Modified:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ (props changed)
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/pom.xml
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml
Propchange: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Apr 21 10:40:47 2009
@@ -0,0 +1 @@
+target
Propchange: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Apr 21 10:40:47 2009
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Added: 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=767108&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/pom.xml (added)
+++ tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/pom.xml Tue Apr 21 10:40:47 2009
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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-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.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>
+ <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>
+ <jarModule>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>itest-contribution-jee-samples-7-ejb-nonenhanced</artifactId>
+ <bundleDir>/</bundleDir>
+ </jarModule>
+ <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-nonenhanced/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/src/main/resources/META-INF/application.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/src/main/resources/META-INF/application.xml?rev=767108&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/src/main/resources/META-INF/application.xml (added)
+++ tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/src/main/resources/META-INF/application.xml Tue Apr 21 10:40:47 2009
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_5.xsd" version="5">
+ <description>simple-app ear</description>
+ <display-name>simple-app ear</display-name>
+ <module>
+ <ejb>ejb-nonenhanced.jar</ejb>
+ </module>
+ <module>
+ <web>
+ <web-uri>war-nonenhanced.war</web-uri>
+ <context-root>/webroot</context-root>
+ </web>
+ </module>
+</application>
Propchange: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/src/main/resources/META-INF/application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/src/main/resources/META-INF/application.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/src/main/resources/META-INF/application.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/src/main/resources/META-INF/geronimo-application.xml?rev=767108&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/src/main/resources/META-INF/geronimo-application.xml (added)
+++ tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/src/main/resources/META-INF/geronimo-application.xml Tue Apr 21 10:40:47 2009
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
+ <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+ <moduleId>
+ <groupId>test</groupId>
+ <artifactId>simple-app</artifactId>
+ <version>1.0</version>
+ <type>ear</type>
+ </moduleId>
+ </environment>
+</application>
Propchange: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/src/main/resources/META-INF/geronimo-application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/src/main/resources/META-INF/geronimo-application.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-nonenhanced/src/main/resources/META-INF/geronimo-application.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Apr 21 10:40:47 2009
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Added: 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=767108&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml (added)
+++ tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml Tue Apr 21 10:40:47 2009
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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-7-ejb-nonenhanced</artifactId>
+ <name>Apache Tuscany SCA iTest Contribution Java EE Samples 7</name>
+
+ <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>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ </plugin>
+ </plugins>
+ <finalName>${artifactId}</finalName>
+ </build>
+</project>
Propchange: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java?rev=767108&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java (added)
+++ tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java Tue Apr 21 10:40:47 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/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldServiceBean.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldServiceBean.java?rev=767108&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldServiceBean.java (added)
+++ tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldServiceBean.java Tue Apr 21 10:40:47 2009
@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES 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.annotation.PostConstruct;
+import javax.ejb.Stateless;
+
+import org.osoa.sca.ComponentContext;
+import org.osoa.sca.annotations.ComponentName;
+import org.osoa.sca.annotations.Context;
+import org.osoa.sca.annotations.Property;
+import org.osoa.sca.annotations.Reference;
+
+/**
+ * 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;
+ }
+
+}
Propchange: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldServiceBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/java/sample/ejb3/HelloworldServiceBean.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: 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=767108&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml (added)
+++ tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml Tue Apr 21 10:40:47 2009
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * 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>helloworld-ejb</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>
Propchange: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/src/main/resources/META-INF/openejb-jar.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
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=767108&r1=767107&r2=767108&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 Tue Apr 21 10:40:47 2009
@@ -39,7 +39,10 @@
<activeByDefault>true</activeByDefault>
</activation>
<modules>
+ <module>war-nonenhanced</module>
<module>war-appcomp-contrib-implicit</module>
+ <module>ejb-nonenhanced</module>
+ <module>ear-nonenhanced</module>
</modules>
</profile>
</profiles>
Modified: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml?rev=767108&r1=767107&r2=767108&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml Tue Apr 21 10:40:47 2009
@@ -27,7 +27,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>itest-contribution-jee-samples-6</artifactId>
+ <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>
Propchange: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Apr 21 10:40:47 2009
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Added: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/pom.xml?rev=767108&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/pom.xml (added)
+++ tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/pom.xml Tue Apr 21 10:40:47 2009
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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-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.6-SNAPSHOT</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>
Propchange: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: 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=767108&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java (added)
+++ tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java Tue Apr 21 10:40:47 2009
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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();
+ }
+}
Propchange: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/HelloworldEjbServlet.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java?rev=767108&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java (added)
+++ tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java Tue Apr 21 10:40:47 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/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/java/sample/ejb3/HelloworldService.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml?rev=767108&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml (added)
+++ tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml Tue Apr 21 10:40:47 2009
@@ -0,0 +1,49 @@
+<?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
Propchange: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml?rev=767108&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml (added)
+++ tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml Tue Apr 21 10:40:47 2009
@@ -0,0 +1,41 @@
+<?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>
Propchange: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html?rev=767108&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html (added)
+++ tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html Tue Apr 21 10:40:47 2009
@@ -0,0 +1,50 @@
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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>
Propchange: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/src/main/webapp/hello.html
------------------------------------------------------------------------------
svn:mime-type = text/html