axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ruchi...@apache.org
Subject svn commit: r367998 - in /webservices/axis2/trunk/java/modules/security: interop/org/apache/axis2/oasis/ping/PingPortSkeleton.java interop/org/apache/axis2/security/PWCallback.java maven.xml
Date Wed, 11 Jan 2006 10:40:30 GMT
Author: ruchithf
Date: Wed Jan 11 02:40:21 2006
New Revision: 367998

URL: http://svn.apache.org/viewcvs?rev=367998&view=rev
Log:
Removing wss4j-SNAPSHOT.jar from the security.mar - wss4j-SNAPSHOT.jar will be availeble in
the WEB-INF/lib dir in the the war distro.
Fixed an NPE in the security test service.


Modified:
    webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/oasis/ping/PingPortSkeleton.java
    webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/security/PWCallback.java
    webservices/axis2/trunk/java/modules/security/maven.xml

Modified: webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/oasis/ping/PingPortSkeleton.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/oasis/ping/PingPortSkeleton.java?rev=367998&r1=367997&r2=367998&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/oasis/ping/PingPortSkeleton.java
(original)
+++ webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/oasis/ping/PingPortSkeleton.java
Wed Jan 11 02:40:21 2006
@@ -34,25 +34,31 @@
                 (Vector) mc.getProperty(WSHandlerConstants.RECV_RESULTS))
                 == null) {
             System.out.println("No security results!!");
-        }
-        System.out.println("Number of results: " + results.size());
-        for (int i = 0; i < results.size(); i++) {
-            WSHandlerResult rResult =
-                    (WSHandlerResult) results.get(i);
-            Vector wsSecEngineResults = rResult.getResults();
-
-            for (int j = 0; j < wsSecEngineResults.size(); j++) {
-                WSSecurityEngineResult wser =
-                        (WSSecurityEngineResult) wsSecEngineResults.get(j);
-                if (wser.getAction() != WSConstants.ENCR && wser.getPrincipal() !=
null) {
-                    System.out.println(wser.getPrincipal().getName());
+            PingResponseDocument response = PingResponseDocument.Factory.newInstance();
+            PingResponse pingRes = response.addNewPingResponse();
+            pingRes.setText("Response: " + param0.getPing().getText() + "\n" +
+                    "WARNING: wsse:Security missing !!!!");
+            return response;
+        } else {
+            System.out.println("Number of results: " + results.size());
+            for (int i = 0; i < results.size(); i++) {
+                WSHandlerResult rResult =
+                        (WSHandlerResult) results.get(i);
+                Vector wsSecEngineResults = rResult.getResults();
+    
+                for (int j = 0; j < wsSecEngineResults.size(); j++) {
+                    WSSecurityEngineResult wser =
+                            (WSSecurityEngineResult) wsSecEngineResults.get(j);
+                    if (wser.getAction() != WSConstants.ENCR && wser.getPrincipal()
!= null) {
+                        System.out.println(wser.getPrincipal().getName());
+                    }
                 }
             }
+            PingResponseDocument response = PingResponseDocument.Factory.newInstance();
+            PingResponse pingRes = response.addNewPingResponse();
+            pingRes.setText("Response: " + param0.getPing().getText());
+            return response;
         }
-        PingResponseDocument response = PingResponseDocument.Factory.newInstance();
-        PingResponse pingRes = response.addNewPingResponse();
-        pingRes.setText("Response: " + param0.getPing().getText());
-        return response;
     }
 
 }

Modified: webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/security/PWCallback.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/security/PWCallback.java?rev=367998&r1=367997&r2=367998&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/security/PWCallback.java
(original)
+++ webservices/axis2/trunk/java/modules/security/interop/org/apache/axis2/security/PWCallback.java
Wed Jan 11 02:40:21 2006
@@ -54,16 +54,6 @@
 
 
 
-    /*
-
-     * (non-Javadoc)
-
-     * @see javax.security.auth.callback.CallbackHandler#handle(javax.security.auth.callback.Callback[])
-
-     */
-
-
-
     /**
 
      * Method handle

Modified: webservices/axis2/trunk/java/modules/security/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/maven.xml?rev=367998&r1=367997&r2=367998&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/security/maven.xml Wed Jan 11 02:40:21 2006
@@ -39,7 +39,6 @@
         <copy file="${maven.repo.local}/xml-security/jars/xmlsec-1.2.1.jar" todir="target/temp-mar/lib"/>
         <copy file="${maven.repo.local}/bouncycastle/jars/bcprov-jdk13-128.jar" todir="target/temp-mar/lib"/>
         <copy file="${maven.repo.local}/opensaml/jars/opensaml-1.0.1.jar" todir="target/temp-mar/lib"/>
-        <copy file="${maven.repo.local}/wss4j/jars/wss4j-SNAPSHOT.jar" todir="target/temp-mar/lib"/>
         <copy file="${maven.repo.local}/jaxen/jars/jaxen-1.1-beta-7.jar" todir="target/temp-mar/lib"/>
         <copy file="${maven.repo.local}/xml-apis/jars/xml-apis-${xml_apis.version}.jar"
todir="target/temp-mar/lib"/>
         <copy file="${maven.repo.local}/xerces/jars/xercesImpl-${xerces.version}.jar"
todir="target/temp-mar/lib"/>



Mime
View raw message