svn commit: r911280 - in /struts: struts2/trunk/xwork-core/ xwork/trunk/core/
Author: lukaszlenart Date: Thu Feb 18 08:22:46 2010 New Revision: 911280 URL: http://svn.apache.org/viewvc?rev=911280&view=rev Log: Move XWork core under Struts 2 to simplify relese proces Added: struts/struts2/trunk/xwork-core/ - copied from r911279, struts/xwork/trunk/core/ Removed: struts/xwork/trunk/core/
[OSS Bamboo] Struts 2 SVN - Main Build build 1263 has FAILED (0 tests failed). Change made by lukaszlenart
--- STRUTS-MAIN-1263 failed. --- Code has been updated by lukaszlenart. No failed tests found, a possible compilation error. http://opensource.bamboo.atlassian.com/browse/STRUTS-MAIN-1263/ -- Code Changes -- lukaszlenart (911280): >Move XWork core under Struts 2 to simplify relese proces -- Error Summary -- [INFO] [ERROR] BUILD ERROR [INFO] [INFO] Failed to resolve artifact. Missing: -- 1) org.apache.struts:struts2-osgi-admin-bundle:jar:2.2.0-SNAPSHOT Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=org.apache.struts -DartifactId=struts2-osgi-admin-bundle -Dversion=2.2.0-SNAPSHOT -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=org.apache.struts -DartifactId=struts2-osgi-admin-bundle -Dversion=2.2.0-SNAPSHOT -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] Path to dependency: 1) org.apache.struts:struts2-assembly:pom:2.2.0-SNAPSHOT 2) org.apache.struts:struts2-osgi-admin-bundle:jar:2.2.0-SNAPSHOT 2) org.apache.struts:struts2-osgi-demo-bundle:jar:2.2.0-SNAPSHOT Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=org.apache.struts -DartifactId=struts2-osgi-demo-bundle -Dversion=2.2.0-SNAPSHOT -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=org.apache.struts -DartifactId=struts2-osgi-demo-bundle -Dversion=2.2.0-SNAPSHOT -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] Path to dependency: 1) org.apache.struts:struts2-assembly:pom:2.2.0-SNAPSHOT 2) org.apache.struts:struts2-osgi-demo-bundle:jar:2.2.0-SNAPSHOT -- 2 required artifacts are missing. for artifact: org.apache.struts:struts2-assembly:pom:2.2.0-SNAPSHOT from the specified remote repositories: apache.snapshots (http://people.apache.org/repo/m2-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 (Java 6) build 1027 has FAILED (0 tests failed). Change made by lukaszlenart
--- STRUTS-MAINJ6-1027 failed. --- Code has been updated by lukaszlenart. No failed tests found, a possible compilation error. http://opensource.bamboo.atlassian.com/browse/STRUTS-MAINJ6-1027/ -- Code Changes -- lukaszlenart (911280): >Move XWork core under Struts 2 to simplify relese proces -- Error Summary -- [INFO] [ERROR] BUILD ERROR [INFO] [INFO] Failed to resolve artifact. Missing: -- 1) org.apache.struts:struts2-osgi-admin-bundle:jar:2.2.0-SNAPSHOT Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=org.apache.struts -DartifactId=struts2-osgi-admin-bundle -Dversion=2.2.0-SNAPSHOT -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=org.apache.struts -DartifactId=struts2-osgi-admin-bundle -Dversion=2.2.0-SNAPSHOT -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] Path to dependency: 1) org.apache.struts:struts2-assembly:pom:2.2.0-SNAPSHOT 2) org.apache.struts:struts2-osgi-admin-bundle:jar:2.2.0-SNAPSHOT 2) org.apache.struts:struts2-osgi-demo-bundle:jar:2.2.0-SNAPSHOT Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=org.apache.struts -DartifactId=struts2-osgi-demo-bundle -Dversion=2.2.0-SNAPSHOT -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=org.apache.struts -DartifactId=struts2-osgi-demo-bundle -Dversion=2.2.0-SNAPSHOT -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] Path to dependency: 1) org.apache.struts:struts2-assembly:pom:2.2.0-SNAPSHOT 2) org.apache.struts:struts2-osgi-demo-bundle:jar:2.2.0-SNAPSHOT -- 2 required artifacts are missing. for artifact: org.apache.struts:struts2-assembly:pom:2.2.0-SNAPSHOT from the specified remote repositories: apache.snapshots (http://people.apache.org/repo/m2-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
svn commit: r911291 - /struts/struts2/trunk/xwork-core/
Author: lukaszlenart Date: Thu Feb 18 09:11:17 2010 New Revision: 911291 URL: http://svn.apache.org/viewvc?rev=911291&view=rev Log: Updated svn:ignore list Modified: struts/struts2/trunk/xwork-core/ (props changed) Propchange: struts/struts2/trunk/xwork-core/ -- --- svn:ignore (added) +++ svn:ignore Thu Feb 18 09:11:17 2010 @@ -0,0 +1,11 @@ +*.ipr +*.iws +*.iml +build +dist +.project +.classpath +ivyrep.properties +cobertura.ser +.settings +target
[OSS Bamboo] Struts 2 SVN - Main Build (Java 6) build 1028 has FAILED (0 tests failed). Change made by lukaszlenart
--- STRUTS-MAINJ6-1028 failed. --- Code has been updated by lukaszlenart. No failed tests found, a possible compilation error. http://opensource.bamboo.atlassian.com/browse/STRUTS-MAINJ6-1028/ -- Code Changes -- lukaszlenart (911291): >Updated svn:ignore list -- Error Summary -- [INFO] [ERROR] BUILD ERROR [INFO] [INFO] Failed to resolve artifact. Missing: -- 1) org.apache.struts:struts2-osgi-admin-bundle:jar:2.2.0-SNAPSHOT Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=org.apache.struts -DartifactId=struts2-osgi-admin-bundle -Dversion=2.2.0-SNAPSHOT -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=org.apache.struts -DartifactId=struts2-osgi-admin-bundle -Dversion=2.2.0-SNAPSHOT -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] Path to dependency: 1) org.apache.struts:struts2-assembly:pom:2.2.0-SNAPSHOT 2) org.apache.struts:struts2-osgi-admin-bundle:jar:2.2.0-SNAPSHOT 2) org.apache.struts:struts2-osgi-demo-bundle:jar:2.2.0-SNAPSHOT Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=org.apache.struts -DartifactId=struts2-osgi-demo-bundle -Dversion=2.2.0-SNAPSHOT -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=org.apache.struts -DartifactId=struts2-osgi-demo-bundle -Dversion=2.2.0-SNAPSHOT -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] Path to dependency: 1) org.apache.struts:struts2-assembly:pom:2.2.0-SNAPSHOT 2) org.apache.struts:struts2-osgi-demo-bundle:jar:2.2.0-SNAPSHOT -- 2 required artifacts are missing. for artifact: org.apache.struts:struts2-assembly:pom:2.2.0-SNAPSHOT from the specified remote repositories: apache.snapshots (http://people.apache.org/repo/m2-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 1264 has FAILED (0 tests failed). Change made by lukaszlenart
--- STRUTS-MAIN-1264 failed. --- Code has been updated by lukaszlenart. No failed tests found, a possible compilation error. http://opensource.bamboo.atlassian.com/browse/STRUTS-MAIN-1264/ -- Code Changes -- lukaszlenart (911291): >Updated svn:ignore list -- Error Summary -- [INFO] [ERROR] BUILD ERROR [INFO] [INFO] Failed to resolve artifact. Missing: -- 1) org.apache.struts:struts2-osgi-admin-bundle:jar:2.2.0-SNAPSHOT Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=org.apache.struts -DartifactId=struts2-osgi-admin-bundle -Dversion=2.2.0-SNAPSHOT -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=org.apache.struts -DartifactId=struts2-osgi-admin-bundle -Dversion=2.2.0-SNAPSHOT -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] Path to dependency: 1) org.apache.struts:struts2-assembly:pom:2.2.0-SNAPSHOT 2) org.apache.struts:struts2-osgi-admin-bundle:jar:2.2.0-SNAPSHOT 2) org.apache.struts:struts2-osgi-demo-bundle:jar:2.2.0-SNAPSHOT Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=org.apache.struts -DartifactId=struts2-osgi-demo-bundle -Dversion=2.2.0-SNAPSHOT -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=org.apache.struts -DartifactId=struts2-osgi-demo-bundle -Dversion=2.2.0-SNAPSHOT -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] Path to dependency: 1) org.apache.struts:struts2-assembly:pom:2.2.0-SNAPSHOT 2) org.apache.struts:struts2-osgi-demo-bundle:jar:2.2.0-SNAPSHOT -- 2 required artifacts are missing. for artifact: org.apache.struts:struts2-assembly:pom:2.2.0-SNAPSHOT from the specified remote repositories: apache.snapshots (http://people.apache.org/repo/m2-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
svn commit: r911396 - in /struts/struts2/trunk: core/pom.xml pom.xml xwork-core/pom.xml
Author: lukaszlenart
Date: Thu Feb 18 13:39:29 2010
New Revision: 911396
URL: http://svn.apache.org/viewvc?rev=911396&view=rev
Log:
Changed poms to reflect new directory structure after moving XWork-core inside
Struts 2
Modified:
struts/struts2/trunk/core/pom.xml
struts/struts2/trunk/pom.xml
struts/struts2/trunk/xwork-core/pom.xml
Modified: struts/struts2/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/pom.xml?rev=911396&r1=911395&r2=911396&view=diff
==
--- struts/struts2/trunk/core/pom.xml (original)
+++ struts/struts2/trunk/core/pom.xml Thu Feb 18 13:39:29 2010
@@ -42,29 +42,6 @@
-maven-dependency-plugin
-
-
-unpack-xwork
-generate-sources
-
-unpack
-
-
-
-
-com.opensymphony
-xwork-core
-2.1.7-SNAPSHOT
-sources
-
-
-
${project.build.directory}/xwork-sources
-
-
-
-
-
org.apache.myfaces.tobago
maven-apt-plugin
1.0.15
@@ -107,7 +84,7 @@
maven-javadoc-plugin
2.2
-
${basedir}/src/main/java;${basedir}/target/xwork-sources
+
${basedir}/src/main/java;${basedir}/../xwork-core/src/main/java
UTF-8
@@ -166,7 +143,7 @@
-
${basedir}/src/main/java;${basedir}/target/xwork-sources
+
${basedir}/src/main/java;${basedir}/../xwork-core/src/main/java
UTF-8
@@ -228,7 +205,7 @@
com.opensymphony
xwork-core
-2.1.7-SNAPSHOT
+2.2.0-SNAPSHOT
Modified: struts/struts2/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/pom.xml?rev=911396&r1=911395&r2=911396&view=diff
==
--- struts/struts2/trunk/pom.xml (original)
+++ struts/struts2/trunk/pom.xml Thu Feb 18 13:39:29 2010
@@ -58,6 +58,7 @@
+xwork-core
core
apps
plugins
@@ -98,7 +99,7 @@
xwork
-../xwork
+xwork-core
Modified: struts/struts2/trunk/xwork-core/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/pom.xml?rev=911396&r1=911395&r2=911396&view=diff
==
--- struts/struts2/trunk/xwork-core/pom.xml (original)
+++ struts/struts2/trunk/xwork-core/pom.xml Thu Feb 18 13:39:29 2010
@@ -3,35 +3,30 @@
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-parent
+2.2.0-SNAPSHOT
+
+
com.opensymphony
xwork-core
jar
XWork: Core
-
-
-com.opensymphony
-xwork-parent
-2.1.7-SNAPSHOT
-
+
-
scm:svn:http://svn.opensymphony.com/svn/xwork/trunk/core
-
-scm:svn:https://svn.opensymphony.com/svn/xwork/trunk/core
-
-https://svn.opensymphony.com/svn/xwork/trunk/core
+
scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/xwork-core/
+
scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/xwork-core/
+
http://svn.apache.org/repos/asf/struts/struts2/trunk/xwork-core/
-
-
-The OpenSymphony Software License 1.1
-../src/resources/LICENSE.txt
-
-This license is derived and fully compatible with the Apache
Software
-License - see http://www.apache.org/LICENSE.txt
-
-
-
+
+${pom.version}
+2.5.6
+3.1
+2.7.3
+
@@ -246,7 +241,117 @@
install
-
-
+
+
+commons-logging
+commons-logging
+1.1.1
+true
+
+
+commons-lang
+commons-lang
+2.4
+true
+
+
+o
[OSS Bamboo] Struts 2 SVN - Main Build (Java 6) build 1029 has FAILED (0 tests failed). Change made by lukaszlenart
--- STRUTS-MAINJ6-1029 failed. --- Code has been updated by lukaszlenart. No failed tests found, a possible compilation error. http://opensource.bamboo.atlassian.com/browse/STRUTS-MAINJ6-1029/ -- Code Changes -- lukaszlenart (911396): >Changed poms to reflect new directory structure after moving XWork-core inside >Struts 2 -- Error Summary -- [INFO] [ERROR] BUILD ERROR [INFO] [INFO] Failed to resolve artifact. Missing: -- 1) org.apache.struts:struts2-osgi-admin-bundle:jar:2.2.0-SNAPSHOT Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=org.apache.struts -DartifactId=struts2-osgi-admin-bundle -Dversion=2.2.0-SNAPSHOT -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=org.apache.struts -DartifactId=struts2-osgi-admin-bundle -Dversion=2.2.0-SNAPSHOT -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] Path to dependency: 1) org.apache.struts:struts2-assembly:pom:2.2.0-SNAPSHOT 2) org.apache.struts:struts2-osgi-admin-bundle:jar:2.2.0-SNAPSHOT 2) org.apache.struts:struts2-osgi-demo-bundle:jar:2.2.0-SNAPSHOT Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=org.apache.struts -DartifactId=struts2-osgi-demo-bundle -Dversion=2.2.0-SNAPSHOT -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=org.apache.struts -DartifactId=struts2-osgi-demo-bundle -Dversion=2.2.0-SNAPSHOT -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] Path to dependency: 1) org.apache.struts:struts2-assembly:pom:2.2.0-SNAPSHOT 2) org.apache.struts:struts2-osgi-demo-bundle:jar:2.2.0-SNAPSHOT -- 2 required artifacts are missing. for artifact: org.apache.struts:struts2-assembly:pom:2.2.0-SNAPSHOT from the specified remote repositories: apache.snapshots (http://people.apache.org/repo/m2-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
svn commit: r911398 - in /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher: ApplicationMap.java RequestMap.java SessionMap.java
Author: lukaszlenart
Date: Thu Feb 18 13:45:08 2010
New Revision: 911398
URL: http://svn.apache.org/viewvc?rev=911398&view=rev
Log:
Solved WW-3385 - proper implementation of put() method to reflect Map interface
specification
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ApplicationMap.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/RequestMap.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/SessionMap.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ApplicationMap.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ApplicationMap.java?rev=911398&r1=911397&r2=911398&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ApplicationMap.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ApplicationMap.java
Thu Feb 18 13:45:08 2010
@@ -21,6 +21,7 @@
package org.apache.struts2.dispatcher;
+import javax.servlet.ServletContext;
import java.io.Serializable;
import java.util.AbstractMap;
import java.util.Enumeration;
@@ -28,15 +29,12 @@
import java.util.Map;
import java.util.Set;
-import javax.servlet.ServletContext;
-
/**
* A simple implementation of the {...@link java.util.Map} interface to handle
a collection of attributes and
* init parameters in a {...@link javax.servlet.ServletContext} object. The
{...@link #entrySet()} method
* enumerates over all servlet context attributes and init parameters and
returns a collection of both.
* Note, this will occur lazily - only when the entry set is asked for.
- *
*/
public class ApplicationMap extends AbstractMap implements Serializable {
@@ -87,7 +85,7 @@
entries.add(new Map.Entry() {
public boolean equals(Object obj) {
if (!(obj instanceof Map.Entry)) {
- return false;
+return false;
}
Map.Entry entry = (Map.Entry) obj;
@@ -123,7 +121,7 @@
entries.add(new Map.Entry() {
public boolean equals(Object obj) {
if (!(obj instanceof Map.Entry)) {
- return false;
+return false;
}
Map.Entry entry = (Map.Entry) obj;
@@ -178,10 +176,10 @@
* @return the attribute that was just set.
*/
public Object put(Object key, Object value) {
+Object oldValue = get(key);
entries = null;
context.setAttribute(key.toString(), value);
-
-return get(key);
+return oldValue;
}
/**
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/RequestMap.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/RequestMap.java?rev=911398&r1=911397&r2=911398&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/RequestMap.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/RequestMap.java
Thu Feb 18 13:45:08 2010
@@ -21,14 +21,13 @@
package org.apache.struts2.dispatcher;
+import javax.servlet.http.HttpServletRequest;
import java.io.Serializable;
import java.util.AbstractMap;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.Set;
-import javax.servlet.http.HttpServletRequest;
-
/**
* A simple implementation of the {...@link java.util.Map} interface to handle
a collection of request attributes.
@@ -81,7 +80,7 @@
entries.add(new Entry() {
public boolean equals(Object obj) {
if (!(obj instanceof Entry)) {
- return false;
+return false;
}
Entry entry = (Entry) obj;
@@ -130,10 +129,10 @@
* @return the object that was just set.
*/
public Object put(Object key, Object value) {
+Object oldValue = get(key);
entries = null;
request.setAttribute(key.toString(), value);
-
-return get(key);
+return oldValue;
}
/**
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/SessionMap.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/SessionMap.java?rev=911398&r1=911397&r2=911398&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/SessionMap.java
(original)
+
[OSS Bamboo] Struts 2 SVN - Main Build build 1265 has FAILED (0 tests failed). Change made by lukaszlenart
--- STRUTS-MAIN-1265 failed. --- Code has been updated by lukaszlenart. No failed tests found, a possible compilation error. http://opensource.bamboo.atlassian.com/browse/STRUTS-MAIN-1265/ -- Code Changes -- lukaszlenart (911396): >Changed poms to reflect new directory structure after moving XWork-core inside >Struts 2 -- Error Summary -- [INFO] [ERROR] BUILD ERROR [INFO] [INFO] Failed to resolve artifact. Missing: -- 1) org.apache.struts:struts2-osgi-admin-bundle:jar:2.2.0-SNAPSHOT Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=org.apache.struts -DartifactId=struts2-osgi-admin-bundle -Dversion=2.2.0-SNAPSHOT -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=org.apache.struts -DartifactId=struts2-osgi-admin-bundle -Dversion=2.2.0-SNAPSHOT -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] Path to dependency: 1) org.apache.struts:struts2-assembly:pom:2.2.0-SNAPSHOT 2) org.apache.struts:struts2-osgi-admin-bundle:jar:2.2.0-SNAPSHOT 2) org.apache.struts:struts2-osgi-demo-bundle:jar:2.2.0-SNAPSHOT Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=org.apache.struts -DartifactId=struts2-osgi-demo-bundle -Dversion=2.2.0-SNAPSHOT -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=org.apache.struts -DartifactId=struts2-osgi-demo-bundle -Dversion=2.2.0-SNAPSHOT -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] Path to dependency: 1) org.apache.struts:struts2-assembly:pom:2.2.0-SNAPSHOT 2) org.apache.struts:struts2-osgi-demo-bundle:jar:2.2.0-SNAPSHOT -- 2 required artifacts are missing. for artifact: org.apache.struts:struts2-assembly:pom:2.2.0-SNAPSHOT from the specified remote repositories: apache.snapshots (http://people.apache.org/repo/m2-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
svn commit: r911403 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
Author: lukaszlenart
Date: Thu Feb 18 13:52:47 2010
New Revision: 911403
URL: http://svn.apache.org/viewvc?rev=911403&view=rev
Log:
Solved WW-3355 - handling empty action extensiomn in proper way
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
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=911403&r1=911402&r2=911403&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
Thu Feb 18 13:52:47 2010
@@ -21,67 +21,71 @@
package org.apache.struts2.dispatcher.mapper;
-import java.util.*;
-
-import javax.servlet.http.HttpServletRequest;
-
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.config.Configuration;
+import com.opensymphony.xwork2.config.ConfigurationManager;
+import com.opensymphony.xwork2.config.entities.PackageConfig;
+import com.opensymphony.xwork2.inject.Container;
+import com.opensymphony.xwork2.inject.Inject;
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;
-import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.inject.Container;
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
/**
*
- *
+ *
* Default action mapper implementation, using the standard *.[ext] (where ext
* usually "action") pattern. The extension is looked up from the Struts
* configuration key struts.action.extension.
- *
+ *
* To help with dealing with buttons and other related requirements, this
* mapper (and other {...@link ActionMapper}s, we hope) has the ability to
name a
* button with some predefined prefix and have that button name alter the
* execution behaviour. The four prefixes are:
- *
+ *
*
- *
+ *
* Method prefix - method:default
- *
+ *
* Action prefix - action:dashboard
- *
+ *
* Redirect prefix - redirect:cancel.jsp
- *
+ *
* Redirect-action prefix - redirectAction:cancel
- *
+ *
*
- *
+ *
* In addition to these four prefixes, this mapper also understands the
* action naming pattern of foo!bar in either the extension form (eg:
* foo!bar.action) or in the prefix form (eg: action:foo!bar). This syntax
tells
* this mapper to map to the action named foo and the method bar.
- *
+ *
*
- *
+ *
* Method Prefix
- *
+ *
*
- *
+ *
* With method-prefix, instead of calling baz action's execute() method (by
* default if it isn't overriden in struts.xml to be something else), the baz
* action's anotherMethod() will be called. A very elegant way determine which
* button is clicked. Alternatively, one would have submit button set a
* particular value on the action when clicked, and the execute() method
decides
* on what to do with the setted value depending on which button is clicked.
- *
+ *
*
- *
+ *
*
*
*
@@ -91,18 +95,18 @@
*
*
*
- *
+ *
* Action prefix
- *
+ *
*
- *
+ *
* With action-prefix, instead of executing baz action's execute() method (by
* default if it isn't overriden in struts.xml to be something else), the
* anotherAction action's execute() method (assuming again if it isn't
overriden
* with something else in struts.xml) will be executed.
- *
+ *
*
- *
+ *
*
*
*
@@ -112,18 +116,18 @@
*
*
*
- *
+ *
* Redirect prefix
- *
+ *
*
- *
+ *
* With redirect-prefix, instead of executing baz action's execute() method (by
* default it isn't overriden in struts.xml to be something else), it will get
* redirected to, in this case to www.google.com. Internally it uses
* ServletRedirectResult to do the task.
- *
+ *
*
- *
+ *
*
*
*
@@ -133,19 +137,19 @@
*
*
[OSS Bamboo] Struts 2 SVN - Main Build (Java 6) build 1030 has FAILED (0 tests failed). Change made by lukaszlenart
--- STRUTS-MAINJ6-1030 failed. --- Code has been updated by lukaszlenart. No failed tests found, a possible compilation error. http://opensource.bamboo.atlassian.com/browse/STRUTS-MAINJ6-1030/ -- Code Changes -- lukaszlenart (911403): >Solved WW-3355 - handling empty action extensiomn in proper way lukaszlenart (911398): >Solved WW-3385 - proper implementation of put() method to reflect Map >interface specification -- Error Summary -- [INFO] [ERROR] BUILD ERROR [INFO] [INFO] Failed to resolve artifact. Missing: -- 1) org.apache.struts:struts2-osgi-admin-bundle:jar:2.2.0-SNAPSHOT Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=org.apache.struts -DartifactId=struts2-osgi-admin-bundle -Dversion=2.2.0-SNAPSHOT -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=org.apache.struts -DartifactId=struts2-osgi-admin-bundle -Dversion=2.2.0-SNAPSHOT -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] Path to dependency: 1) org.apache.struts:struts2-assembly:pom:2.2.0-SNAPSHOT 2) org.apache.struts:struts2-osgi-admin-bundle:jar:2.2.0-SNAPSHOT 2) org.apache.struts:struts2-osgi-demo-bundle:jar:2.2.0-SNAPSHOT Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=org.apache.struts -DartifactId=struts2-osgi-demo-bundle -Dversion=2.2.0-SNAPSHOT -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=org.apache.struts -DartifactId=struts2-osgi-demo-bundle -Dversion=2.2.0-SNAPSHOT -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] Path to dependency: 1) org.apache.struts:struts2-assembly:pom:2.2.0-SNAPSHOT 2) org.apache.struts:struts2-osgi-demo-bundle:jar:2.2.0-SNAPSHOT -- 2 required artifacts are missing. for artifact: org.apache.struts:struts2-assembly:pom:2.2.0-SNAPSHOT from the specified remote repositories: apache.snapshots (http://people.apache.org/repo/m2-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 1266 has FAILED (0 tests failed). Change made by lukaszlenart
--- STRUTS-MAIN-1266 failed. --- Code has been updated by lukaszlenart. No failed tests found, a possible compilation error. http://opensource.bamboo.atlassian.com/browse/STRUTS-MAIN-1266/ -- Code Changes -- lukaszlenart (911403): >Solved WW-3355 - handling empty action extensiomn in proper way lukaszlenart (911398): >Solved WW-3385 - proper implementation of put() method to reflect Map >interface specification -- Error Summary -- [INFO] [ERROR] BUILD ERROR [INFO] [INFO] Failed to resolve artifact. Missing: -- 1) org.apache.struts:struts2-osgi-admin-bundle:jar:2.2.0-SNAPSHOT Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=org.apache.struts -DartifactId=struts2-osgi-admin-bundle -Dversion=2.2.0-SNAPSHOT -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=org.apache.struts -DartifactId=struts2-osgi-admin-bundle -Dversion=2.2.0-SNAPSHOT -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] Path to dependency: 1) org.apache.struts:struts2-assembly:pom:2.2.0-SNAPSHOT 2) org.apache.struts:struts2-osgi-admin-bundle:jar:2.2.0-SNAPSHOT 2) org.apache.struts:struts2-osgi-demo-bundle:jar:2.2.0-SNAPSHOT Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=org.apache.struts -DartifactId=struts2-osgi-demo-bundle -Dversion=2.2.0-SNAPSHOT -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=org.apache.struts -DartifactId=struts2-osgi-demo-bundle -Dversion=2.2.0-SNAPSHOT -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] Path to dependency: 1) org.apache.struts:struts2-assembly:pom:2.2.0-SNAPSHOT 2) org.apache.struts:struts2-osgi-demo-bundle:jar:2.2.0-SNAPSHOT -- 2 required artifacts are missing. for artifact: org.apache.struts:struts2-assembly:pom:2.2.0-SNAPSHOT from the specified remote repositories: apache.snapshots (http://people.apache.org/repo/m2-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
[CONF] Confluence Changes in the last 24 hours
This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache ActiveMQ (http://cwiki.apache.org/confluence/display/ACTIVEMQ) Pages - Examples edited by bsnyder (05:25 PM) http://cwiki.apache.org/confluence/display/ACTIVEMQ/Examples Apache Camel (http://cwiki.apache.org/confluence/display/CAMEL) Pages - Mail edited by tjsnell (03:01 PM) http://cwiki.apache.org/confluence/display/CAMEL/Mail SEDA edited by davsclaus (02:03 PM) http://cwiki.apache.org/confluence/display/CAMEL/SEDA Camel 2.3.0 Release edited by davsclaus (02:02 PM) http://cwiki.apache.org/confluence/display/CAMEL/Camel+2.3.0+Release Camel 2.3 - Overhaul of Aggregator EIP edited by davsclaus (11:39 AM) http://cwiki.apache.org/confluence/display/CAMEL/Camel+2.3+-+Overhaul+of+Aggregator+EIP Aggregator2 edited by davsclaus (11:35 AM) http://cwiki.apache.org/confluence/display/CAMEL/Aggregator2 NotifyBuilder edited by davsclaus (07:56 AM) http://cwiki.apache.org/confluence/display/CAMEL/NotifyBuilder Apache Continuum (http://cwiki.apache.org/confluence/display/CONTINUUM) Pages - Build Environment Selection During Release edited by jzurbano (01:36 PM) http://cwiki.apache.org/confluence/display/CONTINUUM/Build+Environment+Selection+During+Release Apache Felix (http://cwiki.apache.org/confluence/display/FELIX) Pages - news edited by karlpauls (10:06 PM) http://cwiki.apache.org/confluence/display/FELIX/news downloads edited by karlpauls (10:04 PM) http://cwiki.apache.org/confluence/display/FELIX/downloads Apache Felix Framework OSGi TCK Results edited by he...@ungoverned.org (08:04 AM) http://cwiki.apache.org/confluence/display/FELIX/Apache+Felix+Framework+OSGi+TCK+Results Using the OSGi Compliance Tests edited by he...@ungoverned.org (08:02 AM) http://cwiki.apache.org/confluence/display/FELIX/Using+the+OSGi+Compliance+Tests OFBiz Project Administration Workspace (http://cwiki.apache.org/confluence/display/OFBADMIN) Pages - Apache OFBiz PMC Members and Committers edited by jonesde (04:48 PM) http://cwiki.apache.org/confluence/display/OFBADMIN/Apache+OFBiz+PMC+Members+and+Committers Apache Sling Website (http://cwiki.apache.org/confluence/display/SLINGxSITE) Pages - Project Team edited by justinedelson (11:11 PM) http://cwiki.apache.org/confluence/display/SLINGxSITE/Project+Team Content Loading (jcr.contentloader) edited by justinedelson (03:18 PM) http://cwiki.apache.org/confluence/display/SLINGxSITE/Content+Loading+%28jcr.contentloader%29 Maven Launchpad Plugin edited by justinedelson (04:18 AM) http://cwiki.apache.org/confluence/display/SLINGxSITE/Maven+Launchpad+Plugin Test Space (http://cwiki.apache.org/confluence/display/test) Pages - OpenJPAEclipseEnhancementBuilder created by vorburger (03:18 PM) http://cwiki.apache.org/confluence/display/test/OpenJPAEclipseEnhancementBuilder OpenJPAEclipseToolingDevAndBuild created by vorburger (04:35 PM) http://cwiki.apache.org/confluence/display/test/OpenJPAEclipseToolingDevAndBuild OpenJPAEclipseInstallation created by vorburger (02:37 PM) http://cwiki.apache.org/confluence/display/test/OpenJPAEclipseInstallation OpenJPA Eclipse Tooling created by vorburger (02:28 PM) http://cwiki.apache.org/confluence/display/test/OpenJPA+Eclipse+Tooling Apache Wicket (http://cwiki.apache.org/confluence/display/WICKET) Pages - Exception handling in Wicket created by knifesheep (02:35 AM) http://cwiki.apache.org/confluence/display/WICKET/Exception+handling+in+Wicket Apache Wookie (http://cwiki.apache.org/confluence/display/WOOKIE) Pages - Downloading and Installing Wookie edited by scottbw (07:23 PM) http://cwiki.apache.org/confluence/display/WOOKIE/Downloading+and+Installing+Wookie Index edited by bernhard.ho...@wu.ac.at (01:08 PM) http://cwiki.apache.org/confluence/display/WOOKIE/Index Change your notification preferences: http://cwiki.apache.org/confluence/users/viewnotifications.action
