cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r583499 - in /cocoon/trunk: ./ core/cocoon-servlet-service/cocoon-servlet-service-components/ core/cocoon-servlet-service/cocoon-servlet-service-impl/ core/cocoon-servlet-service/cocoon-servlet-service-sample/ parent/ tools/ tools/cocoon-ma...
Date Wed, 10 Oct 2007 14:50:23 GMT
Author: reinhard
Date: Wed Oct 10 07:50:22 2007
New Revision: 583499

URL: http://svn.apache.org/viewvc?rev=583499&view=rev
Log:
fix build hierarchy for servlet-service modules; use the cocoon prefix for the build root
pom; set the version of the Eclipse plugin for the root POM - otherwise at least my Maven
installation complains that it can't find the plugin

Modified:
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/pom.xml
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/pom.xml
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-sample/pom.xml
    cocoon/trunk/parent/   (props changed)
    cocoon/trunk/pom.xml
    cocoon/trunk/tools/cocoon-maven-javadocs-script-report/src/changes/changes.xml
    cocoon/trunk/tools/pom.xml

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/pom.xml?rev=583499&r1=583498&r2=583499&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/pom.xml (original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/pom.xml Wed
Oct 10 07:50:22 2007
@@ -27,7 +27,7 @@
     <artifactId>cocoon</artifactId>
     <groupId>org.apache.cocoon</groupId>
     <version>6-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>
+    <relativePath>../../../parent/pom.xml</relativePath>
   </parent>
   <artifactId>cocoon-servlet-service-components</artifactId>
   <packaging>jar</packaging>

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/pom.xml?rev=583499&r1=583498&r2=583499&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/pom.xml Wed Oct 10
07:50:22 2007
@@ -27,7 +27,7 @@
     <artifactId>cocoon</artifactId>
     <groupId>org.apache.cocoon</groupId>
     <version>6-SNAPSHOT</version>
-    <relativePath>../../../pom.xml</relativePath>
+    <relativePath>../../../parent/pom.xml</relativePath>
   </parent>
   <artifactId>cocoon-servlet-service-impl</artifactId>
   <packaging>jar</packaging>

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-sample/pom.xml?rev=583499&r1=583498&r2=583499&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-sample/pom.xml (original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-sample/pom.xml Wed Oct
10 07:50:22 2007
@@ -27,7 +27,7 @@
     <artifactId>cocoon</artifactId>
     <groupId>org.apache.cocoon</groupId>
     <version>6-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>
+    <relativePath>../../../parent/pom.xml</relativePath>
   </parent>
   <artifactId>cocoon-servlet-service-sample</artifactId>
   <packaging>jar</packaging>

Propchange: cocoon/trunk/parent/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Oct 10 07:50:22 2007
@@ -0,0 +1,2 @@
+target
+.project

Modified: cocoon/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/pom.xml?rev=583499&r1=583498&r2=583499&view=diff
==============================================================================
--- cocoon/trunk/pom.xml (original)
+++ cocoon/trunk/pom.xml Wed Oct 10 07:50:22 2007
@@ -28,9 +28,9 @@
   </parent>
 
   <groupId>org.apache.cocoon</groupId>
-  <artifactId>parent</artifactId>
+  <artifactId>cocoon-parent</artifactId>
   <version>1</version>
-  <name>Apache Cocoon</name>
+  <name>Apache Cocoon [build root]</name>
   <inceptionYear>1999</inceptionYear>
   <url>http://cocoon.apache.org</url>
 
@@ -53,5 +53,14 @@
     <name>The Apache Software Foundation</name>
     <url>http://www.apache.org/</url>
   </organization>
+  
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-eclipse-plugin</artifactId>
+        <version>2.4</version>
+      </plugin>
+    </plugins>
+  </build>  
 
 </project>

Modified: cocoon/trunk/tools/cocoon-maven-javadocs-script-report/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-maven-javadocs-script-report/src/changes/changes.xml?rev=583499&r1=583498&r2=583499&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-maven-javadocs-script-report/src/changes/changes.xml (original)
+++ cocoon/trunk/tools/cocoon-maven-javadocs-script-report/src/changes/changes.xml Wed Oct
10 07:50:22 2007
@@ -22,13 +22,13 @@
     |
     | @version $Id$
     +-->
-    <document>
-      <body>
-        <release version="1.0.0-M1" date="2007-??-??" description="unreleased">   

-          <action dev="reinhard" type="add">
-            Initial creation.
-          </action>      
-        </release>
-      </body>
-    </document>
-    
+<document>
+  <body>
+    <release version="1.0.0-M1" date="2007-??-??" description="unreleased">
+      <action dev="reinhard" type="add">
+        Initial creation.
+      </action>
+    </release>
+  </body>
+</document>
+

Modified: cocoon/trunk/tools/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/pom.xml?rev=583499&r1=583498&r2=583499&view=diff
==============================================================================
--- cocoon/trunk/tools/pom.xml (original)
+++ cocoon/trunk/tools/pom.xml Wed Oct 10 07:50:22 2007
@@ -41,6 +41,8 @@
     <module>archetypes/cocoon-22-archetype-webapp</module>    
     <module>cocoon-maven-reports</module>
     <module>cocoon-maven-plugin</module>
+    <module>cocoon-maven-docs-cleaner-plugin</module>
+    <module>cocoon-maven-javadocs-script-report</module>
     <module>cocoon-rcl/cocoon-rcl-webapp-wrapper</module>
     <module>cocoon-rcl/cocoon-rcl-spring-reloader</module>        
   </modules>



Mime
View raw message