[hibernate-commits] Hibernate SVN: r17809 - in sandbox/trunk/lobtest-ee5: lobtest-ear and 2 other directories.

Author: gbadner Date: 2009-10-20 22:03:44 -0400 (Tue, 20 Oct 2009) New Revision: 17809 Added: sandbox/trunk/lobtest-ee5/README.txt sandbox/trunk/lobtest-ee5/build-and-deploy.sh Modified: sandbox/trunk/lobtest-ee5/lobtest-ear/pom.xml sandbox/trunk/lobtest-ee5/lobtest-ejb/pom.xml sandbox/trunk/lobtest-ee5/lobtest-sar/pom.xml Log: Added 2 profiles: - eap-5 (activated by default) builds with EAP 5.0.0.GA jars - eap-4.3-cp06 builds with EAP 4.3 CP06 jars Added README.txt with instructions for running the test. Added build-and-deploy.sh to build the test app and deploy to AS. Added: sandbox/trunk/lobtest-ee5/README.txt =================================================================== --- sandbox/trunk/lobtest-ee5/README.txt (rev 0) +++ sandbox/trunk/lobtest-ee5/README.txt 2009-10-21 02:03:44 UTC (rev 17809) @@ -0,0 +1,57 @@ +Requires: + + JDK 1.5 or 1.6 + maven 2.2.1 + +To build and deploy to EAP 4.3 CP06: + + sh build-and-deploy.sh eap-4.3-cp06 <jboss-home>/server/production/deploy + +To build and deploy to EAP 5: + + sh build-and-deploy.sh eap-5 <jboss-home>/server/default/deploy + +To run the test: + + http://localhost:8080/lobtest-web/basic.jsp + +The default byte code provider is javassist. + +Using the default byte code provider, javassist, the output should +be something like: + +Tests set up. +A-1 - basic.jsp from ts.findThingJPA(): Thing: id=1256084319135 name=One class=class com.redhat.gss.lobtest.jpa.Thing_$$_javassist_1 +A-2 - basic.jsp from ts.findJPAjndi(): Thing: id=1256084319135 name=One class=class com.redhat.gss.lobtest.jpa.Thing_$$_javassist_1 +A-3 - basic.jsp from ts.findThingJPAThruHibernate(): Thing: id=1256084319135 name=One class=class com.redhat.gss.lobtest.jpa.Thing_$$_javassist_1 +B-1 - basic.jsp from ts.findThingHibernate(): Thing: id=1256084319135 name=One class=class com.redhat.gss.lobtest.jpa.Thing_$$_javassist_1 +B-2 - basic.jsp from ts.findThingHibernateMBean(): Thing: id=1256084319135 name=One class=class com.redhat.gss.lobtest.jpa.Thing_$$_javassist_1 +Tests run successfully. + +To override the default and use cglib as the byte code provider, +add the following to the bottome of jboss-as/bin/run.conf: + + JAVA_OPTS="$JAVA_OPTS -Dhibernate.bytecode.provider=cglib" + +NOTE: Until JBPAPP-2915 is fixed for EAP 4.2/4.3, it is necessary +to change hibernate.bytecode.provider=javassist to +hibernate.bytecode.provider=cglib in +jboss-as/server/production/deploy/ejb3.deployer/META-INF/persistence.properties +to set cglib as the byte code provider. + +JBoss AS will need to be restarted for this change to take affect. + +When the test is rerun: + + http://localhost:8080/lobtest-web/basic.jsp + +If cglib is properly defined as the byte code provider, the output +should be something like: + +Tests set up. +A-1 - basic.jsp from ts.findThingJPA(): Thing: id=1256083856036 name=One class=class com.redhat.gss.lobtest.jpa.Thing$$EnhancerByCGLIB$$adc6e4f4 +A-2 - basic.jsp from ts.findJPAjndi(): Thing: id=1256083856036 name=One class=class com.redhat.gss.lobtest.jpa.Thing$$EnhancerByCGLIB$$adc6e4f4 +A-3 - basic.jsp from ts.findThingJPAThruHibernate(): Thing: id=1256083856036 name=One class=class com.redhat.gss.lobtest.jpa.Thing$$EnhancerByCGLIB$$adc6e4f4 +B-1 - basic.jsp from ts.findThingHibernate(): Thing: id=1256083856036 name=One class=class com.redhat.gss.lobtest.jpa.Thing$$EnhancerByCGLIB$$adc6e4f4 +B-2 - basic.jsp from ts.findThingHibernateMBean(): Thing: id=1256083856036 name=One class=class com.redhat.gss.lobtest.jpa.Thing$$EnhancerByCGLIB$$adc6e4f4 +Tests run successfully. Added: sandbox/trunk/lobtest-ee5/build-and-deploy.sh =================================================================== --- sandbox/trunk/lobtest-ee5/build-and-deploy.sh (rev 0) +++ sandbox/trunk/lobtest-ee5/build-and-deploy.sh 2009-10-21 02:03:44 UTC (rev 17809) @@ -0,0 +1,9 @@ +PROFILE=${1} +JBOSS_DEPLOY_DIR=${2} + +mvn clean install -P ${PROFILE} +cp ./lobtest-ear/target/lobtest.ear $JBOSS_DEPLOY_DIR +cp ./lobtest-ejb/lobtestdb-ds.xml $JBOSS_DEPLOY_DIR + +# To change to use cglib, add -Dhibernate.bytecode.provider=cglib +# to $JAVA_OPTS in <eap-install-dir>/jboss-as/bin/run.conf . Property changes on: sandbox/trunk/lobtest-ee5/build-and-deploy.sh ___________________________________________________________________ Name: svn:executable + * Modified: sandbox/trunk/lobtest-ee5/lobtest-ear/pom.xml =================================================================== --- sandbox/trunk/lobtest-ee5/lobtest-ear/pom.xml 2009-10-20 17:33:40 UTC (rev 17808) +++ sandbox/trunk/lobtest-ee5/lobtest-ear/pom.xml 2009-10-21 02:03:44 UTC (rev 17809) @@ -59,30 +59,6 @@ <!-- These modules are re-listed here to they can be excluded from the EAR --> <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate</artifactId> - <version>3.2.4.sp1</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-annotations</artifactId> - <version>3.2.1.ga</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <version>3.2.1.ga</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>geronimo-spec</groupId> <artifactId>geronimo-spec-jta</artifactId> <version>1.0.1B-rc4</version> @@ -95,4 +71,71 @@ <scope>provided</scope> </dependency> </dependencies> + + <profiles> + <profile> + <id>eap-4.3-cp06</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <dependencies> + <dependency> + <groupId>hibernate.</groupId> + <artifactId>hibernate3</artifactId> + <version>3.2.4.SP1_CP08-brew</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>hibernate-entitymanager</groupId> + <artifactId>ejb3-persistence</artifactId> + <version>3.3.2.GA-brew</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>hibernate-annotations</groupId> + <artifactId>hibernate-annotations</artifactId> + <version>3.3.1.GA_CP01-brew</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>hibernate-entitymanager</groupId> + <artifactId>hibernate-entitymanager</artifactId> + <version>3.3.2.GA-brew</version> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>eap-5</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <dependencies> + <dependency> + <groupId>org.hibernate.</groupId> + <artifactId>hibernate-core</artifactId> + <version>3.3.2.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>ejb3-persistence</artifactId> + <version>1.0.2.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-annotations</artifactId> + <version>3.4.0.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> + <version>3.4.0.GA</version> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> + </profiles> </project> Modified: sandbox/trunk/lobtest-ee5/lobtest-ejb/pom.xml =================================================================== --- sandbox/trunk/lobtest-ee5/lobtest-ejb/pom.xml 2009-10-20 17:33:40 UTC (rev 17808) +++ sandbox/trunk/lobtest-ee5/lobtest-ejb/pom.xml 2009-10-21 02:03:44 UTC (rev 17809) @@ -29,30 +29,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate</artifactId> - <version>3.2.4.sp1</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-annotations</artifactId> - <version>3.2.1.ga</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <version>3.2.1.ga</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>geronimo-spec</groupId> <artifactId>geronimo-spec-jta</artifactId> <version>1.0.1B-rc4</version> @@ -71,4 +47,71 @@ <scope>provided</scope> </dependency> </dependencies> -</project> \ No newline at end of file + + <profiles> + <profile> + <id>eap-4.3-cp06</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <dependencies> + <dependency> + <groupId>hibernate.</groupId> + <artifactId>hibernate3</artifactId> + <version>3.2.4.SP1_CP08-brew</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>hibernate-entitymanager</groupId> + <artifactId>ejb3-persistence</artifactId> + <version>3.3.2.GA-brew</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>hibernate-annotations</groupId> + <artifactId>hibernate-annotations</artifactId> + <version>3.3.1.GA_CP01-brew</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>hibernate-entitymanager</groupId> + <artifactId>hibernate-entitymanager</artifactId> + <version>3.3.2.GA-brew</version> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>eap-5</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <dependencies> + <dependency> + <groupId>org.hibernate.</groupId> + <artifactId>hibernate-core</artifactId> + <version>3.3.2.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>ejb3-persistence</artifactId> + <version>1.0.2.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-annotations</artifactId> + <version>3.4.0.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> + <version>3.4.0.GA</version> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> + </profiles> +</project> Modified: sandbox/trunk/lobtest-ee5/lobtest-sar/pom.xml =================================================================== --- sandbox/trunk/lobtest-ee5/lobtest-sar/pom.xml 2009-10-20 17:33:40 UTC (rev 17808) +++ sandbox/trunk/lobtest-ee5/lobtest-sar/pom.xml 2009-10-21 02:03:44 UTC (rev 17809) @@ -28,30 +28,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate</artifactId> - <version>3.2.4.sp1</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-annotations</artifactId> - <version>3.2.1.ga</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <version>3.2.1.ga</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>geronimo-spec</groupId> <artifactId>geronimo-spec-jta</artifactId> <version>1.0.1B-rc4</version> @@ -70,4 +46,70 @@ <scope>provided</scope> </dependency> </dependencies> -</project> \ No newline at end of file + <profiles> + <profile> + <id>eap-4.3-cp06</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <dependencies> + <dependency> + <groupId>hibernate.</groupId> + <artifactId>hibernate3</artifactId> + <version>3.2.4.SP1_CP08-brew</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>hibernate-entitymanager</groupId> + <artifactId>ejb3-persistence</artifactId> + <version>3.3.2.GA-brew</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>hibernate-annotations</groupId> + <artifactId>hibernate-annotations</artifactId> + <version>3.3.1.GA_CP01-brew</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>hibernate-entitymanager</groupId> + <artifactId>hibernate-entitymanager</artifactId> + <version>3.3.2.GA-brew</version> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>eap-5</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <dependencies> + <dependency> + <groupId>org.hibernate.</groupId> + <artifactId>hibernate-core</artifactId> + <version>3.3.2.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>ejb3-persistence</artifactId> + <version>1.0.2.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-annotations</artifactId> + <version>3.4.0.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> + <version>3.4.0.GA</version> + <scope>provided</scope> + </dependency> + </dependencies> + </profile> + </profiles> +</project>