cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r648751 - in /cocoon/trunk: core/cocoon-core/pom.xml core/cocoon-webapp/pom.xml core/cocoon-xml/cocoon-xml-resolver/pom.xml parent/pom.xml pom.xml
Date Wed, 16 Apr 2008 17:00:00 GMT
Author: reinhard
Date: Wed Apr 16 09:59:52 2008
New Revision: 648751

URL: http://svn.apache.org/viewvc?rev=648751&view=rev
Log:
make use of the new subprojects JNet and BlockDeploy

Modified:
    cocoon/trunk/core/cocoon-core/pom.xml
    cocoon/trunk/core/cocoon-webapp/pom.xml
    cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/pom.xml
    cocoon/trunk/parent/pom.xml
    cocoon/trunk/pom.xml

Modified: cocoon/trunk/core/cocoon-core/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/pom.xml?rev=648751&r1=648750&r2=648751&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/pom.xml (original)
+++ cocoon/trunk/core/cocoon-core/pom.xml Wed Apr 16 09:59:52 2008
@@ -111,6 +111,7 @@
   </scm>
 
   <dependencies>
+    <!-- Cocoon Subprojects -->
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-spring-configurator</artifactId>
@@ -119,6 +120,28 @@
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-configuration-api</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>    
+    <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>
+        
+    <!-- Cocoon Core -->
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-pipeline-components</artifactId>

Modified: cocoon/trunk/core/cocoon-webapp/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/pom.xml?rev=648751&r1=648750&r2=648751&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/pom.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/pom.xml Wed Apr 16 09:59:52 2008
@@ -41,7 +41,7 @@
       <plugin>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>maven-jetty-plugin</artifactId>
-        <version>6.0.2</version>
+        <version>6.1.7</version>
         <configuration>
           <connectors>
             <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">

Modified: cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/pom.xml?rev=648751&r1=648750&r2=648751&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/pom.xml (original)
+++ cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/pom.xml Wed Apr 16 09:59:52 2008
@@ -55,11 +55,10 @@
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-spring-configurator</artifactId>
     </dependency>
-    <!-- Temporarily introduce a dependency on the SSF. (Later this should be replaced
by a 'cocoon-block-deployment' reference.)-->
     <dependency>
       <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-servlet-service-impl</artifactId>
-    </dependency>
+      <artifactId>cocoon-block-deployment</artifactId>
+    </dependency>   
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-xml-impl</artifactId>

Modified: cocoon/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/parent/pom.xml?rev=648751&r1=648750&r2=648751&view=diff
==============================================================================
--- cocoon/trunk/parent/pom.xml (original)
+++ cocoon/trunk/parent/pom.xml Wed Apr 16 09:59:52 2008
@@ -2254,6 +2254,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.cocoon</groupId>
+        <artifactId>cocoon-block-deployment</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+      </dependency>      
+      <dependency>
+        <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-blocks-fw-demo1</artifactId>
         <version>1.0.0-SNAPSHOT</version>
       </dependency>
@@ -2518,6 +2523,11 @@
       <dependency>
         <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-jms-sample</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.cocoon</groupId>
+        <artifactId>cocoon-jnet</artifactId>
         <version>1.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>

Modified: cocoon/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/pom.xml?rev=648751&r1=648750&r2=648751&view=diff
==============================================================================
--- cocoon/trunk/pom.xml (original)
+++ cocoon/trunk/pom.xml Wed Apr 16 09:59:52 2008
@@ -42,6 +42,7 @@
     <module>core</module>
     <module>dists</module>
     <!-- sub projects -->
+    <module>subprojects</module>
     <module>core/cocoon-configuration/cocoon-configuration-api</module>
     <module>core/cocoon-configuration/cocoon-spring-configurator</module>
     <module>core/cocoon-servlet-service/cocoon-servlet-service-components</module>



Mime
View raw message