svn commit: r1082276 - /struts/struts2/trunk/apps/pom.xml
Author: lukaszlenart Date: Wed Mar 16 19:41:23 2011 New Revision: 1082276 URL: http://svn.apache.org/viewvc?rev=1082276&view=rev Log: Removes duplicated site settings Modified: struts/struts2/trunk/apps/pom.xml Modified: struts/struts2/trunk/apps/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/pom.xml?rev=1082276&r1=1082275&r2=1082276&view=diff == --- struts/struts2/trunk/apps/pom.xml (original) +++ struts/struts2/trunk/apps/pom.xml Wed Mar 16 19:41:23 2011 @@ -47,13 +47,6 @@ http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/ - - -apache-site - scp://people.apache.org/www/struts.apache.org/struts2/apps - - - hostedqa
svn commit: r1082277 - /struts/struts2/trunk/assembly/src/main/assembly/docs.xml
Author: lukaszlenart Date: Wed Mar 16 19:42:50 2011 New Revision: 1082277 URL: http://svn.apache.org/viewvc?rev=1082277&view=rev Log: Solves problem with missing JavaDocs Modified: struts/struts2/trunk/assembly/src/main/assembly/docs.xml Modified: struts/struts2/trunk/assembly/src/main/assembly/docs.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/assembly/docs.xml?rev=1082277&r1=1082276&r2=1082277&view=diff == --- struts/struts2/trunk/assembly/src/main/assembly/docs.xml (original) +++ struts/struts2/trunk/assembly/src/main/assembly/docs.xml Wed Mar 16 19:42:50 2011 @@ -22,131 +22,132 @@ --> - docs - -zip - - - - - - ../xwork-core/target/site/apidocs - docs/xwork-apidocs - - - - -../target/site -docs - - -../api/target/site -docs/struts2-api - - -../core/target/site -docs/struts2-core - - - - -target/cwiki/WW -docs - - - - -../plugins/codebehind/target/site - docs/struts2-plugins/struts2-codebehind-plugin - - -../plugins/config-browser/target/site - docs/struts2-plugins/struts2-config-browser-plugin - - -../plugins/dojo/target/site - docs/struts2-plugins/struts2-dojo-plugin - - -../plugins/dojo/target/site - docs/struts2-plugins/struts2-dwr-plugin - - -../plugins/jasperreports/target/site - docs/struts2-plugins/struts2-jasperreports-plugin - - -../plugins/jfreechart/target/site - docs/struts2-plugins/struts2-jfreechart-plugin - - -../plugins/jsf/target/site - docs/struts2-plugins/struts2-jsf-plugin - - -../plugins/junit/target/site - docs/struts2-plugins/struts2-junit-plugin - - -../plugins/pell-multipart/target/site - docs/struts2-plugins/struts2-pell-multipart-plugin - - -../plugins/plexus/target/site - docs/struts2-plugins/struts2-plexus-plugin - - -../plugins/portlet/target/site - docs/struts2-plugins/struts2-portlet-plugin - - -../plugins/rest/target/site - docs/struts2-plugins/struts2-rest-plugin - - -../plugins/struts1/target/site - docs/struts2-plugins/struts2-struts1-plugin - - -../plugins/sitegraph/target/site - docs/struts2-plugins/struts2-sitegraph-plugin - - -../plugins/spring/target/site - docs/struts2-plugins/struts2-spring-plugin - - -../plugins/sitemesh/target/site - docs/struts2-plugins/struts2-sitemesh-plugin - - -../plugins/testng/target/site - docs/struts2-plugins/struts2-testng-plugin - - -../plugins/tiles/target/site - docs/struts2-plugins/struts2-tiles-plugin - - -../plugins/oval/target/site - docs/struts2-plugins/struts2-oval-plugin - - -../plugins/osgi/target/site - docs/struts2-plugins/struts2-osgi-plugin - - -../plugins/json/target/site - docs/struts2-plugins/struts2-json-plugin - - -../plugins/embeddedjsp/target/site - docs/struts2-plugins/struts2-embeddedjsp-plugin - - -../plugins/gxp/target/site - docs/struts2-plugins/struts2-gxp-plugin - - +docs + +zip + + + + + +../xwork-core/target/apidocs +docs/xwork-core/apidocs + + + + +../target/site +docs + + +../core/target/apidocs +docs/struts2-core/apidocs + + + + +target/cwiki/WW +docs/docs + + + + +../plugins/codebehind/target/apidocs + docs/struts2-plugins/struts2-codebehind-plugin/apidocs + + +../plugins/config-browser/target/apidocs + docs/struts2-plugins/struts2-config-browser-plugin/apidocs + + +../plugins/convention/target/apidocs + docs/struts2-plugins/struts2-convention-plugin/apidocs + + +../plugins/dwr/target/apidocs + docs/struts2-plugins/struts2-dwr-plugin/apidocs + + +../plugins/dojo/target/apidocs + docs/struts2-plugins/struts2-dojo-plugin/apidocs + + +../plugins/embeddedjsp/target/apidocs + docs/struts2-plugins/struts2-embeddedjsp-plugin/apidocs + + +../plugins/gxp/target/apidocs + docs/struts2-plugins/struts2-gxp-plugin/apid
svn commit: r1082278 - /struts/struts2/trunk/assembly/pom.xml
Author: lukaszlenart
Date: Wed Mar 16 19:43:23 2011
New Revision: 1082278
URL: http://svn.apache.org/viewvc?rev=1082278&view=rev
Log:
Re-formats source code
Modified:
struts/struts2/trunk/assembly/pom.xml
Modified: struts/struts2/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/pom.xml?rev=1082278&r1=1082277&r2=1082278&view=diff
==
--- struts/struts2/trunk/assembly/pom.xml (original)
+++ struts/struts2/trunk/assembly/pom.xml Wed Mar 16 19:43:23 2011
@@ -1,4 +1,5 @@
-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
struts2-assembly
@@ -19,7 +20,7 @@
scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/assembly
http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/assembly
-
+
j4
@@ -27,13 +28,13 @@
maven-assembly-plugin
-2.2-beta-5
+2.2
make-assembly
package
- attached
+attached
@@ -55,151 +56,151 @@
-
-net.sf.retrotranslator
-retrotranslator-runtime
-1.2.1
-runtime
-
-
-
-backport-util-concurrent
-backport-util-concurrent
-3.0
-runtime
-
-
-
-org.apache.struts.xwork
-xwork-core
-${project.version}
-jar
-jdk14
-runtime
-
-
-
-org.apache.struts
-struts2-core
-${project.version}
-jdk14
-
-
-
-org.apache.struts
-struts2-config-browser-plugin
-${project.version}
-jdk14
-
-
-
-org.apache.struts
-struts2-jasperreports-plugin
-${project.version}
-jdk14
-
-
-
-org.apache.struts
-struts2-jfreechart-plugin
-${project.version}
-jdk14
-
-
-
-org.apache.struts
-struts2-jsf-plugin
-${project.version}
-jdk14
-
-
-
-org.apache.struts
-struts2-pell-multipart-plugin
-${project.version}
-jdk14
-
-
-
-org.apache.struts
-struts2-plexus-plugin
-${project.version}
-jdk14
-
-
-
-org.apache.struts
-struts2-sitegraph-plugin
-${project.version}
-jdk14
-
-
-
-org.apache.struts
-struts2-sitemesh-plugin
-${project.version}
-jdk14
-
-
-
-org.apache.struts
-struts2-struts1-plugin
-${project.version}
-jdk14
-
-
-
-org.apache.struts
-struts2-tiles-plugin
-${project.version}
-jdk14
-
-
-
-org.apache.struts
-struts2-rest-plugin
-
svn commit: r1082279 - /struts/struts2/trunk/src/site/site.xml
Author: lukaszlenart
Date: Wed Mar 16 19:43:51 2011
New Revision: 1082279
URL: http://svn.apache.org/viewvc?rev=1082279&view=rev
Log:
Re-formats source code and add missing references to plugins
Modified:
struts/struts2/trunk/src/site/site.xml
Modified: struts/struts2/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/src/site/site.xml?rev=1082279&r1=1082278&r2=1082279&view=diff
==
--- struts/struts2/trunk/src/site/site.xml (original)
+++ struts/struts2/trunk/src/site/site.xml Wed Mar 16 19:43:51 2011
@@ -34,173 +34,128 @@
-http://www.apache.org/"; />
-http://struts.apache.org/index.html"; />
+http://www.apache.org/"/>
+http://struts.apache.org/index.html"/>
-
-http://struts.apache.org/downloads.html"/>
-http://apache.org/foundation/thanks.html"/>
-http://apache.org/foundation/sponsorship.html"/>
+
+http://struts.apache.org/downloads.html"/>
+http://apache.org/foundation/thanks.html"/>
+http://apache.org/foundation/sponsorship.html"/>
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-http://struts.apache.org/mail.html";
-/>
-http://issues.apache.org/jira/";
-/>
-https://cwiki.apache.org/S2WIKI/welcome-to-apache-struts2.html";
-/>
+http://struts.apache.org/mail.html"/>
+https://issues.apache.org/jira/browse/WW"/>
+https://cwiki.apache.org/S2WIKI/welcome-to-apache-struts2.html"/>
-
-
-http://cwiki.apache.org/S2PLUGINS/home.html";
-/>
+
+
+
+http://cwiki.apache.org/S2PLUGINS/home.html"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-http://struts.apache.org/2.x/index.html"/>
-
-http://struts.apache.org/helping.html";
-/>
-http://struts.apache.org/dev/dev-mail.html";
-/>
-http://struts.apache.org/dev/builds.html";
-/>
-http://struts.apache.org/dev/releases.html";
-/>
-http://struts.apache.org/dev/volunteers.html";
-/>
-http://struts.apache.org/dev/bylaws.html";
-/>
-http://struts.apache.org/struts-sandbox/index.html";
-/>
-http://svn.apache.org/viewcvs.cgi/struts/";
-/>
+http://struts.apache.org/2.x/index.html"/>
+http://struts.apache.org/helping.html"/>
+http://struts.apache.org/dev/dev-mail.html"/>
+http://struts.apache.org/dev/builds.html"/>
+http://struts.apache.org/dev/releases.html"/>
+http://struts.apache.org/dev/volunteers.html"/>
+http://struts.apache.org/dev/bylaws.html"/>
+http://struts.apache.org/struts-sandbox/index.html"/>
+http://svn.apache.org/viewcvs.cgi/struts/"/>
-${modules}
-${reports}
+
+
+
svn commit: r1082295 - /struts/struts2/trunk/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionProxyFactory.java
Author: lukaszlenart
Date: Wed Mar 16 20:49:41 2011
New Revision: 1082295
URL: http://svn.apache.org/viewvc?rev=1082295&view=rev
Log:
Solves WW-3590 - adds dedicated namespace for REST services
Modified:
struts/struts2/trunk/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionProxyFactory.java
Modified:
struts/struts2/trunk/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionProxyFactory.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionProxyFactory.java?rev=1082295&r1=1082294&r2=1082295&view=diff
==
---
struts/struts2/trunk/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionProxyFactory.java
(original)
+++
struts/struts2/trunk/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionProxyFactory.java
Wed Mar 16 20:49:41 2011
@@ -24,6 +24,7 @@ package org.apache.struts2.rest;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.ActionProxy;
import com.opensymphony.xwork2.DefaultActionProxyFactory;
+import com.opensymphony.xwork2.inject.Inject;
import java.util.Map;
@@ -33,11 +34,24 @@ import java.util.Map;
*/
public class RestActionProxyFactory extends DefaultActionProxyFactory {
+public static final String STRUTS_REST_NAMESPACE = "struts.rest.namespace";
+
+protected String namespace = "/";
+
+@Inject(STRUTS_REST_NAMESPACE)
+public void setNamespace(String namespace) {
+this.namespace = namespace;
+}
+
@Override
public ActionProxy createActionProxy(String namespace, String actionName,
String methodName, Map extraContext, boolean executeResult, boolean
cleanupContext) {
-ActionInvocation inv = new RestActionInvocation(extraContext, true);
-container.inject(inv);
-return createActionProxy(inv, namespace, actionName, methodName,
executeResult, cleanupContext);
+if (namespace.startsWith(this.namespace)) {
+ActionInvocation inv = new RestActionInvocation(extraContext,
true);
+container.inject(inv);
+return createActionProxy(inv, namespace, actionName, methodName,
executeResult, cleanupContext);
+} else {
+return super.createActionProxy(namespace, actionName, methodName,
extraContext, executeResult, cleanupContext);
+}
}
}
[CONF] Confluence Changes in the last 24 hours
This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Camel (https://cwiki.apache.org/confluence/display/CAMEL) Pages - Camel 2.7.0 Release edited by njiang (09:08 PM) https://cwiki.apache.org/confluence/display/CAMEL/Camel+2.7.0+Release tutorial-osgi-camel-part1 edited by gertvanthienen (03:46 PM) https://cwiki.apache.org/confluence/display/CAMEL/tutorial-osgi-camel-part1 SNMP edited by mazzag (02:37 PM) https://cwiki.apache.org/confluence/display/CAMEL/SNMP CXF Bean Component edited by mazzag (02:19 PM) https://cwiki.apache.org/confluence/display/CAMEL/CXF+Bean+Component User Guide edited by mazzag (02:15 PM) https://cwiki.apache.org/confluence/display/CAMEL/User+Guide ProducerTemplate edited by tmielke (12:57 PM) https://cwiki.apache.org/confluence/display/CAMEL/ProducerTemplate Apache Directory Server v1.5 (https://cwiki.apache.org/confluence/display/DIRxSRVx11) Pages - 4.3. Embedding ApacheDS as a Web Application edited by pamarcelot (12:19 PM) https://cwiki.apache.org/confluence/display/DIRxSRVx11/4.3.+Embedding+ApacheDS+as+a+Web+Application Apache Jena (https://cwiki.apache.org/confluence/display/JENA) Pages - TxTDB created by andyseaborne (05:14 PM) https://cwiki.apache.org/confluence/display/JENA/TxTDB Apache Ode (https://cwiki.apache.org/confluence/display/ODExSITE) Pages - Getting Ode edited by vanto (04:25 AM) https://cwiki.apache.org/confluence/display/ODExSITE/Getting+Ode Apache OpenNLP (https://cwiki.apache.org/confluence/display/OPENNLP) Pages - TestPlan1.5.1 edited by joern (11:09 AM) https://cwiki.apache.org/confluence/display/OPENNLP/TestPlan1.5.1 Apache Sling (https://cwiki.apache.org/confluence/display/SLING) Pages - Status Report (June 2011) edited by fmeschbe (05:43 AM) https://cwiki.apache.org/confluence/display/SLING/Status+Report+%28June+2011%29 Apache Tuscany Wiki (https://cwiki.apache.org/confluence/display/TUSCANYWIKI) Pages - Develop a NoSQL Datastore component edited by eranda (03:20 AM) https://cwiki.apache.org/confluence/display/TUSCANYWIKI/Develop+a+NoSQL+Datastore+component Apache VCL (https://cwiki.apache.org/confluence/display/VCL) Pages - VCL Release Procedures edited by jfthomps (12:48 PM) https://cwiki.apache.org/confluence/display/VCL/VCL+Release+Procedures VCL 2.2.1 Web Code Installation edited by jfthomps (12:00 PM) https://cwiki.apache.org/confluence/display/VCL/VCL+2.2.1+Web+Code+Installation Apache Struts 2 Documentation (https://cwiki.apache.org/confluence/display/WW) Pages - REST Plugin edited by lukaszlenart (04:45 PM) https://cwiki.apache.org/confluence/display/WW/REST+Plugin Change your notification preferences: https://cwiki.apache.org/confluence/users/viewnotifications.action
