[infinispan-commits] Infinispan SVN: r133 - in trunk: src/main/assembly and 1 other directory.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Fri Apr 17 07:21:08 EDT 2009
Author: adriancole
Date: 2009-04-17 07:21:07 -0400 (Fri, 17 Apr 2009)
New Revision: 133
Modified:
trunk/pom.xml
trunk/src/main/assembly/all.xml
trunk/src/main/assembly/bin.xml
Log:
ISPN-52 created all distribution and added javadoc
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-04-17 10:09:20 UTC (rev 132)
+++ trunk/pom.xml 2009-04-17 11:21:07 UTC (rev 133)
@@ -36,7 +36,8 @@
<executions>
<execution>
<id>javadoc</id>
- <phase>none</phase>
+ <phase>package</phase>
+ <goals><goal>aggregate</goal></goals>
</execution>
</executions>
</plugin>
@@ -66,12 +67,10 @@
<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>
Modified: trunk/src/main/assembly/all.xml
===================================================================
--- trunk/src/main/assembly/all.xml 2009-04-17 10:09:20 UTC (rev 132)
+++ trunk/src/main/assembly/all.xml 2009-04-17 11:21:07 UTC (rev 133)
@@ -21,87 +21,117 @@
+ 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>all</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>
-</assembly>
+ <binaries>
+
+ <outputDirectory>modules/${module.basedir.name}</outputDirectory>
+ <outputFileNameMapping>
+ ${module.artifactId}.${module.extension}
+ </outputFileNameMapping>
+ <unpack>false</unpack>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>modules/${module.basedir.name}/lib</outputDirectory>
+ </dependencySet>
+ </dependencySets>
+
+ </binaries>
+ </moduleSet>
+
+ <moduleSet>
+ <includeSubModules>false</includeSubModules>
+ <binaries>
+ <attachmentClassifier>tests</attachmentClassifier>
+ <outputDirectory>test/modules/${module.basedir.name}</outputDirectory>
+ <outputFileNameMapping>
+ ${module.artifactId}-test.${module.extension}
+ </outputFileNameMapping>
+ <unpack>false</unpack>
+
+ <dependencySets>
+ <dependencySet>
+ <scope>test</scope>
+ <outputDirectory>test/modules/${module.basedir.name}/lib</outputDirectory>
+ </dependencySet>
+ </dependencySets>
+
+ </binaries>
+ </moduleSet>
+
+ </moduleSets>
+
+ <fileSets>
+
+ <!-- docs -->
+ <fileSet>
+ <directory>target/site/apidocs</directory>
+ <outputDirectory>doc/apidocs</outputDirectory>
+ </fileSet>
+
+ </fileSets>
+
+</assembly>
\ No newline at end of file
Modified: trunk/src/main/assembly/bin.xml
===================================================================
--- trunk/src/main/assembly/bin.xml 2009-04-17 10:09:20 UTC (rev 132)
+++ trunk/src/main/assembly/bin.xml 2009-04-17 11:21:07 UTC (rev 133)
@@ -19,7 +19,7 @@
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>
+ <id>bin</id>
<formats>
<format>zip</format>
@@ -27,15 +27,11 @@
<moduleSets>
<moduleSet>
-
<includeSubModules>false</includeSubModules>
- <!--<includes>-->
- <!--<include>org.infinispan:infinispan-core</include>-->
- <!---->
- <!--</includes>-->
<sources>
<includeModuleDirectory>false</includeModuleDirectory>
+
<fileSets>
<!-- resources -->
@@ -75,86 +71,40 @@
</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>
+ <outputFileNameMapping>
+ ${module.artifactId}.${module.extension}
+ </outputFileNameMapping>
<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>
- <!--
+ <fileSets>
- <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>
+ <!-- docs -->
+ <fileSet>
+ <directory>target/site/apidocs</directory>
+ <outputDirectory>doc/apidocs</outputDirectory>
+ </fileSet>
+ </fileSets>
+
+</assembly>
More information about the infinispan-commits
mailing list