[jboss-cvs] JBossAS SVN: r71520 - in trunk/testsuite: imports and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Mar 31 17:02:27 EDT 2008
Author: smcgowan at redhat.com
Date: 2008-03-31 17:02:27 -0400 (Mon, 31 Mar 2008)
New Revision: 71520
Added:
trunk/testsuite/imports/sections/ee5client.xml
trunk/testsuite/src/resources/ee5client/
trunk/testsuite/src/resources/ee5client/Manifest
trunk/testsuite/src/resources/ee5client/application-client.xml
trunk/testsuite/src/resources/ee5client/application.xml
trunk/testsuite/src/resources/ee5client/ee5client-jms-service.xml
trunk/testsuite/src/resources/ee5client/jboss-client.xml
trunk/testsuite/src/resources/ee5client/simpleresource/
trunk/testsuite/src/resources/ee5client/simpleresource/application-client.xml
Modified:
trunk/testsuite/build.xml
trunk/testsuite/imports/test-jars.xml
trunk/testsuite/src/main/org/jboss/test/ee5client/unit/AppClientUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/ee5client/unit/SimpleResourceEarUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/ee5client/unit/SimpleResourceUnitTestCase.java
Log:
add build files for org.jboss.test.ee5client, change tests-aspects to use JDK 5 or higher
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2008-03-31 20:57:09 UTC (rev 71519)
+++ trunk/testsuite/build.xml 2008-03-31 21:02:27 UTC (rev 71520)
@@ -955,7 +955,7 @@
<target name="jboss-all-config-tests"
description="The units tests which are run against the jboss all config" depends="init">
<server:start name="all"/>
- <antcall target="tests-standard-unit"/>
+ <antcall target="tests-standard-unit"/>
<antcall target="tests-client-unit"/>
<antcall target="tests-security-basic-unit"/>
<antcall target="tests-standard-stress"/>
@@ -2320,8 +2320,7 @@
<delete file="${jboss.dist}/bin/pluggable-instrumentor.jar"/>
</target>
<target name="tests-aop-scoped-generated-advisor"
- description="AOP tests requiring a native classloader hook for JDK 5.0"
- if="HAVE_JDK_1.5">
+ description="AOP tests requiring a native classloader hook for JDK 5.0">
<!-- copy across the pluggable instrumentor -->
<copy todir="${jboss.dist}/bin" file="${jboss.aop.lib}/pluggable-instrumentor.jar"/>
@@ -2907,27 +2906,10 @@
<server:stop name="node1"/>
</target>
- <target name="tests-aspects"
- depends="tests-aspects-14, tests-aspects-15"
- description="Runs the aspects tests against ALL configuration"/>
-
<property name="aspects.root" value="${project.root}/aspects"/>
- <condition property="aspects-14">
- <not>
- <isset property="HAVE_JDK_1.5"/>
- </not>
- </condition>
- <condition property="aspects-15">
- <isset property="HAVE_JDK_1.5"/>
- </condition>
-
- <target name="tests-aspects-14" if="aspects-14">
- <ant antfile="${aspects.root}/build-test.xml" inheritAll="false" dir="${aspects.root}"/>
- <ant antfile="${aspects.root}/build-test.xml" inheritAll="false" dir="${aspects.root}" target="tests"/>
- </target>
-
- <target name="tests-aspects-15" if="aspects-15">
+ <target name="tests-aspects"
+ description="Runs the aspects tests against ALL configuration">
<ant antfile="${aspects.root}/build-test50.xml" inheritAll="false" dir="${aspects.root}"/>
<ant antfile="${aspects.root}/build-test50.xml" inheritAll="false" dir="${aspects.root}" target="tests"/>
</target>
Added: trunk/testsuite/imports/sections/ee5client.xml
===================================================================
--- trunk/testsuite/imports/sections/ee5client.xml (rev 0)
+++ trunk/testsuite/imports/sections/ee5client.xml 2008-03-31 21:02:27 UTC (rev 71520)
@@ -0,0 +1,54 @@
+<project name="tests-ee5client-jars">
+<target name="_jars-ee5client">
+ <mkdir dir="${build.lib}"/>
+
+ <jar jarfile="${build.lib}/ee5client-test-client.jar" manifest="${build.resources}/ee5client/Manifest">
+ <zipfileset prefix="META-INF" dir="${build.resources}/ee5client">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </zipfileset>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/ee5client/HelloWorldService.class"/>
+ <include name="org/jboss/test/ee5client/client/HelloWorldClient.class"/>
+ </fileset>
+ </jar>
+
+ <jar jarfile="${build.lib}/ee5client-test.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/ee5client/unit/*.class"/>
+ </fileset>
+ </jar>
+
+ <ear appxml="${build.resources}/ee5client/application.xml" earfile="${build.lib}/ee5client-test.ear">
+ <fileset dir="${build.lib}">
+ <include name="ee5client-test-client.jar"/>
+ <include name="ee5client-test.jar"/>
+ </fileset>
+ </ear>
+
+ <jar jarfile="${build.lib}/ee5client-simpleresource-client.jar">
+ <manifest>
+ <attribute name="Main-Class" value="org.jboss.test.ee5client.client.SimpleResourceClient"/>
+ </manifest>
+ <zipfileset prefix="META-INF" dir="${build.resources}/ee5client/simpleresource">
+ <include name="application-client.xml"/>
+ </zipfileset>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/ee5client/client/SimpleResourceClient.class"/>
+ </fileset>
+ </jar>
+
+ <jar jarfile="${build.lib}/ee5client-simpleresource.ear">
+ <fileset dir="${build.lib}">
+ <include name="ee5client-simpleresource-client.jar"/>
+ </fileset>
+ </jar>
+
+ <copy todir="${build.lib}">
+ <fileset dir="${build.resources}/ee5client">
+ <include name="ee5client-jms-service.xml"/>
+ </fileset>
+ </copy>
+ </target>
+
+</project>
Property changes on: trunk/testsuite/imports/sections/ee5client.xml
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/testsuite/imports/test-jars.xml
===================================================================
--- trunk/testsuite/imports/test-jars.xml 2008-03-31 20:57:09 UTC (rev 71519)
+++ trunk/testsuite/imports/test-jars.xml 2008-03-31 21:02:27 UTC (rev 71520)
@@ -21,6 +21,7 @@
<import file="sections/dbtest.xml"/>
<import file="sections/deadlock.xml"/>
<import file="sections/deployers.xml"/>
+ <import file="sections/ee5client.xml"/>
<import file="sections/ejbconf.xml"/>
<import file="sections/entity.xml"/>
<import file="sections/exception.xml"/>
@@ -99,6 +100,7 @@
_jars-deadlock,
_jars-deployers,
_jars-deployment,
+ _jars-ee5client,
_jars-ejbconf,
_jars-entity,
_jars-entitydepends,
Modified: trunk/testsuite/src/main/org/jboss/test/ee5client/unit/AppClientUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ee5client/unit/AppClientUnitTestCase.java 2008-03-31 20:57:09 UTC (rev 71519)
+++ trunk/testsuite/src/main/org/jboss/test/ee5client/unit/AppClientUnitTestCase.java 2008-03-31 21:02:27 UTC (rev 71520)
@@ -45,7 +45,7 @@
public void test1() throws Throwable
{
String mainClassName = HelloWorldClient.class.getName();
- String applicationClientName = "applicationclient_test"; // must match JNDI name in jboss-client.xml or display-name in application-client.xml
+ String applicationClientName = "ee5client_test"; // must match JNDI name in jboss-client.xml or display-name in application-client.xml
String name = new Date().toString();
String args[] = { name };
@@ -67,7 +67,7 @@
public static Test suite() throws Exception
{
- return getDeploySetup(AppClientUnitTestCase.class, "appclient-jms-service.xml,appclient-test.ear");
+ return getDeploySetup(AppClientUnitTestCase.class, "ee5client-jms-service.xml,ee5client-test.ear");
//return getDeploySetup(AppClientUnitTestCase.class, "appclient-test.jar,appclient-test-client.jar");
}
}
Modified: trunk/testsuite/src/main/org/jboss/test/ee5client/unit/SimpleResourceEarUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ee5client/unit/SimpleResourceEarUnitTestCase.java 2008-03-31 20:57:09 UTC (rev 71519)
+++ trunk/testsuite/src/main/org/jboss/test/ee5client/unit/SimpleResourceEarUnitTestCase.java 2008-03-31 21:02:27 UTC (rev 71520)
@@ -53,7 +53,7 @@
*/
public void testJNDI() throws Exception
{
- String clientName = "appclient-simpleresource-client";
+ String clientName = "ee5client-simpleresource-client";
Context ctx = getInitialContext();
try
{
@@ -95,7 +95,7 @@
public void testClientLauncher() throws Throwable
{
String mainClassName = SimpleResourceClient.class.getName();
- String applicationClientName = "appclient-simpleresource-client"; // must match JNDI name in jboss-client.xml or display-name in application-client.xml
+ String applicationClientName = "ee5client-simpleresource-client"; // must match JNDI name in jboss-client.xml or display-name in application-client.xml
String args[] = { };
ClientLauncher launcher = new ClientLauncher();
@@ -104,7 +104,7 @@
public static Test suite() throws Exception
{
- return getDeploySetup(SimpleResourceEarUnitTestCase.class, "appclient-simpleresource.ear");
+ return getDeploySetup(SimpleResourceEarUnitTestCase.class, "ee5client-simpleresource.ear");
}
}
Modified: trunk/testsuite/src/main/org/jboss/test/ee5client/unit/SimpleResourceUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ee5client/unit/SimpleResourceUnitTestCase.java 2008-03-31 20:57:09 UTC (rev 71519)
+++ trunk/testsuite/src/main/org/jboss/test/ee5client/unit/SimpleResourceUnitTestCase.java 2008-03-31 21:02:27 UTC (rev 71520)
@@ -51,7 +51,7 @@
*/
public void testJNDI() throws Exception
{
- String clientName = "appclient-simpleresource-client";
+ String clientName = "ee5client-simpleresource-client";
Context ctx = getInitialContext();
try
{
@@ -93,7 +93,7 @@
public void testClientLauncher() throws Throwable
{
String mainClassName = SimpleResourceClient.class.getName();
- String applicationClientName = "appclient-simpleresource-client"; // must match JNDI name in jboss-client.xml or display-name in application-client.xml
+ String applicationClientName = "ee5client-simpleresource-client"; // must match JNDI name in jboss-client.xml or display-name in application-client.xml
String args[] = { };
ClientLauncher launcher = new ClientLauncher();
@@ -102,7 +102,7 @@
public static Test suite() throws Exception
{
- return getDeploySetup(SimpleResourceUnitTestCase.class, "appclient-simpleresource-client.jar");
+ return getDeploySetup(SimpleResourceUnitTestCase.class, "ee5client-simpleresource-client.jar");
}
}
Added: trunk/testsuite/src/resources/ee5client/Manifest
===================================================================
--- trunk/testsuite/src/resources/ee5client/Manifest (rev 0)
+++ trunk/testsuite/src/resources/ee5client/Manifest 2008-03-31 21:02:27 UTC (rev 71520)
@@ -0,0 +1 @@
+Main-Class: org.jboss.test.ee5client.client.HelloWorldClient
Added: trunk/testsuite/src/resources/ee5client/application-client.xml
===================================================================
--- trunk/testsuite/src/resources/ee5client/application-client.xml (rev 0)
+++ trunk/testsuite/src/resources/ee5client/application-client.xml 2008-03-31 21:02:27 UTC (rev 71520)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application-client xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/application-client_5.xsd"
+ version="5" id="ee5client-test">
+ <description>EE5 application client unit test</description>
+ <display-name>ee5client-test-client</display-name>
+
+ <env-entry>
+ <env-entry-name>msg</env-entry-name>
+ <env-entry-type>java.lang.String</env-entry-type>
+ <env-entry-value>how are you?</env-entry-value>
+ </env-entry>
+
+ <resource-env-ref>
+ <resource-env-ref-name>messageReplier</resource-env-ref-name>
+ <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
+ </resource-env-ref>
+
+ <post-construct>
+ <lifecycle-callback-method>postConstruct</lifecycle-callback-method>
+ </post-construct>
+
+ <pre-destroy>
+ <lifecycle-callback-method>preDestroy</lifecycle-callback-method>
+ </pre-destroy>
+
+ <callback-handler>org.jboss.test.ee5client.client.TestCallbackHandler</callback-handler>
+</application-client>
Added: trunk/testsuite/src/resources/ee5client/application.xml
===================================================================
--- trunk/testsuite/src/resources/ee5client/application.xml (rev 0)
+++ trunk/testsuite/src/resources/ee5client/application.xml 2008-03-31 21:02:27 UTC (rev 71520)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_5.xsd">
+ <display-name>EE5 client test</display-name>
+ <module>
+ <ejb>ee5client-test.jar</ejb>
+ </module>
+ <module>
+ <java>ee5client-test-client.jar</java>
+ </module>
+</application>
Added: trunk/testsuite/src/resources/ee5client/ee5client-jms-service.xml
===================================================================
--- trunk/testsuite/src/resources/ee5client/ee5client-jms-service.xml (rev 0)
+++ trunk/testsuite/src/resources/ee5client/ee5client-jms-service.xml 2008-03-31 21:02:27 UTC (rev 71520)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+ <mbean code="org.jboss.mq.server.jmx.Queue"
+ name="jboss.mq.destination:service=Queue,name=messageReplier">
+ <attribute name="JNDIName">queue/messageReplier</attribute>
+ <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+ </mbean>
+</server>
Added: trunk/testsuite/src/resources/ee5client/jboss-client.xml
===================================================================
--- trunk/testsuite/src/resources/ee5client/jboss-client.xml (rev 0)
+++ trunk/testsuite/src/resources/ee5client/jboss-client.xml 2008-03-31 21:02:27 UTC (rev 71520)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-client xmlns="http://www.jboss.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/jboss-client_5_0.xsd"
+ version="5.0"
+ id="ee5client-test">
+ <jndi-name>ee5client_test</jndi-name>
+
+ <resource-env-ref>
+ <resource-env-ref-name>messageReplier</resource-env-ref-name>
+ <jndi-name>queue/messageReplier</jndi-name>
+ </resource-env-ref>
+</jboss-client>
Added: trunk/testsuite/src/resources/ee5client/simpleresource/application-client.xml
===================================================================
--- trunk/testsuite/src/resources/ee5client/simpleresource/application-client.xml (rev 0)
+++ trunk/testsuite/src/resources/ee5client/simpleresource/application-client.xml 2008-03-31 21:02:27 UTC (rev 71520)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application-client xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/application-client_5.xsd"
+ version="5">
+ <description>application client unit test</description>
+ <display-name>ee5client-simpleresource-client</display-name>
+ <env-entry>
+ <env-entry-name>msg</env-entry-name>
+ <env-entry-type>java.lang.String</env-entry-type>
+ <env-entry-value>Hello world</env-entry-value>
+ </env-entry>
+</application-client>
More information about the jboss-cvs-commits
mailing list