From 1fddf9913ed2fa3931b727a2cee98513ce66f6d9 Mon Sep 17 00:00:00 2001 From: Alfred Nathaniel Date: Fri, 30 May 2008 21:40:23 +0000 Subject: [PATCH] Move all files from /trunk to /trunk/project. Otherwise these files would never show up in Eclipse. git-svn-id: https://svn.apache.org/repos/asf/cocoon/trunk@661886 13f79535-47bb-0310-9956-ffa450edef68 --- 1ST_README.txt | 1 + project/.project | 11 ++++++++ README.txt => project/README.txt | 36 ++++++++++++++++---------- build-docs.sh => project/build-docs.sh | 2 +- build.sh => project/build.sh | 0 cocoon.sh => project/cocoon.sh | 2 +- pom.xml => project/pom.xml | 20 +++++++------- settings.xml => project/settings.xml | 0 8 files changed, 47 insertions(+), 25 deletions(-) create mode 100644 1ST_README.txt create mode 100644 project/.project rename README.txt => project/README.txt (81%) rename build-docs.sh => project/build-docs.sh (98%) rename build.sh => project/build.sh (100%) rename cocoon.sh => project/cocoon.sh (94%) rename pom.xml => project/pom.xml (79%) rename settings.xml => project/settings.xml (100%) diff --git a/1ST_README.txt b/1ST_README.txt new file mode 100644 index 00000000000..4a87632d21c --- /dev/null +++ b/1ST_README.txt @@ -0,0 +1 @@ +Please read project/README.txt. diff --git a/project/.project b/project/.project new file mode 100644 index 00000000000..217cf6bd749 --- /dev/null +++ b/project/.project @@ -0,0 +1,11 @@ + + + cocoon-22-project + Apache Cocoon project POM + + + + + + + diff --git a/README.txt b/project/README.txt similarity index 81% rename from README.txt rename to project/README.txt index 5f1826f5126..495da21f04e 100644 --- a/README.txt +++ b/project/README.txt @@ -11,7 +11,7 @@ PREREQUISITES 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 @@ process. 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 @@ the message: 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 @@ HOW TO MOUNT THE PROJECTS IN INTELLIJ ------------------------------------ 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 @@ HOW TO START THE COCOON WEBAPP 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. diff --git a/build-docs.sh b/project/build-docs.sh similarity index 98% rename from build-docs.sh rename to project/build-docs.sh index c9ad88f52ad..1c61815c1f8 100755 --- a/build-docs.sh +++ b/project/build-docs.sh @@ -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 diff --git a/build.sh b/project/build.sh similarity index 100% rename from build.sh rename to project/build.sh diff --git a/cocoon.sh b/project/cocoon.sh similarity index 94% rename from cocoon.sh rename to project/cocoon.sh index 55a75460f3d..8ce00946b41 100755 --- a/cocoon.sh +++ b/project/cocoon.sh @@ -33,6 +33,6 @@ do 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 diff --git a/pom.xml b/project/pom.xml similarity index 79% rename from pom.xml rename to project/pom.xml index c5469d394d6..a1d4cef1d91 100644 --- a/pom.xml +++ b/project/pom.xml @@ -28,23 +28,23 @@ org.apache.cocoon - cocoon-parent + cocoon-project 1 Apache Cocoon [build root] 1999 http://cocoon.apache.org - parent - tools - blocks - commons - core - dists + ../parent + ../tools + ../blocks + ../commons + ../core + ../dists - subprojects - core/cocoon-servlet-service/cocoon-servlet-service-components - core/cocoon-servlet-service/cocoon-servlet-service-components-sample + ../subprojects + ../core/cocoon-servlet-service/cocoon-servlet-service-components + ../core/cocoon-servlet-service/cocoon-servlet-service-components-sample diff --git a/settings.xml b/project/settings.xml similarity index 100% rename from settings.xml rename to project/settings.xml