[jboss-cvs] JBossAS SVN: r86760 - in projects/reloaded/trunk/vdf-bootstrap: src/main/assembly and 2 other directories.

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

Author: wolfc
Date: 2009-04-03 14:40:22 -0400 (Fri, 03 Apr 2009)
New Revision: 86760

Added:
   projects/reloaded/trunk/vdf-bootstrap/src/main/assembly/dist.xml
Modified:
   projects/reloaded/trunk/vdf-bootstrap/pom.xml
   projects/reloaded/trunk/vdf-bootstrap/src/main/resources/server/default/conf/bootstrap.xml
   projects/reloaded/trunk/vdf-bootstrap/src/main/resources/server/default/conf/bootstrap/profile-6.xml
Log:
RELOADED-5: created a distro of vdf-bootstrap and fixed VFS caching

Modified: projects/reloaded/trunk/vdf-bootstrap/pom.xml
===================================================================
--- projects/reloaded/trunk/vdf-bootstrap/pom.xml	2009-04-03 18:38:54 UTC (rev 86759)
+++ projects/reloaded/trunk/vdf-bootstrap/pom.xml	2009-04-03 18:40:22 UTC (rev 86760)
@@ -28,6 +28,24 @@
   <build>
     <plugins>
       <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2-beta-3</version>
+        <configuration>
+          <descriptors>
+            <descriptor>src/main/assembly/dist.xml</descriptor>
+          </descriptors>
+        </configuration>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
           <execution>
@@ -253,7 +271,7 @@
     <dependency>
       <groupId>org.jboss</groupId>
       <artifactId>jboss-vfs</artifactId>
-      <version>2.1.0.GA</version>
+      <version>2.2.0-SNAPSHOT</version>
       <scope>runtime</scope>
     </dependency>
     <!-- excluded from jboss-aop-mc-int -->

Added: projects/reloaded/trunk/vdf-bootstrap/src/main/assembly/dist.xml
===================================================================
--- projects/reloaded/trunk/vdf-bootstrap/src/main/assembly/dist.xml	                        (rev 0)
+++ projects/reloaded/trunk/vdf-bootstrap/src/main/assembly/dist.xml	2009-04-03 18:40:22 UTC (rev 86760)
@@ -0,0 +1,37 @@
+<!--
+  vim:ts=2:sw=2:expandtab:
+-->
+<assembly>
+  <id>dist</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <!-- TODO: actually I do want the base directory, but I don't know how to unpack these in maven -->
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>${project.build.outputDirectory}</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>target</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>common/**</include>
+        <include>lib/**</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+  <!-- TODO: cleanup, I only want jboss-reloaded-vdf-bootstrap.jar -->
+  <dependencySets>
+    <dependencySet>
+      <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+      <useProjectArtifact>true</useProjectArtifact>
+      <useProjectAttachments>true</useProjectAttachments>
+      <useTransitiveDependencies>true</useTransitiveDependencies>
+      <includes>
+        <include>org.jboss.reloaded:jboss-reloaded-vdf-bootstrap</include>
+      </includes>
+    </dependencySet>
+  </dependencySets>
+</assembly>

Modified: projects/reloaded/trunk/vdf-bootstrap/src/main/resources/server/default/conf/bootstrap/profile-6.xml
===================================================================
--- projects/reloaded/trunk/vdf-bootstrap/src/main/resources/server/default/conf/bootstrap/profile-6.xml	2009-04-03 18:38:54 UTC (rev 86759)
+++ projects/reloaded/trunk/vdf-bootstrap/src/main/resources/server/default/conf/bootstrap/profile-6.xml	2009-04-03 18:40:22 UTC (rev 86760)
@@ -9,8 +9,8 @@
 
 	<classloader name="profile-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
 		<root>${jboss.lib.url}jboss-profileservice-spi.jar</root>
-        <root>${jboss.server.home.url}/conf</root>
-        <root>${jboss.lib.url}/endorsed/stax-api.jar</root>
+        <root>${jboss.server.home.url}conf</root>
+        <root>${jboss.lib.url}endorsed/stax-api.jar</root>
 	</classloader>
 
 	<!-- 

Modified: projects/reloaded/trunk/vdf-bootstrap/src/main/resources/server/default/conf/bootstrap.xml
===================================================================
--- projects/reloaded/trunk/vdf-bootstrap/src/main/resources/server/default/conf/bootstrap.xml	2009-04-03 18:38:54 UTC (rev 86759)
+++ projects/reloaded/trunk/vdf-bootstrap/src/main/resources/server/default/conf/bootstrap.xml	2009-04-03 18:40:22 UTC (rev 86760)
@@ -5,9 +5,7 @@
 <bootstrap xmlns="urn:jboss:bootstrap:1.0">
 
    <url>bootstrap/logging.xml</url>
-   <!-- Disable VFSCache because of a bug
    <url>bootstrap/vfs.xml</url>
-   -->
    <url>bootstrap/classloader.xml</url>
    <url>bootstrap/aop-6.xml</url>
    <url>bootstrap/jmx.xml</url>