You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by di...@apache.org on 2004/03/08 17:05:06 UTC
cvs commit: ws-fx/wss4j/test/interop TestScenario1.java
dims 2004/03/08 08:05:06
Modified: wss4j build.xml
wss4j/interop/org/apache/ws/axis/oasis Client_deploy.wsdd
Scenario1.java Server_deploy.wsdd
wss4j/interop/org/apache/ws/axis/oasis/ping deploy.wsdd
wss4j/src/org/apache/ws/axis/security package.html
wss4j/interop ping.wsdl
wss4j/test/interop TestScenario1.java
Added: wss4j/interop/org/apache/ws/axis/oasis PWCallback1.java
Log:
Fix and test interop problem for Scenario1 (with MSFT endpoint)
Revision Changes Path
1.3 +1 -0 ws-fx/wss4j/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/ws-fx/wss4j/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 24 Feb 2004 18:59:44 -0000 1.2
+++ build.xml 8 Mar 2004 16:05:06 -0000 1.3
@@ -232,6 +232,7 @@
<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>
</target>
1.4 +2 -2 ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Client_deploy.wsdd
Index: Client_deploy.wsdd
===================================================================
RCS file: /home/cvs/ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Client_deploy.wsdd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Client_deploy.wsdd 3 Mar 2004 20:42:34 -0000 1.3
+++ Client_deploy.wsdd 8 Mar 2004 16:05:06 -0000 1.4
@@ -5,9 +5,9 @@
<service name="Ping1">
<requestFlow>
<handler type="java:org.apache.ws.axis.security.WSDoAllSender" >
- <parameter name="user" value="werner"/>
+ <parameter name="user" value="Chris"/>
<parameter name="passwordCallbackClass"
- value="org.apache.ws.axis.oasis.PWCallback"/>
+ value="org.apache.ws.axis.oasis.PWCallback1"/>
<parameter name="action" value="UsernameToken"/>
<parameter name="passwordType" value="PasswordText" />
</handler>
1.2 +3 -1 ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Scenario1.java
Index: Scenario1.java
===================================================================
RCS file: /home/cvs/ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Scenario1.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Scenario1.java 13 Feb 2004 20:43:04 -0000 1.1
+++ Scenario1.java 8 Mar 2004 16:05:06 -0000 1.2
@@ -18,6 +18,8 @@
package org.apache.ws.axis.oasis;
import org.apache.axis.utils.Options;
+import org.apache.axis.client.Stub;
+import org.apache.axis.client.Call;
import org.apache.ws.axis.oasis.ping.PingPort;
import org.apache.ws.axis.oasis.ping.PingServiceLocator;
import org.apache.ws.axis.oasis.ping.TicketType;
@@ -82,7 +84,7 @@
// perform call
TicketType ticket = new TicketType("scenario1");
javax.xml.rpc.holders.StringHolder text =
- new javax.xml.rpc.holders.StringHolder("Scenario 1 text");
+ new javax.xml.rpc.holders.StringHolder("WSS4J");
port.ping(text, ticket);
System.out.println(text.value);
1.2 +1 -1 ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Server_deploy.wsdd
Index: Server_deploy.wsdd
===================================================================
RCS file: /home/cvs/ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Server_deploy.wsdd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Server_deploy.wsdd 13 Feb 2004 20:43:04 -0000 1.1
+++ Server_deploy.wsdd 8 Mar 2004 16:05:06 -0000 1.2
@@ -25,7 +25,7 @@
<parameter name="allowedMethods" value="ping"/>
<requestFlow>
<handler type="java:org.apache.ws.axis.security.WSDoAllReceiver">
- <parameter name="passwordCallbackClass" value="org.apache.ws.axis.oasis.PWCallback"/>
+ <parameter name="passwordCallbackClass" value="org.apache.ws.axis.oasis.PWCallback1"/>
<parameter name="action" value="UsernameToken"/>
</handler>
</requestFlow>
1.1 ws-fx/wss4j/interop/org/apache/ws/axis/oasis/PWCallback1.java
Index: PWCallback1.java
===================================================================
/*
* Copyright 2003-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
/**
* @author Werner Dittmann (Werner.Dittmann@siemens.com)
*/
package org.apache.ws.axis.oasis;
import org.apache.ws.security.WSPasswordCallback;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
import java.io.IOException;
/**
* Class PWCallback
*/
public class PWCallback1 implements CallbackHandler {
/** Field key */
private static final byte[] key = {
(byte) 0x31, (byte) 0xfd, (byte) 0xcb, (byte) 0xda, (byte) 0xfb,
(byte) 0xcd, (byte) 0x6b, (byte) 0xa8, (byte) 0xe6, (byte) 0x19,
(byte) 0xa7, (byte) 0xbf, (byte) 0x51, (byte) 0xf7, (byte) 0xc7,
(byte) 0x3e, (byte) 0x80, (byte) 0xae, (byte) 0x98, (byte) 0x51,
(byte) 0xc8, (byte) 0x51, (byte) 0x34, (byte) 0x04,
};
/*
* (non-Javadoc)
* @see javax.security.auth.callback.CallbackHandler#handle(javax.security.auth.callback.Callback[])
*/
/**
* Method handle
*
* @param callbacks
* @throws java.io.IOException
* @throws javax.security.auth.callback.UnsupportedCallbackException
*/
public void handle(Callback[] callbacks)
throws IOException, UnsupportedCallbackException {
for (int i = 0; i < callbacks.length; i++) {
if (callbacks[i] instanceof WSPasswordCallback) {
WSPasswordCallback pc = (WSPasswordCallback) callbacks[i];
/*
* here call a function/method to lookup the password for
* the given identifier (e.g. a user name or keystore alias)
* e.g.: pc.setPassword(passStore.getPassword(pc.getIdentfifier))
* for Testing we supply a fixed name here.
*/
if (pc.getUsage() == WSPasswordCallback.KEY_NAME) {
pc.setKey(key);
} else {
pc.setPassword("sirhC");
}
} else {
throw new UnsupportedCallbackException(callbacks[i],
"Unrecognized Callback");
}
}
}
}
1.2 +1 -1 ws-fx/wss4j/interop/org/apache/ws/axis/oasis/ping/deploy.wsdd
Index: deploy.wsdd
===================================================================
RCS file: /home/cvs/ws-fx/wss4j/interop/org/apache/ws/axis/oasis/ping/deploy.wsdd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- deploy.wsdd 13 Feb 2004 20:43:04 -0000 1.1
+++ deploy.wsdd 8 Mar 2004 16:05:06 -0000 1.2
@@ -25,7 +25,7 @@
<parameter name="allowedMethods" value="ping"/>
<requestFlow>
<handler type="java:org.apache.ws.axis.security.WSDoAllReceiver">
- <parameter name="passwordCallbackClass" value="org.apache.ws.axis.oasis.PWCallback"/>
+ <parameter name="passwordCallbackClass" value="org.apache.ws.axis.oasis.PWCallback1"/>
<parameter name="action" value="UsernameToken"/>
</handler>
</requestFlow>
1.3 +1 -1 ws-fx/wss4j/src/org/apache/ws/axis/security/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/ws-fx/wss4j/src/org/apache/ws/axis/security/package.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- package.html 6 Mar 2004 11:53:11 -0000 1.2
+++ package.html 8 Mar 2004 16:05:06 -0000 1.3
@@ -122,7 +122,7 @@
<parameter name="user" value="werner"/>
<parameter name="passwordType" value="PasswordText" />
<parameter name="passwordCallbackClass"
- value="org.apache.ws.axis.oasis.PWCallback"/>
+ value="org.apache.ws.axis.oasis.PWCallback1"/>
</handler>
</requestFlow>
</service>
1.2 +1 -1 ws-fx/wss4j/interop/ping.wsdl
Index: ping.wsdl
===================================================================
RCS file: /home/cvs/ws-fx/wss4j/interop/ping.wsdl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ping.wsdl 13 Feb 2004 20:43:04 -0000 1.1
+++ ping.wsdl 8 Mar 2004 16:05:06 -0000 1.2
@@ -57,7 +57,7 @@
<binding name="PingBinding" type="tns:PingPort">
<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
<operation name="Ping">
- <soap:operation/>
+ <soap:operation soapAction="Ping"/>
<input>
<soap:body use="literal"/>
</input>
1.2 +2 -2 ws-fx/wss4j/test/interop/TestScenario1.java
Index: TestScenario1.java
===================================================================
RCS file: /home/cvs/ws-fx/wss4j/test/interop/TestScenario1.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestScenario1.java 13 Feb 2004 20:43:08 -0000 1.1
+++ TestScenario1.java 8 Mar 2004 16:05:06 -0000 1.2
@@ -55,8 +55,8 @@
*
* @param args command line args
*/
- public static void main(String[] args) {
- junit.textui.TestRunner.run(suite());
+ public static void main(String[] args) throws Exception {
+ Scenario1.main(args);
}
public void testScenario1() throws Exception {
Re: cvs commit: ws-fx/wss4j/test/interop TestScenario1.java
Posted by Davanum Srinivas <di...@apache.org>.
See http://nagoya.apache.org/eyebrowse/ReadMsg?listName=fx-dev@ws.apache.org&msgNo=339 it was a
tiny fix :)
-- dims
--- Werner Dittmann <We...@t-online.de> wrote:
> Dims,
>
> interop scenario1 is a simple UsernameToken test. I didn't see any major
> changes (well, its late today here :-) ) . What did you enhance?
>
> Regards,
> Werner
>
> ----- Original Message -----
> From: <di...@apache.org>
> To: <ws...@apache.org>
> Sent: Monday, March 08, 2004 5:05 PM
> Subject: cvs commit: ws-fx/wss4j/test/interop TestScenario1.java
>
>
> > dims 2004/03/08 08:05:06
> >
> > Modified: wss4j build.xml
> > wss4j/interop/org/apache/ws/axis/oasis Client_deploy.wsdd
> > Scenario1.java Server_deploy.wsdd
> > wss4j/interop/org/apache/ws/axis/oasis/ping deploy.wsdd
> > wss4j/src/org/apache/ws/axis/security package.html
> > wss4j/interop ping.wsdl
> > wss4j/test/interop TestScenario1.java
> > Added: wss4j/interop/org/apache/ws/axis/oasis PWCallback1.java
> > Log:
> > Fix and test interop problem for Scenario1 (with MSFT endpoint)
> >
> > Revision Changes Path
> > 1.3 +1 -0 ws-fx/wss4j/build.xml
> >
> > Index: build.xml
> > ===================================================================
> > RCS file: /home/cvs/ws-fx/wss4j/build.xml,v
> > retrieving revision 1.2
> > retrieving revision 1.3
> > diff -u -r1.2 -r1.3
> > --- build.xml 24 Feb 2004 18:59:44 -0000 1.2
> > +++ build.xml 8 Mar 2004 16:05:06 -0000 1.3
> > @@ -232,6 +232,7 @@
> > <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>
> > </target>
> >
> >
> >
> > 1.4 +2 -2
> ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Client_deploy.wsdd
> >
> > Index: Client_deploy.wsdd
> > ===================================================================
> > RCS file:
> /home/cvs/ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Client_deploy.wsdd,v
> > retrieving revision 1.3
> > retrieving revision 1.4
> > diff -u -r1.3 -r1.4
> > --- Client_deploy.wsdd 3 Mar 2004 20:42:34 -0000 1.3
> > +++ Client_deploy.wsdd 8 Mar 2004 16:05:06 -0000 1.4
> > @@ -5,9 +5,9 @@
> > <service name="Ping1">
> > <requestFlow>
> > <handler type="java:org.apache.ws.axis.security.WSDoAllSender" >
> > - <parameter name="user" value="werner"/>
> > + <parameter name="user" value="Chris"/>
> > <parameter name="passwordCallbackClass"
> > - value="org.apache.ws.axis.oasis.PWCallback"/>
> > + value="org.apache.ws.axis.oasis.PWCallback1"/>
> > <parameter name="action" value="UsernameToken"/>
> > <parameter name="passwordType" value="PasswordText" />
> > </handler>
> >
> >
> >
> > 1.2 +3 -1
> ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Scenario1.java
> >
> > Index: Scenario1.java
> > ===================================================================
> > RCS file:
> /home/cvs/ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Scenario1.java,v
> > retrieving revision 1.1
> > retrieving revision 1.2
> > diff -u -r1.1 -r1.2
> > --- Scenario1.java 13 Feb 2004 20:43:04 -0000 1.1
> > +++ Scenario1.java 8 Mar 2004 16:05:06 -0000 1.2
> > @@ -18,6 +18,8 @@
> > package org.apache.ws.axis.oasis;
> >
> > import org.apache.axis.utils.Options;
> > +import org.apache.axis.client.Stub;
> > +import org.apache.axis.client.Call;
> > import org.apache.ws.axis.oasis.ping.PingPort;
> > import org.apache.ws.axis.oasis.ping.PingServiceLocator;
> > import org.apache.ws.axis.oasis.ping.TicketType;
> > @@ -82,7 +84,7 @@
> > // perform call
> > TicketType ticket = new TicketType("scenario1");
> > javax.xml.rpc.holders.StringHolder text =
> > - new javax.xml.rpc.holders.StringHolder("Scenario 1
> text");
> > + new javax.xml.rpc.holders.StringHolder("WSS4J");
> >
> > port.ping(text, ticket);
> > System.out.println(text.value);
> >
> >
> >
> > 1.2 +1 -1
> ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Server_deploy.wsdd
> >
> > Index: Server_deploy.wsdd
> > ===================================================================
> > RCS file:
> /home/cvs/ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Server_deploy.wsdd,v
> > retrieving revision 1.1
> > retrieving revision 1.2
> > diff -u -r1.1 -r1.2
> > --- Server_deploy.wsdd 13 Feb 2004 20:43:04 -0000 1.1
> > +++ Server_deploy.wsdd 8 Mar 2004 16:05:06 -0000 1.2
> > @@ -25,7 +25,7 @@
> > <parameter name="allowedMethods" value="ping"/>
> > <requestFlow>
> > <handler type="java:org.apache.ws.axis.security.WSDoAllReceiver">
> > - <parameter name="passwordCallbackClass"
> value="org.apache.ws.axis.oasis.PWCallback"/>
> > + <parameter name="passwordCallbackClass"
> value="org.apache.ws.axis.oasis.PWCallback1"/>
> > <parameter name="action" value="UsernameToken"/>
> > </handler>
> > </requestFlow>
> >
> >
> >
> > 1.1
> ws-fx/wss4j/interop/org/apache/ws/axis/oasis/PWCallback1.java
> >
> > Index: PWCallback1.java
> > ===================================================================
> > /*
> > * Copyright 2003-2004 The Apache Software Foundation.
> > *
> > * Licensed under the Apache License, Version 2.0 (the "License");
> > * you may not use this file except in compliance with the License.
> > * You may obtain a copy of the License at
> > *
> > * http://www.apache.org/licenses/LICENSE-2.0
> > *
> > * Unless required by applicable law or agreed to in writing, software
> > * distributed under the License is distributed on an "AS IS" BASIS,
> > * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
> implied.
> > * See the License for the specific language governing permissions and
> > * limitations under the License.
> > *
> > */
> >
> > /**
> > * @author Werner Dittmann (Werner.Dittmann@siemens.com)
> > */
> > package org.apache.ws.axis.oasis;
> >
> > import org.apache.ws.security.WSPasswordCallback;
> >
> > import javax.security.auth.callback.Callback;
> > import javax.security.auth.callback.CallbackHandler;
> > import javax.security.auth.callback.UnsupportedCallbackException;
> > import java.io.IOException;
> >
> > /**
> > * Class PWCallback
> > */
> > public class PWCallback1 implements CallbackHandler {
> >
> > /** Field key */
> > private static final byte[] key = {
> > (byte) 0x31, (byte) 0xfd, (byte) 0xcb, (byte) 0xda, (byte) 0xfb,
> > (byte) 0xcd, (byte) 0x6b, (byte) 0xa8, (byte) 0xe6, (byte) 0x19,
> > (byte) 0xa7, (byte) 0xbf, (byte) 0x51, (byte) 0xf7, (byte) 0xc7,
> > (byte) 0x3e, (byte) 0x80, (byte) 0xae, (byte) 0x98, (byte) 0x51,
> > (byte) 0xc8, (byte) 0x51, (byte) 0x34, (byte) 0x04,
> > };
> >
> > /*
> > * (non-Javadoc)
> > * @see
> javax.security.auth.callback.CallbackHandler#handle(javax.security.auth.call
> back.Callback[])
> > */
> >
> > /**
> > * Method handle
> > *
> > * @param callbacks
> > * @throws java.io.IOException
> > * @throws javax.security.auth.callback.UnsupportedCallbackException
> > */
> > public void handle(Callback[] callbacks)
>
=== message truncated ===
=====
Davanum Srinivas - http://webservices.apache.org/~dims/
Re: cvs commit: ws-fx/wss4j/test/interop TestScenario1.java
Posted by Werner Dittmann <We...@t-online.de>.
Dims,
interop scenario1 is a simple UsernameToken test. I didn't see any major
changes (well, its late today here :-) ) . What did you enhance?
Regards,
Werner
----- Original Message -----
From: <di...@apache.org>
To: <ws...@apache.org>
Sent: Monday, March 08, 2004 5:05 PM
Subject: cvs commit: ws-fx/wss4j/test/interop TestScenario1.java
> dims 2004/03/08 08:05:06
>
> Modified: wss4j build.xml
> wss4j/interop/org/apache/ws/axis/oasis Client_deploy.wsdd
> Scenario1.java Server_deploy.wsdd
> wss4j/interop/org/apache/ws/axis/oasis/ping deploy.wsdd
> wss4j/src/org/apache/ws/axis/security package.html
> wss4j/interop ping.wsdl
> wss4j/test/interop TestScenario1.java
> Added: wss4j/interop/org/apache/ws/axis/oasis PWCallback1.java
> Log:
> Fix and test interop problem for Scenario1 (with MSFT endpoint)
>
> Revision Changes Path
> 1.3 +1 -0 ws-fx/wss4j/build.xml
>
> Index: build.xml
> ===================================================================
> RCS file: /home/cvs/ws-fx/wss4j/build.xml,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -r1.2 -r1.3
> --- build.xml 24 Feb 2004 18:59:44 -0000 1.2
> +++ build.xml 8 Mar 2004 16:05:06 -0000 1.3
> @@ -232,6 +232,7 @@
> <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>
> </target>
>
>
>
> 1.4 +2 -2
ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Client_deploy.wsdd
>
> Index: Client_deploy.wsdd
> ===================================================================
> RCS file:
/home/cvs/ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Client_deploy.wsdd,v
> retrieving revision 1.3
> retrieving revision 1.4
> diff -u -r1.3 -r1.4
> --- Client_deploy.wsdd 3 Mar 2004 20:42:34 -0000 1.3
> +++ Client_deploy.wsdd 8 Mar 2004 16:05:06 -0000 1.4
> @@ -5,9 +5,9 @@
> <service name="Ping1">
> <requestFlow>
> <handler type="java:org.apache.ws.axis.security.WSDoAllSender" >
> - <parameter name="user" value="werner"/>
> + <parameter name="user" value="Chris"/>
> <parameter name="passwordCallbackClass"
> - value="org.apache.ws.axis.oasis.PWCallback"/>
> + value="org.apache.ws.axis.oasis.PWCallback1"/>
> <parameter name="action" value="UsernameToken"/>
> <parameter name="passwordType" value="PasswordText" />
> </handler>
>
>
>
> 1.2 +3 -1
ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Scenario1.java
>
> Index: Scenario1.java
> ===================================================================
> RCS file:
/home/cvs/ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Scenario1.java,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -r1.1 -r1.2
> --- Scenario1.java 13 Feb 2004 20:43:04 -0000 1.1
> +++ Scenario1.java 8 Mar 2004 16:05:06 -0000 1.2
> @@ -18,6 +18,8 @@
> package org.apache.ws.axis.oasis;
>
> import org.apache.axis.utils.Options;
> +import org.apache.axis.client.Stub;
> +import org.apache.axis.client.Call;
> import org.apache.ws.axis.oasis.ping.PingPort;
> import org.apache.ws.axis.oasis.ping.PingServiceLocator;
> import org.apache.ws.axis.oasis.ping.TicketType;
> @@ -82,7 +84,7 @@
> // perform call
> TicketType ticket = new TicketType("scenario1");
> javax.xml.rpc.holders.StringHolder text =
> - new javax.xml.rpc.holders.StringHolder("Scenario 1
text");
> + new javax.xml.rpc.holders.StringHolder("WSS4J");
>
> port.ping(text, ticket);
> System.out.println(text.value);
>
>
>
> 1.2 +1 -1
ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Server_deploy.wsdd
>
> Index: Server_deploy.wsdd
> ===================================================================
> RCS file:
/home/cvs/ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Server_deploy.wsdd,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -r1.1 -r1.2
> --- Server_deploy.wsdd 13 Feb 2004 20:43:04 -0000 1.1
> +++ Server_deploy.wsdd 8 Mar 2004 16:05:06 -0000 1.2
> @@ -25,7 +25,7 @@
> <parameter name="allowedMethods" value="ping"/>
> <requestFlow>
> <handler type="java:org.apache.ws.axis.security.WSDoAllReceiver">
> - <parameter name="passwordCallbackClass"
value="org.apache.ws.axis.oasis.PWCallback"/>
> + <parameter name="passwordCallbackClass"
value="org.apache.ws.axis.oasis.PWCallback1"/>
> <parameter name="action" value="UsernameToken"/>
> </handler>
> </requestFlow>
>
>
>
> 1.1
ws-fx/wss4j/interop/org/apache/ws/axis/oasis/PWCallback1.java
>
> Index: PWCallback1.java
> ===================================================================
> /*
> * Copyright 2003-2004 The Apache Software Foundation.
> *
> * Licensed under the Apache License, Version 2.0 (the "License");
> * you may not use this file except in compliance with the License.
> * You may obtain a copy of the License at
> *
> * http://www.apache.org/licenses/LICENSE-2.0
> *
> * Unless required by applicable law or agreed to in writing, software
> * distributed under the License is distributed on an "AS IS" BASIS,
> * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
> * See the License for the specific language governing permissions and
> * limitations under the License.
> *
> */
>
> /**
> * @author Werner Dittmann (Werner.Dittmann@siemens.com)
> */
> package org.apache.ws.axis.oasis;
>
> import org.apache.ws.security.WSPasswordCallback;
>
> import javax.security.auth.callback.Callback;
> import javax.security.auth.callback.CallbackHandler;
> import javax.security.auth.callback.UnsupportedCallbackException;
> import java.io.IOException;
>
> /**
> * Class PWCallback
> */
> public class PWCallback1 implements CallbackHandler {
>
> /** Field key */
> private static final byte[] key = {
> (byte) 0x31, (byte) 0xfd, (byte) 0xcb, (byte) 0xda, (byte) 0xfb,
> (byte) 0xcd, (byte) 0x6b, (byte) 0xa8, (byte) 0xe6, (byte) 0x19,
> (byte) 0xa7, (byte) 0xbf, (byte) 0x51, (byte) 0xf7, (byte) 0xc7,
> (byte) 0x3e, (byte) 0x80, (byte) 0xae, (byte) 0x98, (byte) 0x51,
> (byte) 0xc8, (byte) 0x51, (byte) 0x34, (byte) 0x04,
> };
>
> /*
> * (non-Javadoc)
> * @see
javax.security.auth.callback.CallbackHandler#handle(javax.security.auth.call
back.Callback[])
> */
>
> /**
> * Method handle
> *
> * @param callbacks
> * @throws java.io.IOException
> * @throws javax.security.auth.callback.UnsupportedCallbackException
> */
> public void handle(Callback[] callbacks)
> throws IOException, UnsupportedCallbackException {
>
> for (int i = 0; i < callbacks.length; i++) {
> if (callbacks[i] instanceof WSPasswordCallback) {
> WSPasswordCallback pc = (WSPasswordCallback)
callbacks[i];
>
> /*
> * here call a function/method to lookup the password
for
> * the given identifier (e.g. a user name or keystore
alias)
> * e.g.:
pc.setPassword(passStore.getPassword(pc.getIdentfifier))
> * for Testing we supply a fixed name here.
> */
> if (pc.getUsage() == WSPasswordCallback.KEY_NAME) {
> pc.setKey(key);
> } else {
> pc.setPassword("sirhC");
> }
> } else {
> throw new UnsupportedCallbackException(callbacks[i],
> "Unrecognized Callback");
> }
> }
> }
> }
>
>
>
> 1.2 +1 -1
ws-fx/wss4j/interop/org/apache/ws/axis/oasis/ping/deploy.wsdd
>
> Index: deploy.wsdd
> ===================================================================
> RCS file:
/home/cvs/ws-fx/wss4j/interop/org/apache/ws/axis/oasis/ping/deploy.wsdd,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -r1.1 -r1.2
> --- deploy.wsdd 13 Feb 2004 20:43:04 -0000 1.1
> +++ deploy.wsdd 8 Mar 2004 16:05:06 -0000 1.2
> @@ -25,7 +25,7 @@
> <parameter name="allowedMethods" value="ping"/>
> <requestFlow>
> <handler type="java:org.apache.ws.axis.security.WSDoAllReceiver">
> - <parameter name="passwordCallbackClass"
value="org.apache.ws.axis.oasis.PWCallback"/>
> + <parameter name="passwordCallbackClass"
value="org.apache.ws.axis.oasis.PWCallback1"/>
> <parameter name="action" value="UsernameToken"/>
> </handler>
> </requestFlow>
>
>
>
> 1.3 +1 -1
ws-fx/wss4j/src/org/apache/ws/axis/security/package.html
>
> Index: package.html
> ===================================================================
> RCS file:
/home/cvs/ws-fx/wss4j/src/org/apache/ws/axis/security/package.html,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -r1.2 -r1.3
> --- package.html 6 Mar 2004 11:53:11 -0000 1.2
> +++ package.html 8 Mar 2004 16:05:06 -0000 1.3
> @@ -122,7 +122,7 @@
> <parameter name="user" value="werner"/>
> <parameter name="passwordType" value="PasswordText" />
> <parameter name="passwordCallbackClass"
> - value="org.apache.ws.axis.oasis.PWCallback"/>
> + value="org.apache.ws.axis.oasis.PWCallback1"/>
> </handler>
> </requestFlow>
> </service>
>
>
>
> 1.2 +1 -1 ws-fx/wss4j/interop/ping.wsdl
>
> Index: ping.wsdl
> ===================================================================
> RCS file: /home/cvs/ws-fx/wss4j/interop/ping.wsdl,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -r1.1 -r1.2
> --- ping.wsdl 13 Feb 2004 20:43:04 -0000 1.1
> +++ ping.wsdl 8 Mar 2004 16:05:06 -0000 1.2
> @@ -57,7 +57,7 @@
> <binding name="PingBinding" type="tns:PingPort">
> <soap:binding style="document"
transport="http://schemas.xmlsoap.org/soap/http"/>
> <operation name="Ping">
> - <soap:operation/>
> + <soap:operation soapAction="Ping"/>
> <input>
> <soap:body use="literal"/>
> </input>
>
>
>
> 1.2 +2 -2 ws-fx/wss4j/test/interop/TestScenario1.java
>
> Index: TestScenario1.java
> ===================================================================
> RCS file: /home/cvs/ws-fx/wss4j/test/interop/TestScenario1.java,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -r1.1 -r1.2
> --- TestScenario1.java 13 Feb 2004 20:43:08 -0000 1.1
> +++ TestScenario1.java 8 Mar 2004 16:05:06 -0000 1.2
> @@ -55,8 +55,8 @@
> *
> * @param args command line args
> */
> - public static void main(String[] args) {
> - junit.textui.TestRunner.run(suite());
> + public static void main(String[] args) throws Exception {
> + Scenario1.main(args);
> }
>
> public void testScenario1() throws Exception {
>
>
>