svn commit: r1053414 - /struts/struts2/trunk/src/site/site.xml

2010-12-28 Thread lukaszlenart
Author: lukaszlenart
Date: Tue Dec 28 19:43:30 2010
New Revision: 1053414

URL: http://svn.apache.org/viewvc?rev=1053414&view=rev
Log:
Proper url for JIRA

Modified:
struts/struts2/trunk/src/site/site.xml

Modified: struts/struts2/trunk/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/src/site/site.xml?rev=1053414&r1=1053413&r2=1053414&view=diff
==
--- struts/struts2/trunk/src/site/site.xml (original)
+++ struts/struts2/trunk/src/site/site.xml Tue Dec 28 19:43:30 2010
@@ -83,7 +83,7 @@
 />
 http://issues.apache.org/struts/";
+href="http://issues.apache.org/jira/";
 />
 

svn commit: r1053429 - in /struts/struts2/trunk: ./ apps/ apps/jboss-blank/ apps/mailreader/ assembly/ bundles/ core/ plugins/ plugins/convention/ plugins/rest/src/main/java/org/apache/struts2/rest/ p

2010-12-28 Thread lukaszlenart
Author: lukaszlenart
Date: Tue Dec 28 20:48:55 2010
New Revision: 1053429

URL: http://svn.apache.org/viewvc?rev=1053429&view=rev
Log:
Merges branch 2.2.1.1 back to trunk

Modified:
struts/struts2/trunk/   (props changed)
struts/struts2/trunk/apps/   (props changed)
struts/struts2/trunk/apps/jboss-blank/pom.xml
struts/struts2/trunk/apps/mailreader/pom.xml
struts/struts2/trunk/assembly/   (props changed)
struts/struts2/trunk/assembly/pom.xml
struts/struts2/trunk/bundles/   (props changed)
struts/struts2/trunk/core/pom.xml
struts/struts2/trunk/plugins/   (props changed)
struts/struts2/trunk/plugins/convention/pom.xml
struts/struts2/trunk/plugins/pom.xml

struts/struts2/trunk/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionMapper.java

struts/struts2/trunk/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionMapperTest.java
struts/struts2/trunk/pom.xml
struts/struts2/trunk/xwork-core/pom.xml
struts/struts2/trunk/xwork-core/test-output/   (props changed)

Propchange: struts/struts2/trunk/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Dec 28 20:48:55 2010
@@ -0,0 +1,2 @@
+/struts/struts2/branches/STRUTS_2_2_1_1:1037870-1053416
+/struts/struts2/tags/STRUTS_2_2_1:965062-1037869

Propchange: struts/struts2/trunk/apps/
--
--- svn:ignore (original)
+++ svn:ignore Tue Dec 28 20:48:55 2010
@@ -1,7 +1,6 @@
-.classpath
-.project
-.settings
 *.ipr
-*.iml
 *.iws
+.classpath
+.project
 target
+.settings

Modified: struts/struts2/trunk/apps/jboss-blank/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/jboss-blank/pom.xml?rev=1053429&r1=1053428&r2=1053429&view=diff
==
--- struts/struts2/trunk/apps/jboss-blank/pom.xml (original)
+++ struts/struts2/trunk/apps/jboss-blank/pom.xml Tue Dec 28 20:48:55 2010
@@ -1,3 +1,26 @@
+
+
 http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
 4.0.0
 

Modified: struts/struts2/trunk/apps/mailreader/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/pom.xml?rev=1053429&r1=1053428&r2=1053429&view=diff
==
--- struts/struts2/trunk/apps/mailreader/pom.xml (original)
+++ struts/struts2/trunk/apps/mailreader/pom.xml Tue Dec 28 20:48:55 2010
@@ -44,7 +44,6 @@
 
javax.servlet
servlet-api
-   2.4
provided
 
 

Propchange: struts/struts2/trunk/assembly/
--
--- svn:ignore (original)
+++ svn:ignore Tue Dec 28 20:48:55 2010
@@ -1,9 +1,8 @@
-.classpath
-.project
-.settings
 *.ipr
-*.iml
 *.iws
-target
+.classpath
+.project
 2.x
+target
 WW
+.settings

Modified: struts/struts2/trunk/assembly/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/pom.xml?rev=1053429&r1=1053428&r2=1053429&view=diff
==
--- struts/struts2/trunk/assembly/pom.xml (original)
+++ struts/struts2/trunk/assembly/pom.xml Tue Dec 28 20:48:55 2010
@@ -198,6 +198,7 @@
 
 org.codehaus.mojo
 dependency-maven-plugin
+1.0
 
 
 copy-war

Propchange: struts/struts2/trunk/bundles/
--
--- svn:ignore (original)
+++ svn:ignore Tue Dec 28 20:48:55 2010
@@ -1,6 +1,5 @@
-target
-.*
-*.iml
-*.ipr
 *.idea
+*.ipr
 *.iws
+target
+.*

Modified: struts/struts2/trunk/core/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/pom.xml?rev=1053429&r1=1053428&r2=1053429&view=diff
==
--- struts/struts2/trunk/core/pom.xml (original)
+++ struts/struts2/trunk/core/pom.xml Tue Dec 28 20:48:55 2010
@@ -210,7 +210,7 @@
 
 org.apache.struts.xwork
 xwork-core
-${version}
+${project.version}
 
 
 

Propchange: struts/struts2/trunk/plugins/
--
--- svn:ignore (original)
+++ svn:ignore Tue Dec 28 20:48:55 2010
@@ -1,7 +1,6 @@
-.classpath
-.project
-.settings
 *.ipr
-*.iml
 *.iws
+.classpath
+.project
 target
+.settings

Modified: struts/struts2/trunk/plugins/convention/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/convention/pom.xml?rev=1053429&r1=1053428&r2=1053429&view=diff
=

svn commit: r1053431 - /struts/struts2/trunk/xwork-core/test-output/

2010-12-28 Thread lukaszlenart
Author: lukaszlenart
Date: Tue Dec 28 20:57:18 2010
New Revision: 1053431

URL: http://svn.apache.org/viewvc?rev=1053431&view=rev
Log:
Removes TestNG output directory - already moved to target/surefire-reports

Removed:
struts/struts2/trunk/xwork-core/test-output/



[CONF] Confluence Changes in the last 24 hours

2010-12-28 Thread confluence
This is a daily summary of all recent changes in Confluence.

-
Updated Spaces:
-


Apache Camel (https://cwiki.apache.org/confluence/display/CAMEL)

Pages
-
Upgrade dependency guide created by muellerc (06:07 PM)
https://cwiki.apache.org/confluence/display/CAMEL/Upgrade+dependency+guide



Apache CXF Documentation (https://cwiki.apache.org/confluence/display/CXF20DOC)

Pages
-
JAX-RS Client API edited by  mazzag  (09:36 PM)
https://cwiki.apache.org/confluence/display/CXF20DOC/JAX-RS+Client+API

JAX-RS edited by  mazzag  (03:03 PM)
https://cwiki.apache.org/confluence/display/CXF20DOC/JAX-RS



Apache Felix (https://cwiki.apache.org/confluence/display/FELIX)

Pages
-
Apache Felix File Install edited by  cziege...@apache.org  (09:54 AM)
https://cwiki.apache.org/confluence/display/FELIX/Apache+Felix+File+Install

Configuration Handler edited by  clement.escoffier  (09:33 AM)
https://cwiki.apache.org/confluence/display/FELIX/Configuration+Handler

Lifecycle Callback Handler edited by  clement.escoffier  (08:20 AM)
https://cwiki.apache.org/confluence/display/FELIX/Lifecycle+Callback+Handler



OFBiz (Open For Business) Project Open Wiki 
(https://cwiki.apache.org/confluence/display/OFBIZ)

Pages
-
Main New Features edited by  mrisaliti  (02:40 PM)
https://cwiki.apache.org/confluence/display/OFBIZ/Main+New+Features

Apache OFBiz Service Providers edited by  ra...@nammasolutions.com  (07:36 AM)
https://cwiki.apache.org/confluence/display/OFBIZ/Apache+OFBiz+Service+Providers



OpenEJB (https://cwiki.apache.org/confluence/display/OPENEJB)

Pages
-
Source Code edited by  jean-louis.monte...@atosorigin.com  (02:43 AM)
https://cwiki.apache.org/confluence/display/OPENEJB/Source+Code



Apache Struts 2 Plugin Registry 
(https://cwiki.apache.org/confluence/display/S2PLUGINS)

Pages
-
Struts-2 Plugin for Request Parameter to Action Object Mapping for Insecure 
Direct Object References Released 1.0 edited by  datta_kud...@rediffmail.com  
(06:10 AM)
https://cwiki.apache.org/confluence/display/S2PLUGINS/2010/12/08/Struts-2+Plugin+for+Request+Parameter+to+Action+Object+Mapping+for+Insecure+Direct+Object+References+Released+1.0

Request Parameter to Action Object Mapping Plugin for Insecure Direct Object 
References edited by  datta_kud...@rediffmail.com  (05:54 AM)
https://cwiki.apache.org/confluence/display/S2PLUGINS/Request+Parameter+to+Action+Object+Mapping+Plugin+for+Insecure+Direct+Object+References



Apache ServiceMix (https://cwiki.apache.org/confluence/display/SM)

Pages
-
Team edited by  iocanel  (06:46 AM)
https://cwiki.apache.org/confluence/display/SM/Team



Apache Tapestry (https://cwiki.apache.org/confluence/display/TAPESTRY)

Pages
-
Frequently Asked Questions edited by  bobharner  (10:46 PM)
https://cwiki.apache.org/confluence/display/TAPESTRY/Frequently+Asked+Questions

IoC edited by  bobharner  (10:29 PM)
https://cwiki.apache.org/confluence/display/TAPESTRY/IoC

Documentation edited by  bobharner  (10:27 PM)
https://cwiki.apache.org/confluence/display/TAPESTRY/Documentation

Redirects created by bobharner (08:13 PM)
https://cwiki.apache.org/confluence/display/TAPESTRY/Redirects

Old Content created by bobharner (10:25 PM)
https://cwiki.apache.org/confluence/display/TAPESTRY/Old+Content

Tapestry Inversion of Control Container created by bobharner (10:21 PM)
https://cwiki.apache.org/confluence/display/TAPESTRY/Tapestry+Inversion+of+Control+Container

Tapestry Inversion of Control FAQ edited by  bobharner  (10:21 PM)
https://cwiki.apache.org/confluence/display/TAPESTRY/Tapestry+Inversion+of+Control+FAQ

Injection edited by  bobharner  (10:10 PM)
https://cwiki.apache.org/confluence/display/TAPESTRY/Injection

Component Templates edited by  bobharner  (10:05 PM)
https://cwiki.apache.org/confluence/display/TAPESTRY/Component+Templates

Component Parameters edited by  bobharner  (09:58 PM)
https://cwiki.apache.org/confluence/display/TAPESTRY/Component+Parameters

Component Classes edited by  bobharner  (09:47 PM)
https://cwiki.apache.org/confluence/display/TAPESTRY/Component+Classes

Service Advisors edited by  bobharner  (09:41 PM)
https://cwiki.apache.org/confluence/display/TAPESTRY/Service+Advisors

Tapestry IoC Decorators edited by  bobharner  (09:34 PM)
https://cwiki.apache.org/confluence/display/TAPESTRY/Tapestry+IoC+Decorators

IoC - cas