[CONF] Confluence Changes in the last 24 hours
- This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Felix (FELIX) http://cwiki.apache.org/confluence/display/FELIX | |-Pages Added or Edited in This Space |-- Contributing was last edited by mcculls (03:12 AM). | http://cwiki.apache.org/confluence/display/FELIX/Contributing Apache Camel (CAMEL) http://cwiki.apache.org/confluence/display/CAMEL | |-Pages Added or Edited in This Space |-- Camel JMX was last edited by davsclaus (10:25 PM). | http://cwiki.apache.org/confluence/display/CAMEL/Camel+JMX |-- JMS was last edited by davsclaus (06:43 AM). | http://cwiki.apache.org/confluence/display/CAMEL/JMS Apache CXF Documentation (CXF20DOC) http://cwiki.apache.org/confluence/display/CXF20DOC | |-Pages Added or Edited in This Space |-- WS-Trust was created by dkulp (06:47 AM). | http://cwiki.apache.org/confluence/display/CXF20DOC/WS-Trust |-- WS-SecureConversation was created by dkulp (06:47 AM). | http://cwiki.apache.org/confluence/display/CXF20DOC/WS-SecureConversation |-- WS-SecurityPolicy was created by dkulp (06:46 AM). | http://cwiki.apache.org/confluence/display/CXF20DOC/WS-SecurityPolicy Apache Directory Server v1.5 (DIRxSRVx11) http://cwiki.apache.org/confluence/display/DIRxSRVx11 | |-Pages Added or Edited in This Space |-- 1.4.1 Configuration of ApacheDS with Spring was last edited by elecharny (05:52 AM). | http://cwiki.apache.org/confluence/display/DIRxSRVx11/1.4.1+Configuration+of+ApacheDS+with+Spring Apache Geronimo Project Management (GMOxPMGT) http://cwiki.apache.org/confluence/display/GMOxPMGT | |-Pages Added or Edited in This Space |-- Geronimo 2.1.4 Release Status was last edited by jbohn (07:51 AM). | http://cwiki.apache.org/confluence/display/GMOxPMGT/Geronimo+2.1.4+Release+Status Tuscany Wiki (TUSCANYWIKI) http://cwiki.apache.org/confluence/display/TUSCANYWIKI | |-Pages Added or Edited in This Space |-- OSOA SCA vs OASIS SCA was last edited by slaws (07:46 AM). | http://cwiki.apache.org/confluence/display/TUSCANYWIKI/OSOA+SCA+vs+OASIS+SCA Apache Struts 2 Documentation (WW) http://cwiki.apache.org/confluence/display/WW | |-New Comments in This Space |-- http://cwiki.apache.org/confluence/display/WW/The+Struts+2+Request+Flow (1) Apache Cayenne (CAY) http://cwiki.apache.org/confluence/display/CAY | |-Pages Added or Edited in This Space |-- Board Report March 2009 was created by andrus (12:42 AM). | http://cwiki.apache.org/confluence/display/CAY/Board+Report+March+2009 |-- Board Reports was last edited by andrus (12:38 AM). | http://cwiki.apache.org/confluence/display/CAY/Board+Reports Apache Pivot (PIVOT) http://cwiki.apache.org/confluence/display/PIVOT | |-Pages Added or Edited in This Space |-- Text Areas was created by ad...@suddtech.net (11:15 AM). | http://cwiki.apache.org/confluence/display/PIVOT/Text+Areas Apache Tuscany (TUSCANY) http://cwiki.apache.org/confluence/display/TUSCANY | |-Pages Added or Edited in This Space |-- SCA Java implementation.spring was last edited by ramkumar.rj (10:33 AM). | http://cwiki.apache.org/confluence/display/TUSCANY/SCA+Java+implementation.spring Apache Wicket (WICKET) http://cwiki.apache.org/confluence/display/WICKET | |-Pages Added or Edited in This Space |-- Companies that provide services was last edited by richpa...@gmail.com (06:58 PM). | http://cwiki.apache.org/confluence/display/WICKET/Companies+that+provide+services |-- Fragment was last edited by bradfritz (02:21 PM). | http://cwiki.apache.org/confluence/display/WICKET/Fragment |-- Wicket Community meetups - Amsterdam was last edited by deliafrees (12:36 PM). | http://cwiki.apache.org/confluence/display/WICKET/Wicket+Community+meetups+-+Amsterdam - CONFLUENCE INFORMATION This message is automatically generated by Confluence Unsubscribe or edit your notifications preferences http://cwiki.apache.org/confluence/users/viewnotifications.action If you think it was sent incorrectly contact one of the administrators http://cwiki.apache.org/confluence/administrators.action If you want more information on Confluence, or have a bug to report see http://www.atlassian.com/software/confluence
svn commit: r755382 - in /struts/struts2/trunk/plugins/convention/src: main/java/org/apache/struts2/convention/ test/java/org/apache/struts2/convention/ test/java/org/apache/struts2/convention/actions
Author: musachy
Date: Tue Mar 17 20:24:26 2009
New Revision: 755382
URL: http://svn.apache.org/viewvc?rev=755382&view=rev
Log:
WW-3043 Result annotations at the method level should overwrite result
annotations at the class level in the Convention plugin
Added:
struts/struts2/trunk/plugins/convention/src/test/java/org/apache/struts2/convention/actions/result/OverrideResultAction.java
Modified:
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java
struts/struts2/trunk/plugins/convention/src/test/java/org/apache/struts2/convention/DefaultResultMapBuilderTest.java
struts/struts2/trunk/plugins/convention/src/test/java/org/apache/struts2/convention/PackageBasedActionConfigBuilderTest.java
Modified:
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java?rev=755382&r1=755381&r2=755382&view=diff
==
---
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java
(original)
+++
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java
Tue Mar 17 20:24:26 2009
@@ -180,20 +180,23 @@
String resultPrefix = defaultResultPath + actionName;
+//results from files
Map results = new HashMap();
Map resultsByExtension =
conventionsService.getResultTypesByExtension(packageConfig);
createFromResources(actionClass, results, defaultResultPath,
resultPrefix, actionName,
packageConfig, resultsByExtension);
-if (annotation != null && annotation.results() != null &&
annotation.results().length > 0) {
-createFromAnnotations(results, defaultResultPath, packageConfig,
annotation.results(),
-actionClass, resultsByExtension);
-}
-//get inherited @Results and @Result
+//get inherited @Results and @Result (class level)
for (Class clazz : ReflectionTools.getClassHierarchy(actionClass)) {
createResultsFromAnnotations(clazz, packageConfig,
defaultResultPath, results, resultsByExtension);
}
+
+//method level
+if (annotation != null && annotation.results() != null &&
annotation.results().length > 0) {
+createFromAnnotations(results, defaultResultPath, packageConfig,
annotation.results(),
+actionClass, resultsByExtension);
+}
return results;
}
Modified:
struts/struts2/trunk/plugins/convention/src/test/java/org/apache/struts2/convention/DefaultResultMapBuilderTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/convention/src/test/java/org/apache/struts2/convention/DefaultResultMapBuilderTest.java?rev=755382&r1=755381&r2=755382&view=diff
==
---
struts/struts2/trunk/plugins/convention/src/test/java/org/apache/struts2/convention/DefaultResultMapBuilderTest.java
(original)
+++
struts/struts2/trunk/plugins/convention/src/test/java/org/apache/struts2/convention/DefaultResultMapBuilderTest.java
Tue Mar 17 20:24:26 2009
@@ -29,6 +29,7 @@
import static org.apache.struts2.convention.ReflectionTools.*;
import org.apache.struts2.convention.actions.NoAnnotationAction;
+import org.apache.struts2.convention.actions.result.OverrideResultAction;
import org.apache.struts2.convention.actions.result.ActionLevelResultAction;
import org.apache.struts2.convention.actions.result.ActionLevelResultsAction;
import org.apache.struts2.convention.actions.result.ClassLevelResultAction;
@@ -74,6 +75,20 @@
verify(context, "/WEB-INF/location", results, false);
}
+public void testResultOverrride() throws Exception {
+ServletContext context = mockServletContext("/WEB-INF/location");
+
+// Test with a slash
+PackageConfig packageConfig = createPackageConfigBuilder("/namespace");
+this.conventionsService = new
ConventionsServiceImpl("/WEB-INF/location");
+DefaultResultMapBuilder builder = new DefaultResultMapBuilder(context,
container, "dispatcher,velocity,freemarker");
+Action actionAnn =
OverrideResultAction.class.getMethod("execute").getAnnotation(Action.class);
+Map results =
builder.build(OverrideResultAction.class, actionAnn, "action100",
packageConfig);
+ResultConfig result = results.get("error");
+assertNotNull(result);
+assertEquals("/WEB-INF/location/namespace/error-overriden.jsp",
result.getParams().get("location"));
+}
+
public void testNull() throws Exception {
ServletContext context =
EasyMock.createStrictMock(ServletContext.class);
[OSS Bamboo] Struts 2 SVN - Main Build (Java 6) build 761 has FAILED (0 tests failed). Change made by Musachy Barroso
--- STRUTS-MAINJ6-761 failed. --- Code has been updated by Musachy Barroso. No failed tests found, a possible compilation error. http://opensource.bamboo.atlassian.com/browse/STRUTS-MAINJ6-761/ -- Code Changes -- Musachy Barroso (755382): >WW-3043 Result annotations at the method level should overwrite result >annotations at the class level in the Convention plugin > > -- Error Summary -- [INFO] [ERROR] BUILD ERROR [INFO] [INFO] Unable to find artifact. Embedded error: Unable to download the artifact from any repository Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=com.opensymphony -DartifactId=xwork -Dversion=2.1.3-SNAPSHOT -Dclassifier=sources -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=com.opensymphony -DartifactId=xwork -Dversion=2.1.3-SNAPSHOT -Dclassifier=sources -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] com.opensymphony:xwork:jar:2.1.3-SNAPSHOT from the specified remote repositories: apache.snapshots (http://people.apache.org/maven-snapshot-repository), central (https://m2proxy.atlassian.com/repository/public) [INFO] [INFO] For more information, run Maven with the -e switch -- This message is automatically generated by Atlassian Bamboo
[OSS Bamboo] Struts 2 SVN - Main Build build 1048 has FAILED (0 tests failed). Change made by Musachy Barroso
--- STRUTS-MAIN-1048 failed. --- Code has been updated by Musachy Barroso. No failed tests found, a possible compilation error. http://opensource.bamboo.atlassian.com/browse/STRUTS-MAIN-1048/ -- Code Changes -- Musachy Barroso (755382): >WW-3043 Result annotations at the method level should overwrite result >annotations at the class level in the Convention plugin > > -- Error Summary -- [INFO] [ERROR] BUILD ERROR [INFO] [INFO] Failed to resolve artifact. GroupId: com.opensymphony ArtifactId: xwork Version: 2.1.3-SNAPSHOT Reason: Unable to download the artifact from any repository Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=com.opensymphony -DartifactId=xwork -Dversion=2.1.3-SNAPSHOT -Dclassifier=sources -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=com.opensymphony -DartifactId=xwork -Dversion=2.1.3-SNAPSHOT -Dclassifier=sources -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] com.opensymphony:xwork:jar:2.1.3-SNAPSHOT from the specified remote repositories: central (https://m2proxy.atlassian.com/repository/public), apache.snapshots (http://people.apache.org/maven-snapshot-repository) [INFO] [INFO] For more information, run Maven with the -e switch -- This message is automatically generated by Atlassian Bamboo
svn commit: r755410 - /struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
Author: musachy
Date: Tue Mar 17 21:50:59 2009
New Revision: 755410
URL: http://svn.apache.org/viewvc?rev=755410&view=rev
Log:
WW-3045 Replace TextUtils String methods
Modified:
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
Modified:
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java?rev=755410&r1=755409&r2=755410&view=diff
==
---
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
(original)
+++
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
Tue Mar 17 21:50:59 2009
@@ -46,6 +46,7 @@
import org.apache.struts2.convention.classloader.ReloadingClassLoader;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.StrutsException;
+import org.apache.commons.lang.xwork.StringUtils;
import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.config.Configuration;
@@ -163,7 +164,7 @@
*/
@Inject(value = "struts.convention.action.includeJars", required = false)
public void setIncludeJars(String includeJars) {
-if (TextUtils.stringSet(includeJars))
+if (StringUtils.isNotEmpty(includeJars))
this.includeJars = includeJars.split("\\s*[,]\\s*");
}
svn commit: r755412 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/views/util/TextUtil.java test/java/org/apache/struts2/views/util/TextUtilTest.java
Author: musachy Date: Tue Mar 17 21:53:14 2009 New Revision: 755412 URL: http://svn.apache.org/viewvc?rev=755412&view=rev Log: Remove TextUtil(not used) Removed: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/util/TextUtil.java struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/util/TextUtilTest.java
[OSS Bamboo] Struts 2 SVN - Main Build (Java 6) build 762 has FAILED (0 tests failed). Change made by Musachy Barroso
--- STRUTS-MAINJ6-762 failed. --- Code has been updated by Musachy Barroso. No failed tests found, a possible compilation error. http://opensource.bamboo.atlassian.com/browse/STRUTS-MAINJ6-762/ -- Code Changes -- Musachy Barroso (755408): >WW-3045 Replace TextUtils String methods -- Error Summary -- [INFO] [ERROR] BUILD ERROR [INFO] [INFO] Unable to find artifact. Embedded error: Unable to download the artifact from any repository Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=com.opensymphony -DartifactId=xwork -Dversion=2.1.3-SNAPSHOT -Dclassifier=sources -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=com.opensymphony -DartifactId=xwork -Dversion=2.1.3-SNAPSHOT -Dclassifier=sources -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] com.opensymphony:xwork:jar:2.1.3-SNAPSHOT from the specified remote repositories: apache.snapshots (http://people.apache.org/maven-snapshot-repository), central (https://m2proxy.atlassian.com/repository/public) [INFO] [INFO] For more information, run Maven with the -e switch -- This message is automatically generated by Atlassian Bamboo
[OSS Bamboo] Struts 2 SVN - Main Build build 1049 has FAILED (0 tests failed). Change made by Musachy Barroso
--- STRUTS-MAIN-1049 failed. --- Code has been updated by Musachy Barroso. No failed tests found, a possible compilation error. http://opensource.bamboo.atlassian.com/browse/STRUTS-MAIN-1049/ -- Code Changes -- Musachy Barroso (755408): >WW-3045 Replace TextUtils String methods -- Error Summary -- [INFO] [ERROR] BUILD ERROR [INFO] [INFO] Failed to resolve artifact. GroupId: com.opensymphony ArtifactId: xwork Version: 2.1.3-SNAPSHOT Reason: Unable to download the artifact from any repository Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=com.opensymphony -DartifactId=xwork -Dversion=2.1.3-SNAPSHOT -Dclassifier=sources -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=com.opensymphony -DartifactId=xwork -Dversion=2.1.3-SNAPSHOT -Dclassifier=sources -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] com.opensymphony:xwork:jar:2.1.3-SNAPSHOT from the specified remote repositories: central (https://m2proxy.atlassian.com/repository/public), apache.snapshots (http://people.apache.org/maven-snapshot-repository) [INFO] [INFO] For more information, run Maven with the -e switch -- This message is automatically generated by Atlassian Bamboo
[OSS Bamboo] Struts 2 SVN - Main Build (Java 6) build 763 has FAILED (0 tests failed). Change made by Musachy Barroso
--- STRUTS-MAINJ6-763 failed. --- Code has been updated by Musachy Barroso. No failed tests found, a possible compilation error. http://opensource.bamboo.atlassian.com/browse/STRUTS-MAINJ6-763/ -- Code Changes -- Musachy Barroso (755412): >Remove TextUtil(not used) Musachy Barroso (755410): >WW-3045 Replace TextUtils String methods > > -- Error Summary -- [INFO] [ERROR] BUILD ERROR [INFO] [INFO] Unable to find artifact. Embedded error: Unable to download the artifact from any repository Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=com.opensymphony -DartifactId=xwork -Dversion=2.1.3-SNAPSHOT -Dclassifier=sources -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=com.opensymphony -DartifactId=xwork -Dversion=2.1.3-SNAPSHOT -Dclassifier=sources -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] com.opensymphony:xwork:jar:2.1.3-SNAPSHOT from the specified remote repositories: apache.snapshots (http://people.apache.org/maven-snapshot-repository), central (https://m2proxy.atlassian.com/repository/public) [INFO] [INFO] For more information, run Maven with the -e switch -- This message is automatically generated by Atlassian Bamboo
[OSS Bamboo] Struts 2 SVN - Main Build build 1050 has FAILED (0 tests failed). Change made by Musachy Barroso
--- STRUTS-MAIN-1050 failed. --- Code has been updated by Musachy Barroso. No failed tests found, a possible compilation error. http://opensource.bamboo.atlassian.com/browse/STRUTS-MAIN-1050/ -- Code Changes -- Musachy Barroso (755412): >Remove TextUtil(not used) Musachy Barroso (755410): >WW-3045 Replace TextUtils String methods > > -- Error Summary -- [INFO] [ERROR] BUILD ERROR [INFO] [INFO] Failed to resolve artifact. GroupId: com.opensymphony ArtifactId: xwork Version: 2.1.3-SNAPSHOT Reason: Unable to download the artifact from any repository Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=com.opensymphony -DartifactId=xwork -Dversion=2.1.3-SNAPSHOT -Dclassifier=sources -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=com.opensymphony -DartifactId=xwork -Dversion=2.1.3-SNAPSHOT -Dclassifier=sources -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] com.opensymphony:xwork:jar:2.1.3-SNAPSHOT from the specified remote repositories: central (https://m2proxy.atlassian.com/repository/public), apache.snapshots (http://people.apache.org/maven-snapshot-repository) [INFO] [INFO] For more information, run Maven with the -e switch -- This message is automatically generated by Atlassian Bamboo
