incubator-hama-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edwardy...@apache.org
Subject svn commit: r1238137 - in /incubator/hama/trunk: ./ core/ core/src/main/java/org/apache/hama/http/ dist/ examples/ graph/ src/assemble/ yarn/
Date Tue, 31 Jan 2012 02:24:41 GMT
Author: edwardyoon
Date: Tue Jan 31 02:24:41 2012
New Revision: 1238137

URL: http://svn.apache.org/viewvc?rev=1238137&view=rev
Log:
Add dist module to generate release tarball

Added:
    incubator/hama/trunk/dist/   (with props)
    incubator/hama/trunk/dist/pom.xml
    incubator/hama/trunk/src/assemble/
    incubator/hama/trunk/src/assemble/core.xml
    incubator/hama/trunk/src/assemble/yarn.xml
Modified:
    incubator/hama/trunk/CHANGES.txt
    incubator/hama/trunk/core/pom.xml
    incubator/hama/trunk/core/src/main/java/org/apache/hama/http/HttpServer.java
    incubator/hama/trunk/examples/pom.xml
    incubator/hama/trunk/graph/pom.xml
    incubator/hama/trunk/pom.xml
    incubator/hama/trunk/yarn/pom.xml

Modified: incubator/hama/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/CHANGES.txt?rev=1238137&r1=1238136&r2=1238137&view=diff
==============================================================================
--- incubator/hama/trunk/CHANGES.txt (original)
+++ incubator/hama/trunk/CHANGES.txt Tue Jan 31 02:24:41 2012
@@ -4,6 +4,7 @@ Release 0.4 - Unreleased
 
   NEW FEATURES
    
+   HAMA-491: Add dist module to generate release tarball (edwardyoon)
    HAMA-451: Show Supersteps in waitForCompletion in YARN (tjungblut) 
    HAMA-479: Add Counters to Hama Jobs (edwardyoon) 
    HAMA-454: Add Zookeeper as synchronization service to YARN (tjungblut)

Modified: incubator/hama/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/core/pom.xml?rev=1238137&r1=1238136&r2=1238137&view=diff
==============================================================================
--- incubator/hama/trunk/core/pom.xml (original)
+++ incubator/hama/trunk/core/pom.xml Tue Jan 31 02:24:41 2012
@@ -27,7 +27,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.hama</groupId>
   <artifactId>hama-core</artifactId>
-  <name>Apache Hama Core</name>
+  <name>core</name>
   <version>0.4.0-incubating-SNAPSHOT</version>
   <packaging>jar</packaging>
   <scm>

Modified: incubator/hama/trunk/core/src/main/java/org/apache/hama/http/HttpServer.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/core/src/main/java/org/apache/hama/http/HttpServer.java?rev=1238137&r1=1238136&r2=1238137&view=diff
==============================================================================
--- incubator/hama/trunk/core/src/main/java/org/apache/hama/http/HttpServer.java (original)
+++ incubator/hama/trunk/core/src/main/java/org/apache/hama/http/HttpServer.java Tue Jan 31
02:24:41 2012
@@ -286,7 +286,7 @@ public class HttpServer {
     // if (url == null)
     // throw new IOException("webapps not found in CLASSPATH");
     // return url.toString();
-    return "src/main/webapp";
+    return "core/src/main/webapp";
   }
 
   /**

Propchange: incubator/hama/trunk/dist/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jan 31 02:24:41 2012
@@ -0,0 +1 @@
+target

Added: incubator/hama/trunk/dist/pom.xml
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/dist/pom.xml?rev=1238137&view=auto
==============================================================================
--- incubator/hama/trunk/dist/pom.xml (added)
+++ incubator/hama/trunk/dist/pom.xml Tue Jan 31 02:24:41 2012
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  
+  <parent>
+    <groupId>org.apache.hama</groupId>
+    <artifactId>hama-parent</artifactId>
+    <version>0.4.0-incubating-SNAPSHOT</version>
+  </parent>
+  
+  <artifactId>hama</artifactId>
+
+  <packaging>pom</packaging>
+
+  <name>distribution</name>
+  
+  <!-- NOTE: These dependency declarations are only required to sort this project to the

+       end of the line in the multimodule build. 
+       
+       Since we only include the child1 module in our assembly, we only need to ensure this
+       distribution project builds AFTER that one...
+  -->
+
+  <build>
+    <plugins>
+    <plugin>
+      <artifactId>maven-assembly-plugin</artifactId>
+      <executions>
+        <execution>
+          <id>core-assembly</id>
+          <phase>package</phase>
+          <goals>
+            <goal>single</goal>
+          </goals>
+          <configuration>
+            <descriptors>
+              <descriptor>src/assemble/core.xml</descriptor>
+            </descriptors>
+            <tarLongFileMode>gnu</tarLongFileMode>
+            <appendAssemblyId>true</appendAssemblyId>
+          </configuration>
+        </execution>
+        <execution>
+          <id>yarn-assembly</id>
+          <phase>package</phase>
+          <goals>
+            <goal>single</goal>
+          </goals>
+          <configuration>
+            <descriptors>
+              <descriptor>src/assemble/yarn.xml</descriptor>
+            </descriptors>
+            <tarLongFileMode>gnu</tarLongFileMode>
+            <appendAssemblyId>true</appendAssemblyId>
+          </configuration>
+        </execution>
+      </executions>
+    </plugin>
+    </plugins>
+  </build>
+</project>
\ No newline at end of file

Modified: incubator/hama/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/examples/pom.xml?rev=1238137&r1=1238136&r2=1238137&view=diff
==============================================================================
--- incubator/hama/trunk/examples/pom.xml (original)
+++ incubator/hama/trunk/examples/pom.xml Tue Jan 31 02:24:41 2012
@@ -27,7 +27,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.hama</groupId>
   <artifactId>hama-examples</artifactId>
-  <name>Apache Hama Examples</name>
+  <name>examples</name>
   <version>0.4.0-incubating-SNAPSHOT</version>
   <packaging>jar</packaging>
 

Modified: incubator/hama/trunk/graph/pom.xml
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/graph/pom.xml?rev=1238137&r1=1238136&r2=1238137&view=diff
==============================================================================
--- incubator/hama/trunk/graph/pom.xml (original)
+++ incubator/hama/trunk/graph/pom.xml Tue Jan 31 02:24:41 2012
@@ -27,7 +27,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.hama</groupId>
   <artifactId>hama-graph</artifactId>
-  <name>Apache Hama Graph Package</name>
+  <name>graph</name>
   <version>0.4.0-incubating-SNAPSHOT</version>
   <packaging>jar</packaging>
 

Modified: incubator/hama/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/pom.xml?rev=1238137&r1=1238136&r2=1238137&view=diff
==============================================================================
--- incubator/hama/trunk/pom.xml (original)
+++ incubator/hama/trunk/pom.xml Tue Jan 31 02:24:41 2012
@@ -188,6 +188,7 @@
     <module>graph</module>
     <module>examples</module>
     <module>yarn</module>
+    <module>dist</module>
   </modules>
 
   <build>
@@ -228,6 +229,12 @@
         <artifactId>maven-antrun-plugin</artifactId>
         <version>1.6</version>
       </plugin>
+      
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2.2</version>
+      </plugin>
+        
     </plugins>
   </build>
   

Added: incubator/hama/trunk/src/assemble/core.xml
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/assemble/core.xml?rev=1238137&view=auto
==============================================================================
--- incubator/hama/trunk/src/assemble/core.xml (added)
+++ incubator/hama/trunk/src/assemble/core.xml Tue Jan 31 02:24:41 2012
@@ -0,0 +1,76 @@
+<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>core</id>
+  <formats>
+    <format>dir</format>
+    <format>tar.gz</format>
+    <format>zip</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <moduleSets>
+    <moduleSet>
+    
+      <!-- Enable access to all projects in the current multimodule build! -->
+      <useAllReactorProjects>true</useAllReactorProjects>
+      
+      <!-- Now, select which projects to include in this module-set. -->
+      <includes>
+        <include>org.apache.hama:hama-core</include>
+        <include>org.apache.hama:hama-examples</include>
+        <include>org.apache.hama:hama-graph</include>
+      </includes>
+      <sources>
+        <outputDirectory>../${module.name}</outputDirectory>
+        <includes>
+          <include>*.xml</include>
+          <include>src/**</include>
+        </includes>
+        <fileSets>
+          <fileSet>
+            <directory>../</directory>
+            <includes>
+              <include>*.txt</include>
+              <include>*.xml</include>
+            </includes>
+            <outputDirectory>../</outputDirectory>
+          </fileSet>
+          <fileSet>
+            <directory>target/lib</directory>
+            <includes>
+              <include>*.jar</include>
+            </includes>
+            <fileMode>755</fileMode>
+            <outputDirectory>../lib</outputDirectory>
+          </fileSet>
+          <fileSet>
+            <directory>bin</directory>
+            <includes>
+              <include>hama</include>
+              <include>*.sh</include>
+            </includes>
+            <outputDirectory>../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>../conf</outputDirectory>
+            <fileMode>755</fileMode>
+          </fileSet>
+        </fileSets>
+      </sources>
+      <binaries>
+        <fileMode>755</fileMode>
+        <outputDirectory>../</outputDirectory>
+        <unpack>false</unpack>
+      </binaries>
+    </moduleSet>
+  </moduleSets>
+</assembly>

Added: incubator/hama/trunk/src/assemble/yarn.xml
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/assemble/yarn.xml?rev=1238137&view=auto
==============================================================================
--- incubator/hama/trunk/src/assemble/yarn.xml (added)
+++ incubator/hama/trunk/src/assemble/yarn.xml Tue Jan 31 02:24:41 2012
@@ -0,0 +1,53 @@
+<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>yarn</id>
+  <formats>
+    <format>dir</format>
+    <format>tar.gz</format>
+    <format>zip</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <moduleSets>
+    <moduleSet>
+    
+      <!-- Enable access to all projects in the current multimodule build! -->
+      <useAllReactorProjects>true</useAllReactorProjects>
+      
+      <!-- Now, select which projects to include in this module-set. -->
+      <includes>
+        <include>org.apache.hama:hama-yarn</include>
+      </includes>
+      <sources>
+        <outputDirectory>../${module.name}</outputDirectory>
+        <includes>
+          <include>*.xml</include>
+          <include>src/**</include>
+        </includes>
+        <fileSets>
+          <fileSet>
+            <directory>../</directory>
+            <includes>
+              <include>*.txt</include>
+              <include>*.xml</include>
+            </includes>
+            <outputDirectory>../</outputDirectory>
+          </fileSet>
+          <fileSet>
+            <directory>target/lib</directory>
+            <includes>
+              <include>*.jar</include>
+            </includes>
+            <fileMode>755</fileMode>
+            <outputDirectory>../lib</outputDirectory>
+          </fileSet>
+        </fileSets>
+      </sources>
+      <binaries>
+        <fileMode>755</fileMode>
+        <outputDirectory>../</outputDirectory>
+        <unpack>false</unpack>
+      </binaries>
+    </moduleSet>
+  </moduleSets>
+</assembly>

Modified: incubator/hama/trunk/yarn/pom.xml
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/yarn/pom.xml?rev=1238137&r1=1238136&r2=1238137&view=diff
==============================================================================
--- incubator/hama/trunk/yarn/pom.xml (original)
+++ incubator/hama/trunk/yarn/pom.xml Tue Jan 31 02:24:41 2012
@@ -26,7 +26,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.hama</groupId>
   <artifactId>hama-yarn</artifactId>
-  <name>Apache Hama YARN</name>
+  <name>yarn</name>
   <version>0.4.0-incubating-SNAPSHOT</version>
   <packaging>jar</packaging>
   <scm>



Mime
View raw message