svn commit: r1086567 - in /struts/sandbox/trunk/struts2-portlet2-plugin: ./ src/main/java/org/apache/struts2/components/ src/main/java/org/apache/struts2/portlet/dispatcher/ src/main/java/org/apache/s
Author: jogep Date: Tue Mar 29 12:36:34 2011 New Revision: 1086567 URL: http://svn.apache.org/viewvc?rev=1086567&view=rev Log: Make Portlet2 Plugin compatible to current Struts2 trunk Modified: struts/sandbox/trunk/struts2-portlet2-plugin/pom.xml struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/components/PortletUrlRenderer.java struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/dispatcher/DispatcherServlet.java struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/interceptor/PortletStateInterceptor.java struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/result/PortletResult.java struts/sandbox/trunk/struts2-portlet2-plugin/src/main/java/org/apache/struts2/portlet/util/PortletUrlHelper.java struts/sandbox/trunk/struts2-portlet2-plugin/src/main/resources/struts-plugin.xml Modified: struts/sandbox/trunk/struts2-portlet2-plugin/pom.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-portlet2-plugin/pom.xml?rev=1086567&r1=1086566&r2=1086567&view=diff == --- struts/sandbox/trunk/struts2-portlet2-plugin/pom.xml (original) +++ struts/sandbox/trunk/struts2-portlet2-plugin/pom.xml Tue Mar 29 12:36:34 2011 @@ -1,181 +1,195 @@ - + 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-plugins -2.2.0-SNAPSHOT - -org.apache.struts -struts2-portlet2-plugin -jar -Struts 2 Portlet 2.0 Plugin - - - scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/trunk/struts2-portlet2-plugin/ - scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/trunk/struts2-portlet2-plugin/ + 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-plugins + 2.3-SNAPSHOT + + org.apache.struts + struts2-portlet2-plugin + jar + Struts 2 Portlet 2.0 Plugin + + + scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/trunk/struts2-portlet2-plugin/ + scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/trunk/struts2-portlet2-plugin/ - http://svn.apache.org/repos/asf/struts/sandbox/trunk/struts2-portlet2-plugin/ - + http://svn.apache.org/repos/asf/struts/sandbox/trunk/struts2-portlet2-plugin/ + - - -junit -junit -test -3.8.1 - - - -javax.servlet -jsp-api -2.0 -provided - - - - -org.apache.velocity -velocity -1.5 -true - - - -org.apache.velocity -velocity-tools -1.3 -true - - - - -javax.portlet -portlet-api -2.0 -true - - - -mockobjects -mockobjects-jdk1.3-j2ee1.3 -0.09 -test - - - -org.easymock -easymock -2.0 -test - - -jmock -jmock -1.0.1 -test - - - -jmock -jmock-cglib -1.0.1 -test - - - -mockobjects -mockobjects-core -0.09 -test - - - -log4j -log4j -1.2.9 -test - - - - -org.springframework -spring-mock -2.0.7 -test - - -org.springframework -spring-portlet -2.0.7 -test - - -org.springframework -spring-core -2.0.7 -test - - -commons-fileupload -commons-fileupload -1.1.1 -test - - -${pom.groupId} -struts2-junit-plugin -${pom.version} -test - - - - - -apache.snapshots -Apache Maven Repository (Snapshots and Test Builds) -http://people.apache.org/repo/m2-snapshot-repository - -false - - -true - -
[CONF] Confluence Changes in the last 24 hours
This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache ActiveMQ (https://cwiki.apache.org/confluence/display/ACTIVEMQ) Pages - How do I embed a Broker inside a Connection edited by gtully (10:34 AM) https://cwiki.apache.org/confluence/display/ACTIVEMQ/How+do+I+embed+a+Broker+inside+a+Connection Clustering edited by gliesian (08:49 AM) https://cwiki.apache.org/confluence/display/ACTIVEMQ/Clustering New Features in 5.5 edited by gtully (04:50 AM) https://cwiki.apache.org/confluence/display/ACTIVEMQ/New+Features+in+5.5 Apache Camel (https://cwiki.apache.org/confluence/display/CAMEL) Pages - Camel 2.8.0 Release edited by davsclaus (01:15 PM) https://cwiki.apache.org/confluence/display/CAMEL/Camel+2.8.0+Release MDC logging edited by davsclaus (01:11 PM) https://cwiki.apache.org/confluence/display/CAMEL/MDC+logging Apache CXF Documentation (https://cwiki.apache.org/confluence/display/CXF20DOC) Pages - JAX-RS Data Bindings edited by sergey_beryozkin (07:22 AM) https://cwiki.apache.org/confluence/display/CXF20DOC/JAX-RS+Data+Bindings Apache Directory client API (https://cwiki.apache.org/confluence/display/DIRAPI) Pages - Value edited by elecharny (05:55 PM) https://cwiki.apache.org/confluence/display/DIRAPI/Value Apache HCatalog (https://cwiki.apache.org/confluence/display/HCATALOG) Pages - Index created by pctony (07:12 AM) https://cwiki.apache.org/confluence/display/HCATALOG/Index OFBiz (Open For Business) Project Open Wiki (https://cwiki.apache.org/confluence/display/OFBIZ) Pages - FAQ - Tips - Tricks - Cookbook - HowTo edited by paul_foxworthy (08:08 PM) https://cwiki.apache.org/confluence/display/OFBIZ/FAQ+-+Tips+-+Tricks+-+Cookbook+-+HowTo OpenEJB 3.0.x documentation (https://cwiki.apache.org/confluence/display/OPENEJBx30) Pages - Singleton Beans edited by dblevins (12:12 PM) https://cwiki.apache.org/confluence/display/OPENEJBx30/Singleton+Beans Apache Qpid (https://cwiki.apache.org/confluence/display/qpid) Pages - 0.10 Release edited by justi9 (02:20 PM) https://cwiki.apache.org/confluence/display/qpid/0.10+Release Apache Tuscany Wiki (https://cwiki.apache.org/confluence/display/TUSCANYWIKI) Pages - Tuscany Samples Requirements edited by ant (05:34 PM) https://cwiki.apache.org/confluence/display/TUSCANYWIKI/Tuscany+Samples+Requirements Apache Struts 2 Documentation (https://cwiki.apache.org/confluence/display/WW) Pages - Version Notes 2.2.2 edited by lukaszlenart (02:48 AM) https://cwiki.apache.org/confluence/display/WW/Version+Notes+2.2.2 Apache Zookeeper (https://cwiki.apache.org/confluence/display/ZOOKEEPER) Pages - Zookeeper and SASL edited by ekoontz (11:58 PM) https://cwiki.apache.org/confluence/display/ZOOKEEPER/Zookeeper+and+SASL Change your notification preferences: https://cwiki.apache.org/confluence/users/viewnotifications.action
svn commit: r1086842 - /struts/struts2/trunk/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionProxyFactory.java
Author: lukaszlenart Date: Wed Mar 30 05:27:52 2011 New Revision: 1086842 URL: http://svn.apache.org/viewvc?rev=1086842&view=rev Log: Changes namespace to be optional parameter 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=1086842&r1=1086841&r2=1086842&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 30 05:27:52 2011 @@ -38,7 +38,7 @@ public class RestActionProxyFactory exte protected String namespace = "/"; -@Inject(STRUTS_REST_NAMESPACE) +@Inject(value = STRUTS_REST_NAMESPACE, required = false) public void setNamespace(String namespace) { this.namespace = namespace; }