[CONF] Confluence Changes in the last 24 hours

2009-01-03 Thread confluence
-
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
 |-- Privacy Policy was created by chirino (09:08 AM).
 |   http://cwiki.apache.org/confluence/display/CAMEL/Privacy+Policy
 |-- FTP was last edited by davsclaus (07:29 AM).
 |   http://cwiki.apache.org/confluence/display/CAMEL/FTP
 |-- File was last edited by davsclaus (07:28 AM).
 |   http://cwiki.apache.org/confluence/display/CAMEL/File
 |-- Splitter was last edited by janstey (07:25 AM).
 |   http://cwiki.apache.org/confluence/display/CAMEL/Splitter

Apache ActiveMQ NMS (NMS) http://cwiki.apache.org/confluence/display/NMS
|
|-Pages Added or Edited in This Space
 |-- Privacy Policy was created by chirino (09:09 AM).
 |   http://cwiki.apache.org/confluence/display/NMS/Privacy+Policy

Apache ActiveMQ (ACTIVEMQ) http://cwiki.apache.org/confluence/display/ACTIVEMQ
|
|-Pages Added or Edited in This Space
 |-- Privacy Policy was created by chirino (09:06 AM).
 |   http://cwiki.apache.org/confluence/display/ACTIVEMQ/Privacy+Policy

Apache ActiveMQ CPP (AMQCPP) http://cwiki.apache.org/confluence/display/AMQCPP
|
|-Pages Added or Edited in This Space
 |-- Privacy Policy was created by chirino (09:10 AM).
 |   http://cwiki.apache.org/confluence/display/AMQCPP/Privacy+Policy

Apache Struts 2 Documentation (WW) http://cwiki.apache.org/confluence/display/WW
|
|-Pages Added or Edited in This Space
 |-- Version Notes 2.1.5 was created by musachy (07:06 AM).
 |   http://cwiki.apache.org/confluence/display/WW/Version+Notes+2.1.5
 |-- Migration Guide was last edited by musachy (07:04 AM).
 |   http://cwiki.apache.org/confluence/display/WW/Migration+Guide

Apache CXF (CXF) http://cwiki.apache.org/confluence/display/CXF
|
|-Pages Added or Edited in This Space
 |-- Distributed OSGi was last edited by dav...@apache.org (07:57 AM).
 |   http://cwiki.apache.org/confluence/display/CXF/Distributed+OSGi

Apache Tuscany (TUSCANY) http://cwiki.apache.org/confluence/display/TUSCANY
|
|-Pages Added or Edited in This Space
 |-- SCA Java Web Applications was created by ant (02:49 AM).
 |   
http://cwiki.apache.org/confluence/display/TUSCANY/SCA+Java+Web+Applications


-
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: r731023 - /struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java

2009-01-03 Thread musachy
Author: musachy
Date: Sat Jan  3 08:58:42 2009
New Revision: 731023

URL: http://svn.apache.org/viewvc?rev=731023&view=rev
Log:
Remove annoying warning

Modified:

struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.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=731023&r1=731022&r2=731023&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
 Sat Jan  3 08:58:42 2009
@@ -398,9 +398,6 @@
 if (!params.containsKey(defaultParamName)) {
 params.put(defaultParamName, info.location);
 }
-} else if (LOG.isWarnEnabled()){
-LOG.warn("Result [#0] for action class [#1] is missing the 
location", info.name,
-actionClass.getSimpleName());
 }
 
 return new ResultConfig.Builder(info.name, 
resultTypeConfig.getClassName()).addParams(params).build();




[OSS Bamboo] Struts 2 SVN - Main Build (Java 6) build 707 has FAILED (0 tests failed). Change made by Musachy Barroso

2009-01-03 Thread bamboo
---
STRUTS-MAINJ6-707 failed.
---
Code has been updated by Musachy Barroso.
No failed tests found, a possible compilation error.

http://opensource.bamboo.atlassian.com/browse/STRUTS-MAINJ6-707/


--
Code Changes
--
Musachy Barroso (731023):

>Remove annoying warning


--
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=org.apache.struts 
-DartifactId=struts2-showcase -Dversion=2.1.6-SNAPSHOT -Dpackaging=war 
-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-showcase -Dversion=2.1.6-SNAPSHOT -Dpackaging=war 
-Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]
   
   
     org.apache.struts:struts2-showcase:war:2.1.6-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 1002 has FAILED (0 tests failed). Change made by Musachy Barroso

2009-01-03 Thread bamboo
---
STRUTS-MAIN-1002 failed.
---
Code has been updated by Musachy Barroso.
No failed tests found, a possible compilation error.

http://opensource.bamboo.atlassian.com/browse/STRUTS-MAIN-1002/


--
Code Changes
--
Musachy Barroso (731023):

>Remove annoying warning


--
Error Summary
--
   [INFO] 

   [ERROR] BUILD ERROR
   [INFO] 

   [INFO] Failed to resolve artifact.
   
   GroupId: org.apache.struts
   ArtifactId: struts2-showcase
   Version: 2.1.6-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=org.apache.struts 
-DartifactId=struts2-showcase -Dversion=2.1.6-SNAPSHOT -Dpackaging=war 
-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-showcase -Dversion=2.1.6-SNAPSHOT -Dpackaging=war 
-Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]
   
   
     org.apache.struts:struts2-showcase:war:2.1.6-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: r731031 - /struts/struts2/trunk/plugins/struts1/pom.xml

2009-01-03 Thread musachy
Author: musachy
Date: Sat Jan  3 09:25:10 2009
New Revision: 731031

URL: http://svn.apache.org/viewvc?rev=731031&view=rev
Log:
WW-2946 Update struts 1 dependency to 1.3.10

Modified:
struts/struts2/trunk/plugins/struts1/pom.xml

Modified: struts/struts2/trunk/plugins/struts1/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/struts1/pom.xml?rev=731031&r1=731030&r2=731031&view=diff
==
--- struts/struts2/trunk/plugins/struts1/pom.xml (original)
+++ struts/struts2/trunk/plugins/struts1/pom.xml Sat Jan  3 09:25:10 2009
@@ -43,7 +43,7 @@
 
 org.apache.struts
 struts-core
-1.3.9
+1.3.10
 
 
 ${pom.groupId}




[OSS Bamboo] Struts 2 SVN - Main Build build 1003 has FAILED (0 tests failed). Change made by Musachy Barroso

2009-01-03 Thread bamboo
---
STRUTS-MAIN-1003 failed.
---
Code has been updated by Musachy Barroso.
No failed tests found, a possible compilation error.

http://opensource.bamboo.atlassian.com/browse/STRUTS-MAIN-1003/


--
Code Changes
--
Musachy Barroso (731031):

>WW-2946 Update struts 1 dependency to 1.3.10


--
Error Summary
--
   [INFO] 

   [ERROR] BUILD ERROR
   [INFO] 

   [INFO] Failed to resolve artifact.
   
   GroupId: org.apache.struts
   ArtifactId: struts2-showcase
   Version: 2.1.6-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=org.apache.struts 
-DartifactId=struts2-showcase -Dversion=2.1.6-SNAPSHOT -Dpackaging=war 
-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-showcase -Dversion=2.1.6-SNAPSHOT -Dpackaging=war 
-Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]
   
   
     org.apache.struts:struts2-showcase:war:2.1.6-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 708 has FAILED (0 tests failed). Change made by Musachy Barroso

2009-01-03 Thread bamboo
---
STRUTS-MAINJ6-708 failed.
---
Code has been updated by Musachy Barroso.
No failed tests found, a possible compilation error.

http://opensource.bamboo.atlassian.com/browse/STRUTS-MAINJ6-708/


--
Code Changes
--
Musachy Barroso (731031):

>WW-2946 Update struts 1 dependency to 1.3.10


--
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=org.apache.struts 
-DartifactId=struts2-showcase -Dversion=2.1.6-SNAPSHOT -Dpackaging=war 
-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-showcase -Dversion=2.1.6-SNAPSHOT -Dpackaging=war 
-Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]
   
   
     org.apache.struts:struts2-showcase:war:2.1.6-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



svn commit: r731063 - in /struts/struts2/trunk/plugins/convention/src/main: java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java resources/struts-plugin.xml resources/struts.propert

2009-01-03 Thread musachy
Author: musachy
Date: Sat Jan  3 10:59:19 2009
New Revision: 731063

URL: http://svn.apache.org/viewvc?rev=731063&view=rev
Log:
WW-2947 Remove convention's "excludeJars" and add "includeJars" instead

Removed:
struts/struts2/trunk/plugins/convention/src/main/resources/struts.properties
Modified:

struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
struts/struts2/trunk/plugins/convention/src/main/resources/struts-plugin.xml

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=731063&r1=731062&r2=731063&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
 Sat Jan  3 10:59:19 2009
@@ -31,6 +31,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.regex.Pattern;
 import java.net.URL;
 
 import org.apache.struts2.convention.annotation.Action;
@@ -60,6 +61,7 @@
 import com.opensymphony.xwork2.util.logging.Logger;
 import com.opensymphony.xwork2.util.logging.LoggerFactory;
 import com.opensymphony.xwork2.util.FileManager;
+import com.opensymphony.xwork2.util.TextUtils;
 
 /**
  * 
@@ -78,7 +80,7 @@
 private String[] actionPackages;
 private String[] excludePackages;
 private String[] packageLocators;
-private String[] excludeJars;
+private String[] includeJars;
 private String packageLocatorsBasePackage;
 private boolean disableJarScanning = true;
 private boolean disableActionScanning = false;
@@ -149,12 +151,13 @@
 }
 
 /**
- * @param exlcudeJars Comma separated list of regular expressions of jars 
to be exluded.
+ * @param exlcudeJars Comma separated list of regular expressions of jars 
to be included.
  *Ignored if 
"struts.convention.action.disableJarScanning" is true
  */
-@Inject(value = "struts.convention.action.excludeJars", required = false)
-public void setExcludeJars(String excludeJars) {
-this.excludeJars = excludeJars.split("\\s*[,]\\s*");
+@Inject(value = "struts.convention.action.includeJars", required = false)
+public void setIncludeJars(String includeJars) {
+if (TextUtils.stringSet(includeJars))
+this.includeJars = includeJars.split("\\s*[,]\\s*");
 }
 
 /**
@@ -335,12 +338,24 @@
 urlSet = urlSet.excludePaths(System.getProperty("sun.boot.class.path", 
""));
 urlSet = urlSet.exclude(".*/JavaVM.framework/.*");
 
-if (disableJarScanning) {
+if (disableJarScanning || includeJars == null) {
 urlSet = urlSet.exclude(".*?jar(!/)?");
-} else if (excludeJars != null) {
-for (String pattern : excludeJars) {
-urlSet = urlSet.exclude(pattern.trim());
+} else if (includeJars != null) {
+//TODO: add this functionality to UrlSet in xwork for next release
+
+List rawIncludedUrls = urlSet.getUrls();
+Set includeUrls = new HashSet();
+for (URL url : rawIncludedUrls) {
+//check if the url matches one of the "includeJars"
+for (String includeJar : includeJars) {
+if (Pattern.matches(includeJar, url.toExternalForm())) {
+includeUrls.add(url);
+break;
+}
+}
 }
+
+return new UrlSet(includeUrls);
 }
 
 return urlSet;

Modified: 
struts/struts2/trunk/plugins/convention/src/main/resources/struts-plugin.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/convention/src/main/resources/struts-plugin.xml?rev=731063&r1=731062&r2=731063&view=diff
==
--- 
struts/struts2/trunk/plugins/convention/src/main/resources/struts-plugin.xml 
(original)
+++ 
struts/struts2/trunk/plugins/convention/src/main/resources/struts-plugin.xml 
Sat Jan  3 10:59:19 2009
@@ -55,6 +55,7 @@
   
   
   
+
 
 
 




[OSS Bamboo] Struts 2 SVN - Main Build build 1004 has FAILED (0 tests failed). Change made by Musachy Barroso

2009-01-03 Thread bamboo
---
STRUTS-MAIN-1004 failed.
---
Code has been updated by Musachy Barroso.
No failed tests found, a possible compilation error.

http://opensource.bamboo.atlassian.com/browse/STRUTS-MAIN-1004/


--
Code Changes
--
Musachy Barroso (731063):

>WW-2947 Remove convention's "excludeJars" and add "includeJars" instead


--
Error Summary
--
   [INFO] 

   [ERROR] BUILD ERROR
   [INFO] 

   [INFO] Failed to resolve artifact.
   
   GroupId: org.apache.struts
   ArtifactId: struts2-showcase
   Version: 2.1.6-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=org.apache.struts 
-DartifactId=struts2-showcase -Dversion=2.1.6-SNAPSHOT -Dpackaging=war 
-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-showcase -Dversion=2.1.6-SNAPSHOT -Dpackaging=war 
-Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]
   
   
     org.apache.struts:struts2-showcase:war:2.1.6-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 709 has FAILED (0 tests failed). Change made by Musachy Barroso

2009-01-03 Thread bamboo
---
STRUTS-MAINJ6-709 failed.
---
Code has been updated by Musachy Barroso.
No failed tests found, a possible compilation error.

http://opensource.bamboo.atlassian.com/browse/STRUTS-MAINJ6-709/


--
Code Changes
--
Musachy Barroso (731063):

>WW-2947 Remove convention's "excludeJars" and add "includeJars" instead


--
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=org.apache.struts 
-DartifactId=struts2-showcase -Dversion=2.1.6-SNAPSHOT -Dpackaging=war 
-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-showcase -Dversion=2.1.6-SNAPSHOT -Dpackaging=war 
-Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]
   
   
     org.apache.struts:struts2-showcase:war:2.1.6-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



svn commit: r731070 - in /struts/struts2/trunk/plugins/convention/src: main/java/org/apache/struts2/convention/ main/resources/ test/java/org/apache/struts2/convention/

2009-01-03 Thread musachy
Author: musachy
Date: Sat Jan  3 11:36:36 2009
New Revision: 731070

URL: http://svn.apache.org/viewvc?rev=731070&view=rev
Log:
WW-2947 Remove convention's "excludeJars" and add "includeJars" instead

Modified:

struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
struts/struts2/trunk/plugins/convention/src/main/resources/struts-plugin.xml

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/PackageBasedActionConfigBuilder.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java?rev=731070&r1=731069&r2=731070&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
 Sat Jan  3 11:36:36 2009
@@ -82,7 +82,6 @@
 private String[] packageLocators;
 private String[] includeJars;
 private String packageLocatorsBasePackage;
-private boolean disableJarScanning = true;
 private boolean disableActionScanning = false;
 private boolean disablePackageLocatorsScanning = false;
 private String actionSuffix = "Action";
@@ -161,14 +160,6 @@
 }
 
 /**
- * @param disableJarScanning Disable scanning jar files for actions
- */
-@Inject(value = "struts.convention.action.disableJarScanning", required = 
false)
-public void setDisableJarScanning(String disableJarScanning) {
-this.disableJarScanning = "true".equals(disableJarScanning);
-}
-
-/**
  * @param disableActionScanning If set to true, only the named packages 
will be scanned
  */
 @Inject(value = "struts.convention.package.locators.disable", required = 
false)
@@ -338,20 +329,26 @@
 urlSet = urlSet.excludePaths(System.getProperty("sun.boot.class.path", 
""));
 urlSet = urlSet.exclude(".*/JavaVM.framework/.*");
 
-if (disableJarScanning || includeJars == null) {
+if (includeJars == null) {
 urlSet = urlSet.exclude(".*?jar(!/)?");
-} else if (includeJars != null) {
+} else {
+//jar urls regexes were specified
 //TODO: add this functionality to UrlSet in xwork for next release
-
 List rawIncludedUrls = urlSet.getUrls();
 Set includeUrls = new HashSet();
+
 for (URL url : rawIncludedUrls) {
-//check if the url matches one of the "includeJars"
-for (String includeJar : includeJars) {
-if (Pattern.matches(includeJar, url.toExternalForm())) {
-includeUrls.add(url);
-break;
+if ("jar".equalsIgnoreCase(url.getProtocol())) {
+//it is a jar file, make sure it macthes at least a url 
regex
+for (String includeJar : includeJars) {
+if (Pattern.matches(includeJar, url.toExternalForm())) 
{
+includeUrls.add(url);
+break;
+}
 }
+} else {
+//it is not a jar
+includeUrls.add(url);
 }
 }
 

Modified: 
struts/struts2/trunk/plugins/convention/src/main/resources/struts-plugin.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/convention/src/main/resources/struts-plugin.xml?rev=731070&r1=731069&r2=731070&view=diff
==
--- 
struts/struts2/trunk/plugins/convention/src/main/resources/struts-plugin.xml 
(original)
+++ 
struts/struts2/trunk/plugins/convention/src/main/resources/struts-plugin.xml 
Sat Jan  3 11:36:36 2009
@@ -42,7 +42,6 @@
   
   
   
-  
   
   
   

Modified: 
struts/struts2/trunk/plugins/convention/src/test/java/org/apache/struts2/convention/PackageBasedActionConfigBuilderTest.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/convention/src/test/java/org/apache/struts2/convention/PackageBasedActionConfigBuilderTest.java?rev=731070&r1=731069&r2=731070&view=diff
==
--- 
struts/struts2/trunk/plugins/convention/src/test/java/org/apache/struts2/convention/PackageBasedActionConfigBuilderTest.java
 (original)
+++ 
struts/struts2/trunk/plugins/convention/src/test/java/org/apache/struts2/convention/PackageBasedActionConfigBuilderTest.java
 Sat Jan  3 11:36:36 2009
@@ -279,7 +279,6 @@
 interceptorBuilder.setCon

[OSS Bamboo] Struts 2 SVN - Main Build (Java 6) build 710 has FAILED (0 tests failed). Change made by Musachy Barroso

2009-01-03 Thread bamboo
---
STRUTS-MAINJ6-710 failed.
---
Code has been updated by Musachy Barroso.
No failed tests found, a possible compilation error.

http://opensource.bamboo.atlassian.com/browse/STRUTS-MAINJ6-710/


--
Code Changes
--
Musachy Barroso (731070):

>WW-2947 Remove convention's "excludeJars" and add "includeJars" instead


--
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=org.apache.struts 
-DartifactId=struts2-showcase -Dversion=2.1.6-SNAPSHOT -Dpackaging=war 
-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-showcase -Dversion=2.1.6-SNAPSHOT -Dpackaging=war 
-Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]
   
   
     org.apache.struts:struts2-showcase:war:2.1.6-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 1005 has FAILED (0 tests failed). Change made by Musachy Barroso

2009-01-03 Thread bamboo
---
STRUTS-MAIN-1005 failed.
---
Code has been updated by Musachy Barroso.
No failed tests found, a possible compilation error.

http://opensource.bamboo.atlassian.com/browse/STRUTS-MAIN-1005/


--
Code Changes
--
Musachy Barroso (731070):

>WW-2947 Remove convention's "excludeJars" and add "includeJars" instead


--
Error Summary
--
   [INFO] 

   [ERROR] BUILD ERROR
   [INFO] 

   [INFO] Failed to resolve artifact.
   
   GroupId: org.apache.struts
   ArtifactId: struts2-showcase
   Version: 2.1.6-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=org.apache.struts 
-DartifactId=struts2-showcase -Dversion=2.1.6-SNAPSHOT -Dpackaging=war 
-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-showcase -Dversion=2.1.6-SNAPSHOT -Dpackaging=war 
-Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]
   
   
     org.apache.struts:struts2-showcase:war:2.1.6-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: r731124 - /struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java

2009-01-03 Thread jeromy
Author: jeromy
Date: Sat Jan  3 15:15:34 2009
New Revision: 731124

URL: http://svn.apache.org/viewvc?rev=731124&view=rev
Log:
WW-2947 added LOG.warn()'s for includeJars patterns that fail to match any jars


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=731124&r1=731123&r2=731124&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
 Sat Jan  3 15:15:34 2009
@@ -150,8 +150,7 @@
 }
 
 /**
- * @param exlcudeJars Comma separated list of regular expressions of jars 
to be included.
- *Ignored if 
"struts.convention.action.disableJarScanning" is true
+ * @param includeJars Comma separated list of regular expressions of jars 
to be included. 
  */
 @Inject(value = "struts.convention.action.includeJars", required = false)
 public void setIncludeJars(String includeJars) {
@@ -336,13 +335,16 @@
 //TODO: add this functionality to UrlSet in xwork for next release
 List rawIncludedUrls = urlSet.getUrls();
 Set includeUrls = new HashSet();
+boolean[] patternUsed = new boolean[includeJars.length];
 
 for (URL url : rawIncludedUrls) {
 if ("jar".equalsIgnoreCase(url.getProtocol())) {
 //it is a jar file, make sure it macthes at least a url 
regex
-for (String includeJar : includeJars) {
+for (int i = 0; i < includeJars.length; i++) {
+String includeJar = includeJars[i];
 if (Pattern.matches(includeJar, url.toExternalForm())) 
{
 includeUrls.add(url);
+patternUsed[i] = true;
 break;
 }
 }
@@ -352,6 +354,13 @@
 }
 }
 
+if (LOG.isWarnEnabled()) {
+for (int i = 0; i < patternUsed.length; i++) {
+if (!patternUsed[i]) {
+LOG.warn("The includeJars pattern 
\""+includeJars[i]+"\" did not match any jars in the classpath");
+}
+}
+}
 return new UrlSet(includeUrls);
 }
 




[OSS Bamboo] Struts 2 SVN - Main Build build 1006 has FAILED (0 tests failed). Change made by jeromy

2009-01-03 Thread bamboo
---
STRUTS-MAIN-1006 failed.
---
Code has been updated by jeromy.
No failed tests found, a possible compilation error.

http://opensource.bamboo.atlassian.com/browse/STRUTS-MAIN-1006/


--
Code Changes
--
jeromy (731124):

>WW-2947 added LOG.warn()'s for includeJars patterns that fail to match any jars
>
>


--
Error Summary
--
   [INFO] 

   [ERROR] BUILD ERROR
   [INFO] 

   [INFO] Failed to resolve artifact.
   
   GroupId: org.apache.struts
   ArtifactId: struts2-showcase
   Version: 2.1.6-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=org.apache.struts 
-DartifactId=struts2-showcase -Dversion=2.1.6-SNAPSHOT -Dpackaging=war 
-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-showcase -Dversion=2.1.6-SNAPSHOT -Dpackaging=war 
-Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]
   
   
     org.apache.struts:struts2-showcase:war:2.1.6-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 711 has FAILED (0 tests failed). Change made by jeromy

2009-01-03 Thread bamboo
---
STRUTS-MAINJ6-711 failed.
---
Code has been updated by jeromy.
No failed tests found, a possible compilation error.

http://opensource.bamboo.atlassian.com/browse/STRUTS-MAINJ6-711/


--
Code Changes
--
jeromy (731124):

>WW-2947 added LOG.warn()'s for includeJars patterns that fail to match any jars
>
>


--
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=org.apache.struts 
-DartifactId=struts2-showcase -Dversion=2.1.6-SNAPSHOT -Dpackaging=war 
-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-showcase -Dversion=2.1.6-SNAPSHOT -Dpackaging=war 
-Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]
   
   
     org.apache.struts:struts2-showcase:war:2.1.6-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



svn commit: r731127 - /struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java

2009-01-03 Thread musachy
Author: musachy
Date: Sat Jan  3 15:49:51 2009
New Revision: 731127

URL: http://svn.apache.org/viewvc?rev=731127&view=rev
Log:
Minor change to makig logging consistent

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=731127&r1=731126&r2=731127&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
 Sat Jan  3 15:49:51 2009
@@ -357,7 +357,7 @@
 if (LOG.isWarnEnabled()) {
 for (int i = 0; i < patternUsed.length; i++) {
 if (!patternUsed[i]) {
-LOG.warn("The includeJars pattern 
\""+includeJars[i]+"\" did not match any jars in the classpath");
+LOG.warn("The includeJars pattern [#0] did not match 
any jars in the classpath", includeJars[i]);
 }
 }
 }




[OSS Bamboo] Struts 2 SVN - Main Build (Java 6) build 712 has FAILED (0 tests failed). Change made by Musachy Barroso

2009-01-03 Thread bamboo
---
STRUTS-MAINJ6-712 failed.
---
Code has been updated by Musachy Barroso.
No failed tests found, a possible compilation error.

http://opensource.bamboo.atlassian.com/browse/STRUTS-MAINJ6-712/


--
Code Changes
--
Musachy Barroso (731127):

>Minor change to makig logging consistent


--
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=org.apache.struts 
-DartifactId=struts2-showcase -Dversion=2.1.6-SNAPSHOT -Dpackaging=war 
-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-showcase -Dversion=2.1.6-SNAPSHOT -Dpackaging=war 
-Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]
   
   
     org.apache.struts:struts2-showcase:war:2.1.6-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



svn commit: r731128 - /struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java

2009-01-03 Thread musachy
Author: musachy
Date: Sat Jan  3 15:58:12 2009
New Revision: 731128

URL: http://svn.apache.org/viewvc?rev=731128&view=rev
Log:
Remove comment

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=731128&r1=731127&r2=731128&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
 Sat Jan  3 15:58:12 2009
@@ -332,7 +332,6 @@
 urlSet = urlSet.exclude(".*?jar(!/)?");
 } else {
 //jar urls regexes were specified
-//TODO: add this functionality to UrlSet in xwork for next release
 List rawIncludedUrls = urlSet.getUrls();
 Set includeUrls = new HashSet();
 boolean[] patternUsed = new boolean[includeJars.length];




[OSS Bamboo] Struts 2 SVN - Main Build build 1007 has FAILED (0 tests failed). Change made by Musachy Barroso

2009-01-03 Thread bamboo
---
STRUTS-MAIN-1007 failed.
---
Code has been updated by Musachy Barroso.
No failed tests found, a possible compilation error.

http://opensource.bamboo.atlassian.com/browse/STRUTS-MAIN-1007/


--
Code Changes
--
Musachy Barroso (731128):

>Remove comment

Musachy Barroso (731127):

>Minor change to makig logging consistent


--
Error Summary
--
   [INFO] 

   [ERROR] BUILD ERROR
   [INFO] 

   [INFO] Failed to resolve artifact.
   
   GroupId: org.apache.struts
   ArtifactId: struts2-showcase
   Version: 2.1.6-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=org.apache.struts 
-DartifactId=struts2-showcase -Dversion=2.1.6-SNAPSHOT -Dpackaging=war 
-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-showcase -Dversion=2.1.6-SNAPSHOT -Dpackaging=war 
-Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]
   
   
     org.apache.struts:struts2-showcase:war:2.1.6-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 713 has FAILED (0 tests failed). Change made by Musachy Barroso

2009-01-03 Thread bamboo
---
STRUTS-MAINJ6-713 failed.
---
This build occured because it is a dependant of XWORK-MAIN-307.
No failed tests found, a possible compilation error.

http://opensource.bamboo.atlassian.com/browse/STRUTS-MAINJ6-713/


--
Code Changes
--
Musachy Barroso (731128):

>Remove comment


--
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=org.apache.struts 
-DartifactId=struts2-showcase -Dversion=2.1.6-SNAPSHOT -Dpackaging=war 
-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-showcase -Dversion=2.1.6-SNAPSHOT -Dpackaging=war 
-Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id]
   
   
     org.apache.struts:struts2-showcase:war:2.1.6-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