[infinispan-commits] Infinispan SVN: r143 - in trunk: src/main and 2 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Fri Apr 17 13:03:06 EDT 2009
Author: adriancole
Date: 2009-04-17 13:03:05 -0400 (Fri, 17 Apr 2009)
New Revision: 143
Added:
trunk/src/main/resources/
trunk/src/main/resources/assemblies/
trunk/src/main/resources/assemblies/all.xml
trunk/src/main/resources/assemblies/bin.xml
trunk/src/main/resources/assemblies/single_jar.xml
trunk/src/main/resources/assemblies/src.xml
Removed:
trunk/src/main/assembly/
trunk/src/main/resources/assemblies/all.xml
trunk/src/main/resources/assemblies/bin.xml
trunk/src/main/resources/assemblies/single_jar.xml
trunk/src/main/resources/assemblies/src.xml
Modified:
trunk/pom.xml
Log:
ISPN-52 fixed single_jar and moved assembly descriptors into standard directories
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-04-17 15:47:20 UTC (rev 142)
+++ trunk/pom.xml 2009-04-17 17:03:05 UTC (rev 143)
@@ -49,26 +49,45 @@
<version>1.3</version>
<executions>
<execution>
- <id>run</id>
+ <id>create-consolidated-jar</id>
<phase>prepare-package</phase>
<goals>
<goal>run</goal>
</goals>
+ <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>
</execution>
+ <execution>
+ <id>remove-dot-ignore</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <property name="file"
+ value="${project.build.directory}/distribution/${artifactId}-${project-version}-single_jar.zip"/>
+ <zip destfile="${file}.new">
+ <zipfileset src="${file}">
+ <exclude name="**/.ignore/**"/>
+ </zipfileset>
+ </zip>
+ <move file="${file}.new" tofile="${file}"/>
+ </tasks>
+ </configuration>
+ </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>
@@ -95,10 +114,10 @@
</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>
+ <descriptor>src/main/resources/assemblies/single_jar.xml</descriptor>
+ <descriptor>src/main/resources/assemblies/bin.xml</descriptor>
+ <descriptor>src/main/resources/assemblies/all.xml</descriptor>
+ <descriptor>src/main/resources/assemblies/src.xml</descriptor>
</descriptors>
<finalName>${artifactId}-${project-version}</finalName>
<outputDirectory>target/distribution</outputDirectory>
Copied: trunk/src/main/resources/assemblies (from rev 132, trunk/src/main/assembly)
Deleted: trunk/src/main/resources/assemblies/all.xml
===================================================================
--- trunk/src/main/assembly/all.xml 2009-04-17 10:09:20 UTC (rev 132)
+++ trunk/src/main/resources/assemblies/all.xml 2009-04-17 17:03:05 UTC (rev 143)
@@ -1,107 +0,0 @@
-<?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>
Copied: trunk/src/main/resources/assemblies/all.xml (from rev 139, trunk/src/main/assembly/all.xml)
===================================================================
--- trunk/src/main/resources/assemblies/all.xml (rev 0)
+++ trunk/src/main/resources/assemblies/all.xml 2009-04-17 17:03:05 UTC (rev 143)
@@ -0,0 +1,145 @@
+<?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 (excluding core and transitive dependencies)
+
+ .. 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="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>
+
+ <moduleSets>
+ <moduleSet>
+ <includeSubModules>false</includeSubModules>
+
+ <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>
+
+ <fileSet>
+ <directory>target/docbook</directory>
+ <outputDirectory>doc/</outputDirectory>
+ </fileSet>
+ </fileSets>
+
+ </sources>
+
+ <binaries>
+
+ <outputDirectory>modules/${module.basedir.name}</outputDirectory>
+ <outputFileNameMapping>
+ ${module.artifactId}.${module.extension}
+ </outputFileNameMapping>
+ <unpack>false</unpack>
+
+ <dependencySets>
+ <dependencySet>
+ <excludes>
+ <exclude>infinispan-core*</exclude>
+ </excludes>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <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>
+ <excludes>
+ <exclude>infinispan-core*</exclude>
+ </excludes>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <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
Deleted: trunk/src/main/resources/assemblies/bin.xml
===================================================================
--- trunk/src/main/assembly/bin.xml 2009-04-17 10:09:20 UTC (rev 132)
+++ trunk/src/main/resources/assemblies/bin.xml 2009-04-17 17:03:05 UTC (rev 143)
@@ -1,160 +0,0 @@
-<!--
- 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>
-
Copied: trunk/src/main/resources/assemblies/bin.xml (from rev 139, trunk/src/main/assembly/bin.xml)
===================================================================
--- trunk/src/main/resources/assemblies/bin.xml (rev 0)
+++ trunk/src/main/resources/assemblies/bin.xml 2009-04-17 17:03:05 UTC (rev 143)
@@ -0,0 +1,114 @@
+<!--
+ This package will build a ZIP containing the following:
+
+ + modules
+ + core
+ - infinispan-core.jar
+ + lib (contains dependencies)
+ + tree
+ - infinispan-tree.jar
+ + lib (excluding core and transitive dependencies)
+
+ .. 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>bin</id>
+
+ <formats>
+ <format>zip</format>
+ </formats>
+
+ <moduleSets>
+ <moduleSet>
+ <includeSubModules>false</includeSubModules>
+
+ <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>
+
+ <fileSet>
+ <directory>target/docbook</directory>
+ <outputDirectory>doc/</outputDirectory>
+ </fileSet>
+ </fileSets>
+
+ </sources>
+
+ <binaries>
+
+ <outputDirectory>modules/${module.basedir.name}</outputDirectory>
+ <unpack>false</unpack>
+ <outputFileNameMapping>
+ ${module.artifactId}.${module.extension}
+ </outputFileNameMapping>
+ <dependencySets>
+ <dependencySet>
+ <excludes>
+ <exclude>infinispan-core*</exclude>
+ </excludes>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <outputDirectory>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>
Deleted: trunk/src/main/resources/assemblies/single_jar.xml
===================================================================
--- trunk/src/main/assembly/single_jar.xml 2009-04-17 10:09:20 UTC (rev 132)
+++ trunk/src/main/resources/assemblies/single_jar.xml 2009-04-17 17:03:05 UTC (rev 143)
@@ -1,96 +0,0 @@
-<?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>
Copied: trunk/src/main/resources/assemblies/single_jar.xml (from rev 136, trunk/src/main/assembly/single_jar.xml)
===================================================================
--- trunk/src/main/resources/assemblies/single_jar.xml (rev 0)
+++ trunk/src/main/resources/assemblies/single_jar.xml 2009-04-17 17:03:05 UTC (rev 143)
@@ -0,0 +1,108 @@
+<?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="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>
+
+ <moduleSets>
+ <moduleSet>
+ <includeSubModules>false</includeSubModules>
+
+ <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>
+
+ <fileSet>
+ <directory>target/docbook</directory>
+ <outputDirectory>doc/</outputDirectory>
+ </fileSet>
+ </fileSets>
+
+ </sources>
+
+ <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>
Deleted: trunk/src/main/resources/assemblies/src.xml
===================================================================
--- trunk/src/main/assembly/src.xml 2009-04-17 10:09:20 UTC (rev 132)
+++ trunk/src/main/resources/assemblies/src.xml 2009-04-17 17:03:05 UTC (rev 143)
@@ -1,30 +0,0 @@
-<?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
Copied: trunk/src/main/resources/assemblies/src.xml (from rev 140, trunk/src/main/assembly/src.xml)
===================================================================
--- trunk/src/main/resources/assemblies/src.xml (rev 0)
+++ trunk/src/main/resources/assemblies/src.xml 2009-04-17 17:03:05 UTC (rev 143)
@@ -0,0 +1,35 @@
+<?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="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>
+ </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>
+ <exclude>**/Horizon-BdbjeCacheStore/**</exclude>
+ <exclude>**/coretarget/**</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
More information about the infinispan-commits
mailing list