Author: manaRH Date: 2013-06-03 09:21:27 -0400 (Mon, 03 Jun 2013) New Revision: 15519 Modified: branches/enterprise/WFK-2_1/distribution/src/main/assembly/dist.xml branches/enterprise/WFK-2_1/distribution/src/main/assembly/seam branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build.xml branches/enterprise/WFK-2_1/jboss-seam-gen/pom.xml branches/enterprise/WFK-2_1/jboss-seam-gen/src/main/assembly/assembly.xml Log: JBSEAM-5108 refactored seam-gen required runtime libraries Modified: branches/enterprise/WFK-2_1/distribution/src/main/assembly/dist.xml =================================================================== --- branches/enterprise/WFK-2_1/distribution/src/main/assembly/dist.xml 2013-06-03 13:21:16 UTC (rev 15518) +++ branches/enterprise/WFK-2_1/distribution/src/main/assembly/dist.xml 2013-06-03 13:21:27 UTC (rev 15519) @@ -91,9 +91,6 @@ <includes> <include>org.jboss.seam:*:*:sources</include> </includes> - <excludes> - <exclude>org.jboss.seam:jboss-seam-gen:*:sources</exclude> - </excludes> <outputFileNameMapping>${artifact.artifactId}-sources.${artifact.extension}</outputFileNameMapping> </dependencySet> @@ -112,6 +109,7 @@ <include>org.jboss.seam:jboss-seam-resteasy:jar</include> <include>org.jboss.seam:jboss-seam-remoting:jar</include> <include>org.jboss.seam:jboss-seam-ioc:jar</include> + <include>org.jboss.seam:jboss-seam-gen:jar</include> </includes> <excludes> <exclude>*:*:ejb:sources</exclude> @@ -137,36 +135,7 @@ <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> </dependencySet> - <!-- Seam gen --> <dependencySet> - <outputDirectory>lib/gen</outputDirectory> - <useProjectArtifact>false</useProjectArtifact> - <useStrictFiltering>true</useStrictFiltering> - <useTransitiveDependencies>true</useTransitiveDependencies> - <includes> - <include>org.jboss.seam:jboss-seam-gen:jar</include> - <include>org.hibernate:hibernate-tools:jar</include> - <include>org.hibernate:hibernate-core:jar:4.0.0.Final</include> - <include>commons-collections:commons-collections:jar</include> - <include>commons-logging:commons-logging:jar</include> - <include>org.beanshell:bsh:jar</include> - <include>org.hibernate:jtidy:jar</include> - <include>freemarker:freemarker:jar</include> - <include>org.eclipse.jdt:core:jar</include> - <include>org.eclipse.core:runtime:jar</include> - <include>org.eclipse.equinox:common:jar</include> - <include>org.eclipse:text:jar</include> - <include>org.apache.ant:ant:jar</include> - <include>org.apache.ant:ant-launcher:jar</include> - <include>org.apache.ant:ant-nodeps:jar</include> - </includes> - <excludes> - <exclude>org.jboss.seam:jboss-seam-gen:jar:sources</exclude> - </excludes> - <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> - </dependencySet> - - <dependencySet> <outputDirectory>lib/test</outputDirectory> <useProjectArtifact>false</useProjectArtifact> <useTransitiveDependencies>true</useTransitiveDependencies> @@ -179,15 +148,6 @@ </dependencySet> <dependencySet> - <outputDirectory>lib/gen/src</outputDirectory> - <useProjectArtifact>false</useProjectArtifact> - <includes> - <include>org.jboss.seam:jboss-seam-gen:*:sources</include> - </includes> - <outputFileNameMapping>${artifact.artifactId}-${artifact.classifier}.${artifact.extension}</outputFileNameMapping> - </dependencySet> - - <dependencySet> <outputDirectory>./seam-gen</outputDirectory> <useProjectArtifact>false</useProjectArtifact> <unpack>true</unpack> Modified: branches/enterprise/WFK-2_1/distribution/src/main/assembly/seam =================================================================== --- branches/enterprise/WFK-2_1/distribution/src/main/assembly/seam 2013-06-03 13:21:16 UTC (rev 15518) +++ branches/enterprise/WFK-2_1/distribution/src/main/assembly/seam 2013-06-03 13:21:27 UTC (rev 15519) @@ -55,7 +55,7 @@ SEAM_HOME_WINPATH=`cygpath -aw "$SEAM_HOME"` SEAM_GEN_DIR_WINPATH=`cygpath -aw "$SEAM_GEN_DIR"` WORKING_DIR_WINPATH=`cygpath -aw "$WORKING_DIR"` - "$JAVA_HOME/bin/java" -cp "$JAVA_HOME_WINPATH\lib\tools.jar;$SEAM_HOME_WINPATH\lib\gen\ant-launcher.jar;$SEAM_HOME_WINPATH\lib\gen\ant-nodeps.jar;$SEAM_HOME_WINPATH\lib\gen\ant.jar" -Dant.home="$SEAM_HOME_WINPATH\lib" org.apache.tools.ant.launch.Launcher -buildfile "$SEAM_GEN_DIR_WINPATH\build.xml" -Dworking.dir="$WORKING_DIR_WINPATH" "$@" + "$JAVA_HOME/bin/java" -cp "$JAVA_HOME_WINPATH\lib\tools.jar;$SEAM_HOME_WINPATH\seam-gen\lib\ant-launcher.jar;$SEAM_HOME_WINPATH\seam-gen\lib\ant-nodeps.jar;$SEAM_HOME_WINPATH\seam-gen\lib\ant.jar" -Dant.home="$SEAM_HOME_WINPATH\lib" org.apache.tools.ant.launch.Launcher -buildfile "$SEAM_GEN_DIR_WINPATH\build.xml" -Dworking.dir="$WORKING_DIR_WINPATH" "$@" else - "$JAVA_HOME/bin/java" -cp "$JAVA_HOME/lib/tools.jar:$SEAM_HOME/lib/gen/ant-launcher.jar:$SEAM_HOME/lib/gen/ant-nodeps.jar:$SEAM_HOME/lib/gen/ant.jar" -Dant.home="$SEAM_HOME/lib" org.apache.tools.ant.launch.Launcher -buildfile "$SEAM_GEN_DIR/build.xml" -Dworking.dir="$WORKING_DIR" "$@" + "$JAVA_HOME/bin/java" -cp "$JAVA_HOME/lib/tools.jar:$SEAM_HOME/seam-gen/lib/ant-launcher.jar:$SEAM_HOME/seam-gen/lib/ant-nodeps.jar:$SEAM_HOME/seam-gen/lib/ant.jar" -Dant.home="$SEAM_HOME/lib" org.apache.tools.ant.launch.Launcher -buildfile "$SEAM_GEN_DIR/build.xml" -Dworking.dir="$WORKING_DIR" "$@" fi Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build.xml =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build.xml 2013-06-03 13:21:16 UTC (rev 15518) +++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build.xml 2013-06-03 13:21:27 UTC (rev 15519) @@ -37,7 +37,7 @@ <import file="${seam.dir}/build/common.build.xml"/> <target name="init"> - <path id="seam-gen.lib.path" path="${seam.dir}/lib/gen/jboss-seam-gen.jar"/> + <path id="seam-gen.lib.path" path="${seam.dir}/lib/jboss-seam-gen.jar"/> <taskdef name="normalizeProjectName" classname="org.jboss.seam.tool.NormalizeProjectNameTask" @@ -1466,34 +1466,6 @@ <echo message="Type '${seam.cmd} restart' and go to http://localhost:8080/${project.name}/${masterPage.name}.seam"/> </target> - <target name="init"]]></replacevalue> - </replace> - - <!-- uncomment richfaces dependencies if not using icefaces --> - <replace dir="${project.home}"> - <include name="ivy.xml" unless="icefaces.property"/> - <replacetoken><![CDATA[ [if richfaces] ->]]></replacetoken> - <replacevalue><![CDATA[ [if richfaces] -->]]></replacevalue> - </replace> - <replace dir="${project.home}"> - <include name="ivy.xml" unless="icefaces.property"/> - <replacetoken><![CDATA[<!- [/endif richfaces] ]]></replacetoken> - <replacevalue><![CDATA[<!-- [/endif richfaces] ]]></replacevalue> - </replace> - - <!-- uncomment icefaces dependencies if using icefaces --> - <replace dir="${project.home}"> - <include name="ivy.xml" if="icefaces.property"/> - <replacetoken><![CDATA[ [if icefaces] ->]]></replacetoken> - <replacevalue><![CDATA[ [if icefaces] -->]]></replacevalue> - </replace> - <replace dir="${project.home}"> - <include name="ivy.xml" if="icefaces.property"/> - <replacetoken><![CDATA[<!- [/endif icefaces] ]]></replacetoken> - <replacevalue><![CDATA[<!-- [/endif icefaces] ]]></replacevalue> - </replace> - </target> - <!-- Do not remove generate-entities, netbeans depends on it --> <target name="generate-entities" depends="generate"/> <target name="generate" depends="validate-project,generate-model,generate-ui" @@ -1503,37 +1475,34 @@ <target name="init-generate"> <path id="htools.classpath"> <pathelement path="${seam.dir}/lib/ant.jar"/> - <pathelement path="${seam.dir}/lib/gen/hibernate-tools.jar"/> - <pathelement path="${seam.dir}/lib/gen/freemarker.jar"/> - <pathelement path="${seam.dir}/lib/jboss-seam.jar"/> - <pathelement path="${seam.dir}/lib/gen/runtime.jar"/> - <pathelement path="${seam.dir}/lib/gen/common.jar"/> - <pathelement path="${seam.dir}/lib/gen/text.jar"/> + <pathelement path="${seam.dir}/seam-gen/lib/hibernate-core.jar"/> + <pathelement path="${seam.dir}/seam-gen/lib/hibernate-entitymanager.jar"/> + <pathelement path="${seam.dir}/seam-gen/lib/hibernate-tools.jar"/> + <pathelement path="${seam.dir}/seam-gen/lib/freemarker.jar"/> + <pathelement path="${seam.dir}/seam-gen/lib/runtime.jar"/> + <pathelement path="${seam.dir}/seam-gen/lib/common.jar"/> + <pathelement path="${seam.dir}/seam-gen/lib/commons-collections.jar"/> + <pathelement path="${seam.dir}/seam-gen/lib/commons-logging.jar"/> + <pathelement path="${seam.dir}/seam-gen/lib/core.jar"/> + <pathelement path="${seam.dir}/seam-gen/lib/text.jar"/> <pathelement path="${seam.dir}/lib/dom4j.jar"/> <pathelement path="${seam.dir}/lib/persistence-api.jar"/> - <pathelement path="${seam.dir}/lib/gen/hibernate-core.jar"/> <pathelement path="${seam.dir}/lib/hibernate-commons-annotations.jar"/> <pathelement path="${seam.dir}/lib/hibernate-annotations.jar"/> - <pathelement path="${seam.dir}/lib/hibernate-entitymanager.jar"/> <pathelement path="${seam.dir}/lib/hibernate-validator.jar"/> <pathelement path="${seam.dir}/lib/jboss-logging.jar"/> <pathelement path="${seam.dir}/lib/jboss-transaction-api_1.1_spec.jar"/> <pathelement path="${seam.dir}/lib/hibernate-jpa-2.0-api.jar"/> - <pathelement path="${seam.dir}/lib/gen/core.jar"/> <pathelement path="${seam.dir}/lib/slf4j-api.jar"/> - <pathelement path="${seam.dir}/lib/slf4j-log4j12.jar"/> <pathelement path="${seam.dir}/lib/log4j.jar"/> - <pathelement path="${seam.dir}/lib/gen/commons-collections.jar"/> - <pathelement path="${seam.dir}/lib/gen/commons-logging.jar"/> <pathelement path="${seam.dir}/lib/javassist.jar"/> - <pathelement path="${seam.dir}/lib/cglib-nodep.jar"/> <pathelement path="${seam.dir}/lib/asm.jar"/> - <pathelement path="${seam.dir}/lib/core.jar"/> <pathelement path="${seam.dir}/lib/jboss-common-core.jar"/> <pathelement path="${seam.dir}/lib/concurrent.jar"/> <pathelement path="${driver.jar}"/> <pathelement path="${driver.license.jar}"/> - <pathelement path="${seam.dir}/lib/gen/jboss-seam-gen.jar"/> + <pathelement path="${seam.dir}/lib/jboss-seam.jar"/> + <pathelement path="${seam.dir}/lib/jboss-seam-gen.jar"/> </path> <taskdef name="hibernate" classname="org.hibernate.tool.ant.HibernateToolTask" classpathref="htools.classpath"/> </target> Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam-gen/pom.xml 2013-06-03 13:21:16 UTC (rev 15518) +++ branches/enterprise/WFK-2_1/jboss-seam-gen/pom.xml 2013-06-03 13:21:27 UTC (rev 15519) @@ -65,6 +65,11 @@ </plugin> </plugins> </build> + + <properties> + <hibernateversion>4.0.0.Final</hibernateversion> + </properties> + <dependencies> <!-- version runtime dependencies are managed only here instead in parent --> @@ -73,32 +78,35 @@ <artifactId>hibernate-tools</artifactId> <version>4.0.0-CR1</version> <scope>runtime</scope> - <exclusions> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</artifactId> - </exclusion> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-commons-annotations</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.hibernate.javax.persistence</groupId> - <artifactId>hibernate-jpa-2.0-api</artifactId> - </exclusion> - - </exclusions> </dependency> <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>${hibernateversion}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> + <version>${hibernateversion}</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1</version> + <scope>runtime</scope> + </dependency> + + <dependency> <groupId>freemarker</groupId> <artifactId>freemarker</artifactId> <version>2.3.8</version> @@ -191,9 +199,6 @@ <scope>runtime</scope> </dependency> </dependencies> - - <modules> - </modules> <profiles> <profile> @@ -213,4 +218,13 @@ </profile> </profiles> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>com.fasterxml</groupId> + <artifactId>classmate</artifactId> + <version>0.5.4-redhat-1</version> + </dependency> + </dependencies> + </dependencyManagement> </project> Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/src/main/assembly/assembly.xml =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam-gen/src/main/assembly/assembly.xml 2013-06-03 13:21:16 UTC (rev 15518) +++ branches/enterprise/WFK-2_1/jboss-seam-gen/src/main/assembly/assembly.xml 2013-06-03 13:21:27 UTC (rev 15519) @@ -20,5 +20,31 @@ </excludes> </fileSet> </fileSets> - + <dependencySets> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <useProjectArtifact>false</useProjectArtifact> + <useStrictFiltering>true</useStrictFiltering> + <useTransitiveDependencies>true</useTransitiveDependencies> + <includes> + <include>org.hibernate:hibernate-tools:jar</include> + <include>org.hibernate:hibernate-core:jar</include> + <include>org.hibernate:hibernate-entitymanager:jar</include> + <include>commons-collections:commons-collections:jar</include> + <include>commons-logging:commons-logging:jar</include> + <include>org.hibernate:jtidy:jar</include> + <include>freemarker:freemarker:jar</include> + <include>org.eclipse.jdt:core:jar</include> + <include>org.eclipse.core:runtime:jar</include> + <include>org.eclipse.equinox:common:jar</include> + <include>org.eclipse:text:jar</include> + <include>antlr:antlr:jar</include> + <include>org.apache.ant:ant:jar</include> + <include>org.apache.ant:ant-nodeps:jar</include> + <include>org.apache.ant:ant-launcher:jar</include> + </includes> + <outputFileNameMapping>${artifact.artifactId}.${artifact.extension} + </outputFileNameMapping> + </dependencySet> + </dependencySets> </assembly> \ No newline at end of file