Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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
  • Loading branch information...
commit 1fddf9913ed2fa3931b727a2cee98513ce66f6d9 1 parent 519d9f3
Alfred Nathaniel authored
View
1  1ST_README.txt
@@ -0,0 +1 @@
+Please read project/README.txt.
View
11 project/.project
@@ -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>
View
36 README.txt → 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.
View
2  build-docs.sh → 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
View
0  build.sh → project/build.sh
File renamed without changes
View
2  cocoon.sh → 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
View
20 pom.xml → project/pom.xml
@@ -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>
View
0  settings.xml → project/settings.xml
File renamed without changes
Please sign in to comment.
Something went wrong with that request. Please try again.