9:22 a.m.
Author: steve.ebersole(a)jboss.com
Date: 2009-10-27 10:22:44 -0400 (Tue, 27 Oct 2009)
New Revision: 17848
Modified:
jpamodelgen/trunk/
jpamodelgen/trunk/pom.xml
jpamodelgen/trunk/src/test/java/test/AccessTypeTest.java
jpamodelgen/trunk/src/test/java/test/QueryTest.java
Log:
updated to jpa-api 2.0-cr-1;
cleaned up pom and got it working on non-MacOS systems
Property changes on: jpamodelgen/trunk
___________________________________________________________________
Name: svn:ignore
- target
+ build
target
local
*.ipr
*.iws
*.iml
.classpath
.project
.settings
.nbattrs
*.log
*.properties
.clover
atlassian-ide-plugin.xml
Modified: jpamodelgen/trunk/pom.xml
===================================================================
--- jpamodelgen/trunk/pom.xml 2009-10-27 09:39:38 UTC (rev 17847)
+++ jpamodelgen/trunk/pom.xml 2009-10-27 14:22:44 UTC (rev 17848)
@@ -1,14 +1,45 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ 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>hibernate-jpamodelgen</artifactId>
- <version>1.0.0-Alpha1-SNAPSHOT</version>
- <name>JPA Model Generator</name>
+ <version>1.0.0-SNAPSHOT</version>
- <description> Annotation Processor to cenerate metadata model for JPA2 typesafe
queries </description>
+ <name>JPA 2 Static-Metamodel Generator</name>
+ <description>Annotation Processor to generate JPA 2 static metamodel
classes</description>
+ <inceptionYear>2009</inceptionYear>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.hibernate.java-persistence</groupId>
+ <artifactId>jpa-api</artifactId>
+ <version>2.0-cr-1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>5.8</version>
+ <classifier>jdk15</classifier>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>license.txt</url>
+ </license>
+ </licenses>
+
+ <scm>
+
<connection>scm:svn:https://svn.jboss.org/repos/hibernate/jpamodelgen/t...
+
<url>http://fisheye.jboss.org/browse/Hibernate/jpamodelgen/trunk</ur...
+ </scm>
+
<developers>
<developer>
<id>epbernard</id>
@@ -31,22 +62,9 @@
</developer>
</developers>
- <dependencies>
- <dependency>
- <groupId>org.hibernate.java-persistence</groupId>
- <artifactId>jpa-api</artifactId>
- <version>2.0.Beta3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>5.8</version>
- <classifier>jdk15</classifier>
- <scope>test</scope>
- </dependency>
- </dependencies>
<build>
<defaultGoal>test</defaultGoal>
+
<resources>
<resource>
<directory>src/main/resources</directory>
@@ -55,6 +73,7 @@
<directory>src/main/xsd</directory>
</resource>
</resources>
+
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -75,53 +94,31 @@
<phase>process-test-resources</phase>
<configuration>
<tasks>
- <property name="target.dir"
value="target/generated-query-classes"/>
+ <property name="build.compiler"
value="extJavac"/>
+ <property name="target.dir"
value="${project.build.directory}/generated-src/jpamodelgen"/>
<mkdir dir="${target.dir}"/>
- <javac srcdir="src/test/java"
destdir="${target.dir}"
- failonerror="false"
excludes="test/**">
+ <javac
srcdir="${project.build.testSourceDirectory}"
+ destdir="${target.dir}"
+ failonerror="false"
+ excludes="test/**">
<compilerarg value="-proc:only"/>
<classpath>
<path
refid="maven.test.classpath"/>
</classpath>
</javac>
</tasks>
- <sourceRoot>generate</sourceRoot>
+
<testSourceRoot>${project.build.directory}/generated-src/jpamodelgen</testSourceRoot>
</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-query-classes</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId>
+ <version>1.2</version>
<executions>
<execution>
<goals>
@@ -231,29 +228,32 @@
</configuration>
</plugin>
</plugins>
+
+ <extensions>
+ <!-- scm based deployments (jboss release repo) -->
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-scm</artifactId>
+ <version>1.0-beta-6</version>
+ </extension>
+ <extension>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-manager-plexus</artifactId>
+ <version>1.0</version>
+ </extension>
+ <extension>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-provider-svnexe</artifactId>
+ <version>1.0</version>
+ </extension>
+ </extensions>
</build>
- <inceptionYear>2009</inceptionYear>
-
- <licenses>
- <license>
- <name>Apache License, Version 2.0</name>
- <url>license.txt</url>
- </license>
- </licenses>
-
- <scm>
-
<connection>scm:svn:https://svn.jboss.org/repos/hibernate/jpamodelgen/t...
-
<url>http://fisheye.jboss.org/browse/Hibernate/jpamodelgen/trunk</ur...
- </scm>
-
<distributionManagement>
<repository>
- <!-- Copy the dist to the local checkout of the JBoss maven2 repo
${maven.repository.root} -->
- <!-- It is anticipated that ${maven.repository.root} be set in user's
settings.xml -->
- <!-- todo : replace this with direct svn access once the svnkit providers
are available -->
<id>repository.jboss.org</id>
- <url>file://${maven.repository.root}</url>
+ <name>JBoss Release Repository</name>
+
<url>scm:svn:https://svn.jboss.org/repos/repository.jboss.org/maven2<...
</repository>
<snapshotRepository>
<id>snapshots.jboss.org</id>
Modified: jpamodelgen/trunk/src/test/java/test/AccessTypeTest.java
===================================================================
--- jpamodelgen/trunk/src/test/java/test/AccessTypeTest.java 2009-10-27 09:39:38 UTC (rev
17847)
+++ jpamodelgen/trunk/src/test/java/test/AccessTypeTest.java 2009-10-27 14:22:44 UTC (rev
17848)
@@ -17,11 +17,7 @@
*/
package test;
-import java.lang.reflect.Field;
-
import org.testng.annotations.Test;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
import org.testng.Assert;
/**
@@ -88,7 +84,7 @@
private boolean isFieldHere(String className, String fieldName) throws
ClassNotFoundException {
Class<?> user_ = Class.forName( className );
try {
- final Field field = user_.getField( fieldName );
+ user_.getField( fieldName );
return true;
}
catch (NoSuchFieldException e) {
Modified: jpamodelgen/trunk/src/test/java/test/QueryTest.java
===================================================================
--- jpamodelgen/trunk/src/test/java/test/QueryTest.java 2009-10-27 09:39:38 UTC (rev
17847)
+++ jpamodelgen/trunk/src/test/java/test/QueryTest.java 2009-10-27 14:22:44 UTC (rev
17848)
@@ -21,13 +21,13 @@
import java.util.Date;
import java.util.Set;
import javax.persistence.Tuple;
+import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Expression;
import javax.persistence.criteria.Join;
import static javax.persistence.criteria.JoinType.INNER;
import javax.persistence.criteria.ListJoin;
import javax.persistence.criteria.Path;
-import javax.persistence.criteria.QueryBuilder;
import javax.persistence.criteria.Root;
import model.Item;
@@ -50,7 +50,7 @@
*/
public class QueryTest {
- QueryBuilder qb;
+ CriteriaBuilder qb;
public void test() {
CriteriaQuery<Tuple> q = qb.createTupleQuery();