[seam-commits] Seam SVN: r15122 - in branches/community/Seam_2_3: jboss-seam-gen/dist and 4 other directories.

seam-commits at lists.jboss.org seam-commits at lists.jboss.org
Mon Sep 10 15:24:23 EDT 2012


Author: manaRH
Date: 2012-09-10 15:24:23 -0400 (Mon, 10 Sep 2012)
New Revision: 15122

Added:
   branches/community/Seam_2_3/jboss-seam-gen/dist/test/Deployments.java
   branches/community/Seam_2_3/jboss-seam-gen/dist/test/arquillian.xml
Modified:
   branches/community/Seam_2_3/distribution/get-arquillian-libs.xml
   branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/build-war.xml
   branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/build.xml
   branches/community/Seam_2_3/jboss-seam-gen/dist/build.xml
   branches/community/Seam_2_3/jboss-seam-gen/dist/ide-project-files/eclipse/.classpath
   branches/community/Seam_2_3/jboss-seam-gen/dist/ivy/ivy-build.xml
   branches/community/Seam_2_3/jboss-seam-gen/dist/ivy/ivy.settings.xml
   branches/community/Seam_2_3/jboss-seam-gen/dist/test/ActionTest.java
   branches/community/Seam_2_3/jboss-seam-gen/dist/test/FormTest.java
   branches/community/Seam_2_3/jboss-seam-gen/dist/test/readme.txt
Log:
enhanced ARQ test generation in seam-gen JBSEAM-5023

Modified: branches/community/Seam_2_3/distribution/get-arquillian-libs.xml
===================================================================
--- branches/community/Seam_2_3/distribution/get-arquillian-libs.xml	2012-09-10 13:19:48 UTC (rev 15121)
+++ branches/community/Seam_2_3/distribution/get-arquillian-libs.xml	2012-09-10 19:24:23 UTC (rev 15122)
@@ -7,11 +7,13 @@
 	
   <property name="test.lib.dir" location="test" />
   <property name="version.jboss-as7" value="7.1.1.Final"/>
+	<property name="version.arquillian-junit" value="1.0.1.Final"/>
   <target name="copyarq" >
         <mkdir dir="${test.lib.dir}"/>
 		<aether:resolve>
 		    <aether:dependencies>
-		        <aether:dependency groupid="org.jboss.as" artifactid="jboss-as-arquillian-container-managed" version="${version.jboss-as7}" />
+		        <aether:dependency groupid="org.jboss.as" artifactid="jboss-as-arquillian-container-remote" version="${version.jboss-as7}" />
+		    	<aether:dependency groupid="org.jboss.arquillian.junit" artifactid="arquillian-junit-container" version="${version.arquillian-junit}" />
 		    </aether:dependencies>
 		    <files dir="${test.lib.dir}"  layout="{artifactId}-{version}-{classifier}.{extension}" />
 		</aether:resolve>

Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/build-war.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/build-war.xml	2012-09-10 13:19:48 UTC (rev 15121)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/build-war.xml	2012-09-10 19:24:23 UTC (rev 15122)
@@ -40,11 +40,15 @@
     <property name="schema.version" value="@schemaVersion@"/>
     
     <fileset id="lib" dir="${lib.dir}">
-        <include name="*.jar" />
+        <include name="*.jar"/>
     </fileset>
-    
+    <fileset id="testlib" dir="${lib.dir}/test">
+        <include name="*.jar"/>
+     </fileset>
+
     <path id="build.classpath">
-        <fileset refid="lib" />
+        <fileset refid="lib"/>
+        <fileset refid="testlib"/>
     </path>
 
     <!-- Import GlassFish deployment targets -->
@@ -409,11 +413,12 @@
               file="${basedir}/resources/import-test.sql"/>
         <copy tofile="${test.dir}/components.properties" 
               file="${basedir}/resources/components-test.properties"/>
-        <copy todir="${test.dir}" flatten="true">
+<!--        <copy todir="${test.dir}" flatten="true">
             <fileset dir="${src.test.dir}">
                 <include name="**/*Test.xml" />
             </fileset>
         </copy>
+         -->
     </target>
     
     <target name="test" depends="buildtest" description="Run the tests">            
@@ -428,21 +433,21 @@
                 <not><available classname="javax.xml.bind.JAXB"/></not>
             </and>
         </condition>
-        <fail if="incompatible.jdk">You are using an incompatible JDK 6. Please use Sun JDK 6 Update 4 (1.6.0_04) or newer or use Open JDK 6.</fail>
-        <taskdef resource="testngtasks" classpath="${testng.jar}" />
+      <!--  <fail if="incompatible.jdk">You are using an incompatible JDK 6. Please use Sun JDK 6 Update 4 (1.6.0_04) or newer or use Open JDK 6.</fail>
+        <taskdef resource="testngtasks" classpath="${testng.jar}" />-->
         <path id="test.path">
             <path path="${test.dir}" />
             <fileset dir="${lib.dir}/test">
                 <include name="*.jar"/>
             </fileset>
-            <path path="${bootstrap.dir}" />
+<!--            <path path="${bootstrap.dir}" />-->
             <path refid="build.classpath" />
         </path>
-        <testng outputdir="${basedir}/test-report">
+        <!-- <testng outputdir="${basedir}/test-report">
             <jvmarg line="-Dsun.lang.ClassLoader.allowArraySyntax=true"/>
             <classpath refid="test.path" />
             <xmlfileset dir="${test.dir}" includes="*Test.xml" />
-        </testng>
+        </testng>-->
     </target>
 
     <target name="javadoc" depends="compile">
@@ -471,7 +476,7 @@
         <ant antfile="validate.xml" target="validateConfiguration"/>
     </target>
 
-    <target name="purge" depends="undeploy" description="Clean out JBoss AS temporary deployment files">
+   <target name="purge" depends="undeploy" description="Clean out JBoss AS temporary deployment files">
         <delete dir="${jboss.home}/server/default/tmp/deploy"/>
         <mkdir dir="${jboss.home}/server/default/tmp/deploy/"/>
         <delete dir="${jboss.home}/server/default/tmp/sessions"/>

Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/build.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/build.xml	2012-09-10 13:19:48 UTC (rev 15121)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/build-scripts/build.xml	2012-09-10 19:24:23 UTC (rev 15122)
@@ -1,502 +1,516 @@
 <?xml version="1.0"?>
 <project name="@projectName@" default="deploy" basedir=".">
 
-    <!-- Give user a chance to override without editing this file or typing -D -->
-    <property file="${basedir}/build.properties"/>
+	<!-- Give user a chance to override without editing this file or typing -D -->
+	<property file="${basedir}/build.properties"/>
 
-    <property name="profile" value="dev"/>
-    <property file="build-${profile}.properties"/>
+	<property name="profile" value="dev"/>
+	<property file="build-${profile}.properties"/>
 
-    <!-- set global properties for this build -->
-    <property name="project.name" value="@projectName@"/>
-    <property name="project.ear" value="true"/>
-    <property name="richfaces.present" value="true"/>
-    <property name="dist.dir" value="dist"/>
-    <property name="src.model.dir" value="src/main"/>
-    <property name="src.action.dir" value="src/hot"/>
-    <property name="src.test.dir" value="src/test"/>
-    <property name="lib.dir" value="lib"/>
-    <property name="endorsed.dir" value="${lib.dir}/endorsed"/>
-    <property name="ear.dir" value="exploded-archives/${project.name}.ear"/>
-    <property name="exploded.archive.dir" value="${ear.dir}"/>
-    <property name="jar.dir" value="${ear.dir}/${project.name}_jar"/>
-    <property name="war.dir" value="${ear.dir}/${project.name}_war"/>
-    <property name="test.dir" value="test-build"/>
-    <property name="bootstrap.dir" value="${basedir}/bootstrap"/>
-    <property name="jboss.domain" value="standalone"/>
-    <property name="deploy.dir" value="${jboss.home}/${jboss.domain}/deployments"/>
-    <property name="ear.deploy.dir" value="${deploy.dir}/${project.name}.ear"/>
-    <property name="jar.deploy.dir" value="${ear.deploy.dir}/${project.name}.jar"/>
-    <property name="war.deploy.dir" value="${ear.deploy.dir}/${project.name}.war"/>
-    <property name="packaged.archive" value="${dist.dir}/${project.name}.ear"/>
-    <property name="testng.jar" value="${basedir}/lib/testng.jar"/>
-    <property name="javac.debug" value="true"/>
-    <property name="javac.deprecation" value="false"/>
-    <property name="debug" value="false"/>
+	<!-- set global properties for this build -->
+	<property name="project.name" value="@projectName@"/>
+	<property name="project.ear" value="true"/>
+	<property name="richfaces.present" value="true"/>
+	<property name="dist.dir" value="dist"/>
+	<property name="src.model.dir" value="src/main"/>
+	<property name="src.action.dir" value="src/hot"/>
+	<property name="src.test.dir" value="src/test"/>
+	<property name="lib.dir" value="lib"/>
+	<property name="endorsed.dir" value="${lib.dir}/endorsed"/>
+	<property name="ear.dir" value="exploded-archives/${project.name}.ear"/>
+	<property name="exploded.archive.dir" value="${ear.dir}"/>
+	<property name="jar.dir" value="${ear.dir}/${project.name}_jar"/>
+	<property name="war.dir" value="${ear.dir}/${project.name}_war"/>
+	<property name="test.dir" value="test-build"/>
+	<property name="jboss.domain" value="standalone"/>
+	<property name="deploy.dir" value="${jboss.home}/${jboss.domain}/deployments"/>
+	<property name="ear.deploy.dir" value="${deploy.dir}/${project.name}.ear"/>
+	<property name="jar.deploy.dir" value="${ear.deploy.dir}/${project.name}.jar"/>
+	<property name="war.deploy.dir" value="${ear.deploy.dir}/${project.name}.war"/>
+	<property name="packaged.archive" value="${dist.dir}/${project.name}.ear"/>
+<!--	<property name="testng.jar" value="${basedir}/lib/testng.jar"/> -->
+	<property name="javac.debug" value="true"/>
+	<property name="javac.deprecation" value="false"/>
+	<property name="debug" value="false"/>
 
-    <!--Properties for validating configuration files -->
-    <property name="validate.resources.dir" value="${basedir}/exploded-archives"/>
-    <property name="schema.dir" value="${basedir}/exploded-archives/schemas"/>
-    <property name="src.schema.dir" value="${schema.dir}/org/jboss/seam"/>
-    <property name="schema.version" value="@schemaVersion@"/>
+	<!--Properties for validating configuration files -->
+	<property name="validate.resources.dir" value="${basedir}/exploded-archives"/>
+	<property name="schema.dir" value="${basedir}/exploded-archives/schemas"/>
+	<property name="src.schema.dir" value="${schema.dir}/org/jboss/seam"/>
+	<property name="schema.version" value="@schemaVersion@"/>
 
-    <fileset id="lib" dir="${lib.dir}">
+	<fileset id="lib" dir="${lib.dir}">
+		<include name="*.jar"/>
+	</fileset>
+	<fileset id="testlib" dir="${lib.dir}/test">
         <include name="*.jar"/>
-    </fileset>
+     </fileset>
 
     <path id="build.classpath">
         <fileset refid="lib"/>
+        <fileset refid="testlib"/>
     </path>
 
-    <!-- Import GlassFish deployment targets -->
-    <import file="${basedir}/glassfish-build.xml"/>
+	<!-- Import GlassFish deployment targets -->
+	<import file="${basedir}/glassfish-build.xml"/>
 
-    <target name="init" description="Initialize the build">
-        <taskdef name="groovyc"
+	<target name="init" description="Initialize the build">
+		<taskdef name="groovyc"
             classname ="org.codehaus.groovy.ant.Groovyc"
-            classpathref="build.classpath"/> <!-- really only the groovy jar is necessary -->
-        <mkdir dir="${jar.dir}"/>
-        <mkdir dir="${ear.dir}"/>
-        <mkdir dir="${war.dir}"/>
-        <mkdir dir="${dist.dir}"/>
+            classpathref="build.classpath"/>
+		<!-- really only the groovy jar is necessary -->
+		<mkdir dir="${jar.dir}"/>
+		<mkdir dir="${ear.dir}"/>
+		<mkdir dir="${war.dir}"/>
+		<mkdir dir="${dist.dir}"/>
 
-        <condition property="is.debug" value="true">
-            <istrue value="${debug}"/>
-        </condition>
-        <property name="transactionManagerLookupClass" value="org.hibernate.transaction.JBossTransactionManagerLookup"/>
-        <property name="ejbJndiPattern" value="java:app/${project.name}.jar/#{ejbName}"/>
-        <property name="seamBootstrapsPu" value="false"/>
-        <property name="seamEmfRef" value="#{null}"/>
-        <property name="puJndiName" value="java:/${project.name}EntityManagerFactory"/>
+		<condition property="is.debug" value="true">
+			<istrue value="${debug}"/>
+		</condition>
+		<property name="transactionManagerLookupClass" value="org.hibernate.transaction.JBossTransactionManagerLookup"/>
+		<property name="ejbJndiPattern" value="java:app/${project.name}.jar/#{ejbName}"/>
+		<property name="seamBootstrapsPu" value="false"/>
+		<property name="seamEmfRef" value="#{null}"/>
+		<property name="puJndiName" value="java:/${project.name}EntityManagerFactory"/>
 
-        <filterset id="persistence">
-            <filter token="transactionManagerLookupClass" value="${transactionManagerLookupClass}"/>
-        </filterset>
-        <filterset id="seam">
-            <filter token="ejbJndiPattern" value="${ejbJndiPattern}"/>
-            <filter token="seamBootstrapsPu" value="${seamBootstrapsPu}"/>
-            <filter token="seamEmfRef" value="${seamEmfRef}"/>
-            <filter token="puJndiName" value="${puJndiName}"/>
-        </filterset>
-        <filterset id="profile">
-            <filter token="debug" value="${debug}"/>
-        </filterset>
+		<filterset id="persistence">
+			<filter token="transactionManagerLookupClass" value="${transactionManagerLookupClass}"/>
+		</filterset>
+		<filterset id="seam">
+			<filter token="ejbJndiPattern" value="${ejbJndiPattern}"/>
+			<filter token="seamBootstrapsPu" value="${seamBootstrapsPu}"/>
+			<filter token="seamEmfRef" value="${seamEmfRef}"/>
+			<filter token="puJndiName" value="${puJndiName}"/>
+		</filterset>
+		<filterset id="profile">
+			<filter token="debug" value="${debug}"/>
+		</filterset>
 
-        <!-- if a .groovy file is in model or action, set groovy.present -->
-        <available property="groovy.present" value="true" file="" searchparents="true">
-            <filepath>
-                <fileset dir="${src.action.dir}">
-                    <include name="**/*.groovy"/>
-                </fileset>
-                <fileset dir="${src.model.dir}">
-                    <include name="**/*.groovy"/>
-                </fileset>
-            </filepath>
-        </available>
-        <condition property="groovy.test.present" value="true">
-            <or>
-                <isset property="groovy.present"/>
-                <available file="" searchparents="true">
-                    <filepath>
-                        <fileset dir="${src.test.dir}">
-                            <include name="**/*.groovy"/>
-                        </fileset>
-                    </filepath>
-                </available>
-            </or>
-        </condition>
-        <!-- NOTE: Seam does not properly detect uncompiled groovy classes in an EAR -->
-        <condition property="groovy.dynamic" value="true">
-            <and>
-                <isset property="groovy.present"/>
-                <istrue value="${debug}"/>
-            </and>
-        </condition>
-        <condition property="groovy.static" value="true">
-            <and>
-                <isset property="groovy.present"/>
-                <isfalse value="${debug}"/>
-            </and>
-        </condition>
-    </target>
+		<!-- if a .groovy file is in model or action, set groovy.present -->
+		<available property="groovy.present" value="true" file="" searchparents="true">
+			<filepath>
+				<fileset dir="${src.action.dir}">
+					<include name="**/*.groovy"/>
+				</fileset>
+				<fileset dir="${src.model.dir}">
+					<include name="**/*.groovy"/>
+				</fileset>
+			</filepath>
+		</available>
+		<condition property="groovy.test.present" value="true">
+			<or>
+				<isset property="groovy.present"/>
+				<available file="" searchparents="true">
+					<filepath>
+						<fileset dir="${src.test.dir}">
+							<include name="**/*.groovy"/>
+						</fileset>
+					</filepath>
+				</available>
+			</or>
+		</condition>
+		<!-- NOTE: Seam does not properly detect uncompiled groovy classes in an EAR -->
+		<condition property="groovy.dynamic" value="true">
+			<and>
+				<isset property="groovy.present"/>
+				<istrue value="${debug}"/>
+			</and>
+		</condition>
+		<condition property="groovy.static" value="true">
+			<and>
+				<isset property="groovy.present"/>
+				<isfalse value="${debug}"/>
+			</and>
+		</condition>
+	</target>
 
-    <target name="groovy.compile" if="groovy.static">
-        <groovyc classpathref="build.classpath"
+	<target name="groovy.compile" if="groovy.static">
+		<groovyc classpathref="build.classpath"
             destdir="${jar.dir}"
             srcdir="${src.model.dir}">
-        </groovyc>
-        <path id="groovy.action.classpath">
-            <path refid="build.classpath"/>
-            <dirset dir="${jar.dir}"/>
-        </path>
-        <groovyc classpathref="groovy.action.classpath"
+		</groovyc>
+		<path id="groovy.action.classpath">
+			<path refid="build.classpath"/>
+			<dirset dir="${jar.dir}"/>
+		</path>
+		<groovyc classpathref="groovy.action.classpath"
             destdir="${jar.dir}"
             srcdir="${src.action.dir}">
-        </groovyc>
-    </target>
+		</groovyc>
+	</target>
 
-    <target name="groovy.copy" if="groovy.dynamic">
-        <copy todir="${jar.dir}">
-            <fileset dir="${src.action.dir}">
-                <include name="**/*.groovy"/>
-            </fileset>
-        </copy>
-    </target>
+	<target name="groovy.copy" if="groovy.dynamic">
+		<copy todir="${jar.dir}">
+			<fileset dir="${src.action.dir}">
+				<include name="**/*.groovy"/>
+			</fileset>
+		</copy>
+	</target>
 
-    <target name="compile" depends="init,groovy.compile,groovy.copy"
+	<target name="compile" depends="init,groovy.compile,groovy.copy"
         description="Compile the Java source code"
         unless="eclipse.running">
-        <javac classpathref="build.classpath"
+		<javac classpathref="build.classpath"
             destdir="${jar.dir}"
             debug="${javac.debug}"
             deprecation="${javac.deprecation}"
             nowarn="on">
-            <src path="${src.model.dir}"/>
-            <src path="${src.action.dir}"/>
-        </javac>
-    </target>
+			<src path="${src.model.dir}"/>
+			<src path="${src.action.dir}"/>
+		</javac>
+	</target>
 
-    <target name="copyclasses" depends="init"
+	<target name="copyclasses" depends="init"
         description="Copy the classes that were compiled by eclipse"
         if="eclipse.running">
-        <copy todir="${jar.dir}">
-            <fileset dir="classes/main">
-                <include name="**/*.class"/>
-            </fileset>
-            <fileset dir="classes/hot">
-                <include name="**/*.class"/>
-            </fileset>
-        </copy>
-    </target>
+		<copy todir="${jar.dir}">
+			<fileset dir="classes/main">
+				<include name="**/*.class"/>
+			</fileset>
+			<fileset dir="classes/hot">
+				<include name="**/*.class"/>
+			</fileset>
+		</copy>
+	</target>
 
-    <target name="jar" depends="compile,copyclasses"
+	<target name="jar" depends="compile,copyclasses"
         description="Build the JAR structure in a staging directory">
-        <copy todir="${jar.dir}">
-            <fileset dir="${src.model.dir}">
-                <include name="**/*.component.xml" />
-            </fileset>
-            <fileset dir="${basedir}/resources">
-                <include name="seam.properties"/>
-                <include name="*.drl"/>
-                <include name="META-INF/*.drl"/>
-            </fileset>
-        </copy>
-        <copy todir="${jar.dir}/META-INF">
-            <fileset dir="${basedir}/resources/META-INF">
-                <include name="ejb-jar.xml"/>
-                <include name="orm.xml"/>
-            </fileset>
-        </copy>
-        <copy tofile="${jar.dir}/META-INF/persistence.xml"
+		<copy todir="${jar.dir}">
+			<fileset dir="${src.model.dir}">
+				<include name="**/*.component.xml" />
+			</fileset>
+			<fileset dir="${basedir}/resources">
+				<include name="seam.properties"/>
+				<include name="*.drl"/>
+				<include name="META-INF/*.drl"/>
+			</fileset>
+		</copy>
+		<copy todir="${jar.dir}/META-INF">
+			<fileset dir="${basedir}/resources/META-INF">
+				<include name="ejb-jar.xml"/>
+				<include name="orm.xml"/>
+			</fileset>
+		</copy>
+		<copy tofile="${jar.dir}/META-INF/persistence.xml"
             file="${basedir}/resources/META-INF/persistence-${profile}.xml">
-            <filterset refid="persistence"/>
-        </copy>
-        <copy tofile="${jar.dir}/import.sql"
+			<filterset refid="persistence"/>
+		</copy>
+		<copy tofile="${jar.dir}/import.sql"
             file="${basedir}/resources/import-${profile}.sql"/>
-    </target>
+	</target>
 
-    <target name="war" depends="compile"
+	<target name="war" depends="compile"
         description="Build the WAR structure in a staging directory">
-        <copy todir="${war.dir}">
-            <fileset dir="${basedir}/view"/>
-        </copy>
-        <copy tofile="${war.dir}/WEB-INF/classes/components.properties"
+		<copy todir="${war.dir}">
+			<fileset dir="${basedir}/view"/>
+		</copy>
+		<copy tofile="${war.dir}/WEB-INF/classes/components.properties"
             file="${basedir}/resources/components-${profile}.properties">
-            <filterset refid="seam"/>
-            <filterset refid="profile"/>
-        </copy>
-        <copy todir="${war.dir}/WEB-INF">
-            <fileset dir="${basedir}/resources/WEB-INF">
-                <include name="*.*"/>
-                <include name="lib/*.*"/>
-                <exclude name="web.xml"/>
-            </fileset>
-        </copy>
-        <copy todir="${war.dir}/WEB-INF/lib">
-            <fileset dir="${lib.dir}">
-                <includesfile name="deployed-jars-war.list"/>
-                <exclude name="jboss-seam-gen.jar"/>
-                <exclude name="jboss-seam-debug.jar" unless="is.debug"/>
-            </fileset>
-        </copy>
-        <copy todir="${war.dir}/WEB-INF/classes">
-            <fileset dir="${basedir}/resources">
-                <include name="messages*.properties"/>
-                <include name="*.skin.properties" if="richfaces.present"/>
-                <include name="*_theme.properties"/>
-                <include name="**/*.xcss" if="richfaces.present"/>
-            </fileset>
-            <!-- move XCSS into classpath for now
+			<filterset refid="seam"/>
+			<filterset refid="profile"/>
+		</copy>
+		<copy todir="${war.dir}/WEB-INF">
+			<fileset dir="${basedir}/resources/WEB-INF">
+				<include name="*.*"/>
+				<include name="lib/*.*"/>
+				<exclude name="web.xml"/>
+			</fileset>
+		</copy>
+		<copy todir="${war.dir}/WEB-INF/lib">
+			<fileset dir="${lib.dir}">
+				<includesfile name="deployed-jars-war.list"/>
+				<exclude name="jboss-seam-gen.jar"/>
+				<exclude name="jboss-seam-debug.jar" unless="is.debug"/>
+			</fileset>
+		</copy>
+		<copy todir="${war.dir}/WEB-INF/classes">
+			<fileset dir="${basedir}/resources">
+				<include name="messages*.properties"/>
+				<include name="*.skin.properties" if="richfaces.present"/>
+				<include name="*_theme.properties"/>
+				<include name="**/*.xcss" if="richfaces.present"/>
+			</fileset>
+			<!-- move XCSS into classpath for now
                  loading from web context only works in JBoss AS 4 -->
-            <fileset dir="${basedir}/view">
-                <include name="**/*.xcss" if="richfaces.present"/>
-            </fileset>
-        </copy>
-        <copy todir="${war.dir}/WEB-INF" 
+			<fileset dir="${basedir}/view">
+				<include name="**/*.xcss" if="richfaces.present"/>
+			</fileset>
+		</copy>
+		<copy todir="${war.dir}/WEB-INF" 
               file="${basedir}/resources/WEB-INF/web.xml">
-            <filterset refid="profile"/>
-        </copy>
-    </target>
+			<filterset refid="profile"/>
+		</copy>
+	</target>
 
-    <target name="ear" description="Build the EAR structure in a staging directory">
-        <copy todir="${ear.dir}">
-            <fileset dir="${basedir}/resources">
-                <include name="*jpdl.xml"/>
-                <include name="*hibernate.cfg.xml"/>
-                <include name="jbpm.cfg.xml"/>
-            </fileset>
-            <fileset dir="${lib.dir}">
-                <include name="jboss-seam.jar"/>
-            </fileset>
-        </copy>
-        <copy todir="${ear.dir}/lib">
-            <fileset dir="${lib.dir}">
-                <includesfile name="deployed-jars-ear.list"/>
-                <exclude name="icefaces-ahs.jar" if="icefaces.present"/>
-            </fileset>
-        </copy>
-        <copy todir="${ear.dir}/META-INF">
-            <fileset dir="${basedir}/resources/META-INF">
-                <include name="application.xml"/>
-                <include name="jboss-app.xml"/>
-                <include name="jboss-deployment-structure.xml"/>
-            </fileset>
-        </copy>
-    </target>
+	<target name="ear" description="Build the EAR structure in a staging directory">
+		<copy todir="${ear.dir}">
+			<fileset dir="${basedir}/resources">
+				<include name="*jpdl.xml"/>
+				<include name="*hibernate.cfg.xml"/>
+				<include name="jbpm.cfg.xml"/>
+			</fileset>
+			<fileset dir="${lib.dir}">
+				<include name="jboss-seam.jar"/>
+			</fileset>
+		</copy>
+		<copy todir="${ear.dir}/lib">
+			<fileset dir="${lib.dir}">
+				<includesfile name="deployed-jars-ear.list"/>
+				<exclude name="icefaces-ahs.jar" if="icefaces.present"/>
+			</fileset>
+		</copy>
+		<copy todir="${ear.dir}/META-INF">
+			<fileset dir="${basedir}/resources/META-INF">
+				<include name="application.xml"/>
+				<include name="jboss-app.xml"/>
+				<include name="jboss-deployment-structure.xml"/>
+			</fileset>
+		</copy>
+	</target>
 
-    <target name="clear-profile-artifacts" depends="init"
+	<target name="clear-profile-artifacts" depends="init"
         description="Clear compiled cache of profile-specific artifacts in anticipation of a profile change">
-        <delete file="${jar.dir}/META-INF/persistence.xml"/>
-        <delete file="${jar.dir}/import.sql"/>
-        <delete file="${war.dir}/WEB-INF/classes/components.properties"/>
-    </target>
+		<delete file="${jar.dir}/META-INF/persistence.xml"/>
+		<delete file="${jar.dir}/import.sql"/>
+		<delete file="${war.dir}/WEB-INF/classes/components.properties"/>
+	</target>
 
-    <target name="stage" depends="jar,war,ear"/>
+	<target name="stage" depends="jar,war,ear"/>
 
-    <target name="archive" depends="clear-profile-artifacts,stage"
+	<target name="archive" depends="clear-profile-artifacts,stage"
         description="Package the archives">
-        <jar jarfile="${dist.dir}/${project.name}.jar" basedir="${jar.dir}"/>
-        <jar jarfile="${dist.dir}/${project.name}.war" basedir="${war.dir}"/>
-        <jar jarfile="${dist.dir}/${project.name}.ear">
-            <fileset dir="${ear.dir}">
-                <exclude name="${project.name}_jar/**"/>
-                <exclude name="${project.name}_war/**"/>
-            </fileset>
-            <fileset dir="${dist.dir}">
-                <include name="${project.name}.jar"/>
-                <include name="${project.name}.war"/>
-            </fileset>
-        </jar>
-    </target>
+		<jar jarfile="${dist.dir}/${project.name}.jar" basedir="${jar.dir}"/>
+		<jar jarfile="${dist.dir}/${project.name}.war" basedir="${war.dir}"/>
+		<jar jarfile="${dist.dir}/${project.name}.ear">
+			<fileset dir="${ear.dir}">
+				<exclude name="${project.name}_jar/**"/>
+				<exclude name="${project.name}_war/**"/>
+			</fileset>
+			<fileset dir="${dist.dir}">
+				<include name="${project.name}.jar"/>
+				<include name="${project.name}.war"/>
+			</fileset>
+		</jar>
+	</target>
 
-    <target name="datasource">
-        <fail unless="jboss.home">jboss.home not set</fail>
-        <copy file="${basedir}/resources/${project.name}-${profile}-ds.xml"
+	<target name="datasource">
+		<fail unless="jboss.home">jboss.home not set</fail>
+		<copy file="${basedir}/resources/${project.name}-${profile}-ds.xml"
             tofile="${deploy.dir}/${project.name}-ds.xml"/>
-    </target>
+	</target>
 
-    <target name="explode" depends="stage,datasource"
+	<target name="explode" depends="stage,datasource"
         description="Deploy the exploded archive">
-        <fail unless="jboss.home">jboss.home not set</fail>
+		<fail unless="jboss.home">jboss.home not set</fail>
 
-        <copy todir="${ear.deploy.dir}">
-            <fileset dir="${ear.dir}">
-                <include name="**/*"/>
-                <exclude name="${project.name}_jar/**"/>
-                <exclude name="${project.name}_war/**"/>
-            </fileset>
-        </copy>
-        <copy todir="${jar.deploy.dir}">
-            <fileset dir="${jar.dir}"/>
-        </copy>
-        <copy todir="${war.deploy.dir}">
-            <fileset dir="${war.dir}"/>
-        </copy>
-    </target>
+		<copy todir="${ear.deploy.dir}">
+			<fileset dir="${ear.dir}">
+				<include name="**/*"/>
+				<exclude name="${project.name}_jar/**"/>
+				<exclude name="${project.name}_war/**"/>
+			</fileset>
+		</copy>
+		<copy todir="${jar.deploy.dir}">
+			<fileset dir="${jar.dir}"/>
+		</copy>
+		<copy todir="${war.deploy.dir}">
+			<fileset dir="${war.dir}"/>
+		</copy>
+	</target>
 
-    <target name="unexplode" description="Undeploy the exploded archive">
-        <delete failonerror="no">
-            <fileset dir="${ear.deploy.dir}">
-                <exclude name="**/*.jar"/>
-            </fileset>
-        </delete>
-        <delete file="${deploy.dir}/${project.name}-ds.xml" failonerror="no"/>
-        <delete dir="${ear.deploy.dir}" failonerror="no"/>
-    </target>
+	<target name="unexplode" description="Undeploy the exploded archive">
+		<delete failonerror="no">
+			<fileset dir="${ear.deploy.dir}">
+				<exclude name="**/*.jar"/>
+			</fileset>
+		</delete>
+		<delete file="${deploy.dir}/${project.name}-ds.xml" failonerror="no"/>
+		<delete dir="${ear.deploy.dir}" failonerror="no"/>
+	</target>
 
-    <target name="reexplode" depends="unexplode,clean,explode"
+	<target name="reexplode" depends="unexplode,clean,explode"
         description="Undeploy the exploded archive, clean, then deploy the exploded archive"/>
 
-    <target name="check-deployed" description="Check to see if packaged archive is currently deployed">
-        <fail unless="jboss.home">jboss.home not set</fail>
-        <condition property="archive.deployed" value="true">
-            <available file="${ear.deploy.dir}" type="file"/>
-        </condition>
-    </target>
+	<target name="check-deployed" description="Check to see if packaged archive is currently deployed">
+		<fail unless="jboss.home">jboss.home not set</fail>
+		<condition property="archive.deployed" value="true">
+			<available file="${ear.deploy.dir}" type="file"/>
+		</condition>
+	</target>
 
-    <target name="restart-exploded" unless="archive.deployed" description="Deploy exploded archive if not deployed as packaged archive">
-        <antcall target="explode"/>
-        <touch file="${ear.deploy.dir}/META-INF/application.xml"/>
-    </target>
+	<target name="restart-exploded" unless="archive.deployed" description="Deploy exploded archive if not deployed as packaged archive">
+		<antcall target="explode"/>
+		<touch file="${ear.deploy.dir}/META-INF/application.xml"/>
+	</target>
 
-    <target name="restart-deployed" if="archive.deployed" description="Deploy packaged archive if deployed as packaged archive">
-        <antcall target="deploy"/>
-    </target>
+	<target name="restart-deployed" if="archive.deployed" description="Deploy packaged archive if deployed as packaged archive">
+		<antcall target="deploy"/>
+	</target>
 
-    <target name="restart" depends="check-deployed,clear-profile-artifacts,restart-exploded,restart-deployed" description="Restart the exploded archive"/>
+	<target name="restart" depends="check-deployed,clear-profile-artifacts,restart-exploded,restart-deployed" description="Restart the exploded archive"/>
 
-    <target name="deploy" depends="archive,datasource" description="Deploy the packaged archive">
-        <fail unless="jboss.home">jboss.home not set</fail>
-        <copy todir="${deploy.dir}" file="${dist.dir}/${project.name}.ear"/>
-    </target>
+	<target name="deploy" depends="archive,datasource" description="Deploy the packaged archive">
+		<fail unless="jboss.home">jboss.home not set</fail>
+		<copy todir="${deploy.dir}" file="${dist.dir}/${project.name}.ear"/>
+	</target>
 
-    <target name="undeploy" description="Undeploy the packaged archive">
-        <delete file="${deploy.dir}/${project.name}.ear"/>
-        <delete file="${deploy.dir}/${project.name}-ds.xml"/>
-    </target>
+	<target name="undeploy" description="Undeploy the packaged archive">
+		<delete file="${deploy.dir}/${project.name}.ear"/>
+		<delete file="${deploy.dir}/${project.name}-ds.xml"/>
+	</target>
 
-    <target name="redeploy" depends="undeploy,clean,deploy"
+	<target name="redeploy" depends="undeploy,clean,deploy"
         description="Undeploy the packaged archive, clean, then deploy the packaged archive"/>
 
-    <target name="clean" description="Cleans up the staging directory">
-        <delete dir="${dist.dir}"/>
-        <delete dir="${basedir}/exploded-archives"/>
-        <delete dir="${src.schema.dir}" failonerror="no"/>
-        <delete dir="${basedir}/test-report"/>
-        <delete dir="${basedir}/test-output"/>
-        <delete failonerror="no" includeemptydirs="true">
-            <fileset dir="${test.dir}">
-                <exclude name="**/*.class" if="eclipse.running"/>
-            </fileset>
-        </delete>
-    </target>
+	<target name="clean" description="Cleans up the staging directory">
+		<delete dir="${dist.dir}"/>
+		<delete dir="${basedir}/exploded-archives"/>
+		<delete dir="${src.schema.dir}" failonerror="no"/>
+		<delete dir="${basedir}/test-report"/>
+		<delete dir="${basedir}/test-output"/>
+		<delete failonerror="no" includeemptydirs="true">
+			<fileset dir="${test.dir}">
+				<exclude name="**/*.class" if="eclipse.running"/>
+			</fileset>
+		</delete>
+	</target>
 
-    <target name="compiletest" depends="groovy.compiletest" unless="eclipse.running" description="Compile the Java source code for the tests">
-        <mkdir dir="${test.dir}"/>
-        <javac classpathref="build.classpath"
+	<target name="compiletest" depends="groovy.compiletest" unless="eclipse.running" description="Compile the Java source code for the tests">
+		<mkdir dir="${test.dir}"/>
+		<javac classpathref="build.classpath"
             destdir="${test.dir}"
             debug="${javac.debug}"
             deprecation="${javac.deprecation}"
             nowarn="on">
-            <src path="${src.action.dir}"/>
-            <src path="${src.model.dir}"/>
-            <src path="${src.test.dir}"/>
-        </javac>
-    </target>
+			<src path="${src.action.dir}"/>
+			<src path="${src.model.dir}"/>
+			<src path="${src.test.dir}"/>
+		</javac>
+	</target>
 
-    <target name="groovy.compiletest" if="groovy.test.present" description="Compile the Groovy source code for the tests">
-        <mkdir dir="${test.dir}"/>
-        <groovyc classpathref="build.classpath"
+	<target name="groovy.compiletest" if="groovy.test.present" description="Compile the Groovy source code for the tests">
+		<mkdir dir="${test.dir}"/>
+		<groovyc classpathref="build.classpath"
             destdir="${test.dir}">
-            <src path="${src.action.dir}"/>
-            <src path="${src.model.dir}"/>
-            <src path="${src.test.dir}"/>
-        </groovyc>
-    </target>
+			<src path="${src.action.dir}"/>
+			<src path="${src.model.dir}"/>
+			<src path="${src.test.dir}"/>
+		</groovyc>
+	</target>
 
-    <target name="copytestclasses" if="eclipse.running" description="Copy classes compiled by eclipse to the test dir">
-    <mkdir dir="${test.dir}"/>
-        <copy todir="${test.dir}">
-            <fileset dir="classes/main">
-                <include name="**/*.class"/>
-            </fileset>
-        </copy>
-        <copy todir="${test.dir}">
-            <fileset dir="classes/hot">
-                <include name="**/*.class"/>
-            </fileset>
-        </copy>
-        <copy todir="${test.dir}">
-            <fileset dir="classes/test">
-                <include name="**/*.class"/>
-            </fileset>
-        </copy>
-    </target>
+	<target name="copytestclasses" if="eclipse.running" description="Copy classes compiled by eclipse to the test dir">
+		<mkdir dir="${test.dir}"/>
+		<copy todir="${test.dir}">
+			<fileset dir="classes/main">
+				<include name="**/*.class"/>
+			</fileset>
+		</copy>
+		<copy todir="${test.dir}">
+			<fileset dir="classes/hot">
+				<include name="**/*.class"/>
+			</fileset>
+		</copy>
+		<copy todir="${test.dir}">
+			<fileset dir="classes/test">
+				<include name="**/*.class"/>
+			</fileset>
+		</copy>
+	</target>
 
-    <target name="buildtest" depends="init,compiletest,copytestclasses" description="Build the tests">
-        <copy todir="${test.dir}">
-            <fileset dir="${basedir}/resources">
-                <exclude name="META-INF/persistence*.xml"/>
-                <exclude name="import*.sql"/>
-                <exclude name="${project.name}-*-ds.xml"/>
-                <exclude name="components-*.properties"/>
-            </fileset>
-            <fileset dir="${basedir}/view"/>
-        </copy>
-        <copy tofile="${test.dir}/META-INF/persistence.xml"
+	<target name="buildtest" depends="init,compiletest,copytestclasses" description="Build the tests">
+		<copy todir="${test.dir}">
+			<fileset dir="${basedir}/resources">
+				<exclude name="META-INF/persistence*.xml"/>
+				<exclude name="import*.sql"/>
+				<exclude name="${project.name}-*-ds.xml"/>
+				<exclude name="components-*.properties"/>
+			</fileset>
+			<fileset dir="${basedir}/view"/>
+		</copy>
+		<copy tofile="${test.dir}/META-INF/persistence.xml"
             file="${basedir}/resources/META-INF/persistence-test.xml"/>
-        <copy tofile="${test.dir}/import.sql"
+		<copy tofile="${test.dir}/import.sql"
             file="${basedir}/resources/import-test.sql"/>
+		<copy tofile="${test.dir}/components.properties"
+            file="${basedir}/resources/components-test.properties"/>
+		<copy todir="${test.dir}" flatten="true">
+			<fileset dir="${src.test.dir}">
+				<include name="**/*Test.xml"/>
+			</fileset>
+		</copy>
         <copy tofile="${test.dir}/components.properties"
-            file="${basedir}/resources/components-test.properties"/>
-        <copy todir="${test.dir}" flatten="true">
-            <fileset dir="${src.test.dir}">
-                <include name="**/*Test.xml"/>
-            </fileset>
-        </copy>
-    </target>
+            file="${basedir}/resources/components-test.properties"/>		
+	</target>
 
-    <target name="test" depends="buildtest" description="Run the tests">
-        <fail message="Cannot run tests because path to project contains spaces.">
-            <condition>
-                <contains string="${basedir}" substring=" "/>
-            </condition>
-        </fail>
-        <condition property="incompatible.jdk" value="true">
+	<target name="test" depends="buildtest" description="Run the tests">
+		<fail message="Cannot run tests because path to project contains spaces.">
+			<condition>
+				<contains string="${basedir}" substring=" "/>
+			</condition>
+		</fail>
+		<!--      <condition property="incompatible.jdk" value="true">
             <and>
                 <equals arg1="${ant.java.version}" arg2="1.6"/>
                 <not><available classname="javax.xml.bind.JAXB"/></not>
             </and>
-        </condition>
+        </condition> 
         <fail if="incompatible.jdk">You are using an incompatible JDK 6. Please use Sun JDK 6 Update 4 (1.6.0_04) or newer or use Open JDK 6.</fail>
-        <taskdef resource="testngtasks" classpath="${testng.jar}"/>
-        <path id="test.path">
-            <path path="${test.dir}"/>
-            <fileset dir="${lib.dir}/test">
-                <include name="*.jar"/>
-            </fileset>
-            <path path="${bootstrap.dir}"/>
-            <path refid="build.classpath"/>
-        </path>
-        <testng outputdir="${basedir}/test-report">
-            <jvmarg line="-Dsun.lang.ClassLoader.allowArraySyntax=true"/>
-            <classpath refid="test.path"/>
-            <xmlfileset dir="${test.dir}" includes="*Test.xml"/>
-        </testng>
-    </target>
+        -->
+		<!--<taskdef resource="testngtasks" classpath="${testng.jar}"/>-->
+		<path id="test.path">
+			<path path="${test.dir}"/>
+			<fileset dir="${lib.dir}/test">
+				<include name="*.jar"/>
+			</fileset>
+			<path refid="build.classpath"/>
+		</path>
+		<junit printsummary="yes">
+			<!--outputdir="${basedir}/test-report">-->
+			<!--<jvmarg line="-Dsun.lang.ClassLoader.allowArraySyntax=true"/>-->
+			<classpath refid="test.path"/>
+			<batchtest todir="${basedir}/test-report">
+				<fileset dir="${test.dir}">
+					<include name="**/*Test.class"/>
+				</fileset>
+		   </batchtest>
+		</junit>
+		<junitreport todir="${basedir}/test-report">
+			<fileset dir="${basedir}/test-report"/>
+			<report todir="${basedir}/test-report"/>
+		</junitreport>
+	</target>
 
-    <target name="javadoc" depends="compile">
-        <mkdir dir="${dist.dir}/apidoc"/>
-        <javadoc classpathref="build.classpath" destdir="${dist.dir}/apidoc" use="true" protected="true" version="true" windowtitle="${project.name} API Documentation" doctitle="${project.name} API Documentation" link="http://java.sun.com/j2se/5.0/docs/api">
-            <packageset dir="${src.action.dir}" defaultexcludes="yes">
-                <include name="*/**"/>
-            </packageset>
-            <packageset dir="${src.model.dir}" defaultexcludes="yes">
-                <include name="*/**"/>
-            </packageset>
-        </javadoc>
-    </target>
+	<target name="javadoc" depends="compile">
+		<mkdir dir="${dist.dir}/apidoc"/>
+		<javadoc classpathref="build.classpath" destdir="${dist.dir}/apidoc" use="true" protected="true" version="true" windowtitle="${project.name} API Documentation" doctitle="${project.name} API Documentation" link="http://java.sun.com/j2se/5.0/docs/api">
+			<packageset dir="${src.action.dir}" defaultexcludes="yes">
+				<include name="*/**"/>
+			</packageset>
+			<packageset dir="${src.model.dir}" defaultexcludes="yes">
+				<include name="*/**"/>
+			</packageset>
+		</javadoc>
+	</target>
 
-    <!-- deprecated -->
-    <target name="validateConfiguration" depends="validate"/>
+	<!-- deprecated -->
+	<target name="validateConfiguration" depends="validate"/>
 
-    <target name="validate" depends="stage" description="Validate the XML configuration files">
-        <mkdir dir="${schema.dir}"/>
-        <unjar src="${lib.dir}/jboss-seam.jar" dest="${schema.dir}">
-            <patternset>
-                <include name="org/jboss/seam/*.xsd"/>
-                <include name="org/jboss/seam/*.dtd"/>
-            </patternset>
-        </unjar>
-        <ant antfile="validate.xml" target="validateConfiguration"/>
-    </target>
+	<target name="validate" depends="stage" description="Validate the XML configuration files">
+		<mkdir dir="${schema.dir}"/>
+		<unjar src="${lib.dir}/jboss-seam.jar" dest="${schema.dir}">
+			<patternset>
+				<include name="org/jboss/seam/*.xsd"/>
+				<include name="org/jboss/seam/*.dtd"/>
+			</patternset>
+		</unjar>
+		<ant antfile="validate.xml" target="validateConfiguration"/>
+	</target>
 
-    <target name="purge" depends="undeploy" description="Clean out JBoss AS temporary deployment files">
+ <target name="purge" depends="undeploy" description="Clean out JBoss AS temporary deployment files">
         <delete dir="${jboss.home}/server/default/tmp/deploy"/>
         <mkdir dir="${jboss.home}/server/default/tmp/deploy/"/>
         <delete dir="${jboss.home}/server/default/tmp/sessions"/>
         <mkdir dir="${jboss.home}/server/default/tmp/sessions"/>
         <delete dir="${jboss.home}/server/default/work/jboss.web/localhost/${project.name}"/>
     </target>
-
 </project>

Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/build.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/dist/build.xml	2012-09-10 13:19:48 UTC (rev 15121)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/build.xml	2012-09-10 19:24:23 UTC (rev 15122)
@@ -209,6 +209,9 @@
             <filter token="listName" value="${component.name}List"/>
             <filter token="homeName" value="${component.name}Home"/>
             <filter token="query" value="${query.text}"/>
+        	<filter token="projectName" value="${project.name}"/>
+        	<filter token="projectType" value="${project.type}"/>
+        	<filter token="workspaceHome" value="${workspace.home}"/>
         </filterset>
 
     </target>
@@ -1305,10 +1308,14 @@
         <copy file="${templates.dir}/src/Action.java" tofile="${interface.file}">
             <filterset refid="filters"/>
         </copy>
+        <copy file="${templates.dir}/test/Deployments.java" tofile="${project.home}/src/${test.dir}/Deployments.java">
+            <filterset refid="filters"/>
+        </copy>    	
         <copy file="${templates.dir}/test/ActionTest.java" tofile="${test.file}">
             <filterset refid="filters"/>
         </copy>
-        <copy file="${templates.dir}/test/testng.xml" tofile="${testng.file}">
+    	<mkdir dir="${project.home}/resources-test"/>
+        <copy file="${templates.dir}/test/arquillian.xml" tofile="${project.home}/resources-test/arquillian.xml">
             <filterset refid="filters"/>
         </copy>
         <copy file="${templates.dir}/view/action.xhtml" tofile="${page.file}">
@@ -1325,8 +1332,12 @@
         <copy file="${templates.dir}/test/ActionTest.java" tofile="${test.file}">
             <filterset refid="filters"/>
         </copy>
-        <copy file="${templates.dir}/test/testng.xml" tofile="${testng.file}">
+        <copy file="${templates.dir}/test/Deployments.java" tofile="${project.home}/src/${test.dir}/Deployments.java">
             <filterset refid="filters"/>
+        </copy>      	
+        <mkdir dir="${project.home}/resources-test"/>
+        <copy file="${templates.dir}/test/arquillian.xml" tofile="${project.home}/resources-test/arquillian.xml">
+            <filterset refid="filters"/>
         </copy>
         <copy file="${templates.dir}/view/action.xhtml" tofile="${page.file}">
             <filterset refid="filters"/>
@@ -1342,12 +1353,16 @@
         <copy file="${templates.dir}/test/FormTest.java" tofile="${test.file}">
             <filterset refid="filters"/>
         </copy>
+        <copy file="${templates.dir}/test/Deployments.java" tofile="${project.home}/src/${test.dir}/Deployments.java">
+            <filterset refid="filters"/>
+        </copy>     	
         <copy file="${templates.dir}/view/form.xhtml" tofile="${page.file}">
             <filterset refid="filters"/>
         </copy>
-        <copy file="${templates.dir}/test/testng.xml" tofile="${testng.file}">
+        <mkdir dir="${project.home}/resources-test"/>
+        <copy file="${templates.dir}/test/arquillian.xml" tofile="${project.home}/resources-test/arquillian.xml">
             <filterset refid="filters"/>
-        </copy>
+        </copy>    	
         <echo message="Type '${seam.cmd} explode' and go to http://localhost:8080/${project.name}/${page.name}.seam"/>
     </target>
 
@@ -1365,8 +1380,12 @@
         <copy file="${templates.dir}/view/form.xhtml" tofile="${page.file}">
             <filterset refid="filters"/>
         </copy>
-        <copy file="${templates.dir}/test/testng.xml" tofile="${testng.file}">
+        <copy file="${templates.dir}/test/Deployments.java" tofile="${project.home}/src/${test.dir}/Deployments.java">
             <filterset refid="filters"/>
+        </copy>         
+        <mkdir dir="${project.home}/resources-test"/>
+        <copy file="${templates.dir}/test/arquillian.xml" tofile="${project.home}/resources-test/arquillian.xml">
+            <filterset refid="filters"/>
         </copy>
         <echo message="Type '${seam.cmd} restart' and go to http://localhost:8080/${project.name}/${page.name}.seam"/>
     </target>

Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/ide-project-files/eclipse/.classpath
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/dist/ide-project-files/eclipse/.classpath	2012-09-10 13:19:48 UTC (rev 15121)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/ide-project-files/eclipse/.classpath	2012-09-10 19:24:23 UTC (rev 15122)
@@ -1,306 +1,321 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+    <classpathentry kind="output" path="test-build"/>
+    <classpathentry kind="src" output="classes/hot" path="src/hot"/>
     <classpathentry kind="src" output="classes/main" path="src/main"/>
-    <classpathentry kind="src" output="classes/hot" path="src/hot"/>
     <classpathentry kind="src" output="classes/test" path="src/test"/>
     <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <classpathentry kind="lib" path="lib/sac.jar"/>
-    <classpathentry kind="lib" path="lib/jackrabbit-spi-commons.jar"/>
-    <classpathentry kind="lib" path="lib/jboss-seam-pdf.jar"/>
-    <classpathentry kind="lib" path="lib/spring-expression.jar"/>
-    <classpathentry kind="lib" path="lib/mail.jar"/>
-    <classpathentry kind="lib" path="lib/jcommander.jar"/>
-    <classpathentry kind="lib" path="lib/spring-context.jar"/>
-    <classpathentry kind="lib" path="lib/jboss-el.jar"/>
-    <classpathentry kind="lib" path="lib/jackrabbit-core.jar"/>
-    <classpathentry kind="lib" path="lib/spring-aop.jar"/>
-    <classpathentry kind="lib" path="lib/javassist.jar"/>
-    <classpathentry kind="lib" path="lib/lucene-highlighter.jar"/>
+    <classpathentry kind="lib" path="lib/activation.jar"/>
+    <classpathentry kind="lib" path="lib/annotations.jar"/>
+    <classpathentry kind="lib" path="lib/ant.jar"/>
+    <classpathentry kind="lib" path="lib/antlr.jar"/>
     <classpathentry kind="lib" path="lib/antlr-runtime.jar"/>
-    <classpathentry kind="lib" path="lib/hibernate-search-engine.jar"/>
-    <classpathentry kind="lib" path="lib/resteasy-jaxrs.jar"/>
-    <classpathentry kind="lib" path="lib/richfaces-core-api.jar"/>
-    <classpathentry kind="lib" path="lib/mvel2.jar"/>
-    <classpathentry kind="lib" path="lib/richfaces-core-impl.jar"/>
-    <classpathentry kind="lib" path="lib/hibernate-jpa-2.0-api.jar"/>
-    <classpathentry kind="lib" path="lib/xercesImpl.jar"/>
+    <classpathentry kind="lib" path="lib/aopalliance.jar"/>
+    <classpathentry kind="lib" path="lib/asm.jar"/>
+    <classpathentry kind="lib" path="lib/avro.jar"/>
+    <classpathentry kind="lib" path="lib/backport-util-concurrent.jar"/>
+    <classpathentry kind="lib" path="lib/blazeds-common.jar"/>
+    <classpathentry kind="lib" path="lib/blazeds-core.jar"/>
+    <classpathentry kind="lib" path="lib/blazeds-proxy.jar"/>
+    <classpathentry kind="lib" path="lib/blazeds-remoting.jar"/>
+    <classpathentry kind="lib" path="lib/bsh.jar"/>
+    <classpathentry kind="lib" path="lib/cglib.jar"/>
+    <classpathentry kind="lib" path="lib/commons-beanutils.jar"/>
     <classpathentry kind="lib" path="lib/commons-codec.jar"/>
-    <classpathentry kind="lib" path="lib/jackrabbit-jcr-commons.jar"/>
+    <classpathentry kind="lib" path="lib/commons-collections.jar"/>
+    <classpathentry kind="lib" path="lib/commons-io.jar"/>
+    <classpathentry kind="lib" path="lib/commons-lang.jar"/>
+    <classpathentry kind="lib" path="lib/commons-logging.jar"/>
+    <classpathentry kind="lib" path="lib/concurrent.jar"/>
+    <classpathentry kind="lib" path="lib/cssparser.jar"/>
+    <classpathentry kind="lib" path="lib/dbunit.jar"/>
+    <classpathentry kind="lib" path="lib/derby.jar"/>
+    <classpathentry kind="lib" path="lib/dom4j.jar"/>
+    <classpathentry kind="lib" path="lib/@driverJar@"/>
+    <classpathentry kind="lib" path="lib/drools-compiler.jar"/>
     <classpathentry kind="lib" path="lib/drools-core.jar"/>
-    <classpathentry kind="lib" path="lib/itext.jar"/>
+    <classpathentry kind="lib" path="lib/drools-decisiontables.jar"/>
+    <classpathentry kind="lib" path="lib/drools-templates.jar"/>
+    <classpathentry kind="lib" path="lib/ecj.jar"/>
     <classpathentry kind="lib" path="lib/ehcache-core.jar"/>
-    <classpathentry kind="lib" path="lib/blazeds-remoting.jar"/>
-    <classpathentry kind="lib" path="lib/poi.jar"/>
-    <classpathentry kind="lib" path="lib/jgroups.jar"/>
+    <classpathentry kind="lib" path="lib/ehcache.jar"/>
+    <classpathentry kind="lib" path="lib/el-api.jar"/>
     <classpathentry kind="lib" path="lib/fontbox.jar"/>
     <classpathentry kind="lib" path="lib/lucene-core.jar"/>
     <classpathentry kind="lib" path="lib/resteasy-atom-provider.jar"/>
+    <classpathentry kind="lib" path="lib/groovy-all.jar"/>
+    <classpathentry kind="lib" path="lib/guava.jar"/>
+    <classpathentry kind="lib" path="lib/guice.jar"/>
+    <classpathentry kind="lib" path="lib/gwt-servlet.jar"/>
+    <classpathentry kind="lib" path="lib/gwt-user.jar"/>
+    <classpathentry kind="lib" path="lib/hibernate-commons-annotations.jar"/>
+    <classpathentry kind="lib" path="lib/hibernate-core.jar"/>
+    <classpathentry kind="lib" path="lib/hibernate-ehcache.jar"/>
+    <classpathentry kind="lib" path="lib/hibernate-entitymanager.jar"/>
+    <classpathentry kind="lib" path="lib/hibernate-jpa-2.0-api.jar"/>
+    <classpathentry kind="lib" path="lib/hibernate-search-analyzers.jar"/>
+    <classpathentry kind="lib" path="lib/hibernate-search-engine.jar"/>
+    <classpathentry kind="lib" path="lib/hibernate-search-orm.jar"/>
+    <classpathentry kind="lib" path="lib/hibernate-validator.jar"/>
+    <classpathentry kind="lib" path="lib/httpclient.jar"/>
+    <classpathentry kind="lib" path="lib/httpcore.jar"/>
+    <classpathentry kind="lib" path="lib/infinispan-core.jar"/>
+    <classpathentry kind="lib" path="lib/infinispan-tree.jar"/>
+    <classpathentry kind="lib" path="lib/itext.jar"/>
+    <classpathentry kind="lib" path="lib/itext-rtf.jar"/>
+    <classpathentry kind="lib" path="lib/jackrabbit-api.jar"/>
+    <classpathentry kind="lib" path="lib/jackrabbit-core.jar"/>
+    <classpathentry kind="lib" path="lib/jackrabbit-jcr-commons.jar"/>
+    <classpathentry kind="lib" path="lib/jackrabbit-spi-commons.jar"/>
+    <classpathentry kind="lib" path="lib/jackrabbit-spi.jar"/>
+    <classpathentry kind="lib" path="lib/jackrabbit-text-extractors.jar"/>
+    <classpathentry kind="lib" path="lib/jackson-core-asl.jar"/>
+    <classpathentry kind="lib" path="lib/jackson-mapper-asl.jar"/>
+    <classpathentry kind="lib" path="lib/javassist.jar"/>
+    <classpathentry kind="lib" path="lib/jaxb-api.jar"/>
+    <classpathentry kind="lib" path="lib/jaxrs-api.jar"/>
+    <classpathentry kind="lib" path="lib/jaxws-api.jar"/>
+    <classpathentry kind="lib" path="lib/jbosscache-core.jar"/>
+    <classpathentry kind="lib" path="lib/jboss-cache.jar"/>
+    <classpathentry kind="lib" path="lib/jboss-ejb-api_3.1_spec.jar"/>
+    <classpathentry kind="lib" path="lib/jboss-el-api_2.2_spec.jar"/>
+    <classpathentry kind="lib" path="lib/jboss-el.jar"/>
+    <classpathentry kind="lib" path="lib/jboss-interceptors-api_1.1_spec.jar"/>
+    <classpathentry kind="lib" path="lib/jboss-jms-api_1.1_spec.jar"/>
+    <classpathentry kind="lib" path="lib/jboss-jmx.jar"/>
     <classpathentry kind="lib" path="lib/jboss-jsf-api_2.1_spec.jar"/>
-    <classpathentry kind="lib" path="lib/spring-tx.jar"/>
-    <classpathentry kind="lib" path="lib/cssparser.jar"/>
+    <classpathentry kind="lib" path="lib/jboss-jsp-api_2.2_spec.jar"/>
+    <classpathentry kind="lib" path="lib/jboss-logging.jar"/>
+    <classpathentry kind="lib" path="lib/jboss-marshalling.jar"/>
+    <classpathentry kind="lib" path="lib/jboss-marshalling-river.jar"/>
+    <classpathentry kind="lib" path="lib/jboss-seam-debug.jar"/>
+    <classpathentry kind="lib" path="lib/jboss-seam-excel.jar"/>
+    <classpathentry kind="lib" path="lib/jboss-seam-flex.jar"/>
+    <classpathentry kind="lib" path="lib/jboss-seam-ioc.jar"/>
+    <classpathentry kind="lib" path="lib/jboss-seam.jar"/>
+    <classpathentry kind="lib" path="lib/jboss-seam-mail.jar"/>
+    <classpathentry kind="lib" path="lib/jboss-seam-pdf.jar"/>
+    <classpathentry kind="lib" path="lib/jboss-seam-remoting.jar"/>
+    <classpathentry kind="lib" path="lib/jboss-seam-resteasy.jar"/>
+    <classpathentry kind="lib" path="lib/jboss-seam-rss.jar"/>
+    <classpathentry kind="lib" path="lib/jboss-seam-ui.jar"/>
+    <classpathentry kind="lib" path="lib/jboss-servlet-api_3.0_spec.jar"/>
+    <classpathentry kind="lib" path="lib/jboss-system.jar"/>
+    <classpathentry kind="lib" path="lib/jboss-transaction-api_1.1_spec.jar"/>
+    <classpathentry kind="lib" path="lib/jbpm-jpdl.jar"/>
+    <classpathentry kind="lib" path="lib/jcip-annotations.jar"/>
     <classpathentry kind="lib" path="lib/jcl-over-slf4j.jar"/>
+    <classpathentry kind="lib" path="lib/jcommander.jar"/>
+    <classpathentry kind="lib" path="lib/jcommon.jar"/>
+    <classpathentry kind="lib" path="lib/jempbox.jar"/>
+    <classpathentry kind="lib" path="lib/jettison.jar"/>
+    <classpathentry kind="lib" path="lib/jfreechart.jar"/>
+    <classpathentry kind="lib" path="lib/jgroups.jar"/>
+    <classpathentry kind="lib" path="lib/joda-time.jar"/>
+    <classpathentry kind="lib" path="lib/jsf-impl.jar"/>
+    <classpathentry kind="lib" path="lib/jsr250-api.jar"/>
+    <classpathentry kind="lib" path="lib/jsr305.jar"/>
+    <classpathentry kind="lib" path="lib/jta.jar"/>
+    <classpathentry kind="lib" path="lib/junit.jar"/>
+    <classpathentry kind="lib" path="lib/jxl.jar"/>
+    <classpathentry kind="lib" path="lib/knowledge-api.jar"/>
+    <classpathentry kind="lib" path="lib/log4j.jar"/>
+    <classpathentry kind="lib" path="lib/lucene-analyzers.jar"/>
+    <classpathentry kind="lib" path="lib/lucene-core.jar"/>
+    <classpathentry kind="lib" path="lib/lucene-grouping.jar"/>
+    <classpathentry kind="lib" path="lib/lucene-highlighter.jar"/>
+    <classpathentry kind="lib" path="lib/lucene-memory.jar"/>
+    <classpathentry kind="lib" path="lib/lucene-misc.jar"/>
+    <classpathentry kind="lib" path="lib/lucene-smartcn.jar"/>
+    <classpathentry kind="lib" path="lib/lucene-spatial.jar"/>
+    <classpathentry kind="lib" path="lib/lucene-spellchecker.jar"/>
+    <classpathentry kind="lib" path="lib/lucene-stempel.jar"/>
+    <classpathentry kind="lib" path="lib/mail.jar"/>
+    <classpathentry kind="lib" path="lib/mvel2.jar"/>
+    <classpathentry kind="lib" path="lib/nekohtml.jar"/>
+    <classpathentry kind="lib" path="lib/openid4java-nodeps.jar"/>
     <classpathentry kind="lib" path="lib/paranamer.jar"/>
-    <classpathentry kind="lib" path="lib/el-api.jar"/>
+    <classpathentry kind="lib" path="lib/pdfbox.jar"/>
+    <classpathentry kind="lib" path="lib/poi.jar"/>
+    <classpathentry kind="lib" path="lib/poi-scratchpad.jar"/>
+    <classpathentry kind="lib" path="lib/portlet-api.jar"/>
     <classpathentry kind="lib" path="lib/quartz.jar"/>
-    <classpathentry kind="lib" path="lib/jboss-seam-resteasy.jar"/>
-    <classpathentry kind="lib" path="lib/blazeds-proxy.jar"/>
-    <classpathentry kind="lib" path="lib/httpcore.jar"/>
-    <classpathentry kind="lib" path="lib/nekohtml.jar"/>
-    <classpathentry kind="lib" path="lib/log4j.jar"/>
+    <classpathentry kind="lib" path="lib/resteasy-atom-provider.jar"/>
+    <classpathentry kind="lib" path="lib/resteasy-jaxb-provider.jar"/>
+    <classpathentry kind="lib" path="lib/resteasy-jaxrs.jar"/>
+    <classpathentry kind="lib" path="lib/resteasy-jettison-provider.jar"/>
+    <classpathentry kind="lib" path="lib/rhq-pluginAnnotations.jar"/>
+    <classpathentry kind="lib" path="lib/richfaces-components-api.jar"/>
+    <classpathentry kind="lib" path="lib/richfaces-components-ui.jar"/>
+    <classpathentry kind="lib" path="lib/richfaces-core-api.jar"/>
+    <classpathentry kind="lib" path="lib/richfaces-core-impl.jar"/>
+    <classpathentry kind="lib" path="lib/saaj-api.jar"/>
+    <classpathentry kind="lib" path="lib/sac.jar"/>
+    <classpathentry kind="lib" path="lib/servlet-api.jar"/>
+    <classpathentry kind="lib" path="lib/slf4j-api.jar"/>
+    <classpathentry kind="lib" path="lib/slf4j-log4j12.jar"/>
     <classpathentry kind="lib" path="lib/snakeyaml.jar"/>
+    <classpathentry kind="lib" path="lib/snappy-java.jar"/>
+    <classpathentry kind="lib" path="lib/solr-analysis-extras.jar"/>
+    <classpathentry kind="lib" path="lib/solr-commons-csv.jar"/>
     <classpathentry kind="lib" path="lib/solr-core.jar"/>
-    <classpathentry kind="lib" path="lib/jboss-el-api_2.2_spec.jar"/>
-    <classpathentry kind="lib" path="lib/jboss-seam-debug.jar"/>
-    <classpathentry kind="lib" path="lib/guava.jar"/>
-    <classpathentry kind="lib" path="lib/jaxws-api.jar"/>
-    <classpathentry kind="lib" path="lib/concurrent.jar"/>
+    <classpathentry kind="lib" path="lib/solr-solrj.jar"/>
+    <classpathentry kind="lib" path="lib/spring-aop.jar"/>
+    <classpathentry kind="lib" path="lib/spring-asm.jar"/>
+    <classpathentry kind="lib" path="lib/spring-beans.jar"/>
+    <classpathentry kind="lib" path="lib/spring-context.jar"/>
+    <classpathentry kind="lib" path="lib/spring-core.jar"/>
+    <classpathentry kind="lib" path="lib/spring-expression.jar"/>
+    <classpathentry kind="lib" path="lib/spring-jdbc.jar"/>
+    <classpathentry kind="lib" path="lib/spring-orm.jar"/>
+    <classpathentry kind="lib" path="lib/spring-tx.jar"/>
+    <classpathentry kind="lib" path="lib/spring-web.jar"/>
     <classpathentry kind="lib" path="lib/stax-api.jar"/>
-    <classpathentry kind="lib" path="lib/antlr.jar"/>
-    <classpathentry kind="lib" path="lib/jboss-marshalling.jar"/>
-    <classpathentry kind="lib" path="lib/asm.jar"/>
-    <classpathentry kind="lib" path="lib/resteasy-jettison-provider.jar"/>
-    <classpathentry kind="lib" path="lib/hibernate-ehcache.jar"/>
-    <classpathentry kind="lib" path="lib/blazeds-common.jar"/>
-    <classpathentry kind="lib" path="lib/jempbox.jar"/>
-    <classpathentry kind="lib" path="lib/test/jboss-interceptor-spi-2.0.0.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/wagon-http-lightweight-1.0-beta-7.jar"/>
-    <classpathentry kind="lib" path="lib/test/jboss-logmanager-log4j-1.0.0.GA.jar"/>
+    <classpathentry kind="lib" path="lib/stax2-api.jar"/>
+    <classpathentry kind="lib" path="lib/test/aether-api-1.8.jar"/>
+    <classpathentry kind="lib" path="lib/test/aether-connector-wagon-1.8.jar"/>
+    <classpathentry kind="lib" path="lib/test/aether-impl-1.8.jar"/>
+    <classpathentry kind="lib" path="lib/test/aether-spi-1.8.jar"/>
+    <classpathentry kind="lib" path="lib/test/aether-util-1.8.jar"/>
+<classpathentry kind="lib" path="lib/test/arquillian-config-api-1.0.0.CR7.jar"/>
+<classpathentry kind="lib" path="lib/test/arquillian-config-api-1.0.1.Final.jar"/>
+<classpathentry kind="lib" path="lib/test/arquillian-config-impl-base-1.0.0.CR7.jar"/>
+<classpathentry kind="lib" path="lib/test/arquillian-config-impl-base-1.0.1.Final.jar"/>
+<classpathentry kind="lib" path="lib/test/arquillian-container-impl-base-1.0.1.Final.jar"/>
+<classpathentry kind="lib" path="lib/test/arquillian-container-osgi-1.0.2.Final.jar"/>
+<classpathentry kind="lib" path="lib/test/arquillian-container-spi-1.0.0.CR7.jar"/>
+<classpathentry kind="lib" path="lib/test/arquillian-container-spi-1.0.1.Final.jar"/>
+<classpathentry kind="lib" path="lib/test/arquillian-container-test-api-1.0.0.CR7.jar"/>
+<classpathentry kind="lib" path="lib/test/arquillian-container-test-api-1.0.1.Final.jar"/>
+<classpathentry kind="lib" path="lib/test/arquillian-container-test-impl-base-1.0.0.CR7.jar"/>
+<classpathentry kind="lib" path="lib/test/arquillian-container-test-impl-base-1.0.1.Final.jar"/>
+<classpathentry kind="lib" path="lib/test/arquillian-container-test-spi-1.0.0.CR7.jar"/>
+<classpathentry kind="lib" path="lib/test/arquillian-container-test-spi-1.0.1.Final.jar"/>
+<classpathentry kind="lib" path="lib/test/arquillian-core-api-1.0.0.CR7.jar"/>
+<classpathentry kind="lib" path="lib/test/arquillian-core-impl-base-1.0.1.Final.jar"/>
+<classpathentry kind="lib" path="lib/test/arquillian-core-spi-1.0.0.CR7.jar"/>
+<classpathentry kind="lib" path="lib/test/arquillian-junit-container-1.0.1.Final.jar"/>
+<classpathentry kind="lib" path="lib/test/arquillian-junit-core-1.0.1.Final.jar"/>
+<classpathentry kind="lib" path="lib/test/arquillian-protocol-jmx-1.0.0.CR7.jar"/>
+<classpathentry kind="lib" path="lib/test/arquillian-test-api-1.0.0.CR7.jar"/>
+<classpathentry kind="lib" path="lib/test/arquillian-test-api-1.0.1.Final.jar"/>
+<classpathentry kind="lib" path="lib/test/arquillian-testenricher-cdi-1.0.0.CR7.jar"/>
+<classpathentry kind="lib" path="lib/test/arquillian-testenricher-ejb-1.0.0.CR7.jar"/>
+<classpathentry kind="lib" path="lib/test/arquillian-testenricher-initialcontext-1.0.0.CR7.jar"/>
+<classpathentry kind="lib" path="lib/test/arquillian-testenricher-osgi-1.0.2.Final.jar"/>
+<classpathentry kind="lib" path="lib/test/arquillian-testenricher-resource-1.0.0.CR7.jar"/>
+<classpathentry kind="lib" path="lib/test/arquillian-test-impl-base-1.0.1.Final.jar"/>
+<classpathentry kind="lib" path="lib/test/arquillian-test-spi-1.0.0.CR7.jar"/>
+<classpathentry kind="lib" path="lib/test/arquillian-test-spi-1.0.1.Final.jar"/>    
+    <classpathentry kind="lib" path="lib/test/google-collections-1.0.jar"/>
     <classpathentry kind="lib" path="lib/test/hibernate-validator-4.2.0.Final.jar"/>
+    <classpathentry kind="lib" path="lib/test/httpserver-1.0.0.Final.jar"/>
+    <classpathentry kind="lib" path="lib/test/jandex-1.0.3.Final.jar"/>
+    <classpathentry kind="lib" path="lib/test/javax.inject-1.jar"/>
+    <classpathentry kind="lib" path="lib/test/jbosgi-deployment-1.0.12.Final.jar"/>
+    <classpathentry kind="lib" path="lib/test/jbosgi-framework-core-1.1.8.Final.jar"/>
+    <classpathentry kind="lib" path="lib/test/jbosgi-metadata-2.0.3.Final.jar"/>
+    <classpathentry kind="lib" path="lib/test/jbosgi-repository-api-1.0.5.jar"/>
+    <classpathentry kind="lib" path="lib/test/jbosgi-repository-core-1.0.5.jar"/>
+    <classpathentry kind="lib" path="lib/test/jbosgi-resolver-api-v2-2.0.0.Beta2.jar"/>
+    <classpathentry kind="lib" path="lib/test/jbosgi-resolver-api-1.0.13.Final.jar"/>
+    <classpathentry kind="lib" path="lib/test/jbosgi-resolver-felix-1.0.13.Final.jar"/>
     <classpathentry kind="lib" path="lib/test/jbosgi-resolver-spi-1.0.13.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/jboss-as-controller-7.1.1.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/arquillian-core-spi-1.0.0.CR7.jar"/>
-    <classpathentry kind="lib" path="lib/test/jboss-as-jmx-7.1.1.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/jboss-as-arquillian-common-7.1.1.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/validation-api-1.0.0.GA.jar"/>
+    <classpathentry kind="lib" path="lib/test/jbosgi-spi-3.0.1.Final.jar"/>
+    <classpathentry kind="lib" path="lib/test/jbosgi-vfs-1.0.7.Final.jar"/>
     <classpathentry kind="lib" path="lib/test/jbosgi-vfs30-1.0.7.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/arquillian-container-osgi-1.0.2.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/arquillian-testenricher-cdi-1.0.0.CR7.jar"/>
-    <classpathentry kind="lib" path="lib/test/arquillian-test-api-1.0.0.CR7.jar"/>
-    <classpathentry kind="lib" path="lib/test/plexus-classworlds-2.2.2.jar"/>
     <classpathentry kind="lib" path="lib/test/jboss-annotations-api_1.1_spec-1.0.0.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/wagon-file-1.0-beta-7.jar"/>
-    <classpathentry kind="lib" path="lib/test/aether-impl-1.8.jar"/>
-    <classpathentry kind="lib" path="lib/test/jboss-as-process-controller-7.1.1.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/arquillian-config-impl-base-1.0.0.CR7.jar"/>
-    <classpathentry kind="lib" path="lib/test/jboss-as-controller-client-7.1.1.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/jdk-tools-jdk.jar"/>
-    <classpathentry kind="lib" path="lib/test/jbosgi-framework-core-1.1.8.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/jboss-as-ee-7.1.1.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/jboss-as-platform-mbean-7.1.1.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/jboss-as-embedded-7.1.1.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/jboss-as-naming-7.1.1.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/javax.inject-1.jar"/>
-    <classpathentry kind="lib" path="lib/test/jbosgi-repository-core-1.0.5.jar"/>
-    <classpathentry kind="lib" path="lib/test/jbosgi-repository-api-1.0.5.jar"/>
-    <classpathentry kind="lib" path="lib/test/jboss-as-domain-http-interface-7.1.1.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/arquillian-testenricher-ejb-1.0.0.CR7.jar"/>
-    <classpathentry kind="lib" path="lib/test/plexus-cipher-1.4.jar"/>
-    <classpathentry kind="lib" path="lib/test/arquillian-testenricher-osgi-1.0.2.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/jboss-vfs-3.1.0.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/jboss-as-threads-7.1.1.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/jboss-threads-2.0.0.GA.jar"/>
-    <classpathentry kind="lib" path="lib/test/jboss-msc-1.0.2.GA.jar"/>
-    <classpathentry kind="lib" path="lib/test/arquillian-container-test-api-1.0.0.CR7.jar"/>
-    <classpathentry kind="lib" path="lib/test/org.apache.felix.resolver-0.1.0.Beta1.jar"/>
-    <classpathentry kind="lib" path="lib/test/jbosgi-resolver-api-1.0.13.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/arquillian-protocol-jmx-1.0.0.CR7.jar"/>
+<classpathentry kind="lib" path="lib/test/jboss-as-arquillian-common-7.1.1.Final.jar"/>
+<classpathentry kind="lib" path="lib/test/jboss-as-arquillian-container-remote-7.1.1.Final.jar"/>
+<classpathentry kind="lib" path="lib/test/jboss-as-arquillian-protocol-jmx-7.1.1.Final.jar"/>
+<classpathentry kind="lib" path="lib/test/jboss-as-arquillian-testenricher-msc-7.1.1.Final.jar"/>
+<classpathentry kind="lib" path="lib/test/jboss-as-build-config-7.1.1.Final.jar"/>
+<classpathentry kind="lib" path="lib/test/jboss-as-controller-client-7.1.1.Final.jar"/>
+<classpathentry kind="lib" path="lib/test/jboss-as-controller-7.1.1.Final.jar"/>
+<classpathentry kind="lib" path="lib/test/jboss-as-deployment-repository-7.1.1.Final.jar"/>
+<classpathentry kind="lib" path="lib/test/jboss-as-domain-http-interface-7.1.1.Final.jar"/>
+<classpathentry kind="lib" path="lib/test/jboss-as-domain-management-7.1.1.Final.jar"/>
+<classpathentry kind="lib" path="lib/test/jboss-as-ee-7.1.1.Final.jar"/>
+<classpathentry kind="lib" path="lib/test/jboss-as-embedded-7.1.1.Final.jar"/>
+<classpathentry kind="lib" path="lib/test/jboss-as-jmx-7.1.1.Final.jar"/>
+<classpathentry kind="lib" path="lib/test/jboss-as-naming-7.1.1.Final.jar"/>
+<classpathentry kind="lib" path="lib/test/jboss-as-network-7.1.1.Final.jar"/>
+<classpathentry kind="lib" path="lib/test/jboss-as-osgi-service-7.1.1.Final.jar"/>
+<classpathentry kind="lib" path="lib/test/jboss-as-platform-mbean-7.1.1.Final.jar"/>
+<classpathentry kind="lib" path="lib/test/jboss-as-process-controller-7.1.1.Final.jar"/>
+<classpathentry kind="lib" path="lib/test/jboss-as-protocol-7.1.1.Final.jar"/>
+<classpathentry kind="lib" path="lib/test/jboss-as-remoting-7.1.1.Final.jar"/>
+<classpathentry kind="lib" path="lib/test/jboss-as-server-7.1.1.Final.jar"/>
+<classpathentry kind="lib" path="lib/test/jboss-as-threads-7.1.1.Final.jar"/>
+    <classpathentry kind="lib" path="lib/test/jboss-common-core-2.2.17.GA.jar"/>
+    <classpathentry kind="lib" path="lib/test/jboss-dmr-1.1.1.Final.jar"/>
+    <classpathentry kind="lib" path="lib/test/jboss-ejb-client-1.0.0.Final.jar"/>
+    <classpathentry kind="lib" path="lib/test/jboss-interceptors-api_1.1_spec-1.0.0.Final.jar"/>
+    <classpathentry kind="lib" path="lib/test/jboss-interceptor-spi-2.0.0.Final.jar"/>
+    <classpathentry kind="lib" path="lib/test/jboss-invocation-1.1.1.Final.jar"/>
     <classpathentry kind="lib" path="lib/test/jboss-logging-3.1.0.GA.jar"/>
-    <classpathentry kind="lib" path="lib/test/jboss-invocation-1.1.1.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/maven-model-3.0.1.jar"/>
-    <classpathentry kind="lib" path="lib/test/slf4j-api-1.6.1.jar"/>
-    <classpathentry kind="lib" path="lib/test/jboss-as-protocol-7.1.1.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/jboss-as-arquillian-container-managed-7.1.1.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/shrinkwrap-descriptors-spi-1.1.0-beta-1.jar"/>
-    <classpathentry kind="lib" path="lib/test/staxmapper-1.1.0.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/shrinkwrap-resolver-api-maven-1.0.0-beta-5.jar"/>
-    <classpathentry kind="lib" path="lib/test/plexus-interpolation-1.14.jar"/>
-    <classpathentry kind="lib" path="lib/test/jandex-1.0.3.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/wagon-provider-api-1.0-beta-7.jar"/>
-    <classpathentry kind="lib" path="lib/test/arquillian-test-spi-1.0.0.CR7.jar"/>
-    <classpathentry kind="lib" path="lib/test/httpserver-1.0.0.Final.jar"/>
+    <classpathentry kind="lib" path="lib/test/jboss-logmanager-log4j-1.0.0.GA.jar"/>
     <classpathentry kind="lib" path="lib/test/jboss-logmanager-1.2.2.GA.jar"/>
-    <classpathentry kind="lib" path="lib/test/plexus-sec-dispatcher-1.3.jar"/>
-    <classpathentry kind="lib" path="lib/test/arquillian-core-api-1.0.0.CR7.jar"/>
-    <classpathentry kind="lib" path="lib/test/shrinkwrap-descriptors-api-1.1.0-beta-1.jar"/>
-    <classpathentry kind="lib" path="lib/test/arquillian-container-test-impl-base-1.0.0.CR7.jar"/>
-    <classpathentry kind="lib" path="lib/test/plexus-utils-2.0.4.jar"/>
-    <classpathentry kind="lib" path="lib/test/google-collections-1.0.jar"/>
     <classpathentry kind="lib" path="lib/test/jboss-marshalling-river-1.3.11.GA.jar"/>
-    <classpathentry kind="lib" path="lib/test/arquillian-testenricher-resource-1.0.0.CR7.jar"/>
-    <classpathentry kind="lib" path="lib/test/org.osgi.core-4.2.0.jar"/>
-    <classpathentry kind="lib" path="lib/test/arquillian-container-test-spi-1.0.0.CR7.jar"/>
-    <classpathentry kind="lib" path="lib/test/aether-connector-wagon-1.8.jar"/>
-    <classpathentry kind="lib" path="lib/test/jboss-as-build-config-7.1.1.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/arquillian-testenricher-initialcontext-1.0.0.CR7.jar"/>
-    <classpathentry kind="lib" path="lib/test/jboss-as-remoting-7.1.1.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/arquillian-container-spi-1.0.0.CR7.jar"/>
-    <classpathentry kind="lib" path="lib/test/jboss-interceptors-api_1.1_spec-1.0.0.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/jboss-as-deployment-repository-7.1.1.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/shrinkwrap-spi-1.0.0-cr-1.jar"/>
-    <classpathentry kind="lib" path="lib/test/jboss-transaction-api_1.1_spec-1.0.0.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/xbean-reflect-3.4.jar"/>
-    <classpathentry kind="lib" path="lib/test/aether-spi-1.8.jar"/>
-    <classpathentry kind="lib" path="lib/test/jbosgi-metadata-2.0.3.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/jbosgi-resolver-felix-1.0.13.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/shrinkwrap-resolver-api-1.0.0-beta-5.jar"/>
+    <classpathentry kind="lib" path="lib/test/jboss-marshalling-1.3.9.GA.jar"/>
+    <classpathentry kind="lib" path="lib/test/jboss-metadata-common-7.0.1.Final.jar"/>
+    <classpathentry kind="lib" path="lib/test/jboss-metadata-ear-7.0.1.Final.jar"/>
+    <classpathentry kind="lib" path="lib/test/jboss-modules-1.1.1.GA.jar"/>
+    <classpathentry kind="lib" path="lib/test/jboss-msc-1.0.2.GA.jar"/>
+    <classpathentry kind="lib" path="lib/test/jboss-remote-naming-1.0.2.Final.jar"/>
     <classpathentry kind="lib" path="lib/test/jboss-remoting-3.2.3.GA.jar"/>
-    <classpathentry kind="lib" path="lib/test/aether-util-1.8.jar"/>
+    <classpathentry kind="lib" path="lib/test/jboss-sasl-1.0.0.Final.jar"/>
     <classpathentry kind="lib" path="lib/test/jboss-stdio-1.0.1.GA.jar"/>
-    <classpathentry kind="lib" path="lib/test/xnio-api-3.0.0.GA.jar"/>
-    <classpathentry kind="lib" path="lib/test/jbosgi-deployment-1.0.12.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/jboss-as-arquillian-protocol-jmx-7.1.1.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/jboss-sasl-1.0.0.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/jboss-modules-1.1.1.GA.jar"/>
-    <classpathentry kind="lib" path="lib/test/jboss-dmr-1.1.1.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/jboss-remote-naming-1.0.2.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/remoting-jmx-1.0.2.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/shrinkwrap-api-1.0.0-cr-1.jar"/>
-    <classpathentry kind="lib" path="lib/test/org.osgi.compendium-4.2.0.jar"/>
+    <classpathentry kind="lib" path="lib/test/jboss-threads-2.0.0.GA.jar"/>
+    <classpathentry kind="lib" path="lib/test/jboss-transaction-api_1.1_spec-1.0.0.Final.jar"/>
+    <classpathentry kind="lib" path="lib/test/jboss-vfs-3.1.0.Final.jar"/>
+    <classpathentry kind="lib" path="lib/test/jdk-tools-jdk.jar"/>
+    <classpathentry kind="lib" path="lib/test/log4j-1.2.12.jar"/>
+    <classpathentry kind="lib" path="lib/test/maven-aether-provider-3.0.1.jar"/>
     <classpathentry kind="lib" path="lib/test/maven-model-builder-3.0.1.jar"/>
-    <classpathentry kind="lib" path="lib/test/shrinkwrap-impl-base-1.0.0-cr-1.jar"/>
-    <classpathentry kind="lib" path="lib/test/log4j-1.2.12.jar"/>
+    <classpathentry kind="lib" path="lib/test/maven-model-3.0.1.jar"/>
+    <classpathentry kind="lib" path="lib/test/maven-repository-metadata-3.0.1.jar"/>
     <classpathentry kind="lib" path="lib/test/maven-settings-builder-3.0.1.jar"/>
-    <classpathentry kind="lib" path="lib/test/jbosgi-resolver-api-v2-2.0.0.Beta2.jar"/>
-    <classpathentry kind="lib" path="lib/test/aether-api-1.8.jar"/>
-    <classpathentry kind="lib" path="lib/test/jboss-as-arquillian-testenricher-msc-7.1.1.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/jboss-common-core-2.2.17.GA.jar"/>
-    <classpathentry kind="lib" path="lib/test/maven-repository-metadata-3.0.1.jar"/>
-    <classpathentry kind="lib" path="lib/test/jboss-ejb-client-1.0.0.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/jboss-as-osgi-service-7.1.1.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/jboss-as-server-7.1.1.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/xnio-nio-3.0.3.GA.jar"/>
-    <classpathentry kind="lib" path="lib/test/jbosgi-vfs-1.0.7.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/jbosgi-spi-3.0.1.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/jboss-metadata-ear-7.0.1.Final.jar"/>
     <classpathentry kind="lib" path="lib/test/maven-settings-3.0.1.jar"/>
-    <classpathentry kind="lib" path="lib/test/maven-aether-provider-3.0.1.jar"/>
-    <classpathentry kind="lib" path="lib/test/jboss-metadata-common-7.0.1.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/arquillian-config-api-1.0.0.CR7.jar"/>
-    <classpathentry kind="lib" path="lib/test/jboss-as-network-7.1.1.Final.jar"/>
+    <classpathentry kind="lib" path="lib/testng.jar"/>
+    <classpathentry kind="lib" path="lib/test/org.apache.felix.resolver-0.1.0.Beta1.jar"/>
+    <classpathentry kind="lib" path="lib/test/org.osgi.compendium-4.2.0.jar"/>
+    <classpathentry kind="lib" path="lib/test/org.osgi.core-4.2.0.jar"/>
+    <classpathentry kind="lib" path="lib/test/org.osgi.enterprise-4.2.0.jar"/>
+    <classpathentry kind="lib" path="lib/test/plexus-cipher-1.4.jar"/>
+    <classpathentry kind="lib" path="lib/test/plexus-classworlds-2.2.2.jar"/>
     <classpathentry kind="lib" path="lib/test/plexus-component-annotations-1.5.5.jar"/>
-    <classpathentry kind="lib" path="lib/test/wagon-http-shared-1.0-beta-7.jar"/>
     <classpathentry kind="lib" path="lib/test/plexus-container-default-1.5.5.jar"/>
-    <classpathentry kind="lib" path="lib/test/jboss-as-domain-management-7.1.1.Final.jar"/>
-    <classpathentry kind="lib" path="lib/test/org.osgi.enterprise-4.2.0.jar"/>
+    <classpathentry kind="lib" path="lib/test/plexus-interpolation-1.14.jar"/>
+    <classpathentry kind="lib" path="lib/test/plexus-sec-dispatcher-1.3.jar"/>
+    <classpathentry kind="lib" path="lib/test/plexus-utils-2.0.4.jar"/>
+    <classpathentry kind="lib" path="lib/test/remoting-jmx-1.0.2.Final.jar"/>
+    <classpathentry kind="lib" path="lib/test/shrinkwrap-api-1.0.0-cr-1.jar"/>
+    <classpathentry kind="lib" path="lib/test/shrinkwrap-descriptors-api-1.1.0-beta-1.jar"/>
+    <classpathentry kind="lib" path="lib/test/shrinkwrap-descriptors-spi-1.1.0-beta-1.jar"/>
+    <classpathentry kind="lib" path="lib/test/shrinkwrap-impl-base-1.0.0-cr-1.jar"/>
+    <classpathentry kind="lib" path="lib/test/shrinkwrap-resolver-api-maven-1.0.0-beta-5.jar"/>
+    <classpathentry kind="lib" path="lib/test/shrinkwrap-resolver-api-1.0.0-beta-5.jar"/>
     <classpathentry kind="lib" path="lib/test/shrinkwrap-resolver-impl-maven-1.0.0-beta-5.jar"/>
-    <classpathentry kind="lib" path="lib/test/jboss-marshalling-1.3.9.GA.jar"/>
-    <classpathentry kind="lib" path="lib/junit.jar"/>
-    <classpathentry kind="lib" path="lib/ehcache.jar"/>
-    <classpathentry kind="lib" path="lib/spring-web.jar"/>
-    <classpathentry kind="lib" path="lib/aopalliance.jar"/>
-    <classpathentry kind="lib" path="lib/lucene-analyzers.jar"/>
-    <classpathentry kind="lib" path="lib/jboss-seam-remoting.jar"/>
-    <classpathentry kind="lib" path="lib/jboss-jsp-api_2.2_spec.jar"/>
-    <classpathentry kind="lib" path="lib/spring-orm.jar"/>
-    <classpathentry kind="lib" path="lib/jxl.jar"/>
-    <classpathentry kind="lib" path="lib/drools-decisiontables.jar"/>
-    <classpathentry kind="lib" path="lib/commons-beanutils.jar"/>
-    <classpathentry kind="lib" path="lib/commons-logging.jar"/>
-    <classpathentry kind="lib" path="lib/hibernate-core.jar"/>
-    <classpathentry kind="lib" path="lib/poi-scratchpad.jar"/>
-    <classpathentry kind="lib" path="lib/backport-util-concurrent.jar"/>
-    <classpathentry kind="lib" path="lib/resteasy-jaxb-provider.jar"/>
-    <classpathentry kind="lib" path="lib/richfaces-components-ui.jar"/>
-    <classpathentry kind="lib" path="lib/jaxb-api.jar"/>
-    <classpathentry kind="lib" path="lib/annotations.jar"/>
-    <classpathentry kind="lib" path="lib/drools-templates.jar"/>
-    <classpathentry kind="lib" path="lib/jboss-seam-excel.jar"/>
-    <classpathentry kind="lib" path="lib/stax2-api.jar"/>
+    <classpathentry kind="lib" path="lib/test/shrinkwrap-spi-1.0.0-cr-1.jar"/>
+    <classpathentry kind="lib" path="lib/test/slf4j-api-1.6.1.jar"/>
+    <classpathentry kind="lib" path="lib/test/staxmapper-1.1.0.Final.jar"/>
+    <classpathentry kind="lib" path="lib/test/validation-api-1.0.0.GA.jar"/>
+    <classpathentry kind="lib" path="lib/test/wagon-file-1.0-beta-7.jar"/>
+    <classpathentry kind="lib" path="lib/test/wagon-http-lightweight-1.0-beta-7.jar"/>
+    <classpathentry kind="lib" path="lib/test/wagon-http-shared-1.0-beta-7.jar"/>
+    <classpathentry kind="lib" path="lib/test/wagon-provider-api-1.0-beta-7.jar"/>
+    <classpathentry kind="lib" path="lib/test/xbean-reflect-3.4.jar"/>
+    <classpathentry kind="lib" path="lib/test/xnio-api-3.0.0.GA.jar"/>
+    <classpathentry kind="lib" path="lib/test/xnio-nio-3.0.3.GA.jar"/>
+    <classpathentry kind="lib" path="lib/urlrewritefilter.jar"/>
     <classpathentry kind="lib" path="lib/validation-api.jar"/>
-    <classpathentry kind="lib" path="lib/bsh.jar"/>
-    <classpathentry kind="lib" path="lib/itext-rtf.jar"/>
-    <classpathentry kind="lib" path="lib/jboss-interceptors-api_1.1_spec.jar"/>
-    <classpathentry kind="lib" path="lib/snappy-java.jar"/>
-    <classpathentry kind="lib" path="lib/jackrabbit-text-extractors.jar"/>
-    <classpathentry kind="lib" path="lib/ant.jar"/>
-    <classpathentry kind="lib" path="lib/jsr305.jar"/>
-    <classpathentry kind="lib" path="lib/lucene-spatial.jar"/>
-    <classpathentry kind="lib" path="lib/jboss-system.jar"/>
-    <classpathentry kind="lib" path="lib/richfaces-components-api.jar"/>
-    <classpathentry kind="lib" path="lib/urlrewritefilter.jar"/>
-    <classpathentry kind="lib" path="lib/woodstox-core-asl.jar"/>
-    <classpathentry kind="lib" path="lib/infinispan-tree.jar"/>
-    <classpathentry kind="lib" path="lib/gwt-user.jar"/>
-    <classpathentry kind="lib" path="lib/jaxrs-api.jar"/>
-    <classpathentry kind="lib" path="lib/httpclient.jar"/>
-    <classpathentry kind="lib" path="lib/derby.jar"/>
-    <classpathentry kind="lib" path="lib/gwt-servlet.jar"/>
-    <classpathentry kind="lib" path="lib/avro.jar"/>
-    <classpathentry kind="lib" path="lib/slf4j-api.jar"/>
-    <classpathentry kind="lib" path="lib/portlet-api.jar"/>
-    <classpathentry kind="lib" path="lib/commons-collections.jar"/>
-    <classpathentry kind="lib" path="lib/ecj.jar"/>
-    <classpathentry kind="lib" path="lib/dbunit.jar"/>
-    <classpathentry kind="lib" path="lib/lucene-spellchecker.jar"/>
-    <classpathentry kind="lib" path="lib/hibernate-search-orm.jar"/>
-    <classpathentry kind="lib" path="lib/commons-io.jar"/>
-    <classpathentry kind="lib" path="lib/activation.jar"/>
-    <classpathentry kind="lib" path="lib/joda-time.jar"/>
-    <classpathentry kind="lib" path="lib/jsr250-api.jar"/>
-    <classpathentry kind="lib" path="lib/blazeds-core.jar"/>
-    <classpathentry kind="lib" path="lib/testng.jar"/>
+    <classpathentry kind="lib" path="lib/wicket-datetime.jar"/>
+    <classpathentry kind="lib" path="lib/wicket-extensions.jar"/>
     <classpathentry kind="lib" path="lib/wicket-ioc.jar"/>
-    <classpathentry kind="lib" path="lib/lucene-misc.jar"/>
-    <classpathentry kind="lib" path="lib/hibernate-validator.jar"/>
-    <classpathentry kind="lib" path="lib/jboss-logging.jar"/>
-    <classpathentry kind="lib" path="lib/groovy-all.jar"/>
-    <classpathentry kind="lib" path="lib/lucene-smartcn.jar"/>
-    <classpathentry kind="lib" path="lib/jboss-marshalling-river.jar"/>
-    <classpathentry kind="lib" path="lib/guice.jar"/>
-    <classpathentry kind="lib" path="lib/cglib.jar"/>
-    <classpathentry kind="lib" path="lib/jboss-jmx.jar"/>
-    <classpathentry kind="lib" path="lib/jbosscache-core.jar"/>
-    <classpathentry kind="lib" path="lib/jboss-transaction-api_1.1_spec.jar"/>
-    <classpathentry kind="lib" path="lib/commons-lang.jar"/>
-    <classpathentry kind="lib" path="lib/jboss-seam.jar"/>
-    <classpathentry kind="lib" path="lib/pdfbox.jar"/>
-    <classpathentry kind="lib" path="lib/jboss-seam-ioc.jar"/>
-    <classpathentry kind="lib" path="lib/knowledge-api.jar"/>
-    <classpathentry kind="lib" path="lib/rhq-pluginAnnotations.jar"/>
-    <classpathentry kind="lib" path="lib/jboss-servlet-api_3.0_spec.jar"/>
-    <classpathentry kind="lib" path="lib/jsf-impl.jar"/>
-    <classpathentry kind="lib" path="lib/jbpm-jpdl.jar"/>
-    <classpathentry kind="lib" path="lib/lucene-stempel.jar"/>
-    <classpathentry kind="lib" path="lib/jta.jar"/>
-    <classpathentry kind="lib" path="lib/jettison.jar"/>
-    <classpathentry kind="lib" path="lib/jfreechart.jar"/>
-    <classpathentry kind="lib" path="lib/infinispan-core.jar"/>
-    <classpathentry kind="lib" path="lib/jcip-annotations.jar"/>
-    <classpathentry kind="lib" path="lib/servlet-api.jar"/>
-    <classpathentry kind="lib" path="lib/jboss-seam-flex.jar"/>
-    <classpathentry kind="lib" path="lib/saaj-api.jar"/>
-    <classpathentry kind="lib" path="lib/yarfraw.jar"/>
-    <classpathentry kind="lib" path="lib/spring-jdbc.jar"/>
-    <classpathentry kind="lib" path="lib/drools-compiler.jar"/>
-    <classpathentry kind="lib" path="lib/jboss-ejb-api_3.1_spec.jar"/>
-    <classpathentry kind="lib" path="lib/lucene-grouping.jar"/>
-    <classpathentry kind="lib" path="lib/jboss-jms-api_1.1_spec.jar"/>
-    <classpathentry kind="lib" path="lib/hibernate-commons-annotations.jar"/>
-    <classpathentry kind="lib" path="lib/jackrabbit-spi.jar"/>
-    <classpathentry kind="lib" path="lib/jboss-cache.jar"/>
-    <classpathentry kind="lib" path="lib/jcommon.jar"/>
-    <classpathentry kind="lib" path="lib/slf4j-log4j12.jar"/>
-    <classpathentry kind="lib" path="lib/spring-asm.jar"/>
-    <classpathentry kind="lib" path="lib/jboss-seam-rss.jar"/>
-    <classpathentry kind="lib" path="lib/solr-solrj.jar"/>
-    <classpathentry kind="lib" path="lib/spring-core.jar"/>
-    <classpathentry kind="lib" path="lib/hibernate-entitymanager.jar"/>
-    <classpathentry kind="lib" path="lib/lucene-memory.jar"/>
-    <classpathentry kind="lib" path="lib/jackson-mapper-asl.jar"/>
-    <classpathentry kind="lib" path="lib/solr-commons-csv.jar"/>
-    <classpathentry kind="lib" path="lib/openid4java-nodeps.jar"/>
     <classpathentry kind="lib" path="lib/wicket.jar"/>
-    <classpathentry kind="lib" path="lib/jackrabbit-api.jar"/>
-    <classpathentry kind="lib" path="lib/jboss-seam-mail.jar"/>
+    <classpathentry kind="lib" path="lib/woodstox-core-asl.jar"/>
+    <classpathentry kind="lib" path="lib/xercesImpl.jar"/>
     <classpathentry kind="lib" path="lib/xml-apis.jar"/>
-    <classpathentry kind="lib" path="lib/hibernate-search-analyzers.jar"/>
-    <classpathentry kind="lib" path="lib/jackson-core-asl.jar"/>
-    <classpathentry kind="lib" path="lib/spring-beans.jar"/>
-    <classpathentry kind="lib" path="lib/solr-analysis-extras.jar"/>
-    <classpathentry kind="lib" path="lib/dom4j.jar"/>
-    <classpathentry kind="lib" path="lib/jboss-seam-ui.jar"/>
-    <classpathentry kind="lib" path="lib/wicket-datetime.jar"/>
-    <classpathentry kind="lib" path="lib/wicket-extensions.jar"/>
-    <classpathentry kind="lib" path="lib/@driverJar@"/>
-    <classpathentry kind="output" path="test-build"/>
+    <classpathentry kind="lib" path="lib/yarfraw.jar"/>
 </classpath>

Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/ivy/ivy-build.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/dist/ivy/ivy-build.xml	2012-09-10 13:19:48 UTC (rev 15121)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/ivy/ivy-build.xml	2012-09-10 19:24:23 UTC (rev 15122)
@@ -1,21 +1,19 @@
 <?xml version="1.0"?>
 <project basedir="." xmlns:ivy="antlib:org.apache.ivy.ant" name="@projectName at -ivy">
-	<property name="ivy.install.version" value="2.0.0"/>
+	<property name="ivy.install.version" value="2.2.0"/>
 	<property name="ivy.jar.dir" value="${lib.dir}/ivy"/>
 	<property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar"/>
 	<property name="ivy.sync" value="false"/>
 	<property name="ivy.use.symlinks" value="false"/>
 	<property name="central.repo" value="http://repo1.maven.org/maven2"/>
 	<property name="jboss.repo" value="http://repository.jboss.org/nexus/content/groups/public"/>
-	<property name="jboss.deprecated.repo" value="https://repository.jboss.org/nexus/content/repositories/deprecated/"/>
-	
 
 	<!-- centralize some key artifact versions -->
-	<property name="seam.version" value="2.2.1.CR2"/>
-	<property name="jsf.version" value="1.2_12"/>
+	<property name="seam.version" value="2.3.0.CR1-SNAPSHOT"/>
+	<!--<property name="jsf.version" value="1.2_12"/>
 	<property name="richfaces.version" value="3.3.3.Final"/>
 	<property name="icefaces.version" value="1.8.1"/>
-	<property name="jboss-embedded.version" value="beta3.SP10"/>
+	<property name="jboss-embedded.version" value="beta3.SP10"/> -->
 
 	<target name="init-ivy">
 		<available property="ivy.installed" value="true" file="${ivy.jar.file}" type="file"/>

Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/ivy/ivy.settings.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/dist/ivy/ivy.settings.xml	2012-09-10 13:19:48 UTC (rev 15121)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/ivy/ivy.settings.xml	2012-09-10 19:24:23 UTC (rev 15122)
@@ -4,12 +4,10 @@
 	<include url="${ivy.default.settings.dir}/ivysettings.xml" />
 	<resolvers>
 		<ibiblio name="jboss" m2compatible="true" usepoms="true" root="${jboss.repo}" pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/>
-		<ibiblio name="jboss-deprec" m2compatible="true" usepoms="true" root="${jboss.deprecated.repo}" pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/>
 		<chain name="seam" dual="true">
 			<!-- local is always checked; public needs to be before jboss to allow Ivy to properly locate sources -->
 			<resolver ref="public"/>
 			<resolver ref="jboss"/>
-			<resolver ref="jboss-deprec"/>
 		</chain>
 	</resolvers>
 </ivysettings>

Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/test/ActionTest.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/dist/test/ActionTest.java	2012-09-10 13:19:48 UTC (rev 15121)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/test/ActionTest.java	2012-09-10 19:24:23 UTC (rev 15122)
@@ -1,10 +1,29 @@
 package @testPackage@;
 
-import org.testng.annotations.Test;
+import org.junit.Test;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.seam.mock.JUnitSeamTest;
+import @testPackage at .Deployments;
+import  @actionPackage at .@interfaceName@;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.runner.RunWith;
 
+ at RunWith(Arquillian.class)
 public class @interfaceName at Test extends JUnitSeamTest {
 
+   @Deployment(name="@interfaceName at Test")
+   @OverProtocol("Servlet 3.0") 
+   public static WebArchive createDeployment()
+   {
+      // use in case jbpm is required in test deployment
+      // return Deployments.jbpmSeamDeployment().addClasses(ProcessComponent.class);
+      return Deployments.defaultWarDeployment()
+            .addClasses(@interfaceName at .class);
+   }
+   
+   
 	@Test
 	public void test_ at methodName@() throws Exception {
 		new FacesRequest("/@pageName at .xhtml") {

Added: branches/community/Seam_2_3/jboss-seam-gen/dist/test/Deployments.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/dist/test/Deployments.java	                        (rev 0)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/test/Deployments.java	2012-09-10 19:24:23 UTC (rev 15122)
@@ -0,0 +1,20 @@
+package @testPackage@;
+
+import java.io.File;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.importer.ZipImporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+
+public class Deployments {
+   public static EnterpriseArchive defaultEarDeployment() {
+      return ShrinkWrap.create(ZipImporter.class, "@projectName at .ear").importFrom(new File("@workspaceHome@/@projectName@/test-build/@projectName at .ear"))
+            .as(EnterpriseArchive.class);
+   }
+   
+   public static WebArchive defaultWarDeployment() {
+      return ShrinkWrap.create(ZipImporter.class, "@projectName at .war").importFrom(new File("@workspaceHome@/@projectName@/test-build/@projectName at .war"))
+            .as(WebArchive.class);
+   }
+}
\ No newline at end of file

Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/test/FormTest.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/dist/test/FormTest.java	2012-09-10 13:19:48 UTC (rev 15121)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/test/FormTest.java	2012-09-10 19:24:23 UTC (rev 15122)
@@ -1,10 +1,29 @@
 package @testPackage@;
 
-import org.testng.annotations.Test;
-import org.jboss.seam.mock.SeamTest;
+import junit.framework.Assert;
 
-public class @interfaceName at Test extends SeamTest {
+import org.junit.Test;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.OverProtocol;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.seam.mock.JUnitSeamTest;
+import org.jboss.shrinkwrap.api.Archive;
+import org.junit.runner.RunWith;
+import  @actionPackage at .@interfaceName@;
 
+ at RunWith(Arquillian.class)
+public class @interfaceName at Test extends JUnitSeamTest {
+
+   @Deployment(name="@interfaceName at Test")
+   @OverProtocol("Servlet 3.0") 
+   public static Archive<?> createDeployment()
+   {
+      // use in case jbpm is required in test deployment
+      // return Deployments.jbpmSeamDeployment().addClasses(ProcessComponent.class);
+      return Deployments.defaultWarDeployment()
+            .addClasses(@interfaceName at .class);
+   }
+   
 	@Test
 	public void test_ at methodName@() throws Exception {
 		new FacesRequest("/@pageName at .xhtml") {
@@ -21,7 +40,7 @@
 			@Override
 			protected void renderResponse() {
 				//check model attributes if needed
-				assert getValue("#{@componentName at .value}").equals("seam");
+			   Assert.assertEquals("seam",  getValue("#{@componentName at .value}"));
 			}
 		}.run();
 	}

Added: branches/community/Seam_2_3/jboss-seam-gen/dist/test/arquillian.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/dist/test/arquillian.xml	                        (rev 0)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/test/arquillian.xml	2012-09-10 19:24:23 UTC (rev 15122)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<arquillian xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="http://jboss.org/schema/arquillian"
+    xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
+
+    <!-- Uncomment to have test archives exported to the file system for inspection.
+          This feature can also be controlled using the system property arquillian.deploymentExportPath -->
+    <!--
+    <engine>
+        <property name="deploymentExportPath">test-build</property>
+    </engine>
+    -->
+
+    <container qualifier="jboss" default="true">
+        <configuration>
+            <property name="javaVmArguments">-Xmx1024m -XX:MaxPermSize=512m</property>
+            <property name="jbossHome">@jbossHome@</property>
+            <property name="serverConfig">standalone-full.xml</property>
+        </configuration>
+    </container>
+
+</arquillian>
\ No newline at end of file

Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/test/readme.txt
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/dist/test/readme.txt	2012-09-10 13:19:48 UTC (rev 15121)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/test/readme.txt	2012-09-10 19:24:23 UTC (rev 15122)
@@ -1,4 +1,4 @@
-If you want to run tests using the Eclipse TestNG plugin, you'll need to add
+If you want to run tests using the Eclipse Junit plugin, you'll need to add
 these jars to the top of your TestNG classpath. Using the Run Dialog, select the
 XML suite to run, and select these entries from the project tree:
 



More information about the seam-commits mailing list