[jboss-cvs] JBossAS SVN: r94790 - in projects/vfs/branches/dml-zip-rework: src/main/java/org/jboss/vfs/spi and 1 other directory.

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

Author: david.lloyd at jboss.com
Date: 2009-10-13 16:14:25 -0400 (Tue, 13 Oct 2009)
New Revision: 94790

Modified:
   projects/vfs/branches/dml-zip-rework/pom.xml
   projects/vfs/branches/dml-zip-rework/src/main/java/org/jboss/vfs/spi/RealFileSystem.java
Log:
Fix build deps and enforcement; fix class init order problem with logging

Modified: projects/vfs/branches/dml-zip-rework/pom.xml
===================================================================
--- projects/vfs/branches/dml-zip-rework/pom.xml	2009-10-13 20:10:51 UTC (rev 94789)
+++ projects/vfs/branches/dml-zip-rework/pom.xml	2009-10-13 20:14:25 UTC (rev 94790)
@@ -30,7 +30,7 @@
 
   <properties>
     <version.jboss.common.core>2.2.13.GA</version.jboss.common.core>
-    <version.jboss.logging>2.1.0.GA</version.jboss.logging>
+    <version.jboss.logging>2.2.0.CR1</version.jboss.logging>
     <version.jboss.test>1.1.0.GA</version.jboss.test>
     <version.junit>4.4</version.junit>
   </properties>
@@ -56,8 +56,8 @@
         <version>2.0</version>
         <configuration>
           <debug>true</debug>
-          <source>1.5</source>
-          <target>1.5</target>
+          <source>1.6</source>
+          <target>1.6</target>
         </configuration>
       </plugin>
       <!-- define that we wish to create src jars -->
@@ -72,8 +72,30 @@
           </execution>
         </executions>
       </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <version>1.0-beta-1</version>
+        <executions>
+          <execution>
+            <id>enforce-java-maven-versions</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <requireJavaVersion>
+                  <version>1.6</version>
+                </requireJavaVersion>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <version>2.4.3</version>
         <configuration>
@@ -128,13 +150,21 @@
       <groupId>org.jboss</groupId>
       <artifactId>jboss-common-core</artifactId>
       <version>${version.jboss.common.core}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.jboss.logging</groupId>
       <artifactId>jboss-logging-spi</artifactId>
       <version>${version.jboss.logging}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
+      <groupId>org.jboss.logging</groupId>
+      <artifactId>jboss-logging-log4j</artifactId>
+      <version>${version.jboss.logging}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>org.jboss.test</groupId>
       <artifactId>jboss-test</artifactId>
       <version>${version.jboss.test}</version>

Modified: projects/vfs/branches/dml-zip-rework/src/main/java/org/jboss/vfs/spi/RealFileSystem.java
===================================================================
--- projects/vfs/branches/dml-zip-rework/src/main/java/org/jboss/vfs/spi/RealFileSystem.java	2009-10-13 20:10:51 UTC (rev 94789)
+++ projects/vfs/branches/dml-zip-rework/src/main/java/org/jboss/vfs/spi/RealFileSystem.java	2009-10-13 20:14:25 UTC (rev 94790)
@@ -39,13 +39,13 @@
  */
 public final class RealFileSystem implements FileSystem {
 
+    private static final Logger log = Logger.getLogger("org.jboss.vfs.real");
+
     /**
      * The root real filesystem (singleton instance).
      */
     public static final RealFileSystem ROOT_INSTANCE = new RealFileSystem(new File(""));
 
-    private static final Logger log = Logger.getLogger("org.jboss.vfs.real");
-
     private final File realRoot;
 
     /**