date:20111216

svn commit: r1215224 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java

2011-12-16 Thread lukaszlenart

Author: lukaszlenart
Date: Fri Dec 16 17:02:42 2011
New Revision: 1215224

URL: http://svn.apache.org/viewvc?rev=1215224&view=rev
Log:
Improves adding tokens to collection

Modified:

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java?rev=1215224&r1=1215223&r2=1215224&view=diff
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
 Fri Dec 16 17:02:42 2011
@@ -276,9 +276,7 @@ public class DefaultActionMapper impleme
 if (extensions != null && !"".equals(extensions)) {
 List list = new ArrayList();
 String[] tokens = extensions.split(",");
-for (String token : tokens) {
-list.add(token);
-}
+Collections.addAll(list, tokens);
 if (extensions.endsWith(",")) {
 list.add("");
 }
@@ -336,6 +334,7 @@ public class DefaultActionMapper impleme
 int exclamation = name.lastIndexOf("!");
 if (exclamation != -1) {
 mapping.setName(name.substring(0, exclamation));
+
 mapping.setMethod(name.substring(exclamation + 1));
 }
 }

svn commit: r1215225 - /struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java

2011-12-16 Thread lukaszlenart

Author: lukaszlenart
Date: Fri Dec 16 17:04:00 2011
New Revision: 1215225

URL: http://svn.apache.org/viewvc?rev=1215225&view=rev
Log:
Removes wrong .equal() and formats code

Modified:

struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java

Modified: 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java?rev=1215225&r1=1215224&r2=1215225&view=diff
==
--- 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
 (original)
+++ 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
 Fri Dec 16 17:04:00 2011
@@ -21,7 +21,11 @@ import com.opensymphony.xwork2.util.logg
 import com.opensymphony.xwork2.util.logging.LoggerFactory;
 
 import java.io.Serializable;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -202,7 +206,7 @@ public class PackageConfig extends Locat
 }
 
 public String getDefaultClassRef() {
-if((defaultClassRef == null) && !parents.isEmpty()) {
+if ((defaultClassRef == null) && !parents.isEmpty()) {
 for (PackageConfig parent : parents) {
 String parentDefault = parent.getDefaultClassRef();
 if (parentDefault != null) {
@@ -349,28 +353,23 @@ public class PackageConfig extends Locat
 return false;
 }
 
-if ((actionConfigs != null) ? 
(!actionConfigs.equals(packageConfig.actionConfigs)) : 
(packageConfig.actionConfigs != null))
-{
+if ((actionConfigs != null) ? 
(!actionConfigs.equals(packageConfig.actionConfigs)) : 
(packageConfig.actionConfigs != null)) {
 return false;
 }
 
-if ((defaultResultType != null) ? 
(!defaultResultType.equals(packageConfig.defaultResultType)) : 
(packageConfig.defaultResultType != null))
-{
+if ((defaultResultType != null) ? 
(!defaultResultType.equals(packageConfig.defaultResultType)) : 
(packageConfig.defaultResultType != null)) {
 return false;
 }
 
-if ((defaultClassRef != null) ? 
(!defaultClassRef.equals(packageConfig.defaultClassRef)) : 
(packageConfig.defaultClassRef != null))
-{
+if ((defaultClassRef != null) ? 
(!defaultClassRef.equals(packageConfig.defaultClassRef)) : 
(packageConfig.defaultClassRef != null)) {
 return false;
 }
 
-if ((globalResultConfigs != null) ? 
(!globalResultConfigs.equals(packageConfig.globalResultConfigs)) : 
(packageConfig.globalResultConfigs != null))
-{
+if ((globalResultConfigs != null) ? 
(!globalResultConfigs.equals(packageConfig.globalResultConfigs)) : 
(packageConfig.globalResultConfigs != null)) {
 return false;
 }
 
-if ((interceptorConfigs != null) ? 
(!interceptorConfigs.equals(packageConfig.interceptorConfigs)) : 
(packageConfig.interceptorConfigs != null))
-{
+if ((interceptorConfigs != null) ? 
(!interceptorConfigs.equals(packageConfig.interceptorConfigs)) : 
(packageConfig.interceptorConfigs != null)) {
 return false;
 }
 
@@ -386,13 +385,11 @@ public class PackageConfig extends Locat
 return false;
 }
 
-if ((resultTypeConfigs != null) ? 
(!resultTypeConfigs.equals(packageConfig.resultTypeConfigs)) : 
(packageConfig.resultTypeConfigs != null))
-{
+if ((resultTypeConfigs != null) ? 
(!resultTypeConfigs.equals(packageConfig.resultTypeConfigs)) : 
(packageConfig.resultTypeConfigs != null)) {
 return false;
 }
 
-if ((globalExceptionMappingConfigs != null) ? 
(!globalExceptionMappingConfigs.equals(packageConfig.globalExceptionMappingConfigs))
 : (packageConfig.globalExceptionMappingConfigs != null))
-{
+if ((globalExceptionMappingConfigs != null) ? 
(!globalExceptionMappingConfigs.equals(packageConfig.globalExceptionMappingConfigs))
 : (packageConfig.globalExceptionMappingConfigs != null)) {
 return false;
 }
 
@@ -473,7 +470,7 @@ public class PackageConfig extends Locat
 return this;
 }
 
-public Builder defaultClassRef( String defaultClassRef ) {
+public Builder defaultClassRef(String defaultClassRef) {
 target.defaultClassRef = defaultClassRef;
 return this;
 }
@@ -545,10 +542,6 @@ public class PackageConfig extends Locat
 }
 
 public Builder addParent(PackageConfig parent) {
-if (this.equals(parent)) {
-LOG.error("A package cannot extend itself: " + target.name

svn commit: r1215253 - /struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java

2011-12-16 Thread lukaszlenart

Author: lukaszlenart
Date: Fri Dec 16 19:53:42 2011
New Revision: 1215253

URL: http://svn.apache.org/viewvc?rev=1215253&view=rev
Log:
WW-3264 improves strict DMI mode

Modified:

struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java

Modified: 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java?rev=1215253&r1=1215252&r2=1215253&view=diff
==
--- 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
 (original)
+++ 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java
 Fri Dec 16 19:53:42 2011
@@ -17,11 +17,17 @@ package com.opensymphony.xwork2.config.e
 
 import com.opensymphony.xwork2.util.location.Located;
 import com.opensymphony.xwork2.util.location.Location;
+import org.apache.commons.lang.StringUtils;
 
 import java.io.Serializable;
-import java.util.*;
-
-import org.apache.commons.lang.StringUtils;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 
 /**
@@ -218,6 +224,7 @@ public class ActionConfig extends Locate
 
 public Builder(ActionConfig toClone) {
 target = new ActionConfig(toClone);
+addAllowedMethod(toClone.getAllowedMethods());
 }
 
 public Builder(String packageName, String name, String className) {

[CONF] Confluence Changes in the last 24 hours

2011-12-16 Thread confluence

This is a daily summary of all recent changes in Confluence.

-
Updated Spaces:
-


Apache ActiveMQ (https://cwiki.apache.org/confluence/display/ACTIVEMQ)

Pages
-
WebSockets edited by  dejanb  (10:58 AM)
https://cwiki.apache.org/confluence/display/ACTIVEMQ/WebSockets



Apache Camel (https://cwiki.apache.org/confluence/display/CAMEL)

Pages
-
Splitter edited by  rubytuesdaydono  (01:02 PM)
https://cwiki.apache.org/confluence/display/CAMEL/Splitter

Camel 2.9.0 Release edited by  davsclaus  (11:25 AM)
https://cwiki.apache.org/confluence/display/CAMEL/Camel+2.9.0+Release

CXF Example edited by  njiang  (02:17 AM)
https://cwiki.apache.org/confluence/display/CAMEL/CXF+Example



Apache DeltaSpike (https://cwiki.apache.org/confluence/display/DeltaSpike)

Pages
-
SE Feature Ranking edited by  struberg  (06:38 AM)
https://cwiki.apache.org/confluence/display/DeltaSpike/SE+Feature+Ranking

Wiki Hints created by gpetracek (06:24 AM)
https://cwiki.apache.org/confluence/display/DeltaSpike/Wiki+Hints



Apache Flume (https://cwiki.apache.org/confluence/display/FLUME)

Pages
-
Flume Hackathon - Dec 16 2011 edited by  esammer  (12:28 PM)
https://cwiki.apache.org/confluence/display/FLUME/Flume+Hackathon+-+Dec+16+2011



Apache Geronimo Project Management 
(https://cwiki.apache.org/confluence/display/GMOxPMGT)

Pages
-
Geronimo 2.1.8 Release Status edited by  xiaming  (08:51 PM)
https://cwiki.apache.org/confluence/display/GMOxPMGT/Geronimo+2.1.8+Release+Status



Apache Hive (https://cwiki.apache.org/confluence/display/Hive)

Pages
-
Home edited by  cwsteinbach  (09:03 PM)
https://cwiki.apache.org/confluence/display/Hive/Home

HowToRelease edited by  cwsteinbach  (08:09 PM)
https://cwiki.apache.org/confluence/display/Hive/HowToRelease



Apache Jackrabbit (https://cwiki.apache.org/confluence/display/JCR)

Pages
-
Downloads edited by  jukka  (08:18 AM)
https://cwiki.apache.org/confluence/display/JCR/Downloads

Welcome to Apache Jackrabbit edited by  jukka  (08:17 AM)
https://cwiki.apache.org/confluence/display/JCR/Welcome+to+Apache+Jackrabbit



Apache OpenOffice.org Community 
(https://cwiki.apache.org/confluence/display/OOOUSERS)

Pages
-
Native Language Projects edited by  khirano  (08:52 PM)
https://cwiki.apache.org/confluence/display/OOOUSERS/Native+Language+Projects

AOOLogo proposal edited by  drewjensen  (01:05 AM)
https://cwiki.apache.org/confluence/display/OOOUSERS/AOOLogo+proposal



Apache Tapestry (https://cwiki.apache.org/confluence/display/TAPESTRY)

Pages
-
Forms and Validation edited by  bobharner  (06:20 PM)
https://cwiki.apache.org/confluence/display/TAPESTRY/Forms+and+Validation



Apache Wicket (https://cwiki.apache.org/confluence/display/WICKET)

Pages
-
Migration to Wicket 1.5 edited by  dretzl...@gmail.com  (05:56 PM)
https://cwiki.apache.org/confluence/display/WICKET/Migration+to+Wicket+1.5



Apache ZooKeeper (https://cwiki.apache.org/confluence/display/ZOOKEEPER)

Pages
-
HowToRelease edited by  phunt  (05:53 PM)
https://cwiki.apache.org/confluence/display/ZOOKEEPER/HowToRelease




Change your notification preferences: 
https://cwiki.apache.org/confluence/users/viewnotifications.action

svn commit: r1215224 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java

svn commit: r1215225 - /struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java

svn commit: r1215253 - /struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java

[CONF] Confluence Changes in the last 24 hours

4 matches

Site Navigation

Mail list logo

Footer information