date:20060503

svn commit: r399458 - in /incubator/webwork2/action-api: ./ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/struts/ src/main/java/org/apache/struts/action2/ src/main/java/org/apa

2006-05-03 Thread plightbo

Author: plightbo
Date: Wed May  3 15:22:02 2006
New Revision: 399458

URL: http://svn.apache.org/viewcvs?rev=399458&view=rev
Log:
bob's API work, milestone 1

Added:
incubator/webwork2/action-api/src/main/java/org/
incubator/webwork2/action-api/src/main/java/org/apache/
incubator/webwork2/action-api/src/main/java/org/apache/struts/
incubator/webwork2/action-api/src/main/java/org/apache/struts/action2/

incubator/webwork2/action-api/src/main/java/org/apache/struts/action2/Action.java

incubator/webwork2/action-api/src/main/java/org/apache/struts/action2/ErrorAware.java

incubator/webwork2/action-api/src/main/java/org/apache/struts/action2/MessageAware.java

incubator/webwork2/action-api/src/main/java/org/apache/struts/action2/Messages.java

incubator/webwork2/action-api/src/main/java/org/apache/struts/action2/ResultNames.java

incubator/webwork2/action-api/src/main/java/org/apache/struts/action2/Validatable.java

incubator/webwork2/action-api/src/main/java/org/apache/struts/action2/attribute/

incubator/webwork2/action-api/src/main/java/org/apache/struts/action2/attribute/AbstractAttribute.java

incubator/webwork2/action-api/src/main/java/org/apache/struts/action2/attribute/ApplicationAttribute.java

incubator/webwork2/action-api/src/main/java/org/apache/struts/action2/attribute/Attribute.java

incubator/webwork2/action-api/src/main/java/org/apache/struts/action2/attribute/RequestAttribute.java

incubator/webwork2/action-api/src/main/java/org/apache/struts/action2/attribute/SessionAttribute.java

incubator/webwork2/action-api/src/main/java/org/apache/struts/action2/attribute/UnitOfWork.java

incubator/webwork2/action-api/src/main/java/org/apache/struts/action2/attribute/package-info.java

incubator/webwork2/action-api/src/main/java/org/apache/struts/action2/package-info.java

incubator/webwork2/action-api/src/main/java/org/apache/struts/action2/servlet/

incubator/webwork2/action-api/src/main/java/org/apache/struts/action2/servlet/ParameterAware.java

incubator/webwork2/action-api/src/main/java/org/apache/struts/action2/servlet/ServletRequestAware.java

incubator/webwork2/action-api/src/main/java/org/apache/struts/action2/servlet/ServletResponseAware.java

incubator/webwork2/action-api/src/main/java/org/apache/struts/action2/servlet/package-info.java
incubator/webwork2/action-api/src/main/java/org/apache/struts/action2/spi/

incubator/webwork2/action-api/src/main/java/org/apache/struts/action2/spi/Interceptor.java

incubator/webwork2/action-api/src/main/java/org/apache/struts/action2/spi/Request.java

incubator/webwork2/action-api/src/main/java/org/apache/struts/action2/spi/RequestAware.java

incubator/webwork2/action-api/src/main/java/org/apache/struts/action2/spi/Result.java

incubator/webwork2/action-api/src/main/java/org/apache/struts/action2/spi/ThreadLocalRequest.java

incubator/webwork2/action-api/src/main/java/org/apache/struts/action2/spi/ValueStack.java

incubator/webwork2/action-api/src/main/java/org/apache/struts/action2/spi/package-info.java
incubator/webwork2/action-api/src/test/java/org/
incubator/webwork2/action-api/src/test/java/org/apache/
incubator/webwork2/action-api/src/test/java/org/apache/struts/
incubator/webwork2/action-api/src/test/java/org/apache/struts/action2/

incubator/webwork2/action-api/src/test/java/org/apache/struts/action2/attribute/

incubator/webwork2/action-api/src/test/java/org/apache/struts/action2/attribute/AttributeTest.java

incubator/webwork2/action-api/src/test/java/org/apache/struts/action2/attribute/ReferenceTest.java
incubator/webwork2/action-api/src/test/java/org/apache/struts/action2/spi/

incubator/webwork2/action-api/src/test/java/org/apache/struts/action2/spi/ThreadLocalRequestTest.java
Modified:
incubator/webwork2/action-api/pom.xml

Modified: incubator/webwork2/action-api/pom.xml
URL: 
http://svn.apache.org/viewcvs/incubator/webwork2/action-api/pom.xml?rev=399458&r1=399457&r2=399458&view=diff
==
--- incubator/webwork2/action-api/pom.xml (original)
+++ incubator/webwork2/action-api/pom.xml Wed May  3 15:22:02 2006
@@ -12,6 +12,34 @@
 jar
 Struts Action Framework 2.0 API
 
-
+
+javax.servlet
+servlet-api
+2.4
+provided
+
+
+junit
+junit
+test
+true
+
+
+easymock
+easymock
+test
+2.0
+
 
+
+
+
+org.apache.maven.plugins
+maven-javadoc-plugin
+
+false
+
+
+
+
 

Added: 
incubator/webwork2/action-api/src/main/java/org/apache/struts/action2/Action.java
URL: 
http://svn.apach

svn commit: r399485 - in /struts/sandbox/trunk/tiles: ./ core/ core/src/ core/src/main/ core/src/main/java/ core/src/main/resources/ core/src/main/resources/META-INF/ core/src/main/resources/org/ core

2006-05-03 Thread wsmoak

Author: wsmoak
Date: Wed May  3 16:03:30 2006
New Revision: 399485

URL: http://svn.apache.org/viewcvs?rev=399485&view=rev
Log:
Maven 2 reorganization
Issue: SB-19

Added:
struts/sandbox/trunk/tiles/core/
struts/sandbox/trunk/tiles/core/LICENSE.txt
  - copied unchanged from r399479, struts/sandbox/trunk/tiles/LICENSE.txt
struts/sandbox/trunk/tiles/core/NOTICE.txt
  - copied unchanged from r399479, struts/sandbox/trunk/tiles/NOTICE.txt
struts/sandbox/trunk/tiles/core/pom.xml
  - copied, changed from r399479, struts/sandbox/trunk/tiles/pom.xml
struts/sandbox/trunk/tiles/core/src/
struts/sandbox/trunk/tiles/core/src/main/
struts/sandbox/trunk/tiles/core/src/main/java/
  - copied from r399479, struts/sandbox/trunk/tiles/src/java/
struts/sandbox/trunk/tiles/core/src/main/resources/
struts/sandbox/trunk/tiles/core/src/main/resources/META-INF/
struts/sandbox/trunk/tiles/core/src/main/resources/META-INF/tiles-core.tld
  - copied unchanged from r399479, 
struts/sandbox/trunk/tiles/src/conf/tiles-core.tld
struts/sandbox/trunk/tiles/core/src/main/resources/org/
struts/sandbox/trunk/tiles/core/src/main/resources/org/apache/
struts/sandbox/trunk/tiles/core/src/main/resources/org/apache/tiles/

struts/sandbox/trunk/tiles/core/src/main/resources/org/apache/tiles/resources/

struts/sandbox/trunk/tiles/core/src/main/resources/org/apache/tiles/resources/tiles-config_1_1.dtd
  - copied unchanged from r399479, 
struts/sandbox/trunk/tiles/src/conf/tiles-config_1_1.dtd

struts/sandbox/trunk/tiles/core/src/main/resources/org/apache/tiles/resources/tiles-config_1_2.dtd
  - copied unchanged from r399479, 
struts/sandbox/trunk/tiles/src/conf/tiles-config_1_2.dtd
struts/sandbox/trunk/tiles/core/src/test/
struts/sandbox/trunk/tiles/core/src/test/java/
struts/sandbox/trunk/tiles/core/src/test/java/org/
  - copied from r399479, struts/sandbox/trunk/tiles/src/test/org/
struts/sandbox/trunk/tiles/src/site/
struts/sandbox/trunk/tiles/src/site/site.xml
  - copied unchanged from r399479, 
struts/sandbox/trunk/tiles/xdocs/navigation.xml
Removed:
struts/sandbox/trunk/tiles/LICENSE.txt
struts/sandbox/trunk/tiles/NOTICE.txt
struts/sandbox/trunk/tiles/build.properties.sample
struts/sandbox/trunk/tiles/build.xml
struts/sandbox/trunk/tiles/pom.xml
struts/sandbox/trunk/tiles/project.properties
struts/sandbox/trunk/tiles/project.xml
struts/sandbox/trunk/tiles/src/conf/
struts/sandbox/trunk/tiles/src/java/
struts/sandbox/trunk/tiles/src/test/
struts/sandbox/trunk/tiles/xdocs/

Copied: struts/sandbox/trunk/tiles/core/pom.xml (from r399479, 
struts/sandbox/trunk/tiles/pom.xml)
URL: 
http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/core/pom.xml?p2=struts/sandbox/trunk/tiles/core/pom.xml&p1=struts/sandbox/trunk/tiles/pom.xml&r1=399479&r2=399485&rev=399485&view=diff
==
--- struts/sandbox/trunk/tiles/pom.xml (original)
+++ struts/sandbox/trunk/tiles/core/pom.xml Wed May  3 16:03:30 2006
@@ -37,23 +37,9 @@
 

 
-  src/java
-  src/test
-
   
  
-src/conf
-
-   **/*.dtd
-
-org/apache/tiles/resources
- 
- 
-src/conf
-
-   **/*.tld
-
-META-INF
+src/main/resources
  
  
 .
@@ -67,14 +53,7 @@
 
   
  
-src/conf
-org/apache/tiles/resources
-
-   **/*.dtd
-
- 
- 
-src/test
+src/test/java
 
**/*.xml
**/*.properties

svn commit: r399487 - in /struts/sandbox/trunk/tiles: core/ tiles-core/

2006-05-03 Thread wsmoak

Author: wsmoak
Date: Wed May  3 16:11:38 2006
New Revision: 399487

URL: http://svn.apache.org/viewcvs?rev=399487&view=rev
Log:
Renamed module to match artifact ID.
Issue: SB-19

Added:
struts/sandbox/trunk/tiles/tiles-core/
  - copied from r399486, struts/sandbox/trunk/tiles/core/
Removed:
struts/sandbox/trunk/tiles/core/

svn commit: r399512 - in /struts/action/trunk: apps/pom.xml integration/apps-it/src/test/java/org/apache/struts/apps/AppsTest.java

2006-05-03 Thread wsmoak

Author: wsmoak
Date: Wed May  3 19:25:29 2006
New Revision: 399512

URL: http://svn.apache.org/viewcvs?rev=399512&view=rev
Log:
Corrected the location of the source code in the example apps.
Issue:  STR-2855
Reported By: Michael Jouravlev

Modified:
struts/action/trunk/apps/pom.xml

struts/action/trunk/integration/apps-it/src/test/java/org/apache/struts/apps/AppsTest.java

Modified: struts/action/trunk/apps/pom.xml
URL: 
http://svn.apache.org/viewcvs/struts/action/trunk/apps/pom.xml?rev=399512&r1=399511&r2=399512&view=diff
==
--- struts/action/trunk/apps/pom.xml (original)
+++ struts/action/trunk/apps/pom.xml Wed May  3 19:25:29 2006
@@ -81,7 +81,7 @@

 
  
- 
+ 
  
 maven-antrun-plugin
 
@@ -89,7 +89,7 @@
   process-sources
   
  
-

 

Modified: 
struts/action/trunk/integration/apps-it/src/test/java/org/apache/struts/apps/AppsTest.java
URL: 
http://svn.apache.org/viewcvs/struts/action/trunk/integration/apps-it/src/test/java/org/apache/struts/apps/AppsTest.java?rev=399512&r1=399511&r2=399512&view=diff
==
--- 
struts/action/trunk/integration/apps-it/src/test/java/org/apache/struts/apps/AppsTest.java
 (original)
+++ 
struts/action/trunk/integration/apps-it/src/test/java/org/apache/struts/apps/AppsTest.java
 Wed May  3 19:25:29 2006
@@ -27,8 +27,8 @@
 import junit.framework.TestSuite;
 
 /**
- * Verify that each of the example apps starts and displays its
- * default page.
+ * Verify that each of the example apps starts and (at least)
+ * displays its default page.
  */
 public class AppsTest extends TestCase {
 
@@ -81,7 +81,21 @@
 
 assertEquals("Struts Cookbook", page.getTitleText());
 }
+
+/**
+ * Verify that the view source function is working
+ * in the Struts Cookbook app.
+ */
+public void testStrutsCookbookViewSource() throws Exception {
+WebClient webClient = new WebClient();
+URL url = new URL("http://localhost:";
++ port + "/struts-cookbook-" + version + "/source.jsp"
++ "?src=/WEB-INF/src/java/examples/SuccessAction.java");
+HtmlPage page = (HtmlPage) webClient.getPage(url);
 
+assertEquals("View Source", page.getTitleText());
+}
+
 /**
  * Verify that the Struts Examples app has started
  */

svn commit: r399518 - /incubator/webwork2/pom.xml

2006-05-03 Thread plightbo

Author: plightbo
Date: Wed May  3 19:50:47 2006
New Revision: 399518

URL: http://svn.apache.org/viewcvs?rev=399518&view=rev
Log:
make the uber jar part of a different profile for now (it's kind of busted at 
the moment)

Modified:
incubator/webwork2/pom.xml

Modified: incubator/webwork2/pom.xml
URL: 
http://svn.apache.org/viewcvs/incubator/webwork2/pom.xml?rev=399518&r1=399517&r2=399518&view=diff
==
--- incubator/webwork2/pom.xml (original)
+++ incubator/webwork2/pom.xml Wed May  3 19:50:47 2006
@@ -116,6 +116,11 @@
 thirdparty
 
 thirdparty
+
+
+
+all
+
 uber
 
 
@@ -475,7 +480,7 @@
 
 easymock
 easymock
-1.2_Java1.3
+2.0
 
 
 easymock

svn commit: r399519 - /incubator/webwork2/action/src/test/java/org/apache/struts/action2/sitegraph/SiteGraphTest.java

2006-05-03 Thread plightbo

Author: plightbo
Date: Wed May  3 19:51:43 2006
New Revision: 399519

URL: http://svn.apache.org/viewcvs?rev=399519&view=rev
Log:
line ending problem reported by brett porter

Modified:

incubator/webwork2/action/src/test/java/org/apache/struts/action2/sitegraph/SiteGraphTest.java

Modified: 
incubator/webwork2/action/src/test/java/org/apache/struts/action2/sitegraph/SiteGraphTest.java
URL: 
http://svn.apache.org/viewcvs/incubator/webwork2/action/src/test/java/org/apache/struts/action2/sitegraph/SiteGraphTest.java?rev=399519&r1=399518&r2=399519&view=diff
==
--- 
incubator/webwork2/action/src/test/java/org/apache/struts/action2/sitegraph/SiteGraphTest.java
 (original)
+++ 
incubator/webwork2/action/src/test/java/org/apache/struts/action2/sitegraph/SiteGraphTest.java
 Wed May  3 19:51:43 2006
@@ -17,13 +17,12 @@
  */
 package org.apache.struts.action2.sitegraph;
 
-import org.apache.struts.action2.StrutsTestCase;
-
 import com.opensymphony.util.ClassLoaderUtil;
+import org.apache.struts.action2.StrutsTestCase;
 
 import java.io.File;
-import java.io.StringWriter;
 import java.io.InputStream;
+import java.io.StringWriter;
 import java.net.URL;
 
 /**
@@ -33,10 +32,10 @@
 // use the classloader rather than relying on the
 // working directory being an assumed value when
 // running the test:  so let's get this class's parent dir 
-   URL url = 
ClassLoaderUtil.getResource("org/apache/struts/action2/sitegraph/xwork.xml", 
SiteGraphTest.class);
+URL url = 
ClassLoaderUtil.getResource("org/apache/struts/action2/sitegraph/xwork.xml", 
SiteGraphTest.class);
 File file = new File(url.toString().substring(5));
 String dir = file.getParent();
-
+
 SiteGraph siteGraph = new SiteGraph(dir, dir, dir, "");
 StringWriter writer = new StringWriter();
 siteGraph.setWriter(writer);
@@ -53,6 +52,6 @@
 }
 
 in.close();
-assertEquals(buffer.toString(), writer.toString());
+assertEquals(buffer.toString().replaceAll("\r\n", "\n"), 
writer.toString().replaceAll("\r\n", "\n"));
 }
 }

svn commit: r399520 - /incubator/webwork2/action-api/pom.xml

2006-05-03 Thread plightbo

Author: plightbo
Date: Wed May  3 19:52:21 2006
New Revision: 399520

URL: http://svn.apache.org/viewcvs?rev=399520&view=rev
Log:
the entire project now uses easy mock 2.0, so no point in specifying it here

Modified:
incubator/webwork2/action-api/pom.xml

Modified: incubator/webwork2/action-api/pom.xml
URL: 
http://svn.apache.org/viewcvs/incubator/webwork2/action-api/pom.xml?rev=399520&r1=399519&r2=399520&view=diff
==
--- incubator/webwork2/action-api/pom.xml (original)
+++ incubator/webwork2/action-api/pom.xml Wed May  3 19:52:21 2006
@@ -28,7 +28,6 @@
 easymock
 easymock
 test
-2.0

svn commit: r399521 - /incubator/webwork2/action/pom.xml

2006-05-03 Thread plightbo

Author: plightbo
Date: Wed May  3 19:53:03 2006
New Revision: 399521

URL: http://svn.apache.org/viewcvs?rev=399521&view=rev
Log:
xstream is now required due to the new DebuggingInterceptor/PrettyPrintWriter

Modified:
incubator/webwork2/action/pom.xml

Modified: incubator/webwork2/action/pom.xml
URL: 
http://svn.apache.org/viewcvs/incubator/webwork2/action/pom.xml?rev=399521&r1=399520&r2=399521&view=diff
==
--- incubator/webwork2/action/pom.xml (original)
+++ incubator/webwork2/action/pom.xml Wed May  3 19:53:03 2006
@@ -183,11 +183,11 @@
 true
 
 
+
 
 xstream
 xstream
 1.1.2
-true
 
 
 
@@ -371,6 +371,5 @@
 log4j
 test
 
-

svn commit: r399525 - /struts/action/trunk/pom.xml

2006-05-03 Thread wsmoak

Author: wsmoak
Date: Wed May  3 20:16:27 2006
New Revision: 399525

URL: http://svn.apache.org/viewcvs?rev=399525&view=rev
Log:
Alphabetize the list of modules
Switch to the latest struts-parent pom
Add the PMD plugin reports

Modified:
struts/action/trunk/pom.xml

Modified: struts/action/trunk/pom.xml
URL: 
http://svn.apache.org/viewcvs/struts/action/trunk/pom.xml?rev=399525&r1=399524&r2=399525&view=diff
==
--- struts/action/trunk/pom.xml (original)
+++ struts/action/trunk/pom.xml Wed May  3 20:16:27 2006
@@ -26,7 +26,7 @@

   org.apache.struts
   struts-parent
-  1
+  2-SNAPSHOT

 
 4.0.0
@@ -64,17 +64,17 @@
 
 
 
+apps
+assembly
 core
 el
 extras
-taglib
-tiles
 faces
-scripting
-apps
-mailreader-dao
-assembly
 integration
+mailreader-dao
+scripting
+taglib
+tiles
 
 
 
@@ -141,6 +141,9 @@
 
 org.codehaus.mojo
 jxr-maven-plugin
+
+
+maven-pmd-plugin

svn commit: r399527 - /struts/maven/trunk/pom/pom.xml

2006-05-03 Thread wsmoak

Author: wsmoak
Date: Wed May  3 20:32:44 2006
New Revision: 399527

URL: http://svn.apache.org/viewcvs?rev=399527&view=rev
Log:
Update to version 2 prior to release vote.

Modified:
struts/maven/trunk/pom/pom.xml

Modified: struts/maven/trunk/pom/pom.xml
URL: 
http://svn.apache.org/viewcvs/struts/maven/trunk/pom/pom.xml?rev=399527&r1=399526&r2=399527&view=diff
==
--- struts/maven/trunk/pom/pom.xml (original)
+++ struts/maven/trunk/pom/pom.xml Wed May  3 20:32:44 2006
@@ -26,7 +26,7 @@

org.apache.struts
struts-parent
-   2-SNAPSHOT
+   2
pom
Apache Struts

svn commit: r399554 - in /struts/action/trunk/faces: ./ src/main/resources/ src/main/resources/META-INF/

2006-05-03 Thread wsmoak

Author: wsmoak
Date: Wed May  3 22:41:13 2006
New Revision: 399554

URL: http://svn.apache.org/viewcvs?rev=399554&view=rev
Log:
Move the faces-config.xml file into META-INF.
Include src/main/resources in the jar in addition to the .properties files.
Configure maven-taglib-plugin for website reports.
Remove old xml and xsl files.

Added:
struts/action/trunk/faces/src/main/resources/META-INF/faces-config.xml
  - copied unchanged from r399452, 
struts/action/trunk/faces/src/main/resources/faces-config.xml
Removed:
struts/action/trunk/faces/src/main/resources/MANIFEST.MF
struts/action/trunk/faces/src/main/resources/faces-config.xml
struts/action/trunk/faces/src/main/resources/struts-doc.xsl
struts/action/trunk/faces/src/main/resources/struts-faces.xml
struts/action/trunk/faces/src/main/resources/struts-tld.xsl
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=399554&r1=399553&r2=399554&view=diff
==
--- struts/action/trunk/faces/pom.xml (original)
+++ struts/action/trunk/faces/pom.xml Wed May  3 22:41:13 2006
@@ -46,6 +46,9 @@

   
  
+src/main/resources
+ 
+ 
 src/main/java
 
**/*.properties
@@ -99,19 +102,18 @@
 

 
-   
+
  

 pre-assembly

svn commit: r399458 - in /incubator/webwork2/action-api: ./ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/struts/ src/main/java/org/apache/struts/action2/ src/main/java/org/apa

svn commit: r399485 - in /struts/sandbox/trunk/tiles: ./ core/ core/src/ core/src/main/ core/src/main/java/ core/src/main/resources/ core/src/main/resources/META-INF/ core/src/main/resources/org/ core

svn commit: r399487 - in /struts/sandbox/trunk/tiles: core/ tiles-core/

svn commit: r399512 - in /struts/action/trunk: apps/pom.xml integration/apps-it/src/test/java/org/apache/struts/apps/AppsTest.java

svn commit: r399518 - /incubator/webwork2/pom.xml

svn commit: r399519 - /incubator/webwork2/action/src/test/java/org/apache/struts/action2/sitegraph/SiteGraphTest.java

svn commit: r399520 - /incubator/webwork2/action-api/pom.xml

svn commit: r399521 - /incubator/webwork2/action/pom.xml

svn commit: r399525 - /struts/action/trunk/pom.xml

svn commit: r399527 - /struts/maven/trunk/pom/pom.xml

svn commit: r399554 - in /struts/action/trunk/faces: ./ src/main/resources/ src/main/resources/META-INF/

11 matches

Site Navigation

Mail list logo

Footer information