You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/05/15 20:29:00 UTC
svn commit: r406702 - in /cocoon/trunk: README.txt core/cocoon-core/pom.xml
core/cocoon-core/src/main/java/org/apache/cocoon/servlet/CocoonServlet.java
core/cocoon-core/src/main/resources/org/apache/cocoon/cocoon.properties
core/cocoon-webapp/pom.xml
Author: cziegeler
Date: Mon May 15 11:28:59 2006
New Revision: 406702
URL: http://svn.apache.org/viewcvs?rev=406702&view=rev
Log:
Update readme
Filter resources in core
Improve logging if an error occurs during initialization
Add some more blocks to default webapp
Modified:
cocoon/trunk/README.txt
cocoon/trunk/core/cocoon-core/pom.xml
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/CocoonServlet.java
cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/cocoon.properties
cocoon/trunk/core/cocoon-webapp/pom.xml
Modified: cocoon/trunk/README.txt
URL: http://svn.apache.org/viewcvs/cocoon/trunk/README.txt?rev=406702&r1=406701&r2=406702&view=diff
==============================================================================
--- cocoon/trunk/README.txt (original)
+++ cocoon/trunk/README.txt Mon May 15 11:28:59 2006
@@ -45,14 +45,14 @@
----------------------------------------------
0. checkout complete trunk and
- $ mvn clean install -Dmaven.test.skip=true
+ $ mvn clean install
- Call this until you get "BUILD SUCCESSFUL" - sometimes donwloads from maven
+ Call this until you get "BUILD SUCCESSFUL" - sometimes downloads from maven
repositories are temporarily unaccessible and cause the build to fail.
1. go to core/cocoon-webapp
$ mvn cocoon:deploy
- $ mvn jetty6:run
+ $ mvn jetty6:run-exploded
2. point your browser to http://localhost:8888/ or http://localhost:8888/apps/cocoon-deployer-plugin-demo/test
Modified: cocoon/trunk/core/cocoon-core/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/cocoon-core/pom.xml?rev=406702&r1=406701&r2=406702&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/pom.xml (original)
+++ cocoon/trunk/core/cocoon-core/pom.xml Mon May 15 11:28:59 2006
@@ -86,6 +86,12 @@
</configuration>
</plugin>
</plugins>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
</build>
<dependencies>
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/CocoonServlet.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/CocoonServlet.java?rev=406702&r1=406701&r2=406702&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/CocoonServlet.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/CocoonServlet.java Mon May 15 11:28:59 2006
@@ -45,6 +45,7 @@
import org.apache.cocoon.environment.http.HttpEnvironment;
import org.apache.cocoon.servlet.multipart.MultipartHttpServletRequest;
import org.apache.cocoon.servlet.multipart.RequestFactory;
+import org.apache.commons.lang.exception.ExceptionUtils;
import org.apache.commons.lang.time.StopWatch;
/**
@@ -124,6 +125,8 @@
this.coreUtil = new CoreUtil(this.environmentContext, env);
this.log = this.coreUtil.getRootLogger();
} catch (Exception e) {
+ this.servletContext.log("Error during initialization - aborting.");
+ this.servletContext.log(ExceptionUtils.getFullStackTrace(e));
if ( e instanceof ServletException ) {
throw (ServletException)e;
}
Modified: cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/cocoon.properties
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/cocoon.properties?rev=406702&r1=406701&r2=406702&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/cocoon.properties (original)
+++ cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/cocoon.properties Mon May 15 11:28:59 2006
@@ -18,11 +18,7 @@
# WARNING: you shouldn't need to modify anything below here since there is a
# very high chance of breaking the build system. Do it only if you know what
# you're doing.
-
-version=2.2.0-dev
-released.version=2.1.7
-year=1999-2005
-name=cocoon
-Name=Cocoon
-fullname=Apache Cocoon
+version=${pom.version}
+released.version=2.1.9
+year=1999-2006
build.info=@date@ (TargetVM=@target.vm@, SourceVM=@source.vm@, Debug=@compiler.debug@, Optimize=@compiler.optimize@)
Modified: cocoon/trunk/core/cocoon-webapp/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/cocoon-webapp/pom.xml?rev=406702&r1=406701&r2=406702&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/pom.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/pom.xml Mon May 15 11:28:59 2006
@@ -94,6 +94,16 @@
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-ajax-sample</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-fop-sample</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-fop-sample</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>