Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r661886 - in /cocoon/trunk: ./ project/
Date: Fri, 30 May 2008 21:40:23 -0000
To: cvs@cocoon.apache.org
From: anathaniel@apache.org
Message-Id: <20080530214024.38D5B23889BA@eris.apache.org>

Author: anathaniel
Date: Fri May 30 14:40:23 2008
New Revision: 661886

URL: http://svn.apache.org/viewvc?rev=661886&view=rev
Log:
Move all files from /trunk to /trunk/project.
Otherwise these files would never show up in Eclipse.

Added:
    cocoon/trunk/1ST_README.txt
    cocoon/trunk/project/
    cocoon/trunk/project/.project
    cocoon/trunk/project/README.txt
      - copied, changed from r661475, cocoon/trunk/README.txt
    cocoon/trunk/project/build-docs.sh
      - copied, changed from r661475, cocoon/trunk/build-docs.sh
    cocoon/trunk/project/build.sh
      - copied unchanged from r661475, cocoon/trunk/build.sh
    cocoon/trunk/project/cocoon.sh
      - copied, changed from r661475, cocoon/trunk/cocoon.sh
    cocoon/trunk/project/pom.xml
      - copied, changed from r661475, cocoon/trunk/pom.xml
    cocoon/trunk/project/settings.xml
      - copied unchanged from r661475, cocoon/trunk/settings.xml
Removed:
    cocoon/trunk/README.txt
    cocoon/trunk/build-docs.sh
    cocoon/trunk/build.sh
    cocoon/trunk/cocoon.sh
    cocoon/trunk/pom.xml
    cocoon/trunk/settings.xml

Added: cocoon/trunk/1ST_README.txt
URL: http://svn.apache.org/viewvc/cocoon/trunk/1ST_README.txt?rev=661886&view=auto
==============================================================================
--- cocoon/trunk/1ST_README.txt (added)
+++ cocoon/trunk/1ST_README.txt Fri May 30 14:40:23 2008
@@ -0,0 +1 @@
+Please read project/README.txt.

Added: cocoon/trunk/project/.project
URL: http://svn.apache.org/viewvc/cocoon/trunk/project/.project?rev=661886&view=auto
==============================================================================
--- cocoon/trunk/project/.project (added)
+++ cocoon/trunk/project/.project Fri May 30 14:40:23 2008
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>cocoon-22-project</name>
+	<comment>Apache Cocoon project POM</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>

Copied: cocoon/trunk/project/README.txt (from r661475, cocoon/trunk/README.txt)
URL: http://svn.apache.org/viewvc/cocoon/trunk/project/README.txt?p2=cocoon/trunk/project/README.txt&p1=cocoon/trunk/README.txt&r1=661475&r2=661886&rev=661886&view=diff
==============================================================================
--- cocoon/trunk/README.txt (original)
+++ cocoon/trunk/project/README.txt Fri May 30 14:40:23 2008
@@ -11,7 +11,7 @@
 You need a JDK, 1.4.x, 1.5.x, 1.6.x, or 1.7.x.
 When experimenting with trunk, 1.5.x is probably the best bet.
 
-Maven 2 must be installed (at least 2.0.6).
+Maven 2 must be installed (at least 2.0.9).
 
 
 MAVEN REPOSITORY MIRRORS
@@ -27,7 +27,7 @@
 
 To build Cocoon, use the following command:
 
-  $ mvn -P allblocks install
+  $ build.sh install
 
 In case of any failures, repeat command as necessary till you see
 the message:
@@ -37,22 +37,21 @@
 If you have consistent build failures due to a missing cocoon-rcl
 artefact, then run first
 
-  $ cd tools
+  $ cd ../tools
   $ mvn clean install
 
 If you have build failures due to out-of-memory conditions, increase
-the JVM maximum memory limit:
+the JVM maximum memory limit in build.sh:
  
-  $ MAVEN_OPTS="-Xmx200m"
-  $ export MAVEN_OPTS
+  $ MAVEN_OPTS="-Xmx256m"
 
 
 HOW TO MOUNT THE PROJECTS IN ECLIPSE
 ------------------------------------
 
-from /trunk, run
+from /trunk/project, run
 
-  $ mvn -P allblocks eclipse:clean eclipse:eclipse
+  $ build.sh eclipse:clean eclipse:eclipse
 
 Next go to eclipse, and make sure you haven't got trunk mounted as a
 project already.  Also remove .classpath and .project files possibly
@@ -78,13 +77,13 @@
 ------------------------------------
 
 First, build all the projects as described above.
-Next, from /trunk, run
+Next, from /trunk/project, run
 
   $ mvn -P allblocks idea:idea
 
 In IntelliJ select File - Open Project...  Navigate to the trunk directory and select cocoon.ipr.
 
-For further information about hte maven idea plugin visit
+For further information about the maven idea plugin visit
 
   http://maven.apache.org/plugins/maven-idea-plugin/
   
@@ -95,15 +94,26 @@
 Checkout complete trunk and build it. If clean rebuild is desired,
 use command:
 
-  $ mvn -P allblocks clean install
+  $ build.sh clean install
 
 Call this until you get "BUILD SUCCESSFUL" - sometimes downloads from maven
 repositories are temporarily unaccessible and cause the build to fail.
 
-Go to core/cocoon-webapp:
-  $ mvn jetty:run
+To start Cocoon within Jetty, use command:
+
+  $ cocoon.sh
 
 Point your browser to http://localhost:8888/
 
 (Don't use jetty:run-exploded as in this case the jetty6 plugin will
  alter the webapp build by the Cocoon deployer again!)
+
+
+HOW TO DEBUG THE COCOON WEBAPP
+------------------------------
+
+To start Cocoon with JVM debug enabled, use command:
+
+  $ cocoon.sh debug
+
+Then tell your IDE to connect to JVM debug on port localhost:5005.

Copied: cocoon/trunk/project/build-docs.sh (from r661475, cocoon/trunk/build-docs.sh)
URL: http://svn.apache.org/viewvc/cocoon/trunk/project/build-docs.sh?p2=cocoon/trunk/project/build-docs.sh&p1=cocoon/trunk/build-docs.sh&r1=661475&r2=661886&rev=661886&view=diff
==============================================================================
--- cocoon/trunk/build-docs.sh (original)
+++ cocoon/trunk/project/build-docs.sh Fri May 30 14:40:23 2008
@@ -16,7 +16,7 @@
 # limitations under the License.
 
 mvn install -N
-cd site
+cd ../site
 MAVEN_OPTS=-Xmx512M
 export MAVEN_OPTS
 mvn site-deploy -P localDocs -Ddocs.repoUrl=http://localhost:9263

Copied: cocoon/trunk/project/cocoon.sh (from r661475, cocoon/trunk/cocoon.sh)
URL: http://svn.apache.org/viewvc/cocoon/trunk/project/cocoon.sh?p2=cocoon/trunk/project/cocoon.sh&p1=cocoon/trunk/cocoon.sh&r1=661475&r2=661886&rev=661886&view=diff
==============================================================================
--- cocoon/trunk/cocoon.sh (original)
+++ cocoon/trunk/project/cocoon.sh Fri May 30 14:40:23 2008
@@ -33,6 +33,6 @@
 done
 
 export MAVEN_OPTS
-cd core/cocoon-webapp && echo "Starting in `pwd`" && mvn jetty:run
+cd ../core/cocoon-webapp && echo "Starting in `pwd`" && mvn jetty:run
 
 cd $CWD

Copied: cocoon/trunk/project/pom.xml (from r661475, cocoon/trunk/pom.xml)
URL: http://svn.apache.org/viewvc/cocoon/trunk/project/pom.xml?p2=cocoon/trunk/project/pom.xml&p1=cocoon/trunk/pom.xml&r1=661475&r2=661886&rev=661886&view=diff
==============================================================================
--- cocoon/trunk/pom.xml (original)
+++ cocoon/trunk/project/pom.xml Fri May 30 14:40:23 2008
@@ -28,23 +28,23 @@
   </parent>
 
   <groupId>org.apache.cocoon</groupId>
-  <artifactId>cocoon-parent</artifactId>
+  <artifactId>cocoon-project</artifactId>
   <version>1</version>
   <name>Apache Cocoon [build root]</name>
   <inceptionYear>1999</inceptionYear>
   <url>http://cocoon.apache.org</url>
 
   <modules>
-    <module>parent</module>
-    <module>tools</module>
-    <module>blocks</module>
-    <module>commons</module>
-    <module>core</module>
-    <module>dists</module>
+    <module>../parent</module>
+    <module>../tools</module>
+    <module>../blocks</module>
+    <module>../commons</module>
+    <module>../core</module>
+    <module>../dists</module>
     <!-- sub projects -->
-    <module>subprojects</module>
-    <module>core/cocoon-servlet-service/cocoon-servlet-service-components</module>
-    <module>core/cocoon-servlet-service/cocoon-servlet-service-components-sample</module>
+    <module>../subprojects</module>
+    <module>../core/cocoon-servlet-service/cocoon-servlet-service-components</module>
+    <module>../core/cocoon-servlet-service/cocoon-servlet-service-components-sample</module>
   </modules>
 
   <organization>