Seam SVN: r15096 - in branches/community/Seam_2_3/examples-ee6/dvdstore: dvdstore-ear and 4 other directories.
by seam-commits＠lists.jboss.org
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>
12 years, 3 months
- 1
- 0
Seam SVN: r15095 - branches/community/Seam_2_3/examples-ee6/booking/booking-tests.
by seam-commits＠lists.jboss.org
Author: dhinojosa
Date: 2012-08-29 14:12:10 -0400 (Wed, 29 Aug 2012)
New Revision: 15095
Modified:
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/build.xml
Log:
halt on failure set to no.
Modified: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/build.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/build.xml 2012-08-29 17:55:55 UTC (rev 15094)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/build.xml 2012-08-29 18:12:10 UTC (rev 15095)
@@ -153,7 +153,7 @@
<mkdir dir="${target.test.classes.dir}"/>
<mkdir dir="${target.test.results.dir}"/>
<mkdir dir="${target.test.reports.dir}"/>
- <junit printsummary="yes" haltonfailure="yes">
+ <junit printsummary="yes" haltonfailure="no">
<formatter type="xml"/>
<classpath refid="combined.test.project.classpath"/>
<batchtest fork="yes" todir="${target.test.results.dir}">
12 years, 3 months
- 1
- 0
Seam SVN: r15094 - in branches/community/Seam_2_3/examples-ee6/booking: booking-ear and 3 other directories.
by seam-commits＠lists.jboss.org
Author: dhinojosa
Date: 2012-08-29 13:55:55 -0400 (Wed, 29 Aug 2012)
New Revision: 15094
Added:
branches/community/Seam_2_3/examples-ee6/booking/build.xml
Modified:
branches/community/Seam_2_3/examples-ee6/booking/booking-ear/build.xml
branches/community/Seam_2_3/examples-ee6/booking/booking-ejb/build.xml
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/build.xml
branches/community/Seam_2_3/examples-ee6/booking/booking-web/build.xml
Log:
Finished with ant for booking
Modified: branches/community/Seam_2_3/examples-ee6/booking/booking-ear/build.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-ear/build.xml 2012-08-29 11:21:47 UTC (rev 15093)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-ear/build.xml 2012-08-29 17:55:55 UTC (rev 15094)
@@ -2,12 +2,6 @@
<project name="booking-ejb" basedir="."
xmlns:artifact="antlib:org.apache.maven.artifact.ant">
- <!-- 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="${basedir}/../build-${profile}.properties"/>
-
<!-- set global properties for this build -->
<property environment="env"/>
<property name="project.name" value="booking-ear"/>
@@ -18,7 +12,7 @@
<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.ear.dir" value="${target.dir}/ear"/>
+ <property name="target.booking.ear.dir" value="${target.dir}/booking-ear"/>
<property name="src.main.resources.dir" value="${basedir}/src/main/resources"/>
<property name="src.main.application.dir" value="${basedir}/src/main/application"/>
@@ -55,6 +49,11 @@
</dependency>
</artifact:dependencies>
+ <artifact:dependencies pathId="lib.classpath" filesetId="lib.fileset">
+ <dependency groupId="org.jboss.el" artifactId="jboss-el" version="1.0_02.CR6">
+ <exclusion groupId="javax.el" artifactId="el-api"/>
+ </dependency>
+ </artifact:dependencies>
<target name="clean" description="Cleans up the target directory">
<delete dir="${target.dir}"/>
@@ -89,7 +88,7 @@
</target>
<target name="package" depends="build-booking-web" description="Compile the Java source code">
- <copy todir="${target.ear.dir}">
+ <copy todir="${target.booking.ear.dir}">
<fileset refid="project.fileset"/>
<!-- This mapper strips off all leading directory information -->
<chainedmapper>
@@ -98,15 +97,21 @@
</chainedmapper>
</copy>
- <ear destfile="${target.dir}/booking.ear"
+ <copy todir="${target.booking.ear.dir}/lib">
+ <fileset refid="lib.fileset"/>
+ <mapper type="flatten"/>
+ </copy>
+
+ <ear destfile="${target.dir}/seam-booking.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="${booking.ejb.dir}/target/booking-ejb.jar"/>
<fileset file="${booking.web.dir}/target/booking-web.war"/>
- <fileset dir="${target.ear.dir}">
- <include name="*.jar"/>
+ <fileset dir="${target.booking.ear.dir}">
+ <include name="**/*"/>
</fileset>
</ear>
</target>
Modified: branches/community/Seam_2_3/examples-ee6/booking/booking-ejb/build.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-ejb/build.xml 2012-08-29 11:21:47 UTC (rev 15093)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-ejb/build.xml 2012-08-29 17:55:55 UTC (rev 15094)
@@ -1,13 +1,6 @@
<?xml version="1.0"?>
<project name="booking-ejb" basedir="."
xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
- <!-- 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="${basedir}/../build-${profile}.properties"/>
-
<!-- set global properties for this build -->
<property environment="env"/>
<property name="project.name" value="booking-ejb"/>
Modified: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/build.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/build.xml 2012-08-29 11:21:47 UTC (rev 15093)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/build.xml 2012-08-29 17:55:55 UTC (rev 15094)
@@ -1,12 +1,6 @@
<?xml version="1.0"?>
<project name="booking-test" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
- <!-- 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="${basedir}/../build-${profile}.properties"/>
-
<!-- set global properties for this build -->
<property environment="env"/>
<property name="project.name" value="booking-ejb"/>
@@ -16,6 +10,7 @@
<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="src.main.java.dir" value="${basedir}/src/main/java"/>
<property name="src.test.java.dir" value="${basedir}/src/test/java"/>
@@ -23,12 +18,11 @@
<property name="src.test.groovy.dir" value="${basedir}/src/test/groovy"/>
<property name="src.main.resources.dir" value="${basedir}/src/main/resources"/>
<property name="booking.ear.dir" value="../booking-ear"/>
-
+ <property name="booking.ejb.dir" value="../booking-ejb"/>
<property name="javac.debug" value="true"/>
- S
<property name="javac.deprecation" value="false"/>
<property name="debug" value="false"/>
- <property name="groovy.home" value="${env.GROOVY_HOME}"/>
+ <property name="version.jbossas7" value="${7.1.1.Final}"/>
<path id="build.lib.classpath">
<fileset dir="${root.dir}/build/lib">
@@ -47,7 +41,6 @@
<dependency groupId="junit" artifactId="junit" version="4.10" scope="test"/>
</artifact:dependencies>
-
<artifact:dependencies pathId="project.classpath">
<dependency groupId="org.jboss.seam" artifactId="jboss-seam" scope="test" version="2.3.0.CR1-SNAPSHOT"/>
<dependency groupId="org.slf4j" artifactId="slf4j-log4j12" scope="test" version="1.6.1"/>
@@ -62,13 +55,13 @@
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.0.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"/>
</artifact:dependencies>
<path id="combined.project.classpath">
<path refid="project.classpath"/>
- <pathelement location="resources-integration/arquillian.xml"/>
- <pathelement location="${booking-ejb.dir}/target/classes"/>
+ <pathelement location="${booking.ejb.dir}/target/classes"/>
</path>
<path id="combined.test.project.classpath">
@@ -87,22 +80,29 @@
<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>
- <condition property="booking-ejb.target.class.dir.exists">
- <available file="${booking-ejb.dir}/target/classes" type="dir"/>
+ <condition property="booking.ejb.target.classes.dir.exists">
+ <available file="${booking.ejb.dir}/target/classes" type="dir"/>
</condition>
- <echo message="${src.test.java.dir.exists}"/>
- <echo message="${booking-ejb.target.class.dir.exists}"/>
+ <condition property="booking.ear.exists">
+ <available file="${booking.ear.dir}/target/seam-booking.ear" type="dir"/>
+ </condition>
+ <condition property="src.main.java.exists">
+ <available file="${src.main.java.dir}" type="dir"/>
+ </condition>
</target>
- <target name="build-booking-ear" depends="init" unless="booking.ear.target.class.dir.exists">
+ <target name="build-booking-ejb" depends="init" unless="booking.ejb.target.classes.dir.exists">
+ <ant antfile="${booking.ejb.dir}/build.xml" target="compile" inheritAll="false"/>
+ </target>
+
+ <target name="build-booking-ear" depends="build-booking-ejb" unless="booking.ear.exists">
<ant antfile="${booking.ear.dir}/build.xml" target="package" inheritAll="false"/>
</target>
- <target name="compile" depends="build-booking-ejb"
+ <target name="compile" depends="build-booking-ear" if="${src.main.java.exists}"
description="Compile the Java source code">
<mkdir dir="${target.classes.dir}"/>
<javac source="1.6" target="1.6" debug="${javac.debug}"
@@ -119,7 +119,7 @@
if="${src.test.java.dir.exists}">
<mkdir dir="${target.test.classes.dir}"/>
<property name="myclasspath" refid="combined.project.classpath"/>
-
+ <echo message="${myclasspath}"/>
<javac source="1.6" target="1.6" debug="${javac.debug}"
deprecation="${javac.deprecation}"
destdir="${target.test.classes.dir}"
@@ -131,17 +131,43 @@
</javac>
</target>
+ <target name="process-test-resources" depends="compile-test">
+ <copy todir="${target.test.classes.dir}">
+ <fileset dir="${src.test.resources}">
+ <include name="*"/>
+ </fileset>
+ <fileset dir="${src.test.resources-integration}">
+ <include name="*"/>
+ </fileset>
+ <fileset dir="${booking.web.dir}/src/main/resources">
+ <include name="*"/>
+ </fileset>
+ <filterset begintoken="${" endtoken="}">
+ <filter token="version.jbossas7" value="${version.jbossas7}"/>
+ </filterset>
+ </copy>
+ </target>
+
<target name="test" depends="compile-test"
if="${src.test.java.dir.exists}">
<mkdir dir="${target.test.classes.dir}"/>
<mkdir dir="${target.test.results.dir}"/>
+ <mkdir dir="${target.test.reports.dir}"/>
<junit printsummary="yes" haltonfailure="yes">
<formatter type="xml"/>
<classpath refid="combined.test.project.classpath"/>
<batchtest fork="yes" todir="${target.test.results.dir}">
- <fileset dir="${target.test.classes.dir}"/>
+ <fileset dir="${target.test.classes.dir}">
+ <exclude name="**/Deployments.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/booking/booking-web/build.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-web/build.xml 2012-08-29 11:21:47 UTC (rev 15093)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-web/build.xml 2012-08-29 17:55:55 UTC (rev 15094)
@@ -1,144 +1,145 @@
<?xml version="1.0"?>
<project name="booking-ejb" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+ <!-- set global properties for this build -->
+ <property environment="env"/>
+ <property name="project.name" value="booking-ejb"/>
+ <property name="root.dir" value="../../.."/>
- <!-- Give user a chance to override without editing this file or typing -D -->
- <property file="${basedir}/../build.properties"/>
+ <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="profile" value="dev"/>
- <property file="${basedir}/../build-${profile}.properties"/>
+ <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"/>
- <!-- set global properties for this build -->
- <property environment="env"/>
- <property name="project.name" value="booking-ejb"/>
- <property name="root.dir" value="../../.."/>
+ <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="target.dir" value="target"/>
- <property name="target.classes.dir" value="${target.dir}/classes"/>
- <property name="target.web.dir" value="${target.dir}/webapp"/>
+ <property name="jndiPattern" value="java:app/booking-ejb/#{ejbName}"/>
+ <property name="distributable" value="false"/>
- <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"/>
+ <path id="build.lib.classpath">
+ <fileset dir="${root.dir}/build/lib">
+ <include name="**/*.jar"/>
+ </fileset>
+ </path>
- <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}"/>
+ <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
+ uri="antlib:org.apache.maven.artifact.ant"
+ classpathref="build.lib.classpath"/>
- <path id="build.lib.classpath">
- <fileset dir="${root.dir}/build/lib">
- <include name="**/*.jar"/>
- </fileset>
- </path>
+ <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>
- <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
- uri="antlib:org.apache.maven.artifact.ant"
- classpathref="build.lib.classpath"/>
+ <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.richfaces.ui" artifactId="richfaces-components-ui" version="4.3.0.20120802-M1"
+ scope="compile"/>
+ <dependency groupId="org.richfaces.core" artifactId="richfaces-core-impl" version="4.3.0.20120802-M1"
+ scope="compile"/>
+ <dependency groupId="org.richfaces.core" artifactId="richfaces-core-api" version="4.3.0.20120802-M1"
+ scope="compile"/>
+ </artifact:dependencies>
- <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>
+ <taskdef name="groovyc"
+ classname="org.codehaus.groovy.ant.Groovyc"
+ classpathref="build.classpath"/>
- <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.richfaces.ui" artifactId="richfaces-components-ui" version="4.3.0.20120802-M1"
- scope="compile"/>
- <dependency groupId="org.richfaces.core" artifactId="richfaces-core-impl" version="4.3.0.20120802-M1"
- scope="compile"/>
- <dependency groupId="org.richfaces.core" artifactId="richfaces-core-api" version="4.3.0.20120802-M1"
- scope="compile"/>
- </artifact:dependencies>
+ <target name="clean" description="Cleans up the target directory">
+ <delete dir="${target.dir}"/>
+ </target>
- <taskdef name="groovyc"
- classname="org.codehaus.groovy.ant.Groovyc"
- classpathref="build.classpath"/>
+ <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="clean" description="Cleans up the target directory">
- <delete dir="${target.dir}"/>
- </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="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-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="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="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="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="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>
- <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>
+ <copy todir="${target.web.dir}/WEB-INF/lib">
+ <fileset refid="project.fileset"/>
+ <!-- This mapper strips off all leading directory information -->
+ <mapper type="flatten"/>
+ </copy>
- <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}"/>
- </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}/booking-web.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>
+ <war destfile="${target.dir}/booking-web.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>
Copied: branches/community/Seam_2_3/examples-ee6/booking/build.xml (from rev 15092, branches/community/Seam_2_3/examples-ee6/booking/booking-tests/build.xml)
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/build.xml (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/booking/build.xml 2012-08-29 17:55:55 UTC (rev 15094)
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<project name="booking" basedir="." >
+
+ <property name="booking.ear.dir" value="${basedir}/booking-ear"/>
+ <property name="booking.ejb.dir" value="${basedir}/booking-ejb"/>
+ <property name="booking.web.dir" value="${basedir}/booking-web"/>
+ <property name="booking.tests.dir" value="${basedir}/booking-tests"/>
+
+ <target name="clean" description="Cleans up the target directory in every module">
+ <ant antfile="${booking.ear.dir}/build.xml" target="clean" inheritAll="false"/>
+ <ant antfile="${booking.ejb.dir}/build.xml" target="clean" inheritAll="false"/>
+ <ant antfile="${booking.web.dir}/build.xml" target="clean" inheritAll="false"/>
+ <ant antfile="${booking.tests.dir}/build.xml" target="clean" inheritAll="false"/>
+ </target>
+
+ <target name="package" description="Cleans up the target directory in every module">
+ <ant antfile="${booking.ear.dir}/build.xml" target="package" inheritAll="false"/>
+ <ant antfile="${booking.ejb.dir}/build.xml" target="package" inheritAll="false"/>
+ <ant antfile="${booking.web.dir}/build.xml" target="package" inheritAll="false"/>
+ </target>
+
+</project>
12 years, 3 months
- 1
- 0
Seam SVN: r15093 - branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam.
by seam-commits＠lists.jboss.org
Author: vdedik
Date: 2012-08-29 07:21:47 -0400 (Wed, 29 Aug 2012)
New Revision: 15093
Modified:
branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/Component.java
branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/Namespace.java
Log:
JBSEAM-4863
Modified: branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/Component.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/Component.java 2012-08-28 19:27:36 UTC (rev 15092)
+++ branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/Component.java 2012-08-29 11:21:47 UTC (rev 15093)
@@ -2361,8 +2361,9 @@
{
log.debug("trying to inject with hierarchical context search: " + name);
}
- boolean create = in.create() && !org.jboss.seam.contexts.Lifecycle.isDestroying();
- result = getInstanceInAllNamespaces(name, create);
+ boolean allowAutocreation = !org.jboss.seam.contexts.Lifecycle.isDestroying();
+ boolean create = in.create() && allowAutocreation;
+ result = getInstanceInAllNamespaces(name, create, allowAutocreation);
}
else
{
@@ -2407,15 +2408,15 @@
}
}
- private Object getInstanceInAllNamespaces(String name, boolean create)
+ private Object getInstanceInAllNamespaces(String name, boolean create, boolean allowAutocreation)
{
Object result;
- result = getInstance(name, create);
+ result = getInstance(name, create, allowAutocreation);
if (result==null)
{
for ( Namespace namespace: getImports() )
{
- result = namespace.getComponentInstance(name, create);
+ result = namespace.getComponentInstance(name, create, allowAutocreation);
if (result!=null) break;
}
}
@@ -2423,7 +2424,7 @@
{
for ( Namespace namespace: Init.instance().getGlobalImports() )
{
- result = namespace.getComponentInstance(name, create);
+ result = namespace.getComponentInstance(name, create, allowAutocreation);
if (result!=null) break;
}
}
@@ -2432,7 +2433,7 @@
Namespace namespace = getNamespace();
if (namespace!=null)
{
- result = namespace.getComponentInstance(name, create);
+ result = namespace.getComponentInstance(name, create, allowAutocreation);
}
}
return result;
Modified: branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/Namespace.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/Namespace.java 2012-08-28 19:27:36 UTC (rev 15092)
+++ branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/Namespace.java 2012-08-29 11:21:47 UTC (rev 15093)
@@ -55,6 +55,11 @@
return Component.getInstance( qualifyName(key), create );
}
+ public Object getComponentInstance(String key, boolean create, boolean allowAutocreation)
+ {
+ return Component.getInstance( qualifyName(key), create, allowAutocreation );
+ }
+
private String qualifyName(String key)
{
return name==null ? key : name + key;
12 years, 3 months
- 1
- 0
Seam SVN: r15092 - in branches/community/Seam_2_3/examples-ee6/booking: booking-tests and 1 other directory.
by seam-commits＠lists.jboss.org
Author: dhinojosa
Date: 2012-08-28 15:27:36 -0400 (Tue, 28 Aug 2012)
New Revision: 15092
Modified:
branches/community/Seam_2_3/examples-ee6/booking/booking-ear/build.xml
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/build.xml
Log:
updated ear.
Modified: branches/community/Seam_2_3/examples-ee6/booking/booking-ear/build.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-ear/build.xml 2012-08-28 18:05:18 UTC (rev 15091)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-ear/build.xml 2012-08-28 19:27:36 UTC (rev 15092)
@@ -2,154 +2,112 @@
<project name="booking-ejb" basedir="."
xmlns:artifact="antlib:org.apache.maven.artifact.ant">
- <!-- 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="${basedir}/../build-${profile}.properties"/>
+ <property name="profile" value="dev"/>
+ <property file="${basedir}/../build-${profile}.properties"/>
- <!-- set global properties for this build -->
- <property environment="env"/>
- <property name="project.name" value="booking-ear"/>
+ <!-- set global properties for this build -->
+ <property environment="env"/>
+ <property name="project.name" value="booking-ear"/>
- <property name="root.dir" value="../../.."/>
- <property name="project.parent.dir" value=".."/>
+ <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.ear.dir" value="${target.dir}/ear"/>
+ <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.ear.dir" value="${target.dir}/ear"/>
- <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.main.application.dir" value="${basedir}/src/main/application"/>
+ <property name="src.main.resources.dir" value="${basedir}/src/main/resources"/>
+ <property name="src.main.application.dir" value="${basedir}/src/main/application"/>
- <property name="booking.ejb.dir" value="${project.parent.dir}/booking-ejb"/>
- <property name="booking.web.dir" value="${project.parent.dir}/booking-web"/>
+ <property name="booking.ejb.dir" value="${project.parent.dir}/booking-ejb"/>
+ <property name="booking.web.dir" value="${project.parent.dir}/booking-web"/>
- <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>
+ <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"/>
+ <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="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="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>
- <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="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="init">
+ <tstamp/>
+ <mkdir dir="${target.dir}"/>
+ <condition property="booking.jar.exists">
+ <and>
+ <available file="${booking.ejb.dir}/target" type="dir"/>
+ <available file="${booking.ejb.dir}/target/booking-ejb.jar"/>
+ </and>
+ </condition>
+ <condition property="booking.web.exists">
+ <and>
+ <available file="${booking.web.dir}/target" type="dir"/>
+ <available file="${booking.web.dir}/target/booking-web.war"/>
+ </and>
+ </condition>
+ <echo message="${booking.jar.exists}"/>
+ <echo message="${booking.war.exists}"/>
- <target name="build-booking-ejb" depends="init" unless="booking-ejb.target.class.dir.exists">
- <ant antfile="${booking-ejb.dir}/build.xml" target="compile" inheritAll="false"/>
- </target>
+ </target>
- <target name="build-booking-war" depends="init" unless="booking-ejb.target.class.dir.exists">
- <ant antfile="${booking-ejb.dir}/build.xml" target="compile" inheritAll="false"/>
- </target>
+ <target name="build-booking-ejb" depends="init" unless="booking.jar.exists">
+ <ant antfile="${booking.ejb.dir}/build.xml" target="package" inheritAll="false"/>
+ </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="build-booking-web" depends="build-booking-ejb" unless="booking.web.exists">
+ <ant antfile="${booking.web.dir}/build.xml" target="package" inheritAll="false"/>
+ </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="package" depends="build-booking-web" description="Compile the Java source code">
+ <copy todir="${target.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>
- <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">
- <copy todir="${target.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>
-
- <ear destfile="${target.dir}/booking.ear"
- basedir="${target.classes.dir}"
- appxml="${src.main.resources.dir}/application-for-ant-only.xml">
- <metainf dir="${src.main.application.dir}/META-INF">
- <include name="*.xml"/>
- </metainf>
- <fileset file="${booking.ejb.dir}/target/booking-ejb.jar"/>
- <fileset file="${booking.web.dir}/target/booking-web.war"/>
- <fileset dir="${target.ear.dir}">
- <include name="*.jar"/>
- </fileset>
- </ear>
- </target>
+ <ear destfile="${target.dir}/booking.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="${booking.ejb.dir}/target/booking-ejb.jar"/>
+ <fileset file="${booking.web.dir}/target/booking-web.war"/>
+ <fileset dir="${target.ear.dir}">
+ <include name="*.jar"/>
+ </fileset>
+ </ear>
+ </target>
</project>
\ No newline at end of file
Modified: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/build.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/build.xml 2012-08-28 18:05:18 UTC (rev 15091)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/build.xml 2012-08-28 19:27:36 UTC (rev 15092)
@@ -1,163 +1,147 @@
<?xml version="1.0"?>
<project name="booking-test" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
- <!-- 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="${basedir}/../build-${profile}.properties"/>
+ <property name="profile" value="dev"/>
+ <property file="${basedir}/../build-${profile}.properties"/>
- <!-- set global properties for this build -->
- <property environment="env"/>
- <property name="project.name" value="booking-ejb"/>
- <property name="root.dir" value="../../.."/>
+ <!-- set global properties for this build -->
+ <property environment="env"/>
+ <property name="project.name" value="booking-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.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="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="booking-ejb.dir" value="../booking-ejb"/>
+ <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="booking.ear.dir" value="../booking-ear"/>
- <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="javac.debug" value="true"/>
+ S
+ <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>
+ <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"/>
+ <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="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.jboss.seam" artifactId="jboss-seam" scope="test" 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.0.Final"/>
- </artifact:dependencies>
+ <artifact:dependencies pathId="project.classpath">
+ <dependency groupId="org.jboss.seam" artifactId="jboss-seam" scope="test" 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.0.Final"/>
+ </artifact:dependencies>
- <path id="combined.project.classpath">
- <path refid="project.classpath"/>
- <pathelement location="resources-integration/arquillian.xml"/>
- <pathelement location="${booking-ejb.dir}/target/classes"/>
- </path>
+ <path id="combined.project.classpath">
+ <path refid="project.classpath"/>
+ <pathelement location="resources-integration/arquillian.xml"/>
+ <pathelement location="${booking-ejb.dir}/target/classes"/>
+ </path>
- <path id="combined.test.project.classpath">
- <path refid="combined.project.classpath"/>
- <pathelement location="${target.test.classes.dir}"/>
- </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"/>
+ <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="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>
- <condition property="booking-ejb.target.class.dir.exists">
- <available file="${booking-ejb.dir}/target/classes" type="dir"/>
- </condition>
- <echo message="${src.test.java.dir.exists}"/>
- <echo message="${booking-ejb.target.class.dir.exists}"/>
- </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>
+ <condition property="booking-ejb.target.class.dir.exists">
+ <available file="${booking-ejb.dir}/target/classes" type="dir"/>
+ </condition>
+ <echo message="${src.test.java.dir.exists}"/>
+ <echo message="${booking-ejb.target.class.dir.exists}"/>
+ </target>
- <target name="build-booking-ejb" depends="init" unless="booking-ejb.target.class.dir.exists">
- <ant antfile="${booking-ejb.dir}/build.xml" target="compile" inheritAll="false"/>
- </target>
+ <target name="build-booking-ear" depends="init" unless="booking.ear.target.class.dir.exists">
+ <ant antfile="${booking.ear.dir}/build.xml" target="package" inheritAll="false"/>
+ </target>
- <target name="compile" depends="build-booking-ejb"
- 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="combined.project.classpath"/>
- <compilerarg value="-Xlint"/>
- </javac>
- </target>
+ <target name="compile" depends="build-booking-ejb"
+ 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="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}"/>
- <property name="myclasspath" refid="combined.project.classpath"/>
+ <target name="compile-test" depends="compile"
+ if="${src.test.java.dir.exists}">
+ <mkdir dir="${target.test.classes.dir}"/>
+ <property name="myclasspath" refid="combined.project.classpath"/>
- <!-- Emit the property to the ant console -->
- <echo message="Classpath = ${myclasspath}"/>
+ <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>
- <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="test" depends="compile-test"
+ if="${src.test.java.dir.exists}">
+ <mkdir dir="${target.test.classes.dir}"/>
+ <mkdir dir="${target.test.results.dir}"/>
+ <junit printsummary="yes" haltonfailure="yes">
+ <formatter type="xml"/>
+ <classpath refid="combined.test.project.classpath"/>
+ <batchtest fork="yes" todir="${target.test.results.dir}">
+ <fileset dir="${target.test.classes.dir}"/>
+ </batchtest>
+ </junit>
+ </target>
- <target name="test" depends="compile-test"
- if="${src.test.java.dir.exists}">
- <mkdir dir="${target.test.classes.dir}"/>
- <mkdir dir="${target.test.results.dir}"/>
- <junit printsummary="yes" haltonfailure="yes">
- <formatter type="xml"/>
- <classpath refid="combined.test.project.classpath"/>
- <batchtest fork="yes" todir="${target.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}/booking-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"/>
- </fileset>
- </jar>
- </target>
</project>
12 years, 3 months
- 1
- 0
Seam SVN: r15091 - in branches/community/Seam_2_3/examples-ee6/booking/booking-ear/src/main: resources and 1 other directory.
by seam-commits＠lists.jboss.org
Author: dhinojosa
Date: 2012-08-28 14:05:18 -0400 (Tue, 28 Aug 2012)
New Revision: 15091
Added:
branches/community/Seam_2_3/examples-ee6/booking/booking-ear/src/main/resources/
branches/community/Seam_2_3/examples-ee6/booking/booking-ear/src/main/resources/application-for-ant-only.xml
Log:
Application-for-ant-only.xml
Added: 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/booking/booking-ear/src/main/resources/application-for-ant-only.xml (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-ear/src/main/resources/application-for-ant-only.xml 2012-08-28 18:05:18 UTC (rev 15091)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE application PUBLIC
+ "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+ "http://java.sun.com/dtd/application_1_3.dtd">
+<application>
+ <display-name>booking-ear</display-name>
+ <description>Examples for Seam 2 Framework in Java EE6 environment</description>
+ <module>
+ <web>
+ <web-uri>booking-web.war</web-uri>
+ <context-root>/seam-booking</context-root>
+ </web>
+ </module>
+ <module>
+ <ejb>booking-ejb.jar</ejb>
+ </module>
+ <module>
+ <ejb>jboss-seam.jar</ejb>
+ </module>
+</application>
\ No newline at end of file
12 years, 3 months
- 1
- 0
Seam SVN: r15090 - in branches/community/Seam_2_3/examples-ee6/booking: booking-ear and 3 other directories.
by seam-commits＠lists.jboss.org
Author: dhinojosa
Date: 2012-08-28 00:59:39 -0400 (Tue, 28 Aug 2012)
New Revision: 15090
Added:
branches/community/Seam_2_3/examples-ee6/booking/booking-ear/build.xml
branches/community/Seam_2_3/examples-ee6/booking/booking-ejb/build.xml
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/build.xml
branches/community/Seam_2_3/examples-ee6/booking/booking-web/build.xml
Removed:
branches/community/Seam_2_3/examples-ee6/booking/ant-dependency/
branches/community/Seam_2_3/examples-ee6/booking/ant-with-maven.xml
branches/community/Seam_2_3/examples-ee6/booking/ant-without-maven.xml
Log:
Added p
Deleted: branches/community/Seam_2_3/examples-ee6/booking/ant-with-maven.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/ant-with-maven.xml 2012-08-27 10:36:26 UTC (rev 15089)
+++ branches/community/Seam_2_3/examples-ee6/booking/ant-with-maven.xml 2012-08-28 04:59:39 UTC (rev 15090)
@@ -1,65 +0,0 @@
-<project xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
- <path id="maven-ant-tasks.classpath" path="ant-dependency/maven-ant-tasks-2.1.3.jar"/>
- <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
- uri="antlib:org.apache.maven.artifact.ant"
- classpathref="maven-ant-tasks.classpath"/>
-
- <target name="clean">
- <artifact:mvn>
- <arg value="clean"/>
- </artifact:mvn>
- </target>
-
- <target name="init">
- <artifact:mvn>
- <arg value="initialize"/>
- </artifact:mvn>
- </target>
-
- <target name="compile">
- <artifact:mvn>
- <arg value="compile"/>
- </artifact:mvn>
- </target>
-
- <target name="compiletest">
- <artifact:mvn>
- <arg value="test-compile"/>
- </artifact:mvn>
- </target>
-
- <target name="war">
- <artifact:mvn pom="booking-ejb/pom.xml">
- <arg value="install"/>
- <arg value="-DskipTests=true"/>
- </artifact:mvn>
- <artifact:mvn pom="booking-web/pom.xml">
- <arg value="-DskipTests=true"/>
- <arg value="install"/>
- </artifact:mvn>
- </target>
-
- <target name="ear">
- <artifact:mvn pom="booking-ear/pom.xml">
- <arg value="install"/>
- <arg value="-DskipTests=true"/>
- </artifact:mvn>
- </target>
-
- <target name="test">
- <artifact:mvn>
- <arg value="test"/>
- </artifact:mvn>
- </target>
-
- <target name="javadoc">
- <artifact:mvn>
- <arg value="install"/>
- <arg value="-DskipTests=true"/>
- </artifact:mvn>
- <artifact:mvn>
- <arg value="javadoc:javadoc"/>
- </artifact:mvn>
- </target>
-</project>
\ No newline at end of file
Deleted: branches/community/Seam_2_3/examples-ee6/booking/ant-without-maven.xml
===================================================================
Added: branches/community/Seam_2_3/examples-ee6/booking/booking-ear/build.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-ear/build.xml (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-ear/build.xml 2012-08-28 04:59:39 UTC (rev 15090)
@@ -0,0 +1,155 @@
+<?xml version="1.0"?>
+<project name="booking-ejb" basedir="."
+ xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+
+ <!-- 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="${basedir}/../build-${profile}.properties"/>
+
+ <!-- set global properties for this build -->
+ <property environment="env"/>
+ <property name="project.name" value="booking-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.ear.dir" value="${target.dir}/ear"/>
+
+ <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.main.application.dir" value="${basedir}/src/main/application"/>
+
+ <property name="booking.ejb.dir" value="${project.parent.dir}/booking-ejb"/>
+ <property name="booking.web.dir" value="${project.parent.dir}/booking-web"/>
+
+ <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" 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>
+
+ <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="build-booking-ejb" depends="init" unless="booking-ejb.target.class.dir.exists">
+ <ant antfile="${booking-ejb.dir}/build.xml" target="compile" inheritAll="false"/>
+ </target>
+
+ <target name="build-booking-war" depends="init" unless="booking-ejb.target.class.dir.exists">
+ <ant antfile="${booking-ejb.dir}/build.xml" target="compile" inheritAll="false"/>
+ </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">
+ <copy todir="${target.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>
+
+ <ear destfile="${target.dir}/booking.ear"
+ basedir="${target.classes.dir}"
+ appxml="${src.main.resources.dir}/application-for-ant-only.xml">
+ <metainf dir="${src.main.application.dir}/META-INF">
+ <include name="*.xml"/>
+ </metainf>
+ <fileset file="${booking.ejb.dir}/target/booking-ejb.jar"/>
+ <fileset file="${booking.web.dir}/target/booking-web.war"/>
+ <fileset dir="${target.ear.dir}">
+ <include name="*.jar"/>
+ </fileset>
+ </ear>
+ </target>
+</project>
\ No newline at end of file
Added: branches/community/Seam_2_3/examples-ee6/booking/booking-ejb/build.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-ejb/build.xml (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-ejb/build.xml 2012-08-28 04:59:39 UTC (rev 15090)
@@ -0,0 +1,153 @@
+<?xml version="1.0"?>
+<project name="booking-ejb" basedir="."
+ xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+
+ <!-- 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="${basedir}/../build-${profile}.properties"/>
+
+ <!-- set global properties for this build -->
+ <property environment="env"/>
+ <property name="project.name" value="booking-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="antlr" artifactId="antlr" version="2.7.6" scope="provided"/>
+ <dependency groupId="commons-collections" artifactId="commons-collections" version="3.2" scope="provided"/>
+ <dependency groupId="dom4j" artifactId="dom4j" version="1.6.1-brew" scope="provided"/>
+ <dependency groupId="javax.validation" artifactId="validation-api" version="1.0.0.GA" scope="provided"/>
+ <dependency groupId="org.hibernate" artifactId="hibernate-core" version="4.1.0.Final" scope="provided"/>
+ <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.hibernate.common" artifactId="hibernate-commons-annotations" version="4.0.1.Final"
+ scope="provided"/>
+ <dependency groupId="org.hibernate.javax.persistence" artifactId="hibernate-jpa-2.0-api" version="1.0.1.Final"
+ scope="provided"/>
+ <dependency groupId="org.javassist" artifactId="javassist" version="3.15.0-GA" scope="provided"/>
+ <dependency groupId="org.jboss.el" artifactId="jboss-el" version="1.0_02.CR6" scope="compile"/>
+ <dependency groupId="org.jboss.logging" artifactId="jboss-logging" version="3.1.0.CR2" 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"/>
+ <exclusion groupId="org.jboss.spec.javax.faces" artifactId="jboss-jsf-api_2.0_spec"/>
+ <exclusion groupId="javax.el" artifactId="el-api"/>
+ </dependency>
+ <dependency groupId="org.jboss.spec.javax.ejb" artifactId="jboss-ejb-api_3.1_spec" version="1.0.1.Final"
+ scope="provided"/>
+ <dependency groupId="org.jboss.spec.javax.faces" artifactId="jboss-jsf-api_2.0_spec" version="1.0.0.Final"
+ scope="provided"/>
+ <dependency groupId="org.jboss.spec.javax.servlet" artifactId="jboss-servlet-api_3.0_spec" version="1.0.0.Final"
+ scope="provided"/>
+ <dependency groupId="org.jboss.spec.javax.transaction" artifactId="jboss-transaction-api_1.1_spec"
+ version="1.0.0.Final" scope="provided"/>
+ <dependency groupId="org.slf4j" artifactId="slf4j-api" version="1.6.1" scope="provided"/>
+ </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}/booking-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"/>
+ </fileset>
+ </jar>
+ </target>
+</project>
\ No newline at end of file
Added: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/build.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/build.xml (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/build.xml 2012-08-28 04:59:39 UTC (rev 15090)
@@ -0,0 +1,163 @@
+<?xml version="1.0"?>
+<project name="booking-test" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+
+ <!-- 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="${basedir}/../build-${profile}.properties"/>
+
+ <!-- set global properties for this build -->
+ <property environment="env"/>
+ <property name="project.name" value="booking-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="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="booking-ejb.dir" value="../booking-ejb"/>
+
+ <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.jboss.seam" artifactId="jboss-seam" scope="test" 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.0.Final"/>
+ </artifact:dependencies>
+
+ <path id="combined.project.classpath">
+ <path refid="project.classpath"/>
+ <pathelement location="resources-integration/arquillian.xml"/>
+ <pathelement location="${booking-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="${src.main.java.dir}"/>
+ <condition property="src.test.java.dir.exists">
+ <available file="${src.test.java.dir}" type="dir"/>
+ </condition>
+ <condition property="booking-ejb.target.class.dir.exists">
+ <available file="${booking-ejb.dir}/target/classes" type="dir"/>
+ </condition>
+ <echo message="${src.test.java.dir.exists}"/>
+ <echo message="${booking-ejb.target.class.dir.exists}"/>
+ </target>
+
+ <target name="build-booking-ejb" depends="init" unless="booking-ejb.target.class.dir.exists">
+ <ant antfile="${booking-ejb.dir}/build.xml" target="compile" inheritAll="false"/>
+ </target>
+
+ <target name="compile" depends="build-booking-ejb"
+ 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="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}"/>
+ <property name="myclasspath" refid="combined.project.classpath"/>
+
+ <!-- Emit the property to the ant console -->
+ <echo message="Classpath = ${myclasspath}"/>
+
+ <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="test" depends="compile-test"
+ if="${src.test.java.dir.exists}">
+ <mkdir dir="${target.test.classes.dir}"/>
+ <mkdir dir="${target.test.results.dir}"/>
+ <junit printsummary="yes" haltonfailure="yes">
+ <formatter type="xml"/>
+ <classpath refid="combined.test.project.classpath"/>
+ <batchtest fork="yes" todir="${target.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}/booking-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"/>
+ </fileset>
+ </jar>
+ </target>
+</project>
Added: branches/community/Seam_2_3/examples-ee6/booking/booking-web/build.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-web/build.xml (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-web/build.xml 2012-08-28 04:59:39 UTC (rev 15090)
@@ -0,0 +1,144 @@
+<?xml version="1.0"?>
+<project name="booking-ejb" basedir="." xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+
+ <!-- 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="${basedir}/../build-${profile}.properties"/>
+
+ <!-- set global properties for this build -->
+ <property environment="env"/>
+ <property name="project.name" value="booking-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}"/>
+
+ <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.richfaces.ui" artifactId="richfaces-components-ui" version="4.3.0.20120802-M1"
+ scope="compile"/>
+ <dependency groupId="org.richfaces.core" artifactId="richfaces-core-impl" version="4.3.0.20120802-M1"
+ scope="compile"/>
+ <dependency groupId="org.richfaces.core" artifactId="richfaces-core-api" version="4.3.0.20120802-M1"
+ 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}"/>
+ </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}/booking-web.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>
12 years, 3 months
- 1
- 0
Seam SVN: r15089 - in branches/community/Seam_2_3/examples-ee6/metawidget/booking: booking-web and 1 other directory.
by seam-commits＠lists.jboss.org
Author: vdedik
Date: 2012-08-27 06:36:26 -0400 (Mon, 27 Aug 2012)
New Revision: 15089
Modified:
branches/community/Seam_2_3/examples-ee6/metawidget/booking/booking-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/metawidget/booking/booking-web/pom.xml
Log:
JBSEAM-4977
Modified: branches/community/Seam_2_3/examples-ee6/metawidget/booking/booking-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/metawidget/booking/booking-ejb/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
+++ branches/community/Seam_2_3/examples-ee6/metawidget/booking/booking-ejb/pom.xml 2012-08-27 10:36:26 UTC (rev 15089)
@@ -94,14 +94,13 @@
<dependency>
<groupId>org.metawidget.modules</groupId>
<artifactId>metawidget-annotation</artifactId>
- <version>2.1</version>
+ <version>2.3</version>
</dependency>
<dependency>
<groupId>org.metawidget.modules.faces</groupId>
<artifactId>metawidget-facesannotation</artifactId>
- <version>2.1</version>
+ <version>2.3</version>
</dependency>
-
</dependencies>
<profiles>
Modified: branches/community/Seam_2_3/examples-ee6/metawidget/booking/booking-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/metawidget/booking/booking-web/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
+++ branches/community/Seam_2_3/examples-ee6/metawidget/booking/booking-web/pom.xml 2012-08-27 10:36:26 UTC (rev 15089)
@@ -75,34 +75,48 @@
<!-- metawidget -->
<dependency>
- <groupId>org.metawidget.modules</groupId>
- <artifactId>metawidget-annotation</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
<groupId>org.metawidget.modules.faces</groupId>
- <artifactId>metawidget-facesannotation</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>org.metawidget.modules.faces</groupId>
<artifactId>metawidget-faces</artifactId>
- <version>2.1</version>
+ <version>2.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.metawidget.modules</groupId>
+ <artifactId>metawidget-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.metawidget.modules.faces</groupId>
<artifactId>metawidget-richfaces</artifactId>
- <version>2.1</version>
+ <version>2.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.metawidget.modules</groupId>
+ <artifactId>metawidget-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.metawidget.modules</groupId>
<artifactId>metawidget-jpa</artifactId>
- <version>2.1</version>
+ <version>2.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.metawidget.modules</groupId>
+ <artifactId>metawidget-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.metawidget.modules</groupId>
<artifactId>metawidget-beanvalidation</artifactId>
- <version>2.1</version>
+ <version>2.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.metawidget.modules</groupId>
+ <artifactId>metawidget-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
12 years, 3 months
- 1
- 0
Seam SVN: r15088 - in branches/community/Seam_2_3: examples-ee6/blog/blog-ejb and 74 other directories.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2012-08-25 15:52:09 -0400 (Sat, 25 Aug 2012)
New Revision: 15088
Modified:
branches/community/Seam_2_3/bom/pom.xml
branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/blog/blog-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/blog/blog-web/pom.xml
branches/community/Seam_2_3/examples-ee6/booking/booking-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-web/pom.xml
branches/community/Seam_2_3/examples-ee6/drools/drools-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/drools/drools-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/excel/excel-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/excel/excel-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/excel/excel-web/pom.xml
branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/pom.xml
branches/community/Seam_2_3/examples-ee6/guice/guice-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/pom.xml
branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/pom.xml
branches/community/Seam_2_3/examples-ee6/itext/itext-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/itext/itext-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/jee6/jee6-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/jee6/jee6-web/pom.xml
branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/pom.xml
branches/community/Seam_2_3/examples-ee6/mail/mail-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/mail/mail-web/pom.xml
branches/community/Seam_2_3/examples-ee6/messages/messages-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/metawidget/booking/booking-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/metawidget/booking/booking-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/metawidget/groovybooking/groovybooking-web/pom.xml
branches/community/Seam_2_3/examples-ee6/nestedbooking/nestedbooking-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/nestedbooking/nestedbooking-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/numberguess/numberguess-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/numberguess/numberguess-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/quartz/quartz-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/quartz/quartz-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/registration/registration-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/registration/registration-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/remoting/chatroom/chatroom-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/remoting/gwt/gwt-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/remoting/helloworld/helloworld-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/remoting/progressbar/progressbar-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/restbay/restbay-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/restbay/restbay-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/rss/rss-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/rss/rss-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/seambay/seambay-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/seambay/seambay-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/seampay/seampay-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/seampay/seampay-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/spring/spring-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/spring/spring-web/pom.xml
branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/todo/todo-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/ui/ui-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/ui/ui-web/pom.xml
branches/community/Seam_2_3/jboss-seam-debug/pom.xml
branches/community/Seam_2_3/jboss-seam-excel/pom.xml
branches/community/Seam_2_3/jboss-seam-mail/pom.xml
branches/community/Seam_2_3/jboss-seam-pdf/pom.xml
branches/community/Seam_2_3/jboss-seam-rss/pom.xml
branches/community/Seam_2_3/jboss-seam-ui/pom.xml
branches/community/Seam_2_3/jboss-seam/pom.xml
branches/community/Seam_2_3/seam-integration-tests/pom.xml
Log:
updated seam BOM to jboss-javaee-with-hibernate 1.0.0.Final
Modified: branches/community/Seam_2_3/bom/pom.xml
===================================================================
--- branches/community/Seam_2_3/bom/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/bom/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -63,7 +63,7 @@
<dependency>
<groupId>org.jboss.bom</groupId>
<artifactId>jboss-javaee-6.0-with-hibernate</artifactId>
- <version>1.0.0.M6</version>
+ <version>1.0.0.Final</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Modified: branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/blog/blog-ejb/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -99,7 +99,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
Modified: branches/community/Seam_2_3/examples-ee6/blog/blog-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/blog/blog-tests/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/blog/blog-tests/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -40,7 +40,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
Modified: branches/community/Seam_2_3/examples-ee6/blog/blog-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/blog/blog-web/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/blog/blog-web/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -75,7 +75,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: branches/community/Seam_2_3/examples-ee6/booking/booking-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-ejb/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-ejb/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -55,7 +55,7 @@
</exclusion>
<exclusion>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
</exclusion>
<exclusion>
<groupId>javax.el</groupId>
@@ -65,7 +65,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -36,7 +36,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
Modified: branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-ejb/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-ejb/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -35,7 +35,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -37,7 +37,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
Modified: branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-web/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-web/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -69,7 +69,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: branches/community/Seam_2_3/examples-ee6/drools/drools-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/drools/drools-ejb/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/drools/drools-ejb/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -89,7 +89,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: branches/community/Seam_2_3/examples-ee6/drools/drools-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/drools/drools-tests/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/drools/drools-tests/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -32,7 +32,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.el</groupId>
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-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ejb/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -87,7 +87,7 @@
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
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-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -97,7 +97,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: branches/community/Seam_2_3/examples-ee6/excel/excel-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/excel/excel-ejb/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/excel/excel-ejb/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -38,7 +38,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: branches/community/Seam_2_3/examples-ee6/excel/excel-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/excel/excel-tests/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/excel/excel-tests/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -36,7 +36,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: branches/community/Seam_2_3/examples-ee6/excel/excel-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/excel/excel-web/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/excel/excel-web/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -60,7 +60,7 @@
<artifactId>jboss-seam-debug</artifactId>
<exclusions>
<exclusion>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<groupId>org.jboss.spec.javax.faces</groupId>
</exclusion>
</exclusions>
Modified: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -115,7 +115,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: branches/community/Seam_2_3/examples-ee6/guice/guice-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/guice/guice-tests/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -30,7 +30,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -60,7 +60,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
Modified: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -85,7 +85,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-ejb/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-ejb/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -48,7 +48,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-tests/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-tests/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -43,7 +43,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
Modified: branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -70,7 +70,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: branches/community/Seam_2_3/examples-ee6/itext/itext-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/itext/itext-ejb/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/itext/itext-ejb/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
Modified: branches/community/Seam_2_3/examples-ee6/itext/itext-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/itext/itext-tests/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/itext/itext-tests/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -36,7 +36,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: branches/community/Seam_2_3/examples-ee6/jee6/jee6-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/jee6/jee6-tests/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/jee6/jee6-tests/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -31,7 +31,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: branches/community/Seam_2_3/examples-ee6/jee6/jee6-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/jee6/jee6-web/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/jee6/jee6-web/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -61,7 +61,7 @@
</exclusion>
<exclusion>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
</exclusion>
<exclusion>
<groupId>javax.el</groupId>
@@ -71,7 +71,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
Modified: branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -31,7 +31,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
Modified: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -82,7 +82,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: branches/community/Seam_2_3/examples-ee6/mail/mail-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/mail/mail-ejb/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/mail/mail-ejb/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -37,7 +37,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: branches/community/Seam_2_3/examples-ee6/mail/mail-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/mail/mail-web/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/mail/mail-web/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -44,7 +44,7 @@
<groupId>com.sun.faces</groupId>
</exclusion>
<exclusion>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<groupId>org.jboss.spec.javax.faces</groupId>
</exclusion>
</exclusions>
@@ -76,7 +76,7 @@
<groupId>org.jboss.seam</groupId>
</exclusion>
<exclusion>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<groupId>org.jboss.spec.javax.faces</groupId>
</exclusion>
</exclusions>
@@ -88,7 +88,7 @@
<scope>runtime</scope>
<exclusions>
<exclusion>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<groupId>org.jboss.spec.javax.faces</groupId>
</exclusion>
</exclusions>
Modified: branches/community/Seam_2_3/examples-ee6/messages/messages-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/messages/messages-tests/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/messages/messages-tests/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -31,7 +31,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: branches/community/Seam_2_3/examples-ee6/metawidget/booking/booking-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/metawidget/booking/booking-ejb/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/metawidget/booking/booking-ejb/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -77,7 +77,7 @@
</exclusion>
<exclusion>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
</exclusion>
<exclusion>
<groupId>javax.el</groupId>
@@ -87,7 +87,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
Modified: branches/community/Seam_2_3/examples-ee6/metawidget/booking/booking-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/metawidget/booking/booking-tests/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/metawidget/booking/booking-tests/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -36,7 +36,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
Modified: branches/community/Seam_2_3/examples-ee6/metawidget/groovybooking/groovybooking-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/metawidget/groovybooking/groovybooking-web/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/metawidget/groovybooking/groovybooking-web/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -37,7 +37,7 @@
</exclusion>
<exclusion>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
</exclusion>
<exclusion>
<groupId>javax.el</groupId>
Modified: branches/community/Seam_2_3/examples-ee6/nestedbooking/nestedbooking-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/nestedbooking/nestedbooking-ejb/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/nestedbooking/nestedbooking-ejb/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -42,7 +42,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: branches/community/Seam_2_3/examples-ee6/nestedbooking/nestedbooking-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/nestedbooking/nestedbooking-tests/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/nestedbooking/nestedbooking-tests/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -32,7 +32,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.testng</groupId>
Modified: branches/community/Seam_2_3/examples-ee6/numberguess/numberguess-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/numberguess/numberguess-ejb/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/numberguess/numberguess-ejb/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -72,7 +72,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: branches/community/Seam_2_3/examples-ee6/numberguess/numberguess-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/numberguess/numberguess-tests/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/numberguess/numberguess-tests/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -33,7 +33,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.testng</groupId>
Modified: branches/community/Seam_2_3/examples-ee6/quartz/quartz-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/quartz/quartz-ejb/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/quartz/quartz-ejb/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -29,7 +29,7 @@
</exclusion>
<exclusion>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
</exclusion>
<exclusion>
<groupId>javax.el</groupId>
@@ -64,7 +64,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: branches/community/Seam_2_3/examples-ee6/quartz/quartz-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/quartz/quartz-tests/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/quartz/quartz-tests/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -37,7 +37,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.hibernate.javax.persistence</groupId>
Modified: branches/community/Seam_2_3/examples-ee6/registration/registration-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/registration/registration-ejb/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/registration/registration-ejb/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -29,7 +29,7 @@
</exclusion>
<exclusion>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
</exclusion>
<exclusion>
<groupId>javax.el</groupId>
@@ -54,7 +54,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: branches/community/Seam_2_3/examples-ee6/registration/registration-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/registration/registration-tests/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/registration/registration-tests/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -40,7 +40,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
Modified: branches/community/Seam_2_3/examples-ee6/remoting/chatroom/chatroom-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/remoting/chatroom/chatroom-ejb/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/remoting/chatroom/chatroom-ejb/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -31,7 +31,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: branches/community/Seam_2_3/examples-ee6/remoting/gwt/gwt-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/remoting/gwt/gwt-ejb/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/remoting/gwt/gwt-ejb/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -56,7 +56,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: branches/community/Seam_2_3/examples-ee6/remoting/helloworld/helloworld-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/remoting/helloworld/helloworld-ejb/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/remoting/helloworld/helloworld-ejb/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -31,7 +31,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: branches/community/Seam_2_3/examples-ee6/remoting/progressbar/progressbar-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/remoting/progressbar/progressbar-ejb/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/remoting/progressbar/progressbar-ejb/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -31,7 +31,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: branches/community/Seam_2_3/examples-ee6/restbay/restbay-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/restbay/restbay-ejb/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/restbay/restbay-ejb/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -46,7 +46,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: branches/community/Seam_2_3/examples-ee6/restbay/restbay-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/restbay/restbay-tests/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/restbay/restbay-tests/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -47,7 +47,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
</dependency>
Modified: branches/community/Seam_2_3/examples-ee6/rss/rss-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/rss/rss-ejb/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/rss/rss-ejb/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -60,7 +60,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: branches/community/Seam_2_3/examples-ee6/rss/rss-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/rss/rss-tests/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/rss/rss-tests/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -37,7 +37,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
Modified: branches/community/Seam_2_3/examples-ee6/seambay/seambay-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/seambay/seambay-ejb/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/seambay/seambay-ejb/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -46,7 +46,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: branches/community/Seam_2_3/examples-ee6/seambay/seambay-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/seambay/seambay-tests/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/seambay/seambay-tests/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -32,7 +32,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.testng</groupId>
Modified: branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-ejb/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-ejb/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -42,7 +42,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/seamdiscs/seamdiscs-tests/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -32,7 +32,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.hibernate.javax.persistence</groupId>
Modified: branches/community/Seam_2_3/examples-ee6/seampay/seampay-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/seampay/seampay-ejb/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/seampay/seampay-ejb/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -46,7 +46,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: branches/community/Seam_2_3/examples-ee6/seampay/seampay-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/seampay/seampay-tests/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/seampay/seampay-tests/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -32,7 +32,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.testng</groupId>
Modified: branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-ejb/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-ejb/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -46,7 +46,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-tests/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-tests/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -32,7 +32,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.testng</groupId>
Modified: branches/community/Seam_2_3/examples-ee6/spring/spring-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/spring/spring-tests/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/spring/spring-tests/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -31,7 +31,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: branches/community/Seam_2_3/examples-ee6/spring/spring-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/spring/spring-web/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/spring/spring-web/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -81,7 +81,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -46,7 +46,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -37,7 +37,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.testng</groupId>
Modified: branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/todo/todo-ejb/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -71,7 +71,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: branches/community/Seam_2_3/examples-ee6/todo/todo-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/todo/todo-tests/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/todo/todo-tests/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -32,7 +32,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
Modified: branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/ui/ui-ejb/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -36,7 +36,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: branches/community/Seam_2_3/examples-ee6/ui/ui-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/ui/ui-tests/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/ui/ui-tests/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -37,7 +37,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
Modified: branches/community/Seam_2_3/examples-ee6/ui/ui-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/ui/ui-web/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/examples-ee6/ui/ui-web/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -56,7 +56,7 @@
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
Modified: branches/community/Seam_2_3/jboss-seam/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/jboss-seam/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -390,7 +390,7 @@
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
Modified: branches/community/Seam_2_3/jboss-seam-debug/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-debug/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/jboss-seam-debug/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -23,7 +23,7 @@
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
Modified: branches/community/Seam_2_3/jboss-seam-excel/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-excel/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/jboss-seam-excel/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -25,7 +25,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: branches/community/Seam_2_3/jboss-seam-mail/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-mail/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/jboss-seam-mail/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -23,7 +23,7 @@
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
</dependency>
Modified: branches/community/Seam_2_3/jboss-seam-pdf/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-pdf/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/jboss-seam-pdf/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
</dependency>
</dependencies>
Modified: branches/community/Seam_2_3/jboss-seam-rss/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-rss/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/jboss-seam-rss/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: branches/community/Seam_2_3/jboss-seam-ui/pom.xml
===================================================================
--- branches/community/Seam_2_3/jboss-seam-ui/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/jboss-seam-ui/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -156,7 +156,7 @@
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
Modified: branches/community/Seam_2_3/seam-integration-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/seam-integration-tests/pom.xml 2012-08-25 19:49:28 UTC (rev 15087)
+++ branches/community/Seam_2_3/seam-integration-tests/pom.xml 2012-08-25 19:52:09 UTC (rev 15088)
@@ -101,7 +101,7 @@
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
+ <artifactId>jboss-jsf-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
12 years, 3 months
- 1
- 0
Seam SVN: r15087 - in branches/community/Seam_2_3/jboss-seam-gen/dist: ide-project-files/eclipse and 1 other directory.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2012-08-25 15:49:28 -0400 (Sat, 25 Aug 2012)
New Revision: 15087
Modified:
branches/community/Seam_2_3/jboss-seam-gen/dist/icefaces/ide-project-files/eclipse/.classpath
branches/community/Seam_2_3/jboss-seam-gen/dist/ide-project-files/eclipse/.classpath
Log:
jboss-seam-gen/dist/icefaces/ide-project-files/eclipse/.classpath
Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/icefaces/ide-project-files/eclipse/.classpath
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/dist/icefaces/ide-project-files/eclipse/.classpath 2012-08-25 19:49:13 UTC (rev 15086)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/icefaces/ide-project-files/eclipse/.classpath 2012-08-25 19:49:28 UTC (rev 15087)
@@ -43,6 +43,5 @@
<classpathentry kind="lib" path="lib/lucene-core.jar" />
<classpathentry kind="output" path="test-build"/>
<classpathentry kind="lib" path="lib/icefaces.jar"/>
- <classpathentry kind="lib" path="lib/icefaces-comps.jar"/>
- <classpathentry kind="lib" path="lib/icefaces-facelets.jar"/>
+ <classpathentry kind="lib" path="lib/icefaces-compat.jar"/>
</classpath>
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-08-25 19:49:13 UTC (rev 15086)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/ide-project-files/eclipse/.classpath 2012-08-25 19:49:28 UTC (rev 15087)
@@ -25,7 +25,6 @@
<classpathentry kind="lib" path="lib/hibernate-jpa-2.0-api.jar"/>
<classpathentry kind="lib" path="lib/xercesImpl.jar"/>
<classpathentry kind="lib" path="lib/commons-codec.jar"/>
- <classpathentry kind="lib" path="lib/testng-jdk15.jar"/>
<classpathentry kind="lib" path="lib/jackrabbit-jcr-commons.jar"/>
<classpathentry kind="lib" path="lib/drools-core.jar"/>
<classpathentry kind="lib" path="lib/itext.jar"/>
@@ -228,7 +227,6 @@
<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/jboss-deployers-client-spi.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"/>
@@ -270,10 +268,8 @@
<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/hsqldb.jar"/>
<classpathentry kind="lib" path="lib/jboss-seam-flex.jar"/>
<classpathentry kind="lib" path="lib/saaj-api.jar"/>
- <classpathentry kind="lib" path="lib/cglib-nodep.jar"/>
<classpathentry kind="lib" path="lib/yarfraw.jar"/>
<classpathentry kind="lib" path="lib/spring-jdbc.jar"/>
<classpathentry kind="lib" path="lib/drools-compiler.jar"/>
@@ -287,7 +283,6 @@
<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/jboss-deployers-core-spi.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"/>
12 years, 3 months
- 1
- 0