[hibernate-commits] Hibernate SVN: r17808 - in core/trunk: entitymanager and 1 other directory.

[hibernate-commits at 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>