[jboss-cvs] JBossAS SVN: r69597 - projects/ejb3/trunk/core.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Feb 4 21:53:08 EST 2008
Author: ALRubinger
Date: 2008-02-04 21:53:08 -0500 (Mon, 04 Feb 2008)
New Revision: 69597
Modified:
projects/ejb3/trunk/core/build-test.xml
projects/ejb3/trunk/core/pom.xml
Log:
Test packaging/scripts in EJB3 Core
Modified: projects/ejb3/trunk/core/build-test.xml
===================================================================
--- projects/ejb3/trunk/core/build-test.xml 2008-02-05 02:44:59 UTC (rev 69596)
+++ projects/ejb3/trunk/core/build-test.xml 2008-02-05 02:53:08 UTC (rev 69597)
@@ -76,9 +76,26 @@
<property name="udpGroup" value=""/>
<!-- Same thing, but passed to the client -->
<property name="jbosstest.udpGroup" value="${udpGroup}"/>
+
+ <!-- Externalized locations -->
+ <property name="location.resources.main" value="${basedir}/src/main/resources"/>
+ <property name="location.resources.test" value="${basedir}/src/test/resourcesALR"/>
+ <property name="location.target" value="${basedir}/target"/>
+ <property name="location.artifact.tests" value="${location.target}/jboss-ejb3-core-tests.jar" />
+ <property name="location.dependencies" value="${location.target}/dependencies"/>
+ <property name="location.dependencies.unpacked" value="${location.dependencies}/unpacked"/>
+ <property name="location.dependencies.unpacked.jboss-test:jboss.test" value="${location.dependencies.unpacked}/jboss-test"/>
+ <property name="location.dependencies.lib" value="${location.dependencies}/lib"/>
+ <property name="location.dependencies.lib.jboss-test:jboss-test" value="${location.dependencies.lib}/jboss-test.jar"/>
+
+ <!-- Define the Path to Server Task Definitions, used by the JBoss Server Run targets -->
+ <path id="server.taskdef.classpath">
+ <pathelement path="${location.dependencies.lib.jboss-test:jboss-test}"/>
+ </path>
<!-- Import the jboss server run targets -->
- <!--import file="target/dependencies/unpacked/jboss-test/server-config.xml"/-->
+ <import file="${location.dependencies.unpacked.jboss-test:jboss.test}/server-config.xml" />
+
<!-- Propagate the dist directory as a jbosstest system property -->
<property name="jbosstest.dist" value="${jboss.dist}"/>
@@ -3931,7 +3948,7 @@
<sysproperty key="jbosstest.deploy.dir" value="${build.lib}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
- <sysproperty key="log4j.configuration" value="file:${resources}/test/log4j.xml"/>
+ <sysproperty key="log4j.configuration" value="file:${basedir}/test/log4.xml"/>
<sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/>
<sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/>
<sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/>
@@ -3954,7 +3971,17 @@
-->
<classpath>
- <path refid="hibernate.hibernate.classpath"/>
+ <fileset dir="${location.dependencies.lib}">
+ <include name="**/*.jar"/>
+ </fileset>
+ <!-- EJB3 TestSuite -->
+ <pathelement path="${location.artifact.tests}" />
+ <!-- JBoss Test Project -->
+ <pathelement path="${location.dependencies.lib.jboss-test:jboss-test}" />
+
+
+
+ <!-- <path refid="hibernate.hibernate.classpath"/>
<pathelement location="${build.classes}"/>
<path refid="${client.run.classpath}"/>
<pathelement location="${resources}/test"/>
@@ -3977,22 +4004,26 @@
<path refid="jboss.jboss.ejb3.impl.classpath"/>
<path refid="jboss.aop.classpath"/>
<path refid="jboss.aspects.classpath"/>
- <path refid="jboss.jbossxb.classpath"/>
+ <path refid="jboss.jbossxb.classpath"/> -->
<!-- for Corba -->
+ <!--
<path refid="jboss.iiop.classpath"/>
<path refid="jacorb.jacorb.classpath"/>
<path refid="apache.avalon.classpath"/>
- <path refid="apache.avalon.logkit.classpath"/>
+ <path refid="apache.avalon.logkit.classpath"/> -->
<!-- EJBTHREE-485 needs javassist -->
- <path refid="javassist.classpath"/>
+ <!--
+ <path refid="javassist.classpath"/> -->
<!-- For clustered entities -->
- <path refid="hsqldb.hsqldb.classpath"/>
+ <!--
+ <path refid="hsqldb.hsqldb.classpath"/> -->
<!-- For JBossWS testing -->
+ <!--
<pathelement path="${sun.jaxb.lib}/jaxb-impl.jar"/>
- <path refid="ibm.wsdl4j.classpath"/>
+ <path refid="ibm.wsdl4j.classpath"/> -->
</classpath>
<formatter type="plain" usefile="true"/>
@@ -4047,7 +4078,7 @@
<sysproperty key="jbosstest.deploy.dir" value="${build.lib}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
- <sysproperty key="log4j.configuration" value="file:${resources}/test/log4j.xml"/>
+ <sysproperty key="log4j.configuration" value="file:${location.resources.test}/test/log4j.xml"/>
<sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/>
<sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/>
<sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/>
Modified: projects/ejb3/trunk/core/pom.xml
===================================================================
--- projects/ejb3/trunk/core/pom.xml 2008-02-05 02:44:59 UTC (rev 69596)
+++ projects/ejb3/trunk/core/pom.xml 2008-02-05 02:53:08 UTC (rev 69597)
@@ -109,7 +109,7 @@
</configuration>
</execution>
- <!-- Copy jboss-test JAR -->
+ <!-- Copy jboss-test JAR -->
<execution>
<id>copy-jboss-test</id>
<phase>process-resources</phase>
@@ -123,14 +123,41 @@
<artifactId>jboss-test</artifactId>
</artifactItem>
</artifactItems>
- <outputDirectory>${project.build.directory}/dependencies/lib/jboss-test</outputDirectory>
+ <outputDirectory>${project.build.directory}/dependencies/lib</outputDirectory>
<overWriteIfNewer>true</overWriteIfNewer>
<stripVersion>true</stripVersion>
</configuration>
</execution>
+
+ <!-- Copy all dependencies -->
+ <execution>
+ <id>copy-core-dependencies</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/dependencies/lib</outputDirectory>
+ <overWriteIfNewer>true</overWriteIfNewer>
+ <stripVersion>true</stripVersion>
+ </configuration>
+ </execution>
</executions>
</plugin>
+
+ <!-- JAR the Tests -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<!-- Temporarily, don't run any tests here -->
<plugin>
More information about the jboss-cvs-commits
mailing list