Author: norman.richards(a)jboss.com
Date: 2009-06-23 15:14:04 -0400 (Tue, 23 Jun 2009)
New Revision: 11198
Modified:
tags/JBoss_Seam_2_2_0_CR1/seam-gen/build.xml
tags/JBoss_Seam_2_2_0_CR1/seam-gen/icefaces/ide-project-files/eclipse/.classpath
tags/JBoss_Seam_2_2_0_CR1/seam-gen/icefaces/ide-project-files/idea/module.iml
tags/JBoss_Seam_2_2_0_CR1/seam-gen/ide-project-files/eclipse/.classpath
tags/JBoss_Seam_2_2_0_CR1/seam-gen/ide-project-files/idea/module.iml
tags/JBoss_Seam_2_2_0_CR1/seam-gen/ide-project-files/netbeans/project.xml
Log:
merge seamgen changes from branch
Modified: tags/JBoss_Seam_2_2_0_CR1/seam-gen/build.xml
===================================================================
--- tags/JBoss_Seam_2_2_0_CR1/seam-gen/build.xml 2009-06-23 19:05:47 UTC (rev 11197)
+++ tags/JBoss_Seam_2_2_0_CR1/seam-gen/build.xml 2009-06-23 19:14:04 UTC (rev 11198)
@@ -1534,15 +1534,18 @@
<pathelement path="${seam.dir}/lib/gen/text.jar"/>
<pathelement path="${seam.dir}/lib/dom4j.jar"/>
<pathelement path="${seam.dir}/lib/persistence-api.jar"/>
- <pathelement path="${seam.dir}/lib/hibernate.jar"/>
+ <pathelement path="${seam.dir}/lib/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/slf4j-api.jar"/>
+ <pathelement path="${seam.dir}/lib/slf4j-log4j12.jar"/>
+ <pathelement path="${seam.dir}/lib/log4j.jar"/>
<pathelement
path="${seam.dir}/lib/commons-collections.jar"/>
<pathelement path="${seam.dir}/lib/commons-logging.jar"/>
<pathelement path="${seam.dir}/lib/javassist.jar"/>
- <pathelement path="${seam.dir}/lib/cglib.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"/>
Modified:
tags/JBoss_Seam_2_2_0_CR1/seam-gen/icefaces/ide-project-files/eclipse/.classpath
===================================================================
---
tags/JBoss_Seam_2_2_0_CR1/seam-gen/icefaces/ide-project-files/eclipse/.classpath 2009-06-23
19:05:47 UTC (rev 11197)
+++
tags/JBoss_Seam_2_2_0_CR1/seam-gen/icefaces/ide-project-files/eclipse/.classpath 2009-06-23
19:14:04 UTC (rev 11198)
@@ -6,7 +6,7 @@
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="bootstrap"/>
<classpathentry kind="lib"
path="lib/hibernate-validator.jar"/>
- <classpathentry kind="lib" path="lib/hibernate.jar"/>
+ <classpathentry kind="lib" path="lib/hibernate-core.jar"/>
<classpathentry kind="lib"
path="lib/hibernate-annotations.jar"/>
<classpathentry kind="lib"
path="lib/hibernate-commons-annotations.jar"/>
<classpathentry kind="lib"
path="lib/hibernate-entitymanager.jar"/>
Modified: tags/JBoss_Seam_2_2_0_CR1/seam-gen/icefaces/ide-project-files/idea/module.iml
===================================================================
---
tags/JBoss_Seam_2_2_0_CR1/seam-gen/icefaces/ide-project-files/idea/module.iml 2009-06-23
19:05:47 UTC (rev 11197)
+++
tags/JBoss_Seam_2_2_0_CR1/seam-gen/icefaces/ide-project-files/idea/module.iml 2009-06-23
19:14:04 UTC (rev 11198)
@@ -84,7 +84,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/lib/hibernate.jar!/" />
+ <root url="jar://$MODULE_DIR$/lib/hibernate-core.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: tags/JBoss_Seam_2_2_0_CR1/seam-gen/ide-project-files/eclipse/.classpath
===================================================================
--- tags/JBoss_Seam_2_2_0_CR1/seam-gen/ide-project-files/eclipse/.classpath 2009-06-23
19:05:47 UTC (rev 11197)
+++ tags/JBoss_Seam_2_2_0_CR1/seam-gen/ide-project-files/eclipse/.classpath 2009-06-23
19:14:04 UTC (rev 11198)
@@ -6,7 +6,7 @@
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="bootstrap"/>
<classpathentry kind="lib"
path="lib/hibernate-validator.jar"/>
- <classpathentry kind="lib" path="lib/hibernate.jar"/>
+ <classpathentry kind="lib" path="lib/hibernate-core.jar"/>
<classpathentry kind="lib"
path="lib/hibernate-annotations.jar"/>
<classpathentry kind="lib"
path="lib/hibernate-commons-annotations.jar"/>
<classpathentry kind="lib"
path="lib/hibernate-entitymanager.jar"/>
Modified: tags/JBoss_Seam_2_2_0_CR1/seam-gen/ide-project-files/idea/module.iml
===================================================================
--- tags/JBoss_Seam_2_2_0_CR1/seam-gen/ide-project-files/idea/module.iml 2009-06-23
19:05:47 UTC (rev 11197)
+++ tags/JBoss_Seam_2_2_0_CR1/seam-gen/ide-project-files/idea/module.iml 2009-06-23
19:14:04 UTC (rev 11198)
@@ -79,7 +79,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/lib/hibernate.jar!/" />
+ <root url="jar://$MODULE_DIR$/lib/hibernate-core.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: tags/JBoss_Seam_2_2_0_CR1/seam-gen/ide-project-files/netbeans/project.xml
===================================================================
--- tags/JBoss_Seam_2_2_0_CR1/seam-gen/ide-project-files/netbeans/project.xml 2009-06-23
19:05:47 UTC (rev 11197)
+++ tags/JBoss_Seam_2_2_0_CR1/seam-gen/ide-project-files/netbeans/project.xml 2009-06-23
19:14:04 UTC (rev 11198)
@@ -96,18 +96,18 @@
<java-data
xmlns="http://www.netbeans.org/ns/freeform-project-java/2">
<compilation-unit>
<package-root>src/main</package-root>
- <classpath
mode="compile">lib/hibernate-validator.jar:lib/hibernate.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/mvel2.jar:lib/drools-api.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/hibernate-core.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/mvel2.jar:lib/drools-api.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/hot</package-root>
- <classpath
mode="compile">lib/hibernate-validator.jar:lib/hibernate.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/mvel2.jar:lib/drools-api.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/hibernate-core.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/mvel2.jar:lib/drools-api.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/hibernate.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/mvel2.jar:lib/drools-api.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/hibernate-core.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/mvel2.jar:lib/drools-api.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>