Author: slaws
Date: Thu May 28 09:20:08 2009
New Revision: 779500
URL: http://svn.apache.org/viewvc?rev=779500&view=rev
Log:
TUSCANY-2978 - tidy contribution jee sample names and add 08
Added:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/
(with props)
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/pom.xml
(with props)
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldLocal8.java
(with props)
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8.java
(with props)
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8Bean.java
(with props)
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/META-INF/
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/META-INF/openejb-jar.xml
(with props)
Modified:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite
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-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldServiceBean.java
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-nonenhanced/pom.xml
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/pom.xml
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-appcomp-contrib-implicit/pom.xml
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/pom.xml
tuscany/branches/sca-java-1.x/itest/contribution-jee/pom.xml
tuscany/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java
tuscany/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipWarAppcompTestCase.java
tuscany/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java
tuscany/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WarAppcompTestCase.java
Modified:
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=779500&r1=779499&r2=779500&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml
(original)
+++
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/pom.xml
Thu May 28 09:20:08 2009
@@ -55,7 +55,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
-
<artifactId>itest-contribution-jee-samples-7-ejb-nonenhanced</artifactId>
+
<artifactId>itest-contribution-jee-samples-08-ejb-enhanced</artifactId>
<version>1.6-SNAPSHOT</version>
<type>ejb</type>
<scope>provided</scope>
@@ -63,7 +63,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
-
<artifactId>itest-contribution-jee-samples-1-war-nonenhanced</artifactId>
+
<artifactId>itest-contribution-jee-samples-01-war-nonenhanced</artifactId>
<version>1.6-SNAPSHOT</version>
<type>war</type>
<scope>provided</scope>
@@ -86,12 +86,12 @@
</jarModule>
<ejbModule>
<groupId>org.apache.tuscany.sca</groupId>
-
<artifactId>itest-contribution-jee-samples-7-ejb-nonenhanced</artifactId>
+
<artifactId>itest-contribution-jee-samples-08-ejb-enhanced</artifactId>
<bundleDir>/</bundleDir>
</ejbModule>
<webModule>
<groupId>org.apache.tuscany.sca</groupId>
-
<artifactId>itest-contribution-jee-samples-1-war-nonenhanced</artifactId>
+
<artifactId>itest-contribution-jee-samples-01-war-nonenhanced</artifactId>
<bundleDir>/</bundleDir>
</webModule>
</modules>
Modified:
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=779500&r1=779499&r2=779500&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite
(original)
+++
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ear-appcomp-contrib-implicit/src/main/application/META-INF/application.composite
Thu May 28 09:20:08 2009
@@ -23,14 +23,17 @@
name="Calculator">
<component name="HelloworldServiceComponent">
- <implementation.ejb
ejb-link="itest-contribution-jee-samples-7-ejb-nonenhanced.jar#HelloworldService7Bean"/>
- <service name="HelloworldService7">
- <interface.java interface="sample.ejb3.HelloworldService7"/>
+ <implementation.ejb
ejb-link="itest-contribution-jee-samples-08-ejb-enhanced.jar#HelloworldService8Bean"/>
+ <service name="HelloworldService8">
+ <interface.java interface="sample.ejb3.HelloworldService8"/>
<binding.sca/>
</service>
+ <reference name="hwReference" target="HelloworldServiceJavaComponent"/>
</component>
- <service name="TheService"
promote="HelloworldServiceComponent/HelloworldService7"/>
+ <service name="TheService"
promote="HelloworldServiceComponent/HelloworldService8"/>
+
+ <reference name="TheReference"
promote="HelloworldServiceComponent/hwReference"/>
<component name="HelloworldServiceJavaComponent">
<implementation.java class="sample.java.HelloworldServiceJavaImpl"/>
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=779500&r1=779499&r2=779500&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
Thu May 28 09:20:08 2009
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
-
<artifactId>itest-contribution-jee-samples-7-ejb-nonenhanced</artifactId>
+
<artifactId>itest-contribution-jee-samples-07-ejb-nonenhanced</artifactId>
<version>1.6-SNAPSHOT</version>
<type>ejb</type>
<scope>provided</scope>
@@ -56,7 +56,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
-
<artifactId>itest-contribution-jee-samples-1-war-nonenhanced</artifactId>
+
<artifactId>itest-contribution-jee-samples-01-war-nonenhanced</artifactId>
<version>1.6-SNAPSHOT</version>
<type>war</type>
<scope>provided</scope>
@@ -73,12 +73,12 @@
<modules>
<ejbModule>
<groupId>org.apache.tuscany.sca</groupId>
-
<artifactId>itest-contribution-jee-samples-7-ejb-nonenhanced</artifactId>
+
<artifactId>itest-contribution-jee-samples-07-ejb-nonenhanced</artifactId>
<bundleDir>/</bundleDir>
</ejbModule>
<webModule>
<groupId>org.apache.tuscany.sca</groupId>
-
<artifactId>itest-contribution-jee-samples-1-war-nonenhanced</artifactId>
+
<artifactId>itest-contribution-jee-samples-01-war-nonenhanced</artifactId>
<bundleDir>/</bundleDir>
</webModule>
</modules>
Modified:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldServiceBean.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldServiceBean.java?rev=779500&r1=779499&r2=779500&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldServiceBean.java
(original)
+++
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-appcomp-contrib-implicit/src/main/java/sample/ejb3/HelloworldServiceBean.java
Thu May 28 09:20:08 2009
@@ -19,12 +19,17 @@
import javax.ejb.Stateless;
+import org.osoa.sca.annotations.Reference;
+
/**
* HelloworldService EJB implementation with no SCA enhancement
*/
@Stateless
public class HelloworldServiceBean implements HelloworldService {
+
+ @Reference
+ protected HelloworldService nextService;
public String getGreetings(String name) {
String greeting = "Hello " + name;
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu May 28 09:20:08 2009
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Added:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/pom.xml?rev=779500&view=auto
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/pom.xml
(added)
+++
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/pom.xml
Thu May 28 09:20:08 2009
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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-08-ejb-enhanced</artifactId>
+ <name>Apache Tuscany SCA iTest Contribution Java EE Samples 08</name>
+ <packaging>ejb</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.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>
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldLocal8.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldLocal8.java?rev=779500&view=auto
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldLocal8.java
(added)
+++
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldLocal8.java
Thu May 28 09:20:08 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.Local;
+
+/**
+ * HelloworldService EJB interface.
+ *
+ * @version $Rev$ $Date$
+ */
+
+...@local
+public interface HelloworldLocal8 {
+ String getGreetingsLocal(String name);
+}
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldLocal8.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldLocal8.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8.java?rev=779500&view=auto
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8.java
(added)
+++
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8.java
Thu May 28 09:20:08 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 HelloworldService8 {
+ String getGreetings(String name);
+}
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8Bean.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8Bean.java?rev=779500&view=auto
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8Bean.java
(added)
+++
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8Bean.java
Thu May 28 09:20:08 2009
@@ -0,0 +1,46 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES 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;
+
+//import org.osoa.sca.annotations.Reference;
+
+/**
+ * HelloworldService EJB implementation SCA enhancement
+
+ */
+...@stateless
+public class HelloworldService8Bean implements HelloworldService8,
HelloworldLocal8 {
+
+ //@Reference
+ //protected HelloworldService8 hwReference;
+
+ public String getGreetings(String name) {
+ String greeting = "Hello remote " + name;
+ System.out.println(greeting);
+ return greeting;
+ }
+
+ public String getGreetingsLocal(String name) {
+ String greeting = "Hello local " + name;
+ System.out.println(greeting);
+ return greeting;
+ }
+
+}
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8Bean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/java/sample/ejb3/HelloworldService8Bean.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/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-enhanced/src/main/resources/META-INF/openejb-jar.xml?rev=779500&view=auto
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/META-INF/openejb-jar.xml
(added)
+++
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/META-INF/openejb-jar.xml
Thu May 28 09:20:08 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"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-08-ejb-enhanced</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-enhanced/src/main/resources/META-INF/openejb-jar.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/META-INF/openejb-jar.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/ejb-enhanced/src/main/resources/META-INF/openejb-jar.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
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=779500&r1=779499&r2=779500&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
Thu May 28 09:20:08 2009
@@ -27,8 +27,8 @@
<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>
+ <artifactId>itest-contribution-jee-samples-07-ejb-nonenhanced</artifactId>
+ <name>Apache Tuscany SCA iTest Contribution Java EE Samples 07</name>
<packaging>ejb</packaging>
<dependencies>
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=779500&r1=779499&r2=779500&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 Thu
May 28 09:20:08 2009
@@ -43,6 +43,7 @@
<module>war-nonenhanced</module>
<module>war-appcomp-contrib-implicit</module>
<module>ejb-nonenhanced</module>
+ <module>ejb-enhanced</module>
<module>ejb-appcomp-contrib-implicit</module>
<module>ear-nonenhanced</module>
<module>ear-appcomp-contrib-implicit</module>
Modified:
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=779500&r1=779499&r2=779500&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite
(original)
+++
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-nonenhanced/src/main/resources/helloworld.composite
Thu May 28 09:20:08 2009
@@ -24,7 +24,7 @@
<component name="HelloworlClientComponent">
<implementation.java class="sample.pojo.HelloworldClientImpl"/>
- <reference name="hwService"
target="HelloworldServiceComponent/HelloworldService7Bean_HelloworldService" />
+ <reference name="hwService"
target="HelloworldServiceComponent/HelloworldService7Bean_HelloworldService7" />
</component>
<component name="HelloworldServiceComponent">
Modified:
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml?rev=779500&r1=779499&r2=779500&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml
(original)
+++
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/scazip-war-appcomp/pom.xml
Thu May 28 09:20:08 2009
@@ -25,8 +25,8 @@
<version>1.6-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
-
<artifactId>itest-contribution-jee-samples-4-scazip-war-appcomp</artifactId>
- <name>Apache Tuscany SCA iTest Contribution Java EE Samples 4</name>
+
<artifactId>itest-contribution-jee-samples-04-scazip-war-appcomp</artifactId>
+ <name>Apache Tuscany SCA iTest Contribution Java EE Samples 04</name>
<repositories>
<repository>
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=779500&r1=779499&r2=779500&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
Thu May 28 09:20:08 2009
@@ -27,8 +27,8 @@
<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>
+
<artifactId>itest-contribution-jee-samples-06-war-appcomp-contrib-implicit</artifactId>
+ <name>Apache Tuscany SCA iTest Contribution Java EE Samples 06</name>
<packaging>war</packaging>
<dependencies>
Modified:
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=779500&r1=779499&r2=779500&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/pom.xml
(original)
+++
tuscany/branches/sca-java-1.x/itest/contribution-jee-samples/war-nonenhanced/pom.xml
Thu May 28 09:20:08 2009
@@ -27,8 +27,8 @@
<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>
+ <artifactId>itest-contribution-jee-samples-01-war-nonenhanced</artifactId>
+ <name>Apache Tuscany SCA iTest Contribution Java EE Samples 01</name>
<packaging>war</packaging>
<dependencies>
Modified: tuscany/branches/sca-java-1.x/itest/contribution-jee/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee/pom.xml?rev=779500&r1=779499&r2=779500&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/contribution-jee/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/itest/contribution-jee/pom.xml Thu May 28
09:20:08 2009
@@ -112,27 +112,34 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
-
<artifactId>itest-contribution-jee-samples-1-war-nonenhanced</artifactId>
+
<artifactId>itest-contribution-jee-samples-01-war-nonenhanced</artifactId>
<version>1.6-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
-
<artifactId>itest-contribution-jee-samples-6-war-appcomp-contrib-implicit</artifactId>
+
<artifactId>itest-contribution-jee-samples-06-war-appcomp-contrib-implicit</artifactId>
<version>1.6-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
-
<artifactId>itest-contribution-jee-samples-7-ejb-nonenhanced</artifactId>
+
<artifactId>itest-contribution-jee-samples-07-ejb-nonenhanced</artifactId>
<version>1.6-SNAPSHOT</version>
<type>ejb</type>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+
<artifactId>itest-contribution-jee-samples-08-ejb-enhanced</artifactId>
+ <version>1.6-SNAPSHOT</version>
+ <type>ejb</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>itest-contribution-jee-samples-12-ejb-appcomp-contrib-implicit</artifactId>
<version>1.6-SNAPSHOT</version>
<type>ejb</type>
Modified:
tuscany/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java?rev=779500&r1=779499&r2=779500&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java
(original)
+++
tuscany/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipEjbAppcompTestCase.java
Thu May 28 09:20:08 2009
@@ -82,7 +82,7 @@
*
*/
@Test
- public void testSCAJarEarNonenhanced() throws Exception {
+ public void testSCAZipEjbAppcomp() throws Exception {
URL contributionLocation = new
File("../contribution-jee-samples/scazip-ejb-appcomp/target/itest-contribution-jee-samples-10-scazip-ejb-appcomp.zip").toURL();
Contribution contribution =
contributionService.contribute(CONTRIBUTION_001_ID, contributionLocation,
false);
Modified:
tuscany/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipWarAppcompTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipWarAppcompTestCase.java?rev=779500&r1=779499&r2=779500&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipWarAppcompTestCase.java
(original)
+++
tuscany/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/SCAZipWarAppcompTestCase.java
Thu May 28 09:20:08 2009
@@ -86,7 +86,7 @@
@Test
public void testSCAJarEarNonenhanced() throws Exception {
- URL contributionLocation = new
File("../contribution-jee-samples/scazip-war-appcomp/target/itest-contribution-jee-samples-4-scazip-war-appcomp.zip").toURL();
+ URL contributionLocation = new
File("../contribution-jee-samples/scazip-war-appcomp/target/itest-contribution-jee-samples-04-scazip-war-appcomp.zip").toURL();
Contribution contribution =
contributionService.contribute(CONTRIBUTION_001_ID, contributionLocation,
false);
Assert.assertNotNull(contribution);
Modified:
tuscany/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java?rev=779500&r1=779499&r2=779500&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java
(original)
+++
tuscany/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WARAppcompContribImplicitTestCase.java
Thu May 28 09:20:08 2009
@@ -78,7 +78,7 @@
*/
@Test
public void testWARAppcompContribImplicit() throws Exception {
- URL contributionLocation = new
File("../contribution-jee-samples/war-appcomp-contrib-implicit/target/itest-contribution-jee-samples-6-war-appcomp-contrib-implicit.war").toURL();
+ URL contributionLocation = new
File("../contribution-jee-samples/war-appcomp-contrib-implicit/target/itest-contribution-jee-samples-06-war-appcomp-contrib-implicit.war").toURL();
contributionService.contribute(CONTRIBUTION_001_ID,
contributionLocation, false);
Assert.assertNotNull(contributionService.getContribution(CONTRIBUTION_001_ID));
}
Modified:
tuscany/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WarAppcompTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WarAppcompTestCase.java?rev=779500&r1=779499&r2=779500&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WarAppcompTestCase.java
(original)
+++
tuscany/branches/sca-java-1.x/itest/contribution-jee/src/test/java/org/apache/tuscany/sca/test/contribution/jee/WarAppcompTestCase.java
Thu May 28 09:20:08 2009
@@ -82,7 +82,7 @@
@Test
public void testEjbAppcom() throws Exception {
- URL contributionLocation = new
File("../contribution-jee-samples/war-appcomp-contrib-implicit/target/itest-contribution-jee-samples-6-war-appcomp-contrib-implicit.war").toURL();
+ URL contributionLocation = new
File("../contribution-jee-samples/war-appcomp-contrib-implicit/target/itest-contribution-jee-samples-06-war-appcomp-contrib-implicit.war").toURL();
Contribution contribution =
contributionService.contribute(CONTRIBUTION_001_ID, contributionLocation,
false);
Assert.assertNotNull(contribution);
