svn commit: r1078462 - in /struts/struts2/trunk: apps/blank/ archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/ archetypes/struts2-archetype-convention/src/main/resources/arche
Author: lukaszlenart Date: Sun Mar 6 13:09:41 2011 New Revision: 1078462 URL: http://svn.apache.org/viewvc?rev=1078462&view=rev Log: Extends Jetty scanner configuration to reload server when any of configuration files will change Modified: struts/struts2/trunk/apps/blank/pom.xml struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml struts/struts2/trunk/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml struts/struts2/trunk/archetypes/struts2-archetype-portlet/src/main/resources/archetype-resources/pom.xml struts/struts2/trunk/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml Modified: struts/struts2/trunk/apps/blank/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/pom.xml?rev=1078462&r1=1078461&r2=1078462&view=diff == --- struts/struts2/trunk/apps/blank/pom.xml (original) +++ struts/struts2/trunk/apps/blank/pom.xml Sun Mar 6 13:09:41 2011 @@ -21,7 +21,8 @@ * under the License. */ --> -http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> 4.0.0 org.apache.struts @@ -34,9 +35,9 @@ Blank Webapp - scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/blank/ - scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/blank/ - http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/blank/ + scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/blank/ + scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/blank/ + http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/blank/ @@ -69,10 +70,15 @@ 6.0.1 10 + +src/main/webapp/WEB-INF + src/main/webapp/WEB-INF/web.xml +src/main/resources/struts.xml +src/main/resources/example.xml + - Modified: struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml?rev=1078462&r1=1078461&r2=1078462&view=diff == --- struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml (original) +++ struts/struts2/trunk/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml Sun Mar 6 13:09:41 2011 @@ -84,6 +84,12 @@ 6.1.21 10 + +src/main/webapp/WEB-INF + src/main/webapp/WEB-INF/web.xml +src/main/resources/struts.xml +src/main/resources/example.xml + Modified: struts/struts2/trunk/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml?rev=1078462&r1=1078461&r2=1078462&view=diff == --- struts/struts2/trunk/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml (original) +++ struts/struts2/trunk/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml Sun Mar 6 13:09:41 2011 @@ -84,6 +84,11 @@ 6.1.21 10 + +src/main/webapp/WEB-INF + src/main/webapp/WEB-INF/web.xml +src/main/resources/struts.xml + Modified: struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml?rev=1078462&r1=1078461&r2=1078462&view=diff
svn commit: r1078465 - /struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java
Author: lukaszlenart
Date: Sun Mar 6 13:24:17 2011
New Revision: 1078465
URL: http://svn.apache.org/viewvc?rev=1078465&view=rev
Log:
Solves WW-3461 - additional synchronize block is not needed as the
validatorCache is already synchronized map
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java?rev=1078465&r1=1078464&r2=1078465&view=diff
==
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java
Sun Mar 6 13:24:17 2011
@@ -28,7 +28,14 @@ import com.opensymphony.xwork2.validator
import java.io.IOException;
import java.io.InputStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
/**
* AnnotationActionValidatorManager is the entry point into XWork's
annotations-based validator framework.
@@ -68,19 +75,18 @@ public class AnnotationActionValidatorMa
public List getValidators(Class clazz, String context, String
method) {
final String validatorKey = buildValidatorKey(clazz);
final List cfgs;
-synchronized (validatorCache) {
-if (validatorCache.containsKey(validatorKey)) {
-if (FileManager.isReloadingConfigs()) {
-validatorCache.put(validatorKey,
buildValidatorConfigs(clazz, context, true, null));
-}
-} else {
-validatorCache.put(validatorKey, buildValidatorConfigs(clazz,
context, false, null));
-}
-// get the set of validator configs
-cfgs = new
ArrayList(validatorCache.get(validatorKey));
+if (validatorCache.containsKey(validatorKey)) {
+if (FileManager.isReloadingConfigs()) {
+validatorCache.put(validatorKey, buildValidatorConfigs(clazz,
context, true, null));
+}
+} else {
+validatorCache.put(validatorKey, buildValidatorConfigs(clazz,
context, false, null));
}
+// get the set of validator configs
+cfgs = new
ArrayList(validatorCache.get(validatorKey));
+
ValueStack stack = ActionContext.getContext().getValueStack();
// create clean instances of the validators for the caller's use
@@ -117,7 +123,7 @@ public class AnnotationActionValidatorMa
List validators = getValidators(object.getClass(), context,
method);
Set shortcircuitedFields = null;
-for (final Validator validator: validators) {
+for (final Validator validator : validators) {
try {
validator.setValidatorContext(validatorContext);
@@ -141,8 +147,7 @@ public class AnnotationActionValidatorMa
}
}
-if (validator instanceof ShortCircuitableValidator &&
((ShortCircuitableValidator) validator).isShortCircuit())
-{
+if (validator instanceof ShortCircuitableValidator &&
((ShortCircuitableValidator) validator).isShortCircuit()) {
// get number of existing errors
List errs = null;
@@ -197,7 +202,7 @@ public class AnnotationActionValidatorMa
validator.validate(object);
} finally {
-validator.setValidatorContext( null );
+validator.setValidatorContext(null);
}
}
@@ -206,7 +211,7 @@ public class AnnotationActionValidatorMa
/**
* Builds a key for validators - used when caching validators.
*
- * @param clazz the action.
+ * @param clazz the action.
* @return a validator key which is the class name plus context.
*/
protected static String buildValidatorKey(Class clazz) {
@@ -224,7 +229,7 @@ public class AnnotationActionValidatorMa
return sb.toString();
}
-private List buildAliasValidatorConfigs(Class aClass,
String context, boolean checkFile) {
+private List buildAliasValidatorConfigs(Class aClass,
String context, boolean checkFile) {
String fileName = aClass.getName().replace('.', '/') + "-" +
context.replace('/', '-') + VALIDATION_CONFIG_SUFFIX;
return loadFile(fileName, aClass, checkFile);
@@ -371,11 +376,10 @@ public class AnnotationActionValidatorMa
}
-
/**
* An
[CONF] Confluence Changes in the last 24 hours
This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Directory Development (https://cwiki.apache.org/confluence/display/DIRxDEV) Pages - Top Level Pom Management Policy edited by seelmann (05:18 PM) https://cwiki.apache.org/confluence/display/DIRxDEV/Top+Level+Pom+Management+Policy Apache Empire DB (https://cwiki.apache.org/confluence/display/empiredb) Pages - Release Process edited by francisdb (04:48 PM) https://cwiki.apache.org/confluence/display/empiredb/Release+Process Apache Geronimo v3.0 (https://cwiki.apache.org/confluence/display/GMOxDOC30) Pages - Naming (JNDI) edited by chirun...@gmail.com (10:43 PM) https://cwiki.apache.org/confluence/display/GMOxDOC30/Naming+%28JNDI%29 Apache Isis (https://cwiki.apache.org/confluence/display/ISIS) Pages - SmokeTest edited by danhaywood (08:17 AM) https://cwiki.apache.org/confluence/display/ISIS/SmokeTest SettingUpDevelopmentEnvironment edited by danhaywood (08:15 AM) https://cwiki.apache.org/confluence/display/ISIS/SettingUpDevelopmentEnvironment BuildProcess edited by danhaywood (07:00 AM) https://cwiki.apache.org/confluence/display/ISIS/BuildProcess Apache Mahout (https://cwiki.apache.org/confluence/display/MAHOUT) Pages - Using Mahout with Python via JPype created by jer...@lewi.us (09:40 PM) https://cwiki.apache.org/confluence/display/MAHOUT/Using+Mahout+with+Python+via+JPype Mahout on Elastic MapReduce edited by thelabdude (11:56 AM) https://cwiki.apache.org/confluence/display/MAHOUT/Mahout+on+Elastic+MapReduce Apache ServiceMix (https://cwiki.apache.org/confluence/display/SM) Pages - Navigation edited by nanthrax (03:33 PM) https://cwiki.apache.org/confluence/display/SM/Navigation Apache Wicket (https://cwiki.apache.org/confluence/display/WICKET) Pages - Products based on Wicket edited by maax (05:40 AM) https://cwiki.apache.org/confluence/display/WICKET/Products+based+on+Wicket - Users - maax https://cwiki.apache.org/confluence/display/~maax Change your notification preferences: https://cwiki.apache.org/confluence/users/viewnotifications.action
