svn commit: r721373 - in /struts/struts1/trunk/core/src/main/java/org/apache/struts/dispatcher: AbstractMappingDispatcher.java AbstractParameterDispatcher.java servlet/ServletMappingDispatcher.java se

2008-11-28 Thread pbenedict
Author: pbenedict
Date: Fri Nov 28 00:01:43 2008
New Revision: 721373

URL: http://svn.apache.org/viewvc?rev=721373&view=rev
Log:
STR-3168: Add serialization UID

Modified:

struts/struts1/trunk/core/src/main/java/org/apache/struts/dispatcher/AbstractMappingDispatcher.java

struts/struts1/trunk/core/src/main/java/org/apache/struts/dispatcher/AbstractParameterDispatcher.java

struts/struts1/trunk/core/src/main/java/org/apache/struts/dispatcher/servlet/ServletMappingDispatcher.java

struts/struts1/trunk/core/src/main/java/org/apache/struts/dispatcher/servlet/ServletParameterDispatcher.java

Modified: 
struts/struts1/trunk/core/src/main/java/org/apache/struts/dispatcher/AbstractMappingDispatcher.java
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/dispatcher/AbstractMappingDispatcher.java?rev=721373&r1=721372&r2=721373&view=diff
==
--- 
struts/struts1/trunk/core/src/main/java/org/apache/struts/dispatcher/AbstractMappingDispatcher.java
 (original)
+++ 
struts/struts1/trunk/core/src/main/java/org/apache/struts/dispatcher/AbstractMappingDispatcher.java
 Fri Nov 28 00:01:43 2008
@@ -24,8 +24,9 @@
 import org.apache.struts.chain.contexts.ActionContext;
 
 /**
- * This abstract class is a template for choosing the target method based on 
the
- * parameter attribute of the [EMAIL PROTECTED] ActionMapping}.
+ * This abstract class is a template for choosing the target method that is
+ * named by the parameter attribute of the corresponding
+ * [EMAIL PROTECTED] ActionMapping}.
  * 
  * @version $Rev$
  * @since Struts 1.4

Modified: 
struts/struts1/trunk/core/src/main/java/org/apache/struts/dispatcher/AbstractParameterDispatcher.java
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/dispatcher/AbstractParameterDispatcher.java?rev=721373&r1=721372&r2=721373&view=diff
==
--- 
struts/struts1/trunk/core/src/main/java/org/apache/struts/dispatcher/AbstractParameterDispatcher.java
 (original)
+++ 
struts/struts1/trunk/core/src/main/java/org/apache/struts/dispatcher/AbstractParameterDispatcher.java
 Fri Nov 28 00:01:43 2008
@@ -23,8 +23,8 @@
 import org.apache.struts.chain.contexts.ActionContext;
 
 /**
- * This abstract class is a template for choosing the target method based on a
- * servlet request parameter.
+ * This abstract class is a template for choosing the target method that is
+ * identified by a submission parameter.
  * 
  * @version $Rev$
  * @since Struts 1.4

Modified: 
struts/struts1/trunk/core/src/main/java/org/apache/struts/dispatcher/servlet/ServletMappingDispatcher.java
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/dispatcher/servlet/ServletMappingDispatcher.java?rev=721373&r1=721372&r2=721373&view=diff
==
--- 
struts/struts1/trunk/core/src/main/java/org/apache/struts/dispatcher/servlet/ServletMappingDispatcher.java
 (original)
+++ 
struts/struts1/trunk/core/src/main/java/org/apache/struts/dispatcher/servlet/ServletMappingDispatcher.java
 Fri Nov 28 00:01:43 2008
@@ -101,6 +101,8 @@
  */
 public class ServletMappingDispatcher extends AbstractMappingDispatcher {
 
+private static final long serialVersionUID = 1L;
+
 protected Object[] buildMethodArguments(ActionContext context, Method 
method) {
return 
ServletDispatchUtils.buildClassicExecuteArguments((ServletActionContext) 
context);
 }

Modified: 
struts/struts1/trunk/core/src/main/java/org/apache/struts/dispatcher/servlet/ServletParameterDispatcher.java
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/dispatcher/servlet/ServletParameterDispatcher.java?rev=721373&r1=721372&r2=721373&view=diff
==
--- 
struts/struts1/trunk/core/src/main/java/org/apache/struts/dispatcher/servlet/ServletParameterDispatcher.java
 (original)
+++ 
struts/struts1/trunk/core/src/main/java/org/apache/struts/dispatcher/servlet/ServletParameterDispatcher.java
 Fri Nov 28 00:01:43 2008
@@ -73,6 +73,8 @@
  */
 public class ServletParameterDispatcher extends AbstractParameterDispatcher {
 
+private static final long serialVersionUID = 1L;
+
 protected Object[] buildMethodArguments(ActionContext context, Method 
method) {
return 
ServletDispatchUtils.buildClassicExecuteArguments((ServletActionContext) 
context);
 }




[CONF] Confluence Changes in the last 24 hours

2008-11-28 Thread confluence
-
This is a daily summary of all recent changes in Confluence.

-
Updated Spaces:
-

Apache Camel (CAMEL) http://cwiki.apache.org/confluence/display/CAMEL
|
|-Pages Added or Edited in This Space
 |-- CXF was last edited by njiang (08:16 PM).
 |   http://cwiki.apache.org/confluence/display/CAMEL/CXF
 |-- Camel 2.0.0 Release was last edited by davsclaus (12:32 PM).
 |   http://cwiki.apache.org/confluence/display/CAMEL/Camel+2.0.0+Release
 |-- File was last edited by davsclaus (12:31 PM).
 |   http://cwiki.apache.org/confluence/display/CAMEL/File
 |-- JMS was last edited by njiang (03:13 AM).
 |   http://cwiki.apache.org/confluence/display/CAMEL/JMS
 |-- Camel 1.5.1 Release was last edited by davsclaus (02:44 AM).
 |   http://cwiki.apache.org/confluence/display/CAMEL/Camel+1.5.1+Release
 |-- Exception Clause was last edited by davsclaus (02:41 AM).
 |   http://cwiki.apache.org/confluence/display/CAMEL/Exception+Clause

Apache Directory Server v1.5 (DIRxSRVx11) 
http://cwiki.apache.org/confluence/display/DIRxSRVx11
|
|-Pages Added or Edited in This Space
 |-- 6. Extending the server was last edited by szoerner (12:08 PM).
 |   
http://cwiki.apache.org/confluence/display/DIRxSRVx11/6.+Extending+the+server
 |-- ApacheDS v1.5 Advanced User's Guide was last edited by szoerner (12:05 PM).
 |   
http://cwiki.apache.org/confluence/display/DIRxSRVx11/ApacheDS+v1.5+Advanced+User%27s+Guide
 |-- 6.1 How to write a simple custom partition for ApacheDS was created by 
szoerner (11:47 AM).
 |   
http://cwiki.apache.org/confluence/display/DIRxSRVx11/6.1+How+to+write+a+simple+custom+partition+for+ApacheDS

Apache Geronimo v2.2 (GMOxDOC22) 
http://cwiki.apache.org/confluence/display/GMOxDOC22
|
|-Pages Added or Edited in This Space
 |-- Installing Eclipse was last edited by sophia (11:57 PM).
 |   http://cwiki.apache.org/confluence/display/GMOxDOC22/Installing+Eclipse
 |-- Apache Geronimo v2.2 documentation development status was last edited by 
[EMAIL PROTECTED] (10:09 PM).
 |   
http://cwiki.apache.org/confluence/display/GMOxDOC22/Apache+Geronimo+v2.2+documentation+development+status
 |-- Documentation was last edited by [EMAIL PROTECTED] (10:08 PM).
 |   http://cwiki.apache.org/confluence/display/GMOxDOC22/Documentation
 |-- Developing a JAX-WS POJO Web Service was last edited by [EMAIL PROTECTED] 
(05:26 PM).
 |   
http://cwiki.apache.org/confluence/display/GMOxDOC22/Developing+a+JAX-WS+POJO+Web+Service
 |-- Developing was last edited by sophia (01:36 AM).
 |   http://cwiki.apache.org/confluence/display/GMOxDOC22/Developing
 |
 |-New Comments in This Space
 |-- http://cwiki.apache.org/confluence/display/GMOxDOC22/Installing+Eclipse (1)

Apache Struts 2 Documentation (WW) http://cwiki.apache.org/confluence/display/WW
|
|-Pages Added or Edited in This Space
 |-- action was last edited by musachy (08:20 AM).
 |   http://cwiki.apache.org/confluence/display/WW/action
 |-- Basic Validation was last edited by phil (01:48 AM).
 |   http://cwiki.apache.org/confluence/display/WW/Basic+Validation
 |
 |-New Comments in This Space
 |-- 
http://cwiki.apache.org/confluence/display/WW/How+do+we+repopulate+controls+when+validation+fails
 (1)
 |-- http://cwiki.apache.org/confluence/display/WW/Basic+Validation (1)

Apache Web services (WS) http://cwiki.apache.org/confluence/display/WS
|
|-Pages Added or Edited in This Space
 |-- Index was last edited by [EMAIL PROTECTED] (11:14 AM).
 |   http://cwiki.apache.org/confluence/display/WS/Index

Apache Wicket (WICKET) http://cwiki.apache.org/confluence/display/WICKET
|
|-Pages Added or Edited in This Space
 |-- Wicket 1.5 Wish List was last edited by ivaynberg (09:45 AM).
 |   http://cwiki.apache.org/confluence/display/WICKET/Wicket+1.5+Wish+List

Apache ServiceMix 4.0 (SMX4) http://cwiki.apache.org/confluence/display/SMX4
|
|-Pages Added or Edited in This Space
 |-- 2. Intermediate - Using EJB in SMX4 was created by nanthrax (01:22 AM).
 |   
http://cwiki.apache.org/confluence/display/SMX4/2.+Intermediate+-+Using+EJB+in+SMX4
 |-- 1. Beginner - Creating wrapper OSGi bundles was created by nanthrax (01:16 
AM).
 |   
http://cwiki.apache.org/confluence/display/SMX4/1.+Beginner+-+Creating+wrapper+OSGi+bundles
 |-- Tutorials was last edited by nanthrax (01:15 AM).
 |   http://cwiki.apache.org/confluence/display/SMX4/Tutorials

Apache Qpid (qpid) http://cwiki.apache.org/confluence/display/qpid
|
|-Pages Added or Edited in This Space
 |-- System Properties was created by ritchiem (04:41 AM).
 |   http://cwiki.apache.org/confluence/display/qpid/System+Properties
 |-- Qpid Java Documentation was last edited by ritchiem (04:43 AM).
 |   http://cwiki.apache.org/confluence/display/qpid/Qpid+Java+Documentation
 |-- Java broker log monitoring was created by aidan (04:23 AM).
 |   http://cwiki.apache.org/conflu

Issues Closed: week of 2008-11-28

2008-11-28 Thread dblevins

Struts2 - Friday, November 28, 2008

  17 closed in last 7 days

[WW-2131] Add custom Dojo profile compilation to build scripts
  Unassigned - Task - [Future]
  http://issues.apache.org/struts/browse/WW-2131

[WW-2628] Session timeout and ajax
  Unassigned - Bug - [Future]
  http://issues.apache.org/struts/browse/WW-2628

[WW-2449] Support convention based action chaining
  Unassigned - New Feature - [2.2.x]
  http://issues.apache.org/struts/browse/WW-2449

[WW-2888] Cleanup of FileUploadInterceptor (added some generics and use 
XWork's text parsing)
  Unassigned - Improvement - [2.1.3]
  http://issues.apache.org/struts/browse/WW-2888

[WW-2422] Merge SmartURLs and CodeBehind into Conventions plugin
  Brian Pontarelli - New Feature - [2.1.3]
  http://issues.apache.org/struts/browse/WW-2422

[WW-1851] Struts 2.0 DTD missing "default-class-ref" element
  James Holmes - Bug - [2.0.9, 2.1.0]
  http://issues.apache.org/struts/browse/WW-1851

[WW-2724] [S2-ActionComponent] Action not on the stack while evaluating body
  Unassigned - Bug - []
  http://issues.apache.org/struts/browse/WW-2724

[WW-2882] FreemarkerManager too private
  Unassigned - Bug - [2.1.3]
  http://issues.apache.org/struts/browse/WW-2882

[WW-2783] The anchor parameter in the url tag does not evaluate OGNL 
expression.
  Unassigned - Improvement - [2.1.3]
  http://issues.apache.org/struts/browse/WW-2783

[WW-2558] Spring plugin can't find Action classes configured by Spring 2.5 
annotations
  Unassigned - Improvement - [2.2.x]
  http://issues.apache.org/struts/browse/WW-2558

[WW-2879] Use Concurrent API in FreemarkerTemplateEngine
  Unassigned - Improvement - [2.1.3]
  http://issues.apache.org/struts/browse/WW-2879

[WW-2894] How to get parameter values from request in the custom interceptor
  Unassigned - Bug - []
  http://issues.apache.org/struts/browse/WW-2894

[WW-2756] struts-dojo-tags.tld is not compatible with Resin 3.1.x
  Unassigned - Bug - [2.1.3]
  http://issues.apache.org/struts/browse/WW-2756

[WW-2889] Use StringBuilder instread of StringBuffer
  Unassigned - Improvement - [2.1.3]
  http://issues.apache.org/struts/browse/WW-2889

[WW-2260] resultsLimit attribute set to -1 in autocompleter tag is ignored
  Unassigned - Bug - [2.1.3]
  http://issues.apache.org/struts/browse/WW-2260

[WW-2360] struts2-portlet in maven repository - war instead of jar
  Unassigned - Bug - []
  http://issues.apache.org/struts/browse/WW-2360

[WW-2248] No way to include an empty option in autocompleter
  Unassigned - Bug - [2.1.3]
  http://issues.apache.org/struts/browse/WW-2248



svn commit: r721379 - in /struts/struts1/trunk/core/src/main/java/org/apache/struts/dispatcher: AbstractEventMappingDispatcher.java servlet/ServletEventMappingDispatcher.java

2008-11-28 Thread pbenedict
Author: pbenedict
Date: Fri Nov 28 00:23:24 2008
New Revision: 721379

URL: http://svn.apache.org/viewvc?rev=721379&view=rev
Log:
STR-3168: Add port of EventActionDispatcher

Added:

struts/struts1/trunk/core/src/main/java/org/apache/struts/dispatcher/AbstractEventMappingDispatcher.java
   (with props)

struts/struts1/trunk/core/src/main/java/org/apache/struts/dispatcher/servlet/ServletEventMappingDispatcher.java
   (with props)

Added: 
struts/struts1/trunk/core/src/main/java/org/apache/struts/dispatcher/AbstractEventMappingDispatcher.java
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/dispatcher/AbstractEventMappingDispatcher.java?rev=721379&view=auto
==
--- 
struts/struts1/trunk/core/src/main/java/org/apache/struts/dispatcher/AbstractEventMappingDispatcher.java
 (added)
+++ 
struts/struts1/trunk/core/src/main/java/org/apache/struts/dispatcher/AbstractEventMappingDispatcher.java
 Fri Nov 28 00:23:24 2008
@@ -0,0 +1,107 @@
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.struts.dispatcher;
+
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.chain.contexts.ActionContext;
+
+import java.util.StringTokenizer;
+
+/**
+ * This abstract class is a template for choosing the target method that is
+ * named in the list-encoded parameter attribute of the
+ * [EMAIL PROTECTED] ActionMapping} that matches a submission parameter. This 
is useful for
+ * developers who prefer to use many submit buttons, images, or submit links on
+ * a single form and whose related actions exist in a single action.
+ * 
+ * For utility purposes, you can use the key=value notation to
+ * alias methods so that they are exposed as different form element names, in
+ * the event of a naming conflict or otherwise. In this example, the
+ * recalc button (via a submission parameter) will invoke the
+ * recalculate method. The security-minded person may find this
+ * feature valuable to obfuscate and not expose the methods.
+ * 
+ * The default key is purely optional, but encouraged when nothing
+ * matches (such as the user pressing the enter key). If this is not specified
+ * and no parameters match the list of method keys, null is
+ * returned which means the unspecified method will be invoked.
+ * 
+ * The order of the parameters are guaranteed to be iterated in the order
+ * specified. If multiple buttons were accidently submitted, the first match in
+ * the list will be dispatched.
+ * 
+ * @version $Rev$
+ * @since Struts 1.4
+ */
+public abstract class AbstractEventMappingDispatcher extends 
AbstractMappingDispatcher {
+
+/**
+ * The method key, if present, to use if other specified method keys do not
+ * match a request parameter.
+ */
+protected static final String DEFAULT_METHOD_KEY = "default";
+
+/**
+ * Determines whether the specified method key is a submission parameter.
+ * 
+ * @param context the current action context
+ * @param methodKey the method key
+ * @return true if match; otherwise false
+ * @see #resolveMethodName(ActionContext)
+ */
+protected abstract boolean isSubmissionParameter(ActionContext context, 
String methodKey);
+
+protected final String resolveMethodName(ActionContext context) {
+   // Obtain the mapping parameter
+   String parameter = super.resolveMethodName(context);
+   assert parameter != null;
+
+   // Parse it as a comma-separated list
+   StringTokenizer st = new StringTokenizer(parameter, ",");
+   String defaultMethodName = null;
+
+   while (st.hasMoreTokens()) {
+   String methodKey = st.nextToken().trim();
+   String methodName = methodKey;
+
+   // The key can either be a direct method name or an alias
+   // to a method as indicated by a "key=value" signature
+   int equals = methodKey.indexOf('=');
+   if (equals > -1) {
+   methodName = methodKey.substring(equals + 1).trim();
+   methodKey = methodKey.substring(0, equals).trim();
+   }
+
+   // Set the default if it pas

svn commit: r721642 - in /struts/struts1: branches/STRUTS_1_3_BRANCH/pom.xml trunk/pom.xml

2008-11-28 Thread pbenedict
Author: pbenedict
Date: Fri Nov 28 21:34:14 2008
New Revision: 721642

URL: http://svn.apache.org/viewvc?rev=721642&view=rev
Log:
STR-3171: Lock down plugin versions

Modified:
struts/struts1/branches/STRUTS_1_3_BRANCH/pom.xml
struts/struts1/trunk/pom.xml

Modified: struts/struts1/branches/STRUTS_1_3_BRANCH/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/pom.xml?rev=721642&r1=721641&r2=721642&view=diff
==
--- struts/struts1/branches/STRUTS_1_3_BRANCH/pom.xml (original)
+++ struts/struts1/branches/STRUTS_1_3_BRANCH/pom.xml Fri Nov 28 21:34:14 2008
@@ -149,22 +149,27 @@
 
 org.apache.maven.plugins
 maven-compiler-plugin
+2.0.2
 
 1.4
 1.4
 
 
 
+maven-javadoc-plugin
+2.5
+
+
 maven-site-plugin
-2.0-beta-5
+2.0-beta-7
 
 
 maven-source-plugin
-2.0.1
+2.0.4
 
 
 maven-jar-plugin
-2.1
+2.2
 
 
 
@@ -177,7 +182,7 @@
 
 net.sf.dtddoc
 dtddoc-maven-plugin
-1.0.0
+1.1
 
 
 net.sourceforge.maven-taglib
@@ -191,9 +196,10 @@
 
 
 
+   org.apache.maven.plugins
maven-antrun-plugin
false
-   1.1
+   1.3

   
  copy-dtds
@@ -224,19 +230,30 @@
 
 org.apache.maven.plugins
 maven-project-info-reports-plugin
+2.1
  
 
 maven-javadoc-plugin
-2.1
+2.5
 
-  true
+  
+http://commons.apache.org/beanutils/apidocs/
+
http://commons.apache.org/logging/commons-logging-1.0.4/docs/apidocs/
+http://commons.apache.org/validator/api-1.3.1/
+http://java.sun.com/j2se/1.4.2/docs/api/
+http://java.sun.com/j2ee/1.4/docs/api/
+  
 
 
 
+org.apache.maven.plugins
 maven-surefire-report-plugin
+2.4.3
 
 
+org.apache.maven.plugins
 maven-checkstyle-plugin
+2.2
 
   
http://svn.apache.org/repos/asf/struts/maven/trunk/build/struts_checks.xml
 
@@ -244,13 +261,17 @@
 
 org.apache.maven.plugins
 maven-jxr-plugin
+2.1
 
 
+org.apache.maven.plugins
 maven-pmd-plugin
+2.4
 
 
 net.sf.dtddoc
 dtddoc-maven-plugin
+1.1
 
 
 **/web-app*

Modified: struts/struts1/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/pom.xml?rev=721642&r1=721641&r2=721642&view=diff
==
--- struts/struts1/trunk/pom.xml (original)
+++ struts/struts1/trunk/pom.xml Fri Nov 28 21:34:14 2008
@@ -158,28 +158,42 @@
 
 
 
-maven-surefire-plugin
-2.4.1
+net.sf.dtddoc
+dtddoc-maven-plugin
+1.1
 
 
-org.apache.maven.plugins
-maven-compiler-plugin
+net.sourceforge.maven-taglib
+maven-taglib-plugin
+2.3.1
 
-1.4
-1.4
+  true
 
 
 
-maven-site-plugin
-2.0-beta-5
+org.apache.maven.plugins
+maven-antrun-plugin
+1.3
 
 
-maven-source-plugin
-2.0.1
+org.apache.felix
+maven-bundle-plugin
+1.4.3
+true
 
 

svn commit: r721644 - in /struts/struts1: branches/STRUTS_1_3_BRANCH/integration/apps-it/src/test/java/org/apache/struts/apps/Tomcat5xTestSetup.java trunk/integration/apps-it/src/test/java/org/apache/

2008-11-28 Thread pbenedict
Author: pbenedict
Date: Fri Nov 28 21:39:33 2008
New Revision: 721644

URL: http://svn.apache.org/viewvc?rev=721644&view=rev
Log:
STR-3172: Bump to TC 5.5.26

Modified:

struts/struts1/branches/STRUTS_1_3_BRANCH/integration/apps-it/src/test/java/org/apache/struts/apps/Tomcat5xTestSetup.java

struts/struts1/trunk/integration/apps-it/src/test/java/org/apache/struts/apps/Tomcat5xTestSetup.java

Modified: 
struts/struts1/branches/STRUTS_1_3_BRANCH/integration/apps-it/src/test/java/org/apache/struts/apps/Tomcat5xTestSetup.java
URL: 
http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/integration/apps-it/src/test/java/org/apache/struts/apps/Tomcat5xTestSetup.java?rev=721644&r1=721643&r2=721644&view=diff
==
--- 
struts/struts1/branches/STRUTS_1_3_BRANCH/integration/apps-it/src/test/java/org/apache/struts/apps/Tomcat5xTestSetup.java
 (original)
+++ 
struts/struts1/branches/STRUTS_1_3_BRANCH/integration/apps-it/src/test/java/org/apache/struts/apps/Tomcat5xTestSetup.java
 Fri Nov 28 21:39:33 2008
@@ -74,7 +74,7 @@
 //System.out.println("INFO: Downloading Tomcat 5.0 from a mirror");
 Installer installer = new ZipURLInstaller(
 new URL("http://mirrors.ibiblio.org/pub/mirrors/apache";
-+ 
"/tomcat/tomcat-5/v5.0.30/bin/jakarta-tomcat-5.0.30.zip"));
++ 
"/tomcat/tomcat-5/v5.5.26/bin/apache-tomcat-5.5.26.zip"));
 installer.install();
 tomcatHome = installer.getHome();
 } else {

Modified: 
struts/struts1/trunk/integration/apps-it/src/test/java/org/apache/struts/apps/Tomcat5xTestSetup.java
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/integration/apps-it/src/test/java/org/apache/struts/apps/Tomcat5xTestSetup.java?rev=721644&r1=721643&r2=721644&view=diff
==
--- 
struts/struts1/trunk/integration/apps-it/src/test/java/org/apache/struts/apps/Tomcat5xTestSetup.java
 (original)
+++ 
struts/struts1/trunk/integration/apps-it/src/test/java/org/apache/struts/apps/Tomcat5xTestSetup.java
 Fri Nov 28 21:39:33 2008
@@ -74,7 +74,7 @@
 //System.out.println("INFO: Downloading Tomcat 5.0 from a mirror");
 Installer installer = new ZipURLInstaller(
 new URL("http://mirrors.ibiblio.org/pub/mirrors/apache";
-+ 
"/tomcat/tomcat-5/v5.0.30/bin/jakarta-tomcat-5.0.30.zip"));
++ 
"/tomcat/tomcat-5/v5.5.26/bin/apache-tomcat-5.5.26.zip"));
 installer.install();
 tomcatHome = installer.getHome();
 } else {




svn commit: r721646 - in /struts/struts1/branches/STRUTS_1_3_BRANCH: ./ apps/ apps/blank/ apps/cookbook/ apps/el-example/ apps/examples/ apps/faces-example1/ apps/faces-example2/ apps/mailreader/ apps

2008-11-28 Thread pbenedict
Author: pbenedict
Date: Fri Nov 28 21:43:22 2008
New Revision: 721646

URL: http://svn.apache.org/viewvc?rev=721646&view=rev
Log:
Prepare 1.3.10 release

Modified:
struts/struts1/branches/STRUTS_1_3_BRANCH/apps/blank/pom.xml
struts/struts1/branches/STRUTS_1_3_BRANCH/apps/cookbook/pom.xml
struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/pom.xml
struts/struts1/branches/STRUTS_1_3_BRANCH/apps/examples/pom.xml
struts/struts1/branches/STRUTS_1_3_BRANCH/apps/faces-example1/pom.xml
struts/struts1/branches/STRUTS_1_3_BRANCH/apps/faces-example2/pom.xml
struts/struts1/branches/STRUTS_1_3_BRANCH/apps/mailreader/pom.xml
struts/struts1/branches/STRUTS_1_3_BRANCH/apps/pom.xml
struts/struts1/branches/STRUTS_1_3_BRANCH/apps/scripting-mailreader/pom.xml
struts/struts1/branches/STRUTS_1_3_BRANCH/assembly/pom.xml
struts/struts1/branches/STRUTS_1_3_BRANCH/core/pom.xml
struts/struts1/branches/STRUTS_1_3_BRANCH/el/pom.xml
struts/struts1/branches/STRUTS_1_3_BRANCH/extras/pom.xml
struts/struts1/branches/STRUTS_1_3_BRANCH/faces/pom.xml
struts/struts1/branches/STRUTS_1_3_BRANCH/integration/apps-it/pom.xml
struts/struts1/branches/STRUTS_1_3_BRANCH/integration/pom.xml
struts/struts1/branches/STRUTS_1_3_BRANCH/mailreader-dao/pom.xml
struts/struts1/branches/STRUTS_1_3_BRANCH/pom.xml
struts/struts1/branches/STRUTS_1_3_BRANCH/scripting/pom.xml
struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/pom.xml
struts/struts1/branches/STRUTS_1_3_BRANCH/tiles/pom.xml

Modified: struts/struts1/branches/STRUTS_1_3_BRANCH/apps/blank/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/apps/blank/pom.xml?rev=721646&r1=721645&r2=721646&view=diff
==
--- struts/struts1/branches/STRUTS_1_3_BRANCH/apps/blank/pom.xml (original)
+++ struts/struts1/branches/STRUTS_1_3_BRANCH/apps/blank/pom.xml Fri Nov 28 
21:43:22 2008
@@ -22,7 +22,7 @@

   org.apache.struts
   struts-apps
-  1.3.10-SNAPSHOT
+  1.3.10

 
4.0.0

Modified: struts/struts1/branches/STRUTS_1_3_BRANCH/apps/cookbook/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/apps/cookbook/pom.xml?rev=721646&r1=721645&r2=721646&view=diff
==
--- struts/struts1/branches/STRUTS_1_3_BRANCH/apps/cookbook/pom.xml (original)
+++ struts/struts1/branches/STRUTS_1_3_BRANCH/apps/cookbook/pom.xml Fri Nov 28 
21:43:22 2008
@@ -22,7 +22,7 @@

   org.apache.struts
   struts-apps
-  1.3.10-SNAPSHOT
+  1.3.10

 
4.0.0

Modified: struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/pom.xml?rev=721646&r1=721645&r2=721646&view=diff
==
--- struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/pom.xml (original)
+++ struts/struts1/branches/STRUTS_1_3_BRANCH/apps/el-example/pom.xml Fri Nov 
28 21:43:22 2008
@@ -22,7 +22,7 @@

   org.apache.struts
   struts-apps
-  1.3.10-SNAPSHOT
+  1.3.10

 
4.0.0

Modified: struts/struts1/branches/STRUTS_1_3_BRANCH/apps/examples/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/apps/examples/pom.xml?rev=721646&r1=721645&r2=721646&view=diff
==
--- struts/struts1/branches/STRUTS_1_3_BRANCH/apps/examples/pom.xml (original)
+++ struts/struts1/branches/STRUTS_1_3_BRANCH/apps/examples/pom.xml Fri Nov 28 
21:43:22 2008
@@ -22,7 +22,7 @@

   org.apache.struts
   struts-apps
-  1.3.10-SNAPSHOT
+  1.3.10

 
4.0.0

Modified: struts/struts1/branches/STRUTS_1_3_BRANCH/apps/faces-example1/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/apps/faces-example1/pom.xml?rev=721646&r1=721645&r2=721646&view=diff
==
--- struts/struts1/branches/STRUTS_1_3_BRANCH/apps/faces-example1/pom.xml 
(original)
+++ struts/struts1/branches/STRUTS_1_3_BRANCH/apps/faces-example1/pom.xml Fri 
Nov 28 21:43:22 2008
@@ -22,7 +22,7 @@

   org.apache.struts
   struts-apps
-  1.3.10-SNAPSHOT
+  1.3.10

 
4.0.0

Modified: struts/struts1/branches/STRUTS_1_3_BRANCH/apps/faces-example2/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/apps/faces-example2/pom.xml?rev=721646&r1=721645&r2=721646&view=diff
==
--- struts/struts1/branches/STRUTS_1_3_BRANCH/apps/faces-example2/pom.xml 
(original)
+++ struts/struts1/branches/STRUTS_1_3_BRANCH/apps/faces-example2/pom.xml Fri 
Nov 28 21:43:22 2008
@@ -22