svn commit: r397781 - in /struts/action/trunk/integration: ./ apps-it/ apps-it/src/ apps-it/src/test/ apps-it/src/test/java/ apps-it/src/test/java/org/ apps-it/src/test/java/org/apache/ apps-it/src/te
Author: wsmoak
Date: Thu Apr 27 23:27:27 2006
New Revision: 397781
URL: http://svn.apache.org/viewcvs?rev=397781view=rev
Log:
Added automated tests to confirm that each example app starts and displays its
default page.
Use 'mvn -P perform-itest' to run the tests.
Issue: STR-2850
Added:
struts/action/trunk/integration/apps-it/
struts/action/trunk/integration/apps-it/pom.xml (with props)
struts/action/trunk/integration/apps-it/src/
struts/action/trunk/integration/apps-it/src/test/
struts/action/trunk/integration/apps-it/src/test/java/
struts/action/trunk/integration/apps-it/src/test/java/org/
struts/action/trunk/integration/apps-it/src/test/java/org/apache/
struts/action/trunk/integration/apps-it/src/test/java/org/apache/struts/
struts/action/trunk/integration/apps-it/src/test/java/org/apache/struts/apps/
struts/action/trunk/integration/apps-it/src/test/java/org/apache/struts/apps/AppsTest.java
(with props)
struts/action/trunk/integration/apps-it/src/test/java/org/apache/struts/apps/Tomcat5xTestSetup.java
(with props)
Modified:
struts/action/trunk/integration/pom.xml
Added: struts/action/trunk/integration/apps-it/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/integration/apps-it/pom.xml?rev=397781view=auto
==
--- struts/action/trunk/integration/apps-it/pom.xml (added)
+++ struts/action/trunk/integration/apps-it/pom.xml Thu Apr 27 23:27:27 2006
@@ -0,0 +1,121 @@
+?xml version=1.0?
+!--
+/*
+ * Copyright 2005-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Id$
+ */
+--
+
+project xmlns=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;
+
+ parent
+ groupIdorg.apache.struts.action/groupId
+ artifactIdstruts-action-it/artifactId
+ version1.3.3-SNAPSHOT/version
+ /parent
+
+ modelVersion4.0.0/modelVersion
+ groupIdorg.apache.struts.action/groupId
+ artifactIdstruts-action-it-apps/artifactId
+ packagingpom/packaging
+ nameStruts Action - Integration - Apps Tests/name
+ urlhttp://struts.apache.org/url
+
+ dependencies
+ dependency
+ groupIdjunit/groupId
+ artifactIdjunit/artifactId
+ version3.8.1/version
+ /dependency
+ dependency
+ groupIdhtmlunit/groupId
+ artifactIdhtmlunit/artifactId
+ version1.8/version
+ exclusions
+exclusion
+ groupIdjavax.xml/groupId
+ artifactIdjsr173/artifactId
+/exclusion
+ /exclusions
+ /dependency
+ dependency
+ groupIdorg.codehaus.cargo/groupId
+ artifactIdcargo-core-uberjar/artifactId
+ version0.8/version
+ scopetest/scope
+ /dependency
+ dependency
+ groupIdorg.codehaus.cargo/groupId
+ artifactIdcargo-ant/artifactId
+ version0.8/version
+ scopetest/scope
+ /dependency
+ /dependencies
+
+ profiles
+ profile
+ idperform-itest/id
+ build
+plugins
+ plugin
+ groupIdorg.apache.maven.plugins/groupId
+ artifactIdmaven-compiler-plugin/artifactId
+ executions
+ execution
+idcompiler-for-tests/id
+phasetest-compile/phase
+goals
+ goaltestCompile/goal
+/goals
+ /execution
+ /executions
+ /plugin
+ plugin
+ groupIdorg.apache.maven.plugins/groupId
+ artifactIdmaven-surefire-plugin/artifactId
+ configuration
+ systemProperties
+property
+ namecargo.tomcat5x.home/name
+ value${cargo.tomcat5x.home}/value
+/property
+property
+ namecargo.servlet.port/name
+ value8080/value
+/property
+property
+ nameversion/name
+ value${version}/value
svn commit: r397784 - in /struts/action/trunk/integration/apps-it: pom.xml src/test/java/org/apache/struts/apps/AppsTest.java src/test/java/org/apache/struts/apps/Tomcat5xTestSetup.java
Author: wsmoak
Date: Thu Apr 27 23:31:16 2006
New Revision: 397784
URL: http://svn.apache.org/viewcvs?rev=397784view=rev
Log:
Removed svn:executable property
Modified:
struts/action/trunk/integration/apps-it/pom.xml (props changed)
struts/action/trunk/integration/apps-it/src/test/java/org/apache/struts/apps/AppsTest.java
(props changed)
struts/action/trunk/integration/apps-it/src/test/java/org/apache/struts/apps/Tomcat5xTestSetup.java
(props changed)
Propchange: struts/action/trunk/integration/apps-it/pom.xml
('svn:executable' removed)
Propchange:
struts/action/trunk/integration/apps-it/src/test/java/org/apache/struts/apps/AppsTest.java
('svn:executable' removed)
Propchange:
struts/action/trunk/integration/apps-it/src/test/java/org/apache/struts/apps/Tomcat5xTestSetup.java
('svn:executable' removed)
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r398084 - /struts/sandbox/trunk/apps-test/
Author: wsmoak Date: Fri Apr 28 21:51:59 2006 New Revision: 398084 URL: http://svn.apache.org/viewcvs?rev=398084view=rev Log: Created folder for the currently non-working Cactus tests, and other test-related files that need to be reviewed. Added: struts/sandbox/trunk/apps-test/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r398085 - in /struts: action/trunk/integration/taglib-it/ sandbox/trunk/apps-test/taglib-it/
Author: wsmoak Date: Fri Apr 28 22:00:40 2006 New Revision: 398085 URL: http://svn.apache.org/viewcvs?rev=398085view=rev Log: Moved the Cactus tests for Struts Taglib to the sandbox. Issue: STR-2852 Added: struts/sandbox/trunk/apps-test/taglib-it/ - copied from r398084, struts/action/trunk/integration/taglib-it/ Removed: struts/action/trunk/integration/taglib-it/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r398086 - in /struts: action/trunk/integration/el-it/ sandbox/trunk/apps-test/el-it/
Author: wsmoak Date: Fri Apr 28 22:01:39 2006 New Revision: 398086 URL: http://svn.apache.org/viewcvs?rev=398086view=rev Log: Moved the Cactus tests for Struts EL to the sandbox. Issue: STR-2852 Added: struts/sandbox/trunk/apps-test/el-it/ - copied from r398085, struts/action/trunk/integration/el-it/ Removed: struts/action/trunk/integration/el-it/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r398087 - in /struts: action/trunk/faces/sysclient-app/ sandbox/trunk/apps-test/sysclient-app/
Author: wsmoak Date: Fri Apr 28 22:05:01 2006 New Revision: 398087 URL: http://svn.apache.org/viewcvs?rev=398087view=rev Log: Moved Struts Faces tests to sandbox. Issue: STR-2852 Added: struts/sandbox/trunk/apps-test/sysclient-app/ - copied from r398086, struts/action/trunk/faces/sysclient-app/ Removed: struts/action/trunk/faces/sysclient-app/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r398089 - in /struts: action/trunk/faces/systest1-webapp/ sandbox/trunk/apps-test/systest1-webapp/
Author: wsmoak Date: Fri Apr 28 22:05:52 2006 New Revision: 398089 URL: http://svn.apache.org/viewcvs?rev=398089view=rev Log: Moved Struts Faces tests to sandbox. Issue: STR-2852 Added: struts/sandbox/trunk/apps-test/systest1-webapp/ - copied from r398088, struts/action/trunk/faces/systest1-webapp/ Removed: struts/action/trunk/faces/systest1-webapp/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r398090 - in /struts: action/trunk/apps/test/ sandbox/trunk/apps-test/test/
Author: wsmoak Date: Fri Apr 28 22:07:09 2006 New Revision: 398090 URL: http://svn.apache.org/viewcvs?rev=398090view=rev Log: Moved Cactus test config to the sandbox. Issue: STR-2852 Added: struts/sandbox/trunk/apps-test/test/ - copied from r398089, struts/action/trunk/apps/test/ Removed: struts/action/trunk/apps/test/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r398094 - in /struts/action/trunk: assembly/src/main/assembly/dist.xml integration/pom.xml
Author: wsmoak Date: Fri Apr 28 22:51:05 2006 New Revision: 398094 URL: http://svn.apache.org/viewcvs?rev=398094view=rev Log: Include the new apps integration tests in the assembly. Issue: STR-2850 Modified: struts/action/trunk/assembly/src/main/assembly/dist.xml struts/action/trunk/integration/pom.xml Modified: struts/action/trunk/assembly/src/main/assembly/dist.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/assembly/src/main/assembly/dist.xml?rev=398094r1=398093r2=398094view=diff == --- struts/action/trunk/assembly/src/main/assembly/dist.xml (original) +++ struts/action/trunk/assembly/src/main/assembly/dist.xml Fri Apr 28 22:51:05 2006 @@ -162,8 +162,8 @@ /includes /fileSet fileSet - directory../integration/taglib-it/directory - outputDirectorysrc/integration/taglib-it/outputDirectory + directory../integration/apps-it/directory + outputDirectorysrc/integration/apps-it/outputDirectory includes includepom.xml/include includesrc//include Modified: struts/action/trunk/integration/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/integration/pom.xml?rev=398094r1=398093r2=398094view=diff == --- struts/action/trunk/integration/pom.xml (original) +++ struts/action/trunk/integration/pom.xml Fri Apr 28 22:51:05 2006 @@ -35,7 +35,6 @@ nameStruts Action - Integration Tests/name modules - moduletaglib-it/module moduleapps-it/module /modules - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r397772 - /struts/action/trunk/assembly/pom.xml
Author: wsmoak
Date: Thu Apr 27 22:52:51 2006
New Revision: 397772
URL: http://svn.apache.org/viewcvs?rev=397772view=rev
Log:
Add the Struts Tiles jar to the assembly.
Reported by: Jürgen Zimmermann Juergen.Zimmermann -at- hs-karlsruhe.de
Modified:
struts/action/trunk/assembly/pom.xml
Modified: struts/action/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/assembly/pom.xml?rev=397772r1=397771r2=397772view=diff
==
--- struts/action/trunk/assembly/pom.xml (original)
+++ struts/action/trunk/assembly/pom.xml Thu Apr 27 22:52:51 2006
@@ -175,6 +175,11 @@
/dependency
dependency
groupIdorg.apache.struts.action/groupId
+ artifactIdstruts-tiles/artifactId
+ version${version}/version
+/dependency
+dependency
+ groupIdorg.apache.struts.action/groupId
artifactIdstruts-mailreader-dao/artifactId
version${version}/version
/dependency
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r397109 - /struts/site/src/site/xdoc/downloads.xml
Author: wsmoak Date: Tue Apr 25 23:45:09 2006 New Revision: 397109 URL: http://svn.apache.org/viewcvs?rev=397109view=rev Log: Updated to reflect the latest project structure, added a link to Shale's nightly builds. Modified: struts/site/src/site/xdoc/downloads.xml Modified: struts/site/src/site/xdoc/downloads.xml URL: http://svn.apache.org/viewcvs/struts/site/src/site/xdoc/downloads.xml?rev=397109r1=397108r2=397109view=diff == --- struts/site/src/site/xdoc/downloads.xml (original) +++ struts/site/src/site/xdoc/downloads.xml Tue Apr 25 23:45:09 2006 @@ -130,22 +130,15 @@ Use at your own risk! /p -p -Apache Struts development builds are managed using -a href=http://maven.apache.org/;Apache Maven/a -. -Maven acquires the various JARs needed by Struts products -and automaticaly shares JARs between Struts subprojects -and other -Maven projects. -/p - ul li -a href=http://svn.apache.org/builds/struts/maven/; -Nightly Builds/a -. +a href=http://cvs.apache.org/builds/struts/maven/trunk/nightly/struts-action/; +Action 1 Nightly Builds/a +/li +li +a href=http://cvs.apache.org/builds/struts/nightly/struts-shale/; +Shale Nightly Builds/a /li /ul @@ -173,8 +166,8 @@ /p p -To download the trunk (HEAD revision) of any Struts -subproject, +To download the trunk (HEAD revision) of all Struts +subprojects, a convenience directory has been added, named bcurrent/b . @@ -222,23 +215,10 @@ /p ul -li - http://svn.apache.org/repos/asf/struts/action/trunk/li -lihttp://svn.apache.org/repos/asf/struts/apps/trunk/li -lihttp://svn.apache.org/repos/asf/struts/el/trunk/li -li -http://svn.apache.org/repos/asf/struts/faces/trunk/li -lihttp://svn.apache.org/repos/asf/struts/flow/trunk/li -li - http://svn.apache.org/repos/asf/struts/sandbox/trunk/li -li - http://svn.apache.org/repos/asf/struts/scripting/trunk/li -li -http://svn.apache.org/repos/asf/struts/shale/trunk/li -li - http://svn.apache.org/repos/asf/struts/taglib/trunk/li -li -http://svn.apache.org/repos/asf/struts/tiles/trunk/li + lihttp://svn.apache.org/repos/asf/struts/action/trunk/li + lihttp://svn.apache.org/repos/asf/struts/sandbox/trunk/li +lihttp://svn.apache.org/repos/asf/struts/shale/trunk/li +lihttp://svn.apache.org/repos/asf/struts/site/li /ul p @@ -285,7 +265,7 @@ we recommend that you install and use a href=http://maven.apache.org; Apache Maven/a -1.0.2, +2.0, since Maven will acquire whatever external JARs your system may need. Of course, @@ -295,11 +275,11 @@ /p p -With Maven installed, building the entire Struts codebase +With Maven installed, building the entire Struts Action 1 codebase is as simple as /p -code/current/build/gt; maven build-all/code +code/current/action/gt; mvn install/code p Maven will automatically download any dependencies as - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r396451 - /struts/action/trunk/faces/pom.xml
Author: wsmoak Date: Sun Apr 23 23:28:13 2006 New Revision: 396451 URL: http://svn.apache.org/viewcvs?rev=396451view=rev Log: Mark the MyFaces dependency as provided. Modified: struts/action/trunk/faces/pom.xml Modified: struts/action/trunk/faces/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/faces/pom.xml?rev=396451r1=396450r2=396451view=diff == --- struts/action/trunk/faces/pom.xml (original) +++ struts/action/trunk/faces/pom.xml Sun Apr 23 23:28:13 2006 @@ -115,6 +115,7 @@ groupIdmyfaces/groupId artifactIdmyfaces-jsf-api/artifactId version1.0.9/version +scopeprovided/scope /dependency /dependencies - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r396458 - in /struts/action/trunk/assembly: pom.xml src/main/assembly/dist.xml
Author: wsmoak
Date: Sun Apr 23 23:53:31 2006
New Revision: 396458
URL: http://svn.apache.org/viewcvs?rev=396458view=rev
Log:
Include struts-tiles in the assembly and clean up the pom.
Mark several dependencies as 'provided' so they will not be included in the
'lib' directory of the assembly.
(Normally this is done with exclusions but I couldn't determine where they
were coming from.)
Modified:
struts/action/trunk/assembly/pom.xml
struts/action/trunk/assembly/src/main/assembly/dist.xml
Modified: struts/action/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/assembly/pom.xml?rev=396458r1=396457r2=396458view=diff
==
--- struts/action/trunk/assembly/pom.xml (original)
+++ struts/action/trunk/assembly/pom.xml Sun Apr 23 23:53:31 2006
@@ -51,60 +51,6 @@
groupIdorg.codehaus.mojo/groupId
artifactIddependency-maven-plugin/artifactId
executions
- !--execution
-idcopy-javadoc/id
-phasepackage/phase
-goals
- goalcopy/goal
-/goals
-configuration
- artifactItems
-artifactItem
- groupIdorg.apache.struts.action/groupId
- artifactIdstruts-core/artifactId
- version${version}/version
- classifierjavadoc/classifier
-/artifactItem
-artifactItem
- groupIdorg.apache.struts.action/groupId
- artifactIdstruts-el/artifactId
- version${version}/version
- classifierjavadoc/classifier
-/artifactItem
-artifactItem
- groupIdorg.apache.struts.action/groupId
- artifactIdstruts-extras/artifactId
- version${version}/version
- classifierjavadoc/classifier
-/artifactItem
-artifactItem
- groupIdorg.apache.struts.action/groupId
- artifactIdstruts-faces/artifactId
- version${version}/version
- classifierjavadoc/classifier
-/artifactItem
-artifactItem
- groupIdorg.apache.struts.action/groupId
- artifactIdstruts-mailreader-dao/artifactId
- version${version}/version
- classifierjavadoc/classifier
-/artifactItem
-artifactItem
- groupIdorg.apache.struts.action/groupId
- artifactIdstruts-scripting/artifactId
- version${version}/version
- classifierjavadoc/classifier
-/artifactItem
-artifactItem
- groupIdorg.apache.struts.action/groupId
- artifactIdstruts-taglib/artifactId
- version${version}/version
- classifierjavadoc/classifier
-/artifactItem
- /artifactItems
-
outputDirectory${project.build.directory}/javadoc/outputDirectory
-/configuration
- /execution--
execution
idcopy-war/id
phasepackage/phase
@@ -171,60 +117,6 @@
outputDirectory${project.build.directory}/webapps/outputDirectory
/configuration
/execution
- !--execution
-idcopy-sources/id
-phasepackage/phase
-goals
- goalcopy/goal
-/goals
-configuration
- artifactItems
-artifactItem
- groupIdorg.apache.struts.action/groupId
- artifactIdstruts-core/artifactId
- version${version}/version
- classifiersources/classifier
-/artifactItem
-artifactItem
- groupIdorg.apache.struts.action/groupId
- artifactIdstruts-el/artifactId
- version${version}/version
- classifiersources/classifier
-/artifactItem
-artifactItem
- groupIdorg.apache.struts.action/groupId
- artifactIdstruts-extras/artifactId
- version${version}/version
- classifiersources/classifier
-/artifactItem
-artifactItem
- groupIdorg.apache.struts.action/groupId
- artifactIdstruts-faces/artifactId
- version${version}/version
- classifiersources/classifier
-/artifactItem
-artifactItem
- groupIdorg.apache.struts.action/groupId
- artifactIdstruts-mailreader-dao/artifactId
- version${version}/version
- classifiersources/classifier
svn commit: r396463 - in /struts/action/trunk/apps/scripting-mailreader/src/main: java/org/apache/struts/apps/scriptingmailreader/ webapp/ webapp/WEB-INF/ webapp/WEB-INF/scripts/
Author: wsmoak Date: Mon Apr 24 00:03:39 2006 New Revision: 396463 URL: http://svn.apache.org/viewcvs?rev=396463view=rev Log: Correct the package name. Added svn eol-style property to scripts. Modified: struts/action/trunk/apps/scripting-mailreader/src/main/java/org/apache/struts/apps/scriptingmailreader/Constants.java struts/action/trunk/apps/scripting-mailreader/src/main/webapp/Error.jsp struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/EditRegistration.gv (contents, props changed) struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/EditSubscription.gv (contents, props changed) struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/Locale.gv (props changed) struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/Logoff.gv (contents, props changed) struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/Logon.gv (contents, props changed) struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/SaveRegistration.gv (contents, props changed) struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/SaveSubscription.gv (contents, props changed) struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/Welcome.gv (contents, props changed) struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/struts-config.xml Modified: struts/action/trunk/apps/scripting-mailreader/src/main/java/org/apache/struts/apps/scriptingmailreader/Constants.java URL: http://svn.apache.org/viewcvs/struts/action/trunk/apps/scripting-mailreader/src/main/java/org/apache/struts/apps/scriptingmailreader/Constants.java?rev=396463r1=396462r2=396463view=diff == --- struts/action/trunk/apps/scripting-mailreader/src/main/java/org/apache/struts/apps/scriptingmailreader/Constants.java (original) +++ struts/action/trunk/apps/scripting-mailreader/src/main/java/org/apache/struts/apps/scriptingmailreader/Constants.java Mon Apr 24 00:03:39 2006 @@ -88,7 +88,7 @@ * The package name for this application. * /p */ -public static final String PACKAGE = org.apache.struts.apps.mailreader; +public static final String PACKAGE = org.apache.struts.apps.scriptingmailreader; /** * p Modified: struts/action/trunk/apps/scripting-mailreader/src/main/webapp/Error.jsp URL: http://svn.apache.org/viewcvs/struts/action/trunk/apps/scripting-mailreader/src/main/webapp/Error.jsp?rev=396463r1=396462r2=396463view=diff == --- struts/action/trunk/apps/scripting-mailreader/src/main/webapp/Error.jsp (original) +++ struts/action/trunk/apps/scripting-mailreader/src/main/webapp/Error.jsp Mon Apr 24 00:03:39 2006 @@ -22,7 +22,7 @@ %@ page contentType=text/html;charset=UTF-8 language=java % %@ page import=org.apache.struts.Globals % -%@ page import=org.apache.struts.apps.mailreader.Constants % +%@ page import=org.apache.struts.apps.scriptingmailreader.Constants % %@ taglib uri=http://struts.apache.org/tags-bean; prefix=bean % %@ taglib uri=http://struts.apache.org/tags-html; prefix=html % Modified: struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/EditRegistration.gv URL: http://svn.apache.org/viewcvs/struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/EditRegistration.gv?rev=396463r1=396462r2=396463view=diff == --- struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/EditRegistration.gv (original) +++ struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/EditRegistration.gv Mon Apr 24 00:03:39 2006 @@ -1,7 +1,7 @@ import java.lang.reflect.InvocationTargetException; import javax.servlet.ServletException; import org.apache.commons.beanutils.PropertyUtils; -import org.apache.struts.apps.mailreader.*; +import org.apache.struts.apps.scriptingmailreader.*; import org.apache.struts.apps.mailreader.dao.*; act = request.getParameter(task); Propchange: struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/EditRegistration.gv -- svn:eol-style = native Modified: struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/EditSubscription.gv URL: http://svn.apache.org/viewcvs/struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/EditSubscription.gv?rev=396463r1=396462r2=396463view=diff == --- struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/EditSubscription.gv (original
svn commit: r396466 - /struts/action/trunk/pom.xml
Author: wsmoak Date: Mon Apr 24 00:11:50 2006 New Revision: 396466 URL: http://svn.apache.org/viewcvs?rev=396466view=rev Log: Add tiles to the list of modules. Modified: struts/action/trunk/pom.xml Modified: struts/action/trunk/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/pom.xml?rev=396466r1=396465r2=396466view=diff == --- struts/action/trunk/pom.xml (original) +++ struts/action/trunk/pom.xml Mon Apr 24 00:11:50 2006 @@ -68,6 +68,7 @@ moduleel/module moduleextras/module moduletaglib/module +moduletiles/module modulefaces/module modulescripting/module moduleapps/module - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r396468 - /struts/action/trunk/tiles/pom.xml
Author: wsmoak Date: Mon Apr 24 00:25:54 2006 New Revision: 396468 URL: http://svn.apache.org/viewcvs?rev=396468view=rev Log: Corrected the project name. Modified: struts/action/trunk/tiles/pom.xml Modified: struts/action/trunk/tiles/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/tiles/pom.xml?rev=396468r1=396467r2=396468view=diff == --- struts/action/trunk/tiles/pom.xml (original) +++ struts/action/trunk/tiles/pom.xml Mon Apr 24 00:25:54 2006 @@ -33,7 +33,7 @@ artifactIdstruts-tiles/artifactId packagingjar/packaging - nameStruts Tiles/name + nameStruts Action - Tiles/name distributionManagement site - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r396472 - /struts/action/trunk/apps/faces-example1/pom.xml
Author: wsmoak Date: Mon Apr 24 00:39:12 2006 New Revision: 396472 URL: http://svn.apache.org/viewcvs?rev=396472view=rev Log: Added the myfaces-jsf-api dependency, which was marked as 'provided' in the struts-faces pom. Modified: struts/action/trunk/apps/faces-example1/pom.xml Modified: struts/action/trunk/apps/faces-example1/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/apps/faces-example1/pom.xml?rev=396472r1=396471r2=396472view=diff == --- struts/action/trunk/apps/faces-example1/pom.xml (original) +++ struts/action/trunk/apps/faces-example1/pom.xml Mon Apr 24 00:39:12 2006 @@ -19,18 +19,6 @@ */ -- -!-- - Experimental Maven 2 Build for Apache Struts - - -To build and install this module into your local repo: - - $ mvn install - -For more information, see: http://wiki.apache.org/struts/StrutsMaven2Plan - --- - project xmlns=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; @@ -68,6 +56,12 @@ artifactIdmyfaces-extensions/artifactId version1.0.9/version /dependency + dependency +groupIdmyfaces/groupId +artifactIdmyfaces-jsf-api/artifactId +version1.0.9/version + /dependency + /dependencies - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r396474 - /struts/action/trunk/apps/faces-example2/pom.xml
Author: wsmoak Date: Mon Apr 24 00:50:42 2006 New Revision: 396474 URL: http://svn.apache.org/viewcvs?rev=396474view=rev Log: Added the myfaces-jsf-api dependency, which was marked as 'provided' in the struts-faces pom. Modified: struts/action/trunk/apps/faces-example2/pom.xml Modified: struts/action/trunk/apps/faces-example2/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/apps/faces-example2/pom.xml?rev=396474r1=396473r2=396474view=diff == --- struts/action/trunk/apps/faces-example2/pom.xml (original) +++ struts/action/trunk/apps/faces-example2/pom.xml Mon Apr 24 00:50:42 2006 @@ -19,18 +19,6 @@ */ -- -!-- - Experimental Maven 2 Build for Apache Struts - - -To build and install this module into your local repo: - - $ mvn install - -For more information, see: http://wiki.apache.org/struts/StrutsMaven2Plan - --- - project xmlns=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; @@ -58,6 +46,11 @@ version2.3/version scopeprovided/scope /dependency + dependency +groupIdmyfaces/groupId +artifactIdmyfaces-jsf-api/artifactId +version1.0.9/version + /dependency /dependencies build - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r396587 - /struts/action/trunk/src/site/site.xml
Author: wsmoak
Date: Mon Apr 24 08:49:57 2006
New Revision: 396587
URL: http://svn.apache.org/viewcvs?rev=396587view=rev
Log:
Add Struts Tiles to the menu.
Modified:
struts/action/trunk/src/site/site.xml
Modified: struts/action/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/src/site/site.xml?rev=396587r1=396586r2=396587view=diff
==
--- struts/action/trunk/src/site/site.xml (original)
+++ struts/action/trunk/src/site/site.xml Mon Apr 24 08:49:57 2006
@@ -88,6 +88,9 @@
item name=Struts Taglib
href=struts-taglib/index.html /
+item name=Struts Tiles
+href=struts-tiles/index.html /
+
/menu
${modules}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r396591 - /struts/action/trunk/apps/blank/src/main/webapp/WEB-INF/struts-config.xml
Author: wsmoak Date: Mon Apr 24 08:59:43 2006 New Revision: 396591 URL: http://svn.apache.org/viewcvs?rev=396591view=rev Log: Tiles is not configured in the struts-blank app. Modified: struts/action/trunk/apps/blank/src/main/webapp/WEB-INF/struts-config.xml Modified: struts/action/trunk/apps/blank/src/main/webapp/WEB-INF/struts-config.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/apps/blank/src/main/webapp/WEB-INF/struts-config.xml?rev=396591r1=396590r2=396591view=diff == --- struts/action/trunk/apps/blank/src/main/webapp/WEB-INF/struts-config.xml (original) +++ struts/action/trunk/apps/blank/src/main/webapp/WEB-INF/struts-config.xml Mon Apr 24 08:59:43 2006 @@ -8,8 +8,8 @@ This is a blank Struts configuration file with an example welcome action/page and other commented sample elements. - Tiles and the Struts Validator are configured using the factory defaults - and are ready-to-use. + Struts Validator is configured using the factory defaults + and is ready-to-use. NOTE: If you have a generator tool to create the corresponding Java classes for you, you could include the details in the form-bean declarations. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r396220 - in /struts/action/trunk: el/pom.xml extras/pom.xml faces/pom.xml scripting/pom.xml taglib/pom.xml
Author: wsmoak Date: Sat Apr 22 23:03:49 2006 New Revision: 396220 URL: http://svn.apache.org/viewcvs?rev=396220view=rev Log: Added distributionManagement/site element to be used with 'mvn site:deploy'. Removed experimental designation from poms. Modified: struts/action/trunk/el/pom.xml struts/action/trunk/extras/pom.xml struts/action/trunk/faces/pom.xml struts/action/trunk/scripting/pom.xml struts/action/trunk/taglib/pom.xml Modified: struts/action/trunk/el/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/el/pom.xml?rev=396220r1=396219r2=396220view=diff == --- struts/action/trunk/el/pom.xml (original) +++ struts/action/trunk/el/pom.xml Sat Apr 22 23:03:49 2006 @@ -19,18 +19,6 @@ */ -- -!-- - Experimental Maven 2 Build for Apache Struts - - -To build and install this module into your local repo: - - $ mvn install - -For more information, see: http://wiki.apache.org/struts/StrutsMaven2Plan - --- - project xmlns=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; @@ -46,6 +34,13 @@ packagingjar/packaging nameStruts Action - EL/name urlhttp://struts.apache.org/url + + distributionManagement + site + idapache-site/id + urlscp://people.apache.org/www/struts.apache.org/struts-action/struts-el/url + /site + /distributionManagement build Modified: struts/action/trunk/extras/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/extras/pom.xml?rev=396220r1=396219r2=396220view=diff == --- struts/action/trunk/extras/pom.xml (original) +++ struts/action/trunk/extras/pom.xml Sat Apr 22 23:03:49 2006 @@ -19,18 +19,6 @@ */ -- -!-- - Experimental Maven 2 Build for Apache Struts - - -To build and install this module into your local repo: - - $ mvn install - -For more information, see: http://wiki.apache.org/struts/StrutsMaven2Plan - --- - project xmlns=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; @@ -46,6 +34,13 @@ packagingjar/packaging nameStruts Action - Extras/name urlhttp://struts.apache.org/url + + distributionManagement + site + idapache-site/id + urlscp://people.apache.org/www/struts.apache.org/struts-action/struts-extras/url + /site + /distributionManagement build Modified: struts/action/trunk/faces/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/faces/pom.xml?rev=396220r1=396219r2=396220view=diff == --- struts/action/trunk/faces/pom.xml (original) +++ struts/action/trunk/faces/pom.xml Sat Apr 22 23:03:49 2006 @@ -19,18 +19,6 @@ */ -- -!-- - Experimental Maven 2 Build for Apache Struts - - -To build and install this module into your local repo: - - $ mvn install - -For more information, see: http://wiki.apache.org/struts/StrutsMaven2Plan - --- - project xmlns=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; @@ -48,6 +36,13 @@ packagingjar/packaging nameStruts Action - Faces/name urlhttp://struts.apache.org/url + + distributionManagement + site + idapache-site/id + urlscp://people.apache.org/www/struts.apache.org/struts-action/struts-faces/url + /site + /distributionManagement build Modified: struts/action/trunk/scripting/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/scripting/pom.xml?rev=396220r1=396219r2=396220view=diff == --- struts/action/trunk/scripting/pom.xml (original) +++ struts/action/trunk/scripting/pom.xml Sat Apr 22 23:03:49 2006 @@ -19,18 +19,6 @@ */ -- -!-- - Experimental Maven 2 Build for Apache Struts - - -To build and install this module into your local repo: - - $ mvn install - -For more information, see: http://wiki.apache.org/struts/StrutsMaven2Plan - --- - project xmlns=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; @@ -47,6 +35,13 @@ nameStruts
svn commit: r396233 - /struts/action/trunk/el/src/site/site.xml
Author: wsmoak Date: Sun Apr 23 00:01:49 2006 New Revision: 396233 URL: http://svn.apache.org/viewcvs?rev=396233view=rev Log: Corrected tagreference links, added a link to the Javadoc. Modified: struts/action/trunk/el/src/site/site.xml Modified: struts/action/trunk/el/src/site/site.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/el/src/site/site.xml?rev=396233r1=396232r2=396233view=diff == --- struts/action/trunk/el/src/site/site.xml (original) +++ struts/action/trunk/el/src/site/site.xml Sun Apr 23 00:01:49 2006 @@ -22,10 +22,11 @@ item name=FAQ href=struts-el.html/ /menu menu name=Reference -item name=Bean EL href=tagreference-struts-bean-el.html/ -item name=HTML EL href=tagreference-struts-html-el.html/ -item name=Logic EL href=tagreference-struts-logic-el.html/ -item name=Tiles EL href=tagreference-struts-tiles-el.html/ +item name=Bean EL href=tagreference.html#struts-bean-el.tld/ +item name=HTML EL href=tagreference.html#struts-html-el.tld/ +item name=Logic EL href=tagreference.html#struts-logic-el.tld/ +item name=Tiles EL href=tagreference.html#struts-tiles-el.tld/ +item name=Javadoc href=apidocs/index.html/ /menu menu name=Quick Links item - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r396335 - in /struts/action/trunk/apps: pom.xml src/ src/site/ src/site/site.xml xdocs/
Author: wsmoak
Date: Sun Apr 23 16:00:09 2006
New Revision: 396335
URL: http://svn.apache.org/viewcvs?rev=396335view=rev
Log:
Maven 2 reorganization.
Added:
struts/action/trunk/apps/src/
struts/action/trunk/apps/src/site/
struts/action/trunk/apps/src/site/site.xml (contents, props changed)
- copied, changed from r396315,
struts/action/trunk/apps/xdocs/navigation.xml
Removed:
struts/action/trunk/apps/xdocs/
Modified:
struts/action/trunk/apps/pom.xml
Modified: struts/action/trunk/apps/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/pom.xml?rev=396335r1=396334r2=396335view=diff
==
--- struts/action/trunk/apps/pom.xml (original)
+++ struts/action/trunk/apps/pom.xml Sun Apr 23 16:00:09 2006
@@ -19,18 +19,6 @@
*/
--
-!--
- Experimental Maven 2 Build for Apache Struts
-
-
-To build and install this module into your local repo:
-
- $ mvn install
-
-For more information, see: http://wiki.apache.org/struts/StrutsMaven2Plan
-
---
-
project xmlns=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;
Copied: struts/action/trunk/apps/src/site/site.xml (from r396315,
struts/action/trunk/apps/xdocs/navigation.xml)
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/src/site/site.xml?p2=struts/action/trunk/apps/src/site/site.xmlp1=struts/action/trunk/apps/xdocs/navigation.xmlr1=396315r2=396335rev=396335view=diff
==
--- struts/action/trunk/apps/xdocs/navigation.xml (original)
+++ struts/action/trunk/apps/src/site/site.xml Sun Apr 23 16:00:09 2006
@@ -1,11 +1,44 @@
?xml version=1.0 encoding=ISO-8859-1?
-project name=Struts Applications
-titleApache Struts - Struts Applications/title
+project name=Apache Struts
+bannerLeft
+nameApache Software Foundation/name
+srchttp://www.apache.org/images/asf-logo.gif/src
+hrefhttp://www.apache.org/href
+/bannerLeft
+bannerRight
+nameApache Struts/name
+srchttp://struts.apache.org/images/struts.gif/src
+hrefhttp://struts.apache.org/href
+/bannerRight
body
+links
+item name=Apache href=http://www.apache.org; /
+item name=Action href=http://struts.apache.org/struts-action;
/
+item name=Shale href=http://struts.apache.org/struts-shale; /
+item name=Tiles href=http://struts.apache.org/struts-tiles; /
+/links
+
menu name=Quick Links
item
name=Apache Struts Home
+href=http://struts.apache.org//
+item
+name=Struts Action
href=../index.html/
/menu
+
+menu name=Apps
+item
+name=Cookbook
+href=struts-cookbook//
+item
+name=Mailreader
+href=struts-mailreader//
+/menu
+
+${modules}
+
+${reports}
+
/body
/project
Propchange: struts/action/trunk/apps/src/site/site.xml
--
svn:eol-style = native
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r396336 - in /struts/action/trunk/assembly: pom.xml src/main/assembly/dist.xml
Author: wsmoak
Date: Sun Apr 23 16:20:09 2006
New Revision: 396336
URL: http://svn.apache.org/viewcvs?rev=396336view=rev
Log:
First pass at an assembly that includes the source code and website docs.
Added:
struts/action/trunk/assembly/src/main/assembly/dist.xml (with props)
Modified:
struts/action/trunk/assembly/pom.xml
Modified: struts/action/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/assembly/pom.xml?rev=396336r1=396335r2=396336view=diff
==
--- struts/action/trunk/assembly/pom.xml (original)
+++ struts/action/trunk/assembly/pom.xml Sun Apr 23 16:20:09 2006
@@ -19,18 +19,6 @@
*/
--
-!--
- Experimental Maven 2 Build for Apache Struts
-
-
-To create the assembly:
-
- $ mvn assembly:assembly
-
-For more information, see: http://wiki.apache.org/struts/StrutsMaven2Plan
-
---
-
project xmlns=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;
modelVersion4.0.0/modelVersion
@@ -63,7 +51,7 @@
groupIdorg.codehaus.mojo/groupId
artifactIddependency-maven-plugin/artifactId
executions
- execution
+ !--execution
idcopy-javadoc/id
phasepackage/phase
goals
@@ -116,7 +104,7 @@
/artifactItems
outputDirectory${project.build.directory}/javadoc/outputDirectory
/configuration
- /execution
+ /execution--
execution
idcopy-war/id
phasepackage/phase
@@ -183,7 +171,7 @@
outputDirectory${project.build.directory}/webapps/outputDirectory
/configuration
/execution
- execution
+ !--execution
idcopy-sources/id
phasepackage/phase
goals
@@ -236,7 +224,7 @@
/artifactItems
outputDirectory${project.build.directory}/sources/outputDirectory
/configuration
- /execution
+ /execution--
/executions
/plugin
/plugins
@@ -251,7 +239,8 @@
version2.0.1/version
configuration
descriptors
-descriptorsrc/main/assembly/all.xml/descriptor
+descriptorsrc/main/assembly/dist.xml/descriptor
+!-- descriptorsrc/main/assembly/all.xml/descriptor --
!-- descriptorsrc/main/assembly/dep.xml/descriptor --
!-- descriptorsrc/main/assembly/src.xml/descriptor --
/descriptors
Added: struts/action/trunk/assembly/src/main/assembly/dist.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/assembly/src/main/assembly/dist.xml?rev=396336view=auto
==
--- struts/action/trunk/assembly/src/main/assembly/dist.xml (added)
+++ struts/action/trunk/assembly/src/main/assembly/dist.xml Sun Apr 23 16:20:09
2006
@@ -0,0 +1,87 @@
+assembly
+ idall/id
+ formats
+formatzip/format
+ /formats
+ dependencySets
+dependencySet
+ outputDirectorylib/outputDirectory
+ scoperuntime/scope
+/dependencySet
+ /dependencySets
+ fileSets
+fileSet
+ directorysrc/main/resources/directory
+ outputDirectory/outputDirectory
+ includes
+includeREADME*/include
+includeLICENSE*/include
+includeNOTICE*/include
+ /includes
+/fileSet
+fileSet
+ directorytarget/webapps/directory
+ outputDirectorywebapps/outputDirectory
+ includes
+include*.war/include
+ /includes
+/fileSet
+
+!-- Include the source code in the assembly --
+fileSet
+ directory..//directory
+ outputDirectorysrc//outputDirectory
+ includes
+includepom.xml/include
+ /includes
+/fileSet
+fileSet
+ directory../core/directory
+ outputDirectorysrc/core/outputDirectory
+ includes
+includepom.xml/include
+includesrc//include
+ /includes
+ /fileSet
+ fileSet
+ directory../el/directory
+ outputDirectorysrc/el/outputDirectory
+ includes
+includepom.xml/include
+includesrc//include
+ /includes
+ /fileSet
+ fileSet
+ directory../taglib/directory
+ outputDirectorysrc/taglib/outputDirectory
+ includes
+includepom.xml/include
+includesrc//include
+ /includes
+ /fileSet
+
+
+ !-- Include the website docs in the assembly --
+ fileSet
+ directory../target/site/directory
+ outputDirectorydocs//outputDirectory
+ /fileSet
+ fileSet
+ directory../apps/target/site/directory
+ outputDirectorydocs/struts-apps/outputDirectory
+ /fileSet
+ fileSet
+ directory../core/target/site/directory
svn commit: r396361 - /struts/action/trunk/assembly/src/main/assembly/dist.xml
Author: wsmoak Date: Sun Apr 23 17:51:36 2006 New Revision: 396361 URL: http://svn.apache.org/viewcvs?rev=396361view=rev Log: Add more website docs to the assembly. Modified: struts/action/trunk/assembly/src/main/assembly/dist.xml Modified: struts/action/trunk/assembly/src/main/assembly/dist.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/assembly/src/main/assembly/dist.xml?rev=396361r1=396360r2=396361view=diff == --- struts/action/trunk/assembly/src/main/assembly/dist.xml (original) +++ struts/action/trunk/assembly/src/main/assembly/dist.xml Sun Apr 23 17:51:36 2006 @@ -71,12 +71,52 @@ outputDirectorydocs/struts-apps/outputDirectory /fileSet fileSet + directory../apps/blank/target/site/directory + outputDirectorydocs/struts-apps/struts-blank/outputDirectory + /fileSet + fileSet + directory../apps/cookbook/target/site/directory + outputDirectorydocs/struts-apps/struts-cookbook/outputDirectory + /fileSet + fileSet + directory../apps/examples/target/site/directory + outputDirectorydocs/struts-apps/struts-examples/outputDirectory + /fileSet + fileSet + directory../apps/faces-example1/target/site/directory + outputDirectorydocs/struts-apps/struts-faces-example1/outputDirectory + /fileSet + fileSet + directory../apps/mailreader/target/site/directory + outputDirectorydocs/struts-apps/struts-mailreader/outputDirectory + /fileSet + fileSet + directory../apps/scripting-mailreader/target/site/directory + outputDirectorydocs/struts-apps/struts-scripting-mailreader/outputDirectory + /fileSet + fileSet + directory../apps/strutsel-exercise-taglib/target/site/directory + outputDirectorydocs/struts-apps/strutsel-exercise-taglib/outputDirectory + /fileSet + fileSet directory../core/target/site/directory outputDirectorydocs/struts-core/outputDirectory /fileSet fileSet directory../el/target/site/directory outputDirectorydocs/struts-el/outputDirectory + /fileSet + fileSet + directory../extras/target/site/directory + outputDirectorydocs/struts-extras/outputDirectory + /fileSet + fileSet + directory../faces/target/site/directory + outputDirectorydocs/struts-faces/outputDirectory + /fileSet + fileSet + directory../scripting/target/site/directory + outputDirectorydocs/struts-scripting/outputDirectory /fileSet fileSet directory../taglib/target/site/directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r396369 - /struts/action/trunk/assembly/src/main/assembly/dist.xml
Author: wsmoak Date: Sun Apr 23 18:25:00 2006 New Revision: 396369 URL: http://svn.apache.org/viewcvs?rev=396369view=rev Log: Added more source code to the assembly. Modified: struts/action/trunk/assembly/src/main/assembly/dist.xml Modified: struts/action/trunk/assembly/src/main/assembly/dist.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/assembly/src/main/assembly/dist.xml?rev=396369r1=396368r2=396369view=diff == --- struts/action/trunk/assembly/src/main/assembly/dist.xml (original) +++ struts/action/trunk/assembly/src/main/assembly/dist.xml Sun Apr 23 18:25:00 2006 @@ -28,6 +28,7 @@ /fileSet !-- Include the source code in the assembly -- +!-- TODO: Replace with modules when maven-assembly-plugin is released -- fileSet directory..//directory outputDirectorysrc//outputDirectory @@ -36,6 +37,90 @@ /includes /fileSet fileSet + directory../apps/directory + outputDirectorysrc/apps/outputDirectory + includes +includepom.xml/include +includesrc//include + /includes +/fileSet +fileSet + directory../apps/blank/directory + outputDirectorysrc/apps/blank/outputDirectory + includes +includepom.xml/include +includesrc//include + /includes +/fileSet +fileSet + directory../apps/cookbook/directory + outputDirectorysrc/apps/cookbook/outputDirectory + includes +includepom.xml/include +includesrc//include + /includes +/fileSet +fileSet + directory../apps/examples/directory + outputDirectorysrc/apps/examples/outputDirectory + includes +includepom.xml/include +includesrc//include + /includes +/fileSet +fileSet + directory../apps/faces-example1/directory + outputDirectorysrc/apps/faces-example1/outputDirectory + includes +includepom.xml/include +includesrc//include + /includes +/fileSet +fileSet + directory../apps/faces-example2/directory + outputDirectorysrc/apps/faces-example2/outputDirectory + includes +includepom.xml/include +includesrc//include + /includes +/fileSet +fileSet + directory../apps/mailreader/directory + outputDirectorysrc/apps/mailreader/outputDirectory + includes +includepom.xml/include +includesrc//include + /includes +/fileSet +fileSet + directory../apps/scripting-mailreader/directory + outputDirectorysrc/apps/scripting-mailreader/outputDirectory + includes +includepom.xml/include +includesrc//include + /includes +/fileSet +fileSet + directory../apps/strutsel-exercise-taglib/directory + outputDirectorysrc/apps/strutsel-exercise-taglib/outputDirectory + includes +includepom.xml/include +includesrc//include + /includes +/fileSet +fileSet + directory../assembly/directory + outputDirectorysrc/assembly/outputDirectory + includes +includepom.xml/include +includesrc//include + /includes +/fileSet +fileSet + directory../build/directory + outputDirectorysrc/build/outputDirectory +/fileSet +fileSet directory../core/directory outputDirectorysrc/core/outputDirectory includes @@ -46,6 +131,54 @@ fileSet directory../el/directory outputDirectorysrc/el/outputDirectory + includes +includepom.xml/include +includesrc//include + /includes + /fileSet + fileSet + directory../extras/directory + outputDirectorysrc/extras/outputDirectory + includes +includepom.xml/include +includesrc//include + /includes + /fileSet + fileSet + directory../faces/directory + outputDirectorysrc/faces/outputDirectory + includes +includepom.xml/include +includesrc//include + /includes + /fileSet + fileSet + directory../integration/directory + outputDirectorysrc/integration/outputDirectory + includes +includepom.xml/include +includesrc//include + /includes + /fileSet + fileSet + directory../integration/taglib-it/directory + outputDirectorysrc/integration/taglib-it/outputDirectory + includes +includepom.xml/include +includesrc//include + /includes + /fileSet + fileSet + directory../mailreader-dao/directory + outputDirectorysrc/mailreader-dao/outputDirectory + includes +includepom.xml/include +includesrc//include + /includes + /fileSet + fileSet + directory../scripting/directory + outputDirectorysrc/scripting/outputDirectory includes includepom.xml/include includesrc//include - To unsubscribe, e-mail: [EMAIL
svn commit: r396389 - in /struts: action/trunk/apps/src/site/site.xml action/trunk/src/site/site.xml action/trunk/src/site/xdoc/javadoc.xml site/src/site/site.xml site/src/site/xdoc/javadoc.xml
Author: wsmoak
Date: Sun Apr 23 19:52:54 2006
New Revision: 396389
URL: http://svn.apache.org/viewcvs?rev=396389view=rev
Log:
Reworked the website menus and Javadoc links.
Added:
struts/action/trunk/src/site/xdoc/javadoc.xml (with props)
Modified:
struts/action/trunk/apps/src/site/site.xml
struts/action/trunk/src/site/site.xml (contents, props changed)
struts/site/src/site/site.xml
struts/site/src/site/xdoc/javadoc.xml
Modified: struts/action/trunk/apps/src/site/site.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/src/site/site.xml?rev=396389r1=396388r2=396389view=diff
==
--- struts/action/trunk/apps/src/site/site.xml (original)
+++ struts/action/trunk/apps/src/site/site.xml Sun Apr 23 19:52:54 2006
@@ -28,12 +28,28 @@
/menu
menu name=Apps
-item
-name=Cookbook
-href=struts-cookbook//
-item
-name=Mailreader
-href=struts-mailreader//
+
+item name=Struts Blank
+href=struts-blank/index.html /
+
+item name=Struts Cookbook
+href=struts-cookbook/index.html /
+
+item name=Struts Examples
+href=struts-examples/index.html /
+
+item name=Struts Faces 1
+href=struts-faces-example1/index.html /
+
+item name=Struts Faces 2
+href=struts-faces-example2/index.html /
+
+item name=Struts Mailreader
+href=struts-mailreader/index.html /
+
+item name=Struts EL Exercise Taglib
+href=strutsel-exercise-taglib/index.html /
+
/menu
${modules}
Modified: struts/action/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/src/site/site.xml?rev=396389r1=396388r2=396389view=diff
==
--- struts/action/trunk/src/site/site.xml (original)
+++ struts/action/trunk/src/site/site.xml Sun Apr 23 19:52:54 2006
@@ -49,8 +49,8 @@
href=faqs/index.html
/
item
-name=JavaDocs
-href=apidocs/index.html
+name=Javadoc
+href=javadoc.html
/
item
name=Release Notes
@@ -64,6 +64,33 @@
name=Apache Struts Home
href=http://struts.apache.org/
/menu
+
+menu name=Components
+
+item name=Struts Action Core
+href=struts-core/index.html /
+
+item name=Struts Apps
+href=struts-apps/index.html /
+
+item name=Struts EL
+href=struts-el/index.html /
+
+item name=Struts Extras
+href=struts-extras/index.html /
+
+item name=Struts Faces
+href=struts-faces/index.html /
+
+item name=Struts Scripting
+href=struts-scripting/index.html /
+
+item name=Struts Taglib
+href=struts-taglib/index.html /
+
+/menu
+
+${modules}
${reports}
/body
/project
Propchange: struts/action/trunk/src/site/site.xml
--
svn:eol-style = native
Added: struts/action/trunk/src/site/xdoc/javadoc.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/src/site/xdoc/javadoc.xml?rev=396389view=auto
==
--- struts/action/trunk/src/site/xdoc/javadoc.xml (added)
+++ struts/action/trunk/src/site/xdoc/javadoc.xml Sun Apr 23 19:52:54 2006
@@ -0,0 +1,53 @@
+?xml version=1.0?
+!--
+Copyright 2006 The Apache Software Foundation
+Licensed under the Apache License, Version 2.0 (the License);
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an AS IS BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+--
+!--
+// 78
+--
+document
+
+ properties
+ titleStruts Action - Javadoc/title
+ /properties
+
+ body
+
+ section name=Struts Action Javadoc
+
+ ul
+li
+ a href=struts-core/apidocs/index.html target=_blank
svn commit: r396390 - /struts/action/trunk/assembly/src/main/assembly/dist.xml
Author: wsmoak Date: Sun Apr 23 19:53:43 2006 New Revision: 396390 URL: http://svn.apache.org/viewcvs?rev=396390view=rev Log: Include the action/src directory in the assembly. Modified: struts/action/trunk/assembly/src/main/assembly/dist.xml Modified: struts/action/trunk/assembly/src/main/assembly/dist.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/assembly/src/main/assembly/dist.xml?rev=396390r1=396389r2=396390view=diff == --- struts/action/trunk/assembly/src/main/assembly/dist.xml (original) +++ struts/action/trunk/assembly/src/main/assembly/dist.xml Sun Apr 23 19:53:43 2006 @@ -34,6 +34,7 @@ outputDirectorysrc//outputDirectory includes includepom.xml/include +includesrc//include /includes /fileSet fileSet - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r396394 - in /struts/site: maven.xml pom.xml project.properties project.xml
Author: wsmoak Date: Sun Apr 23 20:02:47 2006 New Revision: 396394 URL: http://svn.apache.org/viewcvs?rev=396394view=rev Log: Add a distributionManagement section to the pom, and remove Maven 1 build files. Removed: struts/site/maven.xml struts/site/project.properties struts/site/project.xml Modified: struts/site/pom.xml Modified: struts/site/pom.xml URL: http://svn.apache.org/viewcvs/struts/site/pom.xml?rev=396394r1=396393r2=396394view=diff == --- struts/site/pom.xml (original) +++ struts/site/pom.xml Sun Apr 23 20:02:47 2006 @@ -49,4 +49,11 @@ urlhttp://svn.apache.org/repos/asf/struts/site/trunk/url /scm + distributionManagement +site + idapache-site/id + urlscp://people.apache.org/www/struts.apache.org/url +/site + /distributionManagement + /project - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r396407 - /struts/site/src/site/resources/.htaccess
Author: wsmoak Date: Sun Apr 23 20:55:51 2006 New Revision: 396407 URL: http://svn.apache.org/viewcvs?rev=396407view=rev Log: Add the current .htaccess file for struts.apache.org Added: struts/site/src/site/resources/.htaccess (with props) Added: struts/site/src/site/resources/.htaccess URL: http://svn.apache.org/viewcvs/struts/site/src/site/resources/.htaccess?rev=396407view=auto == --- struts/site/src/site/resources/.htaccess (added) +++ struts/site/src/site/resources/.htaccess Sun Apr 23 20:55:51 2006 @@ -0,0 +1,12 @@ +Redirect permanent /userGuide http://struts.apache.org/struts-action/userGuide +Redirect permanent /faqs http://struts.apache.org/struts-action/faqs +Redirect permanent /struts-corehttp://struts.apache.org/struts-action +Redirect permanent /shale http://struts.apache.org/struts-shale +Redirect permanent /flow http://struts.apache.org/struts-flow +Redirect permanent /faces http://struts.apache.org/struts-faces +Redirect permanent /bsfhttp://struts.apache.org/struts-scripting +Redirect permanent /struts-bsf http://struts.apache.org/struts-scripting +Redirect permanent /struts-plugins http://struts.apache.org/struts-extras +Redirect permanent /learning.html http://struts.apache.org/struts-action/learning.html +Redirect permanent /using.html http://struts.apache.org/struts-action/userGuide/index.html + Propchange: struts/site/src/site/resources/.htaccess -- svn:eol-style = native - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r396420 - in /struts/action/trunk/taglib/src/site/xdoc: dev_bean.xml dev_html.xml dev_logic.xml dev_nested.xml
Author: wsmoak Date: Sun Apr 23 21:36:19 2006 New Revision: 396420 URL: http://svn.apache.org/viewcvs?rev=396420view=rev Log: Fixed broken links to the tag reference page. Modified: struts/action/trunk/taglib/src/site/xdoc/dev_bean.xml struts/action/trunk/taglib/src/site/xdoc/dev_html.xml struts/action/trunk/taglib/src/site/xdoc/dev_logic.xml struts/action/trunk/taglib/src/site/xdoc/dev_nested.xml Modified: struts/action/trunk/taglib/src/site/xdoc/dev_bean.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/taglib/src/site/xdoc/dev_bean.xml?rev=396420r1=396419r2=396420view=diff == --- struts/action/trunk/taglib/src/site/xdoc/dev_bean.xml (original) +++ struts/action/trunk/taglib/src/site/xdoc/dev_bean.xml Sun Apr 23 21:36:19 2006 @@ -77,7 +77,7 @@ Taglibdoc/a /li li -a href=tagreference-struts-bean.htmlBean Tag +a href=tagreference.html#struts-bean.tldBean Tag Reference/a /li /ul Modified: struts/action/trunk/taglib/src/site/xdoc/dev_html.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/taglib/src/site/xdoc/dev_html.xml?rev=396420r1=396419r2=396420view=diff == --- struts/action/trunk/taglib/src/site/xdoc/dev_html.xml (original) +++ struts/action/trunk/taglib/src/site/xdoc/dev_html.xml Sun Apr 23 21:36:19 2006 @@ -55,7 +55,7 @@ Taglibdoc/a /li li -a href=tagreference-struts-html.htmlHTML Tag +a href=tagreference.html#struts-html.tldHTML Tag Reference/a /li /ul Modified: struts/action/trunk/taglib/src/site/xdoc/dev_logic.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/taglib/src/site/xdoc/dev_logic.xml?rev=396420r1=396419r2=396420view=diff == --- struts/action/trunk/taglib/src/site/xdoc/dev_logic.xml (original) +++ struts/action/trunk/taglib/src/site/xdoc/dev_logic.xml Sun Apr 23 21:36:19 2006 @@ -59,7 +59,7 @@ Taglibdoc/a /li li -a href=tagreference-struts-logic.htmlLogic Tag +a href=tagreference.html#struts-logic.tldLogic Tag Reference/a /li /ul Modified: struts/action/trunk/taglib/src/site/xdoc/dev_nested.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/taglib/src/site/xdoc/dev_nested.xml?rev=396420r1=396419r2=396420view=diff == --- struts/action/trunk/taglib/src/site/xdoc/dev_nested.xml (original) +++ struts/action/trunk/taglib/src/site/xdoc/dev_nested.xml Sun Apr 23 21:36:19 2006 @@ -49,7 +49,7 @@ Taglibdoc/a /li li -a href=tagreference-struts-nested.htmlNested Tag +a href=tagreference.html#struts-nested.tldNested Tag Reference/a /li /ul - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r396423 - /struts/site/src/site/resources/.htaccess
Author: wsmoak Date: Sun Apr 23 21:55:29 2006 New Revision: 396423 URL: http://svn.apache.org/viewcvs?rev=396423view=rev Log: Added more redirects. Modified: struts/site/src/site/resources/.htaccess Modified: struts/site/src/site/resources/.htaccess URL: http://svn.apache.org/viewcvs/struts/site/src/site/resources/.htaccess?rev=396423r1=396422r2=396423view=diff == --- struts/site/src/site/resources/.htaccess (original) +++ struts/site/src/site/resources/.htaccess Sun Apr 23 21:55:29 2006 @@ -13,4 +13,7 @@ Redirect permanent /learning.html http://struts.apache.org/struts-action/learning.html Redirect permanent /using.html http://struts.apache.org/struts-action/userGuide/index.html Redirect permanent /shale http://struts.apache.org/struts-shale +Redirect permanent /flow http://struts.apache.org/struts-sandbox/struts-flow +Redirect permanent /struts-flow http://struts.apache.org/struts-sandbox/struts-flow +Redirect permanent /struts-apps http://struts.apache.org/struts-action/struts-apps - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r396431 - in /struts: action/tags/STRUTS_TILES_1_3_0/ tiles/tags/STRUTS_TILES_1_3_0/
Author: wsmoak Date: Sun Apr 23 22:25:33 2006 New Revision: 396431 URL: http://svn.apache.org/viewcvs?rev=396431view=rev Log: Moved the Struts Tiles 1.3.0 tag to struts/action/tags. Added: struts/action/tags/STRUTS_TILES_1_3_0/ - copied from r396430, struts/tiles/tags/STRUTS_TILES_1_3_0/ Removed: struts/tiles/tags/STRUTS_TILES_1_3_0/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r396432 - in /struts: action/trunk/tiles/ tiles/trunk/
Author: wsmoak Date: Sun Apr 23 22:28:07 2006 New Revision: 396432 URL: http://svn.apache.org/viewcvs?rev=396432view=rev Log: Moved Struts Tiles into Struts Action Added: struts/action/trunk/tiles/ - copied from r396431, struts/tiles/trunk/ Removed: struts/tiles/trunk/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r396435 - /struts/tiles/
Author: wsmoak Date: Sun Apr 23 22:30:20 2006 New Revision: 396435 URL: http://svn.apache.org/viewcvs?rev=396435view=rev Log: Removed top-level Struts Tiles directory, trunk was moved to struts/action/trunk/tiles in r396432. Removed: struts/tiles/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r396437 - /struts/current/
Author: wsmoak Date: Sun Apr 23 22:33:08 2006 New Revision: 396437 URL: http://svn.apache.org/viewcvs?rev=396437view=rev Log: Removed svn:externals definition for Struts Tiles, which was moved to struts/action/trunk Modified: struts/current/ (props changed) Propchange: struts/current/ -- --- svn:externals (original) +++ svn:externals Sun Apr 23 22:33:08 2006 @@ -2,5 +2,4 @@ sandbox https://svn.apache.org/repos/asf/struts/sandbox/trunk shale https://svn.apache.org/repos/asf/struts/shale/trunk site https://svn.apache.org/repos/asf/struts/site -tiles https://svn.apache.org/repos/asf/struts/tiles/trunk pom https://svn.apache.org/repos/asf/struts/pom - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r396441 - /struts/action/trunk/tiles/pom.xml
Author: wsmoak
Date: Sun Apr 23 22:43:55 2006
New Revision: 396441
URL: http://svn.apache.org/viewcvs?rev=396441view=rev
Log:
Updated pom after moving Struts Tiles back into Struts Action.
Modified:
struts/action/trunk/tiles/pom.xml
Modified: struts/action/trunk/tiles/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/tiles/pom.xml?rev=396441r1=396440r2=396441view=diff
==
--- struts/action/trunk/tiles/pom.xml (original)
+++ struts/action/trunk/tiles/pom.xml Sun Apr 23 22:43:55 2006
@@ -19,28 +19,21 @@
*/
--
-!--
- Experimental Maven 2 Build for Apache Struts
-
-
-To build and install this module into your local repo:
-
- $ mvn install
-
-For more information, see: http://wiki.apache.org/struts/StrutsMaven2Plan
-
---
project xmlns=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;
modelVersion4.0.0/modelVersion
- groupIdorg.apache.struts.tiles/groupId
+
+ parent
+ groupIdorg.apache.struts.action/groupId
+ artifactIdstruts-action-parent/artifactId
+ version1.3.2-SNAPSHOT/version
+/parent
+
artifactIdstruts-tiles/artifactId
packagingjar/packaging
- version1.3.1-SNAPSHOT/version
nameStruts Tiles/name
- urlhttp://struts.apache.org/url
distributionManagement
snapshotRepository
@@ -104,13 +97,12 @@
dependency
groupIdorg.apache.struts.action/groupId
- artifactIdstruts-action/artifactId
- version1.3.2-SNAPSHOT/version
+ artifactIdstruts-core/artifactId
+ version${version}/version
/dependency
/dependencies
- !--
reporting
plugins
plugin
@@ -122,6 +114,5 @@
/plugin
/plugins
/reporting
- --
/project
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r396443 - /struts/action/trunk/el/pom.xml
Author: wsmoak
Date: Sun Apr 23 22:55:20 2006
New Revision: 396443
URL: http://svn.apache.org/viewcvs?rev=396443view=rev
Log:
Struts Tiles is now part of Struts Action.
Modified:
struts/action/trunk/el/pom.xml
Modified: struts/action/trunk/el/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/el/pom.xml?rev=396443r1=396442r2=396443view=diff
==
--- struts/action/trunk/el/pom.xml (original)
+++ struts/action/trunk/el/pom.xml Sun Apr 23 22:55:20 2006
@@ -111,9 +111,9 @@
/dependency
dependency
- groupIdorg.apache.struts.tiles/groupId
+ groupIdorg.apache.struts.action/groupId
artifactIdstruts-tiles/artifactId
- version1.3.0/version
+ version${pom.version}/version
optionaltrue/optional
/dependency
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r396214 - /struts/action/trunk/apps/scripting-mailreader/pom.xml
Author: wsmoak
Date: Sat Apr 22 21:42:28 2006
New Revision: 396214
URL: http://svn.apache.org/viewcvs?rev=396214view=rev
Log:
Added exclusions to counteract the Groovy pom, which lists all of these
dependencies in the default (compile) scope.
Modified:
struts/action/trunk/apps/scripting-mailreader/pom.xml
Modified: struts/action/trunk/apps/scripting-mailreader/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/scripting-mailreader/pom.xml?rev=396214r1=396213r2=396214view=diff
==
--- struts/action/trunk/apps/scripting-mailreader/pom.xml (original)
+++ struts/action/trunk/apps/scripting-mailreader/pom.xml Sat Apr 22 21:42:28
2006
@@ -19,18 +19,6 @@
*/
--
-!--
- Experimental Maven 2 Build for Apache Struts
-
-
-To build and install this module into your local repo:
-
- $ mvn install
-
-For more information, see: http://wiki.apache.org/struts/StrutsMaven2Plan
-
---
-
project xmlns=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;
@@ -45,7 +33,7 @@
artifactIdstruts-scripting-mailreader/artifactId
packagingwar/packaging
nameStruts Action - Apps - Scripting Mailreader/name
-
+
dependencies
dependency
groupId${pom.groupId}/groupId
@@ -71,6 +59,108 @@
groupIdgroovy/groupId
artifactIdgroovy/artifactId
version1.0-jsr-03/version
+ exclusions
+exclusion
+ groupIdxerces/groupId
+ artifactIdxerces/artifactId
+/exclusion
+exclusion
+ groupIdxml-apis/groupId
+ artifactIdxml-apis/artifactId
+/exclusion
+exclusion
+ groupIdclassworlds/groupId
+ artifactIdclassworlds/artifactId
+/exclusion
+exclusion
+ groupIdcommons-cli/groupId
+ artifactIdcommons-cli/artifactId
+/exclusion
+exclusion
+ groupIdant/groupId
+ artifactIdant/artifactId
+/exclusion
+exclusion
+ groupIdant/groupId
+ artifactIdant-junit/artifactId
+/exclusion
+exclusion
+ groupIdant/groupId
+ artifactIdant-launcher/artifactId
+/exclusion
+exclusion
+ groupIdjunit/groupId
+ artifactIdjunit/artifactId
+/exclusion
+exclusion
+ groupIdjmock/groupId
+ artifactIdjmock/artifactId
+/exclusion
+exclusion
+ groupIdjmock/groupId
+ artifactIdjmock-cglib/artifactId
+/exclusion
+exclusion
+ groupIdcglib/groupId
+ artifactIdcglib-nodep/artifactId
+/exclusion
+exclusion
+ groupIdmx4j/groupId
+ artifactIdmx4j/artifactId
+/exclusion
+exclusion
+ groupIdmockobjects/groupId
+ artifactIdmockobjects-core/artifactId
+/exclusion
+exclusion
+ groupIdopenejb/groupId
+ artifactIdopenejb-loader/artifactId
+/exclusion
+exclusion
+ groupIdaxion/groupId
+ artifactIdaxion/artifactId
+/exclusion
+exclusion
+ groupIdcommons-collections/groupId
+ artifactIdcommons-collections/artifactId
+/exclusion
+exclusion
+ groupIdregexp/groupId
+ artifactIdregexp/artifactId
+/exclusion
+exclusion
+ groupIdradeox/groupId
+ artifactIdradeox/artifactId
+/exclusion
+exclusion
+ groupIdradeox/groupId
+ artifactIdradeox-oro/artifactId
+/exclusion
+exclusion
+ groupIdnekohtml/groupId
+ artifactIdnekohtml/artifactId
+/exclusion
+exclusion
+ groupIdqdox/groupId
+ artifactIdqdox/artifactId
+/exclusion
+exclusion
+ groupIdcommons-httpclient/groupId
+ artifactIdcommons-httpclient/artifactId
+/exclusion
+exclusion
+ groupIdxstream/groupId
+ artifactIdxstream/artifactId
+/exclusion
+exclusion
+ groupIdxpp3/groupId
+ artifactIdxpp3/artifactId
+/exclusion
+exclusion
+ groupIdtonic/groupId
+ artifactIdjarjar/artifactId
+/exclusion
+ /exclusions
svn commit: r395790 - /struts/action/trunk/pom.xml
Author: wsmoak Date: Thu Apr 20 23:04:51 2006 New Revision: 395790 URL: http://svn.apache.org/viewcvs?rev=395790view=rev Log: Added JXR plugin for source cross-reference. Checkstyle config added, but commented out as it causes an error. Modified: struts/action/trunk/pom.xml Modified: struts/action/trunk/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/pom.xml?rev=395790r1=395789r2=395790view=diff == --- struts/action/trunk/pom.xml (original) +++ struts/action/trunk/pom.xml Thu Apr 20 23:04:51 2006 @@ -121,6 +121,13 @@ /plugin plugin artifactIdmaven-checkstyle-plugin/artifactId +!--configuration + configLocationbuild/struts_checks.xml/configLocation +/configuration-- +/plugin +plugin +groupIdorg.codehaus.mojo/groupId +artifactIdjxr-maven-plugin/artifactId /plugin /plugins /reporting - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r395778 - in /struts/action/trunk/core: pom.xml src/site/ src/site/site.xml src/site/xdoc/ src/site/xdoc/index.xml
Author: wsmoak
Date: Thu Apr 20 21:51:15 2006
New Revision: 395778
URL: http://svn.apache.org/viewcvs?rev=395778view=rev
Log:
Added Maven 2 website configuration. Use 'mvn site:deploy' to publish.
Added:
struts/action/trunk/core/src/site/
struts/action/trunk/core/src/site/site.xml (with props)
struts/action/trunk/core/src/site/xdoc/
struts/action/trunk/core/src/site/xdoc/index.xml (with props)
Modified:
struts/action/trunk/core/pom.xml
Modified: struts/action/trunk/core/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/core/pom.xml?rev=395778r1=395777r2=395778view=diff
==
--- struts/action/trunk/core/pom.xml (original)
+++ struts/action/trunk/core/pom.xml Thu Apr 20 21:51:15 2006
@@ -19,18 +19,6 @@
*/
--
-!--
- Experimental Maven 2 Build for Apache Struts
-
-
-To build and install this module into your local repo:
-
- $ mvn install
-
-For more information, see: http://wiki.apache.org/struts/StrutsMaven2Plan
-
---
-
project xmlns=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;
@@ -55,6 +43,13 @@
scm:svn:https://svn.apache.org/repos/asf/struts/action/trunk/developerConnection
urlhttp://svn.apache.org/repos/asf/struts/action/trunk/url
/scm
+
+distributionManagement
+site
+idapache-site/id
+
urlscp://people.apache.org/www/struts.apache.org/struts-action/struts-core/url
+/site
+/distributionManagement
build
Added: struts/action/trunk/core/src/site/site.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/core/src/site/site.xml?rev=395778view=auto
==
--- struts/action/trunk/core/src/site/site.xml (added)
+++ struts/action/trunk/core/src/site/site.xml Thu Apr 20 21:51:15 2006
@@ -0,0 +1,29 @@
+?xml version=1.0 encoding=ISO-8859-1?
+project name=Apache Struts
+bannerLeft
+nameApache Software Foundation/name
+srchttp://www.apache.org/images/asf-logo.gif/src
+hrefhttp://www.apache.org/href
+/bannerLeft
+bannerRight
+nameApache Struts/name
+srchttp://struts.apache.org/images/struts.gif/src
+hrefhttp://struts.apache.org/href
+/bannerRight
+body
+links
+item name=Apache href=http://www.apache.org; /
+item name=Action href=http://struts.apache.org/struts-action;
/
+item name=Shale href=http://struts.apache.org/struts-shale; /
+item name=Tiles href=http://struts.apache.org/struts-tiles; /
+/links
+
+menu name=Struts Action Framework
+item name=Struts Action
+href=http://struts.apache.org/struts-action/; /
+/menu
+
+${reports}
+
+/body
+/project
Propchange: struts/action/trunk/core/src/site/site.xml
--
svn:eol-style = native
Propchange: struts/action/trunk/core/src/site/site.xml
--
svn:keywords = Date Author Id Revision HeadURL
Added: struts/action/trunk/core/src/site/xdoc/index.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/core/src/site/xdoc/index.xml?rev=395778view=auto
==
--- struts/action/trunk/core/src/site/xdoc/index.xml (added)
+++ struts/action/trunk/core/src/site/xdoc/index.xml Thu Apr 20 21:51:15 2006
@@ -0,0 +1,29 @@
+?xml version=1.0?
+!--
+Copyright 2006 The Apache Software Foundation
+Licensed under the Apache License, Version 2.0 (the License);
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an AS IS BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+--
+!--
+// 78
+--
+document
+
+properties
+titleStruts Action - Core/title
+/properties
+
+body
+pStruts Action - Core/p
+/body
+
+/document
Propchange: struts/action/trunk/core/src/site/xdoc/index.xml
--
svn:eol-style = native
Propchange: struts/action/trunk/core/src/site/xdoc/index.xml
svn commit: r395779 - /struts/action/trunk/pom.xml
Author: wsmoak Date: Thu Apr 20 22:00:02 2006 New Revision: 395779 URL: http://svn.apache.org/viewcvs?rev=395779view=rev Log: Added surefire and checkstyle report config. Added site location. Modified: struts/action/trunk/pom.xml Modified: struts/action/trunk/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/pom.xml?rev=395779r1=395778r2=395779view=diff == --- struts/action/trunk/pom.xml (original) +++ struts/action/trunk/pom.xml Thu Apr 20 22:00:02 2006 @@ -19,18 +19,6 @@ */ -- -!-- - Experimental Maven 2 Build for Apache Struts - - -To build and install this parent pom and its modules into your local repo: - - $ mvn install - -For more information, see: http://wiki.apache.org/struts/StrutsMaven2Plan - --- - project xmlns=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; @@ -69,6 +57,10 @@ nameApache Maven Repository (Test Builds)/name urlscp://people.apache.org/www/cvs.apache.org/maven-snapshot-repository/url /repository +site +idapache-site/id + urlscp://people.apache.org/www/struts.apache.org/struts-action//url +/site /distributionManagement modules @@ -119,11 +111,16 @@ reporting plugins plugin -groupIdorg.apache.maven.plugins/groupId artifactIdmaven-javadoc-plugin/artifactId configuration aggregatetrue/aggregate /configuration +/plugin +plugin +artifactIdmaven-surefire-report-plugin/artifactId +/plugin +plugin +artifactIdmaven-checkstyle-plugin/artifactId /plugin /plugins /reporting - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r395124 - in /struts/action/trunk/src: ./ site/
Author: wsmoak Date: Tue Apr 18 21:10:42 2006 New Revision: 395124 URL: http://svn.apache.org/viewcvs?rev=395124view=rev Log: Move documentation up to top-level Struts Action site. (Part 1) Added: struts/action/trunk/src/ struts/action/trunk/src/site/ - copied from r395117, struts/action/trunk/core/src/site/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r395126 - /struts/action/trunk/core/src/site/
Author: wsmoak Date: Tue Apr 18 21:11:48 2006 New Revision: 395126 URL: http://svn.apache.org/viewcvs?rev=395126view=rev Log: Move documentation up to top-level Struts Action site. (Part 2) Removed: struts/action/trunk/core/src/site/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r395128 - /struts/action/trunk/pom.xml
Author: wsmoak Date: Tue Apr 18 21:12:48 2006 New Revision: 395128 URL: http://svn.apache.org/viewcvs?rev=395128view=rev Log: Add reporting config for the Javadoc plugin. (Aggregation will only work with 2.0-SNAPSHOT.) Modified: struts/action/trunk/pom.xml Modified: struts/action/trunk/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/pom.xml?rev=395128r1=395127r2=395128view=diff == --- struts/action/trunk/pom.xml (original) +++ struts/action/trunk/pom.xml Tue Apr 18 21:12:48 2006 @@ -116,6 +116,18 @@ /build +reporting +plugins +plugin +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-javadoc-plugin/artifactId +configuration +aggregatetrue/aggregate +/configuration +/plugin +/plugins +/reporting + dependencies/ repositories - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r394264 - in /struts/action/trunk/core: ./ conf/ src/java/ src/main/ src/main/java/ src/main/resources/ src/main/resources/org/ src/main/resources/org/apache/ src/main/resources/org/apache
Author: wsmoak Date: Fri Apr 14 23:10:44 2006 New Revision: 394264 URL: http://svn.apache.org/viewcvs?rev=394264view=rev Log: Reorganize Struts Action Core for Maven 2. Added: struts/action/trunk/core/src/main/ struts/action/trunk/core/src/main/java/ - copied from r394255, struts/action/trunk/core/src/java/ struts/action/trunk/core/src/main/resources/ struts/action/trunk/core/src/main/resources/org/ struts/action/trunk/core/src/main/resources/org/apache/ struts/action/trunk/core/src/main/resources/org/apache/struts/ struts/action/trunk/core/src/main/resources/org/apache/struts/chain/ struts/action/trunk/core/src/main/resources/org/apache/struts/chain/chain-config.xml - copied unchanged from r394255, struts/action/trunk/core/conf/java/chain-config.xml struts/action/trunk/core/src/main/resources/org/apache/struts/resources/ struts/action/trunk/core/src/main/resources/org/apache/struts/resources/struts-config_1_0.dtd - copied unchanged from r394255, struts/action/trunk/core/conf/java/struts-config_1_0.dtd struts/action/trunk/core/src/main/resources/org/apache/struts/resources/struts-config_1_1.dtd - copied unchanged from r394255, struts/action/trunk/core/conf/java/struts-config_1_1.dtd struts/action/trunk/core/src/main/resources/org/apache/struts/resources/struts-config_1_2.dtd - copied unchanged from r394255, struts/action/trunk/core/conf/java/struts-config_1_2.dtd struts/action/trunk/core/src/main/resources/org/apache/struts/resources/struts-config_1_3.dtd - copied unchanged from r394255, struts/action/trunk/core/conf/java/struts-config_1_3.dtd struts/action/trunk/core/src/main/resources/org/apache/struts/resources/web-app_2_3.dtd - copied unchanged from r394255, struts/action/trunk/core/conf/java/web-app_2_3.dtd struts/action/trunk/core/src/main/resources/org/apache/struts/validator/ struts/action/trunk/core/src/main/resources/org/apache/struts/validator/validator-rules.xml - copied unchanged from r394255, struts/action/trunk/core/conf/java/validator-rules.xml struts/action/trunk/core/src/test/java/ struts/action/trunk/core/src/test/java/org/ - copied from r394255, struts/action/trunk/core/src/test/org/ Removed: struts/action/trunk/core/conf/ struts/action/trunk/core/src/java/ struts/action/trunk/core/src/test/org/ Modified: struts/action/trunk/core/pom.xml Modified: struts/action/trunk/core/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/core/pom.xml?rev=394264r1=394263r2=394264view=diff == --- struts/action/trunk/core/pom.xml (original) +++ struts/action/trunk/core/pom.xml Fri Apr 14 23:10:44 2006 @@ -58,35 +58,14 @@ build -sourceDirectorysrc/java/sourceDirectory -testSourceDirectorysrc/test/testSourceDirectory - resources resource -directorysrc/java/directory -includes -include**/*.properties/include -/includes -/resource -resource -directoryconf/java/directory -targetPathorg/apache/struts/resources/targetPath -includes -include**/*.dtd/include -/includes -/resource -resource -directoryconf/java/directory -targetPathorg/apache/struts/chain/targetPath -includes -includechain-config.xml/include -/includes +directorysrc/main/resources/directory /resource resource -directoryconf/java/directory -targetPathorg/apache/struts/validator/targetPath +directorysrc/main/java/directory includes -includevalidator-rules.xml/include +include**/*.properties/include /includes /resource resource @@ -100,15 +79,7 @@ testResources testResource -targetPathorg/apache/struts/resources/targetPath -directoryconf/java/directory -includes -include**/*.xml/include -include**/*.dtd/include -/includes -/testResource -testResource -directorysrc/test/directory +directorysrc/test/java/directory includes include**/*.xml/include /includes - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r394299 - /struts/action/trunk/core/src/main/java/org/apache/struts/action/ActionServlet.java
Author: wsmoak Date: Sat Apr 15 08:01:07 2006 New Revision: 394299 URL: http://svn.apache.org/viewcvs?rev=394299view=rev Log: Remove the registration for web-app_2_2.dtd, which is no longer included in struts-core.jar. Modified: struts/action/trunk/core/src/main/java/org/apache/struts/action/ActionServlet.java Modified: struts/action/trunk/core/src/main/java/org/apache/struts/action/ActionServlet.java URL: http://svn.apache.org/viewcvs/struts/action/trunk/core/src/main/java/org/apache/struts/action/ActionServlet.java?rev=394299r1=394298r2=394299view=diff == --- struts/action/trunk/core/src/main/java/org/apache/struts/action/ActionServlet.java (original) +++ struts/action/trunk/core/src/main/java/org/apache/struts/action/ActionServlet.java Sat Apr 15 08:01:07 2006 @@ -266,8 +266,6 @@ /org/apache/struts/resources/struts-config_1_2.dtd, -//Apache Software Foundation//DTD Struts Configuration 1.3//EN, /org/apache/struts/resources/struts-config_1_3.dtd, --//Sun Microsystems, Inc.//DTD Web Application 2.2//EN, -/org/apache/struts/resources/web-app_2_2.dtd, -//Sun Microsystems, Inc.//DTD Web Application 2.3//EN, /org/apache/struts/resources/web-app_2_3.dtd }; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r394254 - in /struts/sandbox/trunk/archetypes/action-blank: ./ src/main/resources/META-INF/ src/main/resources/archetype-resources/ src/main/resources/archetype-resources/src/main/resource
Author: wsmoak Date: Fri Apr 14 21:27:55 2006 New Revision: 394254 URL: http://svn.apache.org/viewcvs?rev=394254view=rev Log: Update the archetype after recent changes in Struts Action, and remove the Tiles dependency. Removed: struts/sandbox/trunk/archetypes/action-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/tiles-defs.xml Modified: struts/sandbox/trunk/archetypes/action-blank/README.txt struts/sandbox/trunk/archetypes/action-blank/pom.xml struts/sandbox/trunk/archetypes/action-blank/src/main/resources/META-INF/archetype.xml struts/sandbox/trunk/archetypes/action-blank/src/main/resources/archetype-resources/pom.xml struts/sandbox/trunk/archetypes/action-blank/src/main/resources/archetype-resources/src/main/resources/MessageResources.properties struts/sandbox/trunk/archetypes/action-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/struts-config.xml struts/sandbox/trunk/archetypes/action-blank/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml Modified: struts/sandbox/trunk/archetypes/action-blank/README.txt URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/archetypes/action-blank/README.txt?rev=394254r1=394253r2=394254view=diff == --- struts/sandbox/trunk/archetypes/action-blank/README.txt (original) +++ struts/sandbox/trunk/archetypes/action-blank/README.txt Fri Apr 14 21:27:55 2006 @@ -1,6 +1,6 @@ -Struts Action Blank Archetype -= +Struts Archetypes - Action Blank + This directory contains the Struts Action Blank Archetype for Maven 2. @@ -14,9 +14,9 @@ $ cd ~/projects $ mvn archetype:create - -DarchetypeGroupId=struts + -DarchetypeGroupId=org.apache.struts.action -DarchetypeArtifactId=struts-archetype-action-blank - -DarchetypeVersion=1.3.0-SNAPSHOT + -DarchetypeVersion=1.3.2-SNAPSHOT -DgroupId=com.example -DpackageName=com.example.projectname -DartifactId=my-webapp @@ -24,41 +24,15 @@ To build your new webapp: $ cd my-webapp - $ mvn war:war - - -Prerequisites -- - -In order to build the archetype (and the webapp created from it) you will need -the Struts Action, Taglib and Tiles jars in your local Maven 2 repository. - -You can accomplish this by building the artifacts with Maven 2: - -$ svn co http://svn.apache.org/repos/asf/struts/current struts/current -$ cd struts/current/build -$ mvn install - -Alternately, download the nightly builds and install each file as follows: - - $ mvn install:install-file - -Dfile=/path/to/struts-action-1.3.0-dev.jar - -DgroupId=org.apache.struts - -DartifactId=struts-action - -Dversion=1.3.0-SNAPSHOT - -Dpackaging=jar - -DgeneratePom=true - -Repeat for Tiles and Taglib. - - -Other Issues - - + $ mvn install -FAQs - +To start Tomcat and deploy your new webapp: -Q: + Modify pom.xml to provide the path to a local Tomcat 5.x installation: + plugin + groupIdorg.codehaus.cargo/groupId + artifactIdcargo-maven2-plugin/artifactId + ... + homec:/java/apache-tomcat-5.5.15/home -A: + $ mvn package cargo:start Modified: struts/sandbox/trunk/archetypes/action-blank/pom.xml URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/archetypes/action-blank/pom.xml?rev=394254r1=394253r2=394254view=diff == --- struts/sandbox/trunk/archetypes/action-blank/pom.xml (original) +++ struts/sandbox/trunk/archetypes/action-blank/pom.xml Fri Apr 14 21:27:55 2006 @@ -3,11 +3,10 @@ xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd; modelVersion4.0.0/modelVersion - groupIdstruts/groupId + groupIdorg.apache.struts.action/groupId artifactIdstruts-archetype-action-blank/artifactId - version1.3.1-SNAPSHOT/version - packagingmaven-plugin/packaging - nameStruts Action Blank Archetype/name + version1.3.2-SNAPSHOT/version + packagingjar/packaging + nameStruts Archetypes - Action Blank/name /project - Modified: struts/sandbox/trunk/archetypes/action-blank/src/main/resources/META-INF/archetype.xml URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/archetypes/action-blank/src/main/resources/META-INF/archetype.xml?rev=394254r1=394253r2=394254view=diff == --- struts/sandbox/trunk/archetypes/action-blank/src/main/resources/META-INF/archetype.xml (original) +++ struts/sandbox/trunk/archetypes/action-blank/src/main/resources/META-INF/archetype.xml Fri Apr 14 21:27:55 2006 @@ -5,7 +5,6 @@ resourcesrc/main/webapp/index.jsp/resource resourcesrc/main/webapp/pages/Welcome.jsp
svn commit: r394015 - in /struts/action/trunk/apps/cookbook/src/main: java/examples/MessageResources.properties webapp/index.jsp
Author: wsmoak Date: Thu Apr 13 21:27:42 2006 New Revision: 394015 URL: http://svn.apache.org/viewcvs?rev=394015view=rev Log: Remove a duplicate property, and change the title of the index page. Modified: struts/action/trunk/apps/cookbook/src/main/java/examples/MessageResources.properties struts/action/trunk/apps/cookbook/src/main/webapp/index.jsp Modified: struts/action/trunk/apps/cookbook/src/main/java/examples/MessageResources.properties URL: http://svn.apache.org/viewcvs/struts/action/trunk/apps/cookbook/src/main/java/examples/MessageResources.properties?rev=394015r1=394014r2=394015view=diff == --- struts/action/trunk/apps/cookbook/src/main/java/examples/MessageResources.properties (original) +++ struts/action/trunk/apps/cookbook/src/main/java/examples/MessageResources.properties Thu Apr 13 21:27:42 2006 @@ -50,7 +50,6 @@ prompt.name=Name prompt.secret=Secret phrase -prompt.required=Required prompt.byte=Byte prompt.creditCard=Credit Card prompt.date=Date Modified: struts/action/trunk/apps/cookbook/src/main/webapp/index.jsp URL: http://svn.apache.org/viewcvs/struts/action/trunk/apps/cookbook/src/main/webapp/index.jsp?rev=394015r1=394014r2=394015view=diff == --- struts/action/trunk/apps/cookbook/src/main/webapp/index.jsp (original) +++ struts/action/trunk/apps/cookbook/src/main/webapp/index.jsp Thu Apr 13 21:27:42 2006 @@ -6,7 +6,7 @@ html xmlns=http://www.w3.org/1999/xhtml; head meta http-equiv=Content-Type content=text/html; charset=utf-8 / -titleStruts Examples/title +titleStruts Cookbook/title html:xhtml/ html:base/ link href=css/example.css rel=stylesheet type=text/css / - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r394017 - /struts/action/trunk/apps/examples/pom.xml
Author: wsmoak Date: Thu Apr 13 21:28:39 2006 New Revision: 394017 URL: http://svn.apache.org/viewcvs?rev=394017view=rev Log: Correct the groupId for JSTL. Modified: struts/action/trunk/apps/examples/pom.xml Modified: struts/action/trunk/apps/examples/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/apps/examples/pom.xml?rev=394017r1=394016r2=394017view=diff == --- struts/action/trunk/apps/examples/pom.xml (original) +++ struts/action/trunk/apps/examples/pom.xml Thu Apr 13 21:28:39 2006 @@ -64,7 +64,7 @@ scopeprovided/scope /dependency dependency - groupIdjstl/groupId + groupIdjavax.servlet/groupId artifactIdjstl/artifactId version1.0.6/version /dependency - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r393398 - in /struts/action/trunk: apps/blank/ apps/examples/ apps/faces-example1/ apps/faces-example2/ apps/mailreader/ apps/scripting-mailreader/ faces/ mailreader-dao/ scripting/
Author: wsmoak Date: Tue Apr 11 23:36:06 2006 New Revision: 393398 URL: http://svn.apache.org/viewcvs?rev=393398view=rev Log: Add missing svn eol-style and keywords to poms. Modified: struts/action/trunk/apps/blank/pom.xml (contents, props changed) struts/action/trunk/apps/examples/pom.xml (contents, props changed) struts/action/trunk/apps/faces-example1/pom.xml (contents, props changed) struts/action/trunk/apps/faces-example2/pom.xml (contents, props changed) struts/action/trunk/apps/mailreader/pom.xml (contents, props changed) struts/action/trunk/apps/scripting-mailreader/pom.xml (contents, props changed) struts/action/trunk/faces/pom.xml (contents, props changed) struts/action/trunk/mailreader-dao/pom.xml (contents, props changed) struts/action/trunk/scripting/pom.xml (contents, props changed) Modified: struts/action/trunk/apps/blank/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/apps/blank/pom.xml?rev=393398r1=393397r2=393398view=diff == --- struts/action/trunk/apps/blank/pom.xml (original) +++ struts/action/trunk/apps/blank/pom.xml Tue Apr 11 23:36:06 2006 @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * $Id: pom.xml 392080 2006-04-06 21:19:10Z wsmoak $ + * $Id$ */ -- Propchange: struts/action/trunk/apps/blank/pom.xml -- svn:eol-style = native Propchange: struts/action/trunk/apps/blank/pom.xml -- svn:keywords = Date Author Id Revision HeadURL Modified: struts/action/trunk/apps/examples/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/apps/examples/pom.xml?rev=393398r1=393397r2=393398view=diff == --- struts/action/trunk/apps/examples/pom.xml (original) +++ struts/action/trunk/apps/examples/pom.xml Tue Apr 11 23:36:06 2006 @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * $Id: pom.xml 392080 2006-04-06 21:19:10Z wsmoak $ + * $Id$ */ -- Propchange: struts/action/trunk/apps/examples/pom.xml -- svn:eol-style = native Propchange: struts/action/trunk/apps/examples/pom.xml -- svn:keywords = Date Author Id Revision HeadURL Modified: struts/action/trunk/apps/faces-example1/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/apps/faces-example1/pom.xml?rev=393398r1=393397r2=393398view=diff == --- struts/action/trunk/apps/faces-example1/pom.xml (original) +++ struts/action/trunk/apps/faces-example1/pom.xml Tue Apr 11 23:36:06 2006 @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * $Id: pom.xml 392080 2006-04-06 21:19:10Z wsmoak $ + * $Id$ */ -- Propchange: struts/action/trunk/apps/faces-example1/pom.xml -- svn:eol-style = native Propchange: struts/action/trunk/apps/faces-example1/pom.xml -- svn:keywords = Date Author Id Revision HeadURL Modified: struts/action/trunk/apps/faces-example2/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/apps/faces-example2/pom.xml?rev=393398r1=393397r2=393398view=diff == --- struts/action/trunk/apps/faces-example2/pom.xml (original) +++ struts/action/trunk/apps/faces-example2/pom.xml Tue Apr 11 23:36:06 2006 @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * $Id: pom.xml 392080 2006-04-06 21:19:10Z wsmoak $ + * $Id$ */ -- Propchange: struts/action/trunk/apps/faces-example2/pom.xml -- svn:eol-style = native Propchange: struts/action/trunk/apps/faces-example2/pom.xml -- svn:keywords = Date Author Id Revision HeadURL Modified: struts/action/trunk/apps/mailreader/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/apps/mailreader/pom.xml?rev=393398r1=393397r2=393398view=diff == --- struts/action/trunk/apps/mailreader/pom.xml (original) +++ struts/action/trunk/apps/mailreader/pom.xml Tue Apr 11 23:36:06
svn commit: r393401 - in /struts/action/trunk: apps/ apps/blank/ apps/cookbook/ apps/examples/ apps/faces-example1/ apps/faces-example2/ apps/mailreader/ apps/scripting-mailreader/ apps/strutsel-exerc
Author: wsmoak Date: Wed Apr 12 00:05:18 2006 New Revision: 393401 URL: http://svn.apache.org/viewcvs?rev=393401view=rev Log: Add groupId to all poms, since it is not always properly inherited. Workaround for MNG-1527. Modified: struts/action/trunk/apps/blank/pom.xml struts/action/trunk/apps/cookbook/pom.xml struts/action/trunk/apps/examples/pom.xml struts/action/trunk/apps/faces-example1/pom.xml struts/action/trunk/apps/faces-example2/pom.xml struts/action/trunk/apps/mailreader/pom.xml struts/action/trunk/apps/pom.xml struts/action/trunk/apps/scripting-mailreader/pom.xml struts/action/trunk/apps/strutsel-exercise-taglib/pom.xml struts/action/trunk/assembly/pom.xml struts/action/trunk/core/pom.xml struts/action/trunk/el/pom.xml struts/action/trunk/extras/pom.xml struts/action/trunk/faces/pom.xml struts/action/trunk/integration/pom.xml struts/action/trunk/integration/taglib-it/pom.xml struts/action/trunk/mailreader-dao/pom.xml struts/action/trunk/scripting/pom.xml struts/action/trunk/taglib/pom.xml Modified: struts/action/trunk/apps/blank/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/apps/blank/pom.xml?rev=393401r1=393400r2=393401view=diff == --- struts/action/trunk/apps/blank/pom.xml (original) +++ struts/action/trunk/apps/blank/pom.xml Wed Apr 12 00:05:18 2006 @@ -41,6 +41,7 @@ /parent modelVersion4.0.0/modelVersion + groupIdorg.apache.struts.action/groupId artifactIdstruts-blank/artifactId packagingwar/packaging nameStruts Action - Apps - Blank/name Modified: struts/action/trunk/apps/cookbook/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/apps/cookbook/pom.xml?rev=393401r1=393400r2=393401view=diff == --- struts/action/trunk/apps/cookbook/pom.xml (original) +++ struts/action/trunk/apps/cookbook/pom.xml Wed Apr 12 00:05:18 2006 @@ -41,6 +41,7 @@ /parent modelVersion4.0.0/modelVersion + groupIdorg.apache.struts.action/groupId artifactIdstruts-cookbook/artifactId packagingwar/packaging nameStruts Action - Apps - Cookbook/name Modified: struts/action/trunk/apps/examples/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/apps/examples/pom.xml?rev=393401r1=393400r2=393401view=diff == --- struts/action/trunk/apps/examples/pom.xml (original) +++ struts/action/trunk/apps/examples/pom.xml Wed Apr 12 00:05:18 2006 @@ -41,6 +41,7 @@ /parent modelVersion4.0.0/modelVersion + groupIdorg.apache.struts.action/groupId artifactIdstruts-examples/artifactId packagingwar/packaging nameStruts Action - Apps - Examples/name Modified: struts/action/trunk/apps/faces-example1/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/apps/faces-example1/pom.xml?rev=393401r1=393400r2=393401view=diff == --- struts/action/trunk/apps/faces-example1/pom.xml (original) +++ struts/action/trunk/apps/faces-example1/pom.xml Wed Apr 12 00:05:18 2006 @@ -41,6 +41,7 @@ /parent modelVersion4.0.0/modelVersion + groupIdorg.apache.struts.action/groupId artifactIdstruts-faces-example1/artifactId packagingwar/packaging nameStruts Action - Apps - Faces Example 1/name Modified: struts/action/trunk/apps/faces-example2/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/apps/faces-example2/pom.xml?rev=393401r1=393400r2=393401view=diff == --- struts/action/trunk/apps/faces-example2/pom.xml (original) +++ struts/action/trunk/apps/faces-example2/pom.xml Wed Apr 12 00:05:18 2006 @@ -41,6 +41,7 @@ /parent modelVersion4.0.0/modelVersion + groupIdorg.apache.struts.action/groupId artifactIdstruts-faces-example2/artifactId packagingwar/packaging nameStruts Action - Apps - Faces Example 2/name Modified: struts/action/trunk/apps/mailreader/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/apps/mailreader/pom.xml?rev=393401r1=393400r2=393401view=diff == --- struts/action/trunk/apps/mailreader/pom.xml (original) +++ struts/action/trunk/apps/mailreader/pom.xml Wed Apr 12 00:05:18 2006 @@ -41,6 +41,7 @@ /parent modelVersion4.0.0/modelVersion + groupIdorg.apache.struts.action/groupId artifactIdstruts-mailreader/artifactId packagingwar/packaging nameStruts Action - Apps - Mailreader/name Modified: struts/action/trunk/apps/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/apps/pom.xml?rev=393401r1=393400r2=393401view=diff
svn commit: r393500 - in /struts/site: ./ legacy/ legacy/struts-doc-1.0.2/ legacy/struts-doc-1.1/ src/ src/site/ src/site/fml/ src/site/resources/ src/site/resources/images/ src/site/resources/proposa
Author: wsmoak Date: Wed Apr 12 09:39:38 2006 New Revision: 393500 URL: http://svn.apache.org/viewcvs?rev=393500view=rev Log: Reorganize Struts Site for Maven 2. Added: struts/site/legacy/ - copied from r393496, struts/site/xdocs/legacy/ struts/site/legacy/struts-doc-1.0.2/ - copied from r393496, struts/site/xdocs/struts-doc-1.0.2/ struts/site/legacy/struts-doc-1.1/ - copied from r393496, struts/site/xdocs/struts-doc-1.1/ struts/site/pom.xml (with props) struts/site/src/ struts/site/src/site/ struts/site/src/site/fml/ struts/site/src/site/fml/helping.fml - copied unchanged from r393496, struts/site/xdocs/helping.fml struts/site/src/site/fml/kickstart.fml - copied unchanged from r393496, struts/site/xdocs/kickstart.fml struts/site/src/site/fml/roadmap.fml - copied unchanged from r393496, struts/site/xdocs/roadmap.fml struts/site/src/site/resources/ struts/site/src/site/resources/doap_Struts.rdf - copied unchanged from r393496, struts/site/xdocs/doap_Struts.rdf struts/site/src/site/resources/download.cgi - copied unchanged from r393496, struts/site/xdocs/download.cgi struts/site/src/site/resources/images/ - copied from r393496, struts/site/xdocs/images/ struts/site/src/site/resources/proposals/ - copied from r393496, struts/site/xdocs/proposals/ struts/site/src/site/resources/uml/ - copied from r393496, struts/site/xdocs/uml/ struts/site/src/site/site.xml - copied, changed from r393496, struts/site/xdocs/navigation.xml struts/site/src/site/xdoc/ - copied from r393496, struts/site/xdocs/ Removed: struts/site/src/site/xdoc/doap_Struts.rdf struts/site/src/site/xdoc/download.cgi struts/site/src/site/xdoc/helping.fml struts/site/src/site/xdoc/images/ struts/site/src/site/xdoc/kickstart.fml struts/site/src/site/xdoc/legacy/ struts/site/src/site/xdoc/navigation.xml struts/site/src/site/xdoc/proposals/ struts/site/src/site/xdoc/roadmap.fml struts/site/src/site/xdoc/struts-doc-1.0.2/ struts/site/src/site/xdoc/struts-doc-1.1/ struts/site/src/site/xdoc/struts.css struts/site/src/site/xdoc/stylesheets/ struts/site/src/site/xdoc/uml/ struts/site/xdocs/ Added: struts/site/pom.xml URL: http://svn.apache.org/viewcvs/struts/site/pom.xml?rev=393500view=auto == --- struts/site/pom.xml (added) +++ struts/site/pom.xml Wed Apr 12 09:39:38 2006 @@ -0,0 +1,52 @@ +?xml version=1.0? +!-- +/* + * Copyright 2001-2005 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + -- +project xmlns=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; + + parent + groupIdorg.apache.struts/groupId + artifactIdstruts-parent/artifactId + version1/version + /parent + +modelVersion4.0.0/modelVersion +groupIdorg.apache.struts/groupId +artifactIdstruts-site/artifactId +version1/version +packagingpom/packaging +nameStruts Site/name +urlhttp://struts.apache.org/url + +!-- -- +!--Project management section-- +!-- -- + + description +Struts Site is the Apache Struts home page, +the top-level portal to all other Struts frameworks and subprojects. + /description + + scm + connectionscm|svn|http://svn.apache.org/repos/asf/struts/site/trunk/connection + developerConnectionscm|svn|https://svn.apache.org/repos/asf/struts/site/trunk/developerConnection +urlhttp://svn.apache.org/repos/asf/struts/site/trunk/url + /scm + +/project Propchange: struts/site/pom.xml -- svn:eol-style = native Propchange: struts/site/pom.xml -- svn:executable = * Propchange: struts/site/pom.xml -- svn:keywords = Date Author Id Revision HeadURL Copied: struts/site/src/site/site.xml (from r393496, struts/site/xdocs
svn commit: r393684 - /struts/action/trunk/integration/taglib-it/pom.xml
Author: wsmoak Date: Wed Apr 12 19:13:56 2006 New Revision: 393684 URL: http://svn.apache.org/viewcvs?rev=393684view=rev Log: Renamed artifact for consistency. Modified: struts/action/trunk/integration/taglib-it/pom.xml Modified: struts/action/trunk/integration/taglib-it/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/integration/taglib-it/pom.xml?rev=393684r1=393683r2=393684view=diff == --- struts/action/trunk/integration/taglib-it/pom.xml (original) +++ struts/action/trunk/integration/taglib-it/pom.xml Wed Apr 12 19:13:56 2006 @@ -42,7 +42,7 @@ modelVersion4.0.0/modelVersion groupIdorg.apache.struts.action/groupId - artifactIdtaglib-it/artifactId + artifactIdstruts-action-it-taglib/artifactId packagingpom/packaging nameStruts Action - Integration - Taglib Tests/name - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r393700 - /struts/action/trunk/apps/blank/src/main/webapp/WEB-INF/web.xml
Author: wsmoak Date: Wed Apr 12 20:58:10 2006 New Revision: 393700 URL: http://svn.apache.org/viewcvs?rev=393700view=rev Log: Removed the chainConfig init param. Struts Tiles dependency was removed in r392108. Modified: struts/action/trunk/apps/blank/src/main/webapp/WEB-INF/web.xml Modified: struts/action/trunk/apps/blank/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/apps/blank/src/main/webapp/WEB-INF/web.xml?rev=393700r1=393699r2=393700view=diff == --- struts/action/trunk/apps/blank/src/main/webapp/WEB-INF/web.xml (original) +++ struts/action/trunk/apps/blank/src/main/webapp/WEB-INF/web.xml Wed Apr 12 20:58:10 2006 @@ -15,10 +15,6 @@ param-nameconfig/param-name param-value/WEB-INF/struts-config.xml/param-value /init-param -init-param - param-namechainConfig/param-name - param-valueorg/apache/struts/tiles/chain-config.xml/param-value -/init-param load-on-startup2/load-on-startup /servlet - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r392682 - in /struts/action/trunk: assembly/pom.xml core/pom.xml el/pom.xml extras/pom.xml faces/pom.xml mailreader-dao/pom.xml scripting/pom.xml taglib/pom.xml
Author: wsmoak Date: Sat Apr 8 23:37:08 2006 New Revision: 392682 URL: http://svn.apache.org/viewcvs?rev=392682view=rev Log: Correction to r392681: enabling the profile does not generate the assembly. Rename the 'generate-assembly' profile to 'pre-assembly' to more accurately describe its purpose. Modified: struts/action/trunk/assembly/pom.xml struts/action/trunk/core/pom.xml struts/action/trunk/el/pom.xml struts/action/trunk/extras/pom.xml struts/action/trunk/faces/pom.xml struts/action/trunk/mailreader-dao/pom.xml struts/action/trunk/scripting/pom.xml struts/action/trunk/taglib/pom.xml Modified: struts/action/trunk/assembly/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/assembly/pom.xml?rev=392682r1=392681r2=392682view=diff == --- struts/action/trunk/assembly/pom.xml (original) +++ struts/action/trunk/assembly/pom.xml Sat Apr 8 23:37:08 2006 @@ -55,7 +55,7 @@ profiles profile - idgenerate-assembly/id + idpre-assembly/id build plugins plugin @@ -190,7 +190,13 @@ /execution /executions /plugin +/plugins + /build + /profile + /profiles + build +plugins plugin artifactIdmaven-assembly-plugin/artifactId version2.0.1/version @@ -206,10 +212,7 @@ /configuration /plugin /plugins - /build - /profile - /profiles dependencies Modified: struts/action/trunk/core/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/core/pom.xml?rev=392682r1=392681r2=392682view=diff == --- struts/action/trunk/core/pom.xml (original) +++ struts/action/trunk/core/pom.xml Sat Apr 8 23:37:08 2006 @@ -117,7 +117,7 @@ profiles profile -idgenerate-assembly/id +idpre-assembly/id build plugins plugin Modified: struts/action/trunk/el/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/el/pom.xml?rev=392682r1=392681r2=392682view=diff == --- struts/action/trunk/el/pom.xml (original) +++ struts/action/trunk/el/pom.xml Sat Apr 8 23:37:08 2006 @@ -142,7 +142,7 @@ profiles profile -idgenerate-assembly/id +idpre-assembly/id build plugins plugin Modified: struts/action/trunk/extras/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/extras/pom.xml?rev=392682r1=392681r2=392682view=diff == --- struts/action/trunk/extras/pom.xml (original) +++ struts/action/trunk/extras/pom.xml Sat Apr 8 23:37:08 2006 @@ -97,7 +97,7 @@ profiles profile -idgenerate-assembly/id +idpre-assembly/id build plugins plugin Modified: struts/action/trunk/faces/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/faces/pom.xml?rev=392682r1=392681r2=392682view=diff == --- struts/action/trunk/faces/pom.xml (original) +++ struts/action/trunk/faces/pom.xml Sat Apr 8 23:37:08 2006 @@ -136,7 +136,7 @@ -- profiles profile -idgenerate-assembly/id +idpre-assembly/id build plugins plugin Modified: struts/action/trunk/mailreader-dao/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/mailreader-dao/pom.xml?rev=392682r1=392681r2=392682view=diff == --- struts/action/trunk/mailreader-dao/pom.xml (original) +++ struts/action/trunk/mailreader-dao/pom.xml Sat Apr 8 23:37:08 2006 @@ -121,7 +121,7 @@ -- profiles profile -idgenerate-assembly/id +idpre-assembly/id build plugins plugin Modified: struts/action/trunk/scripting/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/scripting/pom.xml?rev=392682r1=392681r2=392682view=diff == --- struts/action/trunk/scripting/pom.xml (original) +++ struts/action/trunk/scripting/pom.xml Sat Apr 8 23:37:08 2006 @@ -132,7 +132,7 @@ profiles profile -idgenerate-assembly/id +idpre-assembly/id build plugins plugin Modified: struts/action/trunk/taglib/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/taglib/pom.xml?rev=392682r1=392681r2=392682view=diff == --- struts/action/trunk/taglib/pom.xml (original) +++ struts/action/trunk/taglib/pom.xml Sat Apr 8 23:37:08 2006 @@ -123,7 +123,7 @@ profiles profile
svn commit: r392684 - /struts/action/trunk/el/pom.xml
Author: wsmoak Date: Sat Apr 8 23:45:58 2006 New Revision: 392684 URL: http://svn.apache.org/viewcvs?rev=392684view=rev Log: Struts Tiles is optional when using Struts EL. Modified: struts/action/trunk/el/pom.xml Modified: struts/action/trunk/el/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/el/pom.xml?rev=392684r1=392683r2=392684view=diff == --- struts/action/trunk/el/pom.xml (original) +++ struts/action/trunk/el/pom.xml Sat Apr 8 23:45:58 2006 @@ -118,6 +118,7 @@ groupIdorg.apache.struts.tiles/groupId artifactIdstruts-tiles/artifactId version1.3.0/version + optionaltrue/optional /dependency dependency - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r392686 - /struts/action/trunk/assembly/pom.xml
Author: wsmoak
Date: Sat Apr 8 23:59:07 2006
New Revision: 392686
URL: http://svn.apache.org/viewcvs?rev=392686view=rev
Log:
Include sources and javadoc for faces, mailreader-dao and scripting in the
assembly.
Modified:
struts/action/trunk/assembly/pom.xml
Modified: struts/action/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/assembly/pom.xml?rev=392686r1=392685r2=392686view=diff
==
--- struts/action/trunk/assembly/pom.xml (original)
+++ struts/action/trunk/assembly/pom.xml Sat Apr 8 23:59:07 2006
@@ -90,6 +90,24 @@
/artifactItem
artifactItem
groupIdorg.apache.struts.action/groupId
+ artifactIdstruts-faces/artifactId
+ version${version}/version
+ classifierjavadoc/classifier
+/artifactItem
+artifactItem
+ groupIdorg.apache.struts.action/groupId
+ artifactIdstruts-mailreader-dao/artifactId
+ version${version}/version
+ classifierjavadoc/classifier
+/artifactItem
+artifactItem
+ groupIdorg.apache.struts.action/groupId
+ artifactIdstruts-scripting/artifactId
+ version${version}/version
+ classifierjavadoc/classifier
+/artifactItem
+artifactItem
+ groupIdorg.apache.struts.action/groupId
artifactIdstruts-taglib/artifactId
version${version}/version
classifierjavadoc/classifier
@@ -180,6 +198,24 @@
/artifactItem
artifactItem
groupIdorg.apache.struts.action/groupId
+ artifactIdstruts-faces/artifactId
+ version${version}/version
+ classifiersources/classifier
+/artifactItem
+artifactItem
+ groupIdorg.apache.struts.action/groupId
+ artifactIdstruts-mailreader-dao/artifactId
+ version${version}/version
+ classifiersources/classifier
+/artifactItem
+artifactItem
+ groupIdorg.apache.struts.action/groupId
+ artifactIdstruts-scripting/artifactId
+ version${version}/version
+ classifiersources/classifier
+/artifactItem
+artifactItem
+ groupIdorg.apache.struts.action/groupId
artifactIdstruts-taglib/artifactId
version${version}/version
classifiersources/classifier
@@ -229,6 +265,16 @@
dependency
groupIdorg.apache.struts.action/groupId
artifactIdstruts-el/artifactId
+ version${version}/version
+/dependency
+dependency
+ groupIdorg.apache.struts.action/groupId
+ artifactIdstruts-faces/artifactId
+ version${version}/version
+/dependency
+dependency
+ groupIdorg.apache.struts.action/groupId
+ artifactIdstruts-scripting/artifactId
version${version}/version
/dependency
dependency
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r392778 - in /struts/action/trunk/apps: pom.xml strutsel-exercise-taglib/ strutsel-exercise-taglib/src/ strutsel-exercise-taglib/src/main/ strutsel-exercise-taglib/src/main/java/ strutsel-
Author: wsmoak Date: Sun Apr 9 09:59:17 2006 New Revision: 392778 URL: http://svn.apache.org/viewcvs?rev=392778view=rev Log: Move the strutsel-exercise-taglib example webapp from el to apps. (Part 2 of 2) Added: struts/action/trunk/apps/strutsel-exercise-taglib/ struts/action/trunk/apps/strutsel-exercise-taglib/src/ struts/action/trunk/apps/strutsel-exercise-taglib/src/main/ struts/action/trunk/apps/strutsel-exercise-taglib/src/main/java/ - copied from r392678, struts/action/trunk/el/src/exercise-taglib/ struts/action/trunk/apps/strutsel-exercise-taglib/src/main/webapp/ - copied from r392678, struts/action/trunk/el/web/exercise-taglib/ Modified: struts/action/trunk/apps/pom.xml Modified: struts/action/trunk/apps/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/apps/pom.xml?rev=392778r1=392777r2=392778view=diff == --- struts/action/trunk/apps/pom.xml (original) +++ struts/action/trunk/apps/pom.xml Sun Apr 9 09:59:17 2006 @@ -52,6 +52,7 @@ moduleexamples/module moduleblank/module modulemailreader/module + modulestrutsel-exercise-taglib/module /modules build - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r392782 - in /struts/action/trunk/apps/strutsel-exercise-taglib/src/main/webapp: ./ WEB-INF/
Author: wsmoak
Date: Sun Apr 9 10:15:42 2006
New Revision: 392782
URL: http://svn.apache.org/viewcvs?rev=392782view=rev
Log:
Complete oas.webapp.exercise - oas.webapp.el.exercise move from r392413.
Modified:
struts/action/trunk/apps/strutsel-exercise-taglib/src/main/webapp/WEB-INF/struts-config.xml
struts/action/trunk/apps/strutsel-exercise-taglib/src/main/webapp/WEB-INF/web.xml
struts/action/trunk/apps/strutsel-exercise-taglib/src/main/webapp/bean-define.jsp
struts/action/trunk/apps/strutsel-exercise-taglib/src/main/webapp/bean-size.jsp
struts/action/trunk/apps/strutsel-exercise-taglib/src/main/webapp/bean-write.jsp
struts/action/trunk/apps/strutsel-exercise-taglib/src/main/webapp/html-select.jsp
struts/action/trunk/apps/strutsel-exercise-taglib/src/main/webapp/logic-compare.jsp
struts/action/trunk/apps/strutsel-exercise-taglib/src/main/webapp/logic-empty.jsp
struts/action/trunk/apps/strutsel-exercise-taglib/src/main/webapp/logic-iterate.jsp
struts/action/trunk/apps/strutsel-exercise-taglib/src/main/webapp/logic-match.jsp
struts/action/trunk/apps/strutsel-exercise-taglib/src/main/webapp/logic-present.jsp
Modified:
struts/action/trunk/apps/strutsel-exercise-taglib/src/main/webapp/WEB-INF/struts-config.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/strutsel-exercise-taglib/src/main/webapp/WEB-INF/struts-config.xml?rev=392782r1=392781r2=392782view=diff
==
---
struts/action/trunk/apps/strutsel-exercise-taglib/src/main/webapp/WEB-INF/struts-config.xml
(original)
+++
struts/action/trunk/apps/strutsel-exercise-taglib/src/main/webapp/WEB-INF/struts-config.xml
Sun Apr 9 10:15:42 2006
@@ -8,7 +8,7 @@
form-beans
form-bean name=testbean
- type=org.apache.struts.webapp.exercise.TestBean/
+ type=org.apache.struts.webapp.el.exercise.TestBean/
form-bean name=dynabean
type=org.apache.struts.action.DynaActionForm
form-property name=foo type=java.lang.String/
@@ -92,7 +92,7 @@
forward name=input path=/bean-dyna.jsp/
/action
action path=/bean-dyna
-type=org.apache.struts.webapp.exercise.DynaSetAction
+type=org.apache.struts.webapp.el.exercise.DynaSetAction
name=dynabean
scope=session
validate=false
@@ -108,7 +108,7 @@
/action-mappings
message-resources
-parameter=org.apache.struts.webapp.exercise.ApplicationResources
+
parameter=org.apache.struts.webapp.el.exercise.ApplicationResources
null=false/
/struts-config
Modified:
struts/action/trunk/apps/strutsel-exercise-taglib/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/strutsel-exercise-taglib/src/main/webapp/WEB-INF/web.xml?rev=392782r1=392781r2=392782view=diff
==
---
struts/action/trunk/apps/strutsel-exercise-taglib/src/main/webapp/WEB-INF/web.xml
(original)
+++
struts/action/trunk/apps/strutsel-exercise-taglib/src/main/webapp/WEB-INF/web.xml
Sun Apr 9 10:15:42 2006
@@ -15,7 +15,7 @@
init-param
param-nameapplication/param-name
param-value
-
org.apache.struts.webapp.exercise.ApplicationResources/param-value
+
org.apache.struts.webapp.el.exercise.ApplicationResources/param-value
/init-param
init-param
param-nameconfig/param-name
Modified:
struts/action/trunk/apps/strutsel-exercise-taglib/src/main/webapp/bean-define.jsp
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/strutsel-exercise-taglib/src/main/webapp/bean-define.jsp?rev=392782r1=392781r2=392782view=diff
==
---
struts/action/trunk/apps/strutsel-exercise-taglib/src/main/webapp/bean-define.jsp
(original)
+++
struts/action/trunk/apps/strutsel-exercise-taglib/src/main/webapp/bean-define.jsp
Sun Apr 9 10:15:42 2006
@@ -17,7 +17,7 @@
h3Test 1 -- Direct Scalar Variable Defines/h3
jsp:useBean id=test1 scope=page
- class=org.apache.struts.webapp.exercise.TestBean/
+ class=org.apache.struts.webapp.el.exercise.TestBean/
c:set var=test1_boolean value=${test1.booleanProperty}/
c:set var=test1_double value=${test1.doubleProperty}/
@@ -71,7 +71,7 @@
h3Test 2 -- Nested Scalar Variable Defines/h3
jsp:useBean id=test2 scope=page
- class=org.apache.struts.webapp.exercise.TestBean/
+ class=org.apache.struts.webapp.el.exercise.TestBean/
bean:define id=test2_boolean name=test2
property=nested.booleanProperty/
Modified:
struts/action/trunk/apps/strutsel-exercise-taglib/src/main/webapp/bean-size.jsp
URL:
http://svn.apache.org/viewcvs
svn commit: r392785 - /struts/action/trunk/apps/pom.xml
Author: wsmoak
Date: Sun Apr 9 10:29:08 2006
New Revision: 392785
URL: http://svn.apache.org/viewcvs?rev=392785view=rev
Log:
Add Cargo plugin configuration for the apps module.
Usage: mvn package cargo:start -Dcargo.tomcat5x.home=...
Modified:
struts/action/trunk/apps/pom.xml
Modified: struts/action/trunk/apps/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/pom.xml?rev=392785r1=392784r2=392785view=diff
==
--- struts/action/trunk/apps/pom.xml (original)
+++ struts/action/trunk/apps/pom.xml Sun Apr 9 10:29:08 2006
@@ -79,7 +79,27 @@
/includes
/resource
/resources
+
+ plugins
+plugin
+ groupIdorg.codehaus.cargo/groupId
+ artifactIdcargo-maven2-plugin/artifactId
+ configuration
+ container
+ containerIdtomcat5x/containerId
+ home${cargo.tomcat5x.home}/home
+ log${project.build.directory}/tomcat5x.log/log
+ output${project.build.directory}/tomcat5x.out/output
+ /container
+ configuration
+ home${project.build.directory}/tomcat5x/home
+ /configuration
+ /configuration
+/plugin
+ /plugins
+
finalName${pom.artifactId}/finalName
+
/build
/project
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r392801 - /struts/pom/pom.xml
Author: wsmoak Date: Sun Apr 9 11:40:03 2006 New Revision: 392801 URL: http://svn.apache.org/viewcvs?rev=392801view=rev Log: Switch to version 1 in preparation for releasing the struts-parent pom. Modified: struts/pom/pom.xml Modified: struts/pom/pom.xml URL: http://svn.apache.org/viewcvs/struts/pom/pom.xml?rev=392801r1=392800r2=392801view=diff == --- struts/pom/pom.xml (original) +++ struts/pom/pom.xml Sun Apr 9 11:40:03 2006 @@ -26,7 +26,7 @@ /parent groupIdorg.apache.struts/groupId artifactIdstruts-parent/artifactId - version1-SNAPSHOT/version + version1/version packagingpom/packaging nameApache Struts/name description - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r392805 - /struts/pom/pom.xml
Author: wsmoak Date: Sun Apr 9 12:15:45 2006 New Revision: 392805 URL: http://svn.apache.org/viewcvs?rev=392805view=rev Log: Checking in final changes for version 1. The 'mvn deploy' command uses the repository element. This will have to be overridden in the struts-action-parent pom to avoid releasing test builds to the distribution repository. Modified: struts/pom/pom.xml Modified: struts/pom/pom.xml URL: http://svn.apache.org/viewcvs/struts/pom/pom.xml?rev=392805r1=392804r2=392805view=diff == --- struts/pom/pom.xml (original) +++ struts/pom/pom.xml Sun Apr 9 12:15:45 2006 @@ -282,9 +282,9 @@ /developers distributionManagement repository - idapache-maven-test-builds/id - nameApache Maven Repository (Test Builds)/name - urlscp://people.apache.org/www/cvs.apache.org/maven-snapshot-repository/url + idapache-maven-releases/id + nameApache Maven Repository (Releases)/name + urlscp://people.apache.org/www/www.apache.org/dist/maven-repository/url /repository snapshotRepository uniqueVersionfalse/uniqueVersion - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r392810 - /struts/action/trunk/pom.xml
Author: wsmoak Date: Sun Apr 9 12:27:56 2006 New Revision: 392810 URL: http://svn.apache.org/viewcvs?rev=392810view=rev Log: Change to version 1 of the struts-parent pom. Remove relativePath, which isn't working (MNG-740). Remove snapshotRepository which will be inherited from struts-parent. Add repository to override the definition in struts-parent and avoid releasing test builds to the distribution repo. Modified: struts/action/trunk/pom.xml Modified: struts/action/trunk/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/pom.xml?rev=392810r1=392809r2=392810view=diff == --- struts/action/trunk/pom.xml (original) +++ struts/action/trunk/pom.xml Sun Apr 9 12:27:56 2006 @@ -38,8 +38,7 @@ parent groupIdorg.apache.struts/groupId artifactIdstruts-parent/artifactId - version1-SNAPSHOT/version - relativePath../pom/pom.xml/relativePath + version1/version /parent modelVersion4.0.0/modelVersion @@ -59,11 +58,11 @@ ciManagement/ distributionManagement -snapshotRepository -idapache-snapshot/id - nameApache Snapshot Repository/name +repository + idapache-maven-test-builds/id + nameApache Maven Repository (Test Builds)/name urlscp://people.apache.org/www/cvs.apache.org/maven-snapshot-repository/url - /snapshotRepository +/repository /distributionManagement modules - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r392811 - /struts/action/trunk/apps/strutsel-exercise-taglib/pom.xml
Author: wsmoak
Date: Sun Apr 9 12:34:53 2006
New Revision: 392811
URL: http://svn.apache.org/viewcvs?rev=392811view=rev
Log:
Add the pom for strutsel-exercise-taglib, which was left out of r392778.
Added:
struts/action/trunk/apps/strutsel-exercise-taglib/pom.xml (with props)
Added: struts/action/trunk/apps/strutsel-exercise-taglib/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/strutsel-exercise-taglib/pom.xml?rev=392811view=auto
==
--- struts/action/trunk/apps/strutsel-exercise-taglib/pom.xml (added)
+++ struts/action/trunk/apps/strutsel-exercise-taglib/pom.xml Sun Apr 9
12:34:53 2006
@@ -0,0 +1,50 @@
+?xml version=1.0?
+!--
+/*
+ * Copyright 2005-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Id$
+ */
+--
+
+project xmlns=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;
+
+ parent
+ groupIdorg.apache.struts.action/groupId
+ artifactIdstruts-apps/artifactId
+ version1.3.2-SNAPSHOT/version
+ /parent
+
+ modelVersion4.0.0/modelVersion
+ artifactIdstrutsel-exercise-taglib/artifactId
+ packagingwar/packaging
+ nameStruts Action - Apps - Struts EL Exercise/name
+
+ dependencies
+ dependency
+ groupId${pom.groupId}/groupId
+ artifactIdstruts-el/artifactId
+ version${pom.version}/version
+ /dependency
+ dependency
+ groupIdjavax.servlet/groupId
+ artifactIdservlet-api/artifactId
+ version2.3/version
+ scopeprovided/scope
+ /dependency
+ /dependencies
+
+/project
Propchange: struts/action/trunk/apps/strutsel-exercise-taglib/pom.xml
--
svn:eol-style = native
Propchange: struts/action/trunk/apps/strutsel-exercise-taglib/pom.xml
--
svn:keywords = Date Author Id Revision HeadURL
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r392835 - in /struts/action/trunk: apps/pom.xml assembly/pom.xml
Author: wsmoak
Date: Sun Apr 9 14:07:30 2006
New Revision: 392835
URL: http://svn.apache.org/viewcvs?rev=392835view=rev
Log:
Include strutsel-exercise-taglib and struts-scripting-mailreader in the
assembly.
Add link to scripting-mailreader from apps/pom.xml.
Modified:
struts/action/trunk/apps/pom.xml
struts/action/trunk/assembly/pom.xml
Modified: struts/action/trunk/apps/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/pom.xml?rev=392835r1=392834r2=392835view=diff
==
--- struts/action/trunk/apps/pom.xml (original)
+++ struts/action/trunk/apps/pom.xml Sun Apr 9 14:07:30 2006
@@ -53,6 +53,7 @@
moduleblank/module
modulemailreader/module
modulestrutsel-exercise-taglib/module
+ modulescripting-mailreader/module
/modules
build
Modified: struts/action/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/assembly/pom.xml?rev=392835r1=392834r2=392835view=diff
==
--- struts/action/trunk/assembly/pom.xml (original)
+++ struts/action/trunk/assembly/pom.xml Sun Apr 9 14:07:30 2006
@@ -166,6 +166,18 @@
version${version}/version
typewar/type
/artifactItem
+artifactItem
+ groupIdorg.apache.struts.action/groupId
+ artifactIdstrutsel-exercise-taglib/artifactId
+ version${version}/version
+ typewar/type
+/artifactItem
+artifactItem
+ groupIdorg.apache.struts.action/groupId
+ artifactIdstruts-scripting-mailreader/artifactId
+ version${version}/version
+ typewar/type
+/artifactItem
/artifactItems
outputDirectory${project.build.directory}/webapps/outputDirectory
/configuration
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r392837 - in /struts/action/trunk: integration/taglib-it/pom.xml pom.xml
Author: wsmoak
Date: Sun Apr 9 14:20:31 2006
New Revision: 392837
URL: http://svn.apache.org/viewcvs?rev=392837view=rev
Log:
Link the integration module into struts-action-parent, and wrap the
configuration in a profile so that integration tests will not be run by default.
Usage: mvn -P perform-itest
Modified:
struts/action/trunk/integration/taglib-it/pom.xml
struts/action/trunk/pom.xml
Modified: struts/action/trunk/integration/taglib-it/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/integration/taglib-it/pom.xml?rev=392837r1=392836r2=392837view=diff
==
--- struts/action/trunk/integration/taglib-it/pom.xml (original)
+++ struts/action/trunk/integration/taglib-it/pom.xml Sun Apr 9 14:20:31 2006
@@ -20,12 +20,10 @@
--
!--
- Experimental Maven 2 Build for Apache Struts
-
To run the Cactus tests for Struts Taglib:
- $ mvn integration-test -Dcargo.tomcat5x.home=c:/java/apache-tomcat-5.5.16
+ $ mvn -P perform-itest -Dcargo.tomcat5x.home=c:/java/apache-tomcat-5.5.16
(The cargo.tomcat5x.home property may be configured in settings.xml)
@@ -106,6 +104,12 @@
finalName${pom.artifactId}/finalName
+ /build
+
+ profiles
+ profile
+ idperform-itest/id
+ build
plugins
plugin
groupIdorg.apache.maven.plugins/groupId
@@ -201,5 +205,7 @@
/plugin
/plugins
/build
+ /profile
+ /profiles
/project
Modified: struts/action/trunk/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/pom.xml?rev=392837r1=392836r2=392837view=diff
==
--- struts/action/trunk/pom.xml (original)
+++ struts/action/trunk/pom.xml Sun Apr 9 14:20:31 2006
@@ -75,6 +75,7 @@
moduleapps/module
modulemailreader-dao/module
moduleassembly/module
+moduleintegration/module
/modules
licenses
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r392848 - in /struts/action/trunk: el/src/test/ el/web/ integration/el-it/ integration/el-it/src/ integration/el-it/src/test/ integration/el-it/src/test/java/
Author: wsmoak Date: Sun Apr 9 16:10:16 2006 New Revision: 392848 URL: http://svn.apache.org/viewcvs?rev=392848view=rev Log: Move the Cactus tests for Struts EL into the integration/el-it module. Added: struts/action/trunk/integration/el-it/ struts/action/trunk/integration/el-it/src/ struts/action/trunk/integration/el-it/src/test/ struts/action/trunk/integration/el-it/src/test/java/ - copied from r392827, struts/action/trunk/el/src/test/ Removed: struts/action/trunk/el/src/test/ struts/action/trunk/el/web/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r392849 - /struts/pom/pom.xml
Author: wsmoak Date: Sun Apr 9 16:34:51 2006 New Revision: 392849 URL: http://svn.apache.org/viewcvs?rev=392849view=rev Log: Update to version 2-SNAPSHOT after releasing the struts-parent pom. Modified: struts/pom/pom.xml Modified: struts/pom/pom.xml URL: http://svn.apache.org/viewcvs/struts/pom/pom.xml?rev=392849r1=392848r2=392849view=diff == --- struts/pom/pom.xml (original) +++ struts/pom/pom.xml Sun Apr 9 16:34:51 2006 @@ -26,7 +26,7 @@ /parent groupIdorg.apache.struts/groupId artifactIdstruts-parent/artifactId - version1/version + version2-SNAPSHOT/version packagingpom/packaging nameApache Struts/name description - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r392857 - /struts/action/trunk/apps/pom.xml
Author: wsmoak
Date: Sun Apr 9 17:36:55 2006
New Revision: 392857
URL: http://svn.apache.org/viewcvs?rev=392857view=rev
Log:
Include the source code under WEB-INF/src for each example app, using an Ant
copy task in an execution of the maven-antrun-plugin bound to the
process-sources phase. (And some reformatting.)
Modified:
struts/action/trunk/apps/pom.xml
Modified: struts/action/trunk/apps/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/pom.xml?rev=392857r1=392856r2=392857view=diff
==
--- struts/action/trunk/apps/pom.xml (original)
+++ struts/action/trunk/apps/pom.xml Sun Apr 9 17:36:55 2006
@@ -55,52 +55,59 @@
modulestrutsel-exercise-taglib/module
modulescripting-mailreader/module
/modules
-
+
build
- resources
-!-- Include source code under WEB-INF/src for example apps --
-!--resource
- directorysrc/main/java/directory--
-
!--targetPath${basedir}/target/${pom.artifactId}/WEB-INF/src/main/java/targetPath--
-
!--targetPath../${pom.artifactId}/WEB-INF/src/main/java/targetPath--
-
!--targetPath${pom.build.directory}/${pom.artifactId}/WEB-INF/src/main/java/targetPath--
-
!--targetPath${project.build.directory}/${pom.artifactId}/WEB-INF/src/main/java/targetPath--
- !--includes
- include**/*.java/include
- include**/*.properties/include
- include**/*.xml/include
- /includes
-/resource--
+ resources
!-- Include resources under src/main/java in WEB-INF/classes --
-resource
+ resource
directorysrc/main/java/directory
includes
-include**/*.properties/include
-include**/*.xml/include
+ include**/*.properties/include
+ include**/*.xml/include
/includes
-/resource
- /resources
+ /resource
+ /resources
- plugins
-plugin
- groupIdorg.codehaus.cargo/groupId
- artifactIdcargo-maven2-plugin/artifactId
- configuration
- container
- containerIdtomcat5x/containerId
- home${cargo.tomcat5x.home}/home
- log${project.build.directory}/tomcat5x.log/log
- output${project.build.directory}/tomcat5x.out/output
- /container
- configuration
- home${project.build.directory}/tomcat5x/home
- /configuration
- /configuration
-/plugin
- /plugins
+ plugins
+ plugin
+groupIdorg.codehaus.cargo/groupId
+artifactIdcargo-maven2-plugin/artifactId
+configuration
+ container
+ containerIdtomcat5x/containerId
+ home${cargo.tomcat5x.home}/home
+ log${project.build.directory}/tomcat5x.log/log
+ output${project.build.directory}/tomcat5x.out/output
+ /container
+ configuration
+ home${project.build.directory}/tomcat5x/home
+ /configuration
+/configuration
+ /plugin
+ !-- Include source code under WEB-INF/src --
+ plugin
+artifactIdmaven-antrun-plugin/artifactId
+executions
+ execution
+ phaseprocess-sources/phase
+ configuration
+ tasks
+copy
todir=${project.build.directory}/${pom.artifactId}/WEB-INF/src
+ failonerror=false
+ fileset dir=${basedir}/src/main/java/
+/copy
+ /tasks
+ /configuration
+ goals
+ goalrun/goal
+ /goals
+ /execution
+/executions
+ /plugin
+ /plugins
- finalName${pom.artifactId}/finalName
+ finalName${pom.artifactId}/finalName
- /build
+ /build
/project
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r392870 - /struts/action/trunk/apps/mailreader/src/main/resources/
Author: wsmoak Date: Sun Apr 9 18:27:26 2006 New Revision: 392870 URL: http://svn.apache.org/viewcvs?rev=392870view=rev Log: Removed empty resources directory. Non-java resources are stored under src/main/java with the source code. Removed: struts/action/trunk/apps/mailreader/src/main/resources/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r392871 - /struts/action/trunk/pom.xml
Author: wsmoak Date: Sun Apr 9 18:29:00 2006 New Revision: 392871 URL: http://svn.apache.org/viewcvs?rev=392871view=rev Log: Added scm section, which will be used for the website and the release process. Modified: struts/action/trunk/pom.xml Modified: struts/action/trunk/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/pom.xml?rev=392871r1=392870r2=392871view=diff == --- struts/action/trunk/pom.xml (original) +++ struts/action/trunk/pom.xml Sun Apr 9 18:29:00 2006 @@ -51,6 +51,12 @@ inceptionYear2000/inceptionYear +scm + connectionscm:svn:http://svn.apache.org/repos/asf/struts/action/trunk/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/struts/action/trunk/developerConnection + urlhttp://svn.apache.org/viewcvs.cgi/struts/action/trunk/url +/scm + issueManagement systemBugzilla/system urlhttp://issues.apache.org/bugzilla/url - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r392878 - /struts/action/trunk/pom.xml
Author: wsmoak Date: Sun Apr 9 20:27:07 2006 New Revision: 392878 URL: http://svn.apache.org/viewcvs?rev=392878view=rev Log: Override the apache.snapshots repository configuration inherited from the Apache parent pom, and enable releases so that our test builds (which do not have a SNAPSHOT identifier) will be downloaded from it. Modified: struts/action/trunk/pom.xml Modified: struts/action/trunk/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/pom.xml?rev=392878r1=392877r2=392878view=diff == --- struts/action/trunk/pom.xml (original) +++ struts/action/trunk/pom.xml Sun Apr 9 20:27:07 2006 @@ -120,9 +120,11 @@ repositories repository -idapache-snapshot/id -nameApache Internal Repository/name +idapache.snapshots/id +nameApache Maven Repository (Snapshots and Test Builds)/name urlhttp://cvs.apache.org/maven-snapshot-repository/url +releasesenabledtrue/enabled/releases +snapshotsenabledtrue/enabled/snapshots /repository /repositories - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r392629 - in /struts/action/trunk/integration: pom.xml taglib-it/pom.xml taglib-it/src/main/webapp/WEB-INF/web.xml taglib-it/src/main/webapp/index.jsp taglib-it/src/main/webapp/jspRedirect
Author: wsmoak
Date: Sat Apr 8 16:17:23 2006
New Revision: 392629
URL: http://svn.apache.org/viewcvs?rev=392629view=rev
Log:
Add manual Cactus configuration to the Struts Taglib test webapp. (There is no
Cactus plugin for Maven 2.)
Bind executions of compiler, surefire, war and cargo plugins to appropriate
build lifecycle phases.
Remove the taglib-webapp module, files were moved to taglib-it in r392482.
Added:
struts/action/trunk/integration/taglib-it/src/main/webapp/index.jsp (with
props)
struts/action/trunk/integration/taglib-it/src/main/webapp/jspRedirector.jsp
(with props)
Removed:
struts/action/trunk/integration/taglib-webapp/
Modified:
struts/action/trunk/integration/pom.xml
struts/action/trunk/integration/taglib-it/pom.xml
struts/action/trunk/integration/taglib-it/src/main/webapp/WEB-INF/web.xml
Modified: struts/action/trunk/integration/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/integration/pom.xml?rev=392629r1=392628r2=392629view=diff
==
--- struts/action/trunk/integration/pom.xml (original)
+++ struts/action/trunk/integration/pom.xml Sat Apr 8 16:17:23 2006
@@ -46,12 +46,7 @@
nameStruts Action - Integration Tests/name
modules
- moduletaglib-webapp/module
moduletaglib-it/module
/modules
-
- build
- finalName${pom.artifactId}/finalName
- /build
/project
Modified: struts/action/trunk/integration/taglib-it/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/integration/taglib-it/pom.xml?rev=392629r1=392628r2=392629view=diff
==
--- struts/action/trunk/integration/taglib-it/pom.xml (original)
+++ struts/action/trunk/integration/taglib-it/pom.xml Sat Apr 8 16:17:23 2006
@@ -23,11 +23,13 @@
Experimental Maven 2 Build for Apache Struts
-To build and install this module into your local repo:
+To run the Cactus tests for Struts Taglib:
- $ mvn install
-
-For more information, see: http://wiki.apache.org/struts/StrutsMaven2Plan
+ $ mvn integration-test -Dcargo.tomcat5x.home=c:/java/apache-tomcat-5.5.16
+
+ (The cargo.tomcat5x.home property may be configured in settings.xml)
+
+For more information, see:
http://wiki.apache.org/struts/StrutsMaintenanceMaven
--
@@ -50,19 +52,22 @@
groupIdjunit/groupId
artifactIdjunit/artifactId
version3.8.1/version
- scopetest/scope
/dependency
dependency
-groupIdcactus/groupId
-artifactIdcactus/artifactId
-version13-1.7/version
-scopetest/scope
-exclusions
- exclusion
-groupIdj2ee/groupId
-artifactIdj2ee/artifactId
- /exclusion
-/exclusions
+ groupIdcactus/groupId
+ artifactIdcactus/artifactId
+ version13-1.7/version
+ exclusions
+exclusion
+ groupIdj2ee/groupId
+ artifactIdj2ee/artifactId
+/exclusion
+ /exclusions
+ /dependency
+ dependency
+ groupIdaspectj/groupId
+ artifactIdaspectjrt/artifactId
+ version1.2.1/version
/dependency
dependency
groupIdhttpunit/groupId
@@ -93,34 +98,108 @@
scopetest/scope
/dependency
/dependencies
-build
-plugins
-plugin
-groupIdorg.apache.maven.plugins/groupId
-artifactIdmaven-compiler-plugin/artifactId
-executions
-execution
-idcompiler-it/id
-phasepre-integration-test/phase
-goals
-goaltestCompile/goal
-/goals
-/execution
-/executions
-/plugin
-plugin
-groupIdorg.apache.maven.plugins/groupId
-artifactIdmaven-surefire-plugin/artifactId
-executions
-execution
-idsurefire-it/id
-phaseintegration-test/phase
-goals
-goaltest/goal
-/goals
-/execution
-/executions
-/plugin
-/plugins
-/build
+
+ build
+
+ sourceDirectorysrc/test/java/sourceDirectory
+ testSourceDirectorysrc/test/java/testSourceDirectory
+
+ finalName${pom.artifactId}/finalName
+
+ plugins
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-war-plugin/artifactId
+executions
+ execution
+ idpackage-war/id
+ phasepackage/phase
+ goals
+ goalwar/goal
svn commit: r392643 - in /struts/action/trunk: apps/pom.xml assembly/pom.xml core/pom.xml el/pom.xml extras/pom.xml faces/pom.xml integration/pom.xml mailreader-dao/pom.xml pom.xml scripting/pom.xml t
Author: wsmoak Date: Sat Apr 8 17:31:22 2006 New Revision: 392643 URL: http://svn.apache.org/viewcvs?rev=392643view=rev Log: Renamed artifactId struts-build - struts-action-parent Modified: struts/action/trunk/apps/pom.xml struts/action/trunk/assembly/pom.xml struts/action/trunk/core/pom.xml struts/action/trunk/el/pom.xml struts/action/trunk/extras/pom.xml struts/action/trunk/faces/pom.xml struts/action/trunk/integration/pom.xml struts/action/trunk/mailreader-dao/pom.xml struts/action/trunk/pom.xml struts/action/trunk/scripting/pom.xml struts/action/trunk/taglib/pom.xml Modified: struts/action/trunk/apps/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/apps/pom.xml?rev=392643r1=392642r2=392643view=diff == --- struts/action/trunk/apps/pom.xml (original) +++ struts/action/trunk/apps/pom.xml Sat Apr 8 17:31:22 2006 @@ -36,7 +36,7 @@ parent groupIdorg.apache.struts.action/groupId - artifactIdstruts-build/artifactId + artifactIdstruts-action-parent/artifactId version1.3.2-SNAPSHOT/version /parent Modified: struts/action/trunk/assembly/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/assembly/pom.xml?rev=392643r1=392642r2=392643view=diff == --- struts/action/trunk/assembly/pom.xml (original) +++ struts/action/trunk/assembly/pom.xml Sat Apr 8 17:31:22 2006 @@ -43,7 +43,7 @@ parent groupIdorg.apache.struts.action/groupId -artifactIdstruts-build/artifactId +artifactIdstruts-action-parent/artifactId version1.3.2-SNAPSHOT/version /parent Modified: struts/action/trunk/core/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/core/pom.xml?rev=392643r1=392642r2=392643view=diff == --- struts/action/trunk/core/pom.xml (original) +++ struts/action/trunk/core/pom.xml Sat Apr 8 17:31:22 2006 @@ -37,7 +37,7 @@ parent groupIdorg.apache.struts.action/groupId -artifactIdstruts-build/artifactId +artifactIdstruts-action-parent/artifactId version1.3.2-SNAPSHOT/version /parent Modified: struts/action/trunk/el/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/el/pom.xml?rev=392643r1=392642r2=392643view=diff == --- struts/action/trunk/el/pom.xml (original) +++ struts/action/trunk/el/pom.xml Sat Apr 8 17:31:22 2006 @@ -36,7 +36,7 @@ parent groupIdorg.apache.struts.action/groupId - artifactIdstruts-build/artifactId + artifactIdstruts-action-parent/artifactId version1.3.2-SNAPSHOT/version /parent Modified: struts/action/trunk/extras/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/extras/pom.xml?rev=392643r1=392642r2=392643view=diff == --- struts/action/trunk/extras/pom.xml (original) +++ struts/action/trunk/extras/pom.xml Sat Apr 8 17:31:22 2006 @@ -36,7 +36,7 @@ parent groupIdorg.apache.struts.action/groupId - artifactIdstruts-build/artifactId + artifactIdstruts-action-parent/artifactId version1.3.2-SNAPSHOT/version /parent Modified: struts/action/trunk/faces/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/faces/pom.xml?rev=392643r1=392642r2=392643view=diff == --- struts/action/trunk/faces/pom.xml (original) +++ struts/action/trunk/faces/pom.xml Sat Apr 8 17:31:22 2006 @@ -36,7 +36,7 @@ parent groupIdorg.apache.struts.action/groupId - artifactIdstruts-build/artifactId + artifactIdstruts-action-parent/artifactId version1.3.2-SNAPSHOT/version /parent Modified: struts/action/trunk/integration/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/integration/pom.xml?rev=392643r1=392642r2=392643view=diff == --- struts/action/trunk/integration/pom.xml (original) +++ struts/action/trunk/integration/pom.xml Sat Apr 8 17:31:22 2006 @@ -36,7 +36,7 @@ parent groupIdorg.apache.struts.action/groupId - artifactIdstruts-build/artifactId + artifactIdstruts-action-parent/artifactId version1.3.2-SNAPSHOT/version /parent Modified: struts/action/trunk/mailreader-dao/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/mailreader-dao/pom.xml?rev=392643r1=392642r2=392643view=diff == --- struts/action/trunk/mailreader-dao/pom.xml (original) +++ struts/action/trunk/mailreader-dao/pom.xml Sat Apr 8 17:31:22 2006 @@ -36,7 +36,7 @@ parent
svn commit: r392651 - in /struts/pom: ./ pom.xml
Author: wsmoak Date: Sat Apr 8 18:07:47 2006 New Revision: 392651 URL: http://svn.apache.org/viewcvs?rev=392651view=rev Log: Added struts-parent pom for Maven 2 build. Added: struts/pom/ struts/pom/pom.xml (with props) Added: struts/pom/pom.xml URL: http://svn.apache.org/viewcvs/struts/pom/pom.xml?rev=392651view=auto == --- struts/pom/pom.xml (added) +++ struts/pom/pom.xml Sat Apr 8 18:07:47 2006 @@ -0,0 +1,247 @@ +?xml version=1.0 encoding=UTF-8? + +!-- + ~ Copyright 2006 The Apache Software Foundation. + ~ + ~ Licensed under the Apache License, Version 2.0 (the License); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an AS IS BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + -- + +project xmlns=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; + modelVersion4.0.0/modelVersion + parent + groupIdorg.apache/groupId + artifactIdapache/artifactId + version1/version + /parent + groupIdorg.apache.struts/groupId + artifactIdstruts-parent/artifactId + version1-SNAPSHOT/version + packagingpom/packaging + nameApache Struts/name + description +The goal of the Apache Struts project is to encourage application +architectures based on the Model 2 approach, a variation of the classic +Model-View-Controller (MVC) design paradigm. Under Model 2, a servlet (or +equivalent) manages business logic execution, and presentation logic +resides mainly in server pages. + /description + urlhttp://struts.apache.org//url + inceptionYear2000/inceptionYear + + mailingLists + mailingList + nameStruts User List/name + subscribe[EMAIL PROTECTED]/subscribe + unsubscribe[EMAIL PROTECTED]/unsubscribe + postuser@struts.apache.org/post + archivehttp://mail-archives.apache.org/mod_mbox/struts-user//archive + otherArchives + otherArchivehttp://struts.apache.org/mail.html#Archives/otherArchive + /otherArchives + /mailingList + mailingList + nameStruts Developer List/name + subscribe[EMAIL PROTECTED]/subscribe + unsubscribe[EMAIL PROTECTED]/unsubscribe + postdev@struts.apache.org/post + archivehttp://mail-archives.apache.org/mod_mbox/struts-dev//archive + otherArchives + otherArchivehttp://struts.apache.org/mail.html#Archives/otherArchive + /otherArchives + /mailingList + /mailingLists + + developers + developer + nameCraig R. McClanahan/name + idcraigmcc/id + emailcraigmcc at apache.org/email + roles +rolePMC Member/role + /roles + /developer + developer + nameTed Husted/name + idhusted/id + emailhusted at apache.org/email + roles +rolePMC Member/role + /roles + /developer + developer + nameCedric Dumoulin/name + idcedric/id + emailcedric.dumoulin at lifl.fr/email + roles +rolePMC Member/role + /roles + /developer + developer + nameMartin Cooper/name + idmartinc/id + emailmartinc at apache.org/email + roles +rolePMC Chair/role + /roles + /developer + developer + nameJames Holmes/name + idjholmes/id + emailjholmes at apache.org/email + roles +rolePMC Member/role + /roles + /developer + developer + nameDavid M. Karr/name + iddmkarr/id + emaildmkarr at apache.org/email + roles +rolePMC Member/role + /roles + /developer + developer + nameEddie Bush/name + idekbush/id + emailekbush at apache.org/email + roles +roleCommitter/role + /roles + /developer + developer + nameDavid Graham/name + iddgraham/id + emaildgraham at apache.org/email + roles +rolePMC Member/role + /roles + /developer + developer + nameJames Mitchell/name + idjmitchell/id + emailjmitchell at apache.org/email + roles +rolePMC Member/role + /roles + /developer + developer + nameDon Brown/name + idmrdon/id + emailmrdon at apache.org/email + roles
svn commit: r392656 - /struts/current/
Author: wsmoak Date: Sat Apr 8 18:42:45 2006 New Revision: 392656 URL: http://svn.apache.org/viewcvs?rev=392656view=rev Log: Added 'pom' to the current svn:externals definition for the Maven 2 struts-parent pom Modified: struts/current/ (props changed) Propchange: struts/current/ -- --- svn:externals (original) +++ svn:externals Sat Apr 8 18:42:45 2006 @@ -3,3 +3,4 @@ shale https://svn.apache.org/repos/asf/struts/shale/trunk site https://svn.apache.org/repos/asf/struts/site tiles https://svn.apache.org/repos/asf/struts/tiles/trunk +pom https://svn.apache.org/repos/asf/struts/pom - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r392658 - /struts/action/trunk/pom.xml
Author: wsmoak Date: Sat Apr 8 18:58:56 2006 New Revision: 392658 URL: http://svn.apache.org/viewcvs?rev=392658view=rev Log: The struts-action-parent pom now inherits from struts-parent. Remove the list of committers which is now in the struts-parent pom.xml. Modified: struts/action/trunk/pom.xml Modified: struts/action/trunk/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/pom.xml?rev=392658r1=392657r2=392658view=diff == --- struts/action/trunk/pom.xml (original) +++ struts/action/trunk/pom.xml Sat Apr 8 18:58:56 2006 @@ -35,6 +35,13 @@ 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; + parent + groupIdorg.apache.struts/groupId + artifactIdstruts-parent/artifactId + version1-SNAPSHOT/version + relativePath../pom/pom.xml/relativePath + /parent + modelVersion4.0.0/modelVersion groupIdorg.apache.struts.action/groupId artifactIdstruts-action-parent/artifactId @@ -58,213 +65,6 @@ urlscp://people.apache.org/www/cvs.apache.org/maven-snapshot-repository/url /snapshotRepository /distributionManagement - -mailingLists -mailingList -nameStruts User List/name -subscribe[EMAIL PROTECTED]/subscribe -unsubscribe[EMAIL PROTECTED]/unsubscribe -postuser@struts.apache.org/post -archive -http://mail-archives.apache.org/mod_mbox/struts-user//archive -otherArchives -otherArchive -http://struts.apache.org/mail.html#Archives/otherArchive -/otherArchives -/mailingList -mailingList -nameStruts Developer List/name -subscribe[EMAIL PROTECTED]/subscribe -unsubscribe[EMAIL PROTECTED]/unsubscribe -postdev@struts.apache.org/post -archive -http://mail-archives.apache.org/mod_mbox/struts-dev//archive -otherArchives -otherArchive -http://struts.apache.org/mail.html#Archives/otherArchive -/otherArchives -/mailingList -/mailingLists - -developers -developer -nameCraig R. McClanahan/name -idcraigmcc/id -emailcraigmcc at apache.org/email -roles -rolePMC Member/role -/roles -/developer -developer -nameTed Husted/name -idhusted/id -emailhusted at apache.org/email -roles -rolePMC Member/role -/roles -/developer -developer -nameCedric Dumoulin/name -idcedric/id -emailcedric.dumoulin at lifl.fr/email -roles -rolePMC Member/role -/roles -/developer -developer -nameMartin Cooper/name -idmartinc/id -emailmartinc at apache.org/email -roles -rolePMC Chair/role -/roles -/developer -developer -nameJames Holmes/name -idjholmes/id -emailjholmes at apache.org/email -roles -rolePMC Member/role -/roles -/developer -developer -nameDavid M. Karr/name -iddmkarr/id -emaildmkarr at apache.org/email -roles -rolePMC Member/role -/roles -/developer -developer -nameEddie Bush/name -idekbush/id -emailekbush at apache.org/email -roles -roleCommitter/role -/roles -/developer -developer -nameDavid Graham/name -iddgraham/id -emaildgraham at apache.org/email -roles -rolePMC Member/role -/roles -/developer -developer -nameJames Mitchell/name -idjmitchell/id -emailjmitchell at apache.org/email -roles -rolePMC Member/role -/roles -/developer -developer -nameDon Brown/name -idmrdon/id -emailmrdon at apache.org/email -roles -rolePMC Member/role -/roles -/developer -developer -nameJoe Germuska/name -idgermuska/id -emailgermuska at apache.org/email -roles -rolePMC Member/role -/roles -/developer -developer -nameNiall Pemberton/name -idniallp/id -emailniallp at apache.org/email -roles -rolePMC Member/role -/roles
svn commit: r392676 - /struts/pom/pom.xml
Author: wsmoak Date: Sat Apr 8 21:31:31 2006 New Revision: 392676 URL: http://svn.apache.org/viewcvs?rev=392676view=rev Log: Added distribution management section to the struts-parent pom. Because Struts uses test builds, we will release to the snapshot repository, then promote the build from there. Suggested by: Brett Porter Modified: struts/pom/pom.xml Modified: struts/pom/pom.xml URL: http://svn.apache.org/viewcvs/struts/pom/pom.xml?rev=392676r1=392675r2=392676view=diff == --- struts/pom/pom.xml (original) +++ struts/pom/pom.xml Sat Apr 8 21:31:31 2006 @@ -182,7 +182,6 @@ roles rolePMC Member/role /roles - timezone-7/timezone /developer developer nameGary VanMatre/name @@ -241,7 +240,24 @@ /roles /developer /developers - + distributionManagement + repository + idapache-maven-test-builds/id + nameApache Maven Repository (Test Builds)/name + urlscp://people.apache.org/www/cvs.apache.org/maven-snapshot-repository/url + /repository + snapshotRepository + uniqueVersionfalse/uniqueVersion + idapache-maven-snapshots/id + nameApache Maven Repository (Snapshots)/name + urlscp://people.apache.org/www/cvs.apache.org/maven-snapshot-repository/url + /snapshotRepository + site + idapache-site/id + nameApache Struts Website/name + urlscp://people.apache.org/www/struts.apache.org/url + /site + /distributionManagement /project - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r392681 - in /struts/action/trunk: assembly/pom.xml pom.xml
Author: wsmoak Date: Sat Apr 8 22:40:48 2006 New Revision: 392681 URL: http://svn.apache.org/viewcvs?rev=392681view=rev Log: Wrap the assembly creation in the 'generate-assembly' profile, and link to it from the struts-action-parent pom, so that 'mvn -P generate-assembly' from /struts/current/action will actually generate the assembly, instead of requiring a second step. Modified: struts/action/trunk/assembly/pom.xml struts/action/trunk/pom.xml Modified: struts/action/trunk/assembly/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/assembly/pom.xml?rev=392681r1=392680r2=392681view=diff == --- struts/action/trunk/assembly/pom.xml (original) +++ struts/action/trunk/assembly/pom.xml Sat Apr 8 22:40:48 2006 @@ -52,7 +52,10 @@ developerConnectionscm:svn:https://svn.apache.org/repos/asf/struts/action/trunk/assembly/developerConnection urlhttp://svn.apache.org/viewcvs.cgi/struts/action/trunk/assembly/url /scm - + + profiles + profile + idgenerate-assembly/id build plugins plugin @@ -205,6 +208,8 @@ /plugins /build + /profile + /profiles dependencies Modified: struts/action/trunk/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/pom.xml?rev=392681r1=392680r2=392681view=diff == --- struts/action/trunk/pom.xml (original) +++ struts/action/trunk/pom.xml Sat Apr 8 22:40:48 2006 @@ -75,6 +75,7 @@ modulescripting/module moduleapps/module modulemailreader-dao/module +moduleassembly/module /modules licenses - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r392344 - in /struts/action/trunk: pom.xml src/ src/main/ src/main/assembly/ src/main/assembly/src.xml
Author: wsmoak
Date: Fri Apr 7 10:52:33 2006
New Revision: 392344
URL: http://svn.apache.org/viewcvs?rev=392344view=rev
Log:
Add configuration for a source distribution.
Usage: mvn assembly:assembly -P assemble-src
Added:
struts/action/trunk/src/
struts/action/trunk/src/main/
struts/action/trunk/src/main/assembly/
struts/action/trunk/src/main/assembly/src.xml (with props)
Modified:
struts/action/trunk/pom.xml
Modified: struts/action/trunk/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/pom.xml?rev=392344r1=392343r2=392344view=diff
==
--- struts/action/trunk/pom.xml (original)
+++ struts/action/trunk/pom.xml Fri Apr 7 10:52:33 2006
@@ -266,7 +266,24 @@
/developer
/developers
-profiles/
+ profiles
+ profile
+idassemble-src/id
+build
+ plugins
+plugin
+ artifactIdmaven-assembly-plugin/artifactId
+ configuration
+ descriptorsrc/main/assembly/src.xml/descriptor
+ finalNamestruts-action-${version}/finalName
+ outputDirectorytarget/assembly/out/outputDirectory
+ workDirectorytarget/assembly/work/workDirectory
+ /configuration
+/plugin
+ /plugins
+/build
+ /profile
+ /profiles
modules
modulecore/module
Added: struts/action/trunk/src/main/assembly/src.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/src/main/assembly/src.xml?rev=392344view=auto
==
--- struts/action/trunk/src/main/assembly/src.xml (added)
+++ struts/action/trunk/src/main/assembly/src.xml Fri Apr 7 10:52:33 2006
@@ -0,0 +1,26 @@
+assembly
+ idsrc/id
+ formats
+formattar.gz/format
+formatzip/format
+ /formats
+ includeBaseDirectorytrue/includeBaseDirectory
+ !--fileSets
+fileSet
+ excludes
+exclude**/target/*/exclude
+ /excludes
+/fileSet
+ /fileSets--
+ modules
+module./module
+moduleapps/module
+modulecore/module
+moduleel/module
+moduleextras/module
+modulefaces/module
+modulemailreader-dao/module
+modulescripting/module
+moduletaglib/module
+ /modules
+/assembly
Propchange: struts/action/trunk/src/main/assembly/src.xml
--
svn:eol-style = native
Propchange: struts/action/trunk/src/main/assembly/src.xml
--
svn:keywords = Date Author Id Revision HeadURL
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r392430 - in /struts/action/trunk/taglib/src: test-cactus/ webapp/
Author: wsmoak Date: Fri Apr 7 14:55:26 2006 New Revision: 392430 URL: http://svn.apache.org/viewcvs?rev=392430view=rev Log: Move the Cactus tests and related webapp out of taglib, to integration. Removed: struts/action/trunk/taglib/src/test-cactus/ struts/action/trunk/taglib/src/webapp/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r392431 - in /struts/action/trunk/integration: ./ taglib-it/ taglib-it/src/ taglib-it/src/test/ taglib-it/src/test/java/ taglib-webapp/ taglib-webapp/src/ taglib-webapp/src/main/ taglib-we
Author: wsmoak
Date: Fri Apr 7 14:56:19 2006
New Revision: 392431
URL: http://svn.apache.org/viewcvs?rev=392431view=rev
Log:
Move the Cactus tests and related webapp out of taglib, to integration.
Added:
struts/action/trunk/integration/
struts/action/trunk/integration/pom.xml (with props)
struts/action/trunk/integration/taglib-it/
struts/action/trunk/integration/taglib-it/pom.xml (with props)
struts/action/trunk/integration/taglib-it/src/
struts/action/trunk/integration/taglib-it/src/test/
struts/action/trunk/integration/taglib-it/src/test/java/
- copied from r392374, struts/action/trunk/taglib/src/test-cactus/
struts/action/trunk/integration/taglib-webapp/
struts/action/trunk/integration/taglib-webapp/pom.xml (with props)
struts/action/trunk/integration/taglib-webapp/src/
struts/action/trunk/integration/taglib-webapp/src/main/
struts/action/trunk/integration/taglib-webapp/src/main/webapp/
- copied from r392374, struts/action/trunk/taglib/src/webapp/
struts/action/trunk/integration/taglib-webapp/src/main/webapp/WEB-INF/web.xml
(with props)
Added: struts/action/trunk/integration/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/integration/pom.xml?rev=392431view=auto
==
--- struts/action/trunk/integration/pom.xml (added)
+++ struts/action/trunk/integration/pom.xml Fri Apr 7 14:56:19 2006
@@ -0,0 +1,57 @@
+?xml version=1.0?
+!--
+/*
+ * Copyright 2005-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Id$
+ */
+--
+
+!--
+ Experimental Maven 2 Build for Apache Struts
+
+
+To build and install this module into your local repo:
+
+ $ mvn install
+
+For more information, see: http://wiki.apache.org/struts/StrutsMaven2Plan
+
+--
+
+project xmlns=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;
+
+ parent
+ groupIdorg.apache.struts.action/groupId
+ artifactIdstruts-build/artifactId
+ version1.3.2-SNAPSHOT/version
+ /parent
+
+ modelVersion4.0.0/modelVersion
+ artifactIdstruts-action-it/artifactId
+ packagingpom/packaging
+ nameStruts Action - Integration Tests/name
+
+ modules
+ moduletaglib-webapp/module
+ moduletaglib-it/module
+ /modules
+
+ build
+ finalName${pom.artifactId}/finalName
+ /build
+
+/project
Propchange: struts/action/trunk/integration/pom.xml
--
svn:eol-style = native
Propchange: struts/action/trunk/integration/pom.xml
--
svn:keywords = Date Author Id Revision HeadURL
Added: struts/action/trunk/integration/taglib-it/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/integration/taglib-it/pom.xml?rev=392431view=auto
==
--- struts/action/trunk/integration/taglib-it/pom.xml (added)
+++ struts/action/trunk/integration/taglib-it/pom.xml Fri Apr 7 14:56:19 2006
@@ -0,0 +1,126 @@
+?xml version=1.0?
+!--
+/*
+ * Copyright 2005-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Id$
+ */
+--
+
+!--
+ Experimental Maven 2 Build for Apache Struts
+
+
+To build and install this module into your local repo:
+
+ $ mvn install
+
+For more information, see: http://wiki.apache.org/struts/StrutsMaven2Plan
+
+--
+
+project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation=http
svn commit: r392450 - in /struts/action/trunk: assembly/pom.xml assembly/src/main/assembly/src.xml pom.xml src/
Author: wsmoak
Date: Fri Apr 7 16:25:18 2006
New Revision: 392450
URL: http://svn.apache.org/viewcvs?rev=392450view=rev
Log:
Specify a version number for maven-assembly-plugin to keep Wendy from using
snapshots. :)
Drop the assemble-src profile.
Move src.xml into assembly, but comment it out as modules (and multiple
descriptors) won't work until v2.1 of the plugin is released.
Added:
struts/action/trunk/assembly/src/main/assembly/src.xml
- copied, changed from r392374,
struts/action/trunk/src/main/assembly/src.xml
Removed:
struts/action/trunk/src/
Modified:
struts/action/trunk/assembly/pom.xml
struts/action/trunk/pom.xml
Modified: struts/action/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/assembly/pom.xml?rev=392450r1=392449r2=392450view=diff
==
--- struts/action/trunk/assembly/pom.xml (original)
+++ struts/action/trunk/assembly/pom.xml Fri Apr 7 16:25:18 2006
@@ -154,9 +154,12 @@
plugin
artifactIdmaven-assembly-plugin/artifactId
-version2.0-beta-1/version
+version2.0.1/version
configuration
- descriptorsrc/main/assembly/dep.xml/descriptor
+ descriptors
+descriptorsrc/main/assembly/dep.xml/descriptor
+!-- descriptorsrc/main/assembly/src.xml/descriptor --
+ /descriptors
finalNamestruts-action-${version}/finalName
outputDirectorytarget/assembly/out/outputDirectory
workDirectorytarget/assembly/work/workDirectory
Copied: struts/action/trunk/assembly/src/main/assembly/src.xml (from r392374,
struts/action/trunk/src/main/assembly/src.xml)
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/assembly/src/main/assembly/src.xml?p2=struts/action/trunk/assembly/src/main/assembly/src.xmlp1=struts/action/trunk/src/main/assembly/src.xmlr1=392374r2=392450rev=392450view=diff
==
--- struts/action/trunk/src/main/assembly/src.xml (original)
+++ struts/action/trunk/assembly/src/main/assembly/src.xml Fri Apr 7 16:25:18
2006
@@ -13,7 +13,6 @@
/fileSet
/fileSets--
modules
-module./module
moduleapps/module
modulecore/module
moduleel/module
Modified: struts/action/trunk/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/pom.xml?rev=392450r1=392449r2=392450view=diff
==
--- struts/action/trunk/pom.xml (original)
+++ struts/action/trunk/pom.xml Fri Apr 7 16:25:18 2006
@@ -266,25 +266,6 @@
/developer
/developers
- profiles
- profile
-idassemble-src/id
-build
- plugins
-plugin
- artifactIdmaven-assembly-plugin/artifactId
- configuration
- descriptorsrc/main/assembly/src.xml/descriptor
- finalNamestruts-action-${version}/finalName
- outputDirectorytarget/assembly/out/outputDirectory
- workDirectorytarget/assembly/work/workDirectory
- /configuration
-/plugin
- /plugins
-/build
- /profile
- /profiles
-
modules
modulecore/module
moduleel/module
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r392465 - in /struts/action/trunk/assembly: pom.xml src/main/assembly/all.xml
Author: wsmoak
Date: Fri Apr 7 17:33:16 2006
New Revision: 392465
URL: http://svn.apache.org/viewcvs?rev=392465view=rev
Log:
Include the -sources jars in the assembly, and call it struts-action-x.x.x-all.
This is a temporary measure while we work on a -src distribution, which may
require maven-assembly-plugin v2.1.
Added:
struts/action/trunk/assembly/src/main/assembly/all.xml
- copied, changed from r392445,
struts/action/trunk/assembly/src/main/assembly/dep.xml
Modified:
struts/action/trunk/assembly/pom.xml
Modified: struts/action/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/assembly/pom.xml?rev=392465r1=392464r2=392465view=diff
==
--- struts/action/trunk/assembly/pom.xml (original)
+++ struts/action/trunk/assembly/pom.xml Fri Apr 7 17:33:16 2006
@@ -149,6 +149,42 @@
outputDirectory${project.build.directory}/webapps/outputDirectory
/configuration
/execution
+ execution
+idcopy-sources/id
+phasepackage/phase
+goals
+ goalcopy/goal
+/goals
+configuration
+ artifactItems
+artifactItem
+ groupIdorg.apache.struts.action/groupId
+ artifactIdstruts-core/artifactId
+ version${version}/version
+ classifiersources/classifier
+/artifactItem
+artifactItem
+ groupIdorg.apache.struts.action/groupId
+ artifactIdstruts-el/artifactId
+ version${version}/version
+ classifiersources/classifier
+/artifactItem
+artifactItem
+ groupIdorg.apache.struts.action/groupId
+ artifactIdstruts-extras/artifactId
+ version${version}/version
+ classifiersources/classifier
+/artifactItem
+artifactItem
+ groupIdorg.apache.struts.action/groupId
+ artifactIdstruts-taglib/artifactId
+ version${version}/version
+ classifiersources/classifier
+/artifactItem
+ /artifactItems
+
outputDirectory${project.build.directory}/sources/outputDirectory
+/configuration
+ /execution
/executions
/plugin
@@ -157,7 +193,8 @@
version2.0.1/version
configuration
descriptors
-descriptorsrc/main/assembly/dep.xml/descriptor
+descriptorsrc/main/assembly/all.xml/descriptor
+!-- descriptorsrc/main/assembly/dep.xml/descriptor --
!-- descriptorsrc/main/assembly/src.xml/descriptor --
/descriptors
finalNamestruts-action-${version}/finalName
Copied: struts/action/trunk/assembly/src/main/assembly/all.xml (from r392445,
struts/action/trunk/assembly/src/main/assembly/dep.xml)
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/assembly/src/main/assembly/all.xml?p2=struts/action/trunk/assembly/src/main/assembly/all.xmlp1=struts/action/trunk/assembly/src/main/assembly/dep.xmlr1=392445r2=392465rev=392465view=diff
==
--- struts/action/trunk/assembly/src/main/assembly/dep.xml (original)
+++ struts/action/trunk/assembly/src/main/assembly/all.xml Fri Apr 7 17:33:16
2006
@@ -1,5 +1,5 @@
assembly
- idbin/id
+ idall/id
formats
formattar.gz/format
formatzip/format
@@ -32,6 +32,13 @@
outputDirectorywebapps/outputDirectory
includes
include*.war/include
+ /includes
+/fileSet
+fileSet
+ directorytarget/sources/directory
+ outputDirectorysources/outputDirectory
+ includes
+include*.jar/include
/includes
/fileSet
/fileSets
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r392482 - in /struts/action/trunk/integration: taglib-it/src/main/ taglib-webapp/src/main/
Author: wsmoak Date: Fri Apr 7 22:45:22 2006 New Revision: 392482 URL: http://svn.apache.org/viewcvs?rev=392482view=rev Log: Move the webapp into the same module as the Struts Taglib Cactus tests. Added: struts/action/trunk/integration/taglib-it/src/main/ - copied from r392481, struts/action/trunk/integration/taglib-webapp/src/main/ Removed: struts/action/trunk/integration/taglib-webapp/src/main/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r391915 - in /struts/action/trunk: assembly/ assembly/src/ assembly/src/main/ assembly/src/main/assembly/ assembly/src/main/resources/ core/
Author: wsmoak
Date: Wed Apr 5 23:46:14 2006
New Revision: 391915
URL: http://svn.apache.org/viewcvs?rev=391915view=rev
Log:
Configure the source and javadoc plugins for struts-core, and add a simple
assembly.
Run 'mvn install' from action/build, then 'mvn assembly:assembly' from
action/assembly.
Adapted from the Apache MyFaces build.
Added:
struts/action/trunk/assembly/
struts/action/trunk/assembly/pom.xml (with props)
struts/action/trunk/assembly/src/
struts/action/trunk/assembly/src/main/
struts/action/trunk/assembly/src/main/assembly/
struts/action/trunk/assembly/src/main/assembly/dep.xml (with props)
struts/action/trunk/assembly/src/main/resources/
struts/action/trunk/assembly/src/main/resources/LICENSE.txt
- copied unchanged from r391907, struts/action/trunk/build/LICENSE.txt
struts/action/trunk/assembly/src/main/resources/NOTICE.txt
- copied unchanged from r391907, struts/action/trunk/build/NOTICE.txt
Modified:
struts/action/trunk/core/pom.xml
Added: struts/action/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/assembly/pom.xml?rev=391915view=auto
==
--- struts/action/trunk/assembly/pom.xml (added)
+++ struts/action/trunk/assembly/pom.xml Wed Apr 5 23:46:14 2006
@@ -0,0 +1,108 @@
+?xml version=1.0?
+!--
+/*
+ * Copyright 2005-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Id:$
+ */
+--
+
+!--
+ Experimental Maven 2 Build for Apache Struts
+
+
+To create the assembly:
+
+ $ mvn assembly:assembly
+
+For more information, see: http://wiki.apache.org/struts/StrutsMaven2Plan
+
+--
+
+project xmlns=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;
+ modelVersion4.0.0/modelVersion
+ artifactIdstruts-action-assembly/artifactId
+ packagingpom/packaging
+ nameStruts Action Assembly/name
+ description
+ Struts Action Assembly
+ /description
+
+ parent
+groupIdorg.apache.struts.action/groupId
+artifactIdstruts-build/artifactId
+version1.3.2-SNAPSHOT/version
+relativePath../build/pom.xml/relativePath
+ /parent
+
+ scm
+
connectionscm:svn:http://svn.apache.org/repos/asf/struts/action/trunk/assembly/connection
+
developerConnectionscm:svn:https://svn.apache.org/repos/asf/struts/action/trunk/assembly/developerConnection
+urlhttp://svn.apache.org/viewcvs.cgi/struts/action/trunk/assembly/url
+ /scm
+
+ build
+plugins
+ plugin
+groupIdorg.codehaus.mojo/groupId
+artifactIddependency-maven-plugin/artifactId
+executions
+ execution
+idcopy-javadoc/id
+phasepackage/phase
+goals
+ goalcopy/goal
+/goals
+configuration
+ artifactItems
+artifactItem
+ groupIdorg.apache.struts.action/groupId
+ artifactIdstruts-core/artifactId
+ version${version}/version
+ classifierjavadoc/classifier
+/artifactItem
+ /artifactItems
+
outputDirectory${project.build.directory}/javadoc/outputDirectory
+/configuration
+ /execution
+/executions
+ /plugin
+
+ plugin
+artifactIdmaven-assembly-plugin/artifactId
+version2.0-beta-1/version
+configuration
+ descriptorsrc/main/assembly/dep.xml/descriptor
+ finalNamestruts-action-${version}/finalName
+ outputDirectorytarget/assembly/out/outputDirectory
+ workDirectorytarget/assembly/work/workDirectory
+/configuration
+ /plugin
+/plugins
+
+ /build
+
+ dependencies
+
+dependency
+ groupIdorg.apache.struts.action/groupId
+ artifactIdstruts-core/artifactId
+ version${version}/version
+/dependency
+
+ /dependencies
+
+/project
Propchange: struts/action/trunk/assembly/pom.xml
--
svn:eol-style = native
Propchange: struts/action/trunk/assembly/pom.xml
--
svn:keywords = Date Author Id
svn commit: r391996 - /struts/action/trunk/apps/blank/project.xml
Author: wsmoak Date: Thu Apr 6 07:39:46 2006 New Revision: 391996 URL: http://svn.apache.org/viewcvs?rev=391996view=rev Log: Struts Action should depend on a fixed version of Struts Tiles. Changed dependency to struts-tiles 1.3.0 which has been deployed to the cvs.apache.org Maven repos. Modified: struts/action/trunk/apps/blank/project.xml Modified: struts/action/trunk/apps/blank/project.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/apps/blank/project.xml?rev=391996r1=391995r2=391996view=diff == --- struts/action/trunk/apps/blank/project.xml (original) +++ struts/action/trunk/apps/blank/project.xml Thu Apr 6 07:39:46 2006 @@ -13,7 +13,7 @@ dependency groupIdorg.apache.struts.tiles/groupId artifactIdstruts-tiles/artifactId - version1.3.1-SNAPSHOT/version + version1.3.0/version properties war.bundletrue/war.bundle /properties - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r392029 - in /struts/action/trunk: assembly/pom.xml build/pom.xml core/pom.xml el/pom.xml extras/pom.xml pom.xml taglib/pom.xml
Author: wsmoak Date: Thu Apr 6 11:43:24 2006 New Revision: 392029 URL: http://svn.apache.org/viewcvs?rev=392029view=rev Log: Moved the Struts Action parent pom to the top level in struts/action/trunk. Added a defaultGoal so that 'mvn' is equivalent to 'mvn install'. Added: struts/action/trunk/pom.xml - copied, changed from r391907, struts/action/trunk/build/pom.xml Removed: struts/action/trunk/build/pom.xml Modified: struts/action/trunk/assembly/pom.xml struts/action/trunk/core/pom.xml struts/action/trunk/el/pom.xml struts/action/trunk/extras/pom.xml struts/action/trunk/taglib/pom.xml Modified: struts/action/trunk/assembly/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/assembly/pom.xml?rev=392029r1=392028r2=392029view=diff == --- struts/action/trunk/assembly/pom.xml (original) +++ struts/action/trunk/assembly/pom.xml Thu Apr 6 11:43:24 2006 @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * $Id:$ + * $Id$ */ -- @@ -36,7 +36,7 @@ modelVersion4.0.0/modelVersion artifactIdstruts-action-assembly/artifactId packagingpom/packaging - nameStruts Action Assembly/name + nameStruts Action - Assembly/name description Struts Action Assembly /description @@ -45,7 +45,6 @@ groupIdorg.apache.struts.action/groupId artifactIdstruts-build/artifactId version1.3.2-SNAPSHOT/version -relativePath../build/pom.xml/relativePath /parent scm Modified: struts/action/trunk/core/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/core/pom.xml?rev=392029r1=392028r2=392029view=diff == --- struts/action/trunk/core/pom.xml (original) +++ struts/action/trunk/core/pom.xml Thu Apr 6 11:43:24 2006 @@ -39,7 +39,6 @@ groupIdorg.apache.struts.action/groupId artifactIdstruts-build/artifactId version1.3.2-SNAPSHOT/version -relativePath../build/pom.xml/relativePath /parent modelVersion4.0.0/modelVersion Modified: struts/action/trunk/el/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/el/pom.xml?rev=392029r1=392028r2=392029view=diff == --- struts/action/trunk/el/pom.xml (original) +++ struts/action/trunk/el/pom.xml Thu Apr 6 11:43:24 2006 @@ -38,14 +38,13 @@ groupIdorg.apache.struts.action/groupId artifactIdstruts-build/artifactId version1.3.2-SNAPSHOT/version - relativePath../build/pom.xml/relativePath /parent modelVersion4.0.0/modelVersion artifactIdstruts-el/artifactId packagingjar/packaging version1.3.1-SNAPSHOT/version - nameStruts EL/name + nameStruts Action - EL/name urlhttp://struts.apache.org/url build Modified: struts/action/trunk/extras/pom.xml URL: http://svn.apache.org/viewcvs/struts/action/trunk/extras/pom.xml?rev=392029r1=392028r2=392029view=diff == --- struts/action/trunk/extras/pom.xml (original) +++ struts/action/trunk/extras/pom.xml Thu Apr 6 11:43:24 2006 @@ -38,14 +38,13 @@ groupIdorg.apache.struts.action/groupId artifactIdstruts-build/artifactId version1.3.2-SNAPSHOT/version - relativePath../build/pom.xml/relativePath /parent modelVersion4.0.0/modelVersion artifactIdstruts-extras/artifactId packagingjar/packaging version1.3.1-SNAPSHOT/version - nameStruts Extras/name + nameStruts Action - Extras/name urlhttp://struts.apache.org/url build Copied: struts/action/trunk/pom.xml (from r391907, struts/action/trunk/build/pom.xml) URL: http://svn.apache.org/viewcvs/struts/action/trunk/pom.xml?p2=struts/action/trunk/pom.xmlp1=struts/action/trunk/build/pom.xmlr1=391907r2=392029rev=392029view=diff == --- struts/action/trunk/build/pom.xml (original) +++ struts/action/trunk/pom.xml Thu Apr 6 11:43:24 2006 @@ -40,7 +40,7 @@ artifactIdstruts-build/artifactId version1.3.2-SNAPSHOT/version packagingpom/packaging -nameApache Struts/name +nameStruts Action/name urlhttp://struts.apache.org/url inceptionYear2000/inceptionYear @@ -269,11 +269,11 @@ profiles/ modules -module../core/module -module../el/module -module../extras/module -module../taglib/module -!--module../apps/module-- +modulecore/module +moduleel/module +moduleextras/module +moduletaglib/module +!--moduleapps/module-- /modules licenses @@ -303,6 +303,9 @@ /plugin /plugins /pluginManagement + +defaultGoalinstall/defaultGoal
svn commit: r392055 - in /struts/action/trunk: core/pom.xml el/pom.xml extras/pom.xml taglib/pom.xml
Author: wsmoak
Date: Thu Apr 6 12:59:42 2006
New Revision: 392055
URL: http://svn.apache.org/viewcvs?rev=392055view=rev
Log:
Synchronize the version number across Struts Action by removing version tags
and using the ${pom.version} expression.
Correct the path to the build directory for license and notice files.
Modified:
struts/action/trunk/core/pom.xml
struts/action/trunk/el/pom.xml
struts/action/trunk/extras/pom.xml
struts/action/trunk/taglib/pom.xml
Modified: struts/action/trunk/core/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/core/pom.xml?rev=392055r1=392054r2=392055view=diff
==
--- struts/action/trunk/core/pom.xml (original)
+++ struts/action/trunk/core/pom.xml Thu Apr 6 12:59:42 2006
@@ -44,7 +44,6 @@
modelVersion4.0.0/modelVersion
artifactIdstruts-core/artifactId
packagingjar/packaging
-version1.3.2-SNAPSHOT/version
nameStruts Action - Core/name
urlhttp://struts.apache.org/url
@@ -90,7 +89,7 @@
/includes
/resource
resource
-directorybuild/directory
+directory../build/directory
includes
includeLICENSE.txt/include
includeNOTICE.txt/include
Modified: struts/action/trunk/el/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/el/pom.xml?rev=392055r1=392054r2=392055view=diff
==
--- struts/action/trunk/el/pom.xml (original)
+++ struts/action/trunk/el/pom.xml Thu Apr 6 12:59:42 2006
@@ -43,7 +43,6 @@
modelVersion4.0.0/modelVersion
artifactIdstruts-el/artifactId
packagingjar/packaging
- version1.3.1-SNAPSHOT/version
nameStruts Action - EL/name
urlhttp://struts.apache.org/url
@@ -61,7 +60,7 @@
targetPathMETA-INF/tlds/targetPath
/resource
resource
-directorybuild/directory
+directory../build/directory
includes
includeLICENSE.txt/include
includeNOTICE.txt/include
@@ -106,13 +105,13 @@
dependency
groupIdorg.apache.struts.action/groupId
artifactIdstruts-core/artifactId
- version1.3.2-SNAPSHOT/version
+ version${pom.version}/version
/dependency
dependency
groupIdorg.apache.struts.action/groupId
artifactIdstruts-taglib/artifactId
- version1.3.1-SNAPSHOT/version
+ version${pom.version}/version
/dependency
dependency
Modified: struts/action/trunk/extras/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/extras/pom.xml?rev=392055r1=392054r2=392055view=diff
==
--- struts/action/trunk/extras/pom.xml (original)
+++ struts/action/trunk/extras/pom.xml Thu Apr 6 12:59:42 2006
@@ -43,7 +43,6 @@
modelVersion4.0.0/modelVersion
artifactIdstruts-extras/artifactId
packagingjar/packaging
- version1.3.1-SNAPSHOT/version
nameStruts Action - Extras/name
urlhttp://struts.apache.org/url
@@ -60,7 +59,7 @@
/includes
/resource
resource
-directorybuild/directory
+directory../build/directory
includes
includeLICENSE.txt/include
includeNOTICE.txt/include
@@ -91,7 +90,7 @@
dependency
groupIdorg.apache.struts.action/groupId
artifactIdstruts-core/artifactId
- version1.3.2-SNAPSHOT/version
+ version${pom.version}/version
/dependency
/dependencies
Modified: struts/action/trunk/taglib/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/taglib/pom.xml?rev=392055r1=392054r2=392055view=diff
==
--- struts/action/trunk/taglib/pom.xml (original)
+++ struts/action/trunk/taglib/pom.xml Thu Apr 6 12:59:42 2006
@@ -43,7 +43,6 @@
modelVersion4.0.0/modelVersion
artifactIdstruts-taglib/artifactId
packagingjar/packaging
- version1.3.1-SNAPSHOT/version
nameStruts Action - Taglib/name
urlhttp://struts.apache.org/url
@@ -67,7 +66,7 @@
targetPathMETA-INF/tlds/targetPath
/resource
resource
-directorybuild/directory
+directory../build/directory
includes
includeLICENSE.txt/include
includeNOTICE.txt/include
@@ -105,7 +104,7 @@
dependency
groupIdorg.apache.struts.action/groupId
artifactIdstruts-core/artifactId
- version1.3.2-SNAPSHOT/version
+ version${pom.version}/version
/dependency
/dependencies
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e
svn commit: r392080 - in /struts/action/trunk: ./ apps/ apps/cookbook/ apps/cookbook/src/java/ apps/cookbook/src/main/ apps/cookbook/src/main/java/ apps/cookbook/src/main/java/examples/ apps/cookbook/
Author: wsmoak
Date: Thu Apr 6 14:19:10 2006
New Revision: 392080
URL: http://svn.apache.org/viewcvs?rev=392080view=rev
Log:
Un-comment the apps module, and add poms for apps and cookbook.
Restructure cookbook to src/main/java and src/main/webapp.
Switch to the Maven 2 repo on cvs.apache.org
Added:
struts/action/trunk/apps/cookbook/pom.xml (with props)
struts/action/trunk/apps/cookbook/src/main/
struts/action/trunk/apps/cookbook/src/main/java/
- copied from r391907, struts/action/trunk/apps/cookbook/src/java/
struts/action/trunk/apps/cookbook/src/main/java/examples/
- copied from r392077,
struts/action/trunk/apps/cookbook/src/java/examples/
struts/action/trunk/apps/cookbook/src/main/webapp/
- copied from r391907, struts/action/trunk/apps/cookbook/src/webapp/
struts/action/trunk/apps/cookbook/src/main/webapp/WEB-INF/
- copied from r392077,
struts/action/trunk/apps/cookbook/src/webapp/WEB-INF/
struts/action/trunk/apps/cookbook/src/main/webapp/css/
- copied from r392077, struts/action/trunk/apps/cookbook/src/webapp/css/
struts/action/trunk/apps/cookbook/src/main/webapp/images/
- copied from r392077,
struts/action/trunk/apps/cookbook/src/webapp/images/
struts/action/trunk/apps/cookbook/src/main/webapp/index.jsp
- copied unchanged from r392077,
struts/action/trunk/apps/cookbook/src/webapp/index.jsp
struts/action/trunk/apps/cookbook/src/main/webapp/jsp/
- copied from r392077, struts/action/trunk/apps/cookbook/src/webapp/jsp/
struts/action/trunk/apps/cookbook/src/main/webapp/source.jsp
- copied unchanged from r392077,
struts/action/trunk/apps/cookbook/src/webapp/source.jsp
struts/action/trunk/apps/pom.xml (with props)
Removed:
struts/action/trunk/apps/cookbook/src/java/
struts/action/trunk/apps/cookbook/src/webapp/
Modified:
struts/action/trunk/core/pom.xml
struts/action/trunk/pom.xml
Added: struts/action/trunk/apps/cookbook/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/cookbook/pom.xml?rev=392080view=auto
==
--- struts/action/trunk/apps/cookbook/pom.xml (added)
+++ struts/action/trunk/apps/cookbook/pom.xml Thu Apr 6 14:19:10 2006
@@ -0,0 +1,66 @@
+?xml version=1.0?
+!--
+/*
+ * Copyright 2005-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Id$
+ */
+--
+
+!--
+ Experimental Maven 2 Build for Apache Struts
+
+
+To build and install this module into your local repo:
+
+ $ mvn install
+
+For more information, see: http://wiki.apache.org/struts/StrutsMaven2Plan
+
+--
+
+project xmlns=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;
+
+ parent
+ groupIdorg.apache.struts.action/groupId
+ artifactIdstruts-apps/artifactId
+ version1.3.2-SNAPSHOT/version
+ /parent
+
+ modelVersion4.0.0/modelVersion
+ artifactIdstruts-cookbook/artifactId
+ packagingwar/packaging
+ nameStruts Action - Apps - Cookbook/name
+
+ dependencies
+ dependency
+ groupId${pom.groupId}/groupId
+ artifactIdstruts-core/artifactId
+ version${pom.version}/version
+ /dependency
+ dependency
+ groupIdjavax.servlet/groupId
+ artifactIdservlet-api/artifactId
+ version2.3/version
+ scopeprovided/scope
+ /dependency
+ /dependencies
+
+ build
+ finalName${pom.artifactId}/finalName
+ /build
+
+/project
\ No newline at end of file
Propchange: struts/action/trunk/apps/cookbook/pom.xml
--
svn:eol-style = native
Propchange: struts/action/trunk/apps/cookbook/pom.xml
--
svn:keywords = Date Author Id Revision HeadURL
Added: struts/action/trunk/apps/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/pom.xml?rev=392080view=auto
==
--- struts/action/trunk/apps/pom.xml (added)
+++ struts/action/trunk/apps/pom.xml Thu Apr 6 14:19:10 2006
@@ -0,0 +1,52 @@
+?xml version=1.0?
+!--
+/*
+ * Copyright 2005
svn commit: r392117 - in /struts/action/trunk/apps: cookbook/pom.xml pom.xml
Author: wsmoak
Date: Thu Apr 6 16:26:51 2006
New Revision: 392117
URL: http://svn.apache.org/viewcvs?rev=392117view=rev
Log:
Include source code for example webapps under WEB-INF/src
Modified:
struts/action/trunk/apps/cookbook/pom.xml
struts/action/trunk/apps/pom.xml
Modified: struts/action/trunk/apps/cookbook/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/cookbook/pom.xml?rev=392117r1=392116r2=392117view=diff
==
--- struts/action/trunk/apps/cookbook/pom.xml (original)
+++ struts/action/trunk/apps/cookbook/pom.xml Thu Apr 6 16:26:51 2006
@@ -58,9 +58,5 @@
scopeprovided/scope
/dependency
/dependencies
-
- build
- finalName${pom.artifactId}/finalName
- /build
/project
Modified: struts/action/trunk/apps/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/pom.xml?rev=392117r1=392116r2=392117view=diff
==
--- struts/action/trunk/apps/pom.xml (original)
+++ struts/action/trunk/apps/pom.xml Thu Apr 6 16:26:51 2006
@@ -55,14 +55,26 @@
build
resources
+!-- Include source code under WEB-INF/src for example apps --
+resource
+ directorysrc/main/java/directory
+ targetPath../${pom.artifactId}/WEB-INF/src/main/java/targetPath
+ includes
+ include**/*.java/include
+ include**/*.properties/include
+ include**/*.xml/include
+ /includes
+/resource
+!-- Include resources under src/main/java in WEB-INF/classes --
resource
directorysrc/main/java/directory
includes
include**/*.properties/include
+include**/*.xml/include
/includes
/resource
- /resources
+ /resources
+ finalName${pom.artifactId}/finalName
/build
-
/project
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r392126 - /struts/action/trunk/apps/examples/pom.xml
Author: wsmoak
Date: Thu Apr 6 16:56:02 2006
New Revision: 392126
URL: http://svn.apache.org/viewcvs?rev=392126view=rev
Log:
Removed build section which will be inherited from parent pom.
Modified:
struts/action/trunk/apps/examples/pom.xml
Modified: struts/action/trunk/apps/examples/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/examples/pom.xml?rev=392126r1=392125r2=392126view=diff
==
--- struts/action/trunk/apps/examples/pom.xml (original)
+++ struts/action/trunk/apps/examples/pom.xml Thu Apr 6 16:56:02 2006
@@ -74,8 +74,4 @@
/dependency
/dependencies
- build
- finalName${pom.artifactId}/finalName
- /build
-
/project
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r392153 - /struts/action/trunk/assembly/pom.xml
Author: wsmoak
Date: Thu Apr 6 18:48:55 2006
New Revision: 392153
URL: http://svn.apache.org/viewcvs?rev=392153view=rev
Log:
Add additional jar and war artifacts to the assembly.
Modified:
struts/action/trunk/assembly/pom.xml
Modified: struts/action/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/assembly/pom.xml?rev=392153r1=392152r2=392153view=diff
==
--- struts/action/trunk/assembly/pom.xml (original)
+++ struts/action/trunk/assembly/pom.xml Thu Apr 6 18:48:55 2006
@@ -73,6 +73,24 @@
version${version}/version
classifierjavadoc/classifier
/artifactItem
+artifactItem
+ groupIdorg.apache.struts.action/groupId
+ artifactIdstruts-el/artifactId
+ version${version}/version
+ classifierjavadoc/classifier
+/artifactItem
+artifactItem
+ groupIdorg.apache.struts.action/groupId
+ artifactIdstruts-extras/artifactId
+ version${version}/version
+ classifierjavadoc/classifier
+/artifactItem
+artifactItem
+ groupIdorg.apache.struts.action/groupId
+ artifactIdstruts-taglib/artifactId
+ version${version}/version
+ classifierjavadoc/classifier
+/artifactItem
/artifactItems
outputDirectory${project.build.directory}/javadoc/outputDirectory
/configuration
@@ -91,6 +109,42 @@
version${version}/version
typewar/type
/artifactItem
+artifactItem
+ groupIdorg.apache.struts.action/groupId
+ artifactIdstruts-examples/artifactId
+ version${version}/version
+ typewar/type
+/artifactItem
+artifactItem
+ groupIdorg.apache.struts.action/groupId
+ artifactIdstruts-mailreader/artifactId
+ version${version}/version
+ typewar/type
+/artifactItem
+artifactItem
+ groupIdorg.apache.struts.action/groupId
+ artifactIdstruts-faces-example1/artifactId
+ version${version}/version
+ typewar/type
+/artifactItem
+artifactItem
+ groupIdorg.apache.struts.action/groupId
+ artifactIdstruts-cookbook/artifactId
+ version${version}/version
+ typewar/type
+/artifactItem
+artifactItem
+ groupIdorg.apache.struts.action/groupId
+ artifactIdstruts-faces-example2/artifactId
+ version${version}/version
+ typewar/type
+/artifactItem
+artifactItem
+ groupIdorg.apache.struts.action/groupId
+ artifactIdstruts-blank/artifactId
+ version${version}/version
+ typewar/type
+/artifactItem
/artifactItems
outputDirectory${project.build.directory}/webapps/outputDirectory
/configuration
@@ -117,6 +171,26 @@
dependency
groupIdorg.apache.struts.action/groupId
artifactIdstruts-core/artifactId
+ version${version}/version
+/dependency
+dependency
+ groupIdorg.apache.struts.action/groupId
+ artifactIdstruts-extras/artifactId
+ version${version}/version
+/dependency
+dependency
+ groupIdorg.apache.struts.action/groupId
+ artifactIdstruts-el/artifactId
+ version${version}/version
+/dependency
+dependency
+ groupIdorg.apache.struts.action/groupId
+ artifactIdstruts-taglib/artifactId
+ version${version}/version
+/dependency
+dependency
+ groupIdorg.apache.struts.action/groupId
+ artifactIdstruts-mailreader-dao/artifactId
version${version}/version
/dependency
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r392155 - /struts/action/trunk/apps/pom.xml
Author: wsmoak
Date: Thu Apr 6 18:52:51 2006
New Revision: 392155
URL: http://svn.apache.org/viewcvs?rev=392155view=rev
Log:
Comment out the inclusion of sources in the webapps until problems can be
resolved.
Modified:
struts/action/trunk/apps/pom.xml
Modified: struts/action/trunk/apps/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/pom.xml?rev=392155r1=392154r2=392155view=diff
==
--- struts/action/trunk/apps/pom.xml (original)
+++ struts/action/trunk/apps/pom.xml Thu Apr 6 18:52:51 2006
@@ -57,7 +57,7 @@
build
resources
!-- Include source code under WEB-INF/src for example apps --
-resource
+!--resource
directorysrc/main/java/directory
targetPath${basedir}/target/${pom.artifactId}/WEB-INF/src/main/java/targetPath
includes
@@ -65,7 +65,7 @@
include**/*.properties/include
include**/*.xml/include
/includes
-/resource
+/resource--
!-- Include resources under src/main/java in WEB-INF/classes --
resource
directorysrc/main/java/directory
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r392159 - /struts/current/nightly.sh
Author: wsmoak Date: Thu Apr 6 19:15:23 2006 New Revision: 392159 URL: http://svn.apache.org/viewcvs?rev=392159view=rev Log: Start converting the Struts Action 1.3 nightly builds to Maven 2. Still needs work. Modified: struts/current/nightly.sh Modified: struts/current/nightly.sh URL: http://svn.apache.org/viewcvs/struts/current/nightly.sh?rev=392159r1=392158r2=392159view=diff == --- struts/current/nightly.sh (original) +++ struts/current/nightly.sh Thu Apr 6 19:15:23 2006 @@ -54,8 +54,10 @@ svn co http://svn.apache.org/repos/asf/struts/current/ struts echo --- build and deploy Struts Action 1.3.x --- -cd $SVN_DIR/struts/action/build/ -maven nightly +cd $SVN_DIR/struts/action/ +mvn install -P generate-assembly +cd assembly +mvn assembly:assembly scp -r $NIGHTLIES $TARGET_1_3_URL - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r392176 - /struts/action/trunk/apps/pom.xml
Author: wsmoak
Date: Thu Apr 6 21:18:11 2006
New Revision: 392176
URL: http://svn.apache.org/viewcvs?rev=392176view=rev
Log:
Added a few more possibilities for targetPath, as comments.
Modified:
struts/action/trunk/apps/pom.xml
Modified: struts/action/trunk/apps/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/pom.xml?rev=392176r1=392175r2=392176view=diff
==
--- struts/action/trunk/apps/pom.xml (original)
+++ struts/action/trunk/apps/pom.xml Thu Apr 6 21:18:11 2006
@@ -58,9 +58,12 @@
resources
!-- Include source code under WEB-INF/src for example apps --
!--resource
- directorysrc/main/java/directory
-
targetPath${basedir}/target/${pom.artifactId}/WEB-INF/src/main/java/targetPath
- includes
+ directorysrc/main/java/directory--
+
!--targetPath${basedir}/target/${pom.artifactId}/WEB-INF/src/main/java/targetPath--
+
!--targetPath../${pom.artifactId}/WEB-INF/src/main/java/targetPath--
+
!--targetPath${pom.build.directory}/${pom.artifactId}/WEB-INF/src/main/java/targetPath--
+
!--targetPath${project.build.directory}/${pom.artifactId}/WEB-INF/src/main/java/targetPath--
+ !--includes
include**/*.java/include
include**/*.properties/include
include**/*.xml/include
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r392186 - in /struts/action/trunk/taglib: pom.xml src/site/ src/site/site.xml src/site/xdoc/ src/site/xdoc/index.xml src/site/xdoc/navigation.xml xdocs/
Author: wsmoak
Date: Thu Apr 6 22:05:57 2006
New Revision: 392186
URL: http://svn.apache.org/viewcvs?rev=392186view=rev
Log:
Restructure Struts Taglib xdocs for Maven 2.
Added:
struts/action/trunk/taglib/src/site/
struts/action/trunk/taglib/src/site/site.xml (with props)
struts/action/trunk/taglib/src/site/xdoc/
- copied from r392181, struts/action/trunk/taglib/xdocs/
struts/action/trunk/taglib/src/site/xdoc/index.xml (with props)
Removed:
struts/action/trunk/taglib/src/site/xdoc/navigation.xml
struts/action/trunk/taglib/xdocs/
Modified:
struts/action/trunk/taglib/pom.xml
Modified: struts/action/trunk/taglib/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/taglib/pom.xml?rev=392186r1=392185r2=392186view=diff
==
--- struts/action/trunk/taglib/pom.xml (original)
+++ struts/action/trunk/taglib/pom.xml Thu Apr 6 22:05:57 2006
@@ -109,7 +109,6 @@
/dependencies
- !--
reporting
plugins
plugin
@@ -121,7 +120,7 @@
/plugin
/plugins
/reporting
- --
+
profiles
profile
idgenerate-assembly/id
Added: struts/action/trunk/taglib/src/site/site.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/taglib/src/site/site.xml?rev=392186view=auto
==
--- struts/action/trunk/taglib/src/site/site.xml (added)
+++ struts/action/trunk/taglib/src/site/site.xml Thu Apr 6 22:05:57 2006
@@ -0,0 +1,65 @@
+?xml version=1.0 encoding=ISO-8859-1?
+project name=Struts Action Framework
+bannerLeft
+nameApache Software Foundation/name
+srchttp://www.apache.org/images/asf-logo.gif/src
+hrefhttp://www.apache.org/href
+/bannerLeft
+bannerRight
+nameApache Struts/name
+srchttp://struts.apache.org/images/struts.gif/src
+hrefhttp://struts.apache.org/href
+/bannerRight
+body
+links
+item name=Apache href=http://www.apache.org; /
+item name=Action href=http://struts.apache.org/struts-action;
/
+item name=Shale href=http://struts.apache.org/struts-shale; /
+item name=Tiles href=http://struts.apache.org/struts-tiles; /
+/links
+menu name=Struts JSP Taglib Guides
+item name=Bean href=dev_bean.html/
+item name=HTML href=dev_html.html/
+item name=Logic href=dev_logic.html/
+item name=Nested href=dev_nested.html/
+/menu
+menu name=FAQs and HOWTOs
+item name=Taglib FAQ href=faq.html/
+item name=Building View Components href=building_view.html/
+item name=Indexed Properties href=indexedprops.html/
+item name=Secure Socket Layer and Web Applications
+ href=ssl.html/
+item name=Struts Validator href=dev_validator.html/
+/menu
+
+menu name=Quick Links
+item name=Display Tag
+ href=http://displaytag.sourceforge.net//
+
+item name=html2
+ href=http://www.rabago.net/struts/html2//
+
+item name=JSTL
+ href=http://java.sun.com/products/jsp/jstl//
+
+item name=JSF
+ href=http://java.sun.com/j2ee/javaserverfaces//
+
+item name=Struts Faces
+ href=http://struts-apach.org/struts-faces/
+
+item name=Struts Layout
+ href=http://struts.application-servers.com/
+
+item name=Struts Menu
+ href=http://struts-menu.sourceforge.net//
+
+item name=Struts Shale
+ href=http://struts.apache.org/struts-shale/
+
+item name=Apache Struts Home
+ href=http://struts.apache.org/
+/menu
+${reports}
+/body
+/project
Propchange: struts/action/trunk/taglib/src/site/site.xml
--
svn:eol-style = native
Propchange: struts/action/trunk/taglib/src/site/site.xml
--
svn:keywords = Date Author Id Revision HeadURL
Added: struts/action/trunk/taglib/src/site/xdoc/index.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/taglib/src/site/xdoc/index.xml?rev=392186view=auto
==
--- struts/action/trunk/taglib/src/site/xdoc/index.xml (added)
+++ struts/action/trunk/taglib/src/site/xdoc/index.xml Thu Apr 6 22:05:57 2006
@@ -0,0 +1,28 @@
+?xml version=1.0?
+!--
+Copyright 1999-2005 The Apache Software Foundation
+Licensed under the Apache License, Version 2.0 (the License);
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org
svn commit: r391058 - /struts/current/nightly.sh
Author: wsmoak Date: Mon Apr 3 07:52:17 2006 New Revision: 391058 URL: http://svn.apache.org/viewcvs?rev=391058view=rev Log: Corrected path for Struts Action 1.3 nightly builds. Modified: struts/current/nightly.sh Modified: struts/current/nightly.sh URL: http://svn.apache.org/viewcvs/struts/current/nightly.sh?rev=391058r1=391057r2=391058view=diff == --- struts/current/nightly.sh (original) +++ struts/current/nightly.sh Mon Apr 3 07:52:17 2006 @@ -19,7 +19,7 @@ export TARGET_HOST=svn.apache.org:/www/cvs.apache.org/builds/jakarta-struts/maven/ export TARGET_1_2_URL=$TARGET_HOST/STRUTS_1_2_BRANCH/nightly export TARGET_1_3_URL=$TARGET_HOST/trunk/ -export NIGHTLIES=$SVN_DIR/struts/build/nightly +export NIGHTLIES=$SVN_DIR/struts/action/build/nightly env echo Struts 1.2.x - @@ -53,8 +53,8 @@ echo --- get a fresh checkout from svn --- svn co http://svn.apache.org/repos/asf/struts/current/ struts -echo --- build and deploy 1.3.x --- -cd $SVN_DIR/struts/build/ +echo --- build and deploy Struts Action 1.3.x --- +cd $SVN_DIR/struts/action/build/ maven nightly scp -r $NIGHTLIES $TARGET_1_3_URL - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
svn commit: r391123 - /struts/action/tags/faces/
Author: wsmoak Date: Mon Apr 3 12:29:55 2006 New Revision: 391123 URL: http://svn.apache.org/viewcvs?rev=391123view=rev Log: Bring back Struts Faces tags after reorg. Added: struts/action/tags/faces/ - copied from r390901, struts/faces/tags/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
