[infinispan-commits] Infinispan SVN: r136 - in trunk: src/main/assembly and 1 other directory.

infinispan-commits at lists.jboss.org infinispan-commits at lists.jboss.org
Fri Apr 17 10:03:02 EDT 2009


Author: adriancole
Date: 2009-04-17 10:03:01 -0400 (Fri, 17 Apr 2009)
New Revision: 136

Modified:
   trunk/pom.xml
   trunk/src/main/assembly/single_jar.xml
   trunk/src/main/assembly/src.xml
Log:
ISPN-52 first pass at all modules

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2009-04-17 13:32:45 UTC (rev 135)
+++ trunk/pom.xml	2009-04-17 14:03:01 UTC (rev 136)
@@ -2,82 +2,109 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-   <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-   <parent>
-      <groupId>org.infinispan</groupId>
-      <artifactId>infinispan-parent</artifactId>
-      <version>4.0.0-SNAPSHOT</version>
-      <relativePath>parent/pom.xml</relativePath>
-   </parent>
+    <parent>
+        <groupId>org.infinispan</groupId>
+        <artifactId>infinispan-parent</artifactId>
+        <version>4.0.0-SNAPSHOT</version>
+        <relativePath>parent/pom.xml</relativePath>
+    </parent>
 
-   <groupId>org.infinispan</groupId>
-   <artifactId>infinispan</artifactId>
-   <version>4.0.0-SNAPSHOT</version>
+    <groupId>org.infinispan</groupId>
+    <artifactId>infinispan</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
 
-   <name>Infinispan Distribution</name>
-   <description>Builds the complete Infinispan distribution bundles</description>
-   <packaging>pom</packaging>
+    <name>Infinispan Distribution</name>
+    <description>Builds the complete Infinispan distribution bundles</description>
+    <packaging>pom</packaging>
 
-   <modules>
-      <module>parent</module>
-      <module>core</module>
-      <module>tree</module>
-      <module>cachestore/bdbje</module>
-      <module>cachestore/s3</module>
-      <module>cachestore/jdbc</module>
-   </modules>
+    <modules>
+        <module>parent</module>
+        <module>core</module>
+        <module>tree</module>
+        <module>cachestore/bdbje</module>
+        <module>cachestore/s3</module>
+        <module>cachestore/jdbc</module>
+    </modules>
 
-   <build>
-      <plugins>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>javadoc</id>
-                <phase>package</phase>
-                <goals><goal>aggregate</goal></goals>
-              </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/single_jar.xml</descriptor>
-                  <descriptor>src/main/assembly/src.xml</descriptor>
--->
-               </descriptors>
-               <finalName>${artifactId}-${project-version}</finalName>
-               <outputDirectory>target/distribution</outputDirectory>
-               <workDirectory>target/assembly/work</workDirectory>
-            </configuration>
-         </plugin>
-      </plugins>
-   </build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>javadoc</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>aggregate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.3</version>
+                <executions>
+                    <execution>
+                        <id>run</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <tasks>
+                        <!-- this is a dependency of single_jar assembly -->
+                        <mkdir dir="target"/>
+                        <zip destfile="target/infinispan-all.jar">
+                            <fileset dir="cachestore/bdbje/target/classes"/>
+                            <fileset dir="cachestore/jdbc/target/classes"/>
+                            <fileset dir="cachestore/s3/target/classes"/>
+                            <fileset dir="core/target/classes"/>
+                            <fileset dir="tree/target/classes"/>
+                        </zip>
+                    </tasks>
+                </configuration>
+            </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/single_jar.xml</descriptor>
+                        <descriptor>src/main/assembly/bin.xml</descriptor>
+                        <descriptor>src/main/assembly/all.xml</descriptor>
+                        <descriptor>src/main/assembly/src.xml</descriptor>
+                    </descriptors>
+                    <finalName>${artifactId}-${project-version}</finalName>
+                    <outputDirectory>target/distribution</outputDirectory>
+                    <workDirectory>target/assembly/work</workDirectory>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

Modified: trunk/src/main/assembly/single_jar.xml
===================================================================
--- trunk/src/main/assembly/single_jar.xml	2009-04-17 13:32:45 UTC (rev 135)
+++ trunk/src/main/assembly/single_jar.xml	2009-04-17 14:03:01 UTC (rev 136)
@@ -10,87 +10,99 @@
    + 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>
+<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>single_jar</id>
 
-   <formats>
-      <format>zip</format>
-   </formats>
+    <formats>
+        <format>zip</format>
+    </formats>
 
-   <!-- TODO fix this, this is still based on the old JBoss Cache src tree -->
-   <includeBaseDirectory>true</includeBaseDirectory>
+    <moduleSets>
+        <moduleSet>
+            <includeSubModules>false</includeSubModules>
 
-   <fileSets>
+            <sources>
+                <includeModuleDirectory>false</includeModuleDirectory>
 
-      <!-- code -->
-      <fileSet>
-         <directory>target</directory>
-         <outputDirectory/>
-         <includes>
-            <include>*.jar</include>
-         </includes>
-         <excludes>
-            <exclude>*test*.jar</exclude>
-         </excludes>
-      </fileSet>
+                <fileSets>
 
-      <!-- resources -->
-      <fileSet>
-         <directory>src/main/resources</directory>
-         <outputDirectory>etc</outputDirectory>
-         <excludes>
-            <exclude>**/*.sh</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>
+                    <!-- 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>
+                    <!-- 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>
+                    <!-- 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>
 
-      <fileSet>
-         <directory>target/docbook</directory>
-         <outputDirectory>doc/</outputDirectory>
-      </fileSet>
-   </fileSets>
+            </sources>
 
-   <!-- 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>
+            <binaries>
+                <unpack>false</unpack>
+                <!-- TODO do not insert the project jar itself, only the deps -->
+                <outputDirectory>/.ignore</outputDirectory>
+                <dependencySets>
+                    <dependencySet>
+                        <excludes>
+                            <exclude>infinispan-*</exclude>
+                        </excludes>
+                        <outputDirectory>lib</outputDirectory>
+                    </dependencySet>
+                </dependencySets>
+            </binaries>
+        </moduleSet>
+
+    </moduleSets>
+    <fileSets>
+        <fileSet>
+            <directory>target</directory>
+            <includes>
+                <include>infinispan-all.jar</include>
+            </includes>
+            <outputDirectory>/</outputDirectory>
+        </fileSet>
+
+        <!-- docs -->
+        <fileSet>
+            <directory>target/site/apidocs</directory>
+            <outputDirectory>doc/apidocs</outputDirectory>
+        </fileSet>
+    </fileSets>
 </assembly>

Modified: trunk/src/main/assembly/src.xml
===================================================================
--- trunk/src/main/assembly/src.xml	2009-04-17 13:32:45 UTC (rev 135)
+++ trunk/src/main/assembly/src.xml	2009-04-17 14:03:01 UTC (rev 136)
@@ -3,7 +3,10 @@
    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">
+<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>src</id>
    <formats>
       <format>zip</format>




More information about the infinispan-commits mailing list