svn commit: r1433600 - in /struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion: annotations/TypeConversion.java impl/XWorkConverter.java
Author: lukaszlenart
Date: Tue Jan 15 19:43:43 2013
New Revision: 1433600
URL: http://svn.apache.org/viewvc?rev=1433600&view=rev
Log:
WW-3837 solves problem with NPE
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/TypeConversion.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/TypeConversion.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/TypeConversion.java?rev=1433600&r1=1433599&r2=1433600&view=diff
==
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/TypeConversion.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/annotations/TypeConversion.java
Tue Jan 15 19:43:43 2013
@@ -155,7 +155,7 @@ public @interface TypeConversion {
/**
* The ConversionRule can be a PROPERTY, KEY, KEY_PROPERTY, ELEMENT,
COLLECTION (deprecated) or a MAP.
- * Note: Collection and Map vonversion rules can be determined via
com.opensymphony.xwork2.util.DefaultObjectTypeDeterminer.
+ * Note: Collection and Map conversion rules can be determined via
com.opensymphony.xwork2.util.DefaultObjectTypeDeterminer.
*
* @see com.opensymphony.xwork2.conversion.impl.DefaultObjectTypeDeterminer
*/
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java?rev=1433600&r1=1433599&r2=1433600&view=diff
==
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java
Tue Jan 15 19:43:43 2013
@@ -440,6 +440,9 @@ public class XWorkConverter extends Defa
}
return converter;
} catch (Throwable t) {
+if (LOG.isDebugEnabled()) {
+LOG.debug("Got exception trying to resolve convert for
class [#0] and property [#1]", t, clazz.getName(), property);
+}
noMapping.add(clazz);
}
}
@@ -753,7 +756,7 @@ public class XWorkConverter extends Defa
if (reloadingConfigs) {
URL fileUrl =
ClassLoaderUtil.getResource(buildConverterFilename(clazz), clazz);
-if (fileManager.fileNeedsReloading(fileUrl.toString())) {
+if (fileManager.fileNeedsReloading(fileUrl)) {
mapping = buildConverterMapping(clazz);
}
}
svn commit: r1433650 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DefaultStaticContentLoader.java
Author: lukaszlenart
Date: Tue Jan 15 21:09:01 2013
New Revision: 1433650
URL: http://svn.apache.org/viewvc?rev=1433650&view=rev
Log:
WW-3962 removes duplicated initialisation of loggerFactory
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DefaultStaticContentLoader.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DefaultStaticContentLoader.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DefaultStaticContentLoader.java?rev=1433650&r1=1433649&r2=1433650&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DefaultStaticContentLoader.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/DefaultStaticContentLoader.java
Tue Jan 15 21:09:01 2013
@@ -62,10 +62,11 @@ import java.util.StringTokenizer;
*
*/
public class DefaultStaticContentLoader implements StaticContentLoader {
+
/**
* Provide a logging instance.
*/
-private Logger log;
+private Logger LOG =
LoggerFactory.getLogger(DefaultStaticContentLoader.class);
/**
* Store set of path prefixes to use with static resources.
@@ -137,7 +138,6 @@ public class DefaultStaticContentLoader
packages = param + " " + packages;
}
this.pathPrefixes = parse(packages);
-initLogging(filterConfig);
}
protected String getAdditionalPackages() {
@@ -213,8 +213,9 @@ public class DefaultStaticContentLoader
try {
ifModifiedSince = request.getDateHeader("If-Modified-Since");
} catch (Exception e) {
-log.warn("Invalid If-Modified-Since header value: '"
-+ request.getHeader("If-Modified-Since") + "',
ignoring");
+if (LOG.isWarnEnabled()) {
+LOG.warn("Invalid If-Modified-Since header value: '#0',
ignoring", request.getHeader("If-Modified-Since"));
+}
}
long lastModifiedMillis = lastModifiedCal.getTimeInMillis();
long now = cal.getTimeInMillis();
@@ -257,29 +258,6 @@ public class DefaultStaticContentLoader
}
}
-private void initLogging(HostConfig filterConfig) {
-String factoryName = filterConfig.getInitParameter("loggerFactory");
-if (factoryName != null) {
-try {
-Class cls = ClassLoaderUtil.loadClass(factoryName,
this.getClass());
-LoggerFactory fac = (LoggerFactory)cls.newInstance();
-LoggerFactory.setLoggerFactory(fac);
-} catch (InstantiationException e) {
-System.err.println("Unable to instantiate logger factory:
"+factoryName+", using default");
-e.printStackTrace();
-} catch (IllegalAccessException e) {
-System.err.println("Unable to access logger factory:
"+factoryName+", using default");
-e.printStackTrace();
-} catch (ClassNotFoundException e) {
-System.err.println("Unable to locate logger factory class:
"+factoryName+", using default");
-e.printStackTrace();
-}
-}
-
-log = LoggerFactory.getLogger(DefaultStaticContentLoader.class);
-
-}
-
/**
* Look for a static resource in the classpath.
*
[CONF] Confluence Changes in the last 24 hours
This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Ambari (Incubating) (https://cwiki.apache.org/confluence/display/AMBARI) Pages - Ambari edited by yusaku (06:23 PM) https://cwiki.apache.org/confluence/display/AMBARI/Ambari Apache Camel (https://cwiki.apache.org/confluence/display/CAMEL) Pages - Camel 2.11.0 Release edited by davsclaus (12:10 PM) https://cwiki.apache.org/confluence/display/CAMEL/Camel+2.11.0+Release Apache Cloudstack (https://cwiki.apache.org/confluence/display/CLOUDSTACK) Pages - BigSwitch Networking Plugin edited by kjiang (10:30 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/BigSwitch+Networking+Plugin Draft - CloudStack Community Events Plan edited by mrhinkle (10:21 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Draft+-+CloudStack+Community+Events+Plan Network inline mode functional spec edited by yasker (09:28 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Network+inline+mode+functional+spec Minutes 15th Jan 2013 created by sudhap (05:26 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Minutes+15th+Jan+2013 CloudStack 4.1 Test Plans edited by sudhap (04:44 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+4.1+Test+Plans CloudStack 4.1 QA Plan edited by sudhap (04:39 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+4.1+QA+Plan devcloud-kvm edited by mlsorensen (02:07 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/devcloud-kvm DevCloud edited by mlsorensen (01:47 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/DevCloud Dedicated Resources - Private pod, cluster, host Functional Spec edited by deeptidohare (01:32 PM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Dedicated+Resources+-+Private+pod%2C+cluster%2C+host+Functional+Spec FS- IP Range Reservation within a Network created by saksham (09:35 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/FS-+IP+Range+Reservation+within+a+Network Multiple IP address per NIC edited by jayapal (07:54 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Multiple+IP+address+per+NIC GSLB (Global Server Load Balancing) Functional specification and Design Document edited by murali.reddy (06:51 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/GSLB+%28Global+Server+Load+Balancing%29+Functional+specification+and+Design+Document Devcloud Continuous Tests edited by tsp (05:11 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Devcloud+Continuous+Tests FS for Integrating CS alerts via SNMP to external management system edited by anshulg (03:22 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/FS+for+Integrating+CS+alerts+via+SNMP+to+external+management+system Limit Resources to domains and accounts edited by sanjay.tripa...@citrix.com (02:41 AM) https://cwiki.apache.org/confluence/display/CLOUDSTACK/Limit+Resources+to+domains+and+accounts Apache cTAKES (https://cwiki.apache.org/confluence/display/CTAKES) Pages - cTAKES 3.0 Developer Guide edited by bleeker (06:12 PM) https://cwiki.apache.org/confluence/display/CTAKES/cTAKES+3.0+Developer+Guide Apache CXF (https://cwiki.apache.org/confluence/display/CXF) Pages - Fediz Configuration edited by cohei...@apache.org (11:08 AM) https://cwiki.apache.org/confluence/display/CXF/Fediz+Configuration Fediz IDP edited by cohei...@apache.org (11:07 AM) https://cwiki.apache.org/confluence/display/CXF/Fediz+IDP Fediz Metadata edited by cohei...@apache.org (11:06 AM) https://cwiki.apache.org/confluence/display/CXF/Fediz+Metadata Apache CXF Documentation (https://cwiki.apache.org/confluence/display/CXF20DOC) Pages - Client HTTP Transport (including SSL support) edited by cohei...@apache.org (09:10 AM) https://cwiki.apache.org/confluence/display/CXF20DOC/Client+HTTP+Transport+%28including+SSL+support%29 Service Routing edited by cohei...@apache.org (07:16 AM) https://cwiki.apache.org/confluence/display/CXF20DOC/Service+Routing Maven cxf-codegen-plugin (WSDL to Java) edited by cohei...@apache.org (06:52 AM) https://cwiki.apache.org/confluence/display/CXF20DOC/Maven+cxf-codegen-plugin+%28WSDL+to+Java%29 Drill Wiki (https://cwiki.apache.org/confluence/display/DRILL) Pages - Index created by pctony (11:57 AM) https://cwiki.apache.org/confluenc
svn commit: r1433833 - in /struts/site/trunk: content/ content/resources/ content/resources/extpaths.txt content/site/resources/community.js content/site/site.xml content/site/xdoc/index.xml pom.xml s
Author: lukaszlenart
Date: Wed Jan 16 06:34:59 2013
New Revision: 1433833
URL: http://svn.apache.org/viewvc?rev=1433833&view=rev
Log:
INFRA-5659 Prepares site for SvnPubSub publishing
Added:
struts/site/trunk/content/
- copied from r1431628, struts/site/trunk/src/
struts/site/trunk/content/resources/
struts/site/trunk/content/resources/extpaths.txt
struts/site/trunk/content/site/resources/community.js
- copied unchanged from r1431640,
struts/site/trunk/src/site/resources/community.js
struts/site/trunk/content/site/site.xml
- copied unchanged from r1431640, struts/site/trunk/src/site/site.xml
struts/site/trunk/content/site/xdoc/index.xml
- copied unchanged from r1431640,
struts/site/trunk/src/site/xdoc/index.xml
Removed:
struts/site/trunk/src/
Modified:
struts/site/trunk/pom.xml
Added: struts/site/trunk/content/resources/extpaths.txt
URL:
http://svn.apache.org/viewvc/struts/site/trunk/content/resources/extpaths.txt?rev=1433833&view=auto
==
--- struts/site/trunk/content/resources/extpaths.txt (added)
+++ struts/site/trunk/content/resources/extpaths.txt Wed Jan 16 06:34:59 2013
@@ -0,0 +1,62 @@
+1.0.2
+1.1
+1.2.4
+1.2.7
+1.2.8
+1.2.9
+1.2.x
+1.3.10
+1.3.5
+1.3.8
+1.3.9
+1.x
+2.0.11
+2.0.11.1
+2.0.11.2
+2.0.12
+2.0.14
+2.0.5
+2.0.6
+2.0.7
+2.0.8
+2.0.9
+2.0.x
+2.1.2
+2.1.6
+2.1.8
+2.1.8.1
+2.2.1
+2.2.1.1
+2.2.3
+2.2.3.1
+2.3.1
+2.3.1.1
+2.3.1.2
+2.3.3
+2.3.4
+2.3.4.1
+2.3.7
+2.3.8
+2.x
+api
+css
+dev
+dtds
+images
+img
+js
+legacy
+proposals
+struts-1.2.x
+struts-annotations
+struts-sandbox
+struts2
+struts2-archetype-blank
+struts2-archetype-convention
+struts2-archetype-dbportlet
+struts2-archetype-plugin
+struts2-archetype-portlet
+struts2-archetype-starter
+style
+stylesheets
+uml
\ No newline at end of file
Modified: struts/site/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/struts/site/trunk/pom.xml?rev=1433833&r1=1433832&r2=1433833&view=diff
==
--- struts/site/trunk/pom.xml (original)
+++ struts/site/trunk/pom.xml Wed Jan 16 06:34:59 2013
@@ -30,10 +30,10 @@
4.0.0
-org.apache.struts
struts-site
1
pom
+
Struts Site
http://struts.apache.org/index.html
@@ -65,6 +65,10 @@
+
+${project.build.directory}/site
+
+
apache-site
@@ -133,9 +137,23 @@
+
+
+
+
+org.apache.maven.plugins
+maven-site-plugin
+
+${basedir}/content
+
+
+
+
+
+${site.output}
org.apache.maven.plugins
