avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon-sandbox/merlin/merlin-plugin project.xml
Date Sun, 24 Aug 2003 18:14:30 GMT
mcconnell    2003/08/24 11:14:30

  Modified:    merlin   maven.xml
               merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl
                        DefaultKernelContext.java
               merlin/merlin-platform/src/bin merlin.sh merlinx.bat
               merlin/merlin-platform/src/config kernel.xml wrapper.conf
               merlin/merlin-plugin project.xml
  Added:       merlin/merlin-platform/src/bin README.TXT merlin-server.sh
                        merlinx.sh
               merlin/merlin-platform/src/bin/nt InstallService-NT.bat
                        TANUKISOFTWARE_LICENSE.txt UninstallService-NT.bat
                        Wrapper.dll Wrapper.exe wrapper.conf wrapper.jar
  Removed:     merlin/merlin-platform/src/bin InstallService-NT.bat
                        UninstallService-NT.bat Wrapper.exe merlin1.sh
                        run.sh
  Log:
  Restructuring aspect of the distribution so that we can easly copy in a new distribution
without stuffing up existing distribution customizations.
  
  Revision  Changes    Path
  1.45      +4 -9      avalon-sandbox/merlin/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/maven.xml,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- maven.xml	23 Aug 2003 02:23:30 -0000	1.44
  +++ maven.xml	24 Aug 2003 18:14:30 -0000	1.45
  @@ -23,10 +23,7 @@
   
       <ant:mkdir dir="${merlin.build.inst.dir}"/>
       <ant:mkdir dir="${merlin.build.inst.dir}/ext"/>
  -    <ant:mkdir dir="${merlin.build.inst.dir}/lib"/>
  -    <ant:copy toDir="${merlin.build.inst.dir}/lib">
  -      <fileset dir="${basedir}/merlin-platform/lib"/>
  -    </ant:copy>
  +    <ant:mkdir dir="${merlin.build.inst.dir}/bin/lib"/>
   
       <!--
       Install the sub-project jars (meta, assembly, merlin, etc.)
  @@ -50,7 +47,7 @@
         ignoreFailures="false" />
       <ant:copy 
          file="${basedir}/kernel/bootstrap/target/merlin-bootstrap-1.0.jar" 
  -       toDir="${merlin.build.inst.dir}/bin"/>
  +       toDir="${merlin.build.inst.dir}/bin/lib"/>
   
       <!--
       Import the dependent jar files referenced by the SMP 
  @@ -81,10 +78,6 @@
   
       <attainGoal name="merlinx-install-plugin"/>
   
  -    <!--<ant:copy 
  -       file="${basedir}/merlin-plugin/target/merlin-plugin-1.0.jar" 
  -       toDir="${merlin.build.inst.dir}/repository/merlin/jars"/>-->
  -
       <!--
       Add the supporting resources.
       -->
  @@ -101,6 +94,8 @@
       </ant:copy>
   
       <ant:chmod file="${merlin.build.inst.dir}/bin/merlin.sh" perm="ugo+rx"/>
  +    <ant:chmod file="${merlin.build.inst.dir}/bin/merlinx.sh" perm="ugo+rx"/>
  +    <ant:chmod file="${merlin.build.inst.dir}/bin/merlin-server.sh" perm="ugo+rx"/>
   
       <ant:copy toDir="${maven.build.dir}">
         <fileset dir="${basedir}">
  
  
  
  1.20      +31 -5     avalon-sandbox/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernelContext.java
  
  Index: DefaultKernelContext.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernelContext.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- DefaultKernelContext.java	23 Aug 2003 17:18:26 -0000	1.19
  +++ DefaultKernelContext.java	24 Aug 2003 18:14:30 -0000	1.20
  @@ -330,8 +330,17 @@
           }
           else
           {
  -            getLogger().debug( "using bootstrap repository" );
  -            m_repository = repository;
  +            if( m_kernel.getChild( "repository", false ) != null )
  +            {
  +                File merlinHome = getSystemDefaultDirectory();
  +                Configuration repositoryConfig = m_kernel.getChild( "repository" );
  +                getLogger().debug( "using kernel defined repository" );
  +                m_repository = createRepository( merlinHome, repositoryConfig );
  +            }
  +            else
  +            {
  +                m_repository = repository;
  +            }
           }
   
           //
  @@ -604,8 +613,17 @@
   
       public String toString()
       {
  -        StringBuffer buffer = new StringBuffer( "  Version: " );
  -        buffer.append( getVersionString() );
  +        StringBuffer buffer = new StringBuffer();
  +        buffer.append( "  ${user.dir}: " + System.getProperty( "user.dir" ) );
  +        if( m_system == null )
  +        {
  +            buffer.append( "\n  ${merlin.home}: " + getSystemDefaultDirectory() );
  +        }
  +        else
  +        {
  +            buffer.append( "\n  ${merlin.home}: " + m_system );
  +        }
  +        buffer.append( "\n  Version: " + getVersionString() );
           buffer.append( "\n  Environment: " 
                 + System.getProperty( "os.name" ) + " "
                 + System.getProperty( "os.version" ) + " Java " 
  @@ -825,5 +843,13 @@
       private URL loadKernelDirective( Repository repository ) throws Exception
       {
           return repository.getArtifact( "merlin", "kernel", "", "xml" );
  +    }
  +
  +    private static File getSystemDefaultDirectory()
  +    {
  +        final String local = 
  +            System.getProperty( "merlin.home", 
  +              System.getProperty( "user.home" ) + "/merlin" );
  +        return new File( local );
       }
   }
  
  
  
  1.8       +11 -220   avalon-sandbox/merlin/merlin-platform/src/bin/merlin.sh
  
  Index: merlin.sh
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/src/bin/merlin.sh,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- merlin.sh	22 Aug 2003 13:41:11 -0000	1.7
  +++ merlin.sh	24 Aug 2003 18:14:30 -0000	1.8
  @@ -1,78 +1,4 @@
   #! /bin/sh
  -#
  -# -----------------------------------------------------------------------------
  -# Merlin start script. Based on the Avalon-Phoenix start script.
  -#
  -# Author: Alexis Agahi <alag@users.sourceforge.net>
  -#         Peter Donald <peter at apache.org>
  -#         Leo Simons <leosimons at apache.org>
  -#
  -# Environment Variable Prequisites
  -#
  -#   MERLIN_OPTS       (Optional) Java runtime options used when the command is
  -#                      executed.
  -#
  -#   JAVA_HOME          Must point at your Java Development Kit installation.
  -#
  -#   MERLIN_JVM_OPTS   (Optional) Java runtime options used when the command is
  -#                       executed.
  -#
  -# -----------------------------------------------------------------------------
  -
  -usage()
  -{
  -    echo "Usage: $0 {start|stop|run|restart|check}"
  -    exit 1
  -}
  -
  -[ $# -gt 0 ] || usage
  -
  -##################################################
  -# Get the action & configs
  -##################################################
  -
  -ACTION=$1
  -shift
  -ARGS="$*"
  -
  -
  -
  -# OS specific support.  $var _must_ be set to either true or false.
  -cygwin=false
  -case "`uname`" in
  -CYGWIN*) cygwin=true;;
  -esac
  -
  -# resolve links - $0 may be a softlink
  -THIS_PROG="$0"
  -
  -while [ -h "$THIS_PROG" ]; do
  -  ls=`ls -ld "$THIS_PROG"`
  -  link=`expr "$ls" : '.*-> \(.*\)$'`
  -  if expr "$link" : '.*/.*' > /dev/null; then
  -    THIS_PROG="$link"
  -  else
  -    THIS_PROG=`dirname "$THIS_PROG"`/"$link"
  -  fi
  -done
  -
  -# Get standard environment variables
  -PRGDIR=`dirname "$THIS_PROG"`
  -MERLIN_HOME=`cd "$PRGDIR/.." ; pwd`
  -
  -unset THIS_PROG
  -
  -if [ -r "$MERLIN_HOME"/bin/setenv.sh ]; then
  -  . "$MERLIN_HOME"/bin/setenv.sh
  -fi
  -
  -if [ -z "$MERLIN_TMPDIR" ] ; then
  -  MERLIN_TMPDIR=$MERLIN_HOME/tmp
  -fi
  -
  -if [ ! -d "$MERLIN_TMPDIR" ] ; then
  -  mkdir "$MERLIN_TMPDIR" 
  -fi
   
   # Checking for JAVA_HOME is required on *nix due
   # to some distributions stupidly including kaffe in /usr/bin
  @@ -84,151 +10,16 @@
     exit 1
   fi
   
  -# For Cygwin, ensure paths are in UNIX format before anything is touched
  -if $cygwin; then
  -  [ -n "$MERLIN_HOME" ] && MERLIN_HOME=`cygpath --unix "$MERLIN_HOME"`
  -fi
  -
  -# For Cygwin, switch paths to Windows format before running java
  -if $cygwin; then
  -  MERLIN_HOME=`cygpath --path --windows "$MERLIN_HOME"`
  -fi
  -
  -# ----- Execute The Requested Command -----------------------------------------
  -
  -
  -# Uncomment to get enable remote debugging
  -# DEBUG="-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y"
  -#
  -# Command to overide JVM ext dir 
  -# 
  -# This is needed as some JVM vendors do foolish things 
  -# like placing jaxp/jaas/xml-parser jars in ext dir 
  -# thus breaking Merlin 
  -# 
  -JVM_EXT_DIRS="$MERLIN_HOME/ext" 
  -if $cygwin; then
  -  JVM_EXT_DIRS=`cygpath --path --windows "$JVM_EXT_DIRS"` 
  -fi
  -JVM_OPTS="-Djava.ext.dirs=$JVM_EXT_DIRS" 
  -
  -# Get the run cmd
  -RUN_CMD="$JAVA_HOME/bin/java $JVM_OPTS $DEBUG $MERLIN_JVM_OPTS -Dmerlin.home=$MERLIN_HOME
-jar $MERLIN_HOME/bin/merlin-bootstrap-1.0.jar $*"
  -
  -echo "Using MERLIN_HOME:   $MERLIN_HOME"
  -echo "Using JAVA_HOME:     $JAVA_HOME"
  -echo "USing RUN_CMD:       $RUN_CMD"
  -
  -#####################################################
  -# Find a PID for the pid file
  -#####################################################
  -if [  -z "$MERLIN_PID" ]
  -then
  -  MERLIN_PID="$MERLIN_TMPDIR/merlin.pid"
  -fi
  -
  -#####################################################
  -# Find a location for the merlin console
  -#####################################################
  -MERLIN_CONSOLE="$MERLIN_TMPDIR/merlin.console"
  -if [  -z "$MERLIN_CONSOLE" ]
  -then
  -  if [ -w /dev/console ]
  -  then
  -    MERLIN_CONSOLE=/dev/console
  -  else
  -    MERLIN_CONSOLE=/dev/tty
  -  fi
  +# Checking for JAVA_HOME is required on *nix due
  +# to some distributions stupidly including kaffe in /usr/bin
  +if [ "$MERLIN_HOME" = "" ] ; then
  +  echo "ERROR: MERLIN_HOME not found in your environment."
  +  echo
  +  echo "Please, set the MERLIN_HOME variable in your environment to match the"
  +  echo "location of Merlin distribution."
  +  exit 1
   fi
   
  -
  -#####################################################
  -# Action!
  -#####################################################
  -
  -case "$ACTION" in
  -  start)
  -        echo "Starting Merlin: "
  -
  -        if [ -f $MERLIN_PID ]
  -        then
  -            if ps -p `cat $MERLIN_PID` >/dev/null 2>/dev/null
  -            then
  -                echo "Already Running!!"
  -                exit 1
  -            fi
  -
  -        fi
  -
  -        echo "STARTED Merlin `date`" >> $MERLIN_CONSOLE
  -
  -        nohup sh -c "exec $RUN_CMD >>$MERLIN_CONSOLE 2>&1" >/dev/null &
  -        echo $! > $MERLIN_PID
  -        echo "Merlin running pid="`cat $MERLIN_PID`
  -        ;;
  -
  -  stop)
  -        PID=`cat $MERLIN_PID 2>/dev/null`
  -        echo "Shutting down Merlin: $PID"
  -        kill $PID 2>/dev/null
  -        sleep 2
  -        kill -9 $PID 2>/dev/null
  -        rm -f $MERLIN_PID
  -        echo "STOPPED `date`" >>$MERLIN_CONSOLE
  -        ;;
  -
  -  restart)
  -        $0 stop $*
  -        sleep 5
  -        $0 start $*
  -        ;;
  -
  -  supervise)
  -       #
  -       # Under control of daemontools supervise monitor which
  -       # handles restarts and shutdowns via the svc program.
  -       #
  -         exec $RUN_CMD
  -         ;;
  -
  -  run|demo)
  -        echo "Running Merlin: "
  -        echo " "
  -
  -        if [ -f $MERLIN_PID ]
  -        then
  -            echo "Already Running!!"
  -            exit 1
  -        fi
  -
  -        exec $RUN_CMD
  -        ;;
  -
  -  check)
  -        echo "Checking arguments to Merlin: "
  -        echo "MERLIN_HOME:     $MERLIN_HOME"
  -        echo "MERLIN_TMPDIR:   $MERLIN_TMPDIR"
  -        echo "MERLIN_JVM_OPTS: $MERLIN_JVM_OPTS"
  -        echo "JAVA_HOME:       $JAVA_HOME"
  -        echo "JVM_OPTS:        $JVM_OPTS"
  -        echo "CLASSPATH:       $CLASSPATH"
  -        echo "RUN_CMD:         $RUN_CMD"
  -        echo
  -
  -        if [ -f $MERLIN_PID ]
  -        then
  -            echo "Merlin running pid="`cat $MERLIN_PID`
  -            exit 0
  -        fi
  -        exit 1
  -        ;;
  -
  -*)
  -        usage
  -        ;;
  -esac
  -
  -exit 0
  -
  -
  -
  +RUN_CMD="$JAVA_HOME/bin/java -Dmerlin.home=$MERLIN_HOME -Djava.ext.dirs=$MERLIN_HOME/ext
-jar $MERLIN_HOME/bin/lib/merlin-bootstrap-1.0.jar $*"
  +echo "RUN CMD IS: $RUN_CMD"
  +exec $RUN_CMD
  
  
  
  1.3       +1 -1      avalon-sandbox/merlin/merlin-platform/src/bin/merlinx.bat
  
  Index: merlinx.bat
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/src/bin/merlinx.bat,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- merlinx.bat	20 Aug 2003 08:45:22 -0000	1.2
  +++ merlinx.bat	24 Aug 2003 18:14:30 -0000	1.3
  @@ -1,7 +1,7 @@
   @echo off
   
   if "%MERLIN_HOME%" == "" goto MissingHomeDefinition
  -java -Dmerlin.home=%MERLIN_HOME% -Dmerlin.repository.local=%MAVEN_HOME% -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl
-Djava.ext.dirs=%MERLIN_HOME%\ext -jar %MERLIN_HOME%\bin\merlin-bootstrap-1.0.jar %1 %2 %3
%4 %5 %6
  +java -Dmerlin.home=%MERLIN_HOME% -Dmerlin.repository.local=%MAVEN_HOME% -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl
-Djava.ext.dirs=%MERLIN_HOME%\ext -jar %MERLIN_HOME%\bin\lib\merlin-bootstrap-1.0.jar %1 %2
%3 %4 %5 %6
   goto :end
   
   :MissingHomeDefinition
  
  
  
  1.1                  avalon-sandbox/merlin/merlin-platform/src/bin/README.TXT
  
  Index: README.TXT
  ===================================================================
  
  
  merlin.bat       -- classic merlin command line exeuction
  merlinx.bat      -- launch merlin using the Maven repository for resolvution 
                      of internal Merlin jar files (handly if your developing 
                      with merlin)
  
  
  merlin-server.sh -- equivalent to the merlin NT service
  merlin.sh        -- same as merlin.bat
  merlinx.sh       -- same as merlinx.bat
  
  
  
  1.1                  avalon-sandbox/merlin/merlin-platform/src/bin/merlin-server.sh
  
  Index: merlin-server.sh
  ===================================================================
  #! /bin/sh
  #
  # -----------------------------------------------------------------------------
  # Merlin start script. Based on the Avalon-Phoenix start script.
  #
  # Author: Alexis Agahi <alag@users.sourceforge.net>
  #         Peter Donald <peter at apache.org>
  #         Leo Simons <leosimons at apache.org>
  #
  # Environment Variable Prequisites
  #
  #   MERLIN_OPTS       (Optional) Java runtime options used when the command is
  #                      executed.
  #
  #   JAVA_HOME          Must point at your Java Development Kit installation.
  #
  #   MERLIN_JVM_OPTS   (Optional) Java runtime options used when the command is
  #                       executed.
  #
  # -----------------------------------------------------------------------------
  
  usage()
  {
      echo "Usage: $0 {start|stop|run|restart|check}"
      exit 1
  }
  
  [ $# -gt 0 ] || usage
  
  ##################################################
  # Get the action & configs
  ##################################################
  
  ACTION=$1
  shift
  ARGS="$*"
  
  
  
  # OS specific support.  $var _must_ be set to either true or false.
  cygwin=false
  case "`uname`" in
  CYGWIN*) cygwin=true;;
  esac
  
  # resolve links - $0 may be a softlink
  THIS_PROG="$0"
  
  while [ -h "$THIS_PROG" ]; do
    ls=`ls -ld "$THIS_PROG"`
    link=`expr "$ls" : '.*-> \(.*\)$'`
    if expr "$link" : '.*/.*' > /dev/null; then
      THIS_PROG="$link"
    else
      THIS_PROG=`dirname "$THIS_PROG"`/"$link"
    fi
  done
  
  # Get standard environment variables
  PRGDIR=`dirname "$THIS_PROG"`
  MERLIN_HOME=`cd "$PRGDIR/.." ; pwd`
  
  unset THIS_PROG
  
  if [ -r "$MERLIN_HOME"/bin/setenv.sh ]; then
    . "$MERLIN_HOME"/bin/setenv.sh
  fi
  
  if [ -z "$MERLIN_TMPDIR" ] ; then
    MERLIN_TMPDIR=$MERLIN_HOME/tmp
  fi
  
  if [ ! -d "$MERLIN_TMPDIR" ] ; then
    mkdir "$MERLIN_TMPDIR" 
  fi
  
  # Checking for JAVA_HOME is required on *nix due
  # to some distributions stupidly including kaffe in /usr/bin
  if [ "$JAVA_HOME" = "" ] ; then
    echo "ERROR: JAVA_HOME not found in your environment."
    echo
    echo "Please, set the JAVA_HOME variable in your environment to match the"
    echo "location of the Java Virtual Machine you want to use."
    exit 1
  fi
  
  # For Cygwin, ensure paths are in UNIX format before anything is touched
  if $cygwin; then
    [ -n "$MERLIN_HOME" ] && MERLIN_HOME=`cygpath --unix "$MERLIN_HOME"`
  fi
  
  # For Cygwin, switch paths to Windows format before running java
  if $cygwin; then
    MERLIN_HOME=`cygpath --path --windows "$MERLIN_HOME"`
  fi
  
  # ----- Execute The Requested Command -----------------------------------------
  
  
  # Uncomment to get enable remote debugging
  # DEBUG="-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y"
  #
  # Command to overide JVM ext dir 
  # 
  # This is needed as some JVM vendors do foolish things 
  # like placing jaxp/jaas/xml-parser jars in ext dir 
  # thus breaking Merlin 
  # 
  JVM_EXT_DIRS="$MERLIN_HOME/ext" 
  if $cygwin; then
    JVM_EXT_DIRS=`cygpath --path --windows "$JVM_EXT_DIRS"` 
  fi
  JVM_OPTS="-Djava.ext.dirs=$JVM_EXT_DIRS" 
  
  # Get the run cmd
  RUN_CMD="$JAVA_HOME/bin/java $JVM_OPTS $DEBUG $MERLIN_JVM_OPTS -Dmerlin.home=$MERLIN_HOME
-jar $MERLIN_HOME/bin/lib/merlin-bootstrap-1.0.jar $*"
  
  echo "Using MERLIN_HOME:   $MERLIN_HOME"
  echo "Using JAVA_HOME:     $JAVA_HOME"
  echo "USing RUN_CMD:       $RUN_CMD"
  
  #####################################################
  # Find a PID for the pid file
  #####################################################
  if [  -z "$MERLIN_PID" ]
  then
    MERLIN_PID="$MERLIN_TMPDIR/merlin.pid"
  fi
  
  #####################################################
  # Find a location for the merlin console
  #####################################################
  MERLIN_CONSOLE="$MERLIN_TMPDIR/merlin.console"
  if [  -z "$MERLIN_CONSOLE" ]
  then
    if [ -w /dev/console ]
    then
      MERLIN_CONSOLE=/dev/console
    else
      MERLIN_CONSOLE=/dev/tty
    fi
  fi
  
  
  #####################################################
  # Action!
  #####################################################
  
  case "$ACTION" in
    start)
          echo "Starting Merlin: "
  
          if [ -f $MERLIN_PID ]
          then
              if ps -p `cat $MERLIN_PID` >/dev/null 2>/dev/null
              then
                  echo "Already Running!!"
                  exit 1
              fi
  
          fi
  
          echo "STARTED Merlin `date`" >> $MERLIN_CONSOLE
  
          nohup sh -c "exec $RUN_CMD >>$MERLIN_CONSOLE 2>&1" >/dev/null &
          echo $! > $MERLIN_PID
          echo "Merlin running pid="`cat $MERLIN_PID`
          ;;
  
    stop)
          PID=`cat $MERLIN_PID 2>/dev/null`
          echo "Shutting down Merlin: $PID"
          kill $PID 2>/dev/null
          sleep 2
          kill -9 $PID 2>/dev/null
          rm -f $MERLIN_PID
          echo "STOPPED `date`" >>$MERLIN_CONSOLE
          ;;
  
    restart)
          $0 stop $*
          sleep 5
          $0 start $*
          ;;
  
    supervise)
         #
         # Under control of daemontools supervise monitor which
         # handles restarts and shutdowns via the svc program.
         #
           exec $RUN_CMD
           ;;
  
    run|demo)
          echo "Running Merlin: "
          echo " "
  
          if [ -f $MERLIN_PID ]
          then
              echo "Already Running!!"
              exit 1
          fi
  
          exec $RUN_CMD
          ;;
  
    check)
          echo "Checking arguments to Merlin: "
          echo "MERLIN_HOME:     $MERLIN_HOME"
          echo "MERLIN_TMPDIR:   $MERLIN_TMPDIR"
          echo "MERLIN_JVM_OPTS: $MERLIN_JVM_OPTS"
          echo "JAVA_HOME:       $JAVA_HOME"
          echo "JVM_OPTS:        $JVM_OPTS"
          echo "CLASSPATH:       $CLASSPATH"
          echo "RUN_CMD:         $RUN_CMD"
          echo
  
          if [ -f $MERLIN_PID ]
          then
              echo "Merlin running pid="`cat $MERLIN_PID`
              exit 0
          fi
          exit 1
          ;;
  
  *)
          usage
          ;;
  esac
  
  exit 0
  
  
  
  
  
  
  1.1                  avalon-sandbox/merlin/merlin-platform/src/bin/merlinx.sh
  
  Index: merlinx.sh
  ===================================================================
  #! /bin/sh
  
  # Checking for JAVA_HOME is required on *nix due
  # to some distributions stupidly including kaffe in /usr/bin
  if [ "$JAVA_HOME" = "" ] ; then
    echo "ERROR: JAVA_HOME not found in your environment."
    echo
    echo "Please, set the JAVA_HOME variable in your environment to match the"
    echo "location of the Java Virtual Machine you want to use."
    exit 1
  fi
  
  # Checking for JAVA_HOME is required on *nix due
  # to some distributions stupidly including kaffe in /usr/bin
  if [ "$MERLIN_HOME" = "" ] ; then
    echo "ERROR: MERLIN_HOME not found in your environment."
    echo
    echo "Please, set the MERLIN_HOME variable in your environment to match the"
    echo "location of Merlin distribution."
    exit 1
  fi
  
  RUN_CMD="$JAVA_HOME/bin/java -Dmerlin.home=$MERLIN_HOME -Dmerlin.repository.local=%MAVEN_HOME%
-Djava.ext.dirs=$MERLIN_HOME/ext -jar $MERLIN_HOME/bin/lib/merlin-bootstrap-1.0.jar $*"
  echo "RUN CMD IS: $RUN_CMD"
  exec $RUN_CMD
  
  
  
  1.1                  avalon-sandbox/merlin/merlin-platform/src/bin/nt/InstallService-NT.bat
  
  Index: InstallService-NT.bat
  ===================================================================
  @echo off
  rem
  rem Find the application home.
  rem
  if "%OS%"=="Windows_NT" goto nt
  
  echo This is not NT, so please edit this script and set _APP_HOME manually
  set _APP_HOME=..\..
  
  goto conf
  
  :nt
  rem %~dp0 is name of current script under NT
  set _APP_HOME=%~dp0
  rem : operator works similar to make : operator
  set _APP_HOME=%_APP_HOME:\bin\nt\=%
  
  
  rem
  rem Find the wrapper.conf
  rem
  :conf
  set _WRAPPER_CONF="%~f1"
  if not %_WRAPPER_CONF%=="" goto startup
  set _WRAPPER_CONF="%_APP_HOME%\bin\nt\wrapper.conf"
  
  
  rem
  rem Run the application.
  rem At runtime, the current directory will be that of Wrapper.exe
  rem
  :startup
  "%_APP_HOME%\bin\nt\Wrapper.exe" -i %_WRAPPER_CONF%
  if not errorlevel 1 goto end
  pause
  
  :end
  set _APP_HOME=
  set _WRAPPER_CONF=
  
  
  
  
  1.1                  avalon-sandbox/merlin/merlin-platform/src/bin/nt/TANUKISOFTWARE_LICENSE.txt
  
  Index: TANUKISOFTWARE_LICENSE.txt
  ===================================================================
  Copyright (c) 1999, 2003 TanukiSoftware.org
  
  Permission is hereby granted, free of charge, to any person
  obtaining a copy of this software and associated documentation
  files (the "Software"), to deal in the Software without 
  restriction, including without limitation the rights to use, 
  copy, modify, merge, publish, distribute, sublicense, and/or 
  sell copies of the Software, and to permit persons to whom the
  Software is furnished to do so, subject to the following 
  conditions:
  
  The above copyright notice and this permission notice shall be
  included in all copies or substantial portions of the Software.
  
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
  OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
  HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  OTHER DEALINGS IN THE SOFTWARE.
  
  
  
  
  1.1                  avalon-sandbox/merlin/merlin-platform/src/bin/nt/UninstallService-NT.bat
  
  Index: UninstallService-NT.bat
  ===================================================================
  @echo off
  rem
  rem Find the application home.
  rem
  if "%OS%"=="Windows_NT" goto nt
  
  echo This is not NT, so please edit this script and set _APP_HOME manually
  set _APP_HOME=..\..
  
  goto conf
  
  :nt
  rem %~dp0 is name of current script under NT
  set _APP_HOME=%~dp0
  rem : operator works similar to make : operator
  set _APP_HOME=%_APP_HOME:\bin\nt\=%
  
  
  rem
  rem Find the wrapper.conf
  rem
  :conf
  set _WRAPPER_CONF="%~f1"
  if not %_WRAPPER_CONF%=="" goto startup
  set _WRAPPER_CONF="%_APP_HOME%\bin\nt\wrapper.conf"
  
  
  rem
  rem Run the application.
  rem At runtime, the current directory will be that of Wrapper.exe
  rem
  :startup
  "%_APP_HOME%\bin\nt\Wrapper.exe" -r %_WRAPPER_CONF%
  if not errorlevel 1 goto end
  pause
  
  :end
  set _APP_HOME=
  set _WRAPPER_CONF=
  
  
  
  
  1.1                  avalon-sandbox/merlin/merlin-platform/src/bin/nt/Wrapper.dll
  
  	<<Binary file>>
  
  
  1.1                  avalon-sandbox/merlin/merlin-platform/src/bin/nt/Wrapper.exe
  
  	<<Binary file>>
  
  
  1.1                  avalon-sandbox/merlin/merlin-platform/src/bin/nt/wrapper.conf
  
  Index: wrapper.conf
  ===================================================================
  #********************************************************************
  # Wrapper parameters
  #********************************************************************
  # Java Application
  wrapper.java.command=java
  
  # Java Main class
  wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp
  
  # Java Classpath (include wrapper.jar)  Add class path elements as
  #  needed starting from 1
  wrapper.java.classpath.1=wrapper.jar
  wrapper.java.classpath.2=../lib/merlin-bootstrap-1.0.jar
  
  # Java Library Path (location of Wrapper.DLL or libwrapper.so)
  wrapper.java.library.path.1=.
  
  # Java Additional Parameters
  wrapper.java.additional.1=-Dmerlin.home=%MERLIN_HOME%
  
  # Initial Java Heap Size (in MB)
  wrapper.java.initmemory=3
  
  # Maximum Java Heap Size (in MB)
  wrapper.java.maxmemory=64
  
  # Application parameters.  Add parameters as needed starting from 1
  wrapper.app.parameter.1=Merlin
  wrapper.app.parameter.2=-info
  wrapper.app.parameter.3=-kernel
  wrapper.app.parameter.4=%MERLIN_HOME%/config/nt/kernel.xml
  wrapper.app.parameter.5=-home
  wrapper.app.parameter.6=%MERLIN_HOME%
  wrapper.app.parameter.7=-config
  wrapper.app.parameter.8=%MERLIN_HOME%/config/nt/config.xml
  wrapper.app.parameter.9=%MERLIN_HOME%/config/nt/blocks/*.xml
  
  
  # Port which the native wrapper code will attempt to connect to
  wrapper.port=1777
  
  #********************************************************************
  # Wrapper Logging parameters
  #********************************************************************
  # Format of output for the console.  (See docs for formats)
  wrapper.console.format=PM
  
  # Log Level for console output.  (See docs for log levels)
  wrapper.console.loglevel=INFO
  
  # Log file to use for wrapper output logging.
  wrapper.logfile=../../logs/nt.log
  
  # Format of output for the log file.  (See docs for formats)
  wrapper.logfile.format=LPTM
  
  # Log Level for log file output.  (See docs for log levels)
  wrapper.logfile.loglevel=DEBUG
  
  # Maximum size that the log file will be allowed to grow to before
  #  the log is rolled. Size is specified in bytes.  The default value
  #  of 0, disables log rolling.  May abbreviate with the 'k' (kb) or
  #  'm' (mb) suffix.  For example: 10m = 10 megabytes.
  wrapper.logfile.maxsize=10m
  
  # Maximum number of rolled log files which will be allowed before old
  #  files are deleted.  The default value of 0 implies no limit.
  wrapper.logfile.maxfiles=10
  
  # Log Level for sys/event log output.  (See docs for log levels)
  wrapper.syslog.loglevel=NONE
  
  #********************************************************************
  # Wrapper NT Service parameters
  #********************************************************************
  # WARNING - Do not modify any of these parameters when an application
  #  using this configuration file has been installed as a service.
  #  Please uninstall the service before modifying this section.  The
  #  service can then be reinstalled.
  
  # Name of the service
  wrapper.ntservice.name=merlin
  
  # Display name of the service
  wrapper.ntservice.displayname=Merlin SMP 3.0
  
  # Description of the service
  wrapper.ntservice.description=Avalon Merlin Service Management Platform.
  
  # Service dependencies.  Add dependencies as needed starting from 1
  wrapper.ntservice.dependency.1=
  
  # Mode in which the service is installed.  AUTO_START or DEMAND_START
  wrapper.ntservice.starttype=AUTO_START
  
  # Priority at which the service is run.  NORMAL, LOW, HIGH, or
  #  REALTIME
  wrapper.ntservice.process_priority=NORMAL
  
  # Allow the service to interact with the desktop.
  wrapper.ntservice.interactive=false
  
  
  
  
  1.1                  avalon-sandbox/merlin/merlin-platform/src/bin/nt/wrapper.jar
  
  	<<Binary file>>
  
  
  1.9       +0 -8      avalon-sandbox/merlin/merlin-platform/src/config/kernel.xml
  
  Index: kernel.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/src/config/kernel.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- kernel.xml	21 Aug 2003 19:37:43 -0000	1.8
  +++ kernel.xml	24 Aug 2003 18:14:30 -0000	1.9
  @@ -19,13 +19,5 @@
        </hosts>
      </repository>
   
  -   <container name="root">
  -     <!-- 
  -     Add components, container or includes here.
  -     These resources will be available to any blocks included 
  -     during deployment from command line or script arguments.
  -     -->
  -   </container>
  -
   </kernel>
   
  
  
  
  1.9       +10 -8     avalon-sandbox/merlin/merlin-platform/src/config/wrapper.conf
  
  Index: wrapper.conf
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/src/config/wrapper.conf,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- wrapper.conf	23 Aug 2003 10:59:12 -0000	1.8
  +++ wrapper.conf	24 Aug 2003 18:14:30 -0000	1.9
  @@ -26,13 +26,15 @@
   
   # Application parameters.  Add parameters as needed starting from 1
   wrapper.app.parameter.1=Merlin
  -wrapper.app.parameter.2=-kernel
  -wrapper.app.parameter.3=%MERLIN_HOME%/config/kernel.xml
  -wrapper.app.parameter.4=-home
  -wrapper.app.parameter.5=%MERLIN_HOME%
  -wrapper.app.parameter.6=-config
  -wrapper.app.parameter.7=%MERLIN_HOME%/config/config.xml
  -wrapper.app.parameter.8=-info
  +wrapper.app.parameter.2=-info
  +wrapper.app.parameter.3=-kernel
  +wrapper.app.parameter.4=%MERLIN_HOME%/config/nt/kernel.xml
  +wrapper.app.parameter.5=-home
  +wrapper.app.parameter.6=%MERLIN_HOME%
  +wrapper.app.parameter.7=-config
  +wrapper.app.parameter.8=%MERLIN_HOME%/config/nt/config.xml
  +wrapper.app.parameter.9=%MERLIN_HOME%/config/nt/blocks/*.xml
  +
   
   # Port which the native wrapper code will attempt to connect to
   wrapper.port=1777
  @@ -47,7 +49,7 @@
   wrapper.console.loglevel=INFO
   
   # Log file to use for wrapper output logging.
  -wrapper.logfile=../logs/wrapper.log
  +wrapper.logfile=../logs/nt.log
   
   # Format of output for the log file.  (See docs for formats)
   wrapper.logfile.format=LPTM
  
  
  
  1.17      +0 -10     avalon-sandbox/merlin/merlin-plugin/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-plugin/project.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- project.xml	21 Aug 2003 19:37:43 -0000	1.16
  +++ project.xml	24 Aug 2003 18:14:30 -0000	1.17
  @@ -81,11 +81,6 @@
         <artifactId>avalon-meta-impl</artifactId>
         <version>SNAPSHOT</version>
       </dependency>
  -    <dependency>
  -      <groupId>avalon-meta</groupId>
  -      <artifactId>avalon-meta-tools</artifactId>
  -      <version>SNAPSHOT</version>
  -    </dependency>
   
       <dependency>
         <groupId>avalon-repository</groupId>
  @@ -121,7 +116,6 @@
         <version>1.0</version>
       </dependency>
   
  -
       <dependency>
         <id>excalibur-i18n</id>
         <version>1.0</version>
  @@ -199,10 +193,6 @@
       </dependency>
       <dependency>
           <id>xdoclet+xjavadoc</id>
  -        <version>1.2b2</version>
  -    </dependency>
  -    <dependency>
  -        <id>xdoclet+jmx-module</id>
           <version>1.2b2</version>
       </dependency>
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message