Fixes #1292

Atmosphere · Sep 17, 2013 · 2f79a15 · 2f79a15
1 parent e889466
commit 2f79a15
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/modules/cpr/pom.xml b/modules/cpr/pom.xml
@@ -171,6 +171,14 @@
             <version>${jbossaswebsockets-version}</version>
             <scope>provided</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.jboss</groupId>
+            <artifactId>jboss-vfs</artifactId>
+            <version>3.1.0.Final</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.atmosphere</groupId>
             <artifactId>atmosphere-compat-jbossweb</artifactId>

diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/DefaultAnnotationProcessor.java b/modules/cpr/src/main/java/org/atmosphere/cpr/DefaultAnnotationProcessor.java
@@ -157,6 +157,7 @@ private void scanForAnnotation(AtmosphereFramework f) {
             // JBoss|vfs with APR issue, or any strange containers may fail. This is a hack for them.
             // https://github.com/Atmosphere/atmosphere/issues/1292
             if (!coreAnnotationsFound.get()) {
+                logger.warn("Unable to detect annotations. Application may to deploy.");
                 for (Class a : coreAnnotations) {
                     try {
                         handler.handleProcessor(loadClass(getClass(), a.getName()));

diff --git a/modules/cpr/src/main/java/org/atmosphere/util/annotation/AnnotationDetector.java b/modules/cpr/src/main/java/org/atmosphere/util/annotation/AnnotationDetector.java
@@ -50,6 +50,7 @@
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -294,9 +295,14 @@ public final void detect(final String... packageNames) throws IOException {
                         if (idx > -1) {
                             jarPath = jarPath.substring(0, idx + 4);
                             final File jarFile = new File(jarPath);
-                            if (jarFile.isFile()) {
+                            if (jarFile.isFile() && jarFile.exists()) {
                                 files.add(jarFile);
                                 if (DEBUG) print("Add jar file from VFS: '%s'", jarFile);
+                            } else {
+                                List<org.jboss.vfs.VirtualFile> vfs = org.jboss.vfs.VFS.getChild(dir.getPath()).getChildren();
+                                for (org.jboss.vfs.VirtualFile f: vfs) {
+                                    files.add(f.getPhysicalFile());
+                                }
                             }
                         }
                     }