svn commit: r998373 - in /lenya/trunk/externals: build.sh cocoon-sitemaptags2daisy-plugin.patch

Author: florent
Date: Sat Sep 18 00:21:55 2010
New Revision: 998373

URL: http://svn.apache.org/viewvc?rev=998373&view=rev
Log:
- patch a dependency failure with inactivation of the module (not core)

Added:
    lenya/trunk/externals/cocoon-sitemaptags2daisy-plugin.patch
Modified:
    lenya/trunk/externals/build.sh

Modified: lenya/trunk/externals/build.sh
URL: http://svn.apache.org/viewvc/lenya/trunk/externals/build.sh?rev=998373&r1=998372&r2=998373&view=diff
==============================================================================
--- lenya/trunk/externals/build.sh (original)
+++ lenya/trunk/externals/build.sh Sat Sep 18 00:21:55 2010
@@ -23,11 +23,22 @@ MAVEN_OPTS="-Xmx256m"
 export MAVEN_OPTS
 
 # Invoke patch
+echo ""
+echo ""
 echo "============================================="
-echo "Apply patch to cocoon still issue COCOON-2294 not solve (https://issues.apache.org/jira/browse/COCOON-2294)"
+echo "Apply patch to cocoon issue COCOON-2294 not still solve (https://issues.apache.org/jira/browse/COCOON-2294)"
 echo "============================================="
-
 patch -p0 < parent-pom_serializer-impl-dependency.patch
+
+# Invoke patch
+echo ""
+echo ""
+echo "============================================="
+echo "Apply patch to cocoon issue COCOON-2302 not still solve (https://issues.apache.org/jira/browse/COCOON-2302)"
+echo "============================================="
+patch -p0 < cocoon-sitemaptags2daisy-plugin.patch
+
+
 # Invoke maven
 cd cocoon-rev-964648
 echo "============================================="

Added: lenya/trunk/externals/cocoon-sitemaptags2daisy-plugin.patch
URL: http://svn.apache.org/viewvc/lenya/trunk/externals/cocoon-sitemaptags2daisy-plugin.patch?rev=998373&view=auto
==============================================================================
--- lenya/trunk/externals/cocoon-sitemaptags2daisy-plugin.patch (added)
+++ lenya/trunk/externals/cocoon-sitemaptags2daisy-plugin.patch Sat Sep 18 00:21:55 2010
@@ -0,0 +1,90 @@
+Index: tools/pom.xml
+===================================================================
+--- tools/pom.xml	(revision 998209)
++++ tools/pom.xml	(working copy)
+@@ -44,7 +44,7 @@
+     <module>cocoon-maven-javadocs-script-report</module>
+     <module>cocoon-rcl/cocoon-rcl-webapp-wrapper</module>
+     <module>cocoon-rcl/cocoon-rcl-spring-reloader</module>        
+-    <module>cocoon-sitemaptags2daisy-plugin</module> 
++    <!-- <module>cocoon-sitemaptags2daisy-plugin</module>  -->
+   </modules>
+ 
+   <scm>
+Index: parent/pom.xml
+===================================================================
+--- parent/pom.xml	(revision 998209)
++++ parent/pom.xml	(working copy)
+@@ -3754,10 +3754,10 @@
+                 </execution>
+               </executions>
+             </plugin>
+-            <plugin>
+-              <groupId>org.apache.cocoon</groupId>
+-              <artifactId>cocoon-sitemaptags2daisy-plugin</artifactId>
+-              <version>1.0.0-SNAPSHOT</version>
++            <!-- <plugin> -->
++            <!--   <groupId>org.apache.cocoon</groupId> -->
++            <!--   <artifactId>cocoon-sitemaptags2daisy-plugin</artifactId> -->
++            <!--   <version>1.0.0-SNAPSHOT</version> -->
+               <!-- the plugins default configuration
+               <configuration>
+                 <simulateInput>false</simulateInput>
+@@ -3765,7 +3765,7 @@
+                 <repoUrl>http://cocoon.zones.apache.org:9263</repoUrl>
+               </configuration>
+               -->
+-            </plugin>
++            <!-- </plugin> -->
+           </plugins>
+         </pluginManagement>
+       </build>
+Index: pom.xml
+===================================================================
+--- pom.xml	(revision 998209)
++++ pom.xml	(working copy)
+@@ -62,25 +62,25 @@
+   </build>  
+ 
+   <profiles>
+-    <profile>
+-      <id>daisy</id>
+-      <build>
+-        <plugins>
+-	  <plugin>
+-	    <groupId>org.apache.cocoon</groupId>
+-	    <artifactId>cocoon-sitemaptags2daisy-plugin</artifactId>
+-	    <executions>
+-	      <execution>
+-	        <phase>install</phase>
+-		<goals>
+-		  <goal>sitemaptags2daisy</goal>
+-		</goals>
+-	      </execution>
+-	    </executions>
+-	  </plugin>
+-	</plugins>
+-      </build>
+-    </profile>
++    <!-- <profile> -->
++    <!--   <id>daisy</id> -->
++    <!--   <build> -->
++    <!--     <plugins> -->
++    <!-- 	  <plugin> -->
++    <!-- 	    <groupId>org.apache.cocoon</groupId> -->
++    <!-- 	    <artifactId>cocoon-sitemaptags2daisy-plugin</artifactId> -->
++    <!-- 	    <executions> -->
++    <!-- 	      <execution> -->
++    <!-- 	        <phase>install</phase> -->
++    <!-- 		<goals> -->
++    <!-- 		  <goal>sitemaptags2daisy</goal> -->
++    <!-- 		</goals> -->
++    <!-- 	      </execution> -->
++    <!-- 	    </executions> -->
++    <!-- 	  </plugin> -->
++    <!-- 	</plugins> -->
++    <!--   </build> -->
++    <!-- </profile> -->
+   </profiles>
+ 
+ </project>