svn commit: r367014 - in /cocoon/trunk: README.m10n.txt cocoon.sh

[da...@apache.org]

Author: danielf
Date: Sun Jan  8 02:13:39 2006
New Revision: 367014

URL: http://svn.apache.org/viewcvs?rev=367014&view=rev
Log:
Making cocoon.sh use the webapp from mvn war:inplace.

Modified:
    cocoon/trunk/README.m10n.txt
    cocoon/trunk/cocoon.sh

Modified: cocoon/trunk/README.m10n.txt
URL: http://svn.apache.org/viewcvs/cocoon/trunk/README.m10n.txt?rev=367014&r1=367013&r2=367014&view=diff
==============================================================================
--- cocoon/trunk/README.m10n.txt (original)
+++ cocoon/trunk/README.m10n.txt Sun Jan  8 02:13:39 2006
@@ -45,4 +45,6 @@
 
 FIXME: The above doesn't work yet. The jetty plugin require the precence of the directory
 target/classes, which isn't added by any of the above goals so it has to be added manually.
-Cocoon fails during startup.
\ No newline at end of file
+Cocoon fails during startup.
+
+2b. Use ./cocoon.sh instead.

Modified: cocoon/trunk/cocoon.sh
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon.sh?rev=367014&r1=367013&r2=367014&view=diff
==============================================================================
--- cocoon/trunk/cocoon.sh (original)
+++ cocoon/trunk/cocoon.sh Sun Jan  8 02:13:39 2006
@@ -109,7 +109,9 @@
     COCOON_WEBAPP_HOME=$STANDALONE_WEBAPP
   else
     # when in the build environment
-    COCOON_WEBAPP_HOME="$COCOON_HOME/build/webapp"
+    # COCOON_WEBAPP_HOME="$COCOON_HOME/build/webapp"
+    # For mvn war:inplace
+    COCOON_WEBAPP_HOME="$COCOON_HOME/cocoon-webapp/src/main/webapp"
   fi
 fi
 echo "$0: using $COCOON_WEBAPP_HOME as the webapp directory"