svn commit: r1026620 - in /activemq/activemq-apollo/trunk: apollo-cli/ apollo-cli/src/main/filtered-resources/ apollo-cli/src/main/filtered-resources/org/ apollo-cli/src/main/filtered-resources/org/apache/ apollo-cli/src/main/filtered-resources/org/apa...

[chirino]

Author: chirino
Date: Sat Oct 23 14:39:33 2010
New Revision: 1026620

URL: http://svn.apache.org/viewvc?rev=1026620&view=rev
Log:
getting cli + distro modules to work (at least on OS X)

Added:
    activemq/activemq-apollo/trunk/apollo-cli/src/main/filtered-resources/
    activemq/activemq-apollo/trunk/apollo-cli/src/main/filtered-resources/org/
    
activemq/activemq-apollo/trunk/apollo-cli/src/main/filtered-resources/org/apache/
    
activemq/activemq-apollo/trunk/apollo-cli/src/main/filtered-resources/org/apache/activemq/
    
activemq/activemq-apollo/trunk/apollo-cli/src/main/filtered-resources/org/apache/activemq/apollo/
    
activemq/activemq-apollo/trunk/apollo-cli/src/main/filtered-resources/org/apache/activemq/apollo/cli/
    
activemq/activemq-apollo/trunk/apollo-cli/src/main/filtered-resources/org/apache/activemq/apollo/cli/banner.txt
      - copied, changed from r1026493, 
activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/banner.txt
Removed:
    
activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/banner.txt
Modified:
    activemq/activemq-apollo/trunk/apollo-cli/pom.xml
    
activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/Apollo.scala
    
activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/common-bin.xml
    activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo

Modified: activemq/activemq-apollo/trunk/apollo-cli/pom.xml
URL: 
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cli/pom.xml?rev=1026620&r1=1026619&r2=1026620&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cli/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-cli/pom.xml Sat Oct 23 14:39:33 2010
@@ -5,6 +5,7 @@
     <groupId>org.apache.activemq</groupId>
     <artifactId>apollo-scala</artifactId>
     <version>6.0-SNAPSHOT</version>
+    <relativePath>../apollo-scala</relativePath>
   </parent>
 
   <groupId>org.apache.activemq</groupId>

Copied: 
activemq/activemq-apollo/trunk/apollo-cli/src/main/filtered-resources/org/apache/activemq/apollo/cli/banner.txt
 (from r1026493, 
activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/banner.txt)
URL: 
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cli/src/main/filtered-resources/org/apache/activemq/apollo/cli/banner.txt?p2=activemq/activemq-apollo/trunk/apollo-cli/src/main/filtered-resources/org/apache/activemq/apollo/cli/banner.txt&p1=activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/banner.txt&r1=1026493&r2=1026620&rev=1026620&view=diff
==============================================================================
--- 
activemq/activemq-apollo/trunk/apollo-cli/src/main/resources/org/apache/activemq/apollo/cli/banner.txt
 (original)
+++ 
activemq/activemq-apollo/trunk/apollo-cli/src/main/filtered-resources/org/apache/activemq/apollo/cli/banner.txt
 Sat Oct 23 14:39:33 2010
@@ -1,4 +1,4 @@
-  Apache Apollo (${project.version})
+Apache Apollo (${project.version})
 
 Hit '<tab>' for a list of available commands
    and '[cmd] --help' for help on a specific command.

Modified: 
activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/Apollo.scala
URL: 
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/Apollo.scala?rev=1026620&r1=1026619&r2=1026620&view=diff
==============================================================================
--- 
activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/Apollo.scala
 (original)
+++ 
activemq/activemq-apollo/trunk/apollo-cli/src/main/scala/org/apache/activemq/apollo/cli/Apollo.scala
 Sat Oct 23 14:39:33 2010
@@ -53,7 +53,7 @@ class Apollo extends Main with Action {
 
   protected override def createConsole(commandProcessor: CommandShellImpl, in: 
InputStream, out: PrintStream, err: PrintStream, terminal: Terminal)  = {
     new Console(commandProcessor, in, out, err, terminal, null) {
-      protected override def getPrompt = BOLD+"scalate> "+RESET
+      protected override def getPrompt = BOLD+"apollo> "+RESET
       protected override def isPrintStackTraces = debug
       protected override def welcome = {
         val source = getClass().getResourceAsStream("banner.txt")

Modified: 
activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/common-bin.xml
URL: 
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/common-bin.xml?rev=1026620&r1=1026619&r2=1026620&view=diff
==============================================================================
--- 
activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/common-bin.xml
 (original)
+++ 
activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/common-bin.xml
 Sat Oct 23 14:39:33 2010
@@ -24,7 +24,7 @@
       <scope>compile</scope>
       <useTransitiveDependencies>true</useTransitiveDependencies>
       <includes>
-        <include>org.apache.activemq.apollo:apollo-cli</include>
+        <include>org.apache.activemq:apollo-cli</include>
       </includes>
     </dependencySet>
     <dependencySet>

Modified: 
activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo
URL: 
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo?rev=1026620&r1=1026619&r2=1026620&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo 
(original)
+++ activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo 
Sat Oct 23 14:39:33 2010
@@ -116,13 +116,20 @@ if [ -z "$APOLLO_BASE" ] ; then
   APOLLO_BASE="$APOLLO_HOME"
 fi
 
-CLASSPATH="${APOLLO_HOME}/lib/*:${APOLLO_HOME}/lib/tool/*:${APOLLO_HOME}/lib/optional/*"
-
+CLASSPATH=${APOLLO_BASE}/etc
+if [ -d "${APOLLO_HOME}/lib/patches" ] ; then
+  for f in "${APOLLO_HOME}/lib/patches"/*.jar; do
+    CLASSPATH="$CLASSPATH:$f"
+  done
+fi
+for f in "${APOLLO_HOME}/lib"/*.jar; do
+  CLASSPATH="$CLASSPATH:$f"
+done
+    
 # For Cygwin, switch paths to Windows format before running java
 if $cygwin; then
   APOLLO_HOME=`cygpath --windows "$APOLLO_HOME"`
   APOLLO_BASE=`cygpath --windows "$APOLLO_BASE"`
-  APOLLO_CLASSPATH=`cygpath --path --windows "$APOLLO_CLASSPATH"`
   JAVA_HOME=`cygpath --windows "$JAVA_HOME"`
   CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
   CYGHOME=`cygpath --windows "$HOME"`
@@ -150,7 +157,7 @@ fi
 JVM_FLAGS="${JVM_FLAGS} ${JMX_OPTS}"
 
 JVM_FLAGS="${JVM_FLAGS} -Dapollo.home=\"${APOLLO_HOME}\" 
-Dapollo.base=\"${APOLLO_BASE}\""
-JVM_FLAGS="${JVM_FLAGS} -classpath \"${CLASSPATH}\""
+JVM_FLAGS="${JVM_FLAGS} -classpath ${CLASSPATH}"
 
 exec "$JAVACMD" ${JVM_FLAGS} org.apache.activemq.apollo.cli.Apollo $@