[infinispan-commits] Infinispan SVN: r131 - in trunk: parent and 3 other directories.

infinispan-commits at lists.jboss.org infinispan-commits at lists.jboss.org
Fri Apr 17 06:06:22 EDT 2009


Author: adriancole
Date: 2009-04-17 06:05:17 -0400 (Fri, 17 Apr 2009)
New Revision: 131

Added:
   trunk/src/
   trunk/src/main/
   trunk/src/main/assembly/
   trunk/src/main/assembly/all.xml
   trunk/src/main/assembly/bin.xml
   trunk/src/main/assembly/dep.xml
   trunk/src/main/assembly/single_jar.xml
   trunk/src/main/assembly/src.xml
   trunk/src/main/assembly/test.xml
Removed:
   trunk/distribution/
Modified:
   trunk/parent/pom.xml
   trunk/pom.xml
Log:
ISPN-52 first cut at bin assembly

Modified: trunk/parent/pom.xml
===================================================================
--- trunk/parent/pom.xml	2009-04-16 14:02:43 UTC (rev 130)
+++ trunk/parent/pom.xml	2009-04-17 10:05:17 UTC (rev 131)
@@ -213,7 +213,7 @@
             <id>javadoc</id>
             <phase>package</phase>
             <goals>
-              <goal>javadoc</goal>
+              <goal>jar</goal>
             </goals>
             <configuration>
               <links>

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2009-04-16 14:02:43 UTC (rev 130)
+++ trunk/pom.xml	2009-04-17 10:05:17 UTC (rev 131)
@@ -26,8 +26,8 @@
       <module>cachestore/bdbje</module>
       <module>cachestore/s3</module>
       <module>cachestore/jdbc</module>
-      <!--	<module>distribution</module>	-->
    </modules>
+
    <build>
       <plugins>
          <plugin>
@@ -35,14 +35,50 @@
             <artifactId>maven-javadoc-plugin</artifactId>
             <executions>
               <execution>
-                <id>aggregate</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>aggregate</goal>
-                </goals>
+                <id>javadoc</id>
+                <phase>none</phase>
               </execution>
             </executions>
          </plugin>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-jar-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>build-test-jar</id>
+                <phase>none</phase>
+              </execution>
+            </executions>
+         </plugin>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <version>2.2-beta-3</version>
+            <executions>
+               <execution>
+                  <id>assemble</id>
+                  <phase>package</phase>
+                  <goals>
+                     <goal>single</goal>
+                  </goals>
+               </execution>
+            </executions>
+            <configuration>
+               <descriptors>
+                  <descriptor>src/main/assembly/bin.xml</descriptor>
+<!--
+                  <descriptor>src/main/assembly/all.xml</descriptor>
+                  <descriptor>src/main/assembly/dep.xml</descriptor>
+                  <descriptor>src/main/assembly/single_jar.xml</descriptor>
+                  <descriptor>src/main/assembly/src.xml</descriptor>
+                  <descriptor>src/main/assembly/test.xml</descriptor>
+-->
+               </descriptors>
+               <finalName>${artifactId}-${project-version}</finalName>
+               <outputDirectory>target/distribution</outputDirectory>
+               <workDirectory>target/assembly/work</workDirectory>
+            </configuration>
+         </plugin>
       </plugins>
    </build>
 </project>

Added: trunk/src/main/assembly/all.xml
===================================================================
--- trunk/src/main/assembly/all.xml	                        (rev 0)
+++ trunk/src/main/assembly/all.xml	2009-04-17 10:05:17 UTC (rev 131)
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+   This package will build a ZIP containing the following:
+
+   + modules
+      + core
+         - infinispan-core.jar
+         + lib (contains dependencies)
+      + tree
+         - infinispan-tree.jar
+         + lib
+
+      .. etc ...
+
+   + test
+      + modules
+         ... as above, for test jars and deps ...
+
+   + bin (any scripts, etc)
+   + etc (sample configs, resources, etc from src/main/resources)
+   + doc (release notes, etc from src/main/release)
+-->
+      
+<assembly xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:maven:assembly:1.1.0-SNAPSHOT">
+   <id>all</id>
+
+   <formats>
+      <format>zip</format>
+   </formats>
+
+   <!-- TODO fix this, this is still based on the old JBoss Cache src tree -->
+   <includeBaseDirectory>true</includeBaseDirectory>
+
+   <fileSets>
+
+      <!-- code -->
+      <fileSet>
+         <directory>target</directory>
+         <outputDirectory/>
+         <includes>
+            <include>*.jar</include>
+         </includes>
+         <excludes>
+            <exclude>*test*.jar</exclude>
+         </excludes>
+      </fileSet>
+
+      <!-- resources -->
+      <fileSet>
+         <directory>src/main/resources</directory>
+         <outputDirectory>etc</outputDirectory>
+         <excludes>
+            <exclude>**/*.sh</exclude>
+         </excludes>
+      </fileSet>
+
+      <!-- Executable resources -->
+      <fileSet>
+         <directory>src/main/resources</directory>
+         <outputDirectory>etc</outputDirectory>
+         <includes>
+            <include>**/*.sh</include>
+         </includes>
+         <fileMode>0777</fileMode>
+      </fileSet>
+
+      <!-- Log4j XML -->
+      <fileSet>
+         <directory>src/test/resources</directory>
+         <outputDirectory>etc</outputDirectory>
+         <includes>
+            <include>log4j.xml</include>
+         </includes>
+      </fileSet>
+
+      <!-- EULAs and license files -->
+      <fileSet>
+         <directory>src/main/release</directory>
+         <outputDirectory/>
+         <includes>
+            <include>**/*.txt</include>
+         </includes>
+      </fileSet>
+
+      <!-- docs -->
+      <fileSet>
+         <directory>target/site/apidocs</directory>
+         <outputDirectory>doc/apidocs</outputDirectory>
+      </fileSet>
+
+      <fileSet>
+         <directory>target/docbook</directory>
+         <outputDirectory>doc/</outputDirectory>
+      </fileSet>
+   </fileSets>
+
+   <!-- Make sure we filter out the junk that jboss-common-core pulls in -->
+   <dependencySets>
+      <dependencySet>
+         <outputDirectory>lib</outputDirectory>
+         <outputFileNameMapping>${scope}/${artifactId}.${extension}</outputFileNameMapping>
+         <unpack>false</unpack>
+         <scope>test</scope>
+      </dependencySet>
+   </dependencySets>
+</assembly>

Added: trunk/src/main/assembly/bin.xml
===================================================================
--- trunk/src/main/assembly/bin.xml	                        (rev 0)
+++ trunk/src/main/assembly/bin.xml	2009-04-17 10:05:17 UTC (rev 131)
@@ -0,0 +1,160 @@
+<!--
+   This package will build a ZIP containing the following:
+
+   + modules
+      + core
+         - infinispan-core.jar
+         + lib (contains dependencies)
+      + tree
+         - infinispan-tree.jar
+         + lib
+
+      .. etc ...
+
+   + bin (any scripts, etc)
+   + etc (sample configs, resources, etc from src/main/resources)
+   + doc (release notes, etc from src/main/release)
+-->
+<assembly
+        xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+    <id>test</id>
+
+    <formats>
+        <format>zip</format>
+    </formats>
+
+    <moduleSets>
+        <moduleSet>
+
+            <includeSubModules>false</includeSubModules>
+            <!--<includes>-->
+            <!--<include>org.infinispan:infinispan-core</include>-->
+            <!---->
+            <!--</includes>-->
+
+            <sources>
+                <includeModuleDirectory>false</includeModuleDirectory>
+                <fileSets>
+
+                    <!-- resources -->
+                    <fileSet>
+                        <directory>src/main/resources</directory>
+                        <outputDirectory>etc</outputDirectory>
+                        <excludes>
+                            <exclude>**/*.sh</exclude>
+                        </excludes>
+                    </fileSet>
+
+                    <!-- Executable resources -->
+                    <fileSet>
+                        <directory>src/main/resources</directory>
+                        <outputDirectory>etc</outputDirectory>
+                        <includes>
+                            <include>**/*.sh</include>
+                        </includes>
+                        <fileMode>0777</fileMode>
+                    </fileSet>
+
+                    <!-- Log4j XML -->
+                    <fileSet>
+                        <directory>src/test/resources</directory>
+                        <outputDirectory>etc</outputDirectory>
+                        <includes>
+                            <include>log4j.xml</include>
+                        </includes>
+                    </fileSet>
+
+                    <!-- EULAs and license files -->
+                    <fileSet>
+                        <directory>src/main/release</directory>
+                        <outputDirectory></outputDirectory>
+                        <includes>
+                            <include>**/*.txt</include>
+                        </includes>
+                    </fileSet>
+
+                    <!-- docs -->
+                    <fileSet>
+                        <directory>target/site/apidocs</directory>
+                        <outputDirectory>doc/apidocs</outputDirectory>
+                    </fileSet>
+
+                    <fileSet>
+                        <directory>target/docbook</directory>
+                        <outputDirectory>doc/</outputDirectory>
+                    </fileSet>
+                </fileSets>
+                <!--
+                <fileSets>
+                    <fileSet>
+                        <outputDirectory>modules/${module.basedir.name}</outputDirectory>
+                        <includes>
+                            <include>src/**</include>
+                        </includes>
+                    </fileSet>
+                </fileSets>
+
+                -->
+            </sources>
+
+            <binaries>
+                <outputDirectory>modules/${module.basedir.name}</outputDirectory>
+                <unpack>false</unpack>
+                <dependencySets>
+                    <dependencySet>
+                        <outputDirectory>modules/${module.basedir.name}/lib</outputDirectory>
+                    </dependencySet>
+                </dependencySets>
+            </binaries>
+        </moduleSet>
+        <!--
+        <moduleSet>
+            <binaries>
+                <attachmentClassifier>javadoc</attachmentClassifier>
+                <includeDependencies>false</includeDependencies>
+                <outputDirectory>modules/${module.basedir.name}/javadoc</outputDirectory>
+            </binaries>
+        </moduleSet>
+              -->
+        <!--<moduleSet>-->
+            <!--<includes>-->
+            <!--<include>org.infinispan:infinispan-core</include>-->
+            <!--</includes>-->
+            <!--<binaries>-->
+                <!--<outputDirectory>-->
+                    <!--modules/${module.basedir.name}-->
+                <!--</outputDirectory>-->
+                <!--<dependencySets>-->
+                    <!--<dependencySet>-->
+                        <!--<outputDirectory>modules/${module.basedir.name}/lib</outputDirectory>-->
+                    <!--</dependencySet>-->
+                <!--</dependencySets>-->
+                <!--<unpack>false</unpack>-->
+            <!--</binaries>-->
+        <!--</moduleSet>-->
+    </moduleSets>
+
+    <!--
+
+      <dependencySets>
+        <dependencySet>
+          <includes>
+            <include>infinispan-*</include>
+          </includes>
+          <useTransitiveDependencies>true</useTransitiveDependencies>
+          <outputDirectory>${artifact.artifactId}</outputDirectory>
+          <unpack>false</unpack>
+        </dependencySet>
+        <dependencySet>
+          <excludes>
+            <exclude>infinispan-*</exclude>
+          </excludes>
+          <useProjectArtifact>false</useProjectArtifact>
+          <outputDirectory>${artifact.artifactId}/lib</outputDirectory>
+        </dependencySet>
+      </dependencySets>
+    -->
+</assembly> 
+

Added: trunk/src/main/assembly/dep.xml
===================================================================
--- trunk/src/main/assembly/dep.xml	                        (rev 0)
+++ trunk/src/main/assembly/dep.xml	2009-04-17 10:05:17 UTC (rev 131)
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   This package will build a ZIP containing the following:
+
+   + modules
+      + core
+         - infinispan-core.jar
+         + lib (contains dependencies)
+      + tree
+         - infinispan-tree.jar
+         + lib
+
+      .. etc ...
+      
+   + bin (any scripts, etc)
+   + etc (sample configs, resources, etc from src/main/resources)
+   + doc (release notes, etc from src/main/release)
+-->
+<assembly xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:maven:assembly:1.1.0-SNAPSHOT">
+  <id>dep</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+<!-- TODO fix this, this is still based on the old JBoss Cache src tree -->
+  <includeBaseDirectory>true</includeBaseDirectory>
+  <moduleSets>
+    <moduleSet>
+      <includes>
+        <include>org.infinispan:infinispan-core</include>
+      </includes>
+      <sources>
+        <fileSets>
+<!-- resources -->
+          <fileSet>
+            <directory>src/main/resources</directory>
+            <outputDirectory>etc</outputDirectory>
+            <excludes>
+              <exclude>**/*.sh</exclude>
+            </excludes>
+          </fileSet>
+<!-- Executable resources -->
+          <fileSet>
+            <directory>src/main/resources</directory>
+            <outputDirectory>etc</outputDirectory>
+            <includes>
+              <include>**/*.sh</include>
+            </includes>
+            <fileMode>0777</fileMode>
+          </fileSet>
+<!-- Log4j XML -->
+          <fileSet>
+            <directory>src/test/resources</directory>
+            <outputDirectory>etc</outputDirectory>
+            <includes>
+              <include>log4j.xml</include>
+            </includes>
+          </fileSet>
+<!-- EULAs and license files -->
+          <fileSet>
+            <directory>src/main/release</directory>
+            <outputDirectory/>
+            <includes>
+              <include>**/*.txt</include>
+            </includes>
+          </fileSet>
+        </fileSets>
+      </sources>
+      <binaries>
+  <dependencySets> 
+    <dependencySet> 
+      <outputDirectory>lib</outputDirectory> 
+      <outputFileNameMapping> 
+        ${groupId}-${artifactId}.${extension} 
+      </outputFileNameMapping> 
+    </dependencySet> 
+  </dependencySets> 
+      </binaries>
+    </moduleSet>
+  </moduleSets>
+</assembly>

Added: trunk/src/main/assembly/single_jar.xml
===================================================================
--- trunk/src/main/assembly/single_jar.xml	                        (rev 0)
+++ trunk/src/main/assembly/single_jar.xml	2009-04-17 10:05:17 UTC (rev 131)
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+   This package will build a ZIP containing a single jar, containing classes from ALL modules.
+
+   - infinispan-all.jar
+   + lib (all dependencies)
+
+   + bin (any scripts, etc)
+   + etc (sample configs, resources, etc from src/main/resources)
+   + doc (release notes, etc from src/main/release)
+-->
+      
+<assembly xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:maven:assembly:1.1.0-SNAPSHOT">
+   <id>all</id>
+
+   <formats>
+      <format>zip</format>
+   </formats>
+
+   <!-- TODO fix this, this is still based on the old JBoss Cache src tree -->
+   <includeBaseDirectory>true</includeBaseDirectory>
+
+   <fileSets>
+
+      <!-- code -->
+      <fileSet>
+         <directory>target</directory>
+         <outputDirectory/>
+         <includes>
+            <include>*.jar</include>
+         </includes>
+         <excludes>
+            <exclude>*test*.jar</exclude>
+         </excludes>
+      </fileSet>
+
+      <!-- resources -->
+      <fileSet>
+         <directory>src/main/resources</directory>
+         <outputDirectory>etc</outputDirectory>
+         <excludes>
+            <exclude>**/*.sh</exclude>
+         </excludes>
+      </fileSet>
+
+      <!-- Executable resources -->
+      <fileSet>
+         <directory>src/main/resources</directory>
+         <outputDirectory>etc</outputDirectory>
+         <includes>
+            <include>**/*.sh</include>
+         </includes>
+         <fileMode>0777</fileMode>
+      </fileSet>
+
+      <!-- Log4j XML -->
+      <fileSet>
+         <directory>src/test/resources</directory>
+         <outputDirectory>etc</outputDirectory>
+         <includes>
+            <include>log4j.xml</include>
+         </includes>
+      </fileSet>
+
+      <!-- EULAs and license files -->
+      <fileSet>
+         <directory>src/main/release</directory>
+         <outputDirectory/>
+         <includes>
+            <include>**/*.txt</include>
+         </includes>
+      </fileSet>
+
+      <!-- docs -->
+      <fileSet>
+         <directory>target/site/apidocs</directory>
+         <outputDirectory>doc/apidocs</outputDirectory>
+      </fileSet>
+
+      <fileSet>
+         <directory>target/docbook</directory>
+         <outputDirectory>doc/</outputDirectory>
+      </fileSet>
+   </fileSets>
+
+   <!-- Make sure we filter out the junk that jboss-common-core pulls in -->
+   <dependencySets>
+      <dependencySet>
+         <outputDirectory>lib</outputDirectory>
+         <outputFileNameMapping>${scope}/${artifactId}.${extension}</outputFileNameMapping>
+         <unpack>false</unpack>
+         <scope>test</scope>
+      </dependencySet>
+   </dependencySets>
+</assembly>

Added: trunk/src/main/assembly/src.xml
===================================================================
--- trunk/src/main/assembly/src.xml	                        (rev 0)
+++ trunk/src/main/assembly/src.xml	2009-04-17 10:05:17 UTC (rev 131)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   This package will build a ZIP the root of the source tree and all subdirectories.  Essentially a snapshot of the
+   subversion checkout.
+-->
+<assembly xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:maven:assembly:1.1.0-SNAPSHOT">
+   <id>src</id>
+   <formats>
+      <format>zip</format>
+   </formats>
+
+   <includeBaseDirectory>true</includeBaseDirectory>
+   <fileSets>
+      <fileSet>
+         <excludes>
+            <exclude>**/target/**</exclude>
+            <exclude>**/output/**</exclude>
+            <exclude>**/test-output/**</exclude>
+            <exclude>**/jbossdb/**</exclude>
+            <exclude>**/testFiles/**</exclude>
+            <exclude>**/*.jdb</exclude>
+            <exclude>**/*.iml</exclude>
+            <exclude>**/*.ipr</exclude>
+            <exclude>**/*.iws</exclude>
+            <exclude>**/*.log</exclude>
+            <exclude>**/*.lck</exclude>
+         </excludes>
+      </fileSet>
+   </fileSets>
+</assembly>
\ No newline at end of file

Added: trunk/src/main/assembly/test.xml
===================================================================
--- trunk/src/main/assembly/test.xml	                        (rev 0)
+++ trunk/src/main/assembly/test.xml	2009-04-17 10:05:17 UTC (rev 131)
@@ -0,0 +1,108 @@
+<!--
+   This package will build a ZIP containing the following:
+
+   + modules
+      + core
+         - infinispan-core.jar
+         + lib (contains dependencies)
+      + tree
+         - infinispan-tree.jar
+         + lib
+
+      .. etc ...
+
+   + bin (any scripts, etc)
+   + etc (sample configs, resources, etc from src/main/resources)
+   + doc (release notes, etc from src/main/release)
+-->
+<assembly
+        xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+    <id>test</id>
+
+    <formats>
+        <format>zip</format>
+    </formats>
+
+    <moduleSets>
+        <moduleSet>
+
+            <includeSubModules>false</includeSubModules>
+            <!--<includes>-->
+                <!--<include>org.infinispan:infinispan-core</include>-->
+                <!---->
+            <!--</includes>-->
+<!--
+            <sources>
+                <includeModuleDirectory>false</includeModuleDirectory>
+                <fileSets>
+                    <fileSet>
+                        <outputDirectory>modules/${module.basedir.name}</outputDirectory>
+                        <includes>
+                            <include>src/**</include>
+                        </includes>
+                    </fileSet>
+                </fileSets>
+            </sources>
+    -->
+            <binaries>
+                <outputDirectory>modules/${module.basedir.name}</outputDirectory>
+                <unpack>false</unpack>
+            </binaries>
+        </moduleSet>
+
+    <!--
+
+        <moduleSet>
+            <includes>
+                <include>org.infinispan:infinispan-core</include>
+            </includes>
+            <binaries>
+                <attachmentClassifier>javadoc</attachmentClassifier>
+                <includeDependencies>false</includeDependencies>
+                <outputDirectory>modules/${module.basedir.name}/javadoc</outputDirectory>
+            </binaries>
+        </moduleSet>
+        -->
+
+        <moduleSet>
+            <!--<includes>-->
+                <!--<include>org.infinispan:infinispan-core</include>-->
+            <!--</includes>-->
+            <binaries>
+                <outputDirectory>
+                    modules/${module.basedir.name}
+                </outputDirectory>
+                <dependencySets>
+                    <dependencySet>
+                        <outputDirectory>modules/${module.basedir.name}/lib</outputDirectory>
+                    </dependencySet>
+                </dependencySets>
+                <unpack>false</unpack>
+            </binaries>
+        </moduleSet>
+    </moduleSets>
+
+    <!--
+
+      <dependencySets>
+        <dependencySet>
+          <includes>
+            <include>infinispan-*</include>
+          </includes>
+          <useTransitiveDependencies>true</useTransitiveDependencies>
+          <outputDirectory>${artifact.artifactId}</outputDirectory>
+          <unpack>false</unpack>
+        </dependencySet>
+        <dependencySet>
+          <excludes>
+            <exclude>infinispan-*</exclude>
+          </excludes>
+          <useProjectArtifact>false</useProjectArtifact>
+          <outputDirectory>${artifact.artifactId}/lib</outputDirectory>
+        </dependencySet>
+      </dependencySets>
+    -->
+</assembly> 
+




More information about the infinispan-commits mailing list