[CONF] Confluence Changes in the last 24 hours
- This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Camel (CAMEL) http://cwiki.apache.org/confluence/display/CAMEL | |-Pages Added or Edited in This Space |-- Xml Reference was last edited by jstrachan (08:12 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Xml+Reference |-- Data Format was last edited by jstrachan (07:47 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Data+Format |-- XStream was created by jstrachan (07:44 AM). | http://cwiki.apache.org/confluence/display/CAMEL/XStream |-- Camel 1.2.0 Release was last edited by jstrachan (06:58 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Camel+1.2.0+Release Apache Felix (FELIX) http://cwiki.apache.org/confluence/display/FELIX | |-Pages Added or Edited in This Space |-- Apache Felix Application Demonstration was last edited by [EMAIL PROTECTED] (11:57 AM). | http://cwiki.apache.org/confluence/display/FELIX/Apache+Felix+Application+Demonstration |-- Apache Felix iPOJO Feature Overview was last edited by [EMAIL PROTECTED] (08:01 AM). | http://cwiki.apache.org/confluence/display/FELIX/Apache+Felix+iPOJO+Feature+Overview Apache Geronimo SandBox (GMOxSBOX) http://cwiki.apache.org/confluence/display/GMOxSBOX | |-Pages Added or Edited in This Space |-- sampling attachements was created by hcunico (11:01 AM). | http://cwiki.apache.org/confluence/display/GMOxSBOX/sampling+attachements |-- tabs-deck test was created by hcunico (07:03 AM). | http://cwiki.apache.org/confluence/display/GMOxSBOX/tabs-deck+test Apache Geronimo (GMOxSITE) http://cwiki.apache.org/confluence/display/GMOxSITE | |-Pages Added or Edited in This Space |-- Downloads was last edited by hcunico (08:59 AM). | http://cwiki.apache.org/confluence/display/GMOxSITE/Downloads |-- Previous releases was created by hcunico (08:53 AM). | http://cwiki.apache.org/confluence/display/GMOxSITE/Previous+releases |-- Current releases was created by hcunico (08:51 AM). | http://cwiki.apache.org/confluence/display/GMOxSITE/Current+releases |-- Apache Geronimo v2.0.2 - Released was created by hcunico (08:10 AM). | http://cwiki.apache.org/confluence/display/GMOxSITE/2007/10/19/Apache+Geronimo+v2.0.2+-+Released |-- Index was last edited by hcunico (08:20 AM). | http://cwiki.apache.org/confluence/display/GMOxSITE/Index |-- Apache Geronimo v2.0.2 Release was last edited by hcunico (05:50 AM). | http://cwiki.apache.org/confluence/display/GMOxSITE/Apache+Geronimo+v2.0.2+Release Apache CXF 2.0 Documentation (CXF20DOC) http://cwiki.apache.org/confluence/display/CXF20DOC | |-Pages Added or Edited in This Space |-- Tools was last edited by mazzag (04:41 PM). | http://cwiki.apache.org/confluence/display/CXF20DOC/Tools |-- CXF tools Ant tasks was created by [EMAIL PROTECTED] (03:33 AM). | http://cwiki.apache.org/confluence/display/CXF20DOC/CXF+tools+Ant+tasks Apache Jackrabbit (JCR) http://cwiki.apache.org/confluence/display/JCR | |-Pages Added or Edited in This Space |-- First Hops with Apache Jackrabbit was created by jukka (05:31 AM). | http://cwiki.apache.org/confluence/display/JCR/First+Hops+with+Apache+Jackrabbit |-- Index was last edited by jukka (05:21 AM). | http://cwiki.apache.org/confluence/display/JCR/Index Apache Geronimo v2.0 (GMOxDOC20) http://cwiki.apache.org/confluence/display/GMOxDOC20 | |-Pages Added or Edited in This Space |-- Configuring Geronimo as a Windows Service was last edited by gawor (11:25 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC20/Configuring+Geronimo+as+a+Windows+Service |-- Using Geronimo's default JavaMail session was last edited by gawor (08:41 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC20/Using+Geronimo%27s+default+JavaMail+session |-- JMS and MDB sample application was last edited by gawor (08:36 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC20/JMS+and+MDB+sample+application |-- DB Pool Testing sample application was last edited by gawor (08:31 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC20/DB+Pool+Testing+sample+application |-- Adminstering security realms was last edited by gawor (08:24 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC20/Adminstering+security+realms |-- Apache Harmony was last edited by vmz (03:28 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC20/Apache+Harmony Apache Abdera (ABDERA) http://cwiki.apache.org/confluence/display/ABDERA | |-Pages Added or Edited in This Space |-- Getting Started was created by jasnell (03:54 PM). | http://cwiki.apache.org/confluence/display/ABDERA/Getting+Started |-- Documentation was last edited by jasnell (03:16 PM). | http://cwiki.apache.org/confluence/display/ABDERA/Documentatio
svn commit: r586694 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/config/ main/java/org/apache/struts2/dispatcher/mapper/ test/java/org/apache/struts2/config/
Author: mrdon
Date: Sat Oct 20 02:56:20 2007
New Revision: 586694
URL: http://svn.apache.org/viewvc?rev=586694&view=rev
Log:
Making it possible to use multiple extensions simultaneously, improving
reloadability
WW-2267
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapping.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/MethodConfigurationProviderTest.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java?rev=586694&r1=586693&r2=586694&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java
Sat Oct 20 02:56:20 2007
@@ -163,7 +163,7 @@
if (ctx != null) {
return ctx.get(reloadKey) == null && super.needsReload();
} else {
-return true;
+return super.needsReload();
}
}
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapping.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapping.java?rev=586694&r1=586693&r2=586694&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapping.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/ActionMapping.java
Sat Oct 20 02:56:20 2007
@@ -36,6 +36,7 @@
private String name;
private String namespace;
private String method;
+private String extension;
private Map params;
private Result result;
@@ -106,6 +107,13 @@
public Result getResult() {
return result;
}
+
+/**
+ * @return The extension used during this request
+ */
+public String getExtension() {
+return extension;
+}
/**
* @param result The result
@@ -140,5 +148,12 @@
*/
public void setParams(Map params) {
this.params = params;
+}
+
+/**
+ * @param extension The extension used in the request
+ */
+public void setExtension(String extension) {
+this.extension = extension;
}
}
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java?rev=586694&r1=586693&r2=586694&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
Sat Oct 20 02:56:20 2007
@@ -32,10 +32,12 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.struts2.RequestUtils;
+import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.dispatcher.ServletRedirectResult;
import org.apache.struts2.util.PrefixTrie;
+import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.config.Configuration;
import com.opensymphony.xwork2.config.ConfigurationManager;
import com.opensymphony.xwork2.config.entities.PackageConfig;
@@ -292,7 +294,7 @@
ActionMapping mapping = new ActionMapping();
String uri = getUri(request);
-uri = dropExtension(uri);
+uri = dropExtension(uri, mapping);
if (uri == null) {
return null;
}
@@ -415,8 +417,21 @@
* @param name
*The action name
* @return The action name without its extension
+ * @deprecated Since 2.1, use [EMAIL PROTECTED]
#dropExtension(java.lang.String,org.apache.struts2.dispatcher.mapper.ActionMapping)}
instead
*/
protected String dropExtension(String name) {
+return dropExtension(name, new ActionMapping());
+}
+
+/**
+ * Drops the extension from the action name, storing it in the mapping for
later use
+ *
+ * @param name
+ *The action name
+ * @param mapping The action mapping to store the extension in
+ * @return The action name without its extension
+ */
+protected String
svn commit: r586696 - /struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
Author: mrdon
Date: Sat Oct 20 03:04:53 2007
New Revision: 586696
URL: http://svn.apache.org/viewvc?rev=586696&view=rev
Log:
Adding test for original extension uri building
WW-2267
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java?rev=586696&r1=586695&r2=586696&view=diff
==
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
Sat Oct 20 03:04:53 2007
@@ -196,6 +196,17 @@
assertEquals("/my/namespace/actionName!add.action",
mapper.getUriFromActionMapping(mapping));
}
+
+public void testGetUriWithOriginalExtension() throws Exception {
+ActionMapping mapping = new ActionMapping("actionName", "/ns", null,
new HashMap());
+
+ActionMapping orig = new ActionMapping();
+orig.setExtension("foo");
+ActionContext.getContext().put(ServletActionContext.ACTION_MAPPING,
orig);
+
+DefaultActionMapper mapper = new DefaultActionMapper();
+assertEquals("/ns/actionName.foo",
mapper.getUriFromActionMapping(mapping));
+}
public void testGetMappingWithNoExtension() throws Exception {
req.setupGetParameterMap(new HashMap());
svn commit: r586735 - in /struts/sandbox/trunk/struts2-rest-plugin: ./ src/main/java/org/apache/struts2/rest/ src/main/java/org/apache/struts2/rest/handler/ src/main/resources/ src/test/java/org/apach
Author: mrdon
Date: Sat Oct 20 07:48:27 2007
New Revision: 586735
URL: http://svn.apache.org/viewvc?rev=586735&view=rev
Log:
Redesigned rest plugin to fit in better with Struts 2 apps and work with the
codebehind plugin
Added:
struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/ContentTypeHandlerSelector.java
struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/ContentTypeInterceptor.java
struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/DefaultRestInfo.java
struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/ResourceClasspathPackageProvider.java
struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/RestInfo.java
struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/handler/ContentTypeHandler.java
struts/sandbox/trunk/struts2-rest-plugin/src/test/java/org/apache/struts2/rest/RestActionMapperTest.java
Removed:
struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/BasicRestful.java
struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/RestActionProxy.java
struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/Restful.java
struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/handler/MimeTypeHandler.java
struts/sandbox/trunk/struts2-rest-plugin/src/test/java/org/apache/struts2/rest/RestActionInvoicationTest.java
Modified:
struts/sandbox/trunk/struts2-rest-plugin/pom.xml
struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/RestActionInvocation.java
struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/RestActionMapper.java
struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/RestActionProxyFactory.java
struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/handler/HtmlHandler.java
struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/handler/XStreamHandler.java
struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/handler/XStreamJsonHandler.java
struts/sandbox/trunk/struts2-rest-plugin/src/main/resources/struts-plugin.xml
Modified: struts/sandbox/trunk/struts2-rest-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-rest-plugin/pom.xml?rev=586735&r1=586734&r2=586735&view=diff
==
--- struts/sandbox/trunk/struts2-rest-plugin/pom.xml (original)
+++ struts/sandbox/trunk/struts2-rest-plugin/pom.xml Sat Oct 20 07:48:27 2007
@@ -2,18 +2,21 @@
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/xsd/maven-4.0.0.xsd";>
4.0.0
-
+
+org.apache.struts
+struts2-plugins
+2.1.0-SNAPSHOT
+
org.apache.struts
struts2-rest-plugin
- 1.0-SNAPSHOT
+ 2.1.0-SNAPSHOT
Struts 2 Plugin
-
org.apache.struts
-struts2-core
-2.0.8
+struts2-codebehind-plugin
+${pom.version}
com.thoughtworks.xstream
@@ -42,28 +45,7 @@
3.8.1
test
-
-mockobjects
-mockobjects-core
-0.09
-test
-
-
-
-install
-
-
-
-maven-compiler-plugin
-
- 1.5
- 1.5
-
-
-
-
-
Added:
struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/ContentTypeHandlerSelector.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/ContentTypeHandlerSelector.java?rev=586735&view=auto
==
---
struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/ContentTypeHandlerSelector.java
(added)
+++
struts/sandbox/trunk/struts2-rest-plugin/src/main/java/org/apache/struts2/rest/ContentTypeHandlerSelector.java
Sat Oct 20 07:48:27 2007
@@ -0,0 +1,49 @@
+package org.apache.struts2.rest;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.struts2.rest.handler.ContentTypeHandler;
+
+import com.opensymphony.xwork2.inject.Container;
+import com.opensymphony.xwork2.inject.Inject;
+
+public class ContentTypeHandlerSelector {
+
+private Map handlers = new
HashMap();
+private String defaultHandlerName;
+
+@Inject("struts.rest.defaultHan
svn commit: r586739 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/ main/java/org/apache/struts2/interceptor/ test/java/org/apache/struts2/ test/java/org/apache/struts2/config/ test
Author: mrdon
Date: Sat Oct 20 08:07:09 2007
New Revision: 586739
URL: http://svn.apache.org/viewvc?rev=586739&view=rev
Log:
Better handling of urls that use semicolons
WW-2268
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/RequestUtils.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ParameterAware.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/RequestUtilsTest.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/MethodConfigurationProviderTest.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/ResourceUtilTest.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/RequestUtils.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/RequestUtils.java?rev=586739&r1=586738&r2=586739&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/RequestUtils.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/RequestUtils.java
Sat Oct 20 08:07:09 2007
@@ -37,12 +37,20 @@
*/
public static String getServletPath(HttpServletRequest request) {
String servletPath = request.getServletPath();
-
+
+String requestUri = request.getRequestURI();
+// Detecting other characters that the servlet container cut off (like
anything after ';')
+if (requestUri != null && servletPath != null &&
!requestUri.endsWith(servletPath)) {
+int pos = requestUri.indexOf(servletPath);
+if (pos > -1) {
+servletPath =
requestUri.substring(requestUri.indexOf(servletPath));
+}
+}
+
if (null != servletPath && !"".equals(servletPath)) {
return servletPath;
}
-
-String requestUri = request.getRequestURI();
+
int startIndex = request.getContextPath().equals("") ? 0 :
request.getContextPath().length();
int endIndex = request.getPathInfo() == null ? requestUri.length() :
requestUri.lastIndexOf(request.getPathInfo());
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ParameterAware.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ParameterAware.java?rev=586739&r1=586738&r2=586739&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ParameterAware.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ParameterAware.java
Sat Oct 20 08:07:09 2007
@@ -41,5 +41,5 @@
*
* @param parameters a Map of parameters (name/value Strings).
*/
-public void setParameters(Map parameters);
+public void setParameters(Map parameters);
}
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/RequestUtilsTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/RequestUtilsTest.java?rev=586739&r1=586738&r2=586739&view=diff
==
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/RequestUtilsTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/RequestUtilsTest.java
Sat Oct 20 08:07:09 2007
@@ -37,6 +37,7 @@
public void testGetServletPathWithServletPathSet() throws Exception {
control.expectAndReturn(requestMock.getServletPath(), "/mycontext/");
+control.expectAndReturn(requestMock.getRequestURI(), "/mycontext/");
control.replay();
assertEquals("/mycontext/", RequestUtils.getServletPath(requestMock));
control.verify();
@@ -73,6 +74,14 @@
control.expectAndReturn(requestMock.getPathInfo(), null);
control.replay();
assertEquals("/mycontext/", RequestUtils.getServletPath(requestMock));
+control.verify();
+}
+
+public void testGetServletPathWithSemicolon() throws Exception {
+control.expectAndReturn(requestMock.getRequestURI(),
"/friend/mycontext/jim;bob");
+control.expectAndReturn(requestMock.getServletPath(),
"/mycontext/jim");
+control.replay();
+assertEquals("/mycontext/jim;bob",
RequestUtils.getServletPath(requestMock));
control.verify();
}
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/MethodConfigurationProviderTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/MethodConfigurationProviderTest.java?rev=586739&r1=586738&r2=586739&view=diff
===
svn commit: r586740 - /struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java
Author: mrdon
Date: Sat Oct 20 08:08:15 2007
New Revision: 586740
URL: http://svn.apache.org/viewvc?rev=586740&view=rev
Log:
Making it easier to extend the classpath package provider
WW-1715
Modified:
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java
Modified:
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java?rev=586740&r1=586739&r2=586740&view=diff
==
---
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java
(original)
+++
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java
Sat Oct 20 08:08:15 2007
@@ -241,16 +241,7 @@
protected void loadPackages(String[] pkgs) {
ResolverUtil resolver = new ResolverUtil();
-resolver.find(new ClassTest() {
-// Match Action implementations and classes ending with "Action"
-public boolean matches(Class type) {
-// TODO: should also find annotated classes
-return (Action.class.isAssignableFrom(type) ||
-type.getSimpleName().endsWith("Action") ||
-
type.getAnnotation(org.apache.struts2.config.Action.class) != null);
-}
-
-}, pkgs);
+resolver.find(createActionClassTest(), pkgs);
Set> actionClasses =
resolver.getClasses();
for (Object obj : actionClasses) {
@@ -265,6 +256,23 @@
}
}
+protected ClassTest createActionClassTest() {
+return new ClassTest() {
+// Match Action implementations and classes ending with "Action"
+public boolean matches(Class type) {
+// TODO: should also find annotated classes
+return (Action.class.isAssignableFrom(type) ||
+type.getSimpleName().endsWith(getClassSuffix()) ||
+
type.getAnnotation(org.apache.struts2.config.Action.class) != null);
+}
+
+};
+}
+
+protected String getClassSuffix() {
+return ACTION;
+}
+
/**
* Create a default action mapping for a class instance.
*
@@ -310,8 +318,8 @@
}
}
// Truncate Action suffix if found
-if (actionName.endsWith(ACTION)) {
-actionName = actionName.substring(0, actionName.length() -
ACTION.length());
+if (actionName.endsWith(getClassSuffix())) {
+actionName = actionName.substring(0, actionName.length() -
getClassSuffix().length());
}
// Force initial letter of action to lowercase, if desired
svn commit: r586743 - in /struts/sandbox/trunk/struts2-rest-plugin/showcase: ./ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/struts2/ src/main/ja
Author: mrdon
Date: Sat Oct 20 08:24:33 2007
New Revision: 586743
URL: http://svn.apache.org/viewvc?rev=586743&view=rev
Log:
Adding showcase app for rest plugin
Added:
struts/sandbox/trunk/struts2-rest-plugin/showcase/
struts/sandbox/trunk/struts2-rest-plugin/showcase/pom.xml
struts/sandbox/trunk/struts2-rest-plugin/showcase/src/
struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/
struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/java/
struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/java/org/
struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/java/org/apache/
struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/java/org/apache/struts2/
struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/java/org/apache/struts2/rest/
struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/java/org/apache/struts2/rest/example/
struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/java/org/apache/struts2/rest/example/Order.java
struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/java/org/apache/struts2/rest/example/OrderResource.java
struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/resources/
struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/resources/struts.properties
struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/webapp/
struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/webapp/WEB-INF/
struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/webapp/WEB-INF/web.xml
struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/webapp/index.jsp
struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/webapp/order-index.jsp
struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/webapp/order-input.jsp
struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/webapp/order-new.jsp
struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/webapp/order-show.jsp
struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/webapp/order-success.jsp
Added: struts/sandbox/trunk/struts2-rest-plugin/showcase/pom.xml
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-rest-plugin/showcase/pom.xml?rev=586743&view=auto
==
--- struts/sandbox/trunk/struts2-rest-plugin/showcase/pom.xml (added)
+++ struts/sandbox/trunk/struts2-rest-plugin/showcase/pom.xml Sat Oct 20
08:24:33 2007
@@ -0,0 +1,54 @@
+
+
+
+ 4.0.0
+
+org.apache.struts
+struts2-apps
+2.1.0-SNAPSHOT
+
+
+ org.apache.struts
+ struts2-rest-showcase
+ war
+ 2.1.0-SNAPSHOT
+ Struts 2 Rest Showcase Example
+ Struts 2 Rest Showcase Example
+
+
+
+org.apache.struts
+struts2-rest-plugin
+2.1.0-SNAPSHOT
+
+
+junit
+junit
+3.8.1
+test
+
+
+
+
+
+
+ struts2-rest-showcase
+
+
+maven-compiler-plugin
+
+ 1.5
+ 1.5
+
+
+
+ org.mortbay.jetty
+ maven-jetty-plugin
+ 6.0.1
+
+ 10
+
+
+
+
+
Added:
struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/java/org/apache/struts2/rest/example/Order.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/java/org/apache/struts2/rest/example/Order.java?rev=586743&view=auto
==
---
struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/java/org/apache/struts2/rest/example/Order.java
(added)
+++
struts/sandbox/trunk/struts2-rest-plugin/showcase/src/main/java/org/apache/struts2/rest/example/Order.java
Sat Oct 20 08:24:33 2007
@@ -0,0 +1,42 @@
+package org.apache.struts2.rest.example;
+
+public class Order {
+String id;
+String clientName;
+int amount;
+
+public Order() {}
+
+public Order(String id, String clientName, int amount) {
+super();
+this.id = id;
+this.clientName = clientName;
+this.amount = amount;
+}
+public int getAmount() {
+return amount;
+}
+public void setAmount(int amount) {
+this.amount = amount;
+}
+public String getClientName() {
+return clientName;
+}
+public void setClientName(String clientName) {
+this.clientName = clientName;
+}
+public String getId() {
+return id;
+}
+public void setId(String id) {
+this.id = id;
+}
+
+public void copyTo(Order order) {
+order.setId(getId());
+order.setAmount(getAmount());
+or
