incubator-hama-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edwardy...@apache.org
Subject svn commit: r1326934 - in /incubator/hama/trunk: CHANGES.txt dist/pom.xml pom.xml src/assemble/bin.xml src/assemble/core.xml src/assemble/src.xml
Date Tue, 17 Apr 2012 05:31:01 GMT
Author: edwardyoon
Date: Tue Apr 17 05:31:01 2012
New Revision: 1326934

URL: http://svn.apache.org/viewvc?rev=1326934&view=rev
Log:
Separate bin and src distributions

Added:
    incubator/hama/trunk/src/assemble/bin.xml
    incubator/hama/trunk/src/assemble/src.xml
Removed:
    incubator/hama/trunk/src/assemble/core.xml
Modified:
    incubator/hama/trunk/CHANGES.txt
    incubator/hama/trunk/dist/pom.xml
    incubator/hama/trunk/pom.xml

Modified: incubator/hama/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/CHANGES.txt?rev=1326934&r1=1326933&r2=1326934&view=diff
==============================================================================
--- incubator/hama/trunk/CHANGES.txt (original)
+++ incubator/hama/trunk/CHANGES.txt Tue Apr 17 05:31:01 2012
@@ -16,6 +16,7 @@ Release 0.5 - April 10, 2012 
 
   IMPROVEMENTS
 
+    HAMA-555: Separate bin and src distributions (edwardyoon)
     HAMA-548: Update 0.23.0-SNAPSHOT to 0.23.1 in pom file of yarn module (edwardyoon)
     HAMA-545: Include the API and other docs in the Hama release (Suraj Menon via edwardyoon)
     HAMA-543: Make best effort to start BSP Task on the host 

Modified: incubator/hama/trunk/dist/pom.xml
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/dist/pom.xml?rev=1326934&r1=1326933&r2=1326934&view=diff
==============================================================================
--- incubator/hama/trunk/dist/pom.xml (original)
+++ incubator/hama/trunk/dist/pom.xml Tue Apr 17 05:31:01 2012
@@ -44,19 +44,34 @@
       <artifactId>maven-assembly-plugin</artifactId>
       <executions>
         <execution>
-          <id>core-assembly</id>
+          <id>bin-assembly</id>
           <phase>package</phase>
           <goals>
             <goal>single</goal>
           </goals>
           <configuration>
             <descriptors>
-              <descriptor>src/assemble/core.xml</descriptor>
+              <descriptor>src/assemble/bin.xml</descriptor>
             </descriptors>
             <tarLongFileMode>gnu</tarLongFileMode>
             <appendAssemblyId>false</appendAssemblyId>
           </configuration>
         </execution>
+        <execution>
+          <id>src-assembly</id>
+          <phase>package</phase>
+          <goals>
+            <goal>single</goal>
+          </goals>
+          <configuration>
+            <descriptors>
+              <descriptor>src/assemble/src.xml</descriptor>
+            </descriptors>
+            <tarLongFileMode>gnu</tarLongFileMode>
+            <appendAssemblyId>true</appendAssemblyId>
+          </configuration>
+        </execution>
+
       </executions>
     </plugin>
     </plugins>

Modified: incubator/hama/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/pom.xml?rev=1326934&r1=1326933&r2=1326934&view=diff
==============================================================================
--- incubator/hama/trunk/pom.xml (original)
+++ incubator/hama/trunk/pom.xml Tue Apr 17 05:31:01 2012
@@ -352,28 +352,28 @@
         </configuration>
       </plugin>
       <plugin>
-	<groupId>org.apache.maven.plugins</groupId>
-	<artifactId>maven-javadoc-plugin</artifactId>
-	<version>2.6</version>
-	<configuration>
-	  <aggregate>true</aggregate>
-	  <outputDirectory>docs/apidocs</outputDirectory>
-	</configuration>
-	<executions>
-	  <execution>
-	    <goals>
-	      <goal>aggregate-jar</goal>
-	    </goals>
-	  </execution>
-	</executions>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.6</version>
+        <configuration>
+          <aggregate>true</aggregate>
+          <outputDirectory>docs/apidocs</outputDirectory>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+             <goal>aggregate-jar</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
   </build>
   
-    <distributionManagement>
-      <site>
-        <id>apache.website</id>
-        <url>scpexe://people.apache.org/www/incubator.apache.org/content/hama</url>
-      </site>
-    </distributionManagement>
+  <distributionManagement>
+    <site>
+      <id>apache.website</id>
+      <url>scpexe://people.apache.org/www/incubator.apache.org/content/hama</url>
+    </site>
+  </distributionManagement>
 </project>

Added: incubator/hama/trunk/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/assemble/bin.xml?rev=1326934&view=auto
==============================================================================
--- incubator/hama/trunk/src/assemble/bin.xml (added)
+++ incubator/hama/trunk/src/assemble/bin.xml Tue Apr 17 05:31:01 2012
@@ -0,0 +1,116 @@
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+  <id>binary</id>
+  <formats>
+    <format>dir</format>
+    <format>tar.gz</format>
+    <format>zip</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  
+  <fileSets>
+    <fileSet>
+      <directory>../core/target</directory>
+      <includes>
+        <include>hama-*.jar</include>
+      </includes>
+      <excludes>
+        <exclude>*sources.jar</exclude>
+        <exclude>*tests.jar</exclude>
+      </excludes>
+      <outputDirectory>../hama-${project.version}/</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>../graph/target</directory>
+      <includes>
+        <include>hama-*.jar</include>
+      </includes>
+      <excludes>
+        <exclude>*sources.jar</exclude>
+        <exclude>*tests.jar</exclude>
+      </excludes>
+      <outputDirectory>../hama-${project.version}/</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>../examples/target</directory>
+      <includes>
+        <include>hama-*.jar</include>
+      </includes>
+      <excludes>
+        <exclude>*sources.jar</exclude>
+        <exclude>*tests.jar</exclude>
+      </excludes>
+      <outputDirectory>../hama-${project.version}/</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>../yarn/target</directory>
+      <includes>
+        <include>hama-*.jar</include>
+      </includes>
+      <excludes>
+        <exclude>*sources.jar</exclude>
+        <exclude>*tests.jar</exclude>
+      </excludes>
+      <outputDirectory>../hama-${project.version}/</outputDirectory>
+    </fileSet>
+    
+    <fileSet>
+      <directory>../</directory>
+      <includes>
+        <include>*.txt</include>
+      </includes>
+      <outputDirectory>../hama-${project.version}/</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>../lib</directory>
+      <includes>
+        <include>*.jar</include>
+      </includes>
+      <fileMode>755</fileMode>
+      <outputDirectory>../hama-${project.version}/lib</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>../bin</directory>
+      <includes>
+        <include>hama</include>
+        <include>*.sh</include>
+      </includes>
+      <outputDirectory>../hama-${project.version}/bin</outputDirectory>
+      <fileMode>755</fileMode>
+    </fileSet>
+    <fileSet>
+      <directory>../conf</directory>
+      <includes>
+        <include>groomservers</include>
+        <include>hama-default.xml</include>
+        <include>hama-env.sh</include>
+        <include>hama-site.xml</include>
+        <include>log4j.properties</include>
+      </includes>
+      <outputDirectory>../hama-${project.version}/conf</outputDirectory>
+      <fileMode>755</fileMode>
+    </fileSet>
+    <fileSet>
+      <directory>../docs</directory>
+      <outputDirectory>../hama-${project.version}/docs</outputDirectory>
+    </fileSet>
+  </fileSets>
+</assembly>
+

Added: incubator/hama/trunk/src/assemble/src.xml
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/assemble/src.xml?rev=1326934&view=auto
==============================================================================
--- incubator/hama/trunk/src/assemble/src.xml (added)
+++ incubator/hama/trunk/src/assemble/src.xml Tue Apr 17 05:31:01 2012
@@ -0,0 +1,69 @@
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+  <id>source</id>
+  <formats>
+    <format>dir</format>
+    <format>tar.gz</format>
+    <format>zip</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  
+  <fileSets>
+    <fileSet>
+      <directory>../</directory>
+      <includes>
+        <include>*.txt</include>
+        <include>*.xml</include>
+        <include>**/*.xml</include>
+        <include>**/src/**</include>
+        <include>**/*.properties</include>
+        <include>**/dev-support/*.sh</include>
+      </includes>
+      <excludes>
+        <exclude>target/**</exclude>
+        <exclude>**/target/**</exclude>
+      </excludes>
+      <outputDirectory>../hama-${project.version}/</outputDirectory>
+    </fileSet>
+    
+    <fileSet>
+      <directory>../bin</directory>
+      <includes>
+        <include>hama</include>
+        <include>*.sh</include>
+      </includes>
+      <outputDirectory>../hama-${project.version}/bin</outputDirectory>
+      <fileMode>755</fileMode>
+    </fileSet>
+    <fileSet>
+      <directory>../conf</directory>
+      <includes>
+        <include>groomservers</include>
+        <include>hama-default.xml</include>
+        <include>hama-env.sh</include>
+        <include>hama-site.xml</include>
+        <include>log4j.properties</include>
+      </includes>
+      <outputDirectory>../hama-${project.version}/conf</outputDirectory>
+      <fileMode>755</fileMode>
+    </fileSet>
+  </fileSets>
+</assembly>
+



Mime
View raw message