svn commit: r491111 - in /struts/struts2/trunk: core/src/main/resources/org/apache/struts2/sitegraph/ core/src/test/java/org/apache/struts2/dispatcher/mapper/ core/src/test/resources/org/apache/struts2/views/jsp/ui/ plugins/sitegraph/ plugins/sitegraph...

[mr...@apache.org]

Author: mrdon
Date: Fri Dec 29 13:43:24 2006
New Revision: 491111

URL: http://svn.apache.org/viewvc?view=rev&rev=491111
Log:
Fixing borked unit tests (bad programmer!), made sitegraph executable, 
moved over sitegraph's docs to the plugin
WW-1483

Added:
    struts/struts2/trunk/plugins/sitegraph/src/main/resources/
    struts/struts2/trunk/plugins/sitegraph/src/main/resources/org/
    struts/struts2/trunk/plugins/sitegraph/src/main/resources/org/apache/
    struts/struts2/trunk/plugins/sitegraph/src/main/resources/org/apache/struts2/
    struts/struts2/trunk/plugins/sitegraph/src/main/resources/org/apache/struts2/sitegraph/
      - copied from r491086, struts/struts2/trunk/core/src/main/resources/org/apache/struts2/sitegraph/
Removed:
    struts/struts2/trunk/core/src/main/resources/org/apache/struts2/sitegraph/
Modified:
    struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
    struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt
    struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt
    struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt
    struts/struts2/trunk/plugins/sitegraph/pom.xml

Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java?view=diff&rev=491111&r1=491110&r2=491111
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java Fri Dec 29 13:43:24 2006
@@ -317,7 +317,9 @@
         request.setParameterMap(parameterMap);
 
         DefaultActionMapper defaultActionMapper = new DefaultActionMapper();
+        defaultActionMapper.setContainer(container);
         ActionMapping actionMapping = defaultActionMapper.getMapping(request, configManager);
+        
 
         Result result = actionMapping.getResult();
         assertNotNull(result);

Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt?view=diff&rev=491111&r1=491110&r2=491111
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt (original)
+++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt Fri Dec 29 13:43:24 2006
@@ -20,7 +20,7 @@
 
 
 <script>
-	dojo.require("dojo.event.connect");
+	dojo.require("dojo.event.*");
 	var containingForm = document.getElementById("myAction");
 	dojo.event.connect(containingForm, "onsubmit", 
 			function(evt) {

Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt?view=diff&rev=491111&r1=491110&r2=491111
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt (original)
+++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt Fri Dec 29 13:43:24 2006
@@ -20,7 +20,7 @@
 
 
 <script>
-	dojo.require("dojo.event.connect");
+	dojo.require("dojo.event.*");
 	var containingForm = document.getElementById("myAction");
 	dojo.event.connect(containingForm, "onsubmit", 
 			function(evt) {

Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt?view=diff&rev=491111&r1=491110&r2=491111
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt (original)
+++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt Fri Dec 29 13:43:24 2006
@@ -19,7 +19,7 @@
 
 
 <script>
-	dojo.require("dojo.event.connect");
+	dojo.require("dojo.event.*");
 	var containingForm = document.getElementById("myAction");
 	dojo.event.connect(containingForm, "onsubmit", 
 			function(evt) {

Modified: struts/struts2/trunk/plugins/sitegraph/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/sitegraph/pom.xml?view=diff&rev=491111&r1=491110&r2=491111
==============================================================================
--- struts/struts2/trunk/plugins/sitegraph/pom.xml (original)
+++ struts/struts2/trunk/plugins/sitegraph/pom.xml Fri Dec 29 13:43:24 2006
@@ -18,6 +18,23 @@
        <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/sitegraph/</url>
     </scm>
 
+    <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-jar-plugin</artifactId>
+            <configuration>
+              <archive>
+                <manifest>
+                  <mainClass>org.apache.struts2.sitegraph.SiteGraph</mainClass>
+                  <addClasspath>true</addClasspath>
+                </manifest>
+              </archive>
+            </configuration>
+          </plugin>
+        </plugins>
+    </build>
+
     <dependencies>
 
         <dependency>