svn commit: r418509 - in /struts: action2/ struts2/
Author: mrdon Date: Sat Jul 1 14:43:55 2006 New Revision: 418509 URL: http://svn.apache.org/viewvc?rev=418509&view=rev Log: Renaming action2 to struts2 WW-1367 Added: struts/struts2/ - copied from r418508, struts/action2/ Removed: struts/action2/
svn commit: r418510 - /struts/current/
Author: mrdon Date: Sat Jul 1 14:44:49 2006 New Revision: 418510 URL: http://svn.apache.org/viewvc?rev=418510&view=rev Log: Fixing current for struts 2 WW-1367 Modified: struts/current/ (props changed) Propchange: struts/current/ -- --- svn:externals (original) +++ svn:externals Sat Jul 1 14:44:49 2006 @@ -1,5 +1,5 @@ actionhttps://svn.apache.org/repos/asf/struts/action/trunk -action2 https://svn.apache.org/repos/asf/struts/action2/trunk +struts2 https://svn.apache.org/repos/asf/struts/struts2/trunk maven https://svn.apache.org/repos/asf/struts/maven/trunk sandbox https://svn.apache.org/repos/asf/struts/sandbox/trunk shale https://svn.apache.org/repos/asf/struts/shale/trunk
svn commit: r418525 - in /struts/struts2/trunk/extras: ./ src/main/java/org/apache/struts/ src/main/java/org/apache/struts2/ src/main/java/org/apache/struts2/dispatcher/ src/main/java/org/apache/strut
Author: mrdon
Date: Sat Jul 1 16:43:57 2006
New Revision: 418525
URL: http://svn.apache.org/viewvc?rev=418525&view=rev
Log:
Renaming org.apache.struts.action2 to org.apache.struts2 in extras
WW-1367
Added:
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/
- copied from r418510,
struts/struts2/trunk/extras/src/main/java/org/apache/struts/action2/
struts/struts2/trunk/extras/src/test/java/org/apache/struts2/
- copied from r418510,
struts/struts2/trunk/extras/src/test/java/org/apache/struts/action2/
Removed:
struts/struts2/trunk/extras/src/main/java/org/apache/struts/
struts/struts2/trunk/extras/src/test/java/org/apache/struts/
Modified:
struts/struts2/trunk/extras/pom.xml
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/dispatcher/ChartResult.java
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/views/jasperreports/CompileReport.java
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/views/jasperreports/JasperReportConstants.java
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/views/jasperreports/OgnlValueStackDataSource.java
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/views/jasperreports/OgnlValueStackShadowMap.java
struts/struts2/trunk/extras/src/test/java/org/apache/struts2/dispatcher/ChartResultTest.java
Modified: struts/struts2/trunk/extras/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/extras/pom.xml?rev=418525&r1=418524&r2=418525&view=diff
==
--- struts/struts2/trunk/extras/pom.xml (original)
+++ struts/struts2/trunk/extras/pom.xml Sat Jul 1 16:43:57 2006
@@ -3,11 +3,11 @@
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.action2
-struts-action2-parent
+org.apache.struts2
+struts2-parent
2.0-SNAPSHOT
-org.apache.struts.action2
+org.apache.struts2
struts-extras
jar
Struts Extras
@@ -15,7 +15,7 @@
apache-site
-
scp://people.apache.org/www/struts.apache.org/struts-action2/struts-extras
+
scp://people.apache.org/www/struts.apache.org/struts2/struts-extras
@@ -29,7 +29,7 @@
-org.apache.struts.action2
+org.apache.struts2
struts-core
${pom.version}
Modified:
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/dispatcher/ChartResult.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/extras/src/main/java/org/apache/struts2/dispatcher/ChartResult.java?rev=418525&r1=418510&r2=418525&view=diff
==
---
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/dispatcher/ChartResult.java
(original)
+++
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/dispatcher/ChartResult.java
Sat Jul 1 16:43:57 2006
@@ -15,9 +15,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.dispatcher;
+package org.apache.struts2.dispatcher;
-import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts2.ServletActionContext;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.Result;
import org.jfree.chart.ChartUtilities;
Modified:
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/extras/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java?rev=418525&r1=418510&r2=418525&view=diff
==
---
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java
(original)
+++
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java
Sat Jul 1 16:43:57 2006
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.dispatcher.multipart;
+package org.apache.struts2.dispatcher.multipart;
-import org.apache.struts.action2.config.Configuration;
-import org.apache.struts.action2.StrutsConstants;
+import org.apache.struts2.config.Configuration;
+import org.apache.struts2.StrutsConstants;
import http.utils.multipartrequest.ServletMultipartRequest;
import javax.servlet.http.HttpServletRequest;
Modified
svn commit: r418530 [3/3] - in /struts/struts2/trunk/apps: ./ blank/ blank/src/main/java/org/apache/struts/ blank/src/main/java/org/apache/struts2/ blank/src/main/java/org/apache/struts2/example/ blan
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/xwork-token.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/xwork-token.xml?rev=418530&r1=418529&r2=418530&view=diff == --- struts/struts2/trunk/apps/showcase/src/main/resources/xwork-token.xml (original) +++ struts/struts2/trunk/apps/showcase/src/main/resources/xwork-token.xml Sat Jul 1 16:58:13 2006 @@ -4,12 +4,12 @@ - + example1.jsp - + doublePost.jsp @@ -18,12 +18,12 @@ - + example2.jsp - + doublePost.jsp @@ -32,12 +32,12 @@ - + example3.jsp - + doublePost.jsp @@ -45,13 +45,13 @@ - + example4.ftl - + doublePost.jsp Modified: struts/struts2/trunk/apps/showcase/src/main/resources/xwork-validation.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/xwork-validation.xml?rev=418530&r1=418529&r2=418530&view=diff == --- struts/struts2/trunk/apps/showcase/src/main/resources/xwork-validation.xml (original) +++ struts/struts2/trunk/apps/showcase/src/main/resources/xwork-validation.xml Sat Jul 1 16:58:13 2006 @@ -6,22 +6,22 @@ - + quiz-basic.jsp quiz-success.jsp - + quiz-client.jsp quiz-success.jsp - + quiz-client-css.jsp quiz-success.jsp - + quiz-ajax.jsp quiz-success.jsp @@ -39,11 +39,11 @@ - + /validation/fieldValidatorsExample.jsp - + /validation/fieldValidatorsExample.jsp /validation/successFieldValidatorsExample.jsp @@ -54,11 +54,11 @@ - + /validation/nonFieldValidatorsExample.jsp - + /validation/nonFieldValidatorsExample.jsp /validation/successNonFieldValidatorsExample.jsp @@ -69,11 +69,11 @@ - + /validation/visitorValidatorsExample.jsp - + /validation/visitorValidatorsExample.jsp /validation/successVisitorValidatorsExample.jsp @@ -84,11 +84,11 @@ - + /validation/clientSideValidationExample.jsp - + /validation/clientSideValidationExample.jsp /validation/successClientSideValidationExample.jsp Modified: struts/struts2/trunk/apps/showcase/src/main/resources/xwork-wait.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/xwork-wait.xml?rev=418530&r1=418529&r2=418530&view=diff == --- struts/struts2/trunk/apps/showcase/src/main/resources/xwork-wait.xml (original) +++ struts/struts2/trunk/apps/showcase/src/main/resources/xwork-wait.xml Sat Jul 1 16:58:13 2006 @@ -4,14 +4,14 @@ - + wait.jsp complete.jsp - + 2000 @@ -20,7 +20,7 @@ complete.jsp - + 3000 Modified: struts/struts2/trunk/apps/showcase/src/main/resources/xwork.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/xwork.xml?rev=418530&r1=418529&r2=418530&view=diff == --- struts/struts2/trunk/apps/showcase/src/main/resources/xwork.xml (original) +++ struts/struts2/trunk/apps/showcase/src/main/resources/xwork.xml Sat Jul 1 16:58:13 2006 @@ -57,7 +57,7
svn commit: r418531 - in /struts/struts2/trunk: ./ archetype/ archetype/src/main/resources/archetype-resources/ archetype/src/main/resources/archetype-resources/src/main/java/com/myComp/myApp/ archety
Author: mrdon Date: Sat Jul 1 17:04:30 2006 New Revision: 418531 URL: http://svn.apache.org/viewvc?rev=418531&view=rev Log: Finished org.apache.struts.action2 package renaming to org.apache.struts2 WW-1367 Modified: struts/struts2/trunk/archetype/pom.xml struts/struts2/trunk/archetype/src/main/resources/archetype-resources/pom.xml struts/struts2/trunk/archetype/src/main/resources/archetype-resources/src/main/java/com/myComp/myApp/DateConverter.java struts/struts2/trunk/archetype/src/main/resources/archetype-resources/src/main/resources/log4j.properties struts/struts2/trunk/archetype/src/main/resources/archetype-resources/src/main/resources/struts.properties struts/struts2/trunk/archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/dwr.xml struts/struts2/trunk/archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml struts/struts2/trunk/pom.xml struts/struts2/trunk/src/main/idea/workspace.xml struts/struts2/trunk/uber/pom.xml struts/struts2/trunk/uber/src/assemble/main.xml Modified: struts/struts2/trunk/archetype/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetype/pom.xml?rev=418531&r1=418530&r2=418531&view=diff == --- struts/struts2/trunk/archetype/pom.xml (original) +++ struts/struts2/trunk/archetype/pom.xml Sat Jul 1 17:04:30 2006 @@ -3,7 +3,7 @@ 4.0.0 org.apache.struts.action2 - saf2-archetype-quickstart + struts2-archetype-quickstart 1.0-SNAPSHOT maven-plugin Modified: struts/struts2/trunk/archetype/src/main/resources/archetype-resources/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetype/src/main/resources/archetype-resources/pom.xml?rev=418531&r1=418530&r2=418531&view=diff == --- struts/struts2/trunk/archetype/src/main/resources/archetype-resources/pom.xml (original) +++ struts/struts2/trunk/archetype/src/main/resources/archetype-resources/pom.xml Sat Jul 1 17:04:30 2006 @@ -21,12 +21,12 @@ -org.apache.struts.action2 +org.apache.struts2 struts-core 2.0-SNAPSHOT -org.apache.struts.action2 +org.apache.struts2 struts-extras 2.0-SNAPSHOT Modified: struts/struts2/trunk/archetype/src/main/resources/archetype-resources/src/main/java/com/myComp/myApp/DateConverter.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetype/src/main/resources/archetype-resources/src/main/java/com/myComp/myApp/DateConverter.java?rev=418531&r1=418530&r2=418531&view=diff == --- struts/struts2/trunk/archetype/src/main/resources/archetype-resources/src/main/java/com/myComp/myApp/DateConverter.java (original) +++ struts/struts2/trunk/archetype/src/main/resources/archetype-resources/src/main/java/com/myComp/myApp/DateConverter.java Sat Jul 1 17:04:30 2006 @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import org.apache.struts.action2.util.StrutsTypeConverter; +import org.apache.struts2.util.StrutsTypeConverter; import java.text.SimpleDateFormat; import java.text.ParseException; Modified: struts/struts2/trunk/archetype/src/main/resources/archetype-resources/src/main/resources/log4j.properties URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetype/src/main/resources/archetype-resources/src/main/resources/log4j.properties?rev=418531&r1=418530&r2=418531&view=diff == --- struts/struts2/trunk/archetype/src/main/resources/archetype-resources/src/main/resources/log4j.properties (original) +++ struts/struts2/trunk/archetype/src/main/resources/archetype-resources/src/main/resources/log4j.properties Sat Jul 1 17:04:30 2006 @@ -4,7 +4,7 @@ log4j.category.com.opensymphony.webwork=DEBUG log4j.category.com.opensymphony.sitemesh=DEBUG -log4j.category.org.apache.struts.action2=DEBUG +log4j.category.org.apache.struts2=DEBUG log4j.category.org.apache=INFO log4j.category.catalia=INFO Modified: struts/struts2/trunk/archetype/src/main/resources/archetype-resources/src/main/resources/struts.properties URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetype/src/main/resources/archetype-resources/src/main/resources/struts.properties?rev=418531&r1=418530&r2=418531&view=diff == --- struts/struts2/trunk/archetype/src/main/resources/archetype-resources/src/main/resources/struts.properties (original) +++ struts/struts2/trunk/archetype/src/main/resources/archetype-resources/src/main/resources/struts.properties Sat Jul
svn commit: r418532 - in /struts/struts2/trunk: api/pom.xml apps/blank/pom.xml apps/pom.xml apps/portlet/pom.xml apps/shopping-cart/pom.xml apps/showcase/pom.xml apps/starter/pom.xml archetype/pom.xml
Author: mrdon
Date: Sat Jul 1 17:16:06 2006
New Revision: 418532
URL: http://svn.apache.org/viewvc?rev=418532&view=rev
Log:
Trying putting struts2 in the artifact id rather than the group id. This
works better when having maven generate IDE projects so that they don't
conflict with Struts 1 artifacts. Also fixed up a few other poms.
WW-1367
Modified:
struts/struts2/trunk/api/pom.xml
struts/struts2/trunk/apps/blank/pom.xml
struts/struts2/trunk/apps/pom.xml
struts/struts2/trunk/apps/portlet/pom.xml
struts/struts2/trunk/apps/shopping-cart/pom.xml
struts/struts2/trunk/apps/showcase/pom.xml
struts/struts2/trunk/apps/starter/pom.xml
struts/struts2/trunk/archetype/pom.xml
struts/struts2/trunk/core/pom.xml
struts/struts2/trunk/extras/pom.xml
struts/struts2/trunk/pom.xml
struts/struts2/trunk/uber/pom.xml
Modified: struts/struts2/trunk/api/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/api/pom.xml?rev=418532&r1=418531&r2=418532&view=diff
==
--- struts/struts2/trunk/api/pom.xml (original)
+++ struts/struts2/trunk/api/pom.xml Sat Jul 1 17:16:06 2006
@@ -3,12 +3,12 @@
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.action2
-struts-action2-parent
+org.apache.struts2
+struts2-parent
2.0-SNAPSHOT
-org.apache.struts.action2
-struts-api
+org.apache.struts
+struts2-api
jar
Struts 2 API
Modified: struts/struts2/trunk/apps/blank/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/pom.xml?rev=418532&r1=418531&r2=418532&view=diff
==
--- struts/struts2/trunk/apps/blank/pom.xml (original)
+++ struts/struts2/trunk/apps/blank/pom.xml Sat Jul 1 17:16:06 2006
@@ -3,12 +3,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
4.0.0
- org.apache.struts2
- struts-apps
+ org.apache.struts
+ struts2-apps
2.0-SNAPSHOT
-org.apache.struts2
-struts-blank
+org.apache.struts
+struts2-blank
war
Blank Webapp
Modified: struts/struts2/trunk/apps/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/pom.xml?rev=418532&r1=418531&r2=418532&view=diff
==
--- struts/struts2/trunk/apps/pom.xml (original)
+++ struts/struts2/trunk/apps/pom.xml Sat Jul 1 17:16:06 2006
@@ -3,12 +3,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
4.0.0
-org.apache.struts2
+org.apache.struts
struts2-parent
2.0-SNAPSHOT
-org.apache.struts2
-struts-apps
+org.apache.struts
+struts2-apps
pom
Webapps
@@ -121,8 +121,8 @@
-org.apache.struts2
-struts-core
+org.apache.struts
+struts2-core
${pom.version}
Modified: struts/struts2/trunk/apps/portlet/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/pom.xml?rev=418532&r1=418531&r2=418532&view=diff
==
--- struts/struts2/trunk/apps/portlet/pom.xml (original)
+++ struts/struts2/trunk/apps/portlet/pom.xml Sat Jul 1 17:16:06 2006
@@ -3,12 +3,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
4.0.0
- org.apache.struts2
- struts-apps
+ org.apache.struts
+ struts2-apps
2.0-SNAPSHOT
-org.apache.struts2
-struts-portlet
+org.apache.struts
+struts2-portlet
war
Portlet Webapp
Modified: struts/struts2/trunk/apps/shopping-cart/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/shopping-cart/pom.xml?rev=418532&r1=418531&r2=418532&view=diff
==
--- struts/struts2/trunk/apps/shopping-cart/pom.xml (original)
+++ struts/struts2/trunk/apps/shopping-cart/pom.xml Sat Jul 1 17:16:06 2006
@@ -3,12 +3,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
4.0.0
- org.apache.struts2
- struts-apps
+ org.apache.struts
+ struts2-apps
2.0-SNAPSHOT
-org.apache.struts2
-struts-shopping-cart
+org.apache.struts
+struts2-shopping-cart
war
Shopping Cart Webapp
Modified: struts/struts2/trunk/apps/showcase/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/pom.xml?rev=418532&r1=418531&r2=418532&view=diff
==
svn commit: r418533 - in /struts/struts2/trunk: api/pom.xml archetype/src/main/resources/archetype-resources/pom.xml
Author: mrdon Date: Sat Jul 1 17:23:12 2006 New Revision: 418533 URL: http://svn.apache.org/viewvc?rev=418533&view=rev Log: Fixing last org.apache.struts2 group ids WW-1367 Modified: struts/struts2/trunk/api/pom.xml struts/struts2/trunk/archetype/src/main/resources/archetype-resources/pom.xml Modified: struts/struts2/trunk/api/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/api/pom.xml?rev=418533&r1=418532&r2=418533&view=diff == --- struts/struts2/trunk/api/pom.xml (original) +++ struts/struts2/trunk/api/pom.xml Sat Jul 1 17:23:12 2006 @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> 4.0.0 -org.apache.struts2 +org.apache.struts struts2-parent 2.0-SNAPSHOT Modified: struts/struts2/trunk/archetype/src/main/resources/archetype-resources/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetype/src/main/resources/archetype-resources/pom.xml?rev=418533&r1=418532&r2=418533&view=diff == --- struts/struts2/trunk/archetype/src/main/resources/archetype-resources/pom.xml (original) +++ struts/struts2/trunk/archetype/src/main/resources/archetype-resources/pom.xml Sat Jul 1 17:23:12 2006 @@ -21,13 +21,13 @@ -org.apache.struts2 -struts-core +org.apache.struts +struts2-core 2.0-SNAPSHOT -org.apache.struts2 -struts-extras +org.apache.struts +struts2-extras 2.0-SNAPSHOT
svn commit: r418534 - in /struts: action/ struts1/
Author: mrdon Date: Sat Jul 1 17:26:22 2006 New Revision: 418534 URL: http://svn.apache.org/viewvc?rev=418534&view=rev Log: Renaming Struts Action svn url to struts 1 STR-2989 Added: struts/struts1/ - copied from r418533, struts/action/ Removed: struts/action/
svn commit: r418535 - /struts/current/
Author: mrdon Date: Sat Jul 1 17:27:21 2006 New Revision: 418535 URL: http://svn.apache.org/viewvc?rev=418535&view=rev Log: Renaming current link to struts1 STR-2898 Modified: struts/current/ (props changed) Propchange: struts/current/ -- --- svn:externals (original) +++ svn:externals Sat Jul 1 17:27:21 2006 @@ -1,4 +1,4 @@ -actionhttps://svn.apache.org/repos/asf/struts/action/trunk +struts1 https://svn.apache.org/repos/asf/struts/struts1/trunk struts2 https://svn.apache.org/repos/asf/struts/struts2/trunk maven https://svn.apache.org/repos/asf/struts/maven/trunk sandbox https://svn.apache.org/repos/asf/struts/sandbox/trunk
svn commit: r418536 - /struts/maven/trunk/pom/pom.xml
Author: wsmoak Date: Sat Jul 1 17:40:41 2006 New Revision: 418536 URL: http://svn.apache.org/viewvc?rev=418536&view=rev Log: Change the artifactId to struts-master. Upgrade to the latest Apache master pom, version 2. Override the so that we always "release" to the snapshot repo. Modified: struts/maven/trunk/pom/pom.xml Modified: struts/maven/trunk/pom/pom.xml URL: http://svn.apache.org/viewvc/struts/maven/trunk/pom/pom.xml?rev=418536&r1=418535&r2=418536&view=diff == --- struts/maven/trunk/pom/pom.xml (original) +++ struts/maven/trunk/pom/pom.xml Sat Jul 1 17:40:41 2006 @@ -22,10 +22,10 @@ org.apache apache - 1 + 2 org.apache.struts - struts-parent + struts-master 3-SNAPSHOT pom Apache Struts @@ -329,14 +329,14 @@ - apache-maven-releases - Apache Maven Repository (Releases) - scp://people.apache.org/www/www.apache.org/dist/maven-repository + apache.snapshots + Apache Development Snapshot (and Test Build) Repository + scp://people.apache.org/www/cvs.apache.org/maven-snapshot-repository false - apache-maven-snapshots - Apache Maven Repository (Snapshots) + apache.snapshots + Apache Development Snapshot Repository scp://people.apache.org/www/cvs.apache.org/maven-snapshot-repository
svn commit: r418537 - in /struts/struts1/trunk: ./ apps/ apps/blank/ apps/cookbook/ apps/examples/ apps/faces-example1/ apps/faces-example2/ apps/mailreader/ apps/scripting-mailreader/ apps/strutsel-e
Author: mrdon Date: Sat Jul 1 17:44:12 2006 New Revision: 418537 URL: http://svn.apache.org/viewvc?rev=418537&view=rev Log: Fixing poms to new group id of org.apache.struts Modified: struts/struts1/trunk/apps/blank/pom.xml struts/struts1/trunk/apps/cookbook/pom.xml struts/struts1/trunk/apps/examples/pom.xml struts/struts1/trunk/apps/faces-example1/pom.xml struts/struts1/trunk/apps/faces-example2/pom.xml struts/struts1/trunk/apps/mailreader/pom.xml struts/struts1/trunk/apps/pom.xml struts/struts1/trunk/apps/scripting-mailreader/pom.xml struts/struts1/trunk/apps/strutsel-exercise-taglib/pom.xml struts/struts1/trunk/assembly/pom.xml struts/struts1/trunk/core/pom.xml struts/struts1/trunk/el/pom.xml struts/struts1/trunk/extras/pom.xml struts/struts1/trunk/faces/pom.xml struts/struts1/trunk/integration/apps-it/pom.xml struts/struts1/trunk/integration/pom.xml struts/struts1/trunk/integration/tg4w/pom.xml struts/struts1/trunk/mailreader-dao/pom.xml struts/struts1/trunk/pom.xml struts/struts1/trunk/scripting/pom.xml struts/struts1/trunk/taglib/pom.xml struts/struts1/trunk/tiles/pom.xml Modified: struts/struts1/trunk/apps/blank/pom.xml URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/blank/pom.xml?rev=418537&r1=418536&r2=418537&view=diff == --- struts/struts1/trunk/apps/blank/pom.xml (original) +++ struts/struts1/trunk/apps/blank/pom.xml Sat Jul 1 17:44:12 2006 @@ -23,16 +23,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - org.apache.struts.action + org.apache.struts struts-apps 1.3.5-SNAPSHOT 4.0.0 - org.apache.struts.action + org.apache.struts struts-blank war - Struts Action - Apps - Blank + Struts 1 - Apps - Blank Modified: struts/struts1/trunk/apps/cookbook/pom.xml URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/cookbook/pom.xml?rev=418537&r1=418536&r2=418537&view=diff == --- struts/struts1/trunk/apps/cookbook/pom.xml (original) +++ struts/struts1/trunk/apps/cookbook/pom.xml Sat Jul 1 17:44:12 2006 @@ -23,16 +23,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - org.apache.struts.action + org.apache.struts struts-apps 1.3.5-SNAPSHOT 4.0.0 - org.apache.struts.action + org.apache.struts struts-cookbook war - Struts Action - Apps - Cookbook + Struts 1 - Apps - Cookbook Modified: struts/struts1/trunk/apps/examples/pom.xml URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/examples/pom.xml?rev=418537&r1=418536&r2=418537&view=diff == --- struts/struts1/trunk/apps/examples/pom.xml (original) +++ struts/struts1/trunk/apps/examples/pom.xml Sat Jul 1 17:44:12 2006 @@ -23,16 +23,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - org.apache.struts.action + org.apache.struts struts-apps 1.3.5-SNAPSHOT 4.0.0 - org.apache.struts.action + org.apache.struts struts-examples war - Struts Action - Apps - Examples + Struts 1 - Apps - Examples Modified: struts/struts1/trunk/apps/faces-example1/pom.xml URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/faces-example1/pom.xml?rev=418537&r1=418536&r2=418537&view=diff == --- struts/struts1/trunk/apps/faces-example1/pom.xml (original) +++ struts/struts1/trunk/apps/faces-example1/pom.xml Sat Jul 1 17:44:12 2006 @@ -23,16 +23,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - org.apache.struts.action + org.apache.struts struts-apps 1.3.5-SNAPSHOT 4.0.0 - org.apache.struts.action + org.apache.struts struts-faces-example1 war - Struts Action - Apps - Faces Example 1 + Struts 1 - Apps - Faces Example 1 Modified: struts/struts1/trunk/apps/faces-example2/pom.xml URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/faces-example2/pom.xml?rev=418537&r1=418536&r2=418537&view=diff == --- struts/struts1/trunk/apps/faces-example2/pom.xml (original) +++ struts/struts1/trunk/apps/faces-example2/pom.xml Sat Jul 1 17:44:12 2006 @@ -23,16 +23,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - org.apache.struts.action + org.apache.struts struts-apps
svn commit: r418538 - /struts/struts2/trunk/pom.xml
Author: mrdon Date: Sat Jul 1 17:45:43 2006 New Revision: 418538 URL: http://svn.apache.org/viewvc?rev=418538&view=rev Log: Using a new master pom WW-1367 Modified: struts/struts2/trunk/pom.xml Modified: struts/struts2/trunk/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/pom.xml?rev=418538&r1=418537&r2=418538&view=diff == --- struts/struts2/trunk/pom.xml (original) +++ struts/struts2/trunk/pom.xml Sat Jul 1 17:45:43 2006 @@ -25,8 +25,8 @@ org.apache.struts - struts-parent - 2 + struts-master + 3-SNAPSHOT 4.0.0
svn commit: r418541 - in /struts/site: ./ src/site/ src/site/fml/ src/site/resources/ src/site/xdoc/
Author: mrdon Date: Sat Jul 1 19:47:25 2006 New Revision: 418541 URL: http://svn.apache.org/viewvc?rev=418541&view=rev Log: Updating site with Struts Action renaming, and Shale moving WW-1367 STR-2898 Modified: struts/site/pom.xml struts/site/src/site/fml/kickstart.fml struts/site/src/site/fml/roadmap.fml struts/site/src/site/resources/.htaccess struts/site/src/site/site.xml struts/site/src/site/xdoc/announce-2005.xml struts/site/src/site/xdoc/announce.xml struts/site/src/site/xdoc/download.xml struts/site/src/site/xdoc/downloads.xml struts/site/src/site/xdoc/index.xml struts/site/src/site/xdoc/javadoc.xml Modified: struts/site/pom.xml URL: http://svn.apache.org/viewvc/struts/site/pom.xml?rev=418541&r1=418540&r2=418541&view=diff == --- struts/site/pom.xml (original) +++ struts/site/pom.xml Sat Jul 1 19:47:25 2006 @@ -22,7 +22,7 @@ org.apache.struts - struts-parent + struts-master 3-SNAPSHOT @@ -39,8 +39,7 @@ -Struts Site is the Apache Struts home page, -the top-level portal to all other Struts frameworks and subprojects. +Struts Site is the Apache Struts home page, covering all versions of Struts. Modified: struts/site/src/site/fml/kickstart.fml URL: http://svn.apache.org/viewvc/struts/site/src/site/fml/kickstart.fml?rev=418541&r1=418540&r2=418541&view=diff == --- struts/site/src/site/fml/kickstart.fml (original) +++ struts/site/src/site/fml/kickstart.fml Sat Jul 1 19:47:25 2006 @@ -29,16 +29,16 @@ http://struts.apache.org/announce-2005.html#a20050322";> Struts 1.2.9. The Struts 1.2.9 release has its -http://struts.apache.org/struts-doc-1.2.9/index.html";> +http://struts.apache.org/1.2.9/index.html";> own area of the website. If you are new to Java or web development as well as Apache Struts, be sure to review the -http://struts.apache.org/struts-doc-1.2.9/userGuide/index.html";> +http://struts.apache.org/1.2.9/userGuide/index.html";> Preface to the User Guide. -The main website is devoted to the upcoming version, Struts Action +The main website is devoted to the upcoming version, Struts 1.3. This version is at the "http://svn.apache.org/dist/struts/action-lib/";>test build" stage now, but it is still 100% backwardly compatible @@ -46,23 +46,21 @@ -Meanwhile, for the Struts Action 2 release, +Meanwhile, for the Struts 2 release, we "joined forces" with another project, http://www.opensymphony.com/webwork/";>OpenSymphony WebWork. The WebWork codebase was donated to Apache Struts; and the WebWork developers have joined the Apache Struts team. -Essentially, Struts Action Framework 2.0 will be WebWork 2.3. +Essentially, Struts 2.0 will be WebWork 2.3. -To learn more about using Apache Struts frameworks, you can also visit +To learn more about using Apache Struts, you can also visit http://www.StrutsCentral.net/";>Struts Central, which catalogs all the known resources about Apache Struts, whether it is -http://struts.apache.org/struts-action/";>Action 1, -http://wiki.apache.org/struts/StrutsTi";>Action 2, -or our offering for JavaServer Faces, -http://struts.apache.org/struts-shale/";>Struts Shale. +http://struts.apache.org/1.x/";>Struts 1, +http://struts.apache.org/2.0/";>Struts 2. To keep up on the latest news about "everything Struts", point your RSS reader at the http://www.PlanetStruts.org/";>Planet Struts news site. @@ -132,7 +130,7 @@ Are there ISPs that will host my Java web application? -For a listing of some Java and Struts Action Framework +For a listing of some Java and Struts ISPs, visit the http://struts.sf.net/community/index.html";>Struts Community Resources @@ -166,7 +164,7 @@ Where can I get help with Apache Struts? -Struts Action Framework comes complete with a +Struts comes complete with a Users Guide to introduce people to the framework and its underlying Modified: struts/site/src/site/fml/roadmap.fml URL: http://svn.apache.org/viewvc/struts/site/src/site/fml/roadmap.fml?rev=418541&r1
svn commit: r418542 - in /struts/struts1/trunk: ./ apps/ apps/src/site/ core/ el/ el/src/site/ extras/ extras/src/site/ faces/ faces/src/site/ scripting/ scripting/src/site/ src/site/ src/site/fml/faq
Author: mrdon Date: Sat Jul 1 19:48:15 2006 New Revision: 418542 URL: http://svn.apache.org/viewvc?rev=418542&view=rev Log: Renaming Struts Action in the documentation STR-2898 Modified: struts/struts1/trunk/apps/pom.xml struts/struts1/trunk/apps/src/site/site.xml struts/struts1/trunk/core/pom.xml struts/struts1/trunk/el/pom.xml struts/struts1/trunk/el/src/site/site.xml struts/struts1/trunk/extras/pom.xml struts/struts1/trunk/extras/src/site/site.xml struts/struts1/trunk/faces/pom.xml struts/struts1/trunk/faces/src/site/site.xml struts/struts1/trunk/pom.xml struts/struts1/trunk/scripting/pom.xml struts/struts1/trunk/scripting/src/site/site.xml struts/struts1/trunk/src/site/fml/faqs/kickstart.fml struts/struts1/trunk/src/site/site.xml struts/struts1/trunk/src/site/xdoc/apidocs/index.xml struts/struts1/trunk/src/site/xdoc/checkstyle.xml struts/struts1/trunk/src/site/xdoc/dependencies.xml struts/struts1/trunk/src/site/xdoc/faqs/apps.xml struts/struts1/trunk/src/site/xdoc/faqs/db-howto.xml struts/struts1/trunk/src/site/xdoc/faqs/eclipse.xml struts/struts1/trunk/src/site/xdoc/faqs/navigation.xml struts/struts1/trunk/src/site/xdoc/faqs/netbeans40.xml struts/struts1/trunk/src/site/xdoc/faqs/works.xml struts/struts1/trunk/src/site/xdoc/index.xml struts/struts1/trunk/src/site/xdoc/jxr.xml struts/struts1/trunk/src/site/xdoc/learning.xml struts/struts1/trunk/src/site/xdoc/roadmap.xml struts/struts1/trunk/src/site/xdoc/userGuide/building_controller.xml struts/struts1/trunk/src/site/xdoc/userGuide/configuration.xml struts/struts1/trunk/src/site/xdoc/userGuide/installation.xml struts/struts1/trunk/src/site/xdoc/userGuide/introduction.xml struts/struts1/trunk/src/site/xdoc/userGuide/navigation.xml struts/struts1/trunk/src/site/xdoc/userGuide/release-notes-1_3_1.xml struts/struts1/trunk/src/site/xdoc/userGuide/release-notes-1_3_2.xml struts/struts1/trunk/src/site/xdoc/userGuide/release-notes-1_3_3.xml struts/struts1/trunk/src/site/xdoc/userGuide/release-notes.xml struts/struts1/trunk/taglib/pom.xml struts/struts1/trunk/taglib/src/site/site.xml struts/struts1/trunk/tiles/pom.xml struts/struts1/trunk/tiles/src/site/site.xml Modified: struts/struts1/trunk/apps/pom.xml URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/pom.xml?rev=418542&r1=418541&r2=418542&view=diff == --- struts/struts1/trunk/apps/pom.xml (original) +++ struts/struts1/trunk/apps/pom.xml Sat Jul 1 19:48:15 2006 @@ -37,7 +37,7 @@ apache-site - scp://people.apache.org/www/struts.apache.org/struts/struts-apps + scp://people.apache.org/www/struts.apache.org/1.x/struts-apps Modified: struts/struts1/trunk/apps/src/site/site.xml URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/src/site/site.xml?rev=418542&r1=418541&r2=418542&view=diff == --- struts/struts1/trunk/apps/src/site/site.xml (original) +++ struts/struts1/trunk/apps/src/site/site.xml Sat Jul 1 19:48:15 2006 @@ -13,9 +13,8 @@ http://www.apache.org"; /> -http://struts.apache.org/struts-action"; /> -http://struts.apache.org/struts-action2"; /> -http://struts.apache.org/struts-shale"; /> +http://struts.apache.org/1.x"; /> +http://struts.apache.org/2.0"; /> Modified: struts/struts1/trunk/core/pom.xml URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/pom.xml?rev=418542&r1=418541&r2=418542&view=diff == --- struts/struts1/trunk/core/pom.xml (original) +++ struts/struts1/trunk/core/pom.xml Sat Jul 1 19:48:15 2006 @@ -45,7 +45,7 @@ apache-site - scp://people.apache.org/www/struts.apache.org/struts/struts-core + scp://people.apache.org/www/struts.apache.org/1.x/struts-core Modified: struts/struts1/trunk/el/pom.xml URL: http://svn.apache.org/viewvc/struts/struts1/trunk/el/pom.xml?rev=418542&r1=418541&r2=418542&view=diff == --- struts/struts1/trunk/el/pom.xml (original) +++ struts/struts1/trunk/el/pom.xml Sat Jul 1 19:48:15 2006 @@ -39,7 +39,7 @@ apache-site - scp://people.apache.org/www/struts.apache.org/struts/struts-el + scp://people.apache.org/www/struts.apache.org/1.x/struts-el Modified: struts/struts1/trunk/el/src/site/site.xml URL: http://svn.apache.org/viewvc/struts/struts1/trunk/el/src/site/site.xml?rev=418542&r1=418541&r2=418542&view=diff ==
svn commit: r418543 - in /struts/struts2/trunk: pom.xml src/site/site.xml src/site/xdoc/apidocs/index.xml src/site/xdoc/index.xml src/site/xdoc/jxr.xml
Author: mrdon
Date: Sat Jul 1 19:48:47 2006
New Revision: 418543
URL: http://svn.apache.org/viewvc?rev=418543&view=rev
Log:
Renaming Struts Action in the documentation
WW-1367
Modified:
struts/struts2/trunk/pom.xml
struts/struts2/trunk/src/site/site.xml
struts/struts2/trunk/src/site/xdoc/apidocs/index.xml
struts/struts2/trunk/src/site/xdoc/index.xml
struts/struts2/trunk/src/site/xdoc/jxr.xml
Modified: struts/struts2/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/pom.xml?rev=418543&r1=418542&r2=418543&view=diff
==
--- struts/struts2/trunk/pom.xml (original)
+++ struts/struts2/trunk/pom.xml Sat Jul 1 19:48:47 2006
@@ -71,7 +71,7 @@
apache-site
-scp://people.apache.org/www/struts.apache.org/struts2/
+scp://people.apache.org/www/struts.apache.org/2.0/
Modified: struts/struts2/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/src/site/site.xml?rev=418543&r1=418542&r2=418543&view=diff
==
--- struts/struts2/trunk/src/site/site.xml (original)
+++ struts/struts2/trunk/src/site/site.xml Sat Jul 1 19:48:47 2006
@@ -1,5 +1,5 @@
-
+
Apache Software Foundation
http://www.apache.org/images/asf-logo.gif
@@ -13,11 +13,10 @@
http://www.apache.org"; />
-http://struts.apache.org/struts-action"; />
-http://struts.apache.org/struts-action2"; />
-http://struts.apache.org/struts-shale"; />
+http://struts.apache.org/1.x"; />
+http://struts.apache.org/2.0"; />
-
+
http://svn.apache.org/viewcvs.cgi/struts/action2/trunk/?root=Apache-SVN";
+
href="http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/?root=Apache-SVN";
/>
${reports}
Modified: struts/struts2/trunk/src/site/xdoc/apidocs/index.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/src/site/xdoc/apidocs/index.xml?rev=418543&r1=418542&r2=418543&view=diff
==
--- struts/struts2/trunk/src/site/xdoc/apidocs/index.xml (original)
+++ struts/struts2/trunk/src/site/xdoc/apidocs/index.xml Sat Jul 1 19:48:47
2006
@@ -19,17 +19,17 @@
- Struts Action 2 - Javadoc
+ Struts 2 - Javadoc
-
+
- Struts Action 2 Core
+ Struts 2 Core
Struts Extras
Modified: struts/struts2/trunk/src/site/xdoc/index.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/src/site/xdoc/index.xml?rev=418543&r1=418542&r2=418543&view=diff
==
--- struts/struts2/trunk/src/site/xdoc/index.xml (original)
+++ struts/struts2/trunk/src/site/xdoc/index.xml Sat Jul 1 19:48:47 2006
@@ -19,16 +19,16 @@
-Struts Action 2
+Struts 2
-
+
-Struts Action 2 is a Java web-application development
framework.
+Struts 2 is a Java web-application development framework.
It is built specifically with developer productivity and
code simplicity in mind, providing robust support for building
reusable UI templates, such as form controls, UI themes,
Modified: struts/struts2/trunk/src/site/xdoc/jxr.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/src/site/xdoc/jxr.xml?rev=418543&r1=418542&r2=418543&view=diff
==
--- struts/struts2/trunk/src/site/xdoc/jxr.xml (original)
+++ struts/struts2/trunk/src/site/xdoc/jxr.xml Sat Jul 1 19:48:47 2006
@@ -24,12 +24,12 @@
-
+
- Struts Action Core
+ Struts Core
Struts Extras
svn commit: r418544 - in /struts/struts2/trunk: pom.xml src/site/xdoc/apidocs/index.xml
Author: mrdon Date: Sat Jul 1 19:59:12 2006 New Revision: 418544 URL: http://svn.apache.org/viewvc?rev=418544&view=rev Log: Took out PMD, fixed a couple links WW-1367 Modified: struts/struts2/trunk/pom.xml struts/struts2/trunk/src/site/xdoc/apidocs/index.xml Modified: struts/struts2/trunk/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/pom.xml?rev=418544&r1=418543&r2=418544&view=diff == --- struts/struts2/trunk/pom.xml (original) +++ struts/struts2/trunk/pom.xml Sat Jul 1 19:59:12 2006 @@ -214,9 +214,11 @@ org.codehaus.mojo jxr-maven-plugin + Modified: struts/struts2/trunk/src/site/xdoc/apidocs/index.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/src/site/xdoc/apidocs/index.xml?rev=418544&r1=418543&r2=418544&view=diff == --- struts/struts2/trunk/src/site/xdoc/apidocs/index.xml (original) +++ struts/struts2/trunk/src/site/xdoc/apidocs/index.xml Sat Jul 1 19:59:12 2006 @@ -28,11 +28,11 @@ - + Struts 2 Core - - Struts Extras + + Struts 2 Extras
svn commit: r418545 - in /struts/struts1/trunk/src/site: resources/userGuide/.htaccess xdoc/learning.xml xdoc/roadmap.xml xdoc/userGuide/introduction.xml xdoc/userGuide/preface.xml
Author: mrdon Date: Sat Jul 1 20:25:01 2006 New Revision: 418545 URL: http://svn.apache.org/viewvc?rev=418545&view=rev Log: More Struts Action renaming STR-2898 Modified: struts/struts1/trunk/src/site/resources/userGuide/.htaccess struts/struts1/trunk/src/site/xdoc/learning.xml struts/struts1/trunk/src/site/xdoc/roadmap.xml struts/struts1/trunk/src/site/xdoc/userGuide/introduction.xml struts/struts1/trunk/src/site/xdoc/userGuide/preface.xml Modified: struts/struts1/trunk/src/site/resources/userGuide/.htaccess URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/resources/userGuide/.htaccess?rev=418545&r1=418544&r2=418545&view=diff == --- struts/struts1/trunk/src/site/resources/userGuide/.htaccess (original) +++ struts/struts1/trunk/src/site/resources/userGuide/.htaccess Sat Jul 1 20:25:01 2006 @@ -1,18 +1,18 @@ -Redirect permanent /struts-action/userGuide/installation-1.0.html http://struts.apache.org/struts-action/userGuide/installation-1_0.html -Redirect permanent /struts-action/userGuide/release-notes-1.0-b1.html http://struts.apache.org/struts-action/userGuide/release-notes-1_0-b1.html -Redirect permanent /struts-action/userGuide/release-notes-1.0-b2.html http://struts.apache.org/struts-action/userGuide/release-notes-1_0-b2.html -Redirect permanent /struts-action/userGuide/release-notes-1.0-b3.html http://struts.apache.org/struts-action/userGuide/release-notes-1_0-b3.html -Redirect permanent /struts-action/userGuide/release-notes-1.0.1.html http://struts.apache.org/struts-action/userGuide/release-notes-1_0_1.html -Redirect permanent /struts-action/userGuide/release-notes-1.0.2.html http://struts.apache.org/struts-action/userGuide/release-notes-1_0_2.html -Redirect permanent /struts-action/userGuide/release-notes-1.0.html http://struts.apache.org/struts-action/userGuide/release-notes-1_0.html -Redirect permanent /struts-action/userGuide/release-notes-1.1-b1.html http://struts.apache.org/struts-action/userGuide/release-notes-1_1-b1.html -Redirect permanent /struts-action/userGuide/release-notes-1.1-b2.html http://struts.apache.org/struts-action/userGuide/release-notes-1_1-b2.html -Redirect permanent /struts-action/userGuide/release-notes-1.1-b3.html http://struts.apache.org/struts-action/userGuide/release-notes-1_1-b3.html -Redirect permanent /struts-action/userGuide/release-notes-1.1-rc1.html http://struts.apache.org/struts-action/userGuide/release-notes-1_1-rc1.html -Redirect permanent /struts-action/userGuide/release-notes-1.1-rc2.html http://struts.apache.org/struts-action/userGuide/release-notes-1_1-rc2.html -Redirect permanent /struts-action/userGuide/release-notes-1.1.html http://struts.apache.org/struts-action/userGuide/release-notes-1_1.html -Redirect permanent /struts-action/userGuide/release-notes-1.2.4.html http://struts.apache.org/struts-action/userGuide/release-notes-1_2_4.html -Redirect permanent /struts-action/userGuide/release-notes-1.2.7.html http://struts.apache.org/struts-action/userGuide/release-notes-1_2_7.html -Redirect permanent /struts-action/userGuide/release-notes-1.2.8.html http://struts.apache.org/struts-action/userGuide/release-notes-1_2_8.html -Redirect permanent /struts-action/userGuide/release-notes-1.3.1.html http://struts.apache.org/struts-action/userGuide/release-notes-1_3_1.html -Redirect permanent /struts-action/userGuide/release-notes-1.3.2.html http://struts.apache.org/struts-action/userGuide/release-notes-1_3_2.html +Redirect permanent /struts-action/userGuide/installation-1.0.html http://struts.apache.org/1.x/userGuide/installation-1_0.html +Redirect permanent /struts-action/userGuide/release-notes-1.0-b1.html http://struts.apache.org/1.x/userGuide/release-notes-1_0-b1.html +Redirect permanent /struts-action/userGuide/release-notes-1.0-b2.html http://struts.apache.org/1.x/userGuide/release-notes-1_0-b2.html +Redirect permanent /struts-action/userGuide/release-notes-1.0-b3.html http://struts.apache.org/1.x/userGuide/release-notes-1_0-b3.html +Redirect permanent /struts-action/userGuide/release-notes-1.0.1.html http://struts.apache.org/1.x/userGuide/release-notes-1_0_1.html +Redirect permanent /struts-action/userGuide/release-notes-1.0.2.html http://struts.apache.org/1.x/userGuide/release-notes-1_0_2.html +Redirect permanent /struts-action/userGuide/release-notes-1.0.html http://struts.apache.org/1.x/userGuide/release-notes-1_0.html +Redirect permanent /struts-action/userGuide/release-notes-1.1-b1.html http://struts.apache.org/1.x/userGuide/release-notes-1_1-b1.html +Redirect permanent /struts-action/userGuide/release-notes-1.1-b2.html http://struts.apache.org/1.x/userGuide/release-notes-1_1-b2.html +Redirect permanent /struts-action/userGuide/release-notes-1.1-b3.html http://struts.apache.org/1.x/userGuide/release-note
svn commit: r418546 - in /struts/struts2/trunk: core/pom.xml extras/pom.xml
Author: mrdon Date: Sat Jul 1 20:25:39 2006 New Revision: 418546 URL: http://svn.apache.org/viewvc?rev=418546&view=rev Log: Fixing site links WW-1367 Modified: struts/struts2/trunk/core/pom.xml struts/struts2/trunk/extras/pom.xml Modified: struts/struts2/trunk/core/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/pom.xml?rev=418546&r1=418545&r2=418546&view=diff == --- struts/struts2/trunk/core/pom.xml (original) +++ struts/struts2/trunk/core/pom.xml Sat Jul 1 20:25:39 2006 @@ -15,7 +15,7 @@ apache-site - scp://people.apache.org/www/struts.apache.org/struts2/struts-core + scp://people.apache.org/www/struts.apache.org/2.0/struts-core Modified: struts/struts2/trunk/extras/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/extras/pom.xml?rev=418546&r1=418545&r2=418546&view=diff == --- struts/struts2/trunk/extras/pom.xml (original) +++ struts/struts2/trunk/extras/pom.xml Sat Jul 1 20:25:39 2006 @@ -15,7 +15,7 @@ apache-site - scp://people.apache.org/www/struts.apache.org/struts2/struts-extras + scp://people.apache.org/www/struts.apache.org/2.0/struts-extras
svn commit: r418547 - /struts/site/src/site/xdoc/downloads.xml
Author: mrdon Date: Sat Jul 1 20:34:45 2006 New Revision: 418547 URL: http://svn.apache.org/viewvc?rev=418547&view=rev Log: Fixed Struts nightly build link STR-2898 Modified: struts/site/src/site/xdoc/downloads.xml Modified: struts/site/src/site/xdoc/downloads.xml URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/downloads.xml?rev=418547&r1=418546&r2=418547&view=diff == --- struts/site/src/site/xdoc/downloads.xml (original) +++ struts/site/src/site/xdoc/downloads.xml Sat Jul 1 20:34:45 2006 @@ -131,8 +131,8 @@ -http://cvs.apache.org/builds/struts/maven/trunk/nightly/struts-action/";> -Struts 1 Nightly Builds +http://cvs.apache.org/builds/struts/maven/trunk/nightly/struts/";> +Struts Nightly Builds http://cvs.apache.org/builds/struts/nightly/struts-shale/";> @@ -154,7 +154,7 @@ Access to the Apache Struts source repository is available through both -http://svn.apache.org/viewcvs.cgi/struts/action/trunk/?root=Apache-SVN";> +http://svn.apache.org/viewcvs.cgi/struts/?root=Apache-SVN";> web browser and http://subversion.tigris.org/";>
[Struts Wiki] Update of "StrutsMaintenanceMaven" by WendySmoak
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Struts Wiki" for change notification. The following page has been changed by WendySmoak: http://wiki.apache.org/struts/StrutsMaintenanceMaven The comment on the change is: Changed server id to match the Apache master pom. -- /path/to/private/key - apache-maven-snapshots + apache.snapshots yourid /path/to/private/key
svn commit: r418551 - in /struts/shale/trunk/maven/etc: ./ buildShaleNightlyMaven.sh
Author: craigmcc Date: Sat Jul 1 21:27:39 2006 New Revision: 418551 URL: http://svn.apache.org/viewvc?rev=418551&view=rev Log: Commit the current nightly build script for Shale artifacts to the "etc" directory. Added: struts/shale/trunk/maven/etc/ struts/shale/trunk/maven/etc/buildShaleNightlyMaven.sh (with props) Added: struts/shale/trunk/maven/etc/buildShaleNightlyMaven.sh URL: http://svn.apache.org/viewvc/struts/shale/trunk/maven/etc/buildShaleNightlyMaven.sh?rev=418551&view=auto == --- struts/shale/trunk/maven/etc/buildShaleNightlyMaven.sh (added) +++ struts/shale/trunk/maven/etc/buildShaleNightlyMaven.sh Sat Jul 1 21:27:39 2006 @@ -0,0 +1,87 @@ +#!/bin/sh +# == +# buildShaleNightlyMaven -- Shale Nightly Builds (with Maven) +# == + +# == +# Setup +# == + +export BUILD_HOME=/home/craigmcc/Build +export CLASSPATH=. +export TSTAMP=`date +%Y%m%d` + +echo \ +echo \ +echo \Shale Nightly Build \(with Maven\) For $TSTAMP\ +echo \ +echo \ +echo \Shale Nightly Build \(with Maven\) For $TSTAMP\ + +# == +# Update From Subversion Repository +# == + +echo \Update From Subversion Repository\ +cd $BUILD_HOME/struts/current/shale +echo \ +svn update +echo \ + +# == +# Build and Deploy Framework Artifaces +# == + +echo \Build and Deploy Framework Artifacts\ +cd $BUILD_HOME/struts/current/shale +echo \ +mvn clean site install deploy + +cd shale-apps +mvn deploy -N +cd .. + +cd shale-dist +mvn assembly:assembly +scp target/assembly/out/shale-framework-*.tar.gz \ + [EMAIL PROTECTED]:/www/cvs.apache.org/builds/struts/shale/shale-framework-$TSTAMP.tar.gz +scp target/assembly/out/shale-framework-*.zip \ + [EMAIL PROTECTED]:/www/cvs.apache.org/builds/struts/shale/shale-framework-$TSTAMP.zip +cd .. + +echo \ + +# == +# Build and Deploy Sample Application Artifacts +# == + +echo \Build and Deploy Sample Application Artifacts\ +cd $BUILD_HOME/struts/current/shale/shale-apps + +export APPS="shale-blank shale-clay-usecases shale-mailreader" +export APPS="$APPS shale-sql-browser shale-usecases" + +for APP in $APPS; do + + cd $APP + echo \Processing sample application $APP\ + echo \ + + mvn clean install deploy assembly:assembly + scp target/$APP-*.tar.gz \ + [EMAIL PROTECTED]:/www/cvs.apache.org/builds/struts/shale/$APP-$TSTAMP.tar.gz + scp target/$APP-*.zip \ + [EMAIL PROTECTED]:/www/cvs.apache.org/builds/struts/shale/$APP-$TSTAMP.zip + + echo \ + cd .. + +done + +# == +# Finish Up +# == + +echo \Job Completed\ +echo \ +echo \ Propchange: struts/shale/trunk/maven/etc/buildShaleNightlyMaven.sh -- svn:executable = *
svn commit: r418552 - /struts/struts1/branches/STRUTS_1_2_BRANCH/
Author: jmitchell Date: Sat Jul 1 21:29:31 2006 New Revision: 418552 URL: http://svn.apache.org/viewvc?rev=418552&view=rev Log: Fix for the rename of action -> struts1 Modified: struts/struts1/branches/STRUTS_1_2_BRANCH/ (props changed) Propchange: struts/struts1/branches/STRUTS_1_2_BRANCH/ -- --- svn:externals (original) +++ svn:externals Sat Jul 1 21:29:31 2006 @@ -1,3 +1,3 @@ -contrib/el https://svn.apache.org/repos/asf/struts/action/branches/el/STRUTS_1_2_BRANCH +contrib/el https://svn.apache.org/repos/asf/struts/struts1/branches/el/STRUTS_1_2_BRANCH contrib/struts-chain https://svn.apache.org/repos/asf/struts/sandbox/branches/STRUTS_1_2_BRANCH/struts-chain -contrib/struts-faces https://svn.apache.org/repos/asf/struts/action/trunk/faces +contrib/struts-faces https://svn.apache.org/repos/asf/struts/struts1/trunk/faces
svn commit: r418556 - in /struts/struts2/trunk/archetype: README.txt pom.xml
Author: tmjee Date: Sat Jul 1 23:36:14 2006 New Revision: 418556 URL: http://svn.apache.org/viewvc?rev=418556&view=rev Log: WW-1367 - changed the groupId of this maven archetype to 'org.apache.struts2' - the artifactId is 'struts2-archetype-quickstart - changed the README.txt file to reflect the above changes ** changes are due to renaming the struts packages Modified: struts/struts2/trunk/archetype/README.txt struts/struts2/trunk/archetype/pom.xml Modified: struts/struts2/trunk/archetype/README.txt URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetype/README.txt?rev=418556&r1=418555&r2=418556&view=diff == --- struts/struts2/trunk/archetype/README.txt (original) +++ struts/struts2/trunk/archetype/README.txt Sat Jul 1 23:36:14 2006 @@ -29,7 +29,7 @@ - the webapp war name -> myWebApp - mvn archetype:create -DgroupId=com.myCompany.mySystem -DartifactId=myWebApp -DarchetypeGroupId=org.apache.struts.action2 -DarchetypeArtifactId=saf2-archetype-quickstart + mvn archetype:create -DgroupId=com.myCompany.mySystem -DartifactId=myWebApp -DarchetypeGroupId=org.apache.struts2 -DarchetypeArtifactId=struts2-archetype-quickstart THis will create the sample Web app template Modified: struts/struts2/trunk/archetype/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/archetype/pom.xml?rev=418556&r1=418555&r2=418556&view=diff == --- struts/struts2/trunk/archetype/pom.xml (original) +++ struts/struts2/trunk/archetype/pom.xml Sat Jul 1 23:36:14 2006 @@ -2,7 +2,7 @@ 4.0.0 - org.apache.struts + org.apache.struts2 struts2-archetype-quickstart 1.0-SNAPSHOT maven-plugin
