You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2007/04/12 02:06:32 UTC
svn commit: r527730 - in
/incubator/openejb/trunk/openejb3/assembly/openejb-tomcat: maven.xml
pom.xml project.properties src/main/assembly/test.xml
Author: dblevins
Date: Wed Apr 11 17:06:32 2007
New Revision: 527730
URL: http://svn.apache.org/viewvc?view=rev&rev=527730
Log:
the itests function again somewhat in the openejb/tomcat integration
Modified:
incubator/openejb/trunk/openejb3/assembly/openejb-tomcat/maven.xml
incubator/openejb/trunk/openejb3/assembly/openejb-tomcat/pom.xml
incubator/openejb/trunk/openejb3/assembly/openejb-tomcat/project.properties
incubator/openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/assembly/test.xml
Modified: incubator/openejb/trunk/openejb3/assembly/openejb-tomcat/maven.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/assembly/openejb-tomcat/maven.xml?view=diff&rev=527730&r1=527729&r2=527730
==============================================================================
--- incubator/openejb/trunk/openejb3/assembly/openejb-tomcat/maven.xml (original)
+++ incubator/openejb/trunk/openejb3/assembly/openejb-tomcat/maven.xml Wed Apr 11 17:06:32 2007
@@ -33,6 +33,13 @@
<attainGoal name="tomcat.env"/>
</goal>
+ <goal name="tomcat6">
+ <j:set var="tomcat.branch" value="6"/>
+ <j:set var="tomcat.version" value="6.0.10"/>
+ <j:set var="tomcat.prefix" value="apache"/>
+ <attainGoal name="tomcat.env"/>
+ </goal>
+
<goal name="tomcat50">
<j:set var="tomcat.branch" value="5"/>
<j:set var="tomcat.version" value="5.0.30"/>
@@ -183,14 +190,23 @@
<attainGoal name="setup:tomcat"/>
<attainGoal name="setup:loader-webapp"/>
<attainGoal name="setup:itests"/>
- <!--<attainGoal name="start:tomcat"/>-->
+ <attainGoal name="start:tomcat"/>
+ <java jar="target/openejb-tomcat-${openejb.version}-test.jar" fork="yes">
+ <sysproperty key="openejb.home" value="target/openejb-${openejb.version}"/>
+ <sysproperty key="tomcat.home" value="${tomcat.home}"/>
+ <sysproperty key="remote.servlet.url" value="http://127.0.0.1:8080/openejb/remote"/>
+ <arg value="tomcat"/>
+ </java>
+ <attainGoal name="stop:tomcat"/>
+ </goal>
+
+ <goal name="test:client">
<java jar="target/openejb-tomcat-${openejb.version}-test.jar" fork="yes">
<sysproperty key="openejb.home" value="target/openejb-${openejb.version}"/>
<sysproperty key="tomcat.home" value="${tomcat.home}"/>
<sysproperty key="remote.servlet.url" value="http://127.0.0.1:8080/openejb/remote"/>
<arg value="tomcat"/>
</java>
- <!--<attainGoal name="stop:tomcat"/>-->
</goal>
<goal name="itest:all">
Modified: incubator/openejb/trunk/openejb3/assembly/openejb-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/assembly/openejb-tomcat/pom.xml?view=diff&rev=527730&r1=527729&r2=527730
==============================================================================
--- incubator/openejb/trunk/openejb3/assembly/openejb-tomcat/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/assembly/openejb-tomcat/pom.xml Wed Apr 11 17:06:32 2007
@@ -60,6 +60,11 @@
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-loader</artifactId>
<version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-core</artifactId>
+ <version>${version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.modules</groupId>
@@ -67,10 +72,6 @@
</exclusion>
<exclusion>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-transaction</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-webservices</artifactId>
</exclusion>
<exclusion>
@@ -85,12 +86,27 @@
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-security</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-core</artifactId>
- <version>${version}</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxr_1.0_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-saaj_1.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
@@ -109,16 +125,28 @@
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>openejb-loader</artifactId>
+ <artifactId>openejb-hsql</artifactId>
<version>${version}</version>
</dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.openejb</groupId>-->
+ <!--<artifactId>openejb-activemq</artifactId>-->
+ <!--<version>${version}</version>-->
+ <!--</dependency>-->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.2.1.6</version>
</dependency>
<dependency>
- <groupId>idb</groupId>
- <artifactId>idb</artifactId>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-http</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-telnet</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -127,13 +155,13 @@
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>openejb-itests-beans</artifactId>
+ <artifactId>openejb-itests-client</artifactId>
<version>${version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>openejb-itests-client</artifactId>
+ <artifactId>openejb-itests-beans</artifactId>
<version>${version}</version>
<scope>test</scope>
</dependency>
Modified: incubator/openejb/trunk/openejb3/assembly/openejb-tomcat/project.properties
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/assembly/openejb-tomcat/project.properties?view=diff&rev=527730&r1=527729&r2=527730
==============================================================================
--- incubator/openejb/trunk/openejb3/assembly/openejb-tomcat/project.properties (original)
+++ incubator/openejb/trunk/openejb3/assembly/openejb-tomcat/project.properties Wed Apr 11 17:06:32 2007
@@ -14,4 +14,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-openejb.version=3.0-SNAPSHOT
+openejb.version=3.0-incubating-SNAPSHOT
Modified: incubator/openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/assembly/test.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/assembly/test.xml?view=diff&rev=527730&r1=527729&r2=527730
==============================================================================
--- incubator/openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/assembly/test.xml (original)
+++ incubator/openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/assembly/test.xml Wed Apr 11 17:06:32 2007
@@ -28,7 +28,12 @@
<unpack>true</unpack>
<includes>
<include>org.apache.geronimo.specs:geronimo-ejb_3.0_spec</include>
- <include>org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-interceptor_3.0_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
+ <include>org.apache.xbean:xbean-finder</include>
+ <include>asm:asm</include>
<include>junit:junit</include>
<include>org.apache.openejb:openejb-itests-beans</include>
<include>org.apache.openejb:openejb-itests-client</include>