[jboss-cvs] JBossAS SVN: r104104 - in projects/scanning/trunk: plugins/src/main/java/org/jboss/scanning/hibernate and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Apr 20 18:22:20 EDT 2010
Author: alesj
Date: 2010-04-20 18:22:19 -0400 (Tue, 20 Apr 2010)
New Revision: 104104
Modified:
projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/ScannerImpl.java
projects/scanning/trunk/pom.xml
projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/helpers/CachingResourceOwnerFinder.java
projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/visitor/ReflectResourceVisitor.java
projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/annotations/test/AnnotationEnvTestCase.java
projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/annotations/test/AnnotationsScanningTestCase.java
projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/annotations/test/AnnotationsTest.java
projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/hibernate/test/HibernateUnitTestCase.java
Log:
Use Reflect, MDR and CL snapshot.
Fix how we handle jar:file url lookup.
Modified: projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/ScannerImpl.java
===================================================================
--- projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/ScannerImpl.java 2010-04-20 21:28:10 UTC (rev 104103)
+++ projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/ScannerImpl.java 2010-04-20 22:22:19 UTC (rev 104104)
@@ -50,6 +50,8 @@
/**
* Hibernate's scanner impl.
*
+ * TODO -- should we fix path mapping?
+ *
* @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
*/
public class ScannerImpl extends WeakClassLoaderHolder implements Scanner, ScanningHandle<ScannerImpl>
Modified: projects/scanning/trunk/pom.xml
===================================================================
--- projects/scanning/trunk/pom.xml 2010-04-20 21:28:10 UTC (rev 104103)
+++ projects/scanning/trunk/pom.xml 2010-04-20 22:22:19 UTC (rev 104104)
@@ -31,10 +31,10 @@
<version.org.jboss.common.core>2.2.17.GA</version.org.jboss.common.core>
<version.org.jboss.vfs>3.0.0.CR5</version.org.jboss.vfs>
<version.org.jboss.classpool>1.0.0.Alpha5</version.org.jboss.classpool>
- <version.org.jboss.reflect>2.2.0.Alpha4</version.org.jboss.reflect>
- <version.org.jboss.mdr>2.2.0.Alpha2</version.org.jboss.mdr>
+ <version.org.jboss.reflect>2.2.0-SNAPSHOT</version.org.jboss.reflect>
+ <version.org.jboss.mdr>2.2.0-SNAPSHOT</version.org.jboss.mdr>
<version.org.jboss.man>2.1.1.SP1</version.org.jboss.man>
- <version.org.jboss.classloader>2.2.0.Alpha4</version.org.jboss.classloader>
+ <version.org.jboss.classloader>2.2.0-SNAPSHOT</version.org.jboss.classloader>
<version.org.jboss.deployers>2.2.0.Alpha4</version.org.jboss.deployers>
<version.org.jboss.mc-int>2.2.0.Alpha2</version.org.jboss.mc-int>
<version.org.jboss.weld-int>6.0.0.Beta11</version.org.jboss.weld-int>
Modified: projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/helpers/CachingResourceOwnerFinder.java
===================================================================
--- projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/helpers/CachingResourceOwnerFinder.java 2010-04-20 21:28:10 UTC (rev 104103)
+++ projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/helpers/CachingResourceOwnerFinder.java 2010-04-20 22:22:19 UTC (rev 104104)
@@ -23,7 +23,9 @@
package org.jboss.scanning.plugins.helpers;
import java.io.File;
+import java.net.JarURLConnection;
import java.net.URL;
+import java.net.URLConnection;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -60,6 +62,14 @@
try
{
URL url = resource.getUrl();
+
+ URLConnection conn = url.openConnection();
+ if (conn instanceof JarURLConnection)
+ {
+ JarURLConnection jarConn = (JarURLConnection) url.openConnection();
+ return jarConn.getJarFileURL();
+ }
+
File file = new File(url.getPath());
if (file.exists()) // does the file exist
return url;
@@ -80,6 +90,9 @@
files.add(file); // not found, add to cache
file = file.getParentFile();
+
+ if (file == null)
+ throw new IllegalArgumentException("Cannot find physical file: " + resource.getUrl());
}
// not found in cache yet
Modified: projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/visitor/ReflectResourceVisitor.java
===================================================================
--- projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/visitor/ReflectResourceVisitor.java 2010-04-20 21:28:10 UTC (rev 104103)
+++ projects/scanning/trunk/scanning-impl/src/main/java/org/jboss/scanning/plugins/visitor/ReflectResourceVisitor.java 2010-04-20 22:22:19 UTC (rev 104104)
@@ -38,7 +38,7 @@
protected final Logger log = Logger.getLogger(getClass());
private ReflectProvider provider;
- protected boolean failOnError;
+ protected boolean ignoreError;
protected ReflectResourceVisitor(ReflectProvider provider)
{
@@ -86,10 +86,10 @@
}
catch (Throwable t)
{
- if (failOnError)
+ if (ignoreError)
+ logThrowable(resource, t);
+ else
throw new RuntimeException(t);
-
- logThrowable(resource, t);
}
}
@@ -148,8 +148,8 @@
log.trace("Exception reading resource: " + resource.getResourceName(), t);
}
- public void setFailOnError(boolean failOnError)
+ public void setIgnoreError(boolean ignoreError)
{
- this.failOnError = failOnError;
+ this.ignoreError = ignoreError;
}
}
Modified: projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/annotations/test/AnnotationEnvTestCase.java
===================================================================
--- projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/annotations/test/AnnotationEnvTestCase.java 2010-04-20 21:28:10 UTC (rev 104103)
+++ projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/annotations/test/AnnotationEnvTestCase.java 2010-04-20 22:22:19 UTC (rev 104104)
@@ -34,6 +34,8 @@
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.scanning.annotations.spi.AnnotationRepository;
import org.jboss.scanning.annotations.spi.Element;
+import org.jboss.scanning.plugins.helpers.CachingResourceOwnerFinder;
+import org.jboss.scanning.plugins.helpers.ResourceOwnerFinder;
import org.jboss.test.scanning.annotations.support.AnnotationsHolder;
import org.jboss.test.scanning.annotations.support.TestAnnotation;
@@ -62,6 +64,7 @@
DeployerClient deployer = getMainDeployer();
Deployment deployment = createSimpleDeployment("a");
+ addMetaData(deployment, new CachingResourceOwnerFinder(), ResourceOwnerFinder.class);
addClassLoadingMetaData(
deployment,
deployment.getName(),
@@ -139,6 +142,7 @@
DeployerClient deployer = getMainDeployer();
Deployment deployment = createSimpleDeployment("a");
+ addMetaData(deployment, new CachingResourceOwnerFinder(), ResourceOwnerFinder.class);
addClassLoadingMetaData(
deployment,
deployment.getName(),
Modified: projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/annotations/test/AnnotationsScanningTestCase.java
===================================================================
--- projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/annotations/test/AnnotationsScanningTestCase.java 2010-04-20 21:28:10 UTC (rev 104103)
+++ projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/annotations/test/AnnotationsScanningTestCase.java 2010-04-20 22:22:19 UTC (rev 104104)
@@ -47,11 +47,11 @@
protected void assertJar(DeploymentUnit jar)
{
- assertAnnotations(jar, 5, 1, 1); // TODO -- fix this once Javassist Reflect is fixed
+ assertAnnotations(jar, 4, 1, 1);
}
protected void assertWar(DeploymentUnit war)
{
- assertAnnotations(war, 6, 1, 1); // TODO -- fix this once Javassist Reflect is fixed
+ assertAnnotations(war, 5, 1, 1);
}
}
Modified: projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/annotations/test/AnnotationsTest.java
===================================================================
--- projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/annotations/test/AnnotationsTest.java 2010-04-20 21:28:10 UTC (rev 104103)
+++ projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/annotations/test/AnnotationsTest.java 2010-04-20 22:22:19 UTC (rev 104104)
@@ -116,8 +116,13 @@
protected static void addMetaData(PredeterminedManagedObjectAttachments attachments, ClassLoadingMetaData md)
{
+ addMetaData(attachments, md, ClassLoadingMetaData.class);
+ }
+
+ protected static <T> void addMetaData(PredeterminedManagedObjectAttachments attachments, T md, Class<T> expectedType)
+ {
MutableAttachments mutable = (MutableAttachments) attachments.getPredeterminedManagedObjects();
- mutable.addAttachment(ClassLoadingMetaData.class, md);
+ mutable.addAttachment(expectedType, md);
}
protected AnnotationRepository getAnnotationRepository(Attachments attachments)
Modified: projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/hibernate/test/HibernateUnitTestCase.java
===================================================================
--- projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/hibernate/test/HibernateUnitTestCase.java 2010-04-20 21:28:10 UTC (rev 104103)
+++ projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/hibernate/test/HibernateUnitTestCase.java 2010-04-20 22:22:19 UTC (rev 104104)
@@ -67,6 +67,7 @@
{
URL url = getResource("/hibernate/defaultpar.jar");
VirtualFile file = VFS.getChild(url);
+ url = file.asDirectoryURL(); // use what is used later on
DeploymentUnit unit = assertDeploy(file);
try
{
More information about the jboss-cvs-commits
mailing list