You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by jm...@apache.org on 2010/03/02 19:12:50 UTC
svn commit: r918135 - in /lucene/mahout/trunk/src/main/assembly: bin.xml
src.xml
Author: jmannix
Date: Tue Mar 2 18:12:49 2010
New Revision: 918135
URL: http://svn.apache.org/viewvc?rev=918135&view=rev
Log:
Fixes MAHOUT-311
Modified:
lucene/mahout/trunk/src/main/assembly/bin.xml
lucene/mahout/trunk/src/main/assembly/src.xml
Modified: lucene/mahout/trunk/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/src/main/assembly/bin.xml?rev=918135&r1=918134&r2=918135&view=diff
==============================================================================
--- lucene/mahout/trunk/src/main/assembly/bin.xml (original)
+++ lucene/mahout/trunk/src/main/assembly/bin.xml Tue Mar 2 18:12:49 2010
@@ -1,6 +1,6 @@
<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">
+ 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>tar.gz</format>
@@ -8,53 +8,90 @@
<format>zip</format>
</formats>
- <moduleSets>
- <moduleSet>
- <includes>
- <include>org.apache.mahout:mahout-collections</include>
- <include>org.apache.mahout:mahout-math</include>
- <include>org.apache.mahout:mahout-core</include>
- <include>org.apache.mahout:mahout-utils</include>
- <include>org.apache.mahout:mahout-examples</include>
- <include>org.apache.mahout:mahout-taste-webapp</include>
- </includes>
- <binaries>
- <outputDirectory/>
- <unpack>false</unpack>
- <dependencySets>
- <dependencySet>
- <excludes>
- <exclude>org.apache.mahout:*</exclude>
- </excludes>
- <outputDirectory>lib</outputDirectory>
- </dependencySet>
- </dependencySets>
- </binaries>
- </moduleSet>
- </moduleSets>
-
<fileSets>
<fileSet>
+ <directory>examples/target/dependency</directory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>mahout-*</exclude>
+ </excludes>
+ <outputDirectory>lib</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>collections/target</directory>
+ <includes>
+ <include>mahout-*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
+ </excludes>
+ <outputDirectory/>
+ </fileSet>
+ <fileSet>
+ <directory>math/target</directory>
+ <includes>
+ <include>mahout-*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
+ </excludes>
+ <outputDirectory/>
+ </fileSet>
+ <fileSet>
<directory>core/target</directory>
<includes>
- <include>*.job</include>
+ <include>mahout-*.job</include>
+ <include>mahout-*.jar</include>
+ </includes>
+ <excludes>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
+ </excludes>
+ <outputDirectory/>
+ </fileSet>
+ <fileSet>
+ <directory>utils/target</directory>
+ <includes>
+ <include>mahout-*.job</include>
+ <include>mahout-*.jar</include>
</includes>
+ <excludes>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
+ </excludes>
<outputDirectory/>
</fileSet>
<fileSet>
<directory>examples/target</directory>
<includes>
- <include>*.job</include>
+ <include>mahout-*.jar</include>
+ <include>mahout-*.job</include>
</includes>
+ <excludes>
+ <exclude>*sources.jar</exclude>
+ <exclude>*javadoc.jar</exclude>
+ <exclude>*tests.jar</exclude>
+ </excludes>
<outputDirectory/>
</fileSet>
<fileSet>
- <directory>math/target/apidocs</directory>
- <outputDirectory>docs/mahout-collections</outputDirectory>
+ <directory>taste-web/target</directory>
+ <includes>
+ <include>mahout-*.war</include>
+ </includes>
+ <outputDirectory/>
</fileSet>
<fileSet>
- <directory>bin</directory>
- <outputDirectory>bin</outputDirectory>
+ <directory>collections/target/apidocs</directory>
+ <outputDirectory>docs/mahout-collections</outputDirectory>
</fileSet>
<fileSet>
<directory>conf</directory>
@@ -85,6 +122,7 @@
<include>NOTICE*</include>
<include>KEYS</include>
</includes>
+ <fileMode>0644</fileMode>
</fileSet>
<fileSet>
<directory>src/main/assembly</directory>
@@ -92,6 +130,20 @@
<includes>
<include>*-LICENSE.txt</include>
</includes>
+ <fileMode>0644</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <includes>
+ <include>mahout</include>
+ </includes>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>conf</directory>
+ <outputDirectory>conf</outputDirectory>
+ <fileMode>0644</fileMode>
</fileSet>
</fileSets>
</assembly>
Modified: lucene/mahout/trunk/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/lucene/mahout/trunk/src/main/assembly/src.xml?rev=918135&r1=918134&r2=918135&view=diff
==============================================================================
--- lucene/mahout/trunk/src/main/assembly/src.xml (original)
+++ lucene/mahout/trunk/src/main/assembly/src.xml Tue Mar 2 18:12:49 2010
@@ -18,7 +18,7 @@
<include>${project.basedir}/**/NOTICE*</include>
<include>${project.basedir}/**/pom.xml</include>
<include>${project.basedir}/**/src/**</include>
- <include>${project.basedir}/bin/**</include>
+ <include>${project.basedir}/conf/**</include>
<include>${project.basedir}/**/build.xml</include>
<include>${project.basedir}/**/*.properties</include>
</includes>
@@ -27,5 +27,14 @@
<exclude>**/target/**</exclude>
</excludes>
</fileSet>
+ <fileSet>
+ <directory/>
+ <outputDirectory/>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <includes>
+ <include>${project.basedir}/bin/mahout</include>
+ </includes>
+ <fileMode>0755</fileMode>
+ </fileSet>
</fileSets>
</assembly>