You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2010/12/03 18:20:51 UTC

svn commit: r1041918 - in /webservices/wss4j/trunk: ./ contrib/ legal/ lib/ src/org/apache/ws/axis/ src/org/apache/ws/security/ src/org/apache/ws/security/components/crypto/ src/org/apache/ws/security/handler/ src/org/apache/ws/security/message/ src/or...

Author: coheigea
Date: Fri Dec  3 17:20:50 2010
New Revision: 1041918

URL: http://svn.apache.org/viewvc?rev=1041918&view=rev
Log:
[WSS-248] - Removed Axis dependencies from the project.
 - I removed all SAAJ references as well, we now just use JAXP to load the sample SOAP envelopes in the tests.

Removed:
    webservices/wss4j/trunk/legal/LICENSE.axis
    webservices/wss4j/trunk/legal/LICENSE.commons-discovery
    webservices/wss4j/trunk/legal/LICENSE.jaf
    webservices/wss4j/trunk/legal/LICENSE.javamail
    webservices/wss4j/trunk/legal/LICENSE.wsdl4j
    webservices/wss4j/trunk/lib/axis-1.4.jar
    webservices/wss4j/trunk/lib/axis-ant-1.4.jar
    webservices/wss4j/trunk/lib/axis-jaxrpc-1.4.jar
    webservices/wss4j/trunk/lib/axis-saaj-1.4.jar
    webservices/wss4j/trunk/lib/commons-discovery-0.2.jar
    webservices/wss4j/trunk/lib/wsdl4j-1.5.1.jar
    webservices/wss4j/trunk/src/org/apache/ws/axis/
    webservices/wss4j/trunk/src/org/apache/ws/security/handler/WSS4JHandler.java
Modified:
    webservices/wss4j/trunk/build.xml
    webservices/wss4j/trunk/contrib/wss4j-release.sh
    webservices/wss4j/trunk/pom.xml
    webservices/wss4j/trunk/src/org/apache/ws/security/WSConstants.java
    webservices/wss4j/trunk/src/org/apache/ws/security/WSSecurityEngine.java
    webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/CryptoBase.java
    webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/X509NameTokenizer.java
    webservices/wss4j/trunk/src/org/apache/ws/security/handler/WSHandler.java
    webservices/wss4j/trunk/src/org/apache/ws/security/handler/WSHandlerResult.java
    webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncrypt.java
    webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecSignatureBase.java
    webservices/wss4j/trunk/src/org/apache/ws/security/message/token/PKIPathSecurity.java
    webservices/wss4j/trunk/src/org/apache/ws/security/message/token/SecurityTokenReference.java
    webservices/wss4j/trunk/src/org/apache/ws/security/util/Base64.java
    webservices/wss4j/trunk/src/org/apache/ws/security/util/NSStack.java
    webservices/wss4j/trunk/src/org/apache/ws/security/util/StringUtil.java
    webservices/wss4j/trunk/test/wssec/SOAPUtil.java
    webservices/wss4j/trunk/test/wssec/TestWSSecurityNewDK.java
    webservices/wss4j/trunk/test/wssec/TestWSSecuritySAMLKeyIdentifier.java
    webservices/wss4j/trunk/test/wssec/TestWSSecurityWSS234.java

Modified: webservices/wss4j/trunk/build.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/build.xml?rev=1041918&r1=1041917&r2=1041918&view=diff
==============================================================================
--- webservices/wss4j/trunk/build.xml (original)
+++ webservices/wss4j/trunk/build.xml Fri Dec  3 17:20:50 2010
@@ -27,9 +27,9 @@ Build Instructions:
 
         <property name='product.version.major' value='1'/>
         <property name='product.version.minor' value='6'/>
-        <property name='product.version.level' value=''/>
+        <!--<property name='product.version.level' value='0'/>-->
         <property name='product.version.qualifier' value='-SNAPSHOT'/>
-        <property name='product.version' value='${product.version.major}.${product.version.minor}.${product.version.level}${product.version.qualifier}'/>
+        <property name='product.version' value='${product.version.major}.${product.version.minor}${product.version.qualifier}'/>
         <property name="year" value="2008"/>
         <property name="copyright" value="Copyright &#169; ${year} Apache WSS4J Project. All Rights Reserved."/>
 
@@ -38,29 +38,16 @@ Build Instructions:
         <property file="./build.properties"/>
         <property file="${user.home}/build.properties"/>
 
-        <!-- Place Holder for proxy settings -->
-        <property name="http.proxyHost" value=""/>
-        <property name="http.proxyPort" value=""/>
-        <property name="http.nonProxyHosts" value="localhost"/>
-        <property name="http.proxyUser" value=""/>
-        <property name="http.proxyPassword" value=""/>
-
         <property name="dir.doc" value="./doc"/>
         <property name="dir.dist" value="./dist"/>
         <property name="dir.libs" value="./lib"/>
         <property name="dir.endorsed.libs" value="./endorsed"/>
         <property name="dir.src" value="./src"/>
-        <property name="dir.samples" value="./samples"/>
         <property name="dir.test" value="./test"/>
         <property name="dir.keys" value="./keys"/>
-        <property name="dir.specs" value="./specs"/>
-        <property name="dir.interop" value="./interop"/>
-        <property name="dir.webapp" location="./webapps/axis" />
 
         <property name="build.dir" value="./build"/>
         <property name="build.classes" value="${build.dir}/classes"/>
-        <property name="build.work" value="${build.dir}/work"/>
-        <property name="build.webapp" location="${build.dir}/webapps/axis"/>
 
         <property name="jar.library" value="${product.shortname}-${product.version}.jar"/>
 
@@ -87,16 +74,13 @@ Build Instructions:
         </condition>
 
         <!-- 
-
          for the time being following path id uses the libs in the wss4j
          lib directory only This is done to test if we really don't need
          any axis libs. After this is done we can include the
          java.class.path and leave the wss4j/lib empty. This requires that
          the CLASSPATH includes all required packages (see above
-
          -->
         
-        
         <path id="classpath.libraries" description="3rd party libs">
             <fileset dir="${dir.libs}">
                 <include name="**/*.jar"/>
@@ -118,14 +102,6 @@ Build Instructions:
             <path refid="classpath.libraries"/>
         </path>
 
-        <taskdef resource="axis-tasks.properties" classpathref=
-              "classpath.library"/>
-        <taskdef name="runaxisfunctionaltests" classname=
-              "org.apache.axis.tools.ant.axis.RunAxisFunctionalTestsTask"
-            loaderref="axis">
-            <classpath refid="classpath.library"/>
-        </taskdef>
-      
         <!-- this shall include Axis jars because the tests use the
          Axis implementation of javax.xml.soap, etc. Therefore the
          CLASSPATH is included.
@@ -153,18 +129,10 @@ Build Instructions:
             <include name="src/**/*"/>
         </patternset>
 
-        <patternset id="srcSamplesFiles">
-            <include name="samples/**/*"/>
-        </patternset>
-
         <patternset id="srcUnitTestsFiles">
             <include name="test/**/*"/>
         </patternset>
 
-        <patternset id="srcInteropFiles">
-            <include name="interop/**/*"/>
-        </patternset>
-
         <property name="javadoc.packages"
             value="
 org.apache.ws.security,
@@ -172,10 +140,7 @@ org.apache.ws.security.components,
 org.apache.ws.security.components.crypto,
 org.apache.ws.security.message,
 org.apache.ws.security.message.token,
-org.apache.ws.security.util,
-org.apache.ws.axis,
-org.apache.ws.axis.security,
-org.apache.ws.axis.security.util
+org.apache.ws.security.util
 "/>
 
       <echo level="debug">
@@ -205,9 +170,7 @@ org.apache.ws.axis.security.util
                                                                            
            compile         --> compiles everything                         
            compile.library --> compiles the source code                    
-           compile.samples --> compiles the samples source code            
            compile.tests   --> compiles the tests source code              
-           compile.interops--> compiles the interop source code            
                                                                            
            javadoc         --> generates the API documentation             
                                (needs Java > 1.2)                          
@@ -233,13 +196,6 @@ org.apache.ws.axis.security.util
     <target name="clean" depends="init"
         description="Clean up all temporary build files">
         <delete dir="${build.dir}"/>
-        <delete>
-            <fileset dir="." includes="before*.xml"/>
-            <fileset dir="." includes="after*.xml"/>
-            <fileset dir="." includes="signed*.xml"/>
-            <fileset dir="." includes="server*.wsdd"/>
-            <fileset dir="." includes="client*.wsdd"/>
-        </delete>
         <delete dir="${dir.dist}"/>
     </target>
 
@@ -302,8 +258,6 @@ org.apache.ws.axis.security.util
             <sourcepath>
                 <pathelement location="${dir.src}"/>
                 <pathelement location="${dir.test}"/>
-                <pathelement location="${dir.samples}"/>
-                <pathelement location="${dir.interop}"/>
             </sourcepath>
         </javadoc>
     </target>
@@ -320,178 +274,42 @@ org.apache.ws.axis.security.util
             description="Target for the gump run"/>
 
     <target name="compile" 
-       depends="compile.library,compile.samples, compile.tests, 
-                compile.interops, fix.properties"
+       depends="compile.library, compile.tests"
             description="compile everything"/>
 
     <target name="test"
-            depends="unitTests, systemTests"
+            depends="unitTests"
             description="tests everything"/>        
 
     <!-- ################################################################## -->
 
-    <target name="fix.properties" if="jdk13.present">
-        <replace dir="${build.dir}" value="org.apache.ws.security.components.crypto.BouncyCastle">
-            <include name="**/*.properties"/>
-            <replacetoken>org.apache.ws.security.components.crypto.Merlin</replacetoken>
-        </replace>
-    </target>
-
     <target name="compile.library" depends="prepare-src">
         <!-- Compile the java code from ${dir.src} into ${build.classes} -->
         <javac srcdir="${dir.src}" destdir="${build.classes}" debug="on" source="1.5" target="1.5" includeAntRuntime="false">
             <classpath refid="classpath.library"/>
+            <!--<compilerarg value="-Xlint"/>-->
             <exclude name="**/Merlin.java" unless="merlin.ok"/>
         </javac>
         <!-- Copy Property files -->
         <copy todir="${build.classes}">
             <fileset dir="${dir.src}">
                 <include name="**/*.properties"/>
-                <exclude name="**/axis/**/*.properties"/>
             </fileset>
         </copy>
     </target>
 
-    <target name="compile.tests"
-        depends="compile.interops"
-        if="junit.present">
+    <target name="compile.tests" if="junit.present">
 
         <javac srcdir="${dir.test}" destdir="${build.classes}" debug="on" source="1.5" target="1.5" includeAntRuntime="false">
             <classpath refid="classpath.test"/>
         </javac>
 
-        <mkdir dir="${build.work}"/>
-
-        <javac srcdir="${build.work}" destdir="${build.classes}" debug="on" source="1.5" target="1.5" includeAntRuntime="false">
-            <classpath refid="classpath.test"/>
-        </javac>
-
         <!-- Copy Property files -->
         <copy todir="${build.classes}">
             <fileset dir="${dir.test}" includes="**/*.properties"/>
-            <fileset dir="${dir.interop}">
-                <include name="**/*.properties"/>
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="compile.samples"
-        depends="compile.library">
-        <!-- Compile the java code from ${dir.src} into ${build.classes} -->
-        <javac srcdir="${dir.samples}"
-            debug="on"
-            source="1.5"
-            destdir="${build.classes}" target="1.5" includeAntRuntime="false">
-            <classpath refid="classpath.library"/>
-        </javac>
-        <copy todir="${build.classes}">
-            <fileset dir="${dir.src}" includes="**/axis/**/*.properties"/>
         </copy>
     </target>
 
-    <target name="compile.interops"
-        depends="compile.library">
-        <ant dir="${dir.interop}"
-            antfile="build.xml"
-            target="compile"
-            inheritAll="false">
-        </ant>
-    </target>
-
-    <target name="systemTests" unless="skip.tests" depends="compile"
-        if="junit.present"
-        description="Runs all JUnit tests">
-        <runaxisfunctionaltests
-            url="http://localhost:8088"
-            httpServerTarget="start-functional-test-http-server"
-            testTarget="allTests"
-            httpStopTarget="stop-functional-test-http-server"/>
-    </target>
-
-    <target name="start-functional-test-http-server" depends="init" if="junit.present">
-        <echo message="Starting http server."/>
-        <java classname="org.apache.axis.transport.http.SimpleAxisServer" 
-          fork="yes" dir="${build.dir}">
-            <jvmarg value="-Djava.endorsed.dirs=${basedir}/endorsed"/>
-            <classpath refid="classpath.library"/>
-        </java>
-    </target>
-
-    <target name="stop-functional-test-http-server" depends="init" if="junit.present">
-        <echo message="Stopping http server."/>
-        <java classname="org.apache.axis.client.AdminClient" fork="yes">
-            <classpath refid="classpath.library"/>
-            <arg line="quit"/>
-        </java>
-    </target>
-
-    <target name="allTests" depends="interopTests">
-    </target>
-
-    <target name="interopTests" depends="init">
-        <echo message="Running system tests - BEGIN..."/>
-
-        <path id="undeploy_xml_files">
-            <fileset dir="${build.work}">
-                <include name="**/undeploy.wsdd"/>
-            </fileset>
-        </path>
-        <property name="undeploy_xml_property" refid="undeploy_xml_files"/>
-
-        <antcall target="deployWSDD" />
-        <junit printsummary="yes"
-            haltonfailure="yes"
-            fork="yes"
-            dir="${basedir}">
-            <jvmarg value="-Djava.endorsed.dirs=${basedir}/endorsed"/>
-            <jvmarg value="-Dhttp.proxyHost=${http.proxyHost}"/>
-            <jvmarg value="-Dhttp.proxyPort=${http.proxyPort}"/>
-            <jvmarg value="-Dhttp.nonProxyHosts=${http.nonProxyHosts}"/>
-            <jvmarg value="-Dhttp.proxyUser=${http.proxyUser}"/>
-            <jvmarg value="-Dhttp.proxyPassword=${http.proxyPassword}"/>
-            <classpath refid="classpath.test"/>
-            <formatter type="xml"/>
-            <batchtest todir="${build.dir}/test-reports">
-                <fileset dir="${build.classes}">
-                    <include name="**/interop/PackageTests.class"/>
-                </fileset>
-            </batchtest>
-        </junit>
-
-        <java classname="org.apache.axis.utils.Admin" fork="true">
-            <classpath refid="classpath.library"/>
-            <arg value="client"/>
-            <arg file=
-               "${build.work}/org/apache/ws/axis/oasis/ping/undeploy.wsdd"/>
-        </java>
-
-        <junit printsummary="yes"
-            haltonfailure="yes"
-            fork="yes"
-            dir="${basedir}">
-            <jvmarg value="-Djava.endorsed.dirs=${basedir}/endorsed"/>
-            <jvmarg value="-Dhttp.proxyHost=${http.proxyHost}"/>
-            <jvmarg value="-Dhttp.proxyPort=${http.proxyPort}"/>
-            <jvmarg value="-Dhttp.nonProxyHosts=${http.nonProxyHosts}"/>
-            <jvmarg value="-Dhttp.proxyUser=${http.proxyUser}"/>
-            <jvmarg value="-Dhttp.proxyPassword=${http.proxyPassword}"/>
-            <classpath refid="classpath.test"/>
-            <formatter type="xml"/>
-            <batchtest todir="${build.dir}/test-reports">
-                <fileset dir="${build.classes}">
-                    <include name="**/interop/TestJAXRPCHandler.class"/>
-                </fileset>
-            </batchtest>
-        </junit>
-
-        <java classname="org.apache.axis.client.AdminClient" fork="yes">
-            <classpath refid="classpath.library"/>
-            <arg line="${undeploy_xml_property}"/>
-        </java>
-        
-        <echo message="Running system tests - END..."/>
-    </target>
-
     <target name="unitTests" unless="skip.tests" depends="compile">
         <junit printsummary="yes"
             haltonfailure="yes"
@@ -501,187 +319,17 @@ org.apache.ws.axis.security.util
             <sysproperty key="build.clonevm" value="true"/>
 
             <jvmarg value="-Djava.endorsed.dirs=${basedir}/endorsed"/>
-            <jvmarg value="-Dhttp.proxyHost=${http.proxyHost}"/>
-            <jvmarg value="-Dhttp.proxyPort=${http.proxyPort}"/>
-            <jvmarg value="-Dhttp.nonProxyHosts=${http.nonProxyHosts}"/>
-            <jvmarg value="-Dhttp.proxyUser=${http.proxyUser}"/>
-            <jvmarg value="-Dhttp.proxyPassword=${http.proxyPassword}"/>
             <classpath refid="classpath.test"/>
             <formatter type="xml"/>
             <batchtest todir="${build.dir}/test-reports">
                 <fileset dir="${build.classes}">
                     <include name="**/wssec/PackageTests.class"/>
                     <include name="**/components/PackageTests.class"/>
-             <!--<include name="**/secconv/components/PackageTests.class"/> -->
-                </fileset>
-            </batchtest>
-        </junit>
-    </target>
-
-    <target name="sandboxTests" depends="compile">
-        <java classname="org.apache.axis.client.AdminClient" fork="yes">
-            <classpath refid="classpath.library"/>
-            <arg line="${dir.samples}/org/apache/ws/sandbox/security/trust2/samples/deploy.wsdd"/>
-        </java>
-
-        <junit printsummary="yes"
-            haltonfailure="yes"
-            fork="yes"
-            dir="${basedir}">
-            <!-- See if this helps with Gump test failures -->
-            <sysproperty key="build.clonevm" value="true"/>
-
-            <jvmarg value="-Djava.endorsed.dirs=${basedir}/endorsed"/>
-            <jvmarg value="-Dhttp.proxyHost=${http.proxyHost}"/>
-            <jvmarg value="-Dhttp.proxyPort=${http.proxyPort}"/>
-            <jvmarg value="-Dhttp.nonProxyHosts=${http.nonProxyHosts}"/>
-            <jvmarg value="-Dhttp.proxyUser=${http.proxyUser}"/>
-            <jvmarg value="-Dhttp.proxyPassword=${http.proxyPassword}"/>
-            <classpath refid="classpath.test"/>
-            <formatter type="xml"/>
-            <batchtest todir="${build.dir}/test-reports">
-                <fileset dir="${build.classes}">
-                    <include name="**/sandbox/PackageTests.class"/>
                 </fileset>
             </batchtest>
         </junit>
-
-        <java classname="org.apache.axis.client.AdminClient" fork="yes">
-            <classpath refid="classpath.library"/>
-            <arg line="${dir.samples}/org/apache/ws/sandbox/security/trust2/samples/undeploy.wsdd"/>
-        </java>
-    </target>
-    
-    <target name="tcpmon" depends="init" description=
-                "Start standalone tcp monitor application (provided by axis)">
-        <java dir="${basedir}" fork="yes" failOnError="true" 
-                 className="org.apache.axis.utils.tcpmon">
-            <classpath refid="classpath.library" />
-             <arg value="9080" />
-             <arg value="localhost" />
-             <arg value="8080" />
-         </java>
-    </target>
-
-    <!--
-    This runs the selected scenario with SimpleAxisServer locally.
-    Before you start this target be sure you have started tcpmon too 
-        in a separate
-    "ant tcpmon" call.
-    To run different scenarios use: "ant -DNumber=x scenarioTest" 
-        to run scenario x
-    -->
-    <target name="scenarioTest" depends="compile"
-        if="junit.present"
-        description="Runs all JUnit tests">
-        <runaxisfunctionaltests
-            url="http://localhost:8088"
-            httpServerTarget="start-functional-test-http-server"
-            testTarget="scenario"
-            httpStopTarget="stop-functional-test-http-server"/>
-    </target>
-
-    <target name="scenario" if="junit.present">
-        <echo message=
-          "Running interop test scenario ${Number} on SimpleAxisServer"/>
-
-        <antcall target="deployWSDD" />
-        
-        <java classname="interop.TestScenario${Number}" fork="yes" 
-                 dir="${basedir}">
-            <jvmarg value="-Djava.endorsed.dirs=${basedir}/endorsed"/>
-            <classpath refid="classpath.library"/>
-        </java>
-
-        <antcall target="undeployWSDD" />
-
-    </target>
-    
-    <!--
-    This runs the selected scenario with SimpleAxisServer locally 
-        with perfomance
-    timing switched on.
-    You may also emable the **.TIME entry in log4j.properties to get 
-        the internal
-    timing.
-    To run different scenarios use: "ant -DNumber=x scenarioTest" 
-        to run scenario x
-    -->
-    <target name="performanceTest" depends="compile"
-        if="junit.present"
-        description="Runs all JUnit tests">
-        <runaxisfunctionaltests
-            url="http://localhost:8088"
-            httpServerTarget="start-functional-test-http-server"
-            testTarget="performance"
-            httpStopTarget="stop-functional-test-http-server"/>
-    </target>
-
-    <target name="performance" if="junit.present">
-        <echo message=
-           "Running performance test scenario ${Number} on SimpleAxisServer"/>
-
-        <antcall target="deployWSDD" />
-        <java classname="interop.TestScenario${Number}" fork="yes" 
-            dir="${basedir}">
-            <jvmarg value="-Djava.endorsed.dirs=${basedir}/endorsed"/>
-       <arg value="-lhttp://localhost:8080/axis/services/Ping${Number}" />
-            <arg value="-t" />
-            <classpath refid="classpath.library"/>
-        </java>
-        <antcall target="undeployWSDD" />
     </target>
-    
-    <target name="deployWSDD" depends="init">
-      <path id="deploy_xml_files">
-      <fileset dir="${build.work}">
-        <include name="**/deploy.wsdd"/>
-      </fileset>
-      </path>
-
-      <copy todir="${build.dir}/keys">
-        <fileset dir="${dir.keys}" includes="**"/>
-      </copy>
-      <copy todir="${build.dir}/interop">
-        <fileset dir="${dir.interop}" includes="*.jks"/>
-      </copy>
-
-      <property name="deploy_xml_property" refid="deploy_xml_files"/>
- 
-      <java classname="org.apache.axis.utils.Admin" fork="true">
-        <classpath refid="classpath.library"/>
-        <arg value="client"/>
-        <arg file="${build.work}/org/apache/ws/axis/oasis/Client_deploy.wsdd"/>
-      </java>
-        
-      <java classname="org.apache.axis.client.AdminClient" fork="yes">
-        <classpath refid="classpath.library"/>
-        <arg line="${deploy_xml_property}"/>
-      </java>
-    </target>
-    
-    <target name="undeployWSDD">
-      <path id="undeploy_xml_files">
-        <fileset dir="${build.work}">
-          <include name="**/undeploy.wsdd"/>
-        </fileset>
-      </path>
 
-      <property name="undeploy_xml_property" refid="undeploy_xml_files"/>
-
-      <java classname="org.apache.axis.utils.Admin" fork="true">
-            <classpath refid="classpath.library"/>
-            <arg value="client"/>
-            <arg file=
-                 "${build.work}/org/apache/ws/axis/oasis/ping/undeploy.wsdd"/>
-      </java>
-
-      <java classname="org.apache.axis.client.AdminClient" fork="yes">
-        <classpath refid="classpath.library"/>
-        <arg line="${undeploy_xml_property}"/>
-      </java>
-    </target>
-        
     <!-- generate a report from all the tests. 
            requires Xalan or other XSLT engine in ant\lib-->
 
@@ -703,7 +351,7 @@ org.apache.ws.axis.security.util
         <jar jarfile="${build.dir}/${jar.library}"
             basedir="${build.classes}"
             includes="**/*, *.txt"
-            excludes="components/**, *.properties, **/sandbox/**, wssec/**, **/interop/**, **/oasis/**, **/samples/**" 
+            excludes="components/**, *.properties, wssec/**" 
             />
     </target>
 
@@ -719,11 +367,11 @@ org.apache.ws.axis.security.util
      <zip destfile=
         "${dir.dist}/${product.shortname}-bin-${product.version}.zip">
         <zipfileset prefix="wss4j" dir="."
-            includes="keys/**, interop/**, interop2/**, test/**, samples/**,
-                ChangeLog.txt, LICENSE.txt, README.txt, NOTICE, webapps/**"/>
+            includes="keys/**, test/**, 
+                ChangeLog.txt, LICENSE.txt, README.txt, NOTICE"/>
         <zipfileset prefix="wss4j/classes" dir="${build.classes}"
             includes=
-                "*.properties, interop/**, wssec/**, org/**/oasis/**, org/**/samples/**"/>
+                "*.properties, wssec/**"/>
         <zipfileset prefix="wss4j/doc/api" dir="${build.javadoc}"/>
         <zipfileset fullpath="wss4j/${jar.library}" dir="${dir.dist}" 
             includes="${jar.library}"/>
@@ -746,7 +394,7 @@ org.apache.ws.axis.security.util
         <zip destfile=
                  "${dir.dist}/${product.shortname}-src-${product.version}.zip">
             <zipfileset prefix="wss4j" dir="."
-                includes="src/** keys/** interop/** test/** samples/** webapps/** legal/** lib/** endorsed/** ChangeLog.txt LICENSE.txt README.txt NOTICE build.xml pom.xml ChangeLog.txt"/>
+                includes="src/** keys/** test/** legal/** lib/** endorsed/** ChangeLog.txt LICENSE.txt README.txt NOTICE build.xml pom.xml ChangeLog.txt"/>
         </zip>
     </target>
 
@@ -762,80 +410,4 @@ org.apache.ws.axis.security.util
             />
     </target>
 
-    <target name="changelog"
-        depends="prepare"
-        description="Generate the changelog for WSS4J project">
-        <cvschangelog dir="."
-            destfile="${build.dir}/changelog.xml"
-            />
-        <style in="${build.dir}/changelog.xml"
-            out="${build.dir}/changelog.html"
-            style="./tools/changelog.xsl">
-            <param name="title" expression="WSS4J ChangeLog"/>
-            <param name="module" expression="ws-wss4j"/>
-            <param name="cvsweb" expression="http://cvs.apache.org/viewcvs/"/>
-        </style>
-    </target>
-
-  <!-- =================================================================== -->
-  <!-- Creates a war file for interop testing                              -->
-  <!-- =================================================================== -->
-  <target name="interop-war" depends="test"
-      description="Create the web application" >
-    <mkdir dir="${build.webapp}"/>
-    <copy todir="${build.webapp}">
-      <fileset dir="${dir.webapp}"/>
-    </copy>
-    <copy todir="${build.webapp}/WEB-INF/lib">
-      <fileset dir="${dir.libs}">
-        <include name="*.jar"/>
-      </fileset>
-      <fileset dir="${basedir}/endorsed">
-        <include name="*.jar"/>
-      </fileset>
-    </copy>
-    <copy todir="${build.webapp}/WEB-INF">
-      <fileset dir="${build.dir}">
-        <include name="*.wsdd"/>
-      </fileset>
-    </copy>
-    <copy todir="${build.webapp}/WEB-INF/classes/">
-      <fileset dir="${build.classes}"/>
-    </copy>
-    <copy todir="${build.webapp}/WEB-INF/classes/">
-      <fileset dir=".">
-          <include name="client-config.wsdd"/>
-      </fileset>
-    </copy>
-    <copy todir="${build.webapp}/WEB-INF/classes/interop">
-        <fileset dir="${dir.interop}">
-            <include name="**/interop2.jks"/>
-        </fileset>
-    </copy>
-
-    <delete>
-      <fileset dir="${build.webapp}" includes="**/CVS"/>
-    </delete>
-    <path id="deploy_xml_files">
-        <fileset dir="${build.work}">
-            <include name="**/deploy.wsdd"/>
-        </fileset>
-    </path>
-    <property name="deploy_xml_property" refid="deploy_xml_files"/>
-    <java classname="org.apache.axis.utils.Admin" fork="true"
-        dir="${build.webapp}/WEB-INF/classes">
-      <classpath refid="classpath.library"/>
-      <arg value="client"/>
-      <arg file="${build.work}/org/apache/ws/axis/oasis/Client_deploy.wsdd"/>
-    </java>
-    <java classname="org.apache.axis.utils.Admin" fork="yes" 
-        dir="${build.webapp}/WEB-INF">
-        <classpath refid="classpath.library"/>
-        <arg line="server"/>
-        <arg line="${deploy_xml_property}"/>
-    </java>
-
-    <jar jarfile="${build.dir}/wss4j.war" basedir="${build.webapp}"/>
-  </target>
-
 </project>

Modified: webservices/wss4j/trunk/contrib/wss4j-release.sh
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/contrib/wss4j-release.sh?rev=1041918&r1=1041917&r2=1041918&view=diff
==============================================================================
--- webservices/wss4j/trunk/contrib/wss4j-release.sh (original)
+++ webservices/wss4j/trunk/contrib/wss4j-release.sh Fri Dec  3 17:20:50 2010
@@ -51,7 +51,7 @@ cp -r dist/* ${WSS4J_STAGE_ROOT}/dist
 # Build and stage through maven; copy the Jartifact built by Maven to the dist
 #
 mvn clean || exit 1
-mvn -Prelease,jdk14 install || exit 1
+mvn -Prelease,jdk15 install || exit 1
 mkdir -p ${WSS4J_STAGE_ROOT}/maven/org/apache/ws/security/wss4j/
 cp -r ${M2_REPO}/org/apache/ws/security/wss4j/${WSS4J_VERSION} ${WSS4J_STAGE_ROOT}/maven/org/apache/ws/security/wss4j
 cp -f ${M2_REPO}/org/apache/ws/security/wss4j/${WSS4J_VERSION}/wss4j-${WSS4J_VERSION}.jar ${WSS4J_STAGE_ROOT}/dist

Modified: webservices/wss4j/trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/pom.xml?rev=1041918&r1=1041917&r2=1041918&view=diff
==============================================================================
--- webservices/wss4j/trunk/pom.xml (original)
+++ webservices/wss4j/trunk/pom.xml Fri Dec  3 17:20:50 2010
@@ -42,13 +42,13 @@
     <mailingLists>
         <mailingList>
             <name>WSS4J Developer List</name>
-            <subscribe>wss4j-dev-subscribe@ws.apache.org</subscribe>
+            <subscribe>dev-subscribe@ws.apache.org</subscribe>
             <unsubscribe>
-                wss4j-dev-unsubscribe@ws.apache.org
+                dev-unsubscribe@ws.apache.org
             </unsubscribe>
-            <post>wss4j-dev@ws.apache.org</post>
+            <post>dev@ws.apache.org</post>
             <archive>
-                http://mail-archives.apache.org/mod_mbox/ws-wss4j-dev/
+                http://mail-archives.apache.org/mod_mbox/ws-dev/
             </archive>
             <otherArchives>
                 <otherArchive>http://www.nabble.com/WSS4J-f2398.html</otherArchive>
@@ -140,12 +140,10 @@
                         <Specification-Version>${project.version}</Specification-Version>
 
                         <Export-Package>
-                              org.apache.ws.security.*;version="${project.version}",
-                              org.apache.ws.axis.security.*;version="${project.version}",
+                              org.apache.ws.security.*;version="${project.version}"
                         </Export-Package>
                         <Import-Package>
                               !org.apache.ws.security.*,
-                              !org.apache.ws.axis.security.*,
                               javax.xml.crypto.*,
                               org.apache.xml.security.*,
                               org.bouncycastle.*;resolution:=optional,
@@ -248,19 +246,6 @@
                         <attach>true</attach>
                     </configuration>
                 </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-assembly-plugin</artifactId>
-                    <version>2.1</version>
-                    <configuration>
-                        <descriptors>
-                            <descriptor>assembly/bin.xml</descriptor>
-                            <descriptor>assembly/src.xml</descriptor>
-                        </descriptors>
-                        <tarLongFileMode>gnu</tarLongFileMode>
-                    </configuration>
-                </plugin>
-  
             </plugins>
         </pluginManagement>
         
@@ -319,7 +304,7 @@
                 <dependency>
                     <groupId>org.bouncycastle</groupId>
                     <artifactId>bcprov-jdk15</artifactId>
-                    <version>${bcprov.jdk15.version}</version>
+                    <version>${bcprov.version}</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
@@ -333,7 +318,7 @@
                 <dependency>
                     <groupId>org.bouncycastle</groupId>
                     <artifactId>bcprov-jdk16</artifactId>
-                    <version>${bcprov.jdk16.version}</version>
+                    <version>${bcprov.version}</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
@@ -357,12 +342,10 @@
         <xmlsec.version>1.4.4</xmlsec.version>
         <opensaml.version>1.1</opensaml.version>
         <xml.apis.version>1.3.04</xml.apis.version>
-        <bcprov.jdk15.version>1.45</bcprov.jdk15.version>
-        <bcprov.jdk16.version>1.45</bcprov.jdk16.version>
+        <bcprov.version>1.45</bcprov.version>
         <commons.logging.version>1.1</commons.logging.version>
         <xalan.version>2.7.1</xalan.version>
         <xerces.version>2.9.1</xerces.version>
-        <axis.version>1.4</axis.version>
         <junit.version>3.8.1</junit.version>
     </properties>
     
@@ -380,18 +363,6 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>commons-discovery</groupId>
-            <artifactId>commons-discovery</artifactId>
-            <version>0.2</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>${junit.version}</version>
@@ -422,27 +393,9 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.axis</groupId>
-            <artifactId>axis</artifactId>
-            <version>${axis.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.axis</groupId>
-            <artifactId>axis-ant</artifactId>
-            <version>${axis.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.axis</groupId>
-            <artifactId>axis-jaxrpc</artifactId>
-            <version>${axis.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.axis</groupId>
-            <artifactId>axis-saaj</artifactId>
-            <version>${axis.version}</version>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.3</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/WSConstants.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/WSConstants.java?rev=1041918&r1=1041917&r2=1041918&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/WSConstants.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/WSConstants.java Fri Dec  3 17:20:50 2010
@@ -297,7 +297,7 @@ public class WSConstants {
      * <p/>
      * Please refer to WS Security SOAP Message security 1.1 specification, 
      * chapter 7.3. Note that this is a NON-STANDARD method. The standard way to refer to
-     * an X.509 Certificate via a KeyIdentifier is to use {@link SKI_KEY_IDENTIFIER}
+     * an X.509 Certificate via a KeyIdentifier is to use {@link #SKI_KEY_IDENTIFIER}
      */
     public static final int X509_KEY_IDENTIFIER = 3;
     

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/WSSecurityEngine.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/WSSecurityEngine.java?rev=1041918&r1=1041917&r2=1041918&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/WSSecurityEngine.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/WSSecurityEngine.java Fri Dec  3 17:20:50 2010
@@ -258,8 +258,8 @@ public class WSSecurityEngine {
      * <li>{@link #SIGNATURE <code>ds:Signature</code>}</li>
      * <li>{@link #ENCRYPTED_KEY <code>xenc:EncryptedKey</code>}</li>
      * <li>{@link #REFERENCE_LIST <code>xenc:ReferenceList</code>}</li>
-     * <li>{@link #usernameToken <code>wsse:UsernameToken</code>}</li>
-     * <li>{@link #timeStamp <code>wsu:Timestamp</code>}</li>
+     * <li>{@link #USERNAME_TOKEN <code>wsse:UsernameToken</code>}</li>
+     * <li>{@link #TIMESTAMP <code>wsu:Timestamp</code>}</li>
      * </ul>
      *
      * Note that additional child elements can be processed if appropriate

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/CryptoBase.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/CryptoBase.java?rev=1041918&r1=1041917&r2=1041918&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/CryptoBase.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/CryptoBase.java Fri Dec  3 17:20:50 2010
@@ -193,7 +193,7 @@ public abstract class CryptoBase impleme
     /**
      * Load a X509Certificate from the input stream.
      *
-     * @param The <code>InputStream</code> containing the X509Certificate
+     * @param in The <code>InputStream</code> containing the X509Certificate
      * @return An X509 certificate
      * @throws org.apache.ws.security.WSSecurityException
      *

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/X509NameTokenizer.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/X509NameTokenizer.java?rev=1041918&r1=1041917&r2=1041918&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/X509NameTokenizer.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/X509NameTokenizer.java Fri Dec  3 17:20:50 2010
@@ -31,7 +31,7 @@ import org.apache.xml.security.utils.RFC
  */
 public class X509NameTokenizer {
 
-    private final java.util.List tokens = new ArrayList();
+    private final java.util.List<String> tokens = new ArrayList<String>();
     private int index = 0;
 
     public X509NameTokenizer(String dn) {

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/handler/WSHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/handler/WSHandler.java?rev=1041918&r1=1041917&r2=1041918&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/handler/WSHandler.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/handler/WSHandler.java Fri Dec  3 17:20:50 2010
@@ -1102,7 +1102,7 @@ public abstract class WSHandler {
      * @return true if the certificate is trusted, false if not (AxisFault is thrown for exceptions
      * during CertPathValidation)
      * @throws WSSecurityException
-     * @deprecated Trust is verified on signature certificates in the SignatureProcessor by default
+     * @Deprecated Trust is verified on signature certificates in the SignatureProcessor by default
      */
     protected boolean verifyTrust(X509Certificate cert, RequestData reqData) 
         throws WSSecurityException {
@@ -1126,7 +1126,7 @@ public abstract class WSHandler {
      * @param timeToLive
      *            the limit on the receivers' side, that the timestamp is validated against
      * @return true if the timestamp is before (now-timeToLive), false otherwise
-     * @deprecated TTL validation is now done by default in the TimestampProcessor
+     * @Deprecated TTL validation is now done by default in the TimestampProcessor
      * @throws WSSecurityException
      */
     protected boolean verifyTimestamp(Timestamp timestamp, int timeToLive) throws WSSecurityException {

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/handler/WSHandlerResult.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/handler/WSHandlerResult.java?rev=1041918&r1=1041917&r2=1041918&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/handler/WSHandlerResult.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/handler/WSHandlerResult.java Fri Dec  3 17:20:50 2010
@@ -32,7 +32,7 @@ public class WSHandlerResult {
     /**
      * constructor
      * @param actor
-     * @param wsResults
+     * @param results
      */ 
     public WSHandlerResult(String actor, List<WSSecurityEngineResult> results) {
         this.actor = actor;

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncrypt.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncrypt.java?rev=1041918&r1=1041917&r2=1041918&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncrypt.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecEncrypt.java Fri Dec  3 17:20:50 2010
@@ -337,7 +337,7 @@ public class WSSecEncrypt extends WSSecE
     }
 
     /**
-     * @deprecated Use encryptForRef(dataRef, references) instead
+     * @Deprecated Use encryptForRef(dataRef, references) instead
      */
     public Element encryptForInternalRef(Element dataRef, List<WSEncryptionPart> references)
         throws WSSecurityException {
@@ -345,7 +345,7 @@ public class WSSecEncrypt extends WSSecE
     }
 
     /**
-     * @deprecated Use encryptForRef(dataRef, references) instead
+     * @Deprecated Use encryptForRef(dataRef, references) instead
      */
     public Element encryptForExternalRef(Element dataRef, List<WSEncryptionPart> references)
         throws WSSecurityException {
@@ -424,7 +424,7 @@ public class WSSecEncrypt extends WSSecE
             if (idToEnc != null) {
                 elementToEncrypt = 
                     WSSecurityUtil.findElementById(
-                            doc.getDocumentElement(), idToEnc, WSConstants.WSU_NS, false
+                        doc.getDocumentElement(), idToEnc, WSConstants.WSU_NS, false
                     );
                 if (elementToEncrypt == null) {
                     elementToEncrypt = 
@@ -434,7 +434,9 @@ public class WSSecEncrypt extends WSSecE
                 }
             } else {
                 elementToEncrypt = 
-                    (Element) WSSecurityUtil.findElement(doc, elemName, nmSpace);
+                    (Element) WSSecurityUtil.findElement(
+                        doc.getDocumentElement(), elemName, nmSpace
+                    );
             }
             if (elementToEncrypt == null) {
                 throw new WSSecurityException(

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecSignatureBase.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecSignatureBase.java?rev=1041918&r1=1041917&r2=1041918&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecSignatureBase.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/message/WSSecSignatureBase.java Fri Dec  3 17:20:50 2010
@@ -57,7 +57,7 @@ public class WSSecSignatureBase extends 
      * 
      * @param doc The parent document
      * @param references The list of references to sign
-     * @param sig The XMLSignature object
+     * @param signatureFactory The XMLSignature object
      * @param secHeader The Security Header
      * @param wssConfig The WSSConfig
      * @param digestAlgo The digest algorithm to use

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/message/token/PKIPathSecurity.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/message/token/PKIPathSecurity.java?rev=1041918&r1=1041917&r2=1041918&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/message/token/PKIPathSecurity.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/message/token/PKIPathSecurity.java Fri Dec  3 17:20:50 2010
@@ -62,7 +62,6 @@ public class PKIPathSecurity extends Bin
     /**
      * get the X509Certificate array.
      *
-     * @param reverse
      * @param crypto
      * @return array of certificates 
      * @throws WSSecurityException
@@ -80,7 +79,6 @@ public class PKIPathSecurity extends Bin
      * set the X509Certificate array.
      *
      * @param certs
-     * @param reverse
      * @param crypto
      * @throws WSSecurityException
      */

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/message/token/SecurityTokenReference.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/message/token/SecurityTokenReference.java?rev=1041918&r1=1041917&r2=1041918&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/message/token/SecurityTokenReference.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/message/token/SecurityTokenReference.java Fri Dec  3 17:20:50 2010
@@ -521,7 +521,7 @@ public class SecurityTokenReference {
     /**
      * Sets the X509Data.
      *
-     * @param ref the {@link DOMX509Data} to put into this
+     * @param domX509Data the {@link DOMX509Data} to put into this
      *            SecurityTokenReference
      */
     public void setX509Data(DOMX509Data domX509Data) {

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/util/Base64.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/util/Base64.java?rev=1041918&r1=1041917&r2=1041918&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/util/Base64.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/util/Base64.java Fri Dec  3 17:20:50 2010
@@ -31,8 +31,6 @@ import org.apache.ws.security.WSSecurity
  * data. You need the data that you will encode/decode
  * already on a byte arrray.
  *
- * @xerces.internal 
- *
  * @author Jeffrey Rodriguez
  * @author Sandy Gao
  * @version $Id$

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/util/NSStack.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/util/NSStack.java?rev=1041918&r1=1041917&r2=1041918&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/util/NSStack.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/util/NSStack.java Fri Dec  3 17:20:50 2010
@@ -23,6 +23,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * The abstraction this class provides is a push down stack of variable
@@ -110,9 +111,9 @@ public class NSStack {
     /**
      * Return a copy of the current frame.  Returns null if none are present.
      */
-    public ArrayList cloneFrame() {
+    public List<Mapping> cloneFrame() {
         if (stack[top] == null) return null;
-        ArrayList clone = new ArrayList();
+        List<Mapping> clone = new ArrayList<Mapping>();
         for (Mapping map = topOfFrame(); map != null; map = next()) {
             clone.add(map);
         }

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/util/StringUtil.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/util/StringUtil.java?rev=1041918&r1=1041917&r2=1041918&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/util/StringUtil.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/util/StringUtil.java Fri Dec  3 17:20:50 2010
@@ -95,7 +95,7 @@ public class StringUtil {
         if (len == 0) {
             return EMPTY_STRING_ARRAY;
         }
-        List list = new ArrayList();
+        List<String> list = new ArrayList<String>();
         int i = 0, start = 0;
         boolean match = false;
         while (i < len) {

Modified: webservices/wss4j/trunk/test/wssec/SOAPUtil.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/SOAPUtil.java?rev=1041918&r1=1041917&r2=1041918&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/SOAPUtil.java (original)
+++ webservices/wss4j/trunk/test/wssec/SOAPUtil.java Fri Dec  3 17:20:50 2010
@@ -19,49 +19,27 @@
 
 package wssec;
 
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.SOAPMessage;
-
-import org.apache.axis.Message;
-import org.apache.axis.MessageContext;
-import org.apache.axis.client.AxisClient;
-import org.apache.axis.configuration.NullProvider;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 
 public class SOAPUtil {
     
-    /**
-     * Convert an SOAP Envelope as a String to a org.w3c.dom.Document. The way this
-     * is done is delegated to one of the other methods in this class.
-     */
-    public static org.w3c.dom.Document toSOAPPart(String xml) throws Exception {
-        // return toSOAPPartSAAJ(xml);
-        return toSOAPPartAxis(xml);
-    }
-
-    /**
-     * Convert an xml String to a Document using the SAAJ API
-     */
-    public static org.w3c.dom.Document toSOAPPartSAAJ(String xml) throws Exception {
-        ByteArrayInputStream in = new ByteArrayInputStream(xml.getBytes());
-        MessageFactory factory = MessageFactory.newInstance();
-        SOAPMessage soapMessage = factory.createMessage(null, in);
-        return soapMessage.getSOAPPart();
+    private static DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+    
+    static {
+        factory.setNamespaceAware(true);
     }
     
     /**
-     * Convert an xml String to a Document using Axis
+     * Convert an SOAP Envelope as a String to a org.w3c.dom.Document.
      */
-    public static org.w3c.dom.Document toSOAPPartAxis(String xml) throws Exception {
-        AxisClient tmpEngine = new AxisClient(new NullProvider());
-        MessageContext msgContext = new MessageContext(tmpEngine);
+    public static org.w3c.dom.Document toSOAPPart(String xml) throws Exception {
         InputStream in = new ByteArrayInputStream(xml.getBytes());
-        Message msg = new Message(in);
-        msg.setMessageContext(msgContext);
-        org.apache.axis.message.SOAPEnvelope soapEnvelope = msg.getSOAPEnvelope();
-        return soapEnvelope.getAsDocument();
+        DocumentBuilder builder = factory.newDocumentBuilder();
+        return builder.parse(in);
     }
     
 }

Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNewDK.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNewDK.java?rev=1041918&r1=1041917&r2=1041918&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNewDK.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNewDK.java Fri Dec  3 17:20:50 2010
@@ -205,7 +205,6 @@ public class TestWSSecurityNewDK extends
          SecurityTokenReference secToken = new SecurityTokenReference(doc);
          X509Certificate[] certs = crypto.getCertificates("wss40");
          secToken.setKeyIdentifierThumb(certs[0]);
-         secToken.getElement();
          
          WSSecDKSign sigBuilder = new WSSecDKSign();
          java.security.Key key = crypto.getPrivateKey("wss40", "security");
@@ -238,7 +237,6 @@ public class TestWSSecurityNewDK extends
          SecurityTokenReference secToken = new SecurityTokenReference(doc);
          X509Certificate[] certs = crypto.getCertificates("wss40");
          secToken.setKeyIdentifierSKI(certs[0], crypto);
-         secToken.getElement();
          
          WSSecDKSign sigBuilder = new WSSecDKSign();
          java.security.Key key = crypto.getPrivateKey("wss40", "security");

Modified: webservices/wss4j/trunk/test/wssec/TestWSSecuritySAMLKeyIdentifier.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecuritySAMLKeyIdentifier.java?rev=1041918&r1=1041917&r2=1041918&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecuritySAMLKeyIdentifier.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecuritySAMLKeyIdentifier.java Fri Dec  3 17:20:50 2010
@@ -25,11 +25,6 @@ import org.apache.ws.security.saml.SAMLI
 import org.apache.ws.security.saml.SAMLIssuer;
 import org.apache.ws.security.util.WSSecurityUtil;
 
-import org.apache.axis.Message;
-import org.apache.axis.MessageContext;
-import org.apache.axis.client.AxisClient;
-import org.apache.axis.configuration.NullProvider;
-import org.apache.axis.message.SOAPEnvelope;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.ws.security.WSConstants;
@@ -49,9 +44,7 @@ import org.w3c.dom.Node;
 
 import org.opensaml.SAMLAssertion;
 
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.util.List;
 import java.util.ArrayList;
 
@@ -71,15 +64,13 @@ public class TestWSSecuritySAMLKeyIdenti
         + "<SOAP-ENV:Envelope "
         +   "xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\" "
         +   "xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" "
-        +   "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">" 
+        +   "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">"
         +   "<SOAP-ENV:Body>" 
         +      "<ns1:testMethod xmlns:ns1=\"uri:LogTestService2\"></ns1:testMethod>" 
         +   "</SOAP-ENV:Body>" 
         + "</SOAP-ENV:Envelope>";
 
     private WSSecurityEngine secEngine = new WSSecurityEngine();
-    private MessageContext msgContext;
-    private Message message;
 
     /**
      * TestWSSecurity constructor
@@ -100,39 +91,13 @@ public class TestWSSecuritySAMLKeyIdenti
     }
 
     /**
-     * Setup method
-     * 
-     * @throws Exception Thrown when there is a problem in setup
-     */
-    protected void setUp() throws Exception {
-        AxisClient tmpEngine = new AxisClient(new NullProvider());
-        msgContext = new MessageContext(tmpEngine);
-        message = getSOAPMessage();
-    }
-
-    /**
-     * Constructs a soap envelope
-     * 
-     * @return soap envelope
-     * @throws Exception if there is any problem constructing the soap envelope
-     */
-    protected Message getSOAPMessage() throws Exception {
-        InputStream in = new ByteArrayInputStream(SOAPMSG.getBytes());
-        Message msg = new Message(in);
-        msg.setMessageContext(msgContext);
-        return msg;
-    }
-
-    /**
      * The body of the SOAP request is encrypted using a secret key, which is in turn encrypted
      * using the certificate embedded in the SAML assertion and referenced using a Key Identifier.
      */
     public void testSAMLEncryptedKey() throws Exception {
-        SOAPEnvelope unsignedEnvelope = message.getSOAPEnvelope();
-        
         // Create a SAML assertion
         SAMLIssuer saml = SAMLIssuerFactory.getInstance("saml4.properties");
-        Document doc = unsignedEnvelope.getAsDocument();
+        Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
         saml.setInstanceDoc(doc);
         Crypto hokCrypto = CryptoFactory.getInstance("crypto.properties");
         saml.setUserCrypto(hokCrypto);

Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityWSS234.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityWSS234.java?rev=1041918&r1=1041917&r2=1041918&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityWSS234.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityWSS234.java Fri Dec  3 17:20:50 2010
@@ -22,11 +22,6 @@ package wssec;
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
-import org.apache.axis.Message;
-import org.apache.axis.MessageContext;
-import org.apache.axis.client.AxisClient;
-import org.apache.axis.configuration.NullProvider;
-import org.apache.axis.message.SOAPEnvelope;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.ws.security.WSPasswordCallback;
@@ -40,9 +35,7 @@ import org.w3c.dom.Document;
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.UnsupportedCallbackException;
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 
 /**
  * This is a test for WSS-234 - 
@@ -66,8 +59,6 @@ public class TestWSSecurityWSS234 extend
     
     private WSSecurityEngine secEngine = new WSSecurityEngine();
     private Crypto crypto = CryptoFactory.getInstance();
-    private MessageContext msgContext;
-    private SOAPEnvelope unsignedEnvelope;
 
     /**
      * TestWSSecurity constructor
@@ -90,32 +81,6 @@ public class TestWSSecurityWSS234 extend
     }
 
     /**
-     * Setup method
-     * <p/>
-     * 
-     * @throws java.lang.Exception Thrown when there is a problem in setup
-     */
-    protected void setUp() throws Exception {
-        AxisClient tmpEngine = new AxisClient(new NullProvider());
-        msgContext = new MessageContext(tmpEngine);
-        unsignedEnvelope = getSOAPEnvelope();
-    }
-
-    /**
-     * Constructs a soap envelope
-     * <p/>
-     * 
-     * @return soap envelope
-     * @throws java.lang.Exception if there is any problem constructing the soap envelope
-     */
-    protected SOAPEnvelope getSOAPEnvelope() throws Exception {
-        InputStream in = new ByteArrayInputStream(SOAPMSG.getBytes());
-        Message msg = new Message(in);
-        msg.setMessageContext(msgContext);
-        return msg.getSOAPEnvelope();
-    }
-
-    /**
      * Test that signs and verifies a WS-Security envelope
      * <p/>
      * 
@@ -125,7 +90,7 @@ public class TestWSSecurityWSS234 extend
         WSSecSignature builder = new WSSecSignature();
         builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
         LOG.info("Before Signing....");
-        Document doc = unsignedEnvelope.getAsDocument();
+        Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
         WSSecHeader secHeader = new WSSecHeader();
         secHeader.insertSecurityHeader(doc);
         Document signedDoc = builder.build(doc, crypto, secHeader);