You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by we...@apache.org on 2009/09/17 21:20:20 UTC

svn commit: r816342 - in /struts/struts2/trunk/plugins/embeddedjsp: ./ pom.xml src/test/java/org/apache/struts2/EmbeddedJSPResultTest.java

Author: wesw
Date: Thu Sep 17 19:20:19 2009
New Revision: 816342

URL: http://svn.apache.org/viewvc?rev=816342&view=rev
Log:
a little cleanup (no @Override on interface method implementations) and trying to make hudson/bamboo happy

Modified:
    struts/struts2/trunk/plugins/embeddedjsp/   (props changed)
    struts/struts2/trunk/plugins/embeddedjsp/pom.xml
    struts/struts2/trunk/plugins/embeddedjsp/src/test/java/org/apache/struts2/EmbeddedJSPResultTest.java

Propchange: struts/struts2/trunk/plugins/embeddedjsp/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Sep 17 19:20:19 2009
@@ -0,0 +1,5 @@
+*.iws
+*.ipr
+*.iml
+.*
+target

Modified: struts/struts2/trunk/plugins/embeddedjsp/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/embeddedjsp/pom.xml?rev=816342&r1=816341&r2=816342&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/embeddedjsp/pom.xml (original)
+++ struts/struts2/trunk/plugins/embeddedjsp/pom.xml Thu Sep 17 19:20:19 2009
@@ -124,7 +124,7 @@
                 <version>2.4.2</version>
                 <configuration>
                     <additionalClasspathElements>
-                        <element>${project.build.testOutputDirectory}/jsps.jar</element>
+                        <element>target/test-classes/jsps.jar</element>
                     </additionalClasspathElements>
                     <forkMode>never</forkMode>
                 </configuration>

Modified: struts/struts2/trunk/plugins/embeddedjsp/src/test/java/org/apache/struts2/EmbeddedJSPResultTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/embeddedjsp/src/test/java/org/apache/struts2/EmbeddedJSPResultTest.java?rev=816342&r1=816341&r2=816342&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/embeddedjsp/src/test/java/org/apache/struts2/EmbeddedJSPResultTest.java (original)
+++ struts/struts2/trunk/plugins/embeddedjsp/src/test/java/org/apache/struts2/EmbeddedJSPResultTest.java Thu Sep 17 19:20:19 2009
@@ -230,7 +230,6 @@
         EasyMock.expect(request.getSession()).andReturn(session).anyTimes();
         EasyMock.expect(request.getParameterMap()).andReturn(params).anyTimes();
         EasyMock.expect(request.getParameter("username")).andAnswer(new IAnswer<String>() {
-            @Override
             public String answer() throws Throwable {
                 return ((String[]) params.get("username"))[0];
             }
@@ -291,7 +290,6 @@
         this.actionContext = actionContext;
     }
 
-    @Override
     public void run() {
         ActionContext.setContext(actionContext);
         //wait to start all therads at once..or try at least