You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2008/04/23 16:01:50 UTC
svn commit: r650874 - in /cocoon/whiteboard/corona/trunk: ./
corona-pipeline/ corona-sample-webapp/ corona-sample/
corona-sample/src/main/java/org/ corona-sample/src/test/java/org/
corona-sample/src/test/resources/COB-INF/ corona-servlet/ corona-servle...
Author: reinhard
Date: Wed Apr 23 07:01:43 2008
New Revision: 650874
URL: http://svn.apache.org/viewvc?rev=650874&view=rev
Log:
. fix names in files after renaming directories
. remove duplicate resources
Removed:
cocoon/whiteboard/corona/trunk/corona-sample/src/main/java/org/
cocoon/whiteboard/corona/trunk/corona-sample/src/test/java/org/
cocoon/whiteboard/corona/trunk/corona-sample/src/test/resources/COB-INF/
cocoon/whiteboard/corona/trunk/corona-servlet/rcl.properties
cocoon/whiteboard/corona/trunk/corona-servlet/src/main/resources/COB-INF/
cocoon/whiteboard/corona/trunk/corona-servlet/src/main/resources/META-INF/
cocoon/whiteboard/corona/trunk/corona-servlet/src/main/resources/aggregation/
cocoon/whiteboard/corona/trunk/corona-servlet/src/main/resources/corona-servlet-1.0.xsd
cocoon/whiteboard/corona/trunk/corona-servlet/src/main/resources/error-handling/
cocoon/whiteboard/corona/trunk/corona-servlet/src/main/resources/overview.html
cocoon/whiteboard/corona/trunk/corona-servlet/src/main/resources/read/
cocoon/whiteboard/corona/trunk/corona-servlet/src/main/resources/sax-pipeline/
cocoon/whiteboard/corona/trunk/corona-servlet/src/main/resources/xslt/
cocoon/whiteboard/corona/trunk/corona-servlet/src/test/java/org/
cocoon/whiteboard/corona/trunk/corona-servlet/src/test/resources/COB-INF/
Modified:
cocoon/whiteboard/corona/trunk/corona-pipeline/pom.xml
cocoon/whiteboard/corona/trunk/corona-sample-webapp/pom.xml
cocoon/whiteboard/corona/trunk/corona-sample/pom.xml
cocoon/whiteboard/corona/trunk/corona-servlet/pom.xml
cocoon/whiteboard/corona/trunk/corona-sitemap/pom.xml
cocoon/whiteboard/corona/trunk/parent/pom.xml
cocoon/whiteboard/corona/trunk/pom.xml
Modified: cocoon/whiteboard/corona/trunk/corona-pipeline/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-pipeline/pom.xml?rev=650874&r1=650873&r2=650874&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-pipeline/pom.xml (original)
+++ cocoon/whiteboard/corona/trunk/corona-pipeline/pom.xml Wed Apr 23 07:01:43 2008
@@ -31,10 +31,10 @@
<relativePath>../parent</relativePath>
</parent>
- <artifactId>corona-core</artifactId>
+ <artifactId>corona-pipeline</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <name>Cocoon Corona: Core [jar]</name>
- <description>The core of Cocoon Corona. A Servlet API independent implementation of XML pipelines.</description>
+ <name>Cocoon Corona: Pipeline [jar]</name>
+ <description>The core of Cocoon Corona. A Servlet API independent implementation of pipelines.</description>
<dependencies>
<dependency>
Modified: cocoon/whiteboard/corona/trunk/corona-sample-webapp/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-sample-webapp/pom.xml?rev=650874&r1=650873&r2=650874&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-sample-webapp/pom.xml (original)
+++ cocoon/whiteboard/corona/trunk/corona-sample-webapp/pom.xml Wed Apr 23 07:01:43 2008
@@ -30,7 +30,7 @@
<relativePath>../parent/pom.xml</relativePath>
</parent>
<name>Cocoon Corona: Webapplication sample [war]</name>
- <artifactId>corona-webapp-sample</artifactId>
+ <artifactId>corona-sample-webapp</artifactId>
<version>1.0.0-SNAPSHOT</version>
<build>
@@ -38,7 +38,6 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.7</version>
<configuration>
<connectors>
<connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
@@ -62,7 +61,6 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.14</version>
</dependency>
</dependencies>
Modified: cocoon/whiteboard/corona/trunk/corona-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-sample/pom.xml?rev=650874&r1=650873&r2=650874&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-sample/pom.xml (original)
+++ cocoon/whiteboard/corona/trunk/corona-sample/pom.xml Wed Apr 23 07:01:43 2008
@@ -30,60 +30,26 @@
<relativePath>../parent/pom.xml</relativePath>
</parent>
- <artifactId>corona-servlet</artifactId>
+ <artifactId>corona-sample</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <name>Cocoon Corona: Servlet [jar]</name>
- <description>Using Cocoon Corona within the Servlet Service framework.</description>
+ <name>Cocoon Corona: Sample [jar]</name>
+ <description>Cocoon Corona samples.</description>
<dependencies>
<!-- Corona -->
<dependency>
<groupId>org.apache.cocoon</groupId>
- <artifactId>corona-sitemap</artifactId>
+ <artifactId>corona-servlet</artifactId>
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>corona-controller</artifactId>
</dependency>
-
- <!-- Cocoon subprojects -->
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-servlet-service-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-spring-configurator</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-jnet</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-block-deployment</artifactId>
- </dependency>
-
- <!-- Spring AOP support -->
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- </dependency>
- <dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>aspectjrt</artifactId>
- </dependency>
- <dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>aspectjweaver</artifactId>
- </dependency>
-
- <!-- Other libraries -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
- </dependency>
+ </dependency>
<!-- Test dependencies -->
<dependency>
Modified: cocoon/whiteboard/corona/trunk/corona-servlet/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-servlet/pom.xml?rev=650874&r1=650873&r2=650874&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-servlet/pom.xml (original)
+++ cocoon/whiteboard/corona/trunk/corona-servlet/pom.xml Wed Apr 23 07:01:43 2008
@@ -93,46 +93,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-maven-plugin</artifactId>
- <configuration>
- <webappProfile>ssf</webappProfile>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <configuration>
- <connectors>
- <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
- <port>8888</port>
- <maxIdleTime>30000</maxIdleTime>
- </connector>
- </connectors>
- <webAppSourceDirectory>${project.build.directory}/rcl/webapp</webAppSourceDirectory>
- <contextPath>/</contextPath>
- <systemProperties>
- <systemProperty>
- <name>org.apache.cocoon.mode</name>
- <value>dev</value>
- </systemProperty>
- </systemProperties>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
- <Cocoon-Block-Name>${pom.artifactId}</Cocoon-Block-Name>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
Modified: cocoon/whiteboard/corona/trunk/corona-sitemap/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-sitemap/pom.xml?rev=650874&r1=650873&r2=650874&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-sitemap/pom.xml (original)
+++ cocoon/whiteboard/corona/trunk/corona-sitemap/pom.xml Wed Apr 23 07:01:43 2008
@@ -39,7 +39,7 @@
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
- <artifactId>corona-core</artifactId>
+ <artifactId>corona-pipeline</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Modified: cocoon/whiteboard/corona/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/parent/pom.xml?rev=650874&r1=650873&r2=650874&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/parent/pom.xml (original)
+++ cocoon/whiteboard/corona/trunk/parent/pom.xml Wed Apr 23 07:01:43 2008
@@ -108,6 +108,11 @@
<version>1.1.1</version>
</dependency>
<dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ <dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>1.3.02</version>
@@ -121,12 +126,12 @@
<!-- Corona internal dependencies -->
<dependency>
<groupId>org.apache.cocoon</groupId>
- <artifactId>corona-core</artifactId>
+ <artifactId>corona-controller</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
- <artifactId>corona-controller</artifactId>
+ <artifactId>corona-pipeline</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -137,6 +142,11 @@
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>corona-sitemap</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>corona-sample</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
Modified: cocoon/whiteboard/corona/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/pom.xml?rev=650874&r1=650873&r2=650874&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/pom.xml (original)
+++ cocoon/whiteboard/corona/trunk/pom.xml Wed Apr 23 07:01:43 2008
@@ -13,7 +13,7 @@
<modules>
<module>parent</module>
<module>corona-controller</module>
- <module>corona-core</module>
+ <module>corona-pipeline</module>
<module>corona-servlet</module>
<module>corona-sitemap</module>
</modules>
@@ -29,9 +29,10 @@
<profiles>
<profile>
- <id>samples</id>
+ <id>sample</id>
<modules>
- <module>corona-webapp-sample</module>
+ <module>corona-sample</module>
+ <module>corona-sample-webapp</module>
</modules>
</profile>
<profile>