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-platform/src/bin security.policy merlin-server.sh merlin.bat merlin.sh merlinx.bat merlinx.sh
Date Fri, 12 Sep 2003 15:25:15 GMT
mcconnell    2003/09/12 08:25:15

  Modified:    merlin/merlin-platform/src/bin merlin-server.sh merlin.bat
                        merlin.sh merlinx.bat merlinx.sh
  Added:       merlin/merlin-platform/src/bin security.policy
  Log:
  Add a security policy definition.
  
  Revision  Changes    Path
  1.2       +1 -1      avalon-sandbox/merlin/merlin-platform/src/bin/merlin-server.sh
  
  Index: merlin-server.sh
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/src/bin/merlin-server.sh,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- merlin-server.sh	24 Aug 2003 18:14:30 -0000	1.1
  +++ merlin-server.sh	12 Sep 2003 15:25:15 -0000	1.2
  @@ -110,7 +110,7 @@
   if $cygwin; then
     JVM_EXT_DIRS=`cygpath --path --windows "$JVM_EXT_DIRS"` 
   fi
  -JVM_OPTS="-Djava.ext.dirs=$JVM_EXT_DIRS" 
  +JVM_OPTS="-Djava.security.policy=$MERLIN_HOME/bin/security.policy -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 $*"
  
  
  
  1.8       +1 -1      avalon-sandbox/merlin/merlin-platform/src/bin/merlin.bat
  
  Index: merlin.bat
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/src/bin/merlin.bat,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- merlin.bat	25 Aug 2003 16:41:04 -0000	1.7
  +++ merlin.bat	12 Sep 2003 15:25:15 -0000	1.8
  @@ -15,7 +15,7 @@
   set MERLIN_CMD_LINE_ARGS=%*
   set MERLIN_BOOTSTRAP_JAR=%MERLIN_HOME%\bin\lib\merlin-bootstrap-1.0.jar
   set MERLIN_EXT_DIR=%MERLIN_HOME%\ext
  -java -Dmerlin.home=%MERLIN_HOME% -Djava.ext.dirs=%MERLIN_EXT_DIR% -jar %MERLIN_BOOTSTRAP_JAR%
%MERLIN_CMD_LINE_ARGS%
  +java -Djava.security.policy=%MERLIN_HOME%\bin\security.policy -Dmerlin.home=%MERLIN_HOME%
-Djava.ext.dirs=%MERLIN_EXT_DIR% -jar %MERLIN_BOOTSTRAP_JAR% %MERLIN_CMD_LINE_ARGS%
   goto EndOfScript
   
   :EndOfScript
  
  
  
  1.9       +1 -1      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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- merlin.sh	24 Aug 2003 18:14:30 -0000	1.8
  +++ merlin.sh	12 Sep 2003 15:25:15 -0000	1.9
  @@ -20,6 +20,6 @@
     exit 1
   fi
   
  -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 $*"
  +RUN_CMD="$JAVA_HOME/bin/java -Djava.security.policy=$MERLIN_HOME/bin/security.policy -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.6       +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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- merlinx.bat	27 Aug 2003 10:19:21 -0000	1.5
  +++ merlinx.bat	12 Sep 2003 15:25:15 -0000	1.6
  @@ -12,7 +12,7 @@
   set MERLIN_CMD_LINE_ARGS=%*
   set MERLIN_BOOTSTRAP_JAR=%MERLIN_HOME%\bin\lib\merlin-bootstrap-1.0.jar
   set MERLIN_EXT_DIR=%MERLIN_HOME%\ext
  -java -Dmerlin.home=%MERLIN_HOME% -Dmerlin.repository.local=%MERLIN_BOOTSTRAP_REPO% -Djava.ext.dirs=%MERLIN_EXT_DIR%
-jar %MERLIN_BOOTSTRAP_JAR% %MERLIN_CMD_LINE_ARGS%
  +java -Djava.security.policy=%MERLIN_HOME%\bin\security.policy -Dmerlin.home=%MERLIN_HOME%
-Dmerlin.repository.local=%MERLIN_BOOTSTRAP_REPO% -Djava.ext.dirs=%MERLIN_EXT_DIR% -jar %MERLIN_BOOTSTRAP_JAR%
%MERLIN_CMD_LINE_ARGS%
   goto :EndOfScript
   
   :MissingHomeDefinition
  
  
  
  1.3       +1 -1      avalon-sandbox/merlin/merlin-platform/src/bin/merlinx.sh
  
  Index: merlinx.sh
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/src/bin/merlinx.sh,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- merlinx.sh	27 Aug 2003 10:28:19 -0000	1.2
  +++ merlinx.sh	12 Sep 2003 15:25:15 -0000	1.3
  @@ -28,6 +28,6 @@
    REPOSITORY="$MAVEN_HOME_LOCAL"
   fi
   
  -RUN_CMD="$JAVA_HOME/bin/java -Dmerlin.home=$MERLIN_HOME -Dmerlin.repository.local=$REPOSITORY
-Djava.ext.dirs=$MERLIN_HOME/ext -jar $MERLIN_HOME/bin/lib/merlin-bootstrap-1.0.jar $*"
  +RUN_CMD="$JAVA_HOME/bin/java -Djava.security.policy=$MERLIN_HOME/bin/security.policy -Dmerlin.home=$MERLIN_HOME
-Dmerlin.repository.local=$REPOSITORY -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/security.policy
  
  Index: security.policy
  ===================================================================
  grant { 
          permission java.security.AllPermission;
  };
  
  
  
  

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


Mime
View raw message