Author: jlaskowski
Date: Sun Dec 9 11:26:17 2007
New Revision: 602726
URL: http://svn.apache.org/viewvc?rev=602726&view=rev
Log:
Run itest using the following command
mvn clean integration-test -P itest
The old, maven1 descriptors are no longer needed (having a m2 plugin to run
openejb would be handy)
Removed:
openejb/trunk/openejb3/assembly/openejb-standalone/maven.xml
openejb/trunk/openejb3/assembly/openejb-standalone/project.properties
Modified:
openejb/trunk/openejb3/assembly/openejb-standalone/assembly.sh
openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml
Modified: openejb/trunk/openejb3/assembly/openejb-standalone/assembly.sh
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-standalone/assembly.sh?rev=602726&r1=602725&r2=602726&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-standalone/assembly.sh (original)
+++ openejb/trunk/openejb3/assembly/openejb-standalone/assembly.sh Sun Dec 9
11:26:17 2007
@@ -15,4 +15,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-mvn clean:clean assembly:assembly && tar tzvf
target/openejb-3.0-SNAPSHOT-bin.tar.gz
+mvn clean assembly:assembly && tar tzvf
target/openejb-3.0.0-SNAPSHOT-bin.tar.gz
Modified: openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml?rev=602726&r1=602725&r2=602726&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml Sun Dec 9
11:26:17 2007
@@ -61,7 +61,8 @@
</execution>
</executions>
</plugin>
- <plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.2</version>
<executions>
@@ -74,7 +75,8 @@
</execution>
</executions>
</plugin>
- <plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.1</version>
<executions>
@@ -89,8 +91,7 @@
<configuration>
<descriptors>
<descriptor>src/main/assembly/bin.xml</descriptor>
- <!-- Creates some bizarre file -->
- <!-- descriptor>src/main/assembly/test.xml</descriptor -->
+ <descriptor>src/main/assembly/test.xml</descriptor>
</descriptors>
<archive>
<manifest>
@@ -190,11 +191,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>
@@ -232,6 +228,7 @@
<id>itest</id>
<properties>
<openejb.debug.suspend>n</openejb.debug.suspend>
+ <openejb.debug.port>5005</openejb.debug.port>
</properties>
<dependencies>
<dependency>
@@ -263,62 +260,40 @@
<goal>run</goal>
</goals>
<configuration>
- <tasks>
- <property name="targetDir" value="${basedir}/target/" />
- <property name="openejb.home"
value="${targetDir}/openejb-${pom.version}" />
- <property name="openejb.dist"
value="${targetDir}/openejb-${pom.version}-bin.zip" />
-
- <unjar src="${openejb.dist}" dest="${targetDir}" />
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>setup:openejb:copy</id>
- <phase>integration-test</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-itests-beans</artifactId>
- <version>${version}</version>
- <type>jar</type>
-
<outputDirectory>${basedir}/target/openejb-${pom.version}/beans</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>test:local</id>
- <phase>integration-test</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <executable>java</executable>
-
<workingDirectory>${project.build.directory}</workingDirectory>
- <arguments>
- <argument>-Dopenejb.home=openejb-${pom.version}</argument>
- <argument>-classpath</argument>
- <classpath />
-
<argument>-agentlib:jdwp=transport=dt_socket,server=y,suspend=${openejb.debug.suspend},address=5005</argument>
- <argument>org.apache.openejb.test.Main</argument>
- <argument>local</argument>
- </arguments>
+ <tasks>
+ <property name="targetDir" value="${basedir}/target/" />
+ <property name="openejb.home"
value="${targetDir}/openejb-${pom.version}" />
+ <property name="openejb.dist"
value="${targetDir}/openejb-${pom.version}-bin.zip" />
+ <property name="openejb.version" value="${pom.version}" />
+
+ <unjar src="${openejb.dist}" dest="${targetDir}" />
+ <copy file="${targetDir}/openejb-${pom.version}-test.jar"
todir="${openejb.home}/apps" />
+
+ <java classname="org.apache.openejb.test.Main" fork="yes">
+ <classpath>
+ <pathelement
location="${targetDir}/openejb-${pom.version}-test.jar" />
+ <fileset dir="${openejb.home}/lib">
+ <include name="*.jar" />
+ </fileset>
+ </classpath>
+ <sysproperty key="openejb.home" value="${openejb.home}"
/>
+ <jvmarg
value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=${openejb.debug.suspend},address=${openejb.debug.port}"
/>
+ <arg value="local" />
+ </java>
+
+ <java jar="target/openejb-${openejb.version}-test.jar"
fork="yes">
+ <sysproperty key="openejb.home" value="${openejb.home}"
/>
+ <jvmarg
value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=${openejb.debug.suspend},address=${openejb.debug.port}"
/>
+ <arg value="remote" />
+ </java>
+
+ <java jar="target/openejb-${openejb.version}-test.jar"
fork="yes">
+ <sysproperty key="openejb.home" value="${openejb.home}"
/>
+ <jvmarg
value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=${openejb.debug.suspend},address=${openejb.debug.port}"
/>
+ <arg value="http"/>
+ </java>
+
+ </tasks>
</configuration>
</execution>
</executions>
