incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ey...@apache.org
Subject svn commit: r1183205 - in /incubator/ambari/trunk: ./ client/bin/ client/conf/ client/src/main/java/org/apache/ambari/common/util/ client/src/main/resources/ client/src/packages/tarball/ controller/ controller/conf/ controller/src/main/resources/ contr...
Date Fri, 14 Oct 2011 02:25:25 GMT
Author: eyang
Date: Fri Oct 14 02:25:24 2011
New Revision: 1183205

URL: http://svn.apache.org/viewvc?rev=1183205&view=rev
Log:
AMBARI-71. Fix broken packaging and startup scripts. (Eric Yang)

Added:
    incubator/ambari/trunk/client/conf/
    incubator/ambari/trunk/client/conf/ambari-env.sh
    incubator/ambari/trunk/client/conf/log4j.properties
      - copied, changed from r1183181, incubator/ambari/trunk/client/src/main/resources/log4j.properties
    incubator/ambari/trunk/client/src/packages/tarball/binary.xml
    incubator/ambari/trunk/client/src/packages/tarball/source.xml
    incubator/ambari/trunk/controller/conf/log4j.properties
      - copied, changed from r1183181, incubator/ambari/trunk/controller/src/main/resources/log4j.properties
    incubator/ambari/trunk/controller/src/packages/tarball/binary.xml   (with props)
    incubator/ambari/trunk/controller/src/packages/tarball/source.xml   (with props)
    incubator/ambari/trunk/src/packages/tarball/binary.xml
    incubator/ambari/trunk/src/packages/tarball/source.xml
Removed:
    incubator/ambari/trunk/client/src/main/resources/log4j.properties
    incubator/ambari/trunk/controller/src/main/resources/log4j.properties
    incubator/ambari/trunk/src/main/resources/log4j.properties
Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/client/bin/ambari
    incubator/ambari/trunk/client/bin/ambari-config.sh
    incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/util/PidFile.java
    incubator/ambari/trunk/client/src/packages/tarball/all.xml
    incubator/ambari/trunk/controller/pom.xml
    incubator/ambari/trunk/pom.xml

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1183205&r1=1183204&r2=1183205&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Fri Oct 14 02:25:24 2011
@@ -2,6 +2,8 @@ Ambari Change log
 
 Release 0.1.0 - unreleased
 
+  AMBARI-71. Fix broken packaging and startup scripts. (Eric Yang)
+
   AMBARI-70. Implements the installation/configuration of gateway role (ddas)
 
   AMBARI-66. Implemented compatible package install/uninstall action for 

Modified: incubator/ambari/trunk/client/bin/ambari
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/client/bin/ambari?rev=1183205&r1=1183204&r2=1183205&view=diff
==============================================================================
--- incubator/ambari/trunk/client/bin/ambari (original)
+++ incubator/ambari/trunk/client/bin/ambari Fri Oct 14 02:25:24 2011
@@ -33,7 +33,6 @@ bin=`cd "$bin"; pwd`
 if [ $# = 0 ]; then
   echo "Usage: $0 [--config confdir] COMMAND"
   echo "where COMMAND is one of:"
-  echo "  agent         run Ambari Agent"
   echo "  controller    run Ambari Controller"
   echo "  client        run Ambari client"
   echo "  version       print the version"
@@ -80,7 +79,7 @@ elif [ "$COMMAND" = "controller" ]; then
   BACKGROUND="true"
 elif [ "$COMMAND" = "client" ]; then
   APP='client'
-  CLASS='org.apache.ambari.client.Client'
+  CLASS='org.apache.ambari.client.AmbariClient'
   PID="client"
 elif [ "$COMMAND" = "version" ]; then
   echo `cat ${AMBARI_HOME}/bin/VERSION`

Modified: incubator/ambari/trunk/client/bin/ambari-config.sh
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/client/bin/ambari-config.sh?rev=1183205&r1=1183204&r2=1183205&view=diff
==============================================================================
--- incubator/ambari/trunk/client/bin/ambari-config.sh (original)
+++ incubator/ambari/trunk/client/bin/ambari-config.sh Fri Oct 14 02:25:24 2011
@@ -53,27 +53,30 @@ fi
 export AMBARI_HOME=`dirname "$this"`/..
 
 if [ -z ${AMBARI_LOG_DIR} ]; then
-    export AMBARI_LOG_DIR="${AMBARI_HOME}/logs"
+    export AMBARI_LOG_DIR="${AMBARI_HOME}/var/log"
 fi
 
 if [ -z ${AMBARI_PID_DIR} ]; then
     export AMBARI_PID_DIR="${AMBARI_HOME}/var/run"
 fi
 
-AMBARI_VERSION=`cat ${AMBARI_HOME}/VERSION`
+AMBARI_VERSION=`cat ${AMBARI_HOME}/share/ambari/VERSION`
 
 # Allow alternate conf dir location.
 if [ -z "${AMBARI_CONF_DIR}" ]; then
-    AMBARI_CONF_DIR="${AMBARI_CONF_DIR:-$AMBARI_HOME/conf}"
-    export AMBARI_CONF_DIR=${AMBARI_HOME}/conf
+    if [ -e "${AMBARI_HOME}/conf" ]; then
+      AMBARI_CONF_DIR="$AMBARI_HOME/conf"
+    fi
+    if [ -e "${AMBARI_HOME}/etc/ambari" ]; then
+      AMBARI_CONF_DIR="$AMBARI_HOME/etc/ambari"
+    fi
 fi
 
 if [ -f "${AMBARI_CONF_DIR}/ambari-env.sh" ]; then
   . "${AMBARI_CONF_DIR}/ambari-env.sh"
 fi
 
-COMMON=`ls ${AMBARI_HOME}/lib/*.jar`
-export COMMON=`echo ${COMMON} | sed 'y/ /:/'`
+COMMON="${AMBARI_HOME}/share/ambari/*:${AMBARI_HOME}/share/ambari/lib/*"
 
 export AMBARI_CORE=${AMBARI_HOME}/ambari-core-${AMBARI_VERSION}.jar
 export AMBARI_AGENT=${AMBARI_HOME}/ambari-agent-${AMBARI_VERSION}.jar

Added: incubator/ambari/trunk/client/conf/ambari-env.sh
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/client/conf/ambari-env.sh?rev=1183205&view=auto
==============================================================================
--- incubator/ambari/trunk/client/conf/ambari-env.sh (added)
+++ incubator/ambari/trunk/client/conf/ambari-env.sh Fri Oct 14 02:25:24 2011
@@ -0,0 +1 @@
+export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home

Copied: incubator/ambari/trunk/client/conf/log4j.properties (from r1183181, incubator/ambari/trunk/client/src/main/resources/log4j.properties)
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/client/conf/log4j.properties?p2=incubator/ambari/trunk/client/conf/log4j.properties&p1=incubator/ambari/trunk/client/src/main/resources/log4j.properties&r1=1183181&r2=1183205&rev=1183205&view=diff
==============================================================================
--- incubator/ambari/trunk/client/src/main/resources/log4j.properties (original)
+++ incubator/ambari/trunk/client/conf/log4j.properties Fri Oct 14 02:25:24 2011
@@ -15,7 +15,7 @@
 
 log4j.rootLogger=INFO, R
 log4j.appender.R=org.apache.log4j.RollingFileAppender
-log4j.appender.R.File=${AMBARI_LOG_DIR}/hms-client.log
+log4j.appender.R.File=${AMBARI_LOG_DIR}/ambari-client.log
 log4j.appender.R.MaxFileSize=10MB
 log4j.appender.R.MaxBackupIndex=10
 log4j.appender.R.layout=org.apache.log4j.PatternLayout

Modified: incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/util/PidFile.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/util/PidFile.java?rev=1183205&r1=1183204&r2=1183205&view=diff
==============================================================================
--- incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/util/PidFile.java
(original)
+++ incubator/ambari/trunk/client/src/main/java/org/apache/ambari/common/util/PidFile.java
Fri Oct 14 02:25:24 2011
@@ -48,9 +48,9 @@ public class PidFile extends Thread {
     String pidLong = ManagementFactory.getRuntimeMXBean().getName();
     String[] items = pidLong.split("@");
     String pid = items[0];
-    String chukwaPath = System.getProperty("HMS_HOME");
+    String chukwaPath = System.getProperty("AMBARI_HOME");
     StringBuffer pidFilesb = new StringBuffer();
-    String pidDir = System.getenv("HMS_PID_DIR");
+    String pidDir = System.getenv("AMBARI_PID_DIR");
     if (pidDir == null) {
       pidDir = chukwaPath + File.separator + "var" + File.separator + "run";
     }
@@ -82,9 +82,9 @@ public class PidFile extends Thread {
   }
 
   public void clean() {
-    String chukwaPath = System.getenv("HMS_HOME");
+    String chukwaPath = System.getenv("AMBARI_HOME");
     StringBuffer pidFilesb = new StringBuffer();
-    String pidDir = System.getenv("HMS_PID_DIR");
+    String pidDir = System.getenv("AMBARI_PID_DIR");
     if (pidDir == null) {
       pidDir = chukwaPath + File.separator + "var" + File.separator + "run";
     }

Modified: incubator/ambari/trunk/client/src/packages/tarball/all.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/client/src/packages/tarball/all.xml?rev=1183205&r1=1183204&r2=1183205&view=diff
==============================================================================
--- incubator/ambari/trunk/client/src/packages/tarball/all.xml (original)
+++ incubator/ambari/trunk/client/src/packages/tarball/all.xml Fri Oct 14 02:25:24 2011
@@ -44,16 +44,22 @@
       <directory>conf</directory>
     </fileSet>
     <fileSet>
-      <directory>../bin</directory>
+      <directory>bin</directory>
       <outputDirectory>bin</outputDirectory>
       <fileMode>755</fileMode>
     </fileSet>
     <fileSet>
       <directory>target</directory>
-      <outputDirectory>/</outputDirectory>
+      <outputDirectory>share/ambari</outputDirectory>
       <includes>
           <include>${artifactId}-${project.version}.jar</include>
           <include>${artifactId}-${project.version}-tests.jar</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>target</directory>
+      <outputDirectory>share/ambari</outputDirectory>
+      <includes>
           <include>VERSION</include>
       </includes>
     </fileSet>
@@ -72,7 +78,7 @@
   </fileSets>
   <dependencySets>
     <dependencySet>
-      <outputDirectory>/lib</outputDirectory>
+      <outputDirectory>share/ambari/lib</outputDirectory>
       <unpack>false</unpack>
       <scope>runtime</scope>
     </dependencySet>

Added: incubator/ambari/trunk/client/src/packages/tarball/binary.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/client/src/packages/tarball/binary.xml?rev=1183205&view=auto
==============================================================================
--- incubator/ambari/trunk/client/src/packages/tarball/binary.xml (added)
+++ incubator/ambari/trunk/client/src/packages/tarball/binary.xml Fri Oct 14 02:25:24 2011
@@ -0,0 +1,80 @@
+<?xml version="1.0"?>
+
+<!--
+   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.1"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1
http://maven.apache.org/xsd/assembly-1.1.1.xsd">
+  <!--This 'all' id is not appended to the produced bundle because we do this:
+    http://maven.apache.org/plugins/maven-assembly-plugin/faq.html#required-classifiers
+  -->
+  <formats>
+    <format>tar.gz</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <outputDirectory>share/ambari</outputDirectory>
+      <includes>
+        <include>${basedir}/*.txt</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>conf</directory>
+      <outputDirectory>etc/ambari</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>bin</directory>
+      <outputDirectory>bin</outputDirectory>
+      <fileMode>755</fileMode>
+    </fileSet>
+    <fileSet>
+      <directory>target</directory>
+      <outputDirectory>share/ambari</outputDirectory>
+      <includes>
+          <include>${artifactId}-${project.version}.jar</include>
+          <include>${artifactId}-${project.version}-tests.jar</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>target</directory>
+      <outputDirectory>share/ambari</outputDirectory>
+      <includes>
+          <include>VERSION</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>target/site</directory>
+      <outputDirectory>docs</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>src/packages</directory>
+      <outputDirectory>sbin</outputDirectory>
+      <fileMode>755</fileMode>
+      <includes>
+          <include>update-hms-${artifactId}-env.sh</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>share/ambari/lib</outputDirectory>
+      <unpack>false</unpack>
+      <scope>runtime</scope>
+    </dependencySet>
+  </dependencySets>
+</assembly>

Added: incubator/ambari/trunk/client/src/packages/tarball/source.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/client/src/packages/tarball/source.xml?rev=1183205&view=auto
==============================================================================
--- incubator/ambari/trunk/client/src/packages/tarball/source.xml (added)
+++ incubator/ambari/trunk/client/src/packages/tarball/source.xml Fri Oct 14 02:25:24 2011
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+
+<!--
+   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.1"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1
http://maven.apache.org/xsd/assembly-1.1.1.xsd">
+  <!--This 'all' id is not appended to the produced bundle because we do this:
+    http://maven.apache.org/plugins/maven-assembly-plugin/faq.html#required-classifiers
+  -->
+  <formats>
+    <format>tar.gz</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <includes>
+        <include>${basedir}/*.txt</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <includes>
+        <include>pom.xml</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>src</directory>
+    </fileSet>
+    <fileSet>
+      <directory>conf</directory>
+    </fileSet>
+    <fileSet>
+      <directory>bin</directory>
+      <outputDirectory>bin</outputDirectory>
+      <fileMode>755</fileMode>
+    </fileSet>
+    <fileSet>
+      <directory>src/packages</directory>
+      <outputDirectory>sbin</outputDirectory>
+      <fileMode>755</fileMode>
+      <includes>
+          <include>update-hms-${artifactId}-env.sh</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+</assembly>

Copied: incubator/ambari/trunk/controller/conf/log4j.properties (from r1183181, incubator/ambari/trunk/controller/src/main/resources/log4j.properties)
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/controller/conf/log4j.properties?p2=incubator/ambari/trunk/controller/conf/log4j.properties&p1=incubator/ambari/trunk/controller/src/main/resources/log4j.properties&r1=1183181&r2=1183205&rev=1183205&view=diff
==============================================================================
--- incubator/ambari/trunk/controller/src/main/resources/log4j.properties (original)
+++ incubator/ambari/trunk/controller/conf/log4j.properties Fri Oct 14 02:25:24 2011
@@ -15,7 +15,7 @@
 
 log4j.rootLogger=INFO, R
 log4j.appender.R=org.apache.log4j.RollingFileAppender
-log4j.appender.R.File=${HMS_LOG_DIR}/hms-controller.log
+log4j.appender.R.File=${AMBARI_LOG_DIR}/ambari-controller.log
 log4j.appender.R.MaxFileSize=10MB
 log4j.appender.R.MaxBackupIndex=10
 log4j.appender.R.layout=org.apache.log4j.PatternLayout

Modified: incubator/ambari/trunk/controller/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/controller/pom.xml?rev=1183205&r1=1183204&r2=1183205&view=diff
==============================================================================
--- incubator/ambari/trunk/controller/pom.xml (original)
+++ incubator/ambari/trunk/controller/pom.xml Fri Oct 14 02:25:24 2011
@@ -115,9 +115,6 @@
               </execution>
             </executions>
           </plugin>
-          <plugin>
-            <artifactId>maven-assembly-plugin</artifactId>
-          </plugin>
       </plugins>
     </build>
     <pluginRepositories>

Added: incubator/ambari/trunk/controller/src/packages/tarball/binary.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/controller/src/packages/tarball/binary.xml?rev=1183205&view=auto
==============================================================================
--- incubator/ambari/trunk/controller/src/packages/tarball/binary.xml (added)
+++ incubator/ambari/trunk/controller/src/packages/tarball/binary.xml Fri Oct 14 02:25:24
2011
@@ -0,0 +1,86 @@
+<?xml version="1.0"?>
+
+<!--
+   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.1"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1
http://maven.apache.org/xsd/assembly-1.1.1.xsd">
+  <!--This 'all' id is not appended to the produced bundle because we do this:
+    http://maven.apache.org/plugins/maven-assembly-plugin/faq.html#required-classifiers
+  -->
+  <formats>
+    <format>tar.gz</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <outputDirectory>share/ambari</outputDirectory>
+      <includes>
+        <include>${basedir}/*.txt</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>src/main/webapps</directory>
+      <outputDirectory>webapps</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>src/main/resources</directory>
+      <outputDirectory>var/run</outputDirectory>
+      <directoryMode>0755</directoryMode>
+      <excludes>
+        <exclude>*</exclude>
+      </excludes>
+    </fileSet>
+    <fileSet>
+      <directory>conf</directory>
+      <outputDirectory>etc/ambari</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>../client/bin</directory>
+      <outputDirectory>bin</outputDirectory>
+      <fileMode>755</fileMode>
+    </fileSet>
+    <fileSet>
+      <directory>target</directory>
+      <outputDirectory>share/ambari</outputDirectory>
+      <includes>
+          <include>${artifactId}-${project.version}.jar</include>
+          <include>${artifactId}-${project.version}-tests.jar</include>
+          <include>VERSION</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>target/site</directory>
+      <outputDirectory>docs</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>src/packages</directory>
+      <outputDirectory>sbin</outputDirectory>
+      <fileMode>755</fileMode>
+      <includes>
+          <include>update-hms-${artifactId}-env.sh</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>share/ambari</outputDirectory>
+      <unpack>false</unpack>
+      <scope>runtime</scope>
+    </dependencySet>
+  </dependencySets>
+</assembly>

Propchange: incubator/ambari/trunk/controller/src/packages/tarball/binary.xml
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/ambari/trunk/controller/src/packages/tarball/source.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/controller/src/packages/tarball/source.xml?rev=1183205&view=auto
==============================================================================
--- incubator/ambari/trunk/controller/src/packages/tarball/source.xml (added)
+++ incubator/ambari/trunk/controller/src/packages/tarball/source.xml Fri Oct 14 02:25:24
2011
@@ -0,0 +1,92 @@
+<?xml version="1.0"?>
+
+<!--
+   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.1"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1
http://maven.apache.org/xsd/assembly-1.1.1.xsd">
+  <!--This 'all' id is not appended to the produced bundle because we do this:
+    http://maven.apache.org/plugins/maven-assembly-plugin/faq.html#required-classifiers
+  -->
+  <formats>
+    <format>tar.gz</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <includes>
+        <include>${basedir}/*.txt</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <includes>
+        <include>pom.xml</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>src</directory>
+    </fileSet>
+    <fileSet>
+      <directory>src/main/webapps</directory>
+      <outputDirectory>webapps</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>src/main/resources</directory>
+      <outputDirectory>var/run</outputDirectory>
+      <directoryMode>0755</directoryMode>
+      <excludes>
+        <exclude>*</exclude>
+      </excludes>
+    </fileSet>
+    <fileSet>
+      <directory>conf</directory>
+    </fileSet>
+    <fileSet>
+      <directory>../client/bin</directory>
+      <outputDirectory>bin</outputDirectory>
+      <fileMode>755</fileMode>
+    </fileSet>
+    <fileSet>
+      <directory>target</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+          <include>${artifactId}-${project.version}.jar</include>
+          <include>${artifactId}-${project.version}-tests.jar</include>
+          <include>VERSION</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>target/site</directory>
+      <outputDirectory>docs</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>src/packages</directory>
+      <outputDirectory>sbin</outputDirectory>
+      <fileMode>755</fileMode>
+      <includes>
+          <include>update-hms-${artifactId}-env.sh</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>/lib</outputDirectory>
+      <unpack>false</unpack>
+      <scope>runtime</scope>
+    </dependencySet>
+  </dependencySets>
+</assembly>

Propchange: incubator/ambari/trunk/controller/src/packages/tarball/source.xml
------------------------------------------------------------------------------
    svn:executable = *

Modified: incubator/ambari/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/pom.xml?rev=1183205&r1=1183204&r2=1183205&view=diff
==============================================================================
--- incubator/ambari/trunk/pom.xml (original)
+++ incubator/ambari/trunk/pom.xml Fri Oct 14 02:25:24 2011
@@ -193,6 +193,29 @@
           <filtering>true</filtering>
         </resource>
       </resources>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-antrun-plugin</artifactId>
+          <version>1.4</version>
+          <executions>
+            <execution>
+              <phase>validate</phase>
+              <configuration>
+                <tasks name="setup">
+                  <mkdir dir="${basedir}/target"/>
+                  <echo message="${project.version}" file="${basedir}/target/VERSION"/>
+                  <mkdir dir="${basedir}/target/clover"/>
+                  <chmod dir="${basedir}/target/clover" perm="a+w" />
+                </tasks>
+              </configuration>
+              <goals>
+                <goal>run</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
       <pluginManagement>
         <plugins>
           <plugin>
@@ -268,45 +291,6 @@
             </configuration>
           </plugin>
           <plugin>
-            <artifactId>maven-assembly-plugin</artifactId>
-            <configuration>
-              <tarLongFileMode>gnu</tarLongFileMode>
-              <descriptors>
-                <descriptor>src/packages/tarball/all.xml</descriptor>
-              </descriptors>
-            </configuration>
-            <executions>
-              <execution>
-                <id>build-tarball</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>single</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <version>1.4</version>
-            <executions>
-              <execution>
-                <phase>validate</phase>
-                <configuration>
-                  <tasks name="setup">
-                    <mkdir dir="${basedir}/target"/>
-                    <echo message="0.1.0" file="${basedir}/target/VERSION"/>
-                    <mkdir dir="${basedir}/target/clover"/>
-                    <chmod dir="${basedir}/target/clover" perm="a+w" />
-                  </tasks>
-                </configuration>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-site-plugin</artifactId>
             <version>3.0</version>
@@ -556,6 +540,54 @@
         <profile>
             <id>src</id>
             <build>
+              <plugins>
+                <plugin>
+                  <artifactId>maven-assembly-plugin</artifactId>
+                  <configuration>
+                    <tarLongFileMode>gnu</tarLongFileMode>
+                    <descriptors>
+                      <descriptor>src/packages/tarball/source.xml</descriptor>
+                    </descriptors>
+                    <finalName>${project.artifactId}-${project.version}-source</finalName>
+                  </configuration>
+                  <executions>
+                    <execution>
+                      <id>build-source-tarball</id>
+                      <phase>package</phase>
+                      <goals>
+                        <goal>single</goal>
+                      </goals>
+                    </execution>
+                  </executions>
+                </plugin>
+              </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>binary</id>
+            <build>
+              <plugins>
+                <plugin>
+                  <artifactId>maven-assembly-plugin</artifactId>
+                  <configuration>
+                    <tarLongFileMode>gnu</tarLongFileMode>
+                    <descriptors>
+                      <descriptor>src/packages/tarball/binary.xml</descriptor>
+                    </descriptors>
+                    <finalName>${project.artifactId}-${project.version}-binary</finalName>
+                  </configuration>
+                  <executions>
+                    <execution>
+                      <id>build-tarball</id>
+                      <phase>package</phase>
+                      <goals>
+                        <goal>single</goal>
+                      </goals>
+                    </execution>
+                  </executions>
+                </plugin>
+              </plugins>
             </build>
         </profile>
 

Added: incubator/ambari/trunk/src/packages/tarball/binary.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/src/packages/tarball/binary.xml?rev=1183205&view=auto
==============================================================================
--- incubator/ambari/trunk/src/packages/tarball/binary.xml (added)
+++ incubator/ambari/trunk/src/packages/tarball/binary.xml Fri Oct 14 02:25:24 2011
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+<!--
+   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.1"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1
http://maven.apache.org/xsd/assembly-1.1.1.xsd">
+  <!--This 'all' id is not appended to the produced bundle because we do this:
+    http://maven.apache.org/plugins/maven-assembly-plugin/faq.html#required-classifiers
+  -->
+  <formats>
+    <format>tar.gz</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <includes>
+        <include>${basedir}/*.txt</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <includes>
+        <include>pom.xml</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>src</directory>
+    </fileSet>
+    <fileSet>
+      <directory>conf</directory>
+    </fileSet>
+    <fileSet>
+      <directory>bin</directory>
+      <outputDirectory>bin</outputDirectory>
+      <fileMode>755</fileMode>
+    </fileSet>
+<!--    <fileSet>
+      <directory>target</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+          <include>${artifactId}-${project.version}.jar</include>
+          <include>${artifactId}-${project.version}-tests.jar</include>
+      </includes>
+    </fileSet> -->
+    <fileSet>
+      <directory>target/site</directory>
+      <outputDirectory>docs</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>src/packages</directory>
+      <outputDirectory>sbin</outputDirectory>
+      <fileMode>755</fileMode>
+      <includes>
+          <include>update-hms-${artifactId}-env.sh</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <useProjectArtifact>false</useProjectArtifact>
+      <outputDirectory>/lib</outputDirectory>
+      <unpack>false</unpack>
+      <scope>runtime</scope>
+    </dependencySet>
+  </dependencySets>
+</assembly>

Added: incubator/ambari/trunk/src/packages/tarball/source.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/src/packages/tarball/source.xml?rev=1183205&view=auto
==============================================================================
--- incubator/ambari/trunk/src/packages/tarball/source.xml (added)
+++ incubator/ambari/trunk/src/packages/tarball/source.xml Fri Oct 14 02:25:24 2011
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+<!--
+   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.1"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1
http://maven.apache.org/xsd/assembly-1.1.1.xsd">
+  <!--This 'all' id is not appended to the produced bundle because we do this:
+    http://maven.apache.org/plugins/maven-assembly-plugin/faq.html#required-classifiers
+  -->
+  <formats>
+    <format>tar.gz</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <includes>
+        <include>${basedir}/*.txt</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <includes>
+        <include>pom.xml</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>src</directory>
+    </fileSet>
+    <fileSet>
+      <directory>conf</directory>
+    </fileSet>
+    <fileSet>
+      <directory>bin</directory>
+      <outputDirectory>bin</outputDirectory>
+      <fileMode>755</fileMode>
+    </fileSet>
+<!--    <fileSet>
+      <directory>target</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+          <include>${artifactId}-${project.version}.jar</include>
+          <include>${artifactId}-${project.version}-tests.jar</include>
+      </includes>
+    </fileSet> -->
+    <fileSet>
+      <directory>target/site</directory>
+      <outputDirectory>docs</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>src/packages</directory>
+      <outputDirectory>sbin</outputDirectory>
+      <fileMode>755</fileMode>
+      <includes>
+          <include>update-hms-${artifactId}-env.sh</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <useProjectArtifact>false</useProjectArtifact>
+      <outputDirectory>/lib</outputDirectory>
+      <unpack>false</unpack>
+      <scope>runtime</scope>
+    </dependencySet>
+  </dependencySets>
+</assembly>



Mime
View raw message