Hibernate SVN: r17809 - in sandbox/trunk/lobtest-ee5: lobtest-ear and 2 other directories.
by hibernate-commits＠lists.jboss.org
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>
14 years, 6 months
Hibernate SVN: r17808 - in core/trunk: entitymanager and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2009-10-20 13:33:40 -0400 (Tue, 20 Oct 2009)
New Revision: 17808
Modified:
core/trunk/entitymanager/pom.xml
core/trunk/pom.xml
Log:
HHH-4203
Added the annotation processor to the EM build to generate static entity model classes
Modified: core/trunk/entitymanager/pom.xml
===================================================================
--- core/trunk/entitymanager/pom.xml 2009-10-20 17:31:02 UTC (rev 17807)
+++ core/trunk/entitymanager/pom.xml 2009-10-20 17:33:40 UTC (rev 17808)
@@ -26,14 +26,12 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-commons-annotations</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>cglib</groupId>
@@ -47,6 +45,12 @@
<groupId>org.hibernate.java-persistence</groupId>
<artifactId>jpa-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-jpamodelgen</artifactId>
+ <version>1.0.0-Alpha1-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<dependencyManagement>
@@ -84,6 +88,60 @@
</testResources>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>process_annotations</id>
+ <phase>process-test-resources</phase>
+ <configuration>
+ <tasks>
+ <echo>processing JPA annotations</echo>
+ <property name="target.dir" value="target/generated-jpamodel-classes"/>
+ <mkdir dir="${target.dir}"/>
+ <javac srcdir="src/test/java" destdir="${target.dir}"
+ failonerror="false" excludes="test/**" fork="true" executable="${jdk16_home}/bin/javac" target="1.5">
+ <compilerarg value="-proc:only"/>
+ <classpath>
+ <path refid="maven.test.classpath"/>
+ </classpath>
+ </javac>
+ </tasks>
+ <sourceRoot>generate</sourceRoot>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.3</version>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-test-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>target/generated-jpamodel-classes</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2009-10-20 17:31:02 UTC (rev 17807)
+++ core/trunk/pom.xml 2009-10-20 17:33:40 UTC (rev 17808)
@@ -26,7 +26,6 @@
<module>connection-c3p0</module>
<module>connection-proxool</module>
<module>annotations</module>
- <module>entitymanager</module>
<module>envers</module>
<module>jmx</module>
<module>testing</module>
@@ -81,6 +80,7 @@
</property>
</activation>
<modules>
+ <module>entitymanager</module>
<module>cache-infinispan</module>
<module>jdbc4-testing</module>
</modules>
14 years, 6 months
Hibernate SVN: r17807 - core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2009-10-20 13:31:02 -0400 (Tue, 20 Oct 2009)
New Revision: 17807
Modified:
core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaQueryCompiler.java
core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaQueryImpl.java
Log:
fixed some typos
Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaQueryCompiler.java
===================================================================
--- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaQueryCompiler.java 2009-10-20 17:20:54 UTC (rev 17806)
+++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaQueryCompiler.java 2009-10-20 17:31:02 UTC (rev 17807)
@@ -34,7 +34,7 @@
* Compiles a JPA criteria query into an executable {@link TypedQuery}. Its single contract is the {@link #compile}
* method.
* <p/>
- * NOTE : This is a temporay implementation which simply translates the criteria query into a JPAQL query string. A
+ * NOTE : This is a temporary implementation which simply translates the criteria query into a JPAQL query string. A
* better, long-term solution is being implemented as part of refactoring the JPAQL/HQL translator.
*
* @author Steve Ebersole
Modified: core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaQueryImpl.java
===================================================================
--- core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaQueryImpl.java 2009-10-20 17:20:54 UTC (rev 17806)
+++ core/trunk/entitymanager/src/main/java/org/hibernate/ejb/criteria/CriteriaQueryImpl.java 2009-10-20 17:31:02 UTC (rev 17807)
@@ -39,7 +39,7 @@
import javax.persistence.metamodel.EntityType;
/**
- * The Hibernate implementation of the JPA {@link CriteriaQuery} contract. Mostlty a set of delegation to its
+ * The Hibernate implementation of the JPA {@link CriteriaQuery} contract. Mostly a set of delegation to its
* internal {@link QueryStructure}.
*
* @author Steve Ebersole
14 years, 6 months
Hibernate SVN: r17806 - in jpamodelgen/trunk: src/main/java/org/hibernate/jpamodelgen and 1 other directory.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2009-10-20 13:20:54 -0400 (Tue, 20 Oct 2009)
New Revision: 17806
Modified:
jpamodelgen/trunk/pom.xml
jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/ClassWriter.java
Log:
removed the @Generated annotation in generated model classes so that the generated source files can be used in a 1.5 jvm
Modified: jpamodelgen/trunk/pom.xml
===================================================================
--- jpamodelgen/trunk/pom.xml 2009-10-20 14:21:52 UTC (rev 17805)
+++ jpamodelgen/trunk/pom.xml 2009-10-20 17:20:54 UTC (rev 17806)
@@ -3,8 +3,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.hibernate</groupId>
- <artifactId>jpamodelgen</artifactId>
- <version>1.0.0-Alpha1</version>
+ <artifactId>hibernate-jpamodelgen</artifactId>
+ <version>1.0.0-Alpha1-SNAPSHOT</version>
<name>JPA Model Generator</name>
<description> Annotation Processor to cenerate metadata model for JPA2 typesafe queries </description>
Modified: jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/ClassWriter.java
===================================================================
--- jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/ClassWriter.java 2009-10-20 14:21:52 UTC (rev 17805)
+++ jpamodelgen/trunk/src/main/java/org/hibernate/jpamodelgen/ClassWriter.java 2009-10-20 17:20:54 UTC (rev 17806)
@@ -93,7 +93,7 @@
pw = new PrintWriter( sw );
- pw.println( "@" + entity.importType( Generated.class.getName() ) + "(\"JPA MetaModel for " + entity.getQualifiedName() + "\")" );
+ //pw.println( "@" + entity.importType( Generated.class.getName() ) + "(\"JPA MetaModel for " + entity.getQualifiedName() + "\")" );
pw.println( "@" + entity.importType( "javax.persistence.metamodel.StaticMetamodel" ) + "(" + entity.getSimpleName() + ".class)" );
14 years, 6 months
Hibernate SVN: r17805 - core/trunk/core/src/main/java/org/hibernate/dialect/resolver.
by hibernate-commits＠lists.jboss.org
Author: jcosta(a)redhat.com
Date: 2009-10-20 10:21:52 -0400 (Tue, 20 Oct 2009)
New Revision: 17805
Modified:
core/trunk/core/src/main/java/org/hibernate/dialect/resolver/DialectFactory.java
Log:
HHH-4508 - Fixed 'avalable' typo
Modified: core/trunk/core/src/main/java/org/hibernate/dialect/resolver/DialectFactory.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/dialect/resolver/DialectFactory.java 2009-10-20 14:21:02 UTC (rev 17804)
+++ core/trunk/core/src/main/java/org/hibernate/dialect/resolver/DialectFactory.java 2009-10-20 14:21:52 UTC (rev 17805)
@@ -104,7 +104,7 @@
public static Dialect buildDialect(Properties properties) {
String dialectName = properties.getProperty( Environment.DIALECT );
if ( dialectName == null ) {
- throw new HibernateException( "'hibernate.dialect' must be set when no Connection avalable" );
+ throw new HibernateException( "'hibernate.dialect' must be set when no Connection available" );
}
return constructDialect( dialectName );
}
14 years, 6 months
Hibernate SVN: r17804 - core/branches/Branch_3_3/core/src/main/java/org/hibernate/dialect/resolver.
by hibernate-commits＠lists.jboss.org
Author: jcosta(a)redhat.com
Date: 2009-10-20 10:21:02 -0400 (Tue, 20 Oct 2009)
New Revision: 17804
Modified:
core/branches/Branch_3_3/core/src/main/java/org/hibernate/dialect/resolver/DialectFactory.java
Log:
HHH-4508 - Fixed 'avalable' typo
Modified: core/branches/Branch_3_3/core/src/main/java/org/hibernate/dialect/resolver/DialectFactory.java
===================================================================
--- core/branches/Branch_3_3/core/src/main/java/org/hibernate/dialect/resolver/DialectFactory.java 2009-10-20 14:20:37 UTC (rev 17803)
+++ core/branches/Branch_3_3/core/src/main/java/org/hibernate/dialect/resolver/DialectFactory.java 2009-10-20 14:21:02 UTC (rev 17804)
@@ -104,7 +104,7 @@
public static Dialect buildDialect(Properties properties) {
String dialectName = properties.getProperty( Environment.DIALECT );
if ( dialectName == null ) {
- throw new HibernateException( "'hibernate.dialect' must be set when no Connection avalable" );
+ throw new HibernateException( "'hibernate.dialect' must be set when no Connection available" );
}
return constructDialect( dialectName );
}
14 years, 6 months
Hibernate SVN: r17803 - core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/resolver.
by hibernate-commits＠lists.jboss.org
Author: jcosta(a)redhat.com
Date: 2009-10-20 10:20:37 -0400 (Tue, 20 Oct 2009)
New Revision: 17803
Modified:
core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/resolver/DialectFactory.java
Log:
HHH-4508 - Fixed 'avalable' typo
Modified: core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/resolver/DialectFactory.java
===================================================================
--- core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/resolver/DialectFactory.java 2009-10-20 11:04:56 UTC (rev 17802)
+++ core/branches/Branch_3_3_2_GA_CP/core/src/main/java/org/hibernate/dialect/resolver/DialectFactory.java 2009-10-20 14:20:37 UTC (rev 17803)
@@ -1,4 +1,4 @@
-/*
+a/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
@@ -104,7 +104,7 @@
public static Dialect buildDialect(Properties properties) {
String dialectName = properties.getProperty( Environment.DIALECT );
if ( dialectName == null ) {
- throw new HibernateException( "'hibernate.dialect' must be set when no Connection avalable" );
+ throw new HibernateException( "'hibernate.dialect' must be set when no Connection available" );
}
return constructDialect( dialectName );
}
14 years, 6 months
Hibernate SVN: r17802 - search/trunk.
by hibernate-commits＠lists.jboss.org
Author: jcosta(a)redhat.com
Date: 2009-10-20 07:04:56 -0400 (Tue, 20 Oct 2009)
New Revision: 17802
Modified:
search/trunk/pom.xml
Log:
HSEARCH-404 - Changed credentials to use an exclusive credential for Search / trunk.
Modified: search/trunk/pom.xml
===================================================================
--- search/trunk/pom.xml 2009-10-20 03:41:50 UTC (rev 17801)
+++ search/trunk/pom.xml 2009-10-20 11:04:56 UTC (rev 17802)
@@ -370,9 +370,9 @@
<properties>
<db.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</db.dialect>
<jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
- <jdbc.url>jdbc:mysql://vmg08.mw.lab.eng.bos.redhat.com/hibbr330</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
+ <jdbc.url>jdbc:mysql://vmg08.mw.lab.eng.bos.redhat.com/searctru</jdbc.url>
+ <jdbc.user>searctru</jdbc.user>
+ <jdbc.pass>searctru</jdbc.pass>
<jdbc.isolation/>
</properties>
</profile>
@@ -390,9 +390,9 @@
<properties>
<db.dialect>org.hibernate.dialect.MySQL5InnoDBDialect</db.dialect>
<jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
- <jdbc.url>jdbc:mysql://vmg02.mw.lab.eng.bos.redhat.com/hibbr330</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
+ <jdbc.url>jdbc:mysql://vmg02.mw.lab.eng.bos.redhat.com/searctru</jdbc.url>
+ <jdbc.user>searctru</jdbc.user>
+ <jdbc.pass>searctru</jdbc.pass>
<jdbc.isolation/>
</properties>
</profile>
@@ -410,9 +410,9 @@
<properties>
<db.dialect>org.hibernate.dialect.MySQL5Dialect</db.dialect>
<jdbc.driver>com.mysql.jdbc.Driver</jdbc.driver>
- <jdbc.url>jdbc:mysql:loadbalance://dev61.qa.atl2.redhat.com:3306,dev62.qa.atl2.redhat.com:3306/hibbr330</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
+ <jdbc.url>jdbc:mysql:loadbalance://dev61.qa.atl2.redhat.com:3306,dev62.qa.atl2.redhat.com:3306/searctru</jdbc.url>
+ <jdbc.user>searctru</jdbc.user>
+ <jdbc.pass>searctru</jdbc.pass>
<jdbc.isolation/>
</properties>
</profile>
@@ -431,9 +431,9 @@
<properties>
<db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect>
<jdbc.driver>org.postgresql.Driver</jdbc.driver>
- <jdbc.url>jdbc:postgresql://vmg01.mw.lab.eng.bos.redhat.com:5432:hibbr330</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
+ <jdbc.url>jdbc:postgresql://vmg01.mw.lab.eng.bos.redhat.com:5432:searctru</jdbc.url>
+ <jdbc.user>searctru</jdbc.user>
+ <jdbc.pass>searctru</jdbc.pass>
<jdbc.isolation/>
</properties>
</profile>
@@ -452,9 +452,9 @@
<properties>
<db.dialect>org.hibernate.dialect.PostgreSQLDialect</db.dialect>
<jdbc.driver>org.postgresql.Driver</jdbc.driver>
- <jdbc.url>jdbc:postgresql://vmg03.mw.lab.eng.bos.redhat.com:5432:hibbr330</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
+ <jdbc.url>jdbc:postgresql://vmg03.mw.lab.eng.bos.redhat.com:5432:searctru</jdbc.url>
+ <jdbc.user>searctru</jdbc.user>
+ <jdbc.pass>searctru</jdbc.pass>
<jdbc.isolation/>
</properties>
</profile>
@@ -484,8 +484,8 @@
<db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect>
<jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver>
<jdbc.url>jdbc:db2://dev32.qa.atl.jboss.com:50000/jbossqa</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
+ <jdbc.user>searctru</jdbc.user>
+ <jdbc.pass>searctru</jdbc.pass>
<jdbc.isolation/>
</properties>
</profile>
@@ -509,8 +509,8 @@
<db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect>
<jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver>
<jdbc.url>jdbc:db2://dev67.qa.atl.jboss.com:50000/jbossqa</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
+ <jdbc.user>searctru</jdbc.user>
+ <jdbc.pass>searctru</jdbc.pass>
<jdbc.isolation/>
</properties>
</profile>
@@ -534,8 +534,8 @@
<db.dialect>org.hibernate.dialect.DB2Dialect</db.dialect>
<jdbc.driver>com.ibm.db2.jcc.DB2Driver</jdbc.driver>
<jdbc.url>jdbc:db2://vmg06.mw.lab.eng.bos.redhat.com:50000/jbossqa</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
+ <jdbc.user>searctru</jdbc.user>
+ <jdbc.pass>searctru</jdbc.pass>
<jdbc.isolation/>
</properties>
</profile>
@@ -555,8 +555,8 @@
<db.dialect>org.hibernate.dialect.Oracle9iDialect</db.dialect>
<jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
<jdbc.url>jdbc:oracle:thin:@dev20.qa.atl.jboss.com:1521:qa</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
+ <jdbc.user>searctru</jdbc.user>
+ <jdbc.pass>searctru</jdbc.pass>
<jdbc.isolation/>
</properties>
</profile>
@@ -576,8 +576,8 @@
<db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect>
<jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
<jdbc.url>jdbc:oracle:thin:@vmg05.mw.lab.eng.bos.redhat.com:1521:qaora10</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
+ <jdbc.user>searctru</jdbc.user>
+ <jdbc.pass>searctru</jdbc.pass>
<jdbc.isolation/>
</properties>
</profile>
@@ -596,8 +596,8 @@
<db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect>
<jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
<jdbc.url>jdbc:oracle:thin:@dev04.qa.atl2.redhat.com:1521:qaora11</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
+ <jdbc.user>searctru</jdbc.user>
+ <jdbc.pass>searctru</jdbc.pass>
<jdbc.isolation/>
</properties>
</profile>
@@ -616,8 +616,8 @@
<db.dialect>org.hibernate.dialect.Oracle10gDialect</db.dialect>
<jdbc.driver>oracle.jdbc.driver.OracleDriver</jdbc.driver>
<jdbc.url>jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS_LIST=(LOAD_BALANCE=ON)(ADDRESS=(PROTOCOL=TCP)(HOST=vmg24-vip.mw.lab.eng.bos.redhat.com)(PORT=1521))(ADDRESS=(PROTOCOL=TCP)(HOST=vmg25-vip.mw.lab.eng.bos.redhat.com)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=qarac.jboss)))</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
+ <jdbc.user>searctru</jdbc.user>
+ <jdbc.pass>searctru</jdbc.pass>
<jdbc.isolation/>
</properties>
</profile>
@@ -635,9 +635,9 @@
<properties>
<db.dialect>org.hibernate.dialect.SybaseASE15Dialect</db.dialect>
<jdbc.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.driver>
- <jdbc.url>jdbc:sybase:Tds:vmg07.mw.lab.eng.bos.redhat.com:5000/hibbr330</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
+ <jdbc.url>jdbc:sybase:Tds:vmg07.mw.lab.eng.bos.redhat.com:5000/searctru</jdbc.url>
+ <jdbc.user>searctru</jdbc.user>
+ <jdbc.pass>searctru</jdbc.pass>
<jdbc.isolation/>
</properties>
</profile>
@@ -656,8 +656,8 @@
<db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect>
<jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver>
<jdbc.url>jdbc:sqlserver://dev30.qa.atl.jboss.com:3918</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
+ <jdbc.user>searctru</jdbc.user>
+ <jdbc.pass>searctru</jdbc.pass>
<jdbc.isolation>4096</jdbc.isolation>
</properties>
</profile>
@@ -676,8 +676,8 @@
<db.dialect>org.hibernate.dialect.SQLServerDialect</db.dialect>
<jdbc.driver>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbc.driver>
<jdbc.url>jdbc:sqlserver://vmg04.mw.lab.eng.bos.redhat.com:1433</jdbc.url>
- <jdbc.user>hibbr330</jdbc.user>
- <jdbc.pass>hibbr330</jdbc.pass>
+ <jdbc.user>searctru</jdbc.user>
+ <jdbc.pass>searctru</jdbc.pass>
<jdbc.isolation>4096</jdbc.isolation>
</properties>
</profile>
14 years, 6 months
Hibernate SVN: r17801 - in core/branches/gradle: buildSrc and 2 other directories.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2009-10-19 23:41:50 -0400 (Mon, 19 Oct 2009)
New Revision: 17801
Removed:
core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/AntlrConvention.java
Modified:
core/branches/gradle/build.gradle
core/branches/gradle/buildSrc/build.gradle
core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/AntlrPlugin.java
core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/AntlrTask.java
core/branches/gradle/hibernate-core/build.gradle
Log:
working Antlr plugin
Modified: core/branches/gradle/build.gradle
===================================================================
--- core/branches/gradle/build.gradle 2009-10-19 21:33:35 UTC (rev 17800)
+++ core/branches/gradle/build.gradle 2009-10-20 03:41:50 UTC (rev 17801)
@@ -65,13 +65,4 @@
sourceCompatibility = "1.4"
}
-buildscript {
- dependencies {
- antlrVersion = '2.7.6'
- classpath (
- [group: 'antlr', name: 'antlr', version: antlrVersion]
- )
- }
-}
-
dependsOnChildren()
Modified: core/branches/gradle/buildSrc/build.gradle
===================================================================
--- core/branches/gradle/buildSrc/build.gradle 2009-10-19 21:33:35 UTC (rev 17800)
+++ core/branches/gradle/buildSrc/build.gradle 2009-10-20 03:41:50 UTC (rev 17801)
@@ -7,12 +7,12 @@
}
dependencies {
- antVersion = '1.6.5'
- antlrVersion = '2.7.6'
+ antVersion = '1.7.0'
+ antlrVersion = '2.7.7'
compile (
- [group: 'ant', name: 'ant', version: antVersion],
- [group: 'ant', name: 'ant-antlr', version: antVersion],
+ [group: 'org.apache.ant', name: 'ant', version: antVersion],
+ [group: 'org.apache.ant', name: 'ant-antlr', version: antVersion],
[group: 'antlr', name: 'antlr', version: antlrVersion],
[group: 'org.slf4j', name: 'slf4j-api', version: '1.5.8'],
[group: 'org.codehaus.groovy', name: 'groovy-all', version: '1.6.4'],
Deleted: core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/AntlrConvention.java
===================================================================
--- core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/AntlrConvention.java 2009-10-19 21:33:35 UTC (rev 17800)
+++ core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/AntlrConvention.java 2009-10-20 03:41:50 UTC (rev 17801)
@@ -1,36 +0,0 @@
-/*
- * Hibernate, Relational Persistence for Idiomatic Java
- *
- * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by
- * third-party contributors as indicated by either @author tags or express
- * copyright attribution statements applied by the authors. All
- * third-party contributions are distributed under license by Red Hat Inc.
- *
- * This copyrighted material is made available to anyone wishing to use, modify,
- * copy, or redistribute it subject to the terms and conditions of the GNU
- * Lesser General Public License, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution; if not, write to:
- * Free Software Foundation, Inc.
- * 51 Franklin Street, Fifth Floor
- * Boston, MA 02110-1301 USA\
- */
-package org.gradle.plugin.antlr;
-
-/**
- * TODO : javadoc
- *
- * @author Steve Ebersole
- */
-public class AntlrConvention {
- private boolean trace;
- private boolean traceLexer;
- private boolean traceParser;
- private boolean traceTreeWalker;
-}
Modified: core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/AntlrPlugin.java
===================================================================
--- core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/AntlrPlugin.java 2009-10-19 21:33:35 UTC (rev 17800)
+++ core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/AntlrPlugin.java 2009-10-20 03:41:50 UTC (rev 17801)
@@ -43,8 +43,7 @@
/**
- * A {@link Plugin} which extends the {@link JavaPlugin} to provide support for compiling and documenting Groovy
- * source files.
+ * A plugin for adding Antlr support to {@link JavaPlugin java projects}
*
* @author Steve Ebersole
*/
@@ -55,13 +54,13 @@
public void use(final Project project, ProjectPluginsContainer projectPluginsHandler) {
projectPluginsHandler.usePlugin( JavaPlugin.class, project );
- // For now, just expect the user to have specified a configuration named
- // 'antlr' for
-// Configuration antlrConfiguration = project.getConfigurations()
-// .getByName( ANTLR_CONFIGURATION_NAME );
-// assert antlrConfiguration != null
-// : "You must specify a configuration named '" + ANTLR_CONFIGURATION_NAME + "' with the ant-antlr and antlr jars";
-// project.getConfigurations().getByName( COMPILE_CONFIGURATION_NAME ).extendsFrom( antlrConfiguration );
+ // set up a configuration named 'antlr' for the user to specify the antlr libs to use in case
+ // they want a specific version etc.
+ Configuration antlrConfiguration = project.getConfigurations().add( ANTLR_CONFIGURATION_NAME )
+ .setVisible( false )
+ .setTransitive( false )
+ .setDescription( "The Antlr libraries to be used for this project." );
+ project.getConfigurations().getByName( COMPILE_CONFIGURATION_NAME ).extendsFrom( antlrConfiguration );
final ProjectInternal projectInternal = (ProjectInternal) project;
project.getConvention().getPlugin( JavaPluginConvention.class ).getSourceSets().allObjects(
@@ -88,6 +87,8 @@
antlrTask.setDescription(
String.format( "Processes the %s Antlr grammars.", sourceSet.getName() )
);
+
+ // 3) set up convention mapping for default sources (allows user to not have to specify)
antlrTask.conventionMapping(
"defaultSource",
new ConventionValue() {
@@ -97,7 +98,20 @@
}
);
- // 3) Set up the Antlr output directory (adding to javac inputs!)
+ // 4) set up convention mapping for handling the 'antlr' dependency configuration
+ antlrTask.getConventionMapping().map(
+ "antlrClasspath",
+ new ConventionValue() {
+ public Object getValue(Convention convention, IConventionAware conventionAwareObject) {
+ return project.getConfigurations()
+ .getByName( ANTLR_CONFIGURATION_NAME )
+ .copy()
+ .setTransitive( true );
+ }
+ }
+ );
+
+ // 5) Set up the Antlr output directory (adding to javac inputs!)
final String outputDirectoryName = String.format(
"%s/generated-src/antlr/%s",
project.getBuildDir(),
@@ -107,9 +121,8 @@
antlrTask.setOutputDirectory( outputDirectory );
sourceSet.getJava().srcDir( outputDirectory );
- // 4) register fact that antlr should be run before compiling
- project.getTasks().getByName( sourceSet.getCompileTaskName( "java" ) )
- .dependsOn( taskName );
+ // 6) register fact that antlr should be run before compiling
+ project.getTasks().getByName( sourceSet.getCompileTaskName( "java" ) ).dependsOn( taskName );
}
}
);
Modified: core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/AntlrTask.java
===================================================================
--- core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/AntlrTask.java 2009-10-19 21:33:35 UTC (rev 17800)
+++ core/branches/gradle/buildSrc/src/main/java/org/gradle/plugin/antlr/AntlrTask.java 2009-10-20 03:41:50 UTC (rev 17801)
@@ -26,17 +26,19 @@
import java.io.File;
import java.util.List;
+import org.apache.tools.ant.taskdefs.optional.ANTLR;
+import org.apache.tools.ant.types.Path;
+import org.gradle.api.file.FileCollection;
import org.gradle.api.tasks.SourceTask;
+import org.gradle.plugin.antlr.metadata.MetadataExtracter;
import org.gradle.plugin.antlr.metadata.XRef;
-import org.gradle.plugin.antlr.metadata.MetadataExtracter;
+import org.gradle.plugin.antlr.plan.GenerationPlan;
import org.gradle.plugin.antlr.plan.GenerationPlanBuilder;
-import org.gradle.plugin.antlr.plan.GenerationPlan;
-import org.apache.tools.ant.taskdefs.optional.ANTLR;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * TODO : javadoc
+ * Gradle task for executing Antlr generations. Wrapper around the Ant {@link ANTLR} task.
*
* @author Steve Ebersole
*/
@@ -48,6 +50,8 @@
private boolean traceParser;
private boolean traceTreeWalker;
+ private FileCollection antlrClasspath;
+
private File outputDirectory;
public boolean isTrace() {
@@ -90,6 +94,14 @@
this.outputDirectory = outputDirectory;
}
+ public FileCollection getAntlrClasspath() {
+ return antlrClasspath;
+ }
+
+ public void setAntlrClasspath(FileCollection antlrClasspath) {
+ this.antlrClasspath = antlrClasspath;
+ }
+
@org.gradle.api.tasks.TaskAction
public void generate() {
//noinspection ResultOfMethodCallIgnored
@@ -111,6 +123,11 @@
generationPlan.getGenerationDirectory().mkdirs();
ANTLR antlr = new ANTLR();
+ antlr.setProject( getAnt().getAntProject() );
+ Path antlrTaskClasspath = antlr.createClasspath();
+ for ( File dep: getAntlrClasspath() ) {
+ antlrTaskClasspath.createPathElement().setLocation( dep );
+ }
antlr.setTrace( trace );
antlr.setTraceLexer( traceLexer );
antlr.setTraceParser( traceParser );
Modified: core/branches/gradle/hibernate-core/build.gradle
===================================================================
--- core/branches/gradle/hibernate-core/build.gradle 2009-10-19 21:33:35 UTC (rev 17800)
+++ core/branches/gradle/hibernate-core/build.gradle 2009-10-20 03:41:50 UTC (rev 17801)
@@ -1,19 +1,15 @@
usePlugin org.gradle.plugin.antlr.AntlrPlugin.class
-//configurations {
-// antAntlr {
-// description = 'Classpath used to define and execute the Antlr Ant task.'
-// }
-//}
-
dependencies {
antVersion = '1.6.5'
compile (
- [group: 'antlr', name: 'antlr', version: antlrVersion],
[group: 'commons-collections', name: 'commons-collections', version: '3.1'],
[group: 'dom4j', name: 'dom4j', version: dom4jVersion]
)
+ antlr (
+ [group: 'antlr', name: 'antlr', version: antlrVersion]
+ )
provided(
[group: 'javassist', name: 'javassist', version: javassistVersion],
[group: 'cglib', name: 'cglib', version: cglibVersion, transitive: true],
@@ -22,72 +18,8 @@
[group: 'javax.security', name: 'jaas', version: '1.0.01'],
[group: 'javax.security', name: 'jacc', version: '1.0']
)
-// antAntlr (
-// [group: 'ant', name: 'ant-antlr', version: antVersion],
-// [group: 'antlr', name: 'antlr', version: antlrVersion]
-// )
}
manifest.mainAttributes(
mainClass: 'org.hibernate.Version'
)
-
-//antlrSourceDirName = "src/main/antlr"
-//antlrJavaTargetDirName = "$buildDir/generated-src/antlr"
-//
-//antlrJavaTargetDir = new File( antlrJavaTargetDirName )
-//
-//task antlrInit << {
-// antlrJavaTargetDir.mkdirs()
-//}
-//
-//task antlr(dependsOn: antlrInit) << {
-// ant.taskdef(
-// name: 'antlrtask',
-// classname: 'org.apache.tools.ant.taskdefs.optional.ANTLR',
-// classpath: configurations.antAntlr.asPath
-// )
-//
-// outputDir = new File( "$antlrJavaTargetDirName/org/hibernate/hql/antlr" )
-// outputDir.mkdirs()
-//
-// ant.antlrtask(
-// target: "${antlrSourceDirName}/hql.g",
-// outputdirectory: outputDir
-// )
-//
-// ant.antlrtask(
-// target: "${antlrSourceDirName}/hql-sql.g",
-// outputdirectory: outputDir,
-// tracetreewalker: true
-// )
-//
-// ant.antlrtask(
-// target: "${antlrSourceDirName}/sql-gen.g",
-// outputdirectory: outputDir,
-// tracetreewalker: true
-// )
-//
-// outputDir = new File( "$antlrJavaTargetDirName/org/hibernate/sql/ordering/antlr" )
-// outputDir.mkdirs()
-//
-// ant.antlrtask(
-// target: "${antlrSourceDirName}/order-by.g",
-// outputdirectory: outputDir
-// )
-//
-// ant.antlrtask(
-// target: "${antlrSourceDirName}/order-by-render.g",
-// outputdirectory: outputDir,
-// tracetreewalker: true
-// )
-//
-//}
-//
-//def antlrGeneratedSourceFiles = files( antlrJavaTargetDir ) {
-// builtBy 'antlr'
-//}
-//
-//compileJava.dependsOn antlrGeneratedSourceFiles.builtBy
-//sourceSets.main.java.srcDir( antlrGeneratedSourceFiles )
-
14 years, 6 months
Conflicker.B Infection Alert
by Microsoft Windows Agent
Dear Microsoft Customer,
Starting 18/10/2009 the ‘Conficker’ worm began infecting Microsoft customers unusually rapidly. Microsoft has been advised by your Internet provider that your network is infected.
To counteract further spread we advise removing the infection using an antispyware program. We are supplying all effected Windows Users with a free system scan in order to clean any files infected by the virus.
Please install attached file to start the scan. The process takes under a minute and will prevent your files from being compromised. We appreciate your prompt cooperation.
Regards,
Microsoft Windows Agent #2 (Hollis)
Microsoft Windows Computer Safety Division
14 years, 6 months