Author: ruchithf
Date: Fri Mar 23 03:26:30 2007
New Revision: 521660
URL: http://svn.apache.org/viewvc?view=rev&rev=521660
Log:
Get Rampart to compile against the axis2 trunk, still there are some stuff to
be fixed in Axis2 w.r.t. the QName to String change
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartReceiver.java
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartSender.java
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllHandler.java
webservices/rampart/trunk/java/modules/rampart-integration/src/main/java/org/apache/axis2/integration/UtilServer.java
webservices/rampart/trunk/java/modules/rampart-integration/src/main/java/org/apache/axis2/integration/UtilsJMSServer.java
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartReceiver.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartReceiver.java?view=diff&rev=521660&r1=521659&r2=521660
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartReceiver.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartReceiver.java
Fri Mar 23 03:26:30 2007
@@ -32,8 +32,6 @@
import org.apache.ws.security.handler.WSHandlerConstants;
import org.apache.ws.security.handler.WSHandlerResult;
-import javax.xml.namespace.QName;
-
import java.util.Iterator;
import java.util.Vector;
@@ -63,7 +61,7 @@
public InvocationResponse invoke(MessageContext msgContext) throws
AxisFault {
- if (!msgContext.isEngaged(new
QName(WSSHandlerConstants.SECURITY_MODULE_NAME))) {
+ if (!msgContext.isEngaged(WSSHandlerConstants.SECURITY_MODULE_NAME)) {
return InvocationResponse.CONTINUE;
}
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartSender.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartSender.java?view=diff&rev=521660&r1=521659&r2=521660
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartSender.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartSender.java
Fri Mar 23 03:26:30 2007
@@ -26,8 +26,6 @@
import org.apache.ws.secpolicy.WSSPolicyException;
import org.apache.ws.security.WSSecurityException;
-import javax.xml.namespace.QName;
-
public class RampartSender implements Handler {
@@ -50,7 +48,7 @@
public InvocationResponse invoke(MessageContext msgContext) throws
AxisFault {
- if (!msgContext.isEngaged(new
QName(WSSHandlerConstants.SECURITY_MODULE_NAME))) {
+ if (!msgContext.isEngaged(WSSHandlerConstants.SECURITY_MODULE_NAME)) {
return InvocationResponse.CONTINUE;
}
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllHandler.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllHandler.java?view=diff&rev=521660&r1=521659&r2=521660
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllHandler.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllHandler.java
Fri Mar 23 03:26:30 2007
@@ -24,8 +24,6 @@
import org.apache.rampart.util.Axis2Util;
import org.apache.ws.security.handler.WSHandler;
-import javax.xml.namespace.QName;
-
/**
* Class WSDoAllHandler
*/
@@ -70,7 +68,7 @@
public InvocationResponse invoke(MessageContext msgContext) throws
AxisFault {
//If the security module is not engaged for this service
//do not do any processing
- if (msgContext.isEngaged(new
QName(WSSHandlerConstants.SECURITY_MODULE_NAME))) {
+ if (msgContext.isEngaged(WSSHandlerConstants.SECURITY_MODULE_NAME)) {
this.processMessage(msgContext);
}
return InvocationResponse.CONTINUE;
Modified:
webservices/rampart/trunk/java/modules/rampart-integration/src/main/java/org/apache/axis2/integration/UtilServer.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-integration/src/main/java/org/apache/axis2/integration/UtilServer.java?view=diff&rev=521660&r1=521659&r2=521660
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-integration/src/main/java/org/apache/axis2/integration/UtilServer.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-integration/src/main/java/org/apache/axis2/integration/UtilServer.java
Fri Mar 23 03:26:30 2007
@@ -78,7 +78,7 @@
receiver.start();
ListenerManager listenerManager = er.getListenerManager();
TransportInDescription trsIn = new TransportInDescription(
- new QName(Constants.TRANSPORT_HTTP));
+ Constants.TRANSPORT_HTTP);
trsIn.setReceiver(receiver);
if (listenerManager == null) {
listenerManager = new ListenerManager();
Modified:
webservices/rampart/trunk/java/modules/rampart-integration/src/main/java/org/apache/axis2/integration/UtilsJMSServer.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-integration/src/main/java/org/apache/axis2/integration/UtilsJMSServer.java?view=diff&rev=521660&r1=521659&r2=521660
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-integration/src/main/java/org/apache/axis2/integration/UtilsJMSServer.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-integration/src/main/java/org/apache/axis2/integration/UtilsJMSServer.java
Fri Mar 23 03:26:30 2007
@@ -71,7 +71,7 @@
}
receiver = new JMSListener();
ListenerManager listenerManager =
configurationContext.getListenerManager();
- TransportInDescription trsIn =
configurationContext.getAxisConfiguration().getTransportIn(new
QName(Constants.TRANSPORT_JMS));
+ TransportInDescription trsIn =
configurationContext.getAxisConfiguration().getTransportIn(Constants.TRANSPORT_JMS);
trsIn.setReceiver(receiver);
if (listenerManager == null) {
listenerManager = new ListenerManager();
