[jboss-cvs] JBossAS SVN: r92681 - in branches/JBPAPP_5_0: server/src/etc/conf/default/bootstrap and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: jaikiran
Date: 2009-08-21 15:16:45 -0400 (Fri, 21 Aug 2009)
New Revision: 92681

Modified:
   branches/JBPAPP_5_0/server/src/etc/conf/all/bootstrap/profile.xml
   branches/JBPAPP_5_0/server/src/etc/conf/default/bootstrap/profile.xml
   branches/JBPAPP_5_0/system/src/main/org/jboss/system/server/profile/basic/AbstractPatternVirtualFileFilter.java
Log:
JBPAPP-2519 Included *jboss-beans.xml and *-service.xml to be part of files which will be watched for redeployments

Modified: branches/JBPAPP_5_0/server/src/etc/conf/all/bootstrap/profile.xml
===================================================================
--- branches/JBPAPP_5_0/server/src/etc/conf/all/bootstrap/profile.xml	2009-08-21 18:09:48 UTC (rev 92680)
+++ branches/JBPAPP_5_0/server/src/etc/conf/all/bootstrap/profile.xml	2009-08-21 19:16:45 UTC (rev 92681)
@@ -93,9 +93,9 @@
     		<constructor>
     			<!-- Remember, the parameter is a regex so use the correct syntax
 				as below. Here we specify that we are interested in watching changes to
-				either application.xml, web.xml, ejb-jar.xml or jboss-service.xml (which are all
-				considered top level deployment descriptors) -->
-    			<parameter class="java.lang.String">^application.xml$|^web.xml$|^ejb-jar.xml$|^jboss-service.xml$</parameter>
+				either application.xml, web.xml, ejb-jar.xml, any -service.xml, jboss-beans.xml 
+				(which are all considered top level deployment descriptors) -->
+    			<parameter class="java.lang.String">.*/(application|web|ejb-jar|(.)+-service|.*jboss-beans)\.xml$</parameter>
     		</constructor>
 	</bean>
   <!-- This just checks metadata locations -->

Modified: branches/JBPAPP_5_0/server/src/etc/conf/default/bootstrap/profile.xml
===================================================================
--- branches/JBPAPP_5_0/server/src/etc/conf/default/bootstrap/profile.xml	2009-08-21 18:09:48 UTC (rev 92680)
+++ branches/JBPAPP_5_0/server/src/etc/conf/default/bootstrap/profile.xml	2009-08-21 19:16:45 UTC (rev 92681)
@@ -84,9 +84,9 @@
     		<constructor>
     			<!-- Remember, the parameter is a regex so use the correct syntax
 				as below. Here we specify that we are interested in watching changes to
-				either application.xml, web.xml, ejb-jar.xml or jboss-service.xml (which are all
-				considered top level deployment descriptors) -->
-    			<parameter class="java.lang.String">^application.xml$|^web.xml$|^ejb-jar.xml$|^jboss-service.xml$</parameter>
+				either application.xml, web.xml, ejb-jar.xml, any -service.xml, jboss-beans.xml 
+				(which are all considered top level deployment descriptors) -->
+    			<parameter class="java.lang.String">.*/(application|web|ejb-jar|(.)+-service|.*jboss-beans)\.xml$</parameter>
     		</constructor>
 	</bean>
   <!-- This just checks metadata locations -->

Modified: branches/JBPAPP_5_0/system/src/main/org/jboss/system/server/profile/basic/AbstractPatternVirtualFileFilter.java
===================================================================
--- branches/JBPAPP_5_0/system/src/main/org/jboss/system/server/profile/basic/AbstractPatternVirtualFileFilter.java	2009-08-21 18:09:48 UTC (rev 92680)
+++ branches/JBPAPP_5_0/system/src/main/org/jboss/system/server/profile/basic/AbstractPatternVirtualFileFilter.java	2009-08-21 19:16:45 UTC (rev 92681)
@@ -25,7 +25,6 @@
 
 import org.jboss.deployers.vfs.spi.structure.modified.AbstractPathNameFilter;
 import org.jboss.deployers.vfs.spi.structure.modified.StructureCacheFilter;
-import org.jboss.virtual.VirtualFile;
 import org.jboss.virtual.VirtualFileFilter;
 
 /**
@@ -42,11 +41,6 @@
       this.pattern = Pattern.compile(patternString);
    }
 
-   public boolean accepts(VirtualFile file)
-   {
-      return pattern.matcher(file.getName()).find() == doMatch();
-   }
-
    /**
     * Should we match the pattern.
     *
@@ -63,9 +57,10 @@
       {
          return false;
       }
+      
       // pattern match the path against our configured
       // regext pattern
-      return pattern.matcher(path).find() == doMatch();
+      return pattern.matcher(path).matches() == doMatch();
    }
    
 }
\ No newline at end of file