cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jheym...@apache.org
Subject svn commit: r307040 - in /cocoon: blocks/ajax/trunk/ blocks/forms/trunk/pom.xml blocks/javaflow/trunk/pom.xml blocks/profiler/trunk/pom.xml trunk/core/pom.xml trunk/pom.xml trunk/webapp/pom.xml
Date Fri, 07 Oct 2005 07:23:17 GMT
Author: jheymans
Date: Fri Oct  7 00:23:09 2005
New Revision: 307040

URL: http://svn.apache.org/viewcvs?rev=307040&view=rev
Log:
[M10N]
- updated commons-jci and commons-javaflow
- adding ajax block to the build
- forms block depends on ajax block

Modified:
    cocoon/blocks/ajax/trunk/   (props changed)
    cocoon/blocks/forms/trunk/pom.xml
    cocoon/blocks/javaflow/trunk/pom.xml
    cocoon/blocks/profiler/trunk/pom.xml
    cocoon/trunk/core/pom.xml
    cocoon/trunk/pom.xml
    cocoon/trunk/webapp/pom.xml

Propchange: cocoon/blocks/ajax/trunk/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Oct  7 00:23:09 2005
@@ -0,0 +1 @@
+target

Modified: cocoon/blocks/forms/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/pom.xml?rev=307040&r1=307039&r2=307040&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/pom.xml (original)
+++ cocoon/blocks/forms/trunk/pom.xml Fri Oct  7 00:23:09 2005
@@ -48,6 +48,11 @@
       <version>2.2-SNAPSHOT</version>
     </dependency>
     <dependency>
+      <groupId>apache-cocoon</groupId>
+      <artifactId>cocoon-ajax</artifactId>
+      <version>2.2-SNAPSHOT</version>
+    </dependency>
+    <dependency>
       <groupId>jakarta-oro</groupId>
       <artifactId>jakarta-oro</artifactId>
       <version>2.0.8</version>

Modified: cocoon/blocks/javaflow/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/javaflow/trunk/pom.xml?rev=307040&r1=307039&r2=307040&view=diff
==============================================================================
--- cocoon/blocks/javaflow/trunk/pom.xml (original)
+++ cocoon/blocks/javaflow/trunk/pom.xml Fri Oct  7 00:23:09 2005
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>commons-javaflow</groupId>
       <artifactId>commons-javaflow</artifactId>
-      <version>r291286</version>
+      <version>r306555</version>
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/blocks/profiler/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/profiler/trunk/pom.xml?rev=307040&r1=307039&r2=307040&view=diff
==============================================================================
--- cocoon/blocks/profiler/trunk/pom.xml (original)
+++ cocoon/blocks/profiler/trunk/pom.xml Fri Oct  7 00:23:09 2005
@@ -31,14 +31,42 @@
   <packaging>jar</packaging>
   <build>
     <sourceDirectory>java</sourceDirectory>
+    <outputDirectory>target/webapp/BLOCK-INF/classes</outputDirectory>
+    <resources>
+      <resource>
+        <directory>webapp</directory>
+        <targetPath>webapp</targetPath>
+        <includes>
+          <include>**/*</include>
+        </includes>
+      </resource>
+      <!-- all java resources -->
+      <resource>
+        <directory>java</directory>
+        <targetPath>webapp/BLOCK-INF/classes</targetPath>
+        <excludes>
+          <exclude>**/*.java</exclude>
+        </excludes>
+      </resource>
+    </resources>
+    <!--
     <resources>
       <resource>
         <directory>java</directory>
+        <targetPath>webapp/BLOCK-INF/classes</targetPath>
         <excludes>
           <exclude>**/*.java</exclude>
         </excludes>
       </resource>
+      <resource>
+        <directory>webapp</directory>
+        <targetPath>webapp</targetPath>
+        <includes>
+           <include>**/*</include>
+        </includes>
+      </resource>
     </resources>
+    -->
   </build>
   <dependencies>
     <dependency>
@@ -47,12 +75,4 @@
       <version>2.2-SNAPSHOT</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/trunk/core/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/pom.xml?rev=307040&r1=307039&r2=307040&view=diff
==============================================================================
--- cocoon/trunk/core/pom.xml (original)
+++ cocoon/trunk/core/pom.xml Fri Oct  7 00:23:09 2005
@@ -124,12 +124,12 @@
     <dependency>
       <groupId>commons-javaflow</groupId>
       <artifactId>commons-javaflow</artifactId>
-      <version>r291286</version>
+      <version>r306555</version>
     </dependency>
     <dependency>
       <groupId>commons-jci</groupId>
       <artifactId>commons-jci</artifactId>
-      <version>r291284</version>
+      <version>r306555</version>
     </dependency>
     <dependency>
       <groupId>commons-jexl</groupId>
@@ -326,7 +326,7 @@
     <dependency>
       <groupId>xml-apis</groupId>
       <artifactId>xml-apis</artifactId>
-      <version>[1.3.02]</version>
+      <version>1.3.02</version>
     </dependency>
     <dependency>
       <groupId>easymock</groupId>

Modified: cocoon/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/pom.xml?rev=307040&r1=307039&r2=307040&view=diff
==============================================================================
--- cocoon/trunk/pom.xml (original)
+++ cocoon/trunk/pom.xml Fri Oct  7 00:23:09 2005
@@ -30,6 +30,7 @@
     <module>core</module>
     <module>core/test-core</module>
     <module>webapp</module>
+    <module>src/blocks/ajax/trunk</module>
     <module>src/blocks/apples/trunk</module>
     <module>src/blocks/asciiart/trunk</module>
     <module>src/blocks/authentication-fw/trunk</module>

Modified: cocoon/trunk/webapp/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/webapp/pom.xml?rev=307040&r1=307039&r2=307040&view=diff
==============================================================================
--- cocoon/trunk/webapp/pom.xml (original)
+++ cocoon/trunk/webapp/pom.xml Fri Oct  7 00:23:09 2005
@@ -52,6 +52,11 @@
     </dependency>
     <dependency>
       <groupId>apache-cocoon</groupId>
+      <artifactId>cocoon-ajax</artifactId>
+      <version>2.2-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>apache-cocoon</groupId>
       <artifactId>cocoon-apples</artifactId>
       <version>2.2-SNAPSHOT</version>
     </dependency>



Mime
View raw message