[jboss-cvs] JBossAS SVN: r102733 - projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Mar 22 15:30:38 EDT 2010
Author: alesj
Date: 2010-03-22 15:30:38 -0400 (Mon, 22 Mar 2010)
New Revision: 102733
Added:
projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/LazyNamedInputStream.java
Modified:
projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/PackageVisitor.java
projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/PatternFilter.java
projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/PatternVisitor.java
projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/ScannerImpl.java
projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/SingleAnnotationVisitor.java
Log:
Add visitors --> scanner additions.
Copied: projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/LazyNamedInputStream.java (from rev 102659, projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/ScannerImpl.java)
===================================================================
--- projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/LazyNamedInputStream.java (rev 0)
+++ projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/LazyNamedInputStream.java 2010-03-22 19:30:38 UTC (rev 102733)
@@ -0,0 +1,66 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.scanning.hibernate;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.jboss.classloading.spi.visitor.ResourceContext;
+
+import org.hibernate.ejb.packaging.NamedInputStream;
+
+/**
+ * Lazy named input stream.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class LazyNamedInputStream extends NamedInputStream
+{
+ private ResourceContext resource;
+
+ public LazyNamedInputStream(ResourceContext resource)
+ {
+ // null check is already done in getName
+ super(PatternFilter.getName(resource), null);
+ this.resource = resource;
+ }
+
+ @Override
+ public InputStream getStream()
+ {
+ try
+ {
+ return resource.getInputStream();
+ }
+ catch (IOException e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Override
+ public void setStream(InputStream stream)
+ {
+ throw new IllegalArgumentException("Cannot change input stream reference.");
+ }
+}
\ No newline at end of file
Modified: projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/PackageVisitor.java
===================================================================
--- projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/PackageVisitor.java 2010-03-22 19:15:14 UTC (rev 102732)
+++ projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/PackageVisitor.java 2010-03-22 19:30:38 UTC (rev 102733)
@@ -22,6 +22,8 @@
package org.jboss.scanning.hibernate;
+import java.net.URL;
+
import org.jboss.classloading.spi.visitor.ClassFilter;
import org.jboss.classloading.spi.visitor.ResourceContext;
import org.jboss.classloading.spi.visitor.ResourceFilter;
@@ -51,7 +53,8 @@
public void visit(ResourceContext resource)
{
- // if there is at least one class, remember this package
- System.out.println("scanner = " + scanner); // TODO
+ URL ownerURL = ScannerImpl.getOwnerURL(resource);
+ String className = resource.getClassName();
+ scanner.addPackage(ownerURL, className.substring(0, className.lastIndexOf(".")));
}
}
\ No newline at end of file
Modified: projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/PatternFilter.java
===================================================================
--- projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/PatternFilter.java 2010-03-22 19:15:14 UTC (rev 102732)
+++ projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/PatternFilter.java 2010-03-22 19:30:38 UTC (rev 102733)
@@ -66,8 +66,21 @@
public boolean accepts(ResourceContext resource)
{
+ return accepts(getName(resource));
+ }
+
+ static String getName(ResourceContext resource)
+ {
+ if (resource == null)
+ throw new IllegalArgumentException("Null resource");
+
String name = resource.getResourceName();
int p = name.lastIndexOf(".");
- return accepts((p >= 0) ? name.substring(p + 1) : name);
+ return (p >= 0) ? name.substring(p + 1) : name;
}
+
+ public String getPattern()
+ {
+ return pattern;
+ }
}
\ No newline at end of file
Modified: projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/PatternVisitor.java
===================================================================
--- projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/PatternVisitor.java 2010-03-22 19:15:14 UTC (rev 102732)
+++ projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/PatternVisitor.java 2010-03-22 19:30:38 UTC (rev 102733)
@@ -22,6 +22,8 @@
package org.jboss.scanning.hibernate;
+import java.net.URL;
+
import org.jboss.classloading.spi.visitor.ResourceContext;
import org.jboss.classloading.spi.visitor.ResourceFilter;
import org.jboss.classloading.spi.visitor.ResourceVisitor;
@@ -33,7 +35,7 @@
*/
public class PatternVisitor implements ResourceVisitor
{
- private final ResourceFilter filter;
+ private final PatternFilter filter;
private final ScannerImpl scanner;
public PatternVisitor(String pattern, ScannerImpl scanner)
@@ -54,6 +56,7 @@
public void visit(ResourceContext resource)
{
- System.out.println("scanner = " + scanner); // TODO
+ URL ownerURL = ScannerImpl.getOwnerURL(resource);
+ scanner.addFile(ownerURL, filter.getPattern(), new LazyNamedInputStream(resource));
}
}
\ No newline at end of file
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-03-22 19:15:14 UTC (rev 102732)
+++ projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/ScannerImpl.java 2010-03-22 19:30:38 UTC (rev 102733)
@@ -24,7 +24,6 @@
import java.io.File;
import java.io.IOException;
-import java.io.InputStream;
import java.lang.annotation.Annotation;
import java.net.URISyntaxException;
import java.net.URL;
@@ -130,7 +129,7 @@
cls.add(clazz);
}
- void addFile(URL url, String pattern, String name, InputStream is)
+ void addFile(URL url, String pattern, NamedInputStream nis)
{
Map<String, Set<NamedInputStream>> map = files.get(url);
if (map == null)
@@ -144,7 +143,7 @@
nims = new HashSet<NamedInputStream>();
map.put(pattern, nims);
}
- nims.add(new NamedInputStream(name, is));
+ nims.add(nis);
}
public void merge(ScannerImpl subHandle)
@@ -259,28 +258,36 @@
private void findFiles(URL jartoScan, Set<String> filePatterns, Map<String, Set<NamedInputStream>> map, Set<NamedInputStream> result)
{
- VirtualFile root = null;
- for (String pattern : filePatterns)
+ if (filePatterns.isEmpty())
{
- Set<NamedInputStream> niss = map.get(pattern);
- if (niss == null)
+ for (Set<NamedInputStream> nims : map.values())
+ result.addAll(nims);
+ }
+ else
+ {
+ VirtualFile root = null;
+ for (String pattern : filePatterns)
{
- if (root == null)
- root = getFile(jartoScan);
+ Set<NamedInputStream> niss = map.get(pattern);
+ if (niss == null)
+ {
+ if (root == null)
+ root = getFile(jartoScan);
- try
- {
- List<VirtualFile> children = root.getChildren(new PatternFilter(pattern));
- niss = toNIS(children);
- if (cacheNewResults)
- map.put(pattern, niss);
+ try
+ {
+ List<VirtualFile> children = root.getChildren(new PatternFilter(pattern));
+ niss = toNIS(children);
+ if (cacheNewResults)
+ map.put(pattern, niss);
+ }
+ catch (IOException e)
+ {
+ throw new RuntimeException(e);
+ }
}
- catch (IOException e)
- {
- throw new RuntimeException(e);
- }
+ result.addAll(niss);
}
- result.addAll(niss);
}
}
Modified: projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/SingleAnnotationVisitor.java
===================================================================
--- projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/SingleAnnotationVisitor.java 2010-03-22 19:15:14 UTC (rev 102732)
+++ projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/SingleAnnotationVisitor.java 2010-03-22 19:30:38 UTC (rev 102733)
@@ -23,6 +23,7 @@
package org.jboss.scanning.hibernate;
import java.lang.annotation.Annotation;
+import java.net.URL;
import org.jboss.classloading.spi.visitor.ClassFilter;
import org.jboss.classloading.spi.visitor.ResourceContext;
@@ -65,7 +66,8 @@
ClassInfo classInfo = getClassInfo(resource);
if (classInfo.isAnnotationPresent(annotation))
{
- System.out.println("scanner = " + scanner); // TODO
+ URL ownerURL = ScannerImpl.getOwnerURL(resource);
+ scanner.addClass(ownerURL, annotation, classInfo.getName());
}
}
}
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list