Merged revisions 18461,18463,18473-18474,18481 via svnmerge from

https://www.dev.java.net/svn/hudson/branches/rc

........
  r18461 | kohsuke | 2009-05-26 18:39:51 -0700 (Tue, 26 May 2009) | 1 line
  
  merged back the RC branch
........
  r18463 | kohsuke | 2009-05-26 18:40:06 -0700 (Tue, 26 May 2009) | 1 line
  
  creating a new RC branch
........
  r18473 | kohsuke | 2009-05-27 09:33:16 -0700 (Wed, 27 May 2009) | 1 line
  
  publish-javadoc happens later, so this comment no longer appears useful
........
  r18474 | kohsuke | 2009-05-27 09:38:45 -0700 (Wed, 27 May 2009) | 1 line
  
  modified to do aggregated javadoc and publish that
........
  r18481 | kohsuke | 2009-05-27 11:20:34 -0700 (Wed, 27 May 2009) | 4 lines
  
  [FIXED HUDSON-3706]
  MaskingClassLoader that's supposed to throw awy components.xml for interceptions are still kicking in when MavenEmbedder run on slaves, as RemoteClassLoader mangles the URL that the MaskingClassLoader was looking for.
  
  So I relaxed the path matching and sniff the content to decide if components.xml is for interception or not.
........


git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@18487 71c3de6d-444a-0410-be80-ed276b4c234a

maven-interceptor/src/main/resources/META-INF/plexus/components.xml

+<!-- MAVEN-INTERCEPTION-TO-BE-MASKED: see MavenUtil.java for how we use this marker -->
 <!--
 The MIT License
 

maven-plugin/pom.xml

@@ -58,7 +58,7 @@ THE SOFTWARE.
         <dependency>
           <groupId>org.jvnet.hudson</groupId>
           <artifactId>maven2.1-interceptor</artifactId>
-          <version>1.1</version>
+          <version>1.2</version>
         </dependency>
         <dependency>
           <groupId>org.apache.maven</groupId>

maven-plugin/src/main/java/hudson/maven/MavenUtil.java

@@ -37,6 +37,8 @@ import org.apache.commons.io.IOUtils;
 
 import java.io.File;
 import java.io.IOException;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Enumeration;
@@ -206,13 +208,23 @@ public class MavenUtil {
                     String s = url.toExternalForm();
                     if(s.contains("maven-plugin-tools-api"))
                         return true;
-                    if(s.endsWith("plexus/components.xml")) {
+                    // because RemoteClassLoader mangles the path, we can't check for plexus/components.xml,
+                    // which would have otherwise made the test cheaper.
+                    if(s.endsWith("components.xml")) {
+                        BufferedReader r=null;
                         try {
                             // is this designated for interception purpose? If so, don't load them in the MavenEmbedder
-                            IOUtils.closeQuietly(new URL(s + ".interception").openStream());
-                            return true;
+                            // earlier I tried to use a marker file in the same directory, but that won't work
+                            r = new BufferedReader(new InputStreamReader(url.openStream()));
+                            for (int i=0; i<2; i++) {
+                                String l = r.readLine();
+                                if(l!=null && l.contains("MAVEN-INTERCEPTION-TO-BE-MASKED"))
+                                    return true;
+                            }
                         } catch (IOException _) {
-                            // no such resource exists
+                            // let whoever requesting this resource re-discover an error and report it
+                        } finally {
+                            IOUtils.closeQuietly(r);
                         }
                     }
                     return false;

pom.xml

@@ -89,6 +89,10 @@ THE SOFTWARE.
           <artifactId>maven-antrun-extended-plugin</artifactId>
           <version>1.39</version>
         </plugin>
+	<plugin>
+	  <artifactId>maven-javadoc-plugin</artifactId>
+	  <version>2.5</version>
+	</plugin>
       </plugins>
     </pluginManagement>
     
@@ -103,7 +107,7 @@ THE SOFTWARE.
             also run assembly during the release.
             http://www.nabble.com/Release-Plugin%3A-Include-assemblies-for-deploying-tf2642295s177.html#a7377938
            -->
-          <goals>-DskipTests install javadoc:javadoc animal-sniffer:check assembly:attached deploy</goals>
+          <goals>-DskipTests install javadoc:javadoc animal-sniffer:check assembly:attached deploy javadoc:aggregate</goals>
           <remoteTagging>true</remoteTagging><!-- work around http://jira.codehaus.org/browse/SCM-406 -->
         </configuration>
       </plugin>

publish-javadoc.sh

@@ -32,8 +32,7 @@ svn revert -R .
 svn update
 popd
 
-cp -R target/checkout/core/target/apidocs/* ../../../www/javadoc
-cp -R target/checkout/test/target/apidocs/*  ../../../www/javadoc/test
+cp -R target/checkout/target/site/apidocs/* ../../../www/javadoc
 
 cd ../../../www/javadoc
 
@@ -42,13 +41,7 @@ find . -name "*.html" | xargs perl -p -i.bak -e "s|-- Generated by javadoc .+--|
 find . -name "*.html" | xargs perl -p -i.bak -e "s|<META NAME=\"DATE\" CONTENT=\"....-..-..\">||"
 find . -name "*.bak" | xargs rm
 
-# ignore everything under CVS, then
-# ignore all files that are already in CVS, then
-# add the rest of the files
-#find . -name CVS -prune -o -exec bash in-cvs.sh {} \; -o \( -print -a -exec cvs add {} \+ \)
-#rcvsadd . "commiting javadoc"
+# add files that are new
 svn add $(svn status | grep "^?" | cut -d " " -f2-) .
 svn commit -m "commiting javadoc"
 
-# sometimes the first commit fails
-#cvs commit -m "commit 1 " || cvs commit -m "commit 2"
\ No newline at end of file

release.sh

@@ -45,7 +45,6 @@ case $id in
 	exit 1
 	;;
 esac
-#./publish-javadoc.sh
 javanettasks uploadFile hudson /releases/$id                "`date +"%Y/%m/%d"` release" Stable target/checkout/war/target/hudson.war | tee target/war-upload.log
 warUrl=$(cat target/war-upload.log | grep "^Posted" | sed -e "s/Posted //g")
 javanettasks uploadFile hudson /releases/source-bundles/$id "`date +"%Y/%m/%d"` release" Stable target/checkout/target/hudson-$id-src.zip