diff --git a/querydsl-jdo/pom.xml b/querydsl-jdo/pom.xml index ab036c40e..9fca3882f 100644 --- a/querydsl-jdo/pom.xml +++ b/querydsl-jdo/pom.xml @@ -39,6 +39,12 @@ querydsl-core ${project.parent.version} + + com.mysema.querydsl + querydsl-apt + ${project.parent.version} + provided + com.mysema.querydsl diff --git a/querydsl-jdo/src/test/java/com/mysema/query/PackageVerification.java b/querydsl-jdo/src/test/java/com/mysema/query/PackageVerification.java index 68ffcae3b..b6b438f26 100644 --- a/querydsl-jdo/src/test/java/com/mysema/query/PackageVerification.java +++ b/querydsl-jdo/src/test/java/com/mysema/query/PackageVerification.java @@ -1,5 +1,6 @@ package com.mysema.query; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.io.File; @@ -9,9 +10,11 @@ import java.net.URLClassLoader; import javax.jdo.annotations.PersistenceCapable; +import org.apache.commons.io.IOUtils; import org.junit.Test; import com.mysema.codegen.CodeWriter; +import com.mysema.query.apt.jdo.JDOAnnotationProcessor; import com.mysema.query.types.Expression; public class PackageVerification { @@ -29,9 +32,9 @@ public class PackageVerification { oneJarClassLoader.loadClass(Expression.class.getName()); // querydsl-core oneJarClassLoader.loadClass(CodeWriter.class.getName()); // codegen oneJarClassLoader.loadClass(PersistenceCapable.class.getName()); // jdo -// oneJarClassLoader.loadClass(JDOAnnotationProcessor.class.getName()); // querydsl-apt -// String resourceKey = "META-INF/services/javax.annotation.processing.Processor"; -// assertEquals(JDOAnnotationProcessor.class.getName(), IOUtils.toString(oneJarClassLoader.findResource(resourceKey).openStream())); + oneJarClassLoader.loadClass(JDOAnnotationProcessor.class.getName()); // querydsl-apt + String resourceKey = "META-INF/services/javax.annotation.processing.Processor"; + assertEquals(JDOAnnotationProcessor.class.getName(), IOUtils.toString(oneJarClassLoader.findResource(resourceKey).openStream())); } } diff --git a/querydsl-jpa/pom.xml b/querydsl-jpa/pom.xml index 8f3bbccbb..a1e87b896 100644 --- a/querydsl-jpa/pom.xml +++ b/querydsl-jpa/pom.xml @@ -68,6 +68,12 @@ querydsl-core ${project.parent.version} + + com.mysema.querydsl + querydsl-apt + ${project.parent.version} + provided + com.mysema.querydsl diff --git a/querydsl-jpa/src/test/java/com/mysema/query/PackageVerification.java b/querydsl-jpa/src/test/java/com/mysema/query/PackageVerification.java index 2b2a08296..5f9e1ade4 100644 --- a/querydsl-jpa/src/test/java/com/mysema/query/PackageVerification.java +++ b/querydsl-jpa/src/test/java/com/mysema/query/PackageVerification.java @@ -1,5 +1,6 @@ package com.mysema.query; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.io.File; @@ -9,9 +10,12 @@ import java.net.URLClassLoader; import javax.persistence.Entity; +import org.apache.commons.io.IOUtils; import org.junit.Test; import com.mysema.codegen.CodeWriter; +import com.mysema.query.apt.hibernate.HibernateAnnotationProcessor; +import com.mysema.query.apt.jpa.JPAAnnotationProcessor; import com.mysema.query.types.Expression; public class PackageVerification { @@ -30,16 +34,16 @@ public class PackageVerification { oneJarClassLoader.loadClass(Expression.class.getName()); // querydsl-core oneJarClassLoader.loadClass(CodeWriter.class.getName()); // codegen oneJarClassLoader.loadClass(Entity.class.getName()); // jpa -// Class processor; -// if (hibernateDeps){ -// oneJarClassLoader.loadClass(org.hibernate.annotations.Type.class.getName()); // hibernate -// processor = HibernateAnnotationProcessor.class; -// }else{ -// processor = JPAAnnotationProcessor.class; -// } -// oneJarClassLoader.loadClass(processor.getName()); // querydsl-apt -// String resourceKey = "META-INF/services/javax.annotation.processing.Processor"; -// assertEquals(processor.getName(), IOUtils.toString(oneJarClassLoader.findResource(resourceKey).openStream())); + Class processor; + if (hibernateDeps){ + oneJarClassLoader.loadClass(org.hibernate.annotations.Type.class.getName()); // hibernate + processor = HibernateAnnotationProcessor.class; + }else{ + processor = JPAAnnotationProcessor.class; + } + oneJarClassLoader.loadClass(processor.getName()); // querydsl-apt + String resourceKey = "META-INF/services/javax.annotation.processing.Processor"; + assertEquals(processor.getName(), IOUtils.toString(oneJarClassLoader.findResource(resourceKey).openStream())); } }