Author: dhinojosa Date: 2012-08-31 13:41:25 -0400 (Fri, 31 Aug 2012) New Revision: 15096 Added: branches/community/Seam_2_3/examples-ee6/dvdstore/build.xml branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ear/build.xml branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ear/src/main/resources/application-for-ant-only.xml branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ejb/build.xml branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/build.xml branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-web/build.xml Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ejb/pom.xml branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/pom.xml Log: Finished with ant for booking Copied: branches/community/Seam_2_3/examples-ee6/dvdstore/build.xml (from rev 15094, branches/community/Seam_2_3/examples-ee6/booking/build.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/dvdstore/build.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/dvdstore/build.xml 2012-08-31 17:41:25 UTC (rev 15096) @@ -0,0 +1,22 @@ +<?xml version="1.0"?> +<project name="dvdstore" basedir="."> + + <property name="dvdstore.ear.dir" value="${basedir}/dvdstore-ear"/> + <property name="dvdstore.ejb.dir" value="${basedir}/dvdstore-ejb"/> + <property name="dvdstore.web.dir" value="${basedir}/dvdstore-web"/> + <property name="dvdstore.tests.dir" value="${basedir}/dvdstore-tests"/> + + <target name="clean" description="Cleans up the target directory in every module"> + <ant antfile="${dvdstore.ear.dir}/build.xml" target="clean" inheritAll="false"/> + <ant antfile="${dvdstore.ejb.dir}/build.xml" target="clean" inheritAll="false"/> + <ant antfile="${dvdstore.web.dir}/build.xml" target="clean" inheritAll="false"/> + <ant antfile="${dvdstore.tests.dir}/build.xml" target="clean" inheritAll="false"/> + </target> + + <target name="package" description="Cleans up the target directory in every module"> + <ant antfile="${dvdstore.ear.dir}/build.xml" target="package" inheritAll="false"/> + <ant antfile="${dvdstore.ejb.dir}/build.xml" target="package" inheritAll="false"/> + <ant antfile="${dvdstore.web.dir}/build.xml" target="package" inheritAll="false"/> + </target> + +</project> Copied: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ear/build.xml (from rev 15094, branches/community/Seam_2_3/examples-ee6/booking/booking-ear/build.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ear/build.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ear/build.xml 2012-08-31 17:41:25 UTC (rev 15096) @@ -0,0 +1,132 @@ +<?xml version="1.0"?> +<project name="dvdstore-ejb" basedir="." + xmlns:artifact="antlib:org.apache.maven.artifact.ant"> + + <!-- set global properties for this build --> + <property environment="env"/> + <property name="project.name" value="dvdstore-ear"/> + + <property name="root.dir" value="../../.."/> + <property name="project.parent.dir" value=".."/> + + <property name="target.dir" value="target"/> + <property name="target.classes.dir" value="${target.dir}/classes"/> + <property name="target.test-classes.dir" value="${target.dir}/test-classes"/> + <property name="target.dvdstore.ear.dir" value="${target.dir}/dvdstore-ear"/> + + <property name="src.main.resources.dir" value="${basedir}/src/main/resources"/> + <property name="src.main.application.dir" value="${basedir}/src/main/application"/> + + <property name="dvdstore.ejb.dir" value="${project.parent.dir}/dvdstore-ejb"/> + <property name="dvdstore.web.dir" value="${project.parent.dir}/dvdstore-web"/> + + + <path id="build.lib.classpath"> + <fileset dir="${root.dir}/build/lib"> + <include name="**/*.jar"/> + </fileset> + </path> + + <typedef resource="org/apache/maven/artifact/ant/antlib.xml" + uri="antlib:org.apache.maven.artifact.ant" + classpathref="build.lib.classpath"/> + + <artifact:dependencies pathId="build.classpath"> + <dependency groupId="org.codehaus.groovy" artifactId="groovy" version="2.0.1"/> + <dependency groupId="org.codehaus.groovy" artifactId="groovy-ant" version="2.0.1"/> + <dependency groupId="commons-cli" artifactId="commons-cli" version="1.2"/> + <dependency groupId="junit" artifactId="junit" version="4.10" scope="test"/> + </artifact:dependencies> + + + <artifact:dependencies pathId="project.classpath" filesetId="project.fileset"> + <dependency groupId="org.jboss.seam" artifactId="jboss-seam" version="2.3.0.CR1-SNAPSHOT" scope="compile"> + <exclusion groupId="org.testng" artifactId="testng"/> + <exclusion groupId="junit" artifactId="junit"/> + <exclusion groupId="org.jboss.spec.javax.faces" artifactId="jboss-jsf-api_2.0_spec"/> + <exclusion groupId="javax.el" artifactId="el-api"/> + <exclusion groupId="org.jboss.el" artifactId="jboss-el"/> + </dependency> + </artifact:dependencies> + + <artifact:dependencies pathId="lib.classpath" filesetId="lib.fileset"> + <dependency groupId="org.hibernate" artifactId="hibernate-search" version="4.2.0.Beta1" scope="compile"> + <exclusion groupId="org.hibernate" artifactId="hibernate-core"/> + <exclusion groupId="org.hibernate" artifactId="ejb3-persistence"/> + <exclusion groupId="javax.transaction" artifactId="jta"/> + <exclusion groupId="hsqldb" artifactId="hsqldb"/> + <exclusion groupId="org.jboss.logging" artifactId="jboss-logging"/> + </dependency> + <dependency groupId="org.jbpm.jbpm3" artifactId="jbpm-jpdl" version="3.2.10.SP3_seam2" scope="compile"> + <exclusion groupId="org.apache.jackrabbit" artifactId="jackrabbit-core"/> + <exclusion groupId="cglib" artifactId="cglib"/> + <exclusion groupId="org.slf4j" artifactId="slf4j-api"/> + <exclusion groupId="org.slf4j" artifactId="slf4j-log4j12"/> + <exclusion artifactId="hibernate-ehcache" groupId="org.hibernate"/> + <exclusion artifactId="dom4j" groupId="dom4j"/> + </dependency> + <dependency groupId="org.beanshell" artifactId="bsh" version="2.0b4" scope="compile"/> + <dependency groupId="org.javassist" artifactId="javassist" version="3.15.0-GA" scope="compile"/> + </artifact:dependencies> + + <target name="clean" description="Cleans up the target directory"> + <delete dir="${target.dir}"/> + </target> + + <target name="init"> + <tstamp/> + <mkdir dir="${target.dir}"/> + <condition property="dvdstore.jar.exists"> + <and> + <available file="${dvdstore.ejb.dir}/target" type="dir"/> + <available file="${dvdstore.ejb.dir}/target/dvdstore-ejb.jar"/> + </and> + </condition> + <condition property="dvdstore.web.exists"> + <and> + <available file="${dvdstore.web.dir}/target" type="dir"/> + <available file="${dvdstore.web.dir}/target/dvdstore-web.war"/> + </and> + </condition> + <echo message="${dvdstore.jar.exists}"/> + <echo message="${dvdstore.war.exists}"/> + + </target> + + <target name="build-dvdstore-ejb" depends="init" unless="dvdstore.jar.exists"> + <ant antfile="${dvdstore.ejb.dir}/build.xml" target="package" inheritAll="false"/> + </target> + + <target name="build-dvdstore-web" depends="build-dvdstore-ejb" unless="dvdstore.web.exists"> + <ant antfile="${dvdstore.web.dir}/build.xml" target="package" inheritAll="false"/> + </target> + + <target name="package" depends="build-dvdstore-web" description="Compile the Java source code"> + <copy todir="${target.dvdstore.ear.dir}"> + <fileset refid="project.fileset"/> + <!-- This mapper strips off all leading directory information --> + <chainedmapper> + <mapper type="flatten"/> + <mapper type="glob" from="jboss-seam*.jar" to="jboss-seam.jar"/> + </chainedmapper> + </copy> + + <copy todir="${target.dvdstore.ear.dir}/lib"> + <fileset refid="lib.fileset"/> + <mapper type="flatten"/> + </copy> + + <ear destfile="${target.dir}/seam-dvdstore.ear" + appxml="${src.main.resources.dir}/application-for-ant-only.xml"> + <metainf dir="${src.main.application.dir}/META-INF"> + <include name="*.xml"/> + </metainf> + + <fileset file="${dvdstore.ejb.dir}/target/dvdstore-ejb.jar"/> + <fileset file="${dvdstore.web.dir}/target/dvdstore-web.war"/> + <fileset dir="${target.dvdstore.ear.dir}"> + <include name="**/*"/> + </fileset> + </ear> + </target> +</project> \ No newline at end of file Copied: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ear/src/main/resources/application-for-ant-only.xml (from rev 15091, branches/community/Seam_2_3/examples-ee6/booking/booking-ear/src/main/resources/application-for-ant-only.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ear/src/main/resources/application-for-ant-only.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ear/src/main/resources/application-for-ant-only.xml 2012-08-31 17:41:25 UTC (rev 15096) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<application xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_6.xsd" version="6"> + <description>Examples for Seam 2 Framework in Java EE6 environment</description> + <display-name>dvdstore-ear</display-name> + <module> + <web> + <web-uri>dvdstore-web.war</web-uri> + <context-root>/seam-dvdstore</context-root> + </web> + </module> + <module> + <ejb>dvdstore-ejb.jar</ejb> + </module> + <module> + <ejb>jboss-seam.jar</ejb> + </module> + <library-directory>lib</library-directory> +</application> \ No newline at end of file Copied: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ejb/build.xml (from rev 15094, branches/community/Seam_2_3/examples-ee6/booking/booking-ejb/build.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ejb/build.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ejb/build.xml 2012-08-31 17:41:25 UTC (rev 15096) @@ -0,0 +1,148 @@ +<?xml version="1.0"?> +<project name="dvdstore-ejb" basedir="." + xmlns:artifact="antlib:org.apache.maven.artifact.ant"> + <!-- set global properties for this build --> + <property environment="env"/> + <property name="project.name" value="dvdstore-ejb"/> + <property name="root.dir" value="../../.."/> + + <property name="target.dir" value="target"/> + <property name="target.classes.dir" value="${target.dir}/classes"/> + <property name="target.test-classes.dir" value="${target.dir}/test-classes"/> + + <property name="src.main.java.dir" value="${basedir}/src/main/java"/> + <property name="src.test.java.dir" value="${basedir}/src/test/java"/> + <property name="src.main.groovy.dir" value="${basedir}/src/main/groovy"/> + <property name="src.test.groovy.dir" value="${basedir}/src/test/groovy"/> + <property name="src.main.resources.dir" value="${basedir}/src/main/resources"/> + + <property name="javac.debug" value="true"/> + <property name="javac.deprecation" value="false"/> + <property name="debug" value="false"/> + <property name="groovy.home" value="${env.GROOVY_HOME}"/> + + <path id="build.lib.classpath"> + <fileset dir="${root.dir}/build/lib"> + <include name="**/*.jar"/> + </fileset> + </path> + + <typedef resource="org/apache/maven/artifact/ant/antlib.xml" + uri="antlib:org.apache.maven.artifact.ant" + classpathref="build.lib.classpath"/> + + <artifact:dependencies pathId="build.classpath"> + <dependency groupId="org.codehaus.groovy" artifactId="groovy" version="2.0.1"/> + <dependency groupId="org.codehaus.groovy" artifactId="groovy-ant" version="2.0.1"/> + <dependency groupId="commons-cli" artifactId="commons-cli" version="1.2"/> + <dependency groupId="junit" artifactId="junit" version="4.10" scope="test"/> + </artifact:dependencies> + + + <artifact:dependencies pathId="project.classpath"> + <dependency groupId="org.hibernate" artifactId="hibernate-entitymanager" version="4.1.0.Final" + scope="provided"/> + <dependency groupId="org.hibernate" artifactId="hibernate-validator" version="4.2.0.Final" scope="provided"/> + + <dependency groupId="org.jboss.seam" artifactId="jboss-seam" version="2.3.0.CR1-SNAPSHOT" scope="compile"> + <exclusion groupId="org.testng" artifactId="testng"/> + <exclusion groupId="junit" artifactId="junit"/> + </dependency> + <dependency groupId="org.jboss.spec.javax.ejb" artifactId="jboss-ejb-api_3.1_spec" version="1.0.2.Final" + scope="provided"/> + <dependency groupId="org.jboss.spec.javax.faces" artifactId="jboss-jsf-api_2.1_spec" version="2.0.2.Final" + scope="provided"/> + + <dependency groupId="javax.annotation" artifactId="jsr250-api" version="1.0" scope="provided"/> + <dependency groupId="org.hibernate" artifactId="hibernate-search" version="4.2.0.Beta1" scope="compile"> + <exclusion groupId="org.hibernate" artifactId="hibernate-core"/> + <exclusion groupId="org.hibernate" artifactId="ejb3-persistence"/> + <exclusion groupId="javax.transaction" artifactId="jta"/> + <exclusion groupId="hsqldb" artifactId="hsqldb"/> + <exclusion groupId="org.jboss.logging" artifactId="jboss-logging"/> + </dependency> + <dependency groupId="org.jbpm.jbpm3" artifactId="jbpm-jpdl" version="3.2.10.SP3_seam2" scope="compile"> + <exclusion groupId="org.apache.jackrabbit" artifactId="jackrabbit-core"/> + <exclusion groupId="cglib" artifactId="cglib"/> + <exclusion groupId="org.slf4j" artifactId="slf4j-api"/> + <exclusion groupId="org.slf4j" artifactId="slf4j-log4j12"/> + <exclusion artifactId="hibernate-ehcache" groupId="org.hibernate"/> + <exclusion artifactId="dom4j" groupId="dom4j"/> + </dependency> + <dependency groupId="org.beanshell" artifactId="bsh" version="2.0b4" scope="compile"/> + <dependency groupId="org.javassist" artifactId="javassist" version="3.15.0-GA" scope="compile"/> + </artifact:dependencies> + + <taskdef name="groovyc" + classname="org.codehaus.groovy.ant.Groovyc" + classpathref="build.classpath"/> + + <target name="clean" description="Cleans up the target directory"> + <delete dir="${target.dir}"/> + </target> + + <target name="init"> + <tstamp/> + <mkdir dir="${target.dir}"/> + <mkdir dir="${src.main.java.dir}"/> + <condition property="src.test.java.dir.exists"> + <available file="${src.test.java.dir}" type="dir"/> + </condition> + </target> + + <target name="compile" depends="init" + description="Compile the Java source code"> + <mkdir dir="${target.classes.dir}"/> + <javac source="1.6" target="1.6" debug="${javac.debug}" + deprecation="${javac.deprecation}" + nowarn="on" + includeantruntime="false" + destdir="${target.classes.dir}"> + <src path="${src.main.java.dir}"/> + <classpath refid="project.classpath"/> + <compilerarg value="-Xlint"/> + </javac> + </target> + + <target name="compile-test" depends="compile" + if="${src.test.java.dir.exists}"> + <mkdir dir="${target.test-classes.dir}"/> + <javac source="1.6" target="1.6" debug="${javac.debug}" + deprecation="${javac.deprecation}" + destdir="${target.test-classes.dir}" + nowarn="on" + includeantruntime="false"> + <compilerarg value="-Xlint"/> + <src path="${src.test.java.dir}"/> + <classpath refid="project.classpath"/> + </javac> + </target> + + <target name="test" depends="compile-test" + if="${src.test.java.dir.exists}"> + <mkdir dir="${target.test.classes.dir}"/> + <junit printsummary="yes" haltonfailure="yes"> + <formatter type="xml"/> + <classpath refid="project.classpath"/> + <batchtest fork="yes" todir="${test.results.dir}"> + <fileset dir="${target.test.classes.dir}"/> + </batchtest> + </junit> + </target> + + <target name="package" depends="test" + description="Compile the Java source code"> + <jar destfile="${target.dir}/dvdstore-ejb.jar" + basedir="${target.classes.dir}"> + <metainf dir="${src.main.resources.dir}/META-INF"> + <include name="ejb-jar.xml"/> + <include name="persistence.xml"/> + </metainf> + <fileset dir="${src.main.resources.dir}"> + <include name="import.sql"/> + <include name="seam.properties"/> + <include name="*.xml"/> + </fileset> + </jar> + </target> +</project> \ No newline at end of file Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ejb/pom.xml 2012-08-29 18:12:10 UTC (rev 15095) +++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ejb/pom.xml 2012-08-31 17:41:25 UTC (rev 15096) @@ -1,134 +1,136 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>dvdstore</artifactId> - <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.CR1-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <groupId>org.jboss.seam.examples-ee6.dvdstore</groupId> - <artifactId>dvdstore-ejb</artifactId> - <packaging>ejb</packaging> - <name>Dvdstore EJB Module (EE6)</name> - - <dependencies> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - <type>ejb</type> - <exclusions> - <exclusion> - <artifactId>testng</artifactId> - <groupId>org.testng</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <scope>provided</scope> - <exclusions> - <exclusion> - <artifactId>jboss-logging</artifactId> - <groupId>org.jboss.logging</groupId> - </exclusion> - <exclusion> - <artifactId>dom4j</artifactId> - <groupId>dom4j</groupId> - </exclusion> - </exclusions> - </dependency> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>dvdstore</artifactId> + <groupId>org.jboss.seam.examples-ee6</groupId> + <version>2.3.0.CR1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> - <dependency> - <groupId>org.jboss.spec.javax.ejb</groupId> - <artifactId>jboss-ejb-api_3.1_spec</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-search</artifactId> - <exclusions> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>ejb3-persistence</artifactId> - </exclusion> - <exclusion> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - </exclusion> - <exclusion> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging</artifactId> - </exclusion> - </exclusions> - </dependency> + <groupId>org.jboss.seam.examples-ee6.dvdstore</groupId> + <artifactId>dvdstore-ejb</artifactId> + <packaging>ejb</packaging> + <name>Dvdstore EJB Module (EE6)</name> - <dependency> - <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.1_spec</artifactId> - <scope>provided</scope> - </dependency> + <dependencies> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <type>ejb</type> + <exclusions> + <exclusion> + <artifactId>testng</artifactId> + <groupId>org.testng</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> + <scope>provided</scope> + <exclusions> + <exclusion> + <artifactId>jboss-logging</artifactId> + <groupId>org.jboss.logging</groupId> + </exclusion> + <exclusion> + <artifactId>dom4j</artifactId> + <groupId>dom4j</groupId> + </exclusion> + </exclusions> + </dependency> - <dependency> - <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jbpm-jpdl</artifactId> - <exclusions> - <exclusion> - <groupId>org.apache.jackrabbit</groupId> - <artifactId>jackrabbit-core</artifactId> - </exclusion> - <exclusion> - <groupId>cglib</groupId> - <artifactId>cglib</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <artifactId>hibernate-ehcache</artifactId> - <groupId>org.hibernate</groupId> - </exclusion> - <exclusion> - <artifactId>dom4j</artifactId> - <groupId>dom4j</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.beanshell</groupId> - <artifactId>bsh</artifactId> - </dependency> - <dependency> - <groupId>org.javassist</groupId> - <artifactId>javassist</artifactId> - </dependency> - </dependencies> - + <dependency> + <groupId>org.jboss.spec.javax.ejb</groupId> + <artifactId>jboss-ejb-api_3.1_spec</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-search</artifactId> + <exclusions> + <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>ejb3-persistence</artifactId> + </exclusion> + <exclusion> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + </exclusion> + <exclusion> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.jboss.spec.javax.faces</groupId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jbpm.jbpm3</groupId> + <artifactId>jbpm-jpdl</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>jackrabbit-core</artifactId> + </exclusion> + <exclusion> + <groupId>cglib</groupId> + <artifactId>cglib</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <artifactId>hibernate-ehcache</artifactId> + <groupId>org.hibernate</groupId> + </exclusion> + <exclusion> + <artifactId>dom4j</artifactId> + <groupId>dom4j</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.beanshell</groupId> + <artifactId>bsh</artifactId> + </dependency> + <dependency> + <groupId>org.javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.15.0-GA</version> + </dependency> + </dependencies> + </project> Copied: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/build.xml (from rev 15094, branches/community/Seam_2_3/examples-ee6/booking/booking-tests/build.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/build.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/build.xml 2012-08-31 17:41:25 UTC (rev 15096) @@ -0,0 +1,270 @@ +<?xml version="1.0"?> +<project name="dvdstore-test" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant"> + + <!-- set global properties for this build --> + <property environment="env"/> + <property name="project.name" value="dvdstore-ejb"/> + <property name="root.dir" value="../../.."/> + + <property name="target.dir" value="target"/> + <property name="target.classes.dir" value="${target.dir}/classes"/> + <property name="target.test.classes.dir" value="${target.dir}/test-classes"/> + <property name="target.test.results.dir" value="${target.dir}/test-results"/> + <property name="target.test.reports.dir" value="${target.dir}/test-reports"/> + <property name="target.web.dir" value="${target.dir}/webapp"/> + + <property name="src.main.java.dir" value="${basedir}/src/main/java"/> + <property name="src.test.java.dir" value="${basedir}/src/test/java"/> + <property name="src.main.groovy.dir" value="${basedir}/src/main/groovy"/> + <property name="src.test.groovy.dir" value="${basedir}/src/test/groovy"/> + <property name="src.main.resources.dir" value="${basedir}/src/main/resources"/> + <property name="src.test.resources.dir" value="${basedir}/src/test/resources"/> + <property name="src.test.resources-integration.dir" value="${basedir}/src/test/resources-integration"/> + <property name="src.main.webapp.dir" value="${basedir}/src/main/webapp"/> + + + <property name="dvdstore.ear.dir" value="../dvdstore-ear"/> + <property name="dvdstore.ejb.dir" value="../dvdstore-ejb"/> + <property name="dvdstore.web.dir" value="../dvdstore-web"/> + + <property name="javac.debug" value="true"/> + <property name="javac.deprecation" value="false"/> + <property name="debug" value="false"/> + <property name="version.jbossas7" value="7.1.1.Final"/> + <property name="jndiPattern" value="java:app/seam-dvdstore/#{ejbName}"/> + + <path id="build.lib.classpath"> + <fileset dir="${root.dir}/build/lib"> + <include name="**/*.jar"/> + </fileset> + </path> + + <typedef resource="org/apache/maven/artifact/ant/antlib.xml" + uri="antlib:org.apache.maven.artifact.ant" + classpathref="build.lib.classpath"/> + + <artifact:dependencies pathId="build.classpath"> + <dependency groupId="org.codehaus.groovy" artifactId="groovy" version="2.0.1"/> + <dependency groupId="org.codehaus.groovy" artifactId="groovy-ant" version="2.0.1"/> + <dependency groupId="commons-cli" artifactId="commons-cli" version="1.2"/> + <dependency groupId="junit" artifactId="junit" version="4.10" scope="test"/> + </artifact:dependencies> + + <artifact:dependencies pathId="project.classpath"> + + <dependency groupId="org.jbpm.jbpm3" artifactId="jbpm-jpdl" version="3.2.10.SP3_seam2" scope="compile"> + <exclusion groupId="org.apache.jackrabbit" artifactId="jackrabbit-core"/> + <exclusion groupId="cglib" artifactId="cglib"/> + <exclusion groupId="org.slf4j" artifactId="slf4j-api"/> + <exclusion groupId="org.slf4j" artifactId="slf4j-log4j12"/> + <exclusion artifactId="hibernate-ehcache" groupId="org.hibernate"/> + <exclusion artifactId="dom4j" groupId="dom4j"/> + </dependency> + <dependency groupId="org.hibernate" artifactId="hibernate-search" version="4.2.0.Beta1" scope="compile"> + <exclusion groupId="org.hibernate" artifactId="hibernate-core"/> + <exclusion groupId="org.hibernate" artifactId="ejb3-persistence"/> + <exclusion groupId="javax.transaction" artifactId="jta"/> + <exclusion groupId="hsqldb" artifactId="hsqldb"/> + <exclusion groupId="org.jboss.logging" artifactId="jboss-logging"/> + </dependency> + <dependency groupId="org.jboss.seam" artifactId="jboss-seam" scope="compile" version="2.3.0.CR1-SNAPSHOT"/> + <dependency groupId="org.slf4j" artifactId="slf4j-log4j12" scope="test" version="1.6.1"/> + <dependency groupId="org.hibernate.javax.persistence" artifactId="hibernate-jpa-2.0-api" version="1.0.1.Final"/> + <dependency groupId="org.jboss.spec.javax.faces" artifactId="jboss-jsf-api_2.0_spec" version="1.0.0.Final"/> + <dependency groupId="javax.mail" artifactId="mail" version="1.4"/> + <dependency groupId="org.seleniumhq.selenium" artifactId="selenium-server" version="2.21.0"/> + <dependency groupId="org.seleniumhq.selenium" artifactId="selenium-java" version="2.21.0"/> + <dependency groupId="org.jboss.seam" artifactId="functional-tests" scope="test" version="2.3.0.CR1-SNAPSHOT"/> + <dependency groupId="junit" artifactId="junit" scope="test" version="4.8.2"/> + <dependency groupId="org.jboss.arquillian.junit" artifactId="arquillian-junit-container" scope="test" + version="1.0.1.Final"/> + <dependency groupId="org.jboss.arquillian.protocol" artifactId="arquillian-protocol-servlet" scope="test" + version="1.0.1.Final"/> + <dependency groupId="org.jboss.spec.javax.el" artifactId="jboss-el-api_2.2_spec" version="1.0.2.Final"/> + <dependency groupId="org.jboss.as" artifactId="jboss-as-arquillian-container-managed" version="7.1.2.Final" scope="test"/> + <dependency groupId="org.hibernate" artifactId="hibernate-validator" scope="provided" version="4.2.0.Final"/> + </artifact:dependencies> + + <artifact:dependencies pathId="lib.classpath" filesetId="lib.fileset"> + <dependency groupId="org.hibernate" artifactId="hibernate-search" version="4.2.0.Beta1" scope="compile"> + <exclusion groupId="org.hibernate" artifactId="hibernate-core"/> + <exclusion groupId="org.hibernate" artifactId="ejb3-persistence"/> + <exclusion groupId="javax.transaction" artifactId="jta"/> + <exclusion groupId="hsqldb" artifactId="hsqldb"/> + <exclusion groupId="org.jboss.logging" artifactId="jboss-logging"/> + </dependency> + <dependency groupId="org.jbpm.jbpm3" artifactId="jbpm-jpdl" version="3.2.10.SP3_seam2" scope="compile"> + <exclusion groupId="org.apache.jackrabbit" artifactId="jackrabbit-core"/> + <exclusion groupId="cglib" artifactId="cglib"/> + <exclusion groupId="org.slf4j" artifactId="slf4j-api"/> + <exclusion groupId="org.slf4j" artifactId="slf4j-log4j12"/> + <exclusion artifactId="hibernate-ehcache" groupId="org.hibernate"/> + <exclusion artifactId="dom4j" groupId="dom4j"/> + </dependency> + <dependency groupId="org.beanshell" artifactId="bsh" version="2.0b4" scope="compile"/> + <dependency groupId="org.javassist" artifactId="javassist" version="3.15.0-GA" scope="compile"/> + <dependency groupId="org.jboss.seam" artifactId="jboss-seam" scope="compile" version="2.3.0.CR1-SNAPSHOT"/> + </artifact:dependencies> + + <path id="combined.project.classpath"> + <path refid="project.classpath"/> + <pathelement location="${dvdstore.ejb.dir}/target/classes"/> + </path> + + <path id="combined.test.project.classpath"> + <path refid="combined.project.classpath"/> + <pathelement location="${target.test.classes.dir}"/> + </path> + + <taskdef name="groovyc" + classname="org.codehaus.groovy.ant.Groovyc" + classpathref="build.classpath"/> + + <target name="clean" description="Cleans up the target directory"> + <delete dir="${target.dir}"/> + </target> + + <target name="init"> + <tstamp/> + <mkdir dir="${target.dir}"/> + <mkdir dir="${target.classes.dir}"/> + <condition property="src.test.java.dir.exists"> + <available file="${src.test.java.dir}" type="dir"/> + </condition> + <condition property="dvdstore.ejb.target.classes.dir.exists"> + <available file="${dvdstore.ejb.dir}/target/classes" type="dir"/> + </condition> + <condition property="dvdstore.ear.exists"> + <available file="${dvdstore.ear.dir}/target/seam-dvdstore.ear" type="dir"/> + </condition> + <condition property="src.main.java.exists"> + <available file="${src.main.java.dir}" type="dir"/> + </condition> + </target> + + <target name="build-dvdstore-ejb" depends="init" unless="dvdstore.ejb.target.classes.dir.exists"> + <ant antfile="${dvdstore.ejb.dir}/build.xml" target="compile" inheritAll="false"/> + </target> + + <target name="build-dvdstore-ear" depends="build-dvdstore-ejb" unless="dvdstore.ear.exists"> + <ant antfile="${dvdstore.ear.dir}/build.xml" target="package" inheritAll="false"/> + </target> + + <target name="compile" depends="build-dvdstore-ear" if="${src.main.java.exists}" + description="Compile the Java source code"> + <javac source="1.6" target="1.6" debug="${javac.debug}" + deprecation="${javac.deprecation}" + nowarn="on" + includeantruntime="false"> + <src path="${src.main.java.dir}"/> + <classpath refid="combined.project.classpath"/> + <compilerarg value="-Xlint"/> + </javac> + </target> + + <target name="compile-test" depends="compile" + if="${src.test.java.dir.exists}"> + <mkdir dir="${target.test.classes.dir}"/> + + <javac source="1.6" target="1.6" debug="${javac.debug}" + deprecation="${javac.deprecation}" + destdir="${target.test.classes.dir}" + nowarn="on" + includeantruntime="false"> + <compilerarg value="-Xlint"/> + <src path="${src.test.java.dir}"/> + <classpath refid="combined.project.classpath"/> + </javac> + </target> + + <target name="process-test-resources" depends="compile-test"> + <!--<copy todir="${target.test.classes.dir}">--> + <!--<fileset dir="${src.test.resources.dir}">--> + <!--<include name="*"/>--> + <!--</fileset>--> + <!--<fileset dir="${src.test.resources-integration.dir}">--> + <!--<include name="*"/>--> + <!--</fileset>--> + <!--<fileset dir="${dvdstore.web.dir}/src/main/resources">--> + <!--<include name="*"/>--> + <!--</fileset>--> + <!--<filterset begintoken="${" endtoken="}">--> + <!--<filter token="version.jbossas7" value="${version.jbossas7}"/>--> + <!--</filterset>--> + <!--</copy>--> + </target> + + <target name="package" depends="process-test-resources"> + <mkdir dir="${target.web.dir}"/> + + <copy todir="${target.web.dir}"> + <fileset dir="${src.main.webapp.dir}"/> + <filterset begintoken="@" endtoken="@"> + <filter token="jndiPattern" value="${jndiPattern}"/> + </filterset> + </copy> + + <copy todir="${target.web.dir}/WEB-INF/lib"> + <fileset refid="lib.fileset"/> + <!-- This mapper strips off all leading directory information --> + <mapper type="flatten"/> + </copy> + + <copy todir="${target.web.dir}/WEB-INF"> + <fileset dir="${dvdstore.ear.dir}/src/main/application/META-INF/"> + <include name="**/*"/> + </fileset> + </copy> + + <copy todir="${target.web.dir}/WEB-INF"> + <fileset dir="${dvdstore.ejb.dir}/src/main/resources/META-INF/"> + <include name="ejb-jar.xml"/> + </fileset> + </copy> + + <copy todir="${target.web.dir}/WEB-INF/classes"> + <fileset dir="${dvdstore.ejb.dir}/src/main/resources"> + <include name="**/*"/> + </fileset> + </copy> + + <copy todir="${target.web.dir}"> + <fileset dir="${dvdstore.web.dir}/src/main/webapp"> + <include name="WEB-INF/pages.xml"/> + </fileset> + </copy> + + <war destfile="${target.dir}/seam-dvdstore.war" + webxml="${target.web.dir}/WEB-INF/web.xml"> + <fileset dir="${target.web.dir}"> + <exclude name="/WEB-INF/web.xml"/> + </fileset> + <classes dir="${target.classes.dir}"/> + </war> + </target> + + <target name="test" depends="package" + if="${src.test.java.dir.exists}"> + <mkdir dir="${target.test.results.dir}"/> + <mkdir dir="${target.test.reports.dir}"/> + <property name="myclasspath" refid="combined.test.project.classpath"/> + <echo message="${myclasspath}"/> + <junit printsummary="yes" haltonfailure="no"> + <formatter type="xml"/> + <classpath refid="combined.test.project.classpath"/> + <batchtest fork="yes" todir="${target.test.results.dir}"> + <fileset dir="${target.test.classes.dir}"> + <exclude name="**/selenium/*"/> + <include name="**/*Test.class"/> + </fileset> + </batchtest> + </junit> + <junitreport todir="${target.test.reports.dir}"> + <fileset dir="${target.test.results.dir}"> + <include name="TEST-*.xml"/> + </fileset> + <report todir="${target.test.reports.dir}"/> + </junitreport> + </target> + +</project> Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/pom.xml 2012-08-29 18:12:10 UTC (rev 15095) +++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/pom.xml 2012-08-31 17:41:25 UTC (rev 15096) @@ -178,6 +178,7 @@ <plugins> <plugin> <artifactId>maven-clean-plugin</artifactId> + <version>2.4.1</version> <configuration> <filesets> <fileset> Copied: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-web/build.xml (from rev 15094, branches/community/Seam_2_3/examples-ee6/booking/booking-web/build.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-web/build.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-web/build.xml 2012-08-31 17:41:25 UTC (rev 15096) @@ -0,0 +1,142 @@ +<?xml version="1.0"?> +<project name="dvdstore-ejb" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant"> + <!-- set global properties for this build --> + <property environment="env"/> + <property name="project.name" value="dvdstore-ejb"/> + <property name="root.dir" value="../../.."/> + + <property name="target.dir" value="target"/> + <property name="target.classes.dir" value="${target.dir}/classes"/> + <property name="target.web.dir" value="${target.dir}/webapp"/> + + <property name="src.main.java.dir" value="${basedir}/src/main/java"/> + <property name="src.test.java.dir" value="${basedir}/src/test/java"/> + <property name="src.main.groovy.dir" value="${basedir}/src/main/groovy"/> + <property name="src.test.groovy.dir" value="${basedir}/src/test/groovy"/> + <property name="src.main.webapp.dir" value="${basedir}/src/main/webapp"/> + <property name="src.main.resources.dir" value="${basedir}/src/main/resources"/> + + <property name="javac.debug" value="true"/> + <property name="javac.deprecation" value="false"/> + <property name="debug" value="false"/> + <property name="groovy.home" value="${env.GROOVY_HOME}"/> + + <property name="jndiPattern" value="java:app/dvdstore-ejb/#{ejbName}"/> + <property name="distributable" value="false"/> + + <path id="build.lib.classpath"> + <fileset dir="${root.dir}/build/lib"> + <include name="**/*.jar"/> + </fileset> + </path> + + <typedef resource="org/apache/maven/artifact/ant/antlib.xml" + uri="antlib:org.apache.maven.artifact.ant" + classpathref="build.lib.classpath"/> + + <artifact:dependencies pathId="build.classpath"> + <dependency groupId="org.codehaus.groovy" artifactId="groovy" version="2.0.1"/> + <dependency groupId="org.codehaus.groovy" artifactId="groovy-ant" version="2.0.1"/> + <dependency groupId="commons-cli" artifactId="commons-cli" version="1.2"/> + <dependency groupId="junit" artifactId="junit" version="4.10" scope="test"/> + </artifact:dependencies> + + <artifact:dependencies pathId="project.classpath" filesetId="project.fileset" useScope="runtime"> + <dependency groupId="org.jboss.seam" artifactId="jboss-seam-ui" version="2.3.0.CR1-SNAPSHOT" scope="runtime"> + <exclusion groupId="org.jboss.seam" artifactId="jboss-seam-jul"/> + <exclusion groupId="org.jboss.seam" artifactId="jboss-seam"/> + </dependency> + <dependency groupId="org.jboss.seam" artifactId="jboss-seam-debug" version="2.3.0.CR1-SNAPSHOT" + scope="compile"> + <exclusion groupId="org.jboss.seam" artifactId="jboss-seam"/> + </dependency> + <dependency groupId="commons-beanutils" artifactId="commons-beanutils" version="1.8.3" scope="compile"> + <exclusion groupId="commons-collections" artifactId="commons-collections"/> + </dependency> + <dependency groupId="commons-logging" artifactId="commons-logging" version="1.1.1" scope="compile"/> + <dependency groupId="org.tuckey" artifactId="urlrewritefilter" version="3.0.4" scope="compile"/> + </artifact:dependencies> + + + + <taskdef name="groovyc" + classname="org.codehaus.groovy.ant.Groovyc" + classpathref="build.classpath"/> + + <target name="clean" description="Cleans up the target directory"> + <delete dir="${target.dir}"/> + </target> + + <target name="init"> + <tstamp/> + <mkdir dir="${target.dir}"/> + <mkdir dir="${src.main.java.dir}"/> + <condition property="src.test.java.dir.exists"> + <available file="${src.test.java.dir}" type="dir"/> + </condition> + </target> + + <target name="compile" depends="init" + description="Compile the Java source code"> + <mkdir dir="${target.classes.dir}"/> + <javac source="1.6" target="1.6" debug="${javac.debug}" + deprecation="${javac.deprecation}" + nowarn="on" + includeantruntime="false"> + <src path="${src.main.java.dir}"/> + <classpath refid="project.classpath"/> + <compilerarg value="-Xlint"/> + </javac> + </target> + + <target name="compile-test" depends="compile" + if="${src.test.java.dir.exists}"> + <mkdir dir="${target.test-classes.dir}"/> + <javac source="1.6" target="1.6" debug="${javac.debug}" + deprecation="${javac.deprecation}" + destdir="${target.test-classes.dir}" + nowarn="on" + includeantruntime="false"> + <compilerarg value="-Xlint"/> + <src path="${src.test.java.dir}"/> + <classpath refid="project.classpath"/> + </javac> + </target> + + <target name="test" depends="compile-test" + if="${src.test.java.dir.exists}"> + <junit printsummary="yes" haltonfailure="yes"> + <formatter type="xml"/> + <classpath refid="project.classpath"/> + <batchtest fork="yes" todir="${test.results.dir}"> + <fileset dir="${target.test.classes.dir}"/> + </batchtest> + </junit> + </target> + + <target name="package" depends="compile" + description="Compile the Java source code"> + <mkdir dir="${target.web.dir}"/> + <copy todir="${target.web.dir}"> + <fileset dir="${src.main.webapp.dir}"/> + <filterset begintoken="${" endtoken="}"> + <filter token="jndiPattern" value="${jndiPattern}"/> + <filter token="distributable" value="${distributable}"/> + </filterset> + </copy> + + <copy todir="${target.web.dir}/WEB-INF/lib"> + <fileset refid="project.fileset"/> + <!-- This mapper strips off all leading directory information --> + <mapper type="flatten"/> + </copy> + + <war destfile="${target.dir}/seam-dvdstore.war" + webxml="${target.web.dir}/WEB-INF/web.xml"> + <fileset dir="${target.web.dir}"> + <exclude name="/WEB-INF/web.xml"/> + </fileset> + <classes dir="${target.classes.dir}"/> + </war> + </target> +</project>