activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1026493 - in /activemq/activemq-apollo/trunk: ./ apollo-cli/ apollo-distro/ apollo-distro/src/ apollo-distro/src/main/ apollo-distro/src/main/descriptors/ apollo-distro/src/main/release/ apollo-distro/src/main/release/bin/
Date Fri, 22 Oct 2010 20:53:23 GMT
Author: chirino
Date: Fri Oct 22 20:53:22 2010
New Revision: 1026493

URL: http://svn.apache.org/viewvc?rev=1026493&view=rev
Log:
adding a distro module.

Added:
    activemq/activemq-apollo/trunk/apollo-distro/
    activemq/activemq-apollo/trunk/apollo-distro/pom.xml
    activemq/activemq-apollo/trunk/apollo-distro/src/
    activemq/activemq-apollo/trunk/apollo-distro/src/main/
    activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/
    activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/common-bin.xml
    activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/unix-bin.xml
    activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/windows-bin.xml
    activemq/activemq-apollo/trunk/apollo-distro/src/main/release/
    activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/
    activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo   (with props)
    activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo.bat
    activemq/activemq-apollo/trunk/apollo-distro/src/main/release/readme.html   (with props)
Modified:
    activemq/activemq-apollo/trunk/apollo-cli/pom.xml
    activemq/activemq-apollo/trunk/pom.xml

Modified: activemq/activemq-apollo/trunk/apollo-cli/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cli/pom.xml?rev=1026493&r1=1026492&r2=1026493&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cli/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-cli/pom.xml Fri Oct 22 20:53:22 2010
@@ -11,7 +11,7 @@
   <artifactId>apollo-cli</artifactId>
   <version>6.0-SNAPSHOT</version>
 
-  <name>${artifactId}</name>
+  <name>${project.artifactId}</name>
 
   <dependencies>
     
@@ -43,6 +43,7 @@
       <version>${jetty-version}</version>
       <optional>true</optional>
     </dependency>
+    
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jetty-util</artifactId>
@@ -56,6 +57,13 @@
       <version>${karaf-version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-nop</artifactId>
+      <version>${slf4j-version}</version>
+      <scope>test</scope>
+    </dependency>
+    
   </dependencies>
 
   <build>

Added: activemq/activemq-apollo/trunk/apollo-distro/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-distro/pom.xml?rev=1026493&view=auto
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-distro/pom.xml (added)
+++ activemq/activemq-apollo/trunk/apollo-distro/pom.xml Fri Oct 22 20:53:22 2010
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.activemq</groupId>
+    <artifactId>apollo-project</artifactId>
+    <version>6.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>apollo-distro</artifactId>
+  <packaging>pom</packaging>
+
+  <name>${project.artifactId}</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>apollo-cli</artifactId>
+      <version>6.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-nop</artifactId>
+      <version>${slf4j-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.karaf.shell</groupId>
+      <artifactId>org.apache.karaf.shell.console</artifactId>
+      <version>${karaf-version}</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-server</artifactId>
+      <version>${jersey-version}</version>
+    </dependency>
+
+  </dependencies>
+
+  <build>
+    <defaultGoal>install</defaultGoal>
+    <plugins>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2-beta-4</version>
+        <executions>
+          <execution>
+            <id>unix-bin</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <configuration>
+              <descriptors>
+                <descriptor>${basedir}/src/main/descriptors/unix-bin.xml</descriptor>
+              </descriptors>
+              <!-- Avoid gnu mode if we can, AIX systems can't cope /w it -->
+              <!-- <tarLongFileMode>gnu</tarLongFileMode> -->
+              <finalName>apache-apollo-${project.version}</finalName>
+            </configuration>
+          </execution>
+          <execution>
+            <id>windows-bin</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <configuration>
+              <descriptors>
+                <descriptor>${basedir}/src/main/descriptors/windows-bin.xml</descriptor>
+              </descriptors>
+              <finalName>apache-apollo-${project.version}</finalName>
+              <appendAssemblyId>true</appendAssemblyId>
+              <assemblyId />
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Added: 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=1026493&view=auto
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/common-bin.xml (added)
+++ activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/common-bin.xml Fri Oct
22 20:53:22 2010
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<component>
+
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>/lib</outputDirectory>
+      <unpack>false</unpack>
+      <scope>compile</scope>
+      <useTransitiveDependencies>true</useTransitiveDependencies>
+      <includes>
+        <include>org.apache.activemq.apollo:apollo-cli</include>
+      </includes>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory>/lib</outputDirectory>
+      <unpack>false</unpack>
+      <scope>runtime</scope>
+      <includes>
+        <include>org.scala-lang:scala-library</include>
+        <include>org.scala-lang:scala-compiler</include>
+        <include>org.slf4j:slf4j-api</include>
+        <include>org.slf4j:slf4j-nop</include>
+        <include>org.apache.karaf.shell:org.apache.karaf.shell.console</include>
+      </includes>
+    </dependencySet>
+    <!-- 
+    <dependencySet>
+      <outputDirectory>/lib/optional</outputDirectory>
+      <unpack>false</unpack>
+      <scope>compile</scope>
+      <useTransitiveDependencies>true</useTransitiveDependencies>
+      <includes>
+        <include>org.apache.activemq.apollo:apollo-cli</include>
+      </includes>
+    </dependencySet>
+    -->
+  </dependencySets>
+
+  <fileSets>
+
+    <!-- copy the website docs -->
+    <!-- 
+    <fileSet>
+      <directory>${basedir}/../apollo-website/target/sitegen/</directory>
+      <outputDirectory>/docs</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>${basedir}/../apollo-website/target/</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>*.html</include>
+      </includes>
+    </fileSet> 
+    -->
+
+    <!-- api doco -->
+    <!-- 
+    <fileSet>
+      <directory>${basedir}/../apollo-broker/target/apidocs</directory>
+      <outputDirectory>/docs/apidocs/apollo-broker</outputDirectory>
+    </fileSet> 
+    -->
+
+  </fileSets>
+
+</component>

Added: activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/unix-bin.xml?rev=1026493&view=auto
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/unix-bin.xml (added)
+++ activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/unix-bin.xml Fri Oct
22 20:53:22 2010
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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>
+  <id>unix-distro</id>
+  <formats>
+    <format>tar.gz</format>
+  </formats>
+
+  <fileSets>
+    <!-- Copy over everything that needs to get unix line endings -->
+    <fileSet>
+      <directory>src/main/release</directory>
+      <outputDirectory>/</outputDirectory>
+      <excludes>
+        <exclude>bin/**</exclude>
+      </excludes>
+      <lineEnding>unix</lineEnding>
+    </fileSet>
+    <fileSet>
+      <directory>src/main/release/bin</directory>
+      <outputDirectory>/bin</outputDirectory>
+      <lineEnding>unix</lineEnding>
+      <fileMode>0755</fileMode>
+      <filtered>true</filtered>
+      <excludes>
+        <exclude>*.bat</exclude>
+      </excludes>
+    </fileSet>
+
+    <fileSet>
+      <directory>..</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>*.txt</include>
+      </includes>
+      <lineEnding>unix</lineEnding>
+    </fileSet>
+
+    <!-- copy the examples -->
+    <fileSet>
+      <directory>../samples</directory>
+      <outputDirectory>/samples</outputDirectory>
+      <includes>
+        <include>pom.xml</include>
+        <include>**/pom.xml</include>
+        <include>**/run</include>
+        <include>*/src/**</include>
+      </includes>
+      <excludes>
+        <exclude>target</exclude>
+        <exclude>**/target</exclude>
+        <exclude>**/target/**</exclude>
+      </excludes>
+      <lineEnding>unix</lineEnding>
+    </fileSet>
+
+  </fileSets>
+
+  <componentDescriptors>
+    <componentDescriptor>src/main/descriptors/common-bin.xml</componentDescriptor>
+  </componentDescriptors>
+
+</assembly>

Added: activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/windows-bin.xml?rev=1026493&view=auto
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/windows-bin.xml (added)
+++ activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/windows-bin.xml Fri
Oct 22 20:53:22 2010
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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>
+  <id>windows-distro</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+
+  <fileSets>
+    <!-- Copy over everything that needs to get dos line endings -->
+    <fileSet>
+      <directory>src/main/release</directory>
+      <outputDirectory>/</outputDirectory>
+      <excludes>
+        <exclude>bin/**</exclude>
+      </excludes>
+      <lineEnding>dos</lineEnding>
+    </fileSet>
+    <fileSet>
+      <directory>src/main/release/bin</directory>
+      <outputDirectory>/bin</outputDirectory>
+      <lineEnding>dos</lineEnding>
+      <filtered>true</filtered>
+      <includes>
+        <include>*.bat</include>
+      </includes>
+    </fileSet>
+
+    <fileSet>
+      <directory>..</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>*.txt</include>
+      </includes>
+      <lineEnding>dos</lineEnding>
+    </fileSet>
+
+    <!-- copy the examples -->
+
+    <fileSet>
+      <directory>../samples</directory>
+      <outputDirectory>/samples</outputDirectory>
+      <includes>
+        <include>pom.xml</include>
+        <include>**/pom.xml</include>
+        <include>**/run</include>
+        <include>*/src/**</include>
+      </includes>
+      <excludes>
+        <exclude>target</exclude>
+        <exclude>**/target</exclude>
+        <exclude>**/target/**</exclude>
+      </excludes>
+      <lineEnding>dos</lineEnding>
+    </fileSet>
+
+  </fileSets>
+
+  <componentDescriptors>
+    <componentDescriptor>src/main/descriptors/common-bin.xml</componentDescriptor>
+  </componentDescriptors>
+
+</assembly>

Added: 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=1026493&view=auto
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo (added)
+++ activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo Fri Oct 22 20:53:22
2010
@@ -0,0 +1,156 @@
+#!/bin/sh
+# ------------------------------------------------------------------------
+# 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.
+# ------------------------------------------------------------------------
+
+# load system-wide apollo configuration
+if [ -f "/etc/apollo.conf" ] ; then
+  . /etc/apollo.conf
+fi
+
+# provide default values for people who don't use RPMs
+if [ -z "$usejikes" ] ; then
+  usejikes=false;
+fi
+
+# load user apollo configuration
+if [ -f "$HOME/.apollorc" ] ; then
+  . "$HOME/.apollorc"
+fi
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+case "`uname`" in
+  CYGWIN*) cygwin=true ;;
+  Darwin*) darwin=true
+           if [ -z "$JAVA_HOME" ] ; then
+             JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
+           fi
+           ;;
+esac
+
+if [ -z "$APOLLO_HOME" ] ; then
+  # try to find APOLLO
+  if [ -d /opt/apollo ] ; then
+    APOLLO_HOME=/opt/apollo
+  fi
+
+  if [ -d "${HOME}/opt/apollo" ] ; then
+    APOLLO_HOME="${HOME}/opt/apollo"
+  fi
+
+  ## resolve links - $0 may be a link to apollo's home
+  PRG="$0"
+  progname=`basename "$0"`
+  saveddir=`pwd`
+
+  # need this for relative symlinks
+  dirname_prg=`dirname "$PRG"`
+  cd "$dirname_prg"
+
+  while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '.*/.*' > /dev/null; then
+    PRG="$link"
+    else
+    PRG=`dirname "$PRG"`"/$link"
+    fi
+  done
+
+  APOLLO_HOME=`dirname "$PRG"`
+
+  cd "$saveddir"
+
+  # make it fully qualified
+  APOLLO_HOME=`cd "$APOLLO_HOME/.." && pwd`
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+  [ -n "$APOLLO_HOME" ] &&
+    APOLLO_HOME=`cygpath --unix "$APOLLO_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+if [ -z "$JAVACMD" ] ; then
+  if [ -n "$JAVA_HOME"  ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+    fi
+  else
+    JAVACMD=`which java 2> /dev/null `
+    if [ -z "$JAVACMD" ] ; then
+        JAVACMD=java
+    fi
+  fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+  echo "Error: JAVA_HOME is not defined correctly."
+  echo "  We cannot execute $JAVACMD"
+  exit 1
+fi
+
+if [ -z "$APOLLO_BASE" ] ; then
+  APOLLO_BASE="$APOLLO_HOME"
+fi
+
+CLASSPATH="${APOLLO_HOME}/lib/*:${APOLLO_HOME}/lib/tool/*:${APOLLO_HOME}/lib/optional/*"
+
+# 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"`
+fi
+
+if [ -z "$APOLLO_OPTS" ] ; then
+  APOLLO_OPTS="-server -Xmx1G"
+fi
+JVM_FLAGS="${APOLLO_OPTS}"
+
+# Optionally enable remote debugging
+if [ "x$APOLLO_DEBUG" != "x" ]; then
+    JVM_FLAGS="${JVM_FLAGS} Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005"
+fi
+
+# Optionally enable YourKit debugging
+if [ "x$APOLLO_PROFILE" != "x" ]; then
+    JVM_FLAGS="-agentlib:yjpagent ${JVM_FLAGS}"
+fi
+
+if [ -z "$JMX_OPTS" ] ; then
+  #JMX_OPTS="-Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.authenticate=false
-Dcom.sun.management.jmxremote.ssl=false"
+  JMX_OPTS="-Dcom.sun.management.jmxremote"
+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}\""
+
+exec "$JAVACMD" ${JVM_FLAGS} org.apache.activemq.apollo.cli.Apollo $@
+

Propchange: activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo
------------------------------------------------------------------------------
    svn:executable = *

Added: activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo.bat
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo.bat?rev=1026493&view=auto
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo.bat (added)
+++ activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo.bat Fri Oct 22
20:53:22 2010
@@ -0,0 +1,98 @@
+@REM
+@REM  Licensed to the Apache Software Foundation (ASF) under one or more
+@REM  contributor license agreements.  See the NOTICE file distributed with
+@REM  this work for additional information regarding copyright ownership.
+@REM  The ASF licenses this file to You under the Apache License, Version 2.0
+@REM  (the "License"); you may not use this file except in compliance with
+@REM  the License.  You may obtain a copy of the License at
+@REM  
+@REM  http://www.apache.org/licenses/LICENSE-2.0
+@REM  
+@REM  Unless required by applicable law or agreed to in writing, software
+@REM  distributed under the License is distributed on an "AS IS" BASIS,
+@REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@REM  See the License for the specific language governing permissions and
+@REM  limitations under the License.
+@REM
+@echo off
+
+REM ------------------------------------------------------------------------
+if "%OS%"=="Windows_NT" @setlocal
+
+rem %~dp0 is expanded pathname of the current script under NT
+set DEFAULT_APOLLO_HOME=%~dp0..
+
+if "%APOLLO_HOME%"=="" set APOLLO_HOME=%DEFAULT_APOLLO_HOME%
+set DEFAULT_APOLLO_HOME=
+
+:doneStart
+rem find APOLLO_HOME if it does not exist due to either an invalid value passed
+rem by the user or the %0 problem on Windows 9x
+if exist "%APOLLO_HOME%\readme.html" goto checkJava
+
+rem check for apollo in Program Files on system drive
+if not exist "%SystemDrive%\Program Files\apollo" goto checkSystemDrive
+set APOLLO_HOME=%SystemDrive%\Program Files\apollo
+goto checkJava
+
+:checkSystemDrive
+rem check for apollo in root directory of system drive
+if not exist %SystemDrive%\apollo\readme.html goto checkCDrive
+set APOLLO_HOME=%SystemDrive%\apollo
+goto checkJava
+
+:checkCDrive
+rem check for apollo in C:\apollo for Win9X users
+if not exist C:\apollo\readme.html goto noHome
+set APOLLO_HOME=C:\apollo
+goto checkJava
+
+:noHome
+echo APOLLO_HOME is set incorrectly or apollo could not be located. Please set APOLLO_HOME.
+goto end
+
+:checkJava
+set _JAVACMD=%JAVACMD%
+
+if "%JAVA_HOME%" == "" goto noJavaHome
+if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
+if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java.exe
+goto runJava
+
+:noJavaHome
+if "%_JAVACMD%" == "" set _JAVACMD=java.exe
+echo.
+echo Warning: JAVA_HOME environment variable is not set.
+echo.
+
+:runJava
+
+SET CLASSPATH=%APOLLO_HOME%\lib\*;%APOLLO_HOME%\lib\tool\*;%APOLLO_HOME%\lib\optional\*
+
+if "%APOLLO_BASE%" == "" set APOLLO_BASE=%APOLLO_HOME%
+
+if "%APOLLO_OPTS%" == "" set APOLLO_OPTS=-server -Xmx1G
+
+set JVM_FLAGS=%APOLLO_OPTS%
+
+if "x%APOLLO_DEBUG%" == "x" goto noDEBUG
+  set JVM_FLAGS=%JVM_FLAGS% -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005
+:noDEBUG
+
+if "x%APOLLO_PROFILE%" == "x" goto noPROFILE
+  set JVM_FLAGS=-agentlib:yjpagent %JVM_FLAGS%
+:noPROFILE
+
+if "%JMX_OPTS%" == "" set JMX_OPTS=-Dcom.sun.management.jmxremote
+REM set JMX_OPTS=-Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.authenticate=false
-Dcom.sun.management.jmxremote.ssl=false
+set JVM_FLAGS=%JVM_FLAGS% %JMX_OPTS%
+
+set JVM_FLAGS=%JVM_FLAGS% -Dapollo.home="%APOLLO_HOME%" -Dapollo.base="%APOLLO_BASE%"
+set JVM_FLAGS=%JVM_FLAGS% -classpath "%CLASSPATH%"
+
+"%_JAVACMD%" %JVM_FLAGS%  org.apache.activemq.apollo.cli.Apollo %*
+
+:end
+set _JAVACMD=
+if "%OS%"=="Windows_NT" @endlocal
+

Added: activemq/activemq-apollo/trunk/apollo-distro/src/main/release/readme.html
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-distro/src/main/release/readme.html?rev=1026493&view=auto
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-distro/src/main/release/readme.html (added)
+++ activemq/activemq-apollo/trunk/apollo-distro/src/main/release/readme.html Fri Oct 22 20:53:22
2010
@@ -0,0 +1,26 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!--
+  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.
+-->
+<html>
+  <head>
+    <title>Apollo</title>
+    <meta http-equiv="refresh" content="0;URL=docs/documentation/index.html">
+  </head>
+  <body style="font-size:8pt; font-color:#333;">
+    This file has moved. Please follow <a href="docs/documentation/index.html">this
link</a>.
+  </body>
+</html>

Propchange: activemq/activemq-apollo/trunk/apollo-distro/src/main/release/readme.html
------------------------------------------------------------------------------
    svn:executable = *

Modified: activemq/activemq-apollo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/pom.xml?rev=1026493&r1=1026492&r2=1026493&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/pom.xml (original)
+++ activemq/activemq-apollo/trunk/pom.xml Fri Oct 22 20:53:22 2010
@@ -162,6 +162,7 @@
     <module>apollo-web</module>
     <module>apache-activemq-apollo</module>
     <module>apollo-cli</module>
+    <module>apollo-distro</module>
   </modules>
 
   <scm>



Mime
View raw message