Commits

tm_jee  committed 1c5cd35

WW-420
- fix failing test running through 'mvn clean test', due to xwork-test-default.xml using package named "xwork-default" which is already declared by xwork-default.xml, renamed it to "xwork-test-default" instead.

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

  • Participants
  • Parent commits 2254a25

Comments (0)

Files changed (2)

File src/test/xwork-sample.xml

 
 <xwork>
     <include file="xwork-test-default.xml"/>
-    <package name="default" extends="xwork-default" externalReferenceResolver="com.opensymphony.xwork2.config.TestExternalReferenceResolver">
+    <package name="default" extends="xwork-test-default" externalReferenceResolver="com.opensymphony.xwork2.config.TestExternalReferenceResolver">
 
         <global-results>
             <result name="login"> <!-- should be chain type since it is the default -->
 
    </package>
 
-           <package name="test-external-refs" extends="default" namespace="test/externalRef/">
+   <package name="test-external-refs" extends="default" namespace="test/externalRef/">
         <!-- test resolution when Resolver is declared on parent -->
         <action name="TestExternalRefResolver4" class="com.opensymphony.xwork2.ExternalReferenceAction">
                 <external-ref name="foo">myFoo</external-ref>
 
    </package>
 
-    <package name="bar" extends="default" namespace="/foo/bar">
+   <package name="bar" extends="default" namespace="/foo/bar">
         <interceptors>
             <interceptor-stack name="barDefaultStack">
                 <interceptor-ref name="debugStack"/>

File src/test/xwork-test-default.xml

  >
 
 <xwork>
-    <package name="xwork-default">
+    <package name="xwork-test-default">
         <result-types>
             <result-type name="chain" class="com.opensymphony.xwork2.ActionChainResult" default="true"/>
             <result-type name="void" class="com.opensymphony.xwork2.VoidResult"/>