[CONF] Confluence Changes in the last 24 hours
- This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Geronimo Development (GMOxDEV) http://cwiki.apache.org/confluence/display/GMOxDEV | |-Pages Added or Edited in This Space |-- Building Apache Geronimo was last edited by kevan (06:33 AM). | http://cwiki.apache.org/confluence/display/GMOxDEV/Building+Apache+Geronimo Apache Camel (CAMEL) http://cwiki.apache.org/confluence/display/CAMEL | |-Pages Added or Edited in This Space |-- Artix Data Services was last edited by jstrachan (07:39 AM). | http://cwiki.apache.org/confluence/display/CAMEL/Artix+Data+Services Apache Sling (SLING) http://cwiki.apache.org/confluence/display/SLING | |-Pages Added or Edited in This Space |-- Sling API Redesign was last edited by bdelacretaz (06:26 AM). | http://cwiki.apache.org/confluence/display/SLING/Sling+API+Redesign Apache CXF 2.0 Documentation (CXF20DOC) http://cwiki.apache.org/confluence/display/CXF20DOC | |-Pages Added or Edited in This Space |-- Developing a Consumer was last edited by tkurosaka (03:33 PM). | http://cwiki.apache.org/confluence/display/CXF20DOC/Developing+a+Consumer Apache Geronimo Project Management (GMOxPMGT) http://cwiki.apache.org/confluence/display/GMOxPMGT | |-Pages Added or Edited in This Space |-- Release Branching Process was last edited by kevan (05:34 AM). | http://cwiki.apache.org/confluence/display/GMOxPMGT/Release+Branching+Process |-- Apache Geronimo Board Report - 2007-10 - October was last edited by kevan (12:16 AM). | http://cwiki.apache.org/confluence/display/GMOxPMGT/Apache+Geronimo+Board+Report+-+2007-10+-+October Apache Struts 2 Documentation (WW) http://cwiki.apache.org/confluence/display/WW | |-Pages Added or Edited in This Space |-- Codebehind Plugin was last edited by mrdon (07:16 AM). | http://cwiki.apache.org/confluence/display/WW/Codebehind+Plugin |-- Zero Configuration was last edited by mrdon (07:15 AM). | http://cwiki.apache.org/confluence/display/WW/Zero+Configuration |-- Version Notes 2.1.0 was last edited by mrdon (07:11 AM). | http://cwiki.apache.org/confluence/display/WW/Version+Notes+2.1.0 |-- How do we download files within the framework was created by [EMAIL PROTECTED] (04:49 AM). | http://cwiki.apache.org/confluence/display/WW/How+do+we+download+files+within+the+framework |-- FAQs was last edited by [EMAIL PROTECTED] (04:45 AM). | http://cwiki.apache.org/confluence/display/WW/FAQs | |-New Comments in This Space |-- http://cwiki.apache.org/confluence/display/WW/Ajax+Tags (1) Apache Cayenne Documentation (CAYDOC) http://cwiki.apache.org/confluence/display/CAYDOC | |-Pages Added or Edited in This Space |-- NULL Handling was last edited by andrus (11:19 AM). | http://cwiki.apache.org/confluence/display/CAYDOC/NULL+Handling Apache Cayenne (CAY) http://cwiki.apache.org/confluence/display/CAY | |-Pages Added or Edited in This Space |-- Cayenne Examples was last edited by [EMAIL PROTECTED] (11:14 AM). | http://cwiki.apache.org/confluence/display/CAY/Cayenne+Examples Apache Wicket (WICKET) http://cwiki.apache.org/confluence/display/WICKET | |-Pages Added or Edited in This Space |-- Index was last edited by seitz (02:52 PM). | http://cwiki.apache.org/confluence/display/WICKET/Index |-- Community meetups was last edited by [EMAIL PROTECTED] (04:57 AM). | http://cwiki.apache.org/confluence/display/WICKET/Community+meetups |-- Tabs with image was created by [EMAIL PROTECTED] (04:03 AM). | http://cwiki.apache.org/confluence/display/WICKET/Tabs+with+image |-- Wicket Source Code Style was last edited by gwynevans (12:31 AM). | http://cwiki.apache.org/confluence/display/WICKET/Wicket+Source+Code+Style Apache Geronimo (GMOxSITE) http://cwiki.apache.org/confluence/display/GMOxSITE | |-Pages Added or Edited in This Space |-- Development Tools was last edited by mcconne (11:07 AM). | http://cwiki.apache.org/confluence/display/GMOxSITE/Development+Tools Apache Geronimo v2.0 (GMOxDOC20) http://cwiki.apache.org/confluence/display/GMOxDOC20 | |-Pages Added or Edited in This Space |-- RELEASE-NOTES-2.0.2.TXT was last edited by kevan (06:37 AM). | http://cwiki.apache.org/confluence/display/GMOxDOC20/RELEASE-NOTES-2.0.2.TXT Apache Jackrabbit (JCR) http://cwiki.apache.org/confluence/display/JCR | |-Pages Added or Edited in This Space |-- Index was created by husted (06:22 AM). | http://cwiki.apache.org/confluence/display/JCR/Index Apache ServiceMix (SM) http://cwiki.apache.org/confluence/display/SM | |-Pages Added or Edited in This Space |-- Users was last edited by chirino (11:23 AM). | http://cwiki.apache.org/confluence/display/SM/Users |-- 1.6. Beginner - Exercise was last edited by gertvanthienen (05:25 AM). | http://cwiki.apache.org/con
svn commit: r584404 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/ main/java/org/apache/struts2/config/ main/java/org/apache/struts2/interceptor/ main/resources/ test/java/org/apac
Author: mrdon
Date: Sat Oct 13 07:06:08 2007
New Revision: 584404
URL: http://svn.apache.org/viewvc?rev=584404&view=rev
Log:
Adding a wildcard processing plugin point
WW-2250
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
struts/struts2/trunk/core/src/main/resources/struts-default.xml
struts/struts2/trunk/core/src/test/java/org/apache/struts2/config/MethodConfigurationProviderTest.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java?rev=584404&r1=584403&r2=584404&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/StrutsConstants.java
Sat Oct 13 07:06:08 2007
@@ -176,5 +176,8 @@
/** The [EMAIL PROTECTED]
com.opensymphony.xwork2.reflection.ReflectionContextFactory} implementation
class */
public static final String STRUTS_REFLECTIONCONTEXTFACTORY =
"struts.reflectionContextFactory";
+
+/** The [EMAIL PROTECTED] com.opensymphony.xwork2.util.PatternMatcher}
implementation class */
+public static final String STRUTS_PATTERNMATCHER = "struts.patternMatcher";
}
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java?rev=584404&r1=584403&r2=584404&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
Sat Oct 13 07:06:08 2007
@@ -45,6 +45,7 @@
import com.opensymphony.xwork2.inject.Scope;
import com.opensymphony.xwork2.util.ClassLoaderUtil;
import com.opensymphony.xwork2.util.LocalizedTextUtil;
+import com.opensymphony.xwork2.util.PatternMatcher;
import com.opensymphony.xwork2.util.ValueStackFactory;
import com.opensymphony.xwork2.util.location.LocatableProperties;
import com.opensymphony.xwork2.util.logging.Logger;
@@ -143,6 +144,12 @@
* singleton
* All beans registered as PackageProvider implementations will be
automatically included in configuration building (since 2.1)
*
+ *
+ * com.opensymphony.xwork2.util.PatternMatcher
+ * struts.patternMatcher
+ * singleton
+ * Matches patterns, such as action names, generally used in
configuration (since 2.1)
+ *
*
*
*
@@ -200,6 +207,7 @@
alias(ValueStackFactory.class,
StrutsConstants.STRUTS_VALUESTACKFACTORY, builder, props);
alias(ReflectionProvider.class,
StrutsConstants.STRUTS_REFLECTIONPROVIDER, builder, props);
alias(ReflectionContextFactory.class,
StrutsConstants.STRUTS_REFLECTIONCONTEXTFACTORY, builder, props);
+alias(PatternMatcher.class, StrutsConstants.STRUTS_PATTERNMATCHER,
builder, props);
if
("true".equalsIgnoreCase(props.getProperty(StrutsConstants.STRUTS_DEVMODE))) {
props.setProperty(StrutsConstants.STRUTS_I18N_RELOAD, "true");
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java?rev=584404&r1=584403&r2=584404&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CookieInterceptor.java
Sat Oct 13 07:06:08 2007
@@ -41,17 +41,17 @@
/**
*
*
- * The aim of this interceptor is to set values in the stack/action based on
cookie name/value
+ * The aim of this intercepter is to set values in the stack/action based on
cookie name/value
* of interest.
*
- * If an asterik is present in cookiesName parameter, it will be assume that
+ * If an asterisk is present in cookiesName parameter, it will be assume that
* all cookies name are to be injected into struts' action, even though
- * cookiesName is comma-separated by other values, eg (cookie1,*,cookie2).
+ * cookiesName is comma-separated by other values, e.g. (cookie1,*,cookie2).
*
* If cookiesName is left empty it will assume that no cookie will be injected
* into Struts' action.
*
- * If an asterik is present in cookiesVal
svn commit: r584413 - in /struts/struts2/trunk/plugins/codebehind/src: main/java/org/apache/struts2/config/ test/java/org/apache/struts2/config/
Author: mrdon
Date: Sat Oct 13 08:41:39 2007
New Revision: 584413
URL: http://svn.apache.org/viewvc?rev=584413&view=rev
Log:
Adding action annotation
WW-2251
Added:
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/Action.java
struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/config/AnnotatedAction.java
Modified:
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java
struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/config/ClasspathPackageProviderTest.java
Added:
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/Action.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/Action.java?rev=584413&view=auto
==
---
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/Action.java
(added)
+++
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/Action.java
Sat Oct 13 08:41:39 2007
@@ -0,0 +1,31 @@
+/*
+ * $Id: Namespace.java 584166 2007-10-12 14:07:52Z mrdon $
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.struts2.config;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
[EMAIL PROTECTED](RetentionPolicy.RUNTIME)
+public @interface Action {
+public static final String DEFAULT_NAMESPACE = "__default_namespace__";
+String namespace() default DEFAULT_NAMESPACE;
+String name();
+}
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=584413&r1=584412&r2=584413&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 13 08:41:39 2007
@@ -246,7 +246,8 @@
public boolean matches(Class type) {
// TODO: should also find annotated classes
return (Action.class.isAssignableFrom(type) ||
-type.getSimpleName().endsWith("Action"));
+type.getSimpleName().endsWith("Action") ||
+
type.getAnnotation(org.apache.struts2.config.Action.class) != null);
}
}, pkgs);
@@ -274,26 +275,53 @@
* @param cls Action or POJO instance to process
* @param pkgs List of packages that were scanned for Actions
*/
-protected void processActionClass(Class cls, String[] pkgs) {
+protected void processActionClass(Class cls, String[] pkgs) {
+ActionConfig actionConfig = new ActionConfig();
String name = cls.getName();
String actionPackage = cls.getPackage().getName();
String actionNamespace = null;
String actionName = null;
-for (String pkg : pkgs) {
-if (name.startsWith(pkg)) {
-if (LOG.isDebugEnabled()) {
-LOG.debug("ClasspathPackageProvider: Processing class
"+name);
-}
-name = name.substring(pkg.length() + 1);
-
+
+org.apache.struts2.config.Action actionAnn =
+(org.apache.struts2.config.Action)
cls.getAnnotation(org.apache.struts2.config.Action.class);
+if (actionAnn != null) {
+actionName = actionAnn.name();
+if
(actionAnn.namespace().equals(org.apache.struts2.config.Action.DEFAULT_NAMESPACE))
{
actionNamespace = "";
-actionName = name;
-int pos = name.lastIndexOf('.');
-if (pos > -1) {
-actionNamespace = "/" + name.substring(0,
pos).replace('.','/');
-actionName = name.substring(pos+1);
+
[OSS Bamboo] Struts 2 SVN - Main Build build 560 has FAILED (1 tests failed). Change made by Don Brown
The project Struts 2 SVN - Main Build has the following 1 change by 1 author: *Don Brown* made the following changes at Comment: Adding action annotation WW-2251 > /struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/Action.java > (584413) > /struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/config/AnnotatedAction.java > (584413) > /struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/config/ClasspathPackageProviderTest.java > (584413) > /struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java > (584413) --- The build has 1 failed test and 710 successful tests. Click http://opensource.bamboo.atlassian.com/browse/STRUTS-MAIN-560 to find out more. Thanks, Bamboo
[OSS Bamboo] Struts 2 SVN - Main Build (Java 6) build 213 has FAILED (1 tests failed). Change made by Don Brown
The project Struts 2 SVN - Main Build (Java 6) has the following 1 change by 1 author: *Don Brown* made the following changes at Comment: Adding action annotation WW-2251 > /struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/Action.java > (584413) > /struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/config/AnnotatedAction.java > (584413) > /struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/config/ClasspathPackageProviderTest.java > (584413) > /struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/config/ClasspathPackageProvider.java > (584413) --- The build has 1 failed test and 710 successful tests. Click http://opensource.bamboo.atlassian.com/browse/STRUTS-MAINJ6-213 to find out more. Thanks, Bamboo
svn commit: r584416 - /struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/config/AnotherAnnotatedObject.java
Author: mrdon
Date: Sat Oct 13 08:50:32 2007
New Revision: 584416
URL: http://svn.apache.org/viewvc?rev=584416&view=rev
Log:
Adding missing test
WW-2251
Added:
struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/config/AnotherAnnotatedObject.java
Added:
struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/config/AnotherAnnotatedObject.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/config/AnotherAnnotatedObject.java?rev=584416&view=auto
==
---
struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/config/AnotherAnnotatedObject.java
(added)
+++
struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/config/AnotherAnnotatedObject.java
Sat Oct 13 08:50:32 2007
@@ -0,0 +1,26 @@
+/*
+ * $Id: CustomNamespaceAction.java 584166 2007-10-12 14:07:52Z mrdon $
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.struts2.config;
+
[EMAIL PROTECTED](name="myaction2")
+public class AnotherAnnotatedObject {
+
+}
[OSS Bamboo] Struts 2 SVN - Main Build build 561 was SUCCESSFUL (with 711 tests). Change made by Don Brown
The project Struts 2 SVN - Main Build has the following 1 change by 1 author: *Don Brown* made the following changes at Comment: Adding missing test WW-2251 > /struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/config/AnotherAnnotatedObject.java > (584416) --- All 711 tests passed. Click http://opensource.bamboo.atlassian.com/browse/STRUTS-MAIN-561 to find out more. Thanks, Bamboo
[OSS Bamboo] Struts 2 SVN - Main Build (Java 6) build 214 was SUCCESSFUL (with 711 tests). Change made by Don Brown
The project Struts 2 SVN - Main Build (Java 6) has the following 1 change by 1 author: *Don Brown* made the following changes at Comment: Adding missing test WW-2251 > /struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/config/AnotherAnnotatedObject.java > (584416) --- All 711 tests passed. Click http://opensource.bamboo.atlassian.com/browse/STRUTS-MAINJ6-214 to find out more. Thanks, Bamboo
