Author: dain
Date: Wed Sep 19 19:12:25 2007
New Revision: 577503
URL: http://svn.apache.org/viewvc?rev=577503&view=rev
Log:
Merging 577186 from trunk
Moved itest web archive and standalone client from openejb-tomcat module to
separate projects under itests
Changed openejb-tomcat to build a war file instead of a zip
Added:
openejb/branches/3.0-beta-1/assembly/openejb-tomcat/src/main/assembly/war.xml
- copied unchanged from r577186,
openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/assembly/war.xml
openejb/branches/3.0-beta-1/itests/openejb-itests-standalone-client/
(props changed)
- copied from r577186,
openejb/trunk/openejb3/itests/openejb-itests-standalone-client/
openejb/branches/3.0-beta-1/itests/openejb-itests-standalone-client/pom.xml
- copied unchanged from r577186,
openejb/trunk/openejb3/itests/openejb-itests-standalone-client/pom.xml
openejb/branches/3.0-beta-1/itests/openejb-itests-standalone-client/src/
- copied from r577186,
openejb/trunk/openejb3/itests/openejb-itests-standalone-client/src/
openejb/branches/3.0-beta-1/itests/openejb-itests-standalone-client/src/main/
- copied from r577186,
openejb/trunk/openejb3/itests/openejb-itests-standalone-client/src/main/
openejb/branches/3.0-beta-1/itests/openejb-itests-standalone-client/src/main/assembly/
- copied from r577186,
openejb/trunk/openejb3/itests/openejb-itests-standalone-client/src/main/assembly/
openejb/branches/3.0-beta-1/itests/openejb-itests-standalone-client/src/main/assembly/client.xml
- copied unchanged from r577186,
openejb/trunk/openejb3/itests/openejb-itests-standalone-client/src/main/assembly/client.xml
openejb/branches/3.0-beta-1/itests/openejb-itests-web/ (props changed)
- copied from r577186, openejb/trunk/openejb3/itests/openejb-itests-web/
openejb/branches/3.0-beta-1/itests/openejb-itests-web/pom.xml
- copied unchanged from r577186,
openejb/trunk/openejb3/itests/openejb-itests-web/pom.xml
openejb/branches/3.0-beta-1/itests/openejb-itests-web/src/
- copied from r577186,
openejb/trunk/openejb3/itests/openejb-itests-web/src/
openejb/branches/3.0-beta-1/itests/openejb-itests-web/src/main/
- copied from r577186,
openejb/trunk/openejb3/itests/openejb-itests-web/src/main/
openejb/branches/3.0-beta-1/itests/openejb-itests-web/src/main/assembly/
- copied from r577186,
openejb/trunk/openejb3/itests/openejb-itests-web/src/main/assembly/
openejb/branches/3.0-beta-1/itests/openejb-itests-web/src/main/assembly/war.xml
- copied unchanged from r577186,
openejb/trunk/openejb3/itests/openejb-itests-web/src/main/assembly/war.xml
Removed:
openejb/branches/3.0-beta-1/assembly/openejb-tomcat/src/main/assembly/bin.xml
openejb/branches/3.0-beta-1/assembly/openejb-tomcat/src/main/assembly/itests.xml
openejb/branches/3.0-beta-1/assembly/openejb-tomcat/src/main/assembly/test.xml
Modified:
openejb/branches/3.0-beta-1/assembly/openejb-tomcat/maven.xml
openejb/branches/3.0-beta-1/assembly/openejb-tomcat/pom.xml
openejb/branches/3.0-beta-1/itests/pom.xml
Modified: openejb/branches/3.0-beta-1/assembly/openejb-tomcat/maven.xml
URL:
http://svn.apache.org/viewvc/openejb/branches/3.0-beta-1/assembly/openejb-tomcat/maven.xml?rev=577503&r1=577502&r2=577503&view=diff
==============================================================================
--- openejb/branches/3.0-beta-1/assembly/openejb-tomcat/maven.xml (original)
+++ openejb/branches/3.0-beta-1/assembly/openejb-tomcat/maven.xml Wed Sep 19
19:12:25 2007
@@ -182,14 +182,9 @@
<!--======================-->
<goal name="setup:loader-webapp">
- <!-- Unzip webapp and set openejb.home -->
- <unjar src="${basedir}/target/openejb-tomcat-${openejb.version}-bin.zip"
dest="${tomcat.webapps}"/>
- <!--<delete file="${tomcat.home}/lib/annotations-api.jar"/>-->
-
- <!--<u:file var="fileAsFile"
name="${tomcat.dist}/conf/Catalina/localhost"/>-->
- <!--<j:if test="${!(fileAsFile.exists())}">-->
- <!--<move file="${tomcat.webapps}/openejb/openejb.xml"
todir="${tomcat.home}/conf/Catalina/localhost"/>-->
- <!--</j:if>-->
+ <!-- Unzip openejb war -->
+ <mkdir dir="${tomcat.webapps}/openejb"/>
+ <unjar src="${basedir}/target/openejb-tomcat-${openejb.version}.war"
dest="${tomcat.webapps}/openejb"/>
</goal>
<goal name="setup:itests">
@@ -205,7 +200,7 @@
<goal name="setup:itests-war">
<j:set var="targetDir" value="${basedir}/target/"/>
- <j:set var="itests.war"
value="openejb-tomcat-${openejb.version}-itests.war"/>
+ <j:set var="itests.war"
value="openejb-itests-web-${openejb.version}.war"/>
<u:file var="fileAsFile" name="${tomcat.home}/webapps/itests.war"/>
<j:if test="${!(fileAsFile.exists())}">
@@ -245,7 +240,7 @@
<attainGoal name="setup:loader-webapp"/>
<attainGoal name="setup:itests-war"/>
<attainGoal name="start:tomcat"/>
- <java jar="target/openejb-tomcat-${openejb.version}-test.jar" fork="yes">
+ <java
jar="target/openejb-itests-standalone-client-${openejb.version}.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"/>
@@ -255,7 +250,7 @@
</goal>
<goal name="test:client">
- <java jar="target/openejb-tomcat-${openejb.version}-test.jar" fork="yes">
+ <java
jar="target/openejb-itests-standalone-client-${openejb.version}.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"/>
Modified: openejb/branches/3.0-beta-1/assembly/openejb-tomcat/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/branches/3.0-beta-1/assembly/openejb-tomcat/pom.xml?rev=577503&r1=577502&r2=577503&view=diff
==============================================================================
--- openejb/branches/3.0-beta-1/assembly/openejb-tomcat/pom.xml (original)
+++ openejb/branches/3.0-beta-1/assembly/openejb-tomcat/pom.xml Wed Sep 19
19:12:25 2007
@@ -42,18 +42,40 @@
</execution>
</executions>
<configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- <descriptor>src/main/assembly/test.xml</descriptor>
- <descriptor>src/main/assembly/itests.xml</descriptor>
- </descriptors>
- <archive>
- <manifest>
- <mainClass>org.apache.openejb.test.Main</mainClass>
- </manifest>
- </archive>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptor>src/main/assembly/war.xml</descriptor>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-itests-standalone-client</artifactId>
+ <version>${version}</version>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-itests-web</artifactId>
+ <version>${version}</version>
+ <type>war</type>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<dependencies>
@@ -125,11 +147,6 @@
<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.derby</groupId>
<artifactId>derby</artifactId>
Propchange: openejb/branches/3.0-beta-1/itests/openejb-itests-standalone-client/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Sep 19 19:12:25 2007
@@ -0,0 +1,10 @@
+*.iws
+*.ipr
+*.iml
+.classpath
+.project
+.settings
+*.log
+junit*.properties
+target
+bin
Propchange: openejb/branches/3.0-beta-1/itests/openejb-itests-web/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Sep 19 19:12:25 2007
@@ -0,0 +1,10 @@
+*.iws
+*.ipr
+*.iml
+.classpath
+.project
+.settings
+*.log
+junit*.properties
+target
+bin
Modified: openejb/branches/3.0-beta-1/itests/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/branches/3.0-beta-1/itests/pom.xml?rev=577503&r1=577502&r2=577503&view=diff
==============================================================================
--- openejb/branches/3.0-beta-1/itests/pom.xml (original)
+++ openejb/branches/3.0-beta-1/itests/pom.xml Wed Sep 19 19:12:25 2007
@@ -35,5 +35,7 @@
<module>openejb-itests-beans</module>
<module>openejb-itests-interceptor-beans</module>
<module>openejb-itests-app</module>
+ <module>openejb-itests-web</module>
+ <module>openejb-itests-standalone-client</module>
</modules>
</project>
