Anonymous avatar Anonymous committed adfe593

Porting over changes from branch 2.0 to fix the CI build:

Fixing unit tests for ant based build

Updating Spring dep to version 2.0.3

Updating maven repo directory

Maven site currently not build with ant based build
o commenting link to maven site docs

git-svn-id: http://svn.opensymphony.com/svn/xwork/trunk@1453 e221344d-f017-0410-9bd5-d282ab1896d7

Comments (0)

Files changed (6)

         <copy file="${build}/${name}-${version}.jar" tofile="/opt/repository/ibiblio.org/opensymphony/jars/${name}-${version}-SNAPSHOT.jar" overwrite="true"/>
         <copy file="${build}/${name}-${version}-sources.jar" tofile="/opt/repository/ibiblio.org/opensymphony/jars/${name}-${version}-SNAPSHOT-sources.jar" overwrite="true"/>
         <copy file="${build}/${name}-${version}-javadoc.jar" tofile="/opt/repository/ibiblio.org/opensymphony/jars/${name}-${version}-SNAPSHOT-javadoc.jar" overwrite="true"/>
+
+        <copy file="pom.xml" tofile="/var/www/domains/opensymphony.com/maven1/htdocs/opensymphony/poms/${name}-${version}-SNAPSHOT.pom" overwrite="true"/>
+        <copy file="${build}/${name}-${version}.jar" tofile="/var/www/domains/opensymphony.com/maven1/htdocs/opensymphony/jars/${name}-${version}-SNAPSHOT.jar" overwrite="true"/>
+        <copy file="${build}/${name}-${version}-sources.jar" tofile="/var/www/domains/opensymphony.com/maven1/htdocs/opensymphony/jars/${name}-${version}-SNAPSHOT-sources.jar" overwrite="true"/>
+        <copy file="${build}/${name}-${version}-javadoc.jar" tofile="/var/www/domains/opensymphony.com/maven1/htdocs/opensymphony/jars/${name}-${version}-SNAPSHOT-javadoc.jar" overwrite="true"/>
     </target>
 
 </project>
 especially if you are using XWork from CVS, please check out the <a href="http://wiki.opensymphony.com/display/XW">wiki</a>.
 
 <p/>
-
+<!--
 The maven generated site with lots of information and reports about the current release can be found <a href="site/index.html">here</a>
 
 <p/>
-
+-->
 Feel free to use the "powered by XWork" logo on your website or projects if you use XWork:
 
 <p/>
         <dependency org="mockobjects" name="mockobjects-core" rev="0.09" conf="build->*"/>
         <dependency org="mockobjects" name="mockobjects-jdk1.3" rev="0.09" conf="build->*"/>
         <dependency org="mockobjects" name="mockobjects-alt-jdk1.3" rev="0.09" conf="build->*"/>
-        <dependency org="easymock" name="easymock" rev="1.2_Java1.3" conf="build->*"/>
-        <dependency org="easymock" name="easymockclassextension" rev="1.1" conf="build->*"/>
-        
+        <dependency org="org.easymock" name="easymock" rev="2.0" conf="build->*"/>
+        <dependency org="cglib" name="cglib" rev="2.1_3" conf="build->*"/>
+
         <dependency org="clover" name="clover" rev="1.3.11" conf="build->*"/>
         <dependency org="junit" name="junit" rev="3.8.1" conf="build->*"/>
         <dependency org="org/testng" name="testng" rev="5.1" conf="build->*"/>
         <dependency org="sun" name="javamail" rev="1.3.3" conf="default->*"/>
 
         <!-- spring -->
-        <dependency org="springframework" name="spring" rev="1.2.6"
-                    conf="spring->spring-mock,spring-aop,spring-beans,spring-context,spring-core,spring-web"/>
+        <dependency org="org.springframework" name="spring" rev="2.0.3" conf="default->*"/>
+        <dependency org="org.springframework" name="spring-mock" rev="2.0.3" conf="default->*"/>
+        <dependency org="org.springframework" name="spring-aop" rev="2.0.3" conf="default->*"/>
+        <dependency org="org.springframework" name="spring-beans" rev="2.0.3" conf="default->*"/>
+        <dependency org="org.springframework" name="spring-context" rev="2.0.3" conf="default->*"/>
+        <dependency org="org.springframework" name="spring-core" rev="2.0.3" conf="default->*"/>
+        <dependency org="org.springframework" name="spring-web" rev="2.0.3" conf="default->*"/>
+
+        <dependency org="asm" name="asm" rev="1.5.3" conf="default->*"/>
     </dependencies>
 </ivy-module>
                 <artifact
                         pattern="http://ivyrep.opensymphony.com/[organisation]/[module]/[artifact]-[revision].[type]"/>
             </url>
+            <url name="spring">
+                <artifact pattern="https://svn.sourceforge.net/svnroot/springframework/repos/repo/[organisation]/[module]/[revision]/[module]-[revision].[type]"/>
+            </url>
             <url name="contegix">
                 <ivy pattern="http://repository.contegix.com/ivyrep/[organisation]/[module]/ivy-[revision].xml"/>
                 <artifact
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>1.2.8</version>
+            <version>2.0.3</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-aop</artifactId>
-            <version>1.2.8</version>
+            <version>2.0.3</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
-            <version>1.2.8</version>
+            <version>2.0.3</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>1.2.8</version>
+            <version>2.0.3</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-            <version>1.2.8</version>
+            <version>2.0.3</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-mock</artifactId>
-            <version>1.2.8</version>
+            <version>2.0.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>

src/test/com/opensymphony/xwork2/util/OgnlValueStackTest.java

         vs.push(bean);
 
         try {
-            vs.setValue("count", "1");
+            vs.setValue("count", "1", true);
             fail("Expected an exception for mismatched getter and setter");
         } catch (XWorkException e) {
             //expected
         }
 
         try {
-            vs.setValue("count2", "a");
+            vs.setValue("count2", "a", true);
             fail("Expected an exception for mismatched getter and setter");
         } catch (XWorkException e) {
             //expected
         stack.getContext().put(XWorkConverter.REPORT_CONVERSION_ERRORS, Boolean.TRUE);
         stack.push(action);
         try {
-            stack.setValue("bean", "foobar");
+            stack.setValue("bean", "foobar", true);
             fail("Should have thrown a type conversion exception");
         } catch (XWorkException e) {
             // expected
         stack.push(bean);
         stack.getContext().put(XWorkConverter.REPORT_CONVERSION_ERRORS, Boolean.TRUE);
         try {
-            stack.setValue("count", "a");
+            stack.setValue("count", "a", true);
             fail("Should have thrown a type conversion exception");
         } catch (XWorkException e) {
             // expected
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.