hama-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edwardy...@apache.org
Subject svn commit: r1124594 - in /incubator/hama/trunk: CHANGES.txt bin/hama pom.xml
Date Thu, 19 May 2011 08:35:06 GMT
Author: edwardyoon
Date: Thu May 19 08:35:06 2011
New Revision: 1124594

URL: http://svn.apache.org/viewvc?rev=1124594&view=rev
Log:
Refactor 'hama' script and pom.xml

Modified:
    incubator/hama/trunk/CHANGES.txt
    incubator/hama/trunk/bin/hama
    incubator/hama/trunk/pom.xml

Modified: incubator/hama/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/CHANGES.txt?rev=1124594&r1=1124593&r2=1124594&view=diff
==============================================================================
--- incubator/hama/trunk/CHANGES.txt (original)
+++ incubator/hama/trunk/CHANGES.txt Thu May 19 08:35:06 2011
@@ -13,6 +13,7 @@ Release 0.3 - Unreleased
     
   IMPROVEMENTS
 
+    HAMA-394: Refactor 'hama' script and pom.xml (edwardyoon)
     HAMA-388: Add a profile 'forrest' to generate the website (edwardyoon)
     HAMA-392: Make zk session-timeout configurable (edwardyoon)
     HAMA-389: Make the thread pool size user configurable (Thomas Jungblut via edwardyoon)

Modified: incubator/hama/trunk/bin/hama
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/bin/hama?rev=1124594&r1=1124593&r2=1124594&view=diff
==============================================================================
--- incubator/hama/trunk/bin/hama (original)
+++ incubator/hama/trunk/bin/hama Thu May 19 08:35:06 2011
@@ -100,23 +100,17 @@ CLASSPATH="${HAMA_CONF_DIR}"
 CLASSPATH=${CLASSPATH}:$JAVA_HOME/lib/tools.jar
 
 # for developers, add Hama classes to CLASSPATH
-if [ -d "$HAMA_HOME/build/classes" ]; then
-  CLASSPATH=${CLASSPATH}:$HAMA_HOME/build/classes
+if [ -d "$HAMA_HOME/target/classes" ]; then
+  CLASSPATH=${CLASSPATH}:$HAMA_HOME/target/classes
 fi
-if [ -d "$HAMA_HOME/build/webapps" ]; then
-  CLASSPATH=${CLASSPATH}:$HAMA_HOME/build
-fi
-if [ -d "$HAMA_HOME/build/test/classes" ]; then
-  CLASSPATH=${CLASSPATH}:$HAMA_HOME/build/test/classes
+if [ -d "$HAMA_HOME/target/test-classes/classes" ]; then
+  CLASSPATH=${CLASSPATH}:$HAMA_HOME/target/test-classes
 fi
 
 # so that filenames w/ spaces are handled correctly in loops below
 IFS=
 
-# for releases, add core hama jar & webapps to CLASSPATH
-if [ -d "$HAMA_HOME/webapps" ]; then
-  CLASSPATH=${CLASSPATH}:$HAMA_HOME
-fi
+# for releases, add core hama jar to CLASSPATH
 for f in $HAMA_HOME/hama-**.jar; do
   CLASSPATH=${CLASSPATH}:$f;
 done
@@ -126,10 +120,6 @@ for f in $HAMA_HOME/lib/*.jar; do
   CLASSPATH=${CLASSPATH}:$f;
 done
 
-for f in $HAMA_HOME/lib/jsp-2.1/*.jar; do
-  CLASSPATH=${CLASSPATH}:$f;
-done
-
 # add user-specified CLASSPATH last
 if [ "$HAMA_CLASSPATH" != "" ]; then
   CLASSPATH=${CLASSPATH}:${HAMA_CLASSPATH}

Modified: incubator/hama/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/pom.xml?rev=1124594&r1=1124593&r2=1124594&view=diff
==============================================================================
--- incubator/hama/trunk/pom.xml (original)
+++ incubator/hama/trunk/pom.xml Thu May 19 08:35:06 2011
@@ -92,11 +92,6 @@
       <version>1.2</version>
     </dependency>
     <dependency>
-      <groupId>commons-httpclient</groupId>
-      <artifactId>commons-httpclient</artifactId>
-      <version>3.0.1</version>
-    </dependency>
-    <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
       <version>1.0.4</version>
@@ -198,6 +193,27 @@
         <source.dir>src/java</source.dir>
       </properties>
       <build>
+        <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}/lib</outputDirectory>
+                  <overWriteReleases>false</overWriteReleases>
+                  <overWriteSnapshots>true</overWriteSnapshots>
+                  <excludeTransitive>true</excludeTransitive>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
         <finalName>hama-core-${project.version}</finalName>
       </build>
     </profile>



Mime
View raw message