[infinispan-commits] Infinispan SVN: r613 - trunk/src/main/resources/assemblies.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Thu Jul 23 11:01:15 EDT 2009
Author: galder.zamarreno at jboss.com
Date: 2009-07-23 11:01:14 -0400 (Thu, 23 Jul 2009)
New Revision: 613
Modified:
trunk/src/main/resources/assemblies/all.xml
trunk/src/main/resources/assemblies/bin.xml
Log:
[ISPN-140] Separated module sets for core and the rest so that transitive dependencies for other modules can be brought it without replicating core's dependencies.
Modified: trunk/src/main/resources/assemblies/all.xml
===================================================================
--- trunk/src/main/resources/assemblies/all.xml 2009-07-23 13:28:56 UTC (rev 612)
+++ trunk/src/main/resources/assemblies/all.xml 2009-07-23 15:01:14 UTC (rev 613)
@@ -9,7 +9,7 @@
+ lib (contains dependencies)
+ tree
- infinispan-tree.jar
- + lib (excluding core and transitive dependencies)
+ + lib (excluding core)
.. etc ...
@@ -35,9 +35,9 @@
<moduleSet>
<includeSubModules>false</includeSubModules>
- <excludes>
- <exclude>org.infinispan:infinispan-tools</exclude>
- </excludes>
+ <includes>
+ <include>org.infinispan:infinispan-core</include>
+ </includes>
<sources>
<includeModuleDirectory>false</includeModuleDirectory>
@@ -100,10 +100,92 @@
<dependencySets>
<dependencySet>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <outputDirectory>modules/${module.basedir.name}/lib</outputDirectory>
+ </dependencySet>
+ </dependencySets>
+
+ </binaries>
+ </moduleSet>
+
+ <moduleSet>
+ <includeSubModules>false</includeSubModules>
+ <includes>
+ <include>org.infinispan:infinispan-cachestore-bdbje</include>
+ <include>org.infinispan:infinispan-cachestore-jdbc</include>
+ <include>org.infinispan:infinispan-cachestore-jdbm</include>
+ <include>org.infinispan:infinispan-cachestore-s3</include>
+ <include>org.infinispan:infinispan-gui-demo</include>
+ <include>org.infinispan:infinispan-jopr-plugin</include>
+ <include>org.infinispan:infinispan-tree</include>
+ </includes>
+ <sources>
+ <includeModuleDirectory>false</includeModuleDirectory>
+
+ <fileSets>
+
+ <!-- resources -->
+ <fileSet>
+ <directory>src/main/resources</directory>
+ <outputDirectory>etc</outputDirectory>
<excludes>
+ <exclude>**/*.sh</exclude>
+ <exclude>**/*.bat</exclude>
+ <exclude>**/*.cmd</exclude>
+ <exclude>**/*.py</exclude>
+ </excludes>
+ </fileSet>
+
+ <!-- Executable resources -->
+ <fileSet>
+ <directory>src/main/resources</directory>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>**/*.sh</include>
+ <include>**/*.bat</include>
+ <include>**/*.cmd</include>
+ <include>**/*.py</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>
+
+ </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>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ <useTransitiveFiltering>true</useTransitiveFiltering>
<outputDirectory>modules/${module.basedir.name}/lib</outputDirectory>
</dependencySet>
</dependencySets>
Modified: trunk/src/main/resources/assemblies/bin.xml
===================================================================
--- trunk/src/main/resources/assemblies/bin.xml 2009-07-23 13:28:56 UTC (rev 612)
+++ trunk/src/main/resources/assemblies/bin.xml 2009-07-23 15:01:14 UTC (rev 613)
@@ -7,7 +7,7 @@
+ lib (contains dependencies)
+ tree
- infinispan-tree.jar
- + lib (excluding core and transitive dependencies)
+ + lib (excluding core)
.. etc ...
@@ -28,9 +28,9 @@
<moduleSets>
<moduleSet>
<includeSubModules>false</includeSubModules>
- <excludes>
- <exclude>org.infinispan:infinispan-tools</exclude>
- </excludes>
+ <includes>
+ <include>org.infinispan:infinispan-core</include>
+ </includes>
<sources>
<includeModuleDirectory>false</includeModuleDirectory>
@@ -96,10 +96,95 @@
</outputFileNameMapping>
<dependencySets>
<dependencySet>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <outputDirectory>modules/${module.basedir.name}/lib</outputDirectory>
+ </dependencySet>
+ </dependencySets>
+
+ </binaries>
+ </moduleSet>
+
+ <moduleSet>
+ <includeSubModules>false</includeSubModules>
+ <includes>
+ <include>org.infinispan:infinispan-cachestore-bdbje</include>
+ <include>org.infinispan:infinispan-cachestore-jdbc</include>
+ <include>org.infinispan:infinispan-cachestore-jdbm</include>
+ <include>org.infinispan:infinispan-cachestore-s3</include>
+ <include>org.infinispan:infinispan-gui-demo</include>
+ <include>org.infinispan:infinispan-jopr-plugin</include>
+ <include>org.infinispan:infinispan-tree</include>
+ </includes>
+ <sources>
+ <includeModuleDirectory>false</includeModuleDirectory>
+
+ <fileSets>
+
+ <!-- resources -->
+ <fileSet>
+ <directory>src/main/resources</directory>
+ <outputDirectory>etc</outputDirectory>
<excludes>
+ <exclude>**/*.sh</exclude>
+ <exclude>**/*.bat</exclude>
+ <exclude>**/*.cmd</exclude>
+ <exclude>**/*.py</exclude>
+ </excludes>
+ </fileSet>
+
+ <!-- Executable resources -->
+ <fileSet>
+ <directory>src/main/resources</directory>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>**/*.sh</include>
+ <include>**/*.bat</include>
+ <include>**/*.cmd</include>
+ <include>**/*.py</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>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ <useTransitiveFiltering>true</useTransitiveFiltering>
<outputDirectory>modules/${module.basedir.name}/lib</outputDirectory>
</dependencySet>
</dependencySets>
More information about the infinispan-commits
mailing list