Author: manaRH Date: 2009-04-30 08:02:38 -0400 (Thu, 30 Apr 2009) New Revision: 10731 Modified: branches/enterprise/JBPAPP_4_3_FP01/build/common.build.xml branches/enterprise/JBPAPP_4_3_FP01/build/utilities.build.xml branches/enterprise/JBPAPP_4_3_FP01/examples/build.xml branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build-scripts/deployed-jars-ear.list branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build-scripts/deployed-jars-war.list branches/enterprise/JBPAPP_4_3_FP01/seam-gen/icefaces/build-scripts/deployed-jars-ear.list branches/enterprise/JBPAPP_4_3_FP01/seam-gen/icefaces/build-scripts/deployed-jars-war.list branches/enterprise/JBPAPP_4_3_FP01/seam-gen/nbproject/project.xml Log: replaced mvel14.jar renaming, used pure mvel.jar Modified: branches/enterprise/JBPAPP_4_3_FP01/build/common.build.xml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/build/common.build.xml 2009-04-30 07:49:15 UTC (rev 10730) +++ branches/enterprise/JBPAPP_4_3_FP01/build/common.build.xml 2009-04-30 12:02:38 UTC (rev 10731) @@ -125,9 +125,7 @@ <copyDependencies id="pdf" pom="${pdf.pom}" todir="${lib.dir}" scope="compile" /> <copyDependencies id="remoting" pom="${remoting.pom}" todir="${lib.dir}" scope="compile" /> <copyDependencies id="ui" pom="${ui.pom}" todir="${lib.dir}" scope="compile" /> - <copyDependencies id="gen" pom="${gen.pom}" todir="${lib.dir}/gen" scope="compile" /> - <!-- globmapper doesn't work with ant 1.6.5--> - <move file="${lib.dir}/mvel.jar" tofile="${lib.dir}/mvel14.jar"/> + <copyDependencies id="gen" pom="${gen.pom}" todir="${lib.dir}/gen" scope="compile" /> <property name="copyseamdependenciesdone" value="true" /> </target> Modified: branches/enterprise/JBPAPP_4_3_FP01/build/utilities.build.xml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/build/utilities.build.xml 2009-04-30 07:49:15 UTC (rev 10730) +++ branches/enterprise/JBPAPP_4_3_FP01/build/utilities.build.xml 2009-04-30 12:02:38 UTC (rev 10731) @@ -137,10 +137,6 @@ <chainedmapper> <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from=&quot;${@{scope}.(a){id}.versions}&quot; to="flatten" /> <flattenmapper /> - <compositemapper> - <identitymapper /> - <globmapper from="mvel.jar" to="mvel14.jar"/> - </compositemapper> </chainedmapper> </copy> </sequential> @@ -162,10 +158,6 @@ <chainedmapper> <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from=&quot;${@{scope}.(a){id}.versions}&quot; to="flatten" /> <flattenmapper /> - <compositemapper> - <identitymapper /> - <globmapper from="mvel.jar" to="mvel14.jar"/> - </compositemapper> </chainedmapper> </copy> </sequential> Modified: branches/enterprise/JBPAPP_4_3_FP01/examples/build.xml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/examples/build.xml 2009-04-30 07:49:15 UTC (rev 10730) +++ branches/enterprise/JBPAPP_4_3_FP01/examples/build.xml 2009-04-30 12:02:38 UTC (rev 10731) @@ -253,7 +253,7 @@ <include name="antlr-runtime.jar" if="drools.lib" /> <include name="core.jar" if="drools.lib" /> <include name="janino.jar" if="drools.lib" /> - <include name="mvel14.jar" if="drools.lib" /> + <include name="mvel.jar" if="drools.lib" /> <include name="drools-core.jar" if="drools.lib" /> <include name="drools-compiler.jar" if="drools.lib" /> </fileset> Modified: branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build-scripts/deployed-jars-ear.list =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build-scripts/deployed-jars-ear.list 2009-04-30 07:49:15 UTC (rev 10730) +++ branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build-scripts/deployed-jars-ear.list 2009-04-30 12:02:38 UTC (rev 10731) @@ -5,5 +5,5 @@ janino.jar jboss-el.jar jbpm-jpdl.jar -mvel14.jar +mvel.jar richfaces-api.jar Modified: branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build-scripts/deployed-jars-war.list =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build-scripts/deployed-jars-war.list 2009-04-30 07:49:15 UTC (rev 10730) +++ branches/enterprise/JBPAPP_4_3_FP01/seam-gen/build-scripts/deployed-jars-war.list 2009-04-30 12:02:38 UTC (rev 10731) @@ -10,7 +10,7 @@ jboss-seam-*.jar jbpm-jpdl.jar jsf-facelets.jar -mvel14.jar +mvel.jar richfaces-api.jar richfaces-impl.jar richfaces-ui.jar Modified: branches/enterprise/JBPAPP_4_3_FP01/seam-gen/icefaces/build-scripts/deployed-jars-ear.list =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/seam-gen/icefaces/build-scripts/deployed-jars-ear.list 2009-04-30 07:49:15 UTC (rev 10730) +++ branches/enterprise/JBPAPP_4_3_FP01/seam-gen/icefaces/build-scripts/deployed-jars-ear.list 2009-04-30 12:02:38 UTC (rev 10731) @@ -11,4 +11,4 @@ janino.jar jboss-el.jar jbpm-jpdl.jar -mvel14.jar +mvel.jar Modified: branches/enterprise/JBPAPP_4_3_FP01/seam-gen/icefaces/build-scripts/deployed-jars-war.list =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/seam-gen/icefaces/build-scripts/deployed-jars-war.list 2009-04-30 07:49:15 UTC (rev 10730) +++ branches/enterprise/JBPAPP_4_3_FP01/seam-gen/icefaces/build-scripts/deployed-jars-war.list 2009-04-30 12:02:38 UTC (rev 10731) @@ -14,4 +14,4 @@ jboss-seam.jar jboss-seam-*.jar jbpm-jpdl.jar -mvel14.jar +mvel.jar Modified: branches/enterprise/JBPAPP_4_3_FP01/seam-gen/nbproject/project.xml =================================================================== --- branches/enterprise/JBPAPP_4_3_FP01/seam-gen/nbproject/project.xml 2009-04-30 07:49:15 UTC (rev 10730) +++ branches/enterprise/JBPAPP_4_3_FP01/seam-gen/nbproject/project.xml 2009-04-30 12:02:38 UTC (rev 10731) @@ -96,18 +96,18 @@ <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/2"> <compilation-unit> <package-root>src/model</package-root> - <classpath mode="compile">lib/hibernate-validator.jar:lib/hibernate3.jar:lib/hibernate-annotations.jar:lib/hibernate-commons-annotations.jar:lib/hibernate-entitymanager.jar:lib/jboss-seam.jar:lib/jboss-seam-debug.jar:lib/jboss-cache.jar:lib/jbpm-jpdl.jar:lib/antlr.jar:lib/jgroups.jar:lib/jsf-facelets.jar:lib/jstl.jar:lib/jsf-api.jar:lib/servlet-api.jar:lib/jboss-el.jar:lib/el-api.jar:lib/mvel14.jar:lib/drools-core.jar:lib/drools-compiler.jar:lib/janino.jar:lib/antlr-runtime.jar:lib/mail.jar:lib/persistence-api.jar:lib/ejb-api.jar:lib/jsr250-api.jar:lib/jta.jar:lib/core.jar:lib/jboss-embedded-api.jar:lib/hibernate-search.jar:lib/richfaces-api.jar:lib/richfaces-ui.jar:lib/@driverJar@:lib/lucene-core.jar</classpath> + <classpath mode="compile">lib/hibernate-validator.jar:lib/hibernate3.jar:lib/hibernate-annotations.jar:lib/hibernate-commons-annotations.jar:lib/hibernate-entitymanager.jar:lib/jboss-seam.jar:lib/jboss-seam-debug.jar:lib/jboss-cache.jar:lib/jbpm-jpdl.jar:lib/antlr.jar:lib/jgroups.jar:lib/jsf-facelets.jar:lib/jstl.jar:lib/jsf-api.jar:lib/servlet-api.jar:lib/jboss-el.jar:lib/el-api.jar:lib/mvel.jar:lib/drools-core.jar:lib/drools-compiler.jar:lib/janino.jar:lib/antlr-runtime.jar:lib/mail.jar:lib/persistence-api.jar:lib/ejb-api.jar:lib/jsr250-api.jar:lib/jta.jar:lib/core.jar:lib/jboss-embedded-api.jar:lib/hibernate-search.jar:lib/richfaces-api.jar:lib/richfaces-ui.jar:lib/@driverJar@:lib/lucene-core.jar</classpath> <source-level>1.5</source-level> </compilation-unit> <compilation-unit> <package-root>src/action</package-root> - <classpath mode="compile">lib/hibernate-validator.jar:lib/hibernate3.jar:lib/hibernate-annotations.jar:lib/hibernate-commons-annotations.jar:lib/hibernate-entitymanager.jar:lib/jboss-seam.jar:lib/jboss-seam-debug.jar:lib/jboss-cache.jar:lib/jbpm-jpdl.jar:lib/antlr.jar:lib/jgroups.jar:lib/jsf-facelets.jar:lib/jstl.jar:lib/jsf-api.jar:lib/servlet-api.jar:lib/jboss-el.jar:lib/el-api.jar:lib/mvel14.jar:lib/drools-core.jar:lib/drools-compiler.jar:lib/janino.jar:lib/antlr-runtime.jar:lib/mail.jar:lib/persistence-api.jar:lib/ejb-api.jar:lib/jsr250-api.jar:lib/jta.jar:lib/core.jar:lib/jboss-embedded-api.jar:lib/hibernate-search.jar:lib/richfaces-api.jar:lib/richfaces-ui.jar:lib/@driverJar@:lib/lucene-core.jar</classpath> + <classpath mode="compile">lib/hibernate-validator.jar:lib/hibernate3.jar:lib/hibernate-annotations.jar:lib/hibernate-commons-annotations.jar:lib/hibernate-entitymanager.jar:lib/jboss-seam.jar:lib/jboss-seam-debug.jar:lib/jboss-cache.jar:lib/jbpm-jpdl.jar:lib/antlr.jar:lib/jgroups.jar:lib/jsf-facelets.jar:lib/jstl.jar:lib/jsf-api.jar:lib/servlet-api.jar:lib/jboss-el.jar:lib/el-api.jar:lib/mvel.jar:lib/drools-core.jar:lib/drools-compiler.jar:lib/janino.jar:lib/antlr-runtime.jar:lib/mail.jar:lib/persistence-api.jar:lib/ejb-api.jar:lib/jsr250-api.jar:lib/jta.jar:lib/core.jar:lib/jboss-embedded-api.jar:lib/hibernate-search.jar:lib/richfaces-api.jar:lib/richfaces-ui.jar:lib/@driverJar@:lib/lucene-core.jar</classpath> <source-level>1.5</source-level> </compilation-unit> <compilation-unit> <package-root>src/test</package-root> <unit-tests/> - <classpath mode="compile">bootstrap:lib/hibernate-validator.jar:lib/hibernate3.jar:lib/hibernate-annotations.jar:lib/hibernate-commons-annotations.jar:lib/hibernate-entitymanager.jar:lib/jboss-seam.jar:lib/jboss-seam-debug.jar:lib/jboss-cache.jar:lib/jbpm-jpdl.jar:lib/antlr.jar:lib/jgroups.jar:lib/jsf-facelets.jar:lib/jstl.jar:lib/jsf-api.jar:lib/servlet-api.jar:lib/testng.jar:lib/jboss-el.jar:lib/el-api.jar:lib/mvel14.jar:lib/drools-core.jar:lib/drools-compiler.jar:lib/janino.jar:lib/antlr-runtime.jar:lib/mail.jar:lib/persistence-api.jar:lib/ejb-api.jar:lib/jsr250-api.jar:lib/jta.jar:lib/core.jar:lib/jboss-embedded-api.jar:lib/hibernate-search.jar:lib/richfaces-api.jar:lib/@driverJar@:lib/lucene-core.jar</classpath> + <classpath mode="compile">bootstrap:lib/hibernate-validator.jar:lib/hibernate3.jar:lib/hibernate-annotations.jar:lib/hibernate-commons-annotations.jar:lib/hibernate-entitymanager.jar:lib/jboss-seam.jar:lib/jboss-seam-debug.jar:lib/jboss-cache.jar:lib/jbpm-jpdl.jar:lib/antlr.jar:lib/jgroups.jar:lib/jsf-facelets.jar:lib/jstl.jar:lib/jsf-api.jar:lib/servlet-api.jar:lib/testng.jar:lib/jboss-el.jar:lib/el-api.jar:lib/mvel.jar:lib/drools-core.jar:lib/drools-compiler.jar:lib/janino.jar:lib/antlr-runtime.jar:lib/mail.jar:lib/persistence-api.jar:lib/ejb-api.jar:lib/jsr250-api.jar:lib/jta.jar:lib/core.jar:lib/jboss-embedded-api.jar:lib/hibernate-search.jar:lib/richfaces-api.jar:lib/@driverJar@:lib/lucene-core.jar</classpath> <source-level>1.5</source-level> </compilation-unit> </java-data>