cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdelacre...@apache.org
Subject svn commit: r312623 - in /cocoon/branches/BRANCH_2_1_X: cocoon.sh status.xml
Date Mon, 10 Oct 2005 11:39:55 GMT
Author: bdelacretaz
Date: Mon Oct 10 04:39:51 2005
New Revision: 312623

URL: http://svn.apache.org/viewcvs?rev=312623&view=rev
Log:
cocoon.sh: 'servlet' is now the default action

Modified:
    cocoon/branches/BRANCH_2_1_X/cocoon.sh
    cocoon/branches/BRANCH_2_1_X/status.xml

Modified: cocoon/branches/BRANCH_2_1_X/cocoon.sh
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/cocoon.sh?rev=312623&r1=312622&r2=312623&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/cocoon.sh (original)
+++ cocoon/branches/BRANCH_2_1_X/cocoon.sh Mon Oct 10 04:39:51 2005
@@ -55,17 +55,23 @@
     echo "Usage: $0 (action)"
     echo "actions:"
     echo "  cli               Run Cocoon from the command line"
-    echo "  servlet           Run Cocoon in a servlet container"
+    echo "  servlet           Run Cocoon in a servlet container (default)"
     echo "  servlet-admin     Run Cocoon in a servlet container and turn on container web
administration"
     echo "  servlet-debug     Run Cocoon in a servlet container and turn on JVM remote debug"
     echo "  servlet-profile   Run Cocoon in a servlet container and turn on JVM profiling"
     exit 1
 }
 
-[ $# -gt 0 ] || usage
-
-ACTION=$1
-shift
+# ----- Handle action parameter ------------------------------------------------
+DEFAULT_ACTION="servlet"
+ACTION="$1"
+if [ -n "$ACTION" ]
+then
+  shift
+else
+  ACTION=$DEFAULT_ACTION
+  echo "$0: executing default action '$ACTION', use -h to see other actions"
+fi
 ARGS="$*"
 
 # ----- Verify and Set Required Environment Variables -------------------------

Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/status.xml?rev=312623&r1=312622&r2=312623&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Mon Oct 10 04:39:51 2005
@@ -197,6 +197,9 @@
 
   <changes>
   <release version="@version@" date="@date@">
+    <action dev="BD" type="update">
+      cocoon.sh and cocoon.bat (done by CZ): "servlet" is now the default action.
+    </action>
     <action dev="VG" type="update">
       Update Avalon framework to 4.3, Avalon LogKit to 2.1, Excalibur Instrument to 2.1,
       Excalibur Logger to 2.1, Excalibur Pool to 2.1, Excalibur SourceResolve to 2.1,



Mime
View raw message