#806305 : fixed one jar generation

This commit is contained in:
Timo Westkämper 2011-07-06 06:00:46 +00:00
parent 9ee7551686
commit 13aebfe2ea
4 changed files with 32 additions and 13 deletions

View File

@ -39,6 +39,12 @@
<artifactId>querydsl-core</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>com.mysema.querydsl</groupId>
<artifactId>querydsl-apt</artifactId>
<version>${project.parent.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.mysema.querydsl</groupId>

View File

@ -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()));
}
}

View File

@ -68,6 +68,12 @@
<artifactId>querydsl-core</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>com.mysema.querydsl</groupId>
<artifactId>querydsl-apt</artifactId>
<version>${project.parent.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.mysema.querydsl</groupId>

View File

@ -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()));
}
}