date:20130425

svn commit: r1475841 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ContainerHolder.java

2013-04-25 Thread rgielen

Author: rgielen
Date: Thu Apr 25 16:24:16 2013
New Revision: 1475841

URL: http://svn.apache.org/r1475841
Log:
WW-4058
- use remove rather than set(null) for cleanup

Modified:

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

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ContainerHolder.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ContainerHolder.java?rev=1475841&r1=1475840&r2=1475841&view=diff
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ContainerHolder.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ContainerHolder.java
 Thu Apr 25 16:24:16 2013
@@ -27,7 +27,7 @@ class ContainerHolder {
 }
 
 public static void clear() {
-ContainerHolder.instance.set(null);
+ContainerHolder.instance.remove();
 }
 
 }

[CONF] Confluence Changes in the last 24 hours

2013-04-25 Thread confluence

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

-
Updated Spaces:
-


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

Pages
-
GSoC 2013 edited by  smarru  (09:33 AM)
https://cwiki.apache.org/confluence/display/AIRAVATA/GSoC+2013



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

Pages
-
Camel 2.12.0 Release edited by  davsclaus  (08:05 AM)
https://cwiki.apache.org/confluence/display/CAMEL/Camel+2.12.0+Release


Comments
https://cwiki.apache.org/confluence/display/CAMEL/Guice+JMS+Example (1)

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

Pages
-
Blacklist of Routes created by chandanp (08:05 PM)
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Blacklist+of+Routes

N-Tier Features created by chandanp (08:04 PM)
https://cwiki.apache.org/confluence/display/CLOUDSTACK/N-Tier+Features

Setting up a CloudStack dev environment on Windows edited by  parth  (07:59 PM)
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Setting+up+a+CloudStack+dev+environment+on+Windows

Setting Up a CloudStack Development Environment on Mac OS X edited by  parth  
(06:58 PM)
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Setting+Up+a+CloudStack+Development+Environment+on+Mac+OS+X

Internal Load Balancing between VPC tiers edited by  alena1108  (06:57 PM)
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Internal+Load+Balancing+between+VPC+tiers

FS- Dedicate Guest VLANs per tenant edited by  likitha.she...@citrix.com  
(06:27 PM)
https://cwiki.apache.org/confluence/display/CLOUDSTACK/FS-+Dedicate+Guest+VLANs+per+tenant

Support ACL deny rules edited by  kis...@cloud.com  (09:54 AM)
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Support+ACL+deny+rules

Ability to have better control over first class objects in CS created by 
nitin.me...@citrix.com (04:37 AM)
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Ability+to+have+better+control+over+first+class+objects+in+CS

Scaling-up CPU and RAM for running VMs edited by  prashantkm  (07:47 AM)
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Scaling-up+CPU+and+RAM+for+running+VMs

Dedicated Resources - Private zone, pod, cluster, host Functional Spec edited 
by  deeptidohare  (05:17 AM)
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Dedicated+Resources+-+Private+zone%2C+pod%2C+cluster%2C+host+Functional+Spec

CloudStack 4.0 test procedure edited by  sebgoa  (03:50 AM)
https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+4.0+test+procedure

How to build on master branch edited by  nitin.me...@citrix.com  (03:00 AM)
https://cwiki.apache.org/confluence/display/CLOUDSTACK/How+to+build+on+master+branch

Source NAT on private gateway edited by  jayapal  (01:26 AM)
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Source+NAT+on+private+gateway



Apache CXF Documentation (https://cwiki.apache.org/confluence/display/CXF20DOC)

Pages
-
JAX-RS Client API edited by  sergey_beryozkin  (05:24 AM)
https://cwiki.apache.org/confluence/display/CXF20DOC/JAX-RS+Client+API


Comments
https://cwiki.apache.org/confluence/display/CXF20DOC/JAX-WS+Configuration (1)

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

Pages
-
GSoc 2013 - Cascading Support - Project Details created by 
la.udesh1...@gmail.com (01:40 AM)
https://cwiki.apache.org/confluence/display/GORA/GSoc+2013+-+Cascading+Support+-+Project+Details



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

Pages
-
LanguageManual edited by  leftyl  (05:17 PM)
https://cwiki.apache.org/confluence/display/Hive/LanguageManual

LanguageManual Windowing&Analytics created by leftyl (05:06 PM)
https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=31819589

PhabricatorCodeReview edited by  mweaverh  (01:27 PM)
https://cwiki.apache.org/confluence/display/Hive/PhabricatorCodeReview



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

Pages
-
AOO 4.0 Release Planning edited by  h...@apache.org  (10:39 AM)
https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.0+Release+Planning



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

Pages
-
Pages edited by  duongphuhiep  (06:31 PM)
https://cwiki.apache.org/confluence/display/WICKET/Pages

Wicket 7.0 Roadmap cr

svn commit: r1476062 - in /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher: Dispatcher.java ng/filter/StrutsPrepareAndExecuteFilter.java ng/filter/StrutsPrepareFilter.java ng/lis

2013-04-25 Thread lukaszlenart

Author: lukaszlenart
Date: Fri Apr 26 06:24:11 2013
New Revision: 1476062

URL: http://svn.apache.org/r1476062
Log:
WW-4058 Adds new method to cleanup after Dispatcher initialisation

Modified:

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

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareAndExecuteFilter.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareFilter.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/listener/StrutsListener.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/servlet/StrutsServlet.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java?rev=1476062&r1=1476061&r2=1476062&view=diff
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
 Fri Apr 26 06:24:11 2013
@@ -815,6 +815,7 @@ public class Dispatcher {
  * @see org.apache.struts2.dispatcher.multipart.MultiPartRequestWrapper
  */
 public void cleanUpRequest(HttpServletRequest request) {
+ContainerHolder.clear();
 if (!(request instanceof MultiPartRequestWrapper)) {
 return;
 }
@@ -895,7 +896,15 @@ public class Dispatcher {
 }
 }
 
-
+/**
+ * Cleanup any resources used to initialise Dispatcher
+ */
+public void cleanUpAfterInit() {
+if (LOG.isDebugEnabled()) {
+LOG.debug("Cleaning up resources used to init Dispatcher");
+}
+ContainerHolder.clear();
+}
 
 /**
  * Provide an accessor class for static XWork utility.

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareAndExecuteFilter.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareAndExecuteFilter.java?rev=1476062&r1=1476061&r2=1476062&view=diff
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareAndExecuteFilter.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareAndExecuteFilter.java
 Fri Apr 26 06:24:11 2013
@@ -45,10 +45,11 @@ public class StrutsPrepareAndExecuteFilt
 
 public void init(FilterConfig filterConfig) throws ServletException {
 InitOperations init = new InitOperations();
+Dispatcher dispatcher = null;
 try {
 FilterHostConfig config = new FilterHostConfig(filterConfig);
 init.initLogging(config);
-Dispatcher dispatcher = init.initDispatcher(config);
+dispatcher = init.initDispatcher(config);
 init.initStaticContentLoader(config, dispatcher);
 
 prepare = new PrepareOperations(filterConfig.getServletContext(), 
dispatcher);
@@ -57,6 +58,9 @@ public class StrutsPrepareAndExecuteFilt
 
 postInit(dispatcher, filterConfig);
 } finally {
+if (dispatcher != null) {
+dispatcher.cleanUpAfterInit();
+}
 init.cleanup();
 }
 

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareFilter.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareFilter.java?rev=1476062&r1=1476061&r2=1476062&view=diff
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareFilter.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareFilter.java
 Fri Apr 26 06:24:11 2013
@@ -44,16 +44,20 @@ public class StrutsPrepareFilter impleme
 
public void init(FilterConfig filterConfig) throws ServletException {
 InitOperations init = new InitOperations();
+Dispatcher dispatcher = null;
 try {
 FilterHostConfig config = new FilterHostConfig(filterConfig);
 init.initLogging(config);
-Dispatcher dispatcher = init.initDispatcher(config);
+dispatcher = init.initDispatcher(config);
 
 prepare = new PrepareOperations(filterConfig.getServletContext(), 
dispatcher);
this.excludedPatterns = 
init.buildExcludedPatternsList(dispatcher);
 
 postInit(dispatcher, filterConfig);
 } fina

svn commit: r1476063 - /struts/struts2/trunk/apps/showcase/src/main/resources/log4j.properties

2013-04-25 Thread lukaszlenart

Author: lukaszlenart
Date: Fri Apr 26 06:27:17 2013
New Revision: 1476063

URL: http://svn.apache.org/r1476063
Log:
Changes log levels to be more realistic

Modified:
struts/struts2/trunk/apps/showcase/src/main/resources/log4j.properties

Modified: struts/struts2/trunk/apps/showcase/src/main/resources/log4j.properties
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/log4j.properties?rev=1476063&r1=1476062&r2=1476063&view=diff
==
--- struts/struts2/trunk/apps/showcase/src/main/resources/log4j.properties 
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/log4j.properties Fri 
Apr 26 06:27:17 2013
@@ -11,7 +11,7 @@
 
 
 # Set root logger level to WARN and append to stdout
-log4j.rootLogger=DEBUG, stdout
+log4j.rootLogger=INFO, stdout
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.Target=System.out
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
@@ -20,17 +20,14 @@ log4j.appender.stdout.layout=org.apache.
 log4j.appender.stdout.layout.ConversionPattern=%d %5p (%c:%L) - %m%n
 
 # Print only messages of level ERROR or above in the package noModule.
-log4j.logger.noModule=FATAL
+log4j.logger.noModule=INFO
 
 # OpenSymphony Stuff
 log4j.logger.freemarker=INFO
 log4j.logger.com.opensymphony=INFO
-log4j.logger.com.opensymphony.xwork2.ognl=ERROR
-log4j.logger.org.apache.struts2=WARN
-log4j.logger.org.apache.struts2.components=WARN
-log4j.logger.org.apache.struts2.dispatcher=WARN
-log4j.logger.org.apache.struts2.convention=INFO
+log4j.logger.com.opensymphony.xwork2.ognl=INFO
+log4j.logger.org.apache.struts2=INFO
 
 # Spring Stuff
-log4j.logger.org.springframework=WARN
+log4j.logger.org.springframework=INFO

svn commit: r1476064 - in /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng: filter/ listener/ servlet/

2013-04-25 Thread lukaszlenart

Author: lukaszlenart
Date: Fri Apr 26 06:32:25 2013
New Revision: 1476064

URL: http://svn.apache.org/r1476064
Log:
Re-formats code

Modified:

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsExecuteFilter.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareAndExecuteFilter.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareFilter.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/listener/StrutsListener.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/servlet/StrutsServlet.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsExecuteFilter.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsExecuteFilter.java?rev=1476064&r1=1476063&r2=1476064&view=diff
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsExecuteFilter.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsExecuteFilter.java
 Fri Apr 26 06:32:25 2013
@@ -22,12 +22,17 @@ package org.apache.struts2.dispatcher.ng
 
 import org.apache.struts2.StrutsStatics;
 import org.apache.struts2.dispatcher.Dispatcher;
-import org.apache.struts2.dispatcher.ng.PrepareOperations;
+import org.apache.struts2.dispatcher.mapper.ActionMapping;
 import org.apache.struts2.dispatcher.ng.ExecuteOperations;
 import org.apache.struts2.dispatcher.ng.InitOperations;
-import org.apache.struts2.dispatcher.mapper.ActionMapping;
+import org.apache.struts2.dispatcher.ng.PrepareOperations;
 
-import javax.servlet.*;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -63,15 +68,15 @@ public class StrutsExecuteFilter impleme
 HttpServletRequest request = (HttpServletRequest) req;
 HttpServletResponse response = (HttpServletResponse) res;
 
-   if (excludeUrl(request)) {
-   chain.doFilter(request, response);
-   return;
-   }
+if (excludeUrl(request)) {
+chain.doFilter(request, response);
+return;
+}
 
 // This is necessary since we need the dispatcher instance, which was 
created by the prepare filter
-   if (execute == null) {
-   lazyInit();
-   }
+if (execute == null) {
+lazyInit();
+}
 
 ActionMapping mapping = prepare.findActionMapping(request, response);
 
@@ -89,13 +94,14 @@ public class StrutsExecuteFilter impleme
 }
 }
 
-   private boolean excludeUrl(HttpServletRequest request) {
-   return 
request.getAttribute(StrutsPrepareFilter.REQUEST_EXCLUDED_FROM_ACTION_MAPPING) 
!= null;
-   }
+private boolean excludeUrl(HttpServletRequest request) {
+return 
request.getAttribute(StrutsPrepareFilter.REQUEST_EXCLUDED_FROM_ACTION_MAPPING) 
!= null;
+}
 
 public void destroy() {
 prepare = null;
 execute = null;
 filterConfig = null;
 }
+
 }

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareAndExecuteFilter.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareAndExecuteFilter.java?rev=1476064&r1=1476063&r2=1476064&view=diff
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareAndExecuteFilter.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsPrepareAndExecuteFilter.java
 Fri Apr 26 06:32:25 2013
@@ -27,7 +27,12 @@ import org.apache.struts2.dispatcher.ng.
 import org.apache.struts2.dispatcher.ng.InitOperations;
 import org.apache.struts2.dispatcher.ng.PrepareOperations;
 
-import javax.servlet.*;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -41,7 +46,7 @@ import java.util.regex.Pattern;
 public class StrutsPrepareAndExecuteFilter implements StrutsStatics, Filter {
 protected PrepareOperations prepare;

svn commit: r1475841 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ContainerHolder.java

[CONF] Confluence Changes in the last 24 hours

svn commit: r1476062 - in /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher: Dispatcher.java ng/filter/StrutsPrepareAndExecuteFilter.java ng/filter/StrutsPrepareFilter.java ng/lis

svn commit: r1476063 - /struts/struts2/trunk/apps/showcase/src/main/resources/log4j.properties

svn commit: r1476064 - in /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng: filter/ listener/ servlet/

5 matches

Site Navigation

Mail list logo

Footer information