You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hama.apache.org by ed...@apache.org on 2012/02/01 09:57:06 UTC
svn commit: r1239013 - in /incubator/hama/trunk: bin/ conf/ core/ core/bin/
core/conf/ dist/ examples/ src/assemble/ yarn/
Author: edwardyoon
Date: Wed Feb 1 08:57:05 2012
New Revision: 1239013
URL: http://svn.apache.org/viewvc?rev=1239013&view=rev
Log:
Refactor POM files
Added:
incubator/hama/trunk/bin/
- copied from r1238879, incubator/hama/trunk/core/bin/
incubator/hama/trunk/conf/
- copied from r1238879, incubator/hama/trunk/core/conf/
Removed:
incubator/hama/trunk/conf/groomservers.template
incubator/hama/trunk/conf/hama-env.sh.template
incubator/hama/trunk/conf/hama-site.xml.template
incubator/hama/trunk/core/bin/
incubator/hama/trunk/core/conf/
incubator/hama/trunk/src/assemble/yarn.xml
Modified:
incubator/hama/trunk/bin/hama
incubator/hama/trunk/core/pom.xml
incubator/hama/trunk/dist/pom.xml
incubator/hama/trunk/examples/pom.xml
incubator/hama/trunk/src/assemble/core.xml
incubator/hama/trunk/yarn/pom.xml
Modified: incubator/hama/trunk/bin/hama
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/bin/hama?rev=1239013&r1=1238879&r2=1239013&view=diff
==============================================================================
--- incubator/hama/trunk/bin/hama (original)
+++ incubator/hama/trunk/bin/hama Wed Feb 1 08:57:05 2012
@@ -100,11 +100,11 @@ CLASSPATH="${HAMA_CONF_DIR}"
CLASSPATH=${CLASSPATH}:$JAVA_HOME/lib/tools.jar
# for developers, add Hama classes to CLASSPATH
-if [ -d "$HAMA_HOME/target/classes" ]; then
- CLASSPATH=${CLASSPATH}:$HAMA_HOME/target/classes
+if [ -d "$HAMA_HOME/core/target/classes" ]; then
+ CLASSPATH=${CLASSPATH}:$HAMA_HOME/core/target/classes
fi
-if [ -d "$HAMA_HOME/target/test-classes/classes" ]; then
- CLASSPATH=${CLASSPATH}:$HAMA_HOME/target/test-classes
+if [ -d "$HAMA_HOME/core/target/test-classes/classes" ]; then
+ CLASSPATH=${CLASSPATH}:$HAMA_HOME/core/target/test-classes
fi
# so that filenames w/ spaces are handled correctly in loops below
Modified: incubator/hama/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/core/pom.xml?rev=1239013&r1=1239012&r2=1239013&view=diff
==============================================================================
--- incubator/hama/trunk/core/pom.xml (original)
+++ incubator/hama/trunk/core/pom.xml Wed Feb 1 08:57:05 2012
@@ -123,10 +123,11 @@
<goal>copy-dependencies</goal>
</goals>
<configuration>
- <outputDirectory>${basedir}/target/lib</outputDirectory>
+ <outputDirectory>${project.parent.basedir}/lib</outputDirectory>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
<excludeTransitive>true</excludeTransitive>
+ <fileMode>755</fileMode>
</configuration>
</execution>
</executions>
Modified: incubator/hama/trunk/dist/pom.xml
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/dist/pom.xml?rev=1239013&r1=1239012&r2=1239013&view=diff
==============================================================================
--- incubator/hama/trunk/dist/pom.xml (original)
+++ incubator/hama/trunk/dist/pom.xml Wed Feb 1 08:57:05 2012
@@ -10,11 +10,11 @@
<version>0.4.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>hama</artifactId>
+ <artifactId>hama-dist</artifactId>
<packaging>pom</packaging>
- <name>distribution</name>
+ <name>dist</name>
<!-- NOTE: These dependency declarations are only required to sort this project to the
end of the line in the multimodule build.
@@ -39,25 +39,11 @@
<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>
+ <appendAssemblyId>false</appendAssemblyId>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/hama/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/examples/pom.xml?rev=1239013&r1=1239012&r2=1239013&view=diff
==============================================================================
--- incubator/hama/trunk/examples/pom.xml (original)
+++ incubator/hama/trunk/examples/pom.xml Wed Feb 1 08:57:05 2012
@@ -46,26 +46,20 @@
<build>
<finalName>hama-examples-${project.version}</finalName>
<plugins>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>1.4</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
- <mainClass>org.apache.hama.examples.ExampleDriver</mainClass>
- </transformer>
- </transformers>
- </configuration>
- </execution>
- </executions>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ <mainClass>org.apache.hama.examples.ExampleDriver</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
</plugin>
+
</plugins>
</build>
</project>
Modified: incubator/hama/trunk/src/assemble/core.xml
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/assemble/core.xml?rev=1239013&r1=1239012&r2=1239013&view=diff
==============================================================================
--- incubator/hama/trunk/src/assemble/core.xml (original)
+++ incubator/hama/trunk/src/assemble/core.xml Wed Feb 1 08:57:05 2012
@@ -19,6 +19,8 @@
<include>org.apache.hama:hama-core</include>
<include>org.apache.hama:hama-examples</include>
<include>org.apache.hama:hama-graph</include>
+ <include>org.apache.hama:hama-yarn</include>
+ <include>org.apache.hama:hama-dist</include>
</includes>
<sources>
<outputDirectory>../hama-${project.version}/${module.name}</outputDirectory>
@@ -32,11 +34,12 @@
<includes>
<include>*.txt</include>
<include>*.xml</include>
+ <include>src/**</include>
</includes>
<outputDirectory>../hama-${project.version}/</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/lib</directory>
+ <directory>../lib</directory>
<includes>
<include>*.jar</include>
</includes>
@@ -44,7 +47,7 @@
<outputDirectory>../hama-${project.version}/lib</outputDirectory>
</fileSet>
<fileSet>
- <directory>bin</directory>
+ <directory>../bin</directory>
<includes>
<include>hama</include>
<include>*.sh</include>
@@ -53,7 +56,7 @@
<fileMode>755</fileMode>
</fileSet>
<fileSet>
- <directory>conf</directory>
+ <directory>../conf</directory>
<includes>
<include>groomservers</include>
<include>hama-default.xml</include>
Modified: incubator/hama/trunk/yarn/pom.xml
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/yarn/pom.xml?rev=1239013&r1=1239012&r2=1239013&view=diff
==============================================================================
--- incubator/hama/trunk/yarn/pom.xml (original)
+++ incubator/hama/trunk/yarn/pom.xml Wed Feb 1 08:57:05 2012
@@ -65,7 +65,6 @@
<version>1.5.3</version>
</dependency>
-
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
@@ -102,25 +101,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <phase>package</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/target/lib</outputDirectory>
- <overWriteReleases>false</overWriteReleases>
- <overWriteSnapshots>true</overWriteSnapshots>
- <excludeTransitive>true</excludeTransitive>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>1.4</version>
<executions>
@@ -129,10 +109,18 @@
<goals>
<goal>shade</goal>
</goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>org.apache.hama:*</include>
+ </includes>
+ </artifactSet>
+ </configuration>
</execution>
</executions>
</plugin>
</plugins>
<finalName>hama-yarn-${project.version}</finalName>
</build>
+
</project>