[CONF] Confluence Changes in the last 24 hours

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

-
Updated Spaces:
-

Apache Sling (SLING) http://cwiki.apache.org/confluence/display/SLING
|
|-Pages Added or Edited in This Space
 |-- Boilerplate was created by bdelacretaz (02:41 AM).
 |   http://cwiki.apache.org/confluence/display/SLING/Boilerplate

Apache Camel (CAMEL) http://cwiki.apache.org/confluence/display/CAMEL
|
|-Pages Added or Edited in This Space
 |-- Component List was last edited by davsclaus (09:41 AM).
 |   http://cwiki.apache.org/confluence/display/CAMEL/Component+List
 |-- msmq was last edited by jstrachan (08:42 AM).
 |   http://cwiki.apache.org/confluence/display/CAMEL/msmq

Apache Sling Website (SLINGxSITE) 
http://cwiki.apache.org/confluence/display/SLINGxSITE
|
|-Pages Added or Edited in This Space
 |-- Getting and Building Sling was last edited by fmeschbe (06:53 AM).
 |   
http://cwiki.apache.org/confluence/display/SLINGxSITE/Getting+and+Building+Sling
 |-- Discover Sling in 15 minutes was last edited by bdelacretaz (03:13 AM).
 |   
http://cwiki.apache.org/confluence/display/SLINGxSITE/Discover+Sling+in+15+minutes

Apache ActiveMQ CPP (AMQCPP) http://cwiki.apache.org/confluence/display/AMQCPP
|
|-Pages Added or Edited in This Space
 |-- Building was last edited by nmittler (11:26 AM).
 |   http://cwiki.apache.org/confluence/display/AMQCPP/Building

Apache Struts 2 Documentation (WW) http://cwiki.apache.org/confluence/display/WW
|
|-Pages Added or Edited in This Space
 |-- JUnit Plugin was created by mrdon (12:16 AM).
 |   http://cwiki.apache.org/confluence/display/WW/JUnit+Plugin

Apache Wicket Website (WICKETxSITE) 
http://cwiki.apache.org/confluence/display/WICKETxSITE
|
|-Pages Added or Edited in This Space
 |-- QuickStart was last edited by seitz (07:01 AM).
 |   http://cwiki.apache.org/confluence/display/WICKETxSITE/QuickStart

Apache Directory Project Management (DIRxPMGT) 
http://cwiki.apache.org/confluence/display/DIRxPMGT
|
|-Pages Added or Edited in This Space
 |-- Documentation Rework for 2.0 was last edited by seelmann (07:31 AM).
 |   
http://cwiki.apache.org/confluence/display/DIRxPMGT/Documentation+Rework+for+2.0

Apache Geronimo (GMOxSITE) http://cwiki.apache.org/confluence/display/GMOxSITE
|
|-Pages Added or Edited in This Space
 |-- Committers was last edited by hcunico (12:49 PM).
 |   http://cwiki.apache.org/confluence/display/GMOxSITE/Committers

Apache Qpid (qpid) http://cwiki.apache.org/confluence/display/qpid
|
|-Pages Added or Edited in This Space
 |-- Getting Started was last edited by cctrieloff (06:48 PM).
 |   http://cwiki.apache.org/confluence/display/qpid/Getting+Started
 |-- Navigation was last edited by cctrieloff (06:41 PM).
 |   http://cwiki.apache.org/confluence/display/qpid/Navigation
 |-- Project Status was last edited by cctrieloff (06:41 PM).
 |   http://cwiki.apache.org/confluence/display/qpid/Project+Status
 |-- MgmtC++ was created by cctrieloff (02:13 PM).
 |   http://cwiki.apache.org/confluence/pages/viewpage.action?pageId=82403
 |-- Building was last edited by cctrieloff (06:07 PM).
 |   http://cwiki.apache.org/confluence/display/qpid/Building
 |-- Qpid 'C++' Documentation was last edited by cctrieloff (05:54 PM).
 |   http://cwiki.apache.org/confluence/pages/viewpage.action?pageId=28284
 |-- Getting Involved was last edited by cctrieloff (05:54 PM).
 |   http://cwiki.apache.org/confluence/display/qpid/Getting+Involved
 |-- People was last edited by cctrieloff (05:51 PM).
 |   http://cwiki.apache.org/confluence/display/qpid/People
 |-- Mailing Lists was last edited by cctrieloff (05:22 PM).
 |   http://cwiki.apache.org/confluence/display/qpid/Mailing+Lists
 |-- License was last edited by cctrieloff (05:17 PM).
 |   http://cwiki.apache.org/confluence/display/qpid/License
 |-- RASC was created by cctrieloff (01:56 PM).
 |   http://cwiki.apache.org/confluence/display/qpid/RASC
 |-- Developer Pages was last edited by cctrieloff (01:39 PM).
 |   http://cwiki.apache.org/confluence/display/qpid/Developer+Pages
 |-- Getting Started Guide was last edited by cctrieloff (01:34 PM).
 |   http://cwiki.apache.org/confluence/display/qpid/Getting+Started+Guide
 |-- RAJB was created by cctrieloff (01:22 PM).
 |   http://cwiki.apache.org/confluence/display/qpid/RAJB
 |-- Download was last edited by cctrieloff (01:06 PM).
 |   http://cwiki.apache.org/confluence/display/qpid/Download
 |-- Index was last edited by cctrieloff (12:40 PM).
 |   http://cwiki.apache.org/confluence/display/qpid/Index
 |-- OSVC was created by cctrieloff (12:17 PM).
 |   http://cwiki.apache.org/confluence/display/qpid/OSVC
 |-- Acknowledgment was last edited by cctrieloff (08:54 AM).
 |   http://cwiki.apache.org/confluence/display/qpid/Acknowledgment
 |-- Qpid Java Meeting Minutes 11-04-2008 was created by godfrer (

svn commit: r647418 - in /struts/struts2/trunk: apps/blank/ apps/portlet/ apps/portlet/src/main/java/org/apache/struts2/portlet/example/fileupload/ apps/showcase/ core/ core/src/main/java/org/apache/s

2008-04-12 Thread mrdon 
Author: mrdon
Date: Sat Apr 12 03:33:33 2008
New Revision: 647418

URL: http://svn.apache.org/viewvc?rev=647418&view=rev
Log:
Moving the DWR validator into its own plugin
WW-2589

Added:
struts/struts2/trunk/plugins/dwr/
struts/struts2/trunk/plugins/dwr/pom.xml
struts/struts2/trunk/plugins/dwr/src/
struts/struts2/trunk/plugins/dwr/src/main/
struts/struts2/trunk/plugins/dwr/src/main/java/
struts/struts2/trunk/plugins/dwr/src/main/java/org/
struts/struts2/trunk/plugins/dwr/src/main/java/org/apache/
struts/struts2/trunk/plugins/dwr/src/main/java/org/apache/struts2/

struts/struts2/trunk/plugins/dwr/src/main/java/org/apache/struts2/validators/

struts/struts2/trunk/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java
  - copied unchanged from r647407, 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/validators/DWRValidator.java
Removed:

struts/struts2/trunk/core/src/main/java/org/apache/struts2/validators/DWRValidator.java
Modified:
struts/struts2/trunk/apps/blank/pom.xml
struts/struts2/trunk/apps/portlet/pom.xml

struts/struts2/trunk/apps/portlet/src/main/java/org/apache/struts2/portlet/example/fileupload/FileUploadAction.java
struts/struts2/trunk/apps/showcase/pom.xml
struts/struts2/trunk/core/pom.xml

struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java

struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CookiesAware.java

struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/PropertyTest.java

struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
struts/struts2/trunk/plugins/pom.xml

struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/dispatcher/DispatcherServlet.java

struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptor.java

struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletContextAware.java

struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletRequestAware.java

struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletResponseAware.java

struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptor.java

struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletHttpSession.java

struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletConfig.java

struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletContext.java

struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletInputStream.java

struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletOutputStream.java

struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletRequest.java

struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletRequestDispatcher.java

struts/struts2/trunk/plugins/portlet/src/main/java/org/apache/struts2/portlet/servlet/PortletServletResponse.java

struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptorTest.java

struts/struts2/trunk/plugins/portlet/src/test/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptorTest.java

Modified: struts/struts2/trunk/apps/blank/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/pom.xml?rev=647418&r1=647417&r2=647418&view=diff
==
--- struts/struts2/trunk/apps/blank/pom.xml (original)
+++ struts/struts2/trunk/apps/blank/pom.xml Sat Apr 12 03:33:33 2008
@@ -55,14 +55,12 @@
 2.0
 provided
 
-
 
-org.springframework
-spring-core
-2.0.8
+${pom.groupId}
+struts2-junit-plugin
+${pom.version}
 test
 
-
 
 
 

Modified: struts/struts2/trunk/apps/portlet/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/pom.xml?rev=647418&r1=647417&r2=647418&view=diff
==
--- struts/struts2/trunk/apps/portlet/pom.xml (original)
+++ struts/struts2/trunk/apps/portlet/pom.xml Sat Apr 12 03:33:33 2008
@@ -114,6 +114,12 @@
 struts2-portlet-plugin
 ${pom.version}
 
+ 
+org.apache.struts
+struts2-dwr-plugin
+${pom.version}
+
+
 
 org.apache.velocity
 ve

svn commit: r647419 - in /struts/struts2/trunk/plugins: dwr/ junit/ testng/

2008-04-12 Thread mrdon 
Author: mrdon
Date: Sat Apr 12 03:36:03 2008
New Revision: 647419

URL: http://svn.apache.org/viewvc?rev=647419&view=rev
Log:
Adding appropriate svn ignores
WW-2589

Modified:
struts/struts2/trunk/plugins/dwr/   (props changed)
struts/struts2/trunk/plugins/junit/   (props changed)
struts/struts2/trunk/plugins/testng/   (props changed)

Propchange: struts/struts2/trunk/plugins/dwr/
--
--- svn:ignore (added)
+++ svn:ignore Sat Apr 12 03:36:03 2008
@@ -0,0 +1,7 @@
+.classpath
+.project
+.settings
+*.ipr
+*.iml
+*.iws
+target

Propchange: struts/struts2/trunk/plugins/junit/
--
--- svn:ignore (added)
+++ svn:ignore Sat Apr 12 03:36:03 2008
@@ -0,0 +1,7 @@
+.classpath
+.project
+.settings
+*.ipr
+*.iml
+*.iws
+target

Propchange: struts/struts2/trunk/plugins/testng/
--
--- svn:ignore (added)
+++ svn:ignore Sat Apr 12 03:36:03 2008
@@ -0,0 +1,8 @@
+.classpath
+.project
+.settings
+*.ipr
+*.iml
+*.iws
+target
+test-output

svn commit: r647434 - in /struts/struts2/trunk: core/ core/src/main/java/org/apache/struts2/dispatcher/multipart/ core/src/main/java/org/apache/struts2/util/ core/src/main/java/org/apache/struts2/vali

2008-04-12 Thread mrdon 
Author: mrdon
Date: Sat Apr 12 04:41:24 2008
New Revision: 647434

URL: http://svn.apache.org/viewvc?rev=647434&view=rev
Log:
* Upgrading commons-fileupload to 1.2.1, now required
* Cleaning up testing so spring's mocks are not in the compile scope
WW-2590 WW-2588

Removed:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/validators/
Modified:
struts/struts2/trunk/core/pom.xml

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

struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java

struts/struts2/trunk/core/src/test/java/org/apache/struts2/StrutsTestCase.java

struts/struts2/trunk/plugins/junit/src/main/java/org/apache/struts2/StrutsTestCase.java

struts/struts2/trunk/plugins/testng/src/main/java/org/apache/struts2/StrutsTestCase.java

Modified: struts/struts2/trunk/core/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/pom.xml?rev=647434&r1=647433&r2=647434&view=diff
==
--- struts/struts2/trunk/core/pom.xml (original)
+++ struts/struts2/trunk/core/pom.xml Sat Apr 12 04:41:24 2008
@@ -288,29 +288,20 @@
 
 commons-fileupload
 commons-fileupload
-1.1.1
-true
+1.2.1
 
 
 commons-io
 commons-io
-1.0
-true
+1.3.2
 
-
-
-commons-lang
-commons-lang
-2.1
-true
-
-
+
 
 
 org.springframework
 spring-mock
 2.0.8
-true
+test
 
 
 
@@ -405,6 +396,7 @@
 org.apache.struts
 struts-annotations
 1.0.3-20080216.121126-3
+compile
 true
 
 

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java?rev=647434&r1=647433&r2=647434&view=diff
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
 Sat Apr 12 04:41:24 2008
@@ -87,6 +87,7 @@
 try {
 ServletFileUpload upload = new ServletFileUpload(fac);
 upload.setSizeMax(maxSize);
+
 List items = 
upload.parseRequest(createRequestContext(servletRequest));
 
 for (Object item1 : items) {
@@ -298,6 +299,10 @@
 }
 
 public InputStream getInputStream() throws IOException {
+InputStream in = req.getInputStream();
+if (in == null) {
+throw new IOException("Missing content in the request");
+}
 return req.getInputStream();
 }
 };

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java?rev=647434&r1=647433&r2=647434&view=diff
==
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java
 Sat Apr 12 04:41:24 2008
@@ -24,13 +24,14 @@
 import java.util.Map;
 
 import org.apache.struts2.dispatcher.Dispatcher;
-import org.springframework.mock.web.MockServletContext;
 
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.util.LocalizedTextUtil;
 import com.opensymphony.xwork2.util.ValueStack;
 import com.opensymphony.xwork2.util.ValueStackFactory;
 
+import javax.servlet.ServletContext;
+
 /**
  * Generic test setup methods to be used with any unit testing framework. 
  */
@@ -44,11 +45,11 @@
 LocalizedTextUtil.clearDefaultResourceBundles();
 }
 
-public static Dispatcher initDispatcher(Map params) {
+public static Dispatcher initDispatcher(ServletContext ctx, 
Map params) {
 if (params == null) {
 params = new HashMap();
 }
-Dispatcher du = new Dispatcher(new MockServletContext(), params);
+Dispatcher du = new Dispatcher(ctx, params);
 du.init();
 Dispatcher.setInstance(du);
 

Modified: 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/StrutsTestCase.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/str

svn commit: r647435 - /struts/struts2/trunk/core/src/main/resources/struts-default.xml

2008-04-12 Thread mrdon 
Author: mrdon
Date: Sat Apr 12 04:48:17 2008
New Revision: 647435

URL: http://svn.apache.org/viewvc?rev=647435&view=rev
Log:
Removing optional from bean loading now that fileupload is required, cleaned up 
optional notation for freemarker, also required
WW-2590

Modified:
struts/struts2/trunk/core/src/main/resources/struts-default.xml

Modified: struts/struts2/trunk/core/src/main/resources/struts-default.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/struts-default.xml?rev=647435&r1=647434&r2=647435&view=diff
==
--- struts/struts2/trunk/core/src/main/resources/struts-default.xml (original)
+++ struts/struts2/trunk/core/src/main/resources/struts-default.xml Sat Apr 12 
04:48:17 2008
@@ -44,12 +44,12 @@
 
 
 
-
-
+
+
 
 
 
-
+

svn commit: r647439 - /struts/struts2/trunk/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java

2008-04-12 Thread mrdon 
Author: mrdon
Date: Sat Apr 12 05:16:41 2008
New Revision: 647439

URL: http://svn.apache.org/viewvc?rev=647439&view=rev
Log:
Fixing javadoc, minor code improvements
WW-2589

Modified:

struts/struts2/trunk/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java

Modified: 
struts/struts2/trunk/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java?rev=647439&r1=647438&r2=647439&view=diff
==
--- 
struts/struts2/trunk/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java
 (original)
+++ 
struts/struts2/trunk/plugins/dwr/src/main/java/org/apache/struts2/validators/DWRValidator.java
 Sat Apr 12 05:16:41 2008
@@ -56,12 +56,12 @@
  * 
  * 
  *
- * 
+ *
+ *  
+ *  
+ *
+ * 
  *
  * 
  * 
@@ -69,19 +69,6 @@
 public class DWRValidator {
 private static final Logger LOG = 
LoggerFactory.getLogger(DWRValidator.class);
 
-private ActionProxyFactory actionProxyFactory;
-private ActionMapper actionMapper;
-
-@Inject
-public void setActionMapper(ActionMapper actionMapper) {
-this.actionMapper = actionMapper;
-}
-
-@Inject
-public void setActionProxyFactory(ActionProxyFactory fac) {
-this.actionProxyFactory = fac;
-}
-
 public ValidationAwareSupport doPost(String namespace, String action, Map 
params) throws Exception {
 HttpServletRequest req = 
WebContextFactory.get().getHttpServletRequest();
 ServletContext servletContext = 
WebContextFactory.get().getServletContext();
@@ -106,8 +93,10 @@
 servletContext);
 
 try {
+ActionMapper actionMapper = 
du.getContainer().getInstance(ActionMapper.class);
 ActionMapping mapping = 
actionMapper.getMappingFromActionName(action);
 ActionInvocation inv = new ValidatorActionInvocation(ctx, true);
+ActionProxyFactory actionProxyFactory = 
du.getContainer().getInstance(ActionProxyFactory.class);
 ActionProxy proxy = actionProxyFactory.createActionProxy(inv, 
namespace, mapping.getName(), mapping.getMethod(), true, true);
 proxy.execute();
 Object a = proxy.getAction();

svn commit: r647442 - /struts/struts2/trunk/pom.xml

2008-04-12 Thread mrdon 
Author: mrdon
Date: Sat Apr 12 05:41:34 2008
New Revision: 647442

URL: http://svn.apache.org/viewvc?rev=647442&view=rev
Log:
Adding OSGi entries in the manifest
WW-2591

Modified:
struts/struts2/trunk/pom.xml

Modified: struts/struts2/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/pom.xml?rev=647442&r1=647441&r2=647442&view=diff
==
--- struts/struts2/trunk/pom.xml (original)
+++ struts/struts2/trunk/pom.xml Sat Apr 12 05:41:34 2008
@@ -313,7 +313,30 @@
 
 
 
+
+
+  maven-jar-plugin
+  
+
+  
${project.build.outputDirectory}/META-INF/MANIFEST.MF
+
+  
+
+
+  org.apache.felix
+  maven-bundle-plugin
+  
+
+  bundle-manifest
+  process-classes
+  
+manifest
+  
+
+  
+
 
+
 install