Return-Path: 
 <scm-return-40928-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 77574 invoked from network); 18 Mar 2010 09:49:36 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 18 Mar 2010 09:49:36 -0000
Received: (qmail 42300 invoked by uid 500); 18 Mar 2010 09:49:35 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 42224 invoked by uid 500); 18 Mar 2010 09:49:35 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 42217 invoked by uid 99); 18 Mar 2010 09:49:34 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Mar 2010 09:49:34 +0000
X-ASF-Spam-Status: No, hits=-1322.3 required=10.0
	tests=ALL_TRUSTED,AWL
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Mar 2010 09:49:33 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 24100238897A; Thu, 18 Mar 2010 09:49:13 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r924678 - in /geronimo/server/branches/2.1: ./
 assemblies/geronimo-boilerplate-minimal/ plugins/jaxws/jaxws-tools/
 plugins/tomcat/geronimo-tomcat6-clustering-wadi/src/test/java/org/apache/geronimo/tomcat/cluster/
Date: Thu, 18 Mar 2010 09:49:13 -0000
To: scm@geronimo.apache.org
From: rwonly@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100318094913.24100238897A@eris.apache.org>

Author: rwonly
Date: Thu Mar 18 09:49:12 2010
New Revision: 924678

URL: http://svn.apache.org/viewvc?rev=924678&view=rev
Log:
update a bunch of maven plugin versions plus some err fixes

Modified:
    geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/pom.xml
    geronimo/server/branches/2.1/plugins/jaxws/jaxws-tools/pom.xml
    geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-clustering-wadi/src/test/java/org/apache/geronimo/tomcat/cluster/ClusteredManagerTest.java
    geronimo/server/branches/2.1/pom.xml

Modified: geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/pom.xml?rev=924678&r1=924677&r2=924678&view=diff
==============================================================================
--- geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/pom.xml (original)
+++ geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/pom.xml Thu Mar 18 09:49:12 2010
@@ -324,7 +324,7 @@
                             <tasks>
                                 <mkdir dir="${project.build.outputDirectory}"/>
                                 <copy todir="${project.build.outputDirectory}">
-                                    <fileset dir="${project.build.directory}/${project.build.finalName}.dir/${project.build.finalName}">
+                                    <fileset dir="${project.build.directory}/${project.build.finalName}/${project.build.finalName}">
                                         <include name="**"/>
                                     </fileset>
                                 </copy>

Modified: geronimo/server/branches/2.1/plugins/jaxws/jaxws-tools/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/jaxws/jaxws-tools/pom.xml?rev=924678&r1=924677&r2=924678&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/jaxws/jaxws-tools/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/jaxws/jaxws-tools/pom.xml Thu Mar 18 09:49:12 2010
@@ -65,7 +65,7 @@
                             <tasks>
                                 <mkdir dir="${project.build.directory}/classes"/>
                                 <copy todir="${project.build.directory}/classes">
-                                    <fileset dir="${project.build.directory}/${project.build.finalName}.dir/${project.build.finalName}">
+                                    <fileset dir="${project.build.directory}/${project.build.finalName}/${project.build.finalName}">
                                         <include name="**"/>
                                     </fileset>
                                 </copy>

Modified: geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-clustering-wadi/src/test/java/org/apache/geronimo/tomcat/cluster/ClusteredManagerTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-clustering-wadi/src/test/java/org/apache/geronimo/tomcat/cluster/ClusteredManagerTest.java?rev=924678&r1=924677&r2=924678&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-clustering-wadi/src/test/java/org/apache/geronimo/tomcat/cluster/ClusteredManagerTest.java (original)
+++ geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-clustering-wadi/src/test/java/org/apache/geronimo/tomcat/cluster/ClusteredManagerTest.java Thu Mar 18 09:49:12 2010
@@ -149,8 +149,8 @@ public class ClusteredManagerTest extend
     
     public void testInvalidateSessionReleasesUnderlyingSessionAndRemoveSessionFromManager() throws Exception {
         final org.apache.geronimo.clustering.Session underlyingSession =recordCreateUnderlyingSession();
-        context.getLoader();
-        modify().returnValue(null);
+        //context.getLoader();
+        //modify().returnValue(null);
         underlyingSession.release();
         modify().perform(new Action() {
             public Object invocation(Object[] arg0, MethodHandle arg1) throws Throwable {

Modified: geronimo/server/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/pom.xml?rev=924678&r1=924677&r2=924678&view=diff
==============================================================================
--- geronimo/server/branches/2.1/pom.xml (original)
+++ geronimo/server/branches/2.1/pom.xml Thu Mar 18 09:49:12 2010
@@ -2124,36 +2124,36 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>1.0-alpha-3</version>
+                    <!--<version>1.0-alpha-3</version>   1.0-beta-1 -->
                 </plugin>
 
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>
-                    <version>2.2-beta-1</version>
+                    <!--<version>2.2-beta-1</version>	2.2-beta-4 -->
                 </plugin>
 
-                <plugin>
+                <!--<plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>2.3</version>
+                    <version>2.3</version>    2.5
                     <configuration>
                         <source>1.5</source>
                     </configuration>
-                </plugin>
+                </plugin>-->
 
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
                     <!-- The 2.0 level doesn't handle the dojo tgz correctly -->
-                    <version>2.0-alpha-4</version>
+                    <version>2.0-alpha-4</version>  
                 </plugin>
 
-                <plugin>
+                <!--<plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-remote-resources-plugin</artifactId>
                     <version>1.0</version>
-                </plugin>
+                </plugin>-->
 
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
@@ -2164,7 +2164,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>xmlbeans-maven-plugin</artifactId>
-                    <version>2.3.1</version>
+                    <!--<version>2.3.1</version>-->
                     <executions>
                         <execution>
                             <goals>
@@ -2181,14 +2181,14 @@
                 <plugin>
                     <groupId>org.codehaus.groovy.maven</groupId>
                     <artifactId>gmaven-plugin</artifactId>
-                    <version>1.0-rc-2</version>
+                    <!--<version>1.0-rc-2</version> 1.0-rc-3 -->
                 </plugin>
 
-                <plugin>
+                <!--<plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-plugin-plugin</artifactId>
-                    <version>2.3</version>
-                </plugin>
+                    <version>2.3</version>   2.5
+                </plugin>-->
 
                 <plugin>
                     <groupId>org.codehaus.mojo.jspc</groupId>
@@ -2232,13 +2232,13 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>sql-maven-plugin</artifactId>
-                    <version>1.0</version>
+                    <!--<version>1.0</version> 1.1   -->
                 </plugin>
                 
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>jaxb2-maven-plugin</artifactId>
-                    <version>1.2</version>
+                    <!--<version>1.2</version>-->
                 </plugin>
 
                 <!--
@@ -2280,7 +2280,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-ear-plugin</artifactId>
-                    <version>2.3</version>
+                    <!--<version>2.3</version>-->
                     <configuration>
                         <archive>
                             <!-- Do not include META-INF/maven to avoid long file problems on windows -->
@@ -2292,7 +2292,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-rar-plugin</artifactId>
-                    <version>2.2</version>
+                    <!--<version>2.2</version>-->
                     <configuration>
                         <archive>
                             <!-- Do not include META-INF/maven to avoid long file problems on windows -->
@@ -2304,8 +2304,21 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>2.1</version>
+                    <!--<version>2.1</version>-->
+                    <configuration>
+                        <archive>
+                            <!-- Do not include META-INF/maven to avoid long file problems on windows -->
+                            <addMavenDescriptor>false</addMavenDescriptor>
+                        </archive>
+                    </configuration>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-ejb-plugin</artifactId>
+                    <!--<version>2.1</version>-->
                     <configuration>
+                        <ejbVersion>3.0</ejbVersion>
                         <archive>
                             <!-- Do not include META-INF/maven to avoid long file problems on windows -->
                             <addMavenDescriptor>false</addMavenDescriptor>
@@ -2316,7 +2329,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <!--version>2.3</version-->
+                    <!--version>2.3</version2.4.3-->
                     <configuration>
                         <redirectTestOutputToFile>true</redirectTestOutputToFile>
                         <failIfNoTests>false</failIfNoTests>
@@ -2401,7 +2414,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>shitty-maven-plugin</artifactId>
-                    <version>1.0-alpha-2</version>
+                    <!--<version>1.0-alpha-2</version>   alpha-3 -->
                 </plugin>
 
                 <plugin>
@@ -2413,7 +2426,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-deploy-plugin</artifactId>
-                    <version>2.3</version>
+                    <!--<version>2.3</version>  2.4-->
                     <inherited>true</inherited>
                     <configuration>
                         <updateReleaseInfo>true</updateReleaseInfo>
@@ -2424,7 +2437,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-gpg-plugin</artifactId>
-                    <version>1.0-alpha-3</version>
+                    <!--<version>1.0-alpha-3</version>   alpha-4 -->
                     <configuration>
                         <passphrase>${gpg.passphrase}</passphrase>
                     </configuration>
@@ -2440,7 +2453,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-release-plugin</artifactId>
-                    <version>2.0-beta-6</version>
+                    <!--version>2.0-beta-6</version-->
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -2506,7 +2519,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.3</version>
+                <!--<version>2.3</version>-->
                 <configuration>
                     <breakiterator>true</breakiterator>
                     <quiet>true</quiet>
@@ -2523,7 +2536,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
-                <version>2.2</version>
+                <!--<version>2.2</version>-->
                 <configuration>
                     <targetJdk>1.5</targetJdk>
                 </configuration>