[Jpackage-commits] dist/maven-shared/JPP-6 maven-shared-AbstractSeleniumTestCase.patch, NONE, 1.1 maven-shared-doxia-tools-DefaultSiteTool.patch, NONE, 1.1 maven-shared-fileset-mdo.patch, NONE, 1.1 maven-shared-jar-pom.patch, NONE, 1.1 maven-shared-plugin-tools-model-pom.patch, NONE, 1.1

jpackage jpackage at ryu.zarb.org
Sun Dec 5 11:23:01 CET 2010


Update of /home/projects/jpackage/cvs/dist/maven-shared/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv26179

Added Files:
	maven-shared-AbstractSeleniumTestCase.patch 
	maven-shared-doxia-tools-DefaultSiteTool.patch 
	maven-shared-fileset-mdo.patch maven-shared-jar-pom.patch 
	maven-shared-plugin-tools-model-pom.patch 
Log Message:
Add new patches

--- NEW FILE: maven-shared-fileset-mdo.patch ---
--- file-management/src/main/mdo/fileset.mdo.sav	2010-11-28 01:40:33.000000000 +0100
+++ file-management/src/main/mdo/fileset.mdo	2010-11-28 01:40:55.000000000 +0100
@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
 
-<model>
+<model xmlns="http://modello.codehaus.org/MODELLO/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://modello.codehaus.or
+g/MODELLO/1.0.0 http://modello.codehaus.org/xsd/modello-1.0.0.xsd"
+  xml.namespace="http://maven.apache.org/FILESET/${version}">
   <id>fileset</id>
   <name>FileSet</name>
   <description>

--- NEW FILE: maven-shared-doxia-tools-DefaultSiteTool.patch ---
--- maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java.sav	2010-11-28 02:31:12.000000000 +0100
+++ maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java	2010-11-28 02:36:57.000000000 +0100
@@ -664,7 +664,11 @@
 
         interpolator.addValueSource( new MapBasedValueSource( project.getProperties() ) );
 
-        siteDescriptorContent = interpolator.interpolate( siteDescriptorContent, "project" );
+	try {
+            siteDescriptorContent = interpolator.interpolate( siteDescriptorContent, "project" );
+	} catch (Exception e) {
+            throw new SiteToolException( "cannot interpolate site descriptor: " + e.getMessage(), e );
+	}
 
         props.put( "inputEncoding", inputEncoding );
 

--- NEW FILE: maven-shared-plugin-tools-model-pom.patch ---
--- ./maven-plugin-tools/maven-plugin-tools-model/pom.xml.sav6	2007-03-10 23:48:08.000000000 +0100
+++ ./maven-plugin-tools/maven-plugin-tools-model/pom.xml	2010-11-28 01:30:33.000000000 +0100
@@ -34,7 +34,9 @@
         <groupId>org.codehaus.modello</groupId>
         <artifactId>modello-maven-plugin</artifactId>
         <configuration>
-          <model>src/main/mdo/plugin-metadata.mdo</model>
+          <models>
+            <model>src/main/mdo/plugin-metadata.mdo</model>
+          </models>
           <version>1.0.0</version>
         </configuration>
         <executions>

--- NEW FILE: maven-shared-jar-pom.patch ---
--- maven-shared-jar/pom.xml.sav	2010-11-28 02:23:49.000000000 +0100
+++ maven-shared-jar/pom.xml	2010-11-28 02:24:09.000000000 +0100
@@ -68,27 +68,8 @@
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>
         <version>2.2</version>
-        <!-- TODO: move configuration to parent POM -->
         <configuration>
-          <!-- TODO: not needed under javadoc plugin 2.3, once released -->
           <overview>${basedir}/src/main/javadoc/overview.html</overview>
-          <tags>
-            <tag>
-              <name>todo</name>
-              <placement>a</placement>
-              <head>TODO:</head>
-            </tag>
-            <tag>
-              <name>plexus.requirement</name>
-              <placement>f</placement>
-              <head>Plexus Requirement:</head>
-            </tag>
-            <tag>
-              <name>plexus.component</name>
-              <placement>t</placement>
-              <head>Plexus Component:</head>
-            </tag>
-          </tags>
         </configuration>
       </plugin>
       <plugin>

--- NEW FILE: maven-shared-AbstractSeleniumTestCase.patch ---
--- maven-web-ui-tests/src/main/java/org/apache/maven/shared/web/test/AbstractSeleniumTestCase.java.sav	2010-11-26 10:03:47.000000000 +0100
+++ maven-web-ui-tests/src/main/java/org/apache/maven/shared/web/test/AbstractSeleniumTestCase.java	2010-11-26 10:05:17.000000000 +0100
@@ -24,6 +24,7 @@
 import junit.framework.TestCase;
 import org.codehaus.plexus.util.StringUtils;
 import org.openqa.selenium.server.SeleniumServer;
+import org.openqa.selenium.server.RemoteControlConfiguration;
 
 import java.io.File;
 import java.util.Calendar;
@@ -61,7 +62,7 @@
             browser = "*firefox";
         }
 
-        sel = new DefaultSelenium( "localhost", SeleniumServer.DEFAULT_PORT, browser, getBaseUrl() );
+        sel = new DefaultSelenium( "localhost", RemoteControlConfiguration.DEFAULT_PORT, browser, getBaseUrl() );
         sel.start();
         initialize();
     }




More information about the JPackage-commits mailing list