Author: thorsten
Date: Wed Dec 12 03:05:26 2007
New Revision: 603559
URL: http://svn.apache.org/viewvc?rev=603559&view=rev
Log:
Dispatcher uses 1.5 feature so setting up jvm version. Using latest cocoon
versiones.
Added:
forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/application.properties
(with props)
Modified:
forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/pom.xml
forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/rcl.properties
Added:
forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/application.properties
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/application.properties?rev=603559&view=auto
==============================================================================
---
forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/application.properties
(added)
+++
forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/application.properties
Wed Dec 12 03:05:26 2007
@@ -0,0 +1 @@
+java.version=1.5
Propchange:
forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/application.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/pom.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/pom.xml?rev=603559&r1=603558&r2=603559&view=diff
==============================================================================
--- forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/pom.xml (original)
+++ forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/pom.xml Wed Dec 12
03:05:26 2007
@@ -18,9 +18,10 @@
under the License.
-->
<!--+
- | @version $Id: pom.xml 579823 2007-09-26 22:09:12Z reinhard $
+ | @version $Id: pom.xml 540441 2007-05-22 06:18:44Z reinhard $
+-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
@@ -34,23 +35,38 @@
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-core</artifactId>
- <version>2.2.0-RC2</version>
+ <version>2.2.0-RC3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-servlet-service-components</artifactId>
- <version>1.0.0-RC1</version>
+ <version>1.0.0-RC2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.forrest</groupId>
+ <artifactId>propertiesGenerator</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.forrest</groupId>
+ <artifactId>locationmap</artifactId>
+ <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-template-impl</artifactId>
- <version>1.0.0-RC2</version>
+ <version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-flowscript-impl</artifactId>
- <version>1.0.0-RC2</version>
+ <artifactId>cocoon-chaperon-impl</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
+ <!--<dependency>
+ <groupId>stax-utils</groupId>
+ <artifactId>stax-utils</artifactId>
+ <version>snapshot-20040917</version>
+ </dependency>-->
</dependencies>
<build>
@@ -58,7 +74,7 @@
<plugin>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-maven-plugin</artifactId>
- <version>1.0.0-M1</version>
+ <version>1.0.0-RC1-SNAPSHOT</version>
<executions>
<execution>
<id>rcl</id>
@@ -70,17 +86,27 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.5</version>
+ <version>6.1.3</version>
<configuration>
<connectors>
- <connector
implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+ <connector
+ implementation="org.mortbay.jetty.nio.SelectChannelConnector">
<port>8888</port>
<maxIdleTime>30000</maxIdleTime>
</connector>
</connectors>
-
<webAppSourceDirectory>${project.build.directory}/rcl/webapp</webAppSourceDirectory>
+ <webAppSourceDirectory>
+ ${project.build.directory}/rcl/webapp</webAppSourceDirectory>
<contextPath>/</contextPath>
<systemProperties>
<systemProperty>
@@ -88,6 +114,8 @@
<value>dev</value>
</systemProperty>
</systemProperties>
+ <source>1.5</source>
+ <target>1.5</target>
</configuration>
</plugin>
<plugin>
@@ -99,6 +127,8 @@
<Cocoon-Block-Name>${pom.artifactId}</Cocoon-Block-Name>
</manifestEntries>
</archive>
+ <source>1.5</source>
+ <target>1.5</target>
</configuration>
</plugin>
<plugin>
Modified: forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/rcl.properties
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/rcl.properties?rev=603559&r1=603558&r2=603559&view=diff
==============================================================================
--- forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/rcl.properties
(original)
+++ forrest/trunk/whiteboard/cocoon-2.2-blocks/dispatcher/rcl.properties Wed
Dec 12 03:05:26 2007
@@ -14,4 +14,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-org.apache.forrest.dispatcher.service%classes-dir=./target/classes
\ No newline at end of file
+org.apache.forrest.dispatcher.block%classes-dir=./target/classes
+org.apache.forrest.propertiesGenerator.block%classes-dir=../propertiesGenerator/target/classes
\ No newline at end of file
