You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pubscribe-commits@ws.apache.org by ip...@apache.org on 2005/08/17 00:04:25 UTC
svn commit: r233066 - in /webservices/pubscribe/trunk: ./
src/examples/broker/WEB-INF/
src/examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/
src/examples/pubsubclient/WEB-INF/ src/java/org/apache/ws/eventing/
src/webapp/WEB-INF/
Author: ips
Date: Tue Aug 16 15:04:18 2005
New Revision: 233066
URL: http://svn.apache.org/viewcvs?rev=233066&view=rev
Log:
removed dep on Apache Addressing and all refs to classes from it
Modified:
webservices/pubscribe/trunk/project.xml
webservices/pubscribe/trunk/src/examples/broker/WEB-INF/server-config.wsdd
webservices/pubscribe/trunk/src/examples/broker/WEB-INF/server-config_wse.wsdd
webservices/pubscribe/trunk/src/examples/broker/WEB-INF/server-config_wsn.wsdd
webservices/pubscribe/trunk/src/examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/Filesystem_deploy.wsdd
webservices/pubscribe/trunk/src/examples/pubsubclient/WEB-INF/server-config.wsdd
webservices/pubscribe/trunk/src/examples/pubsubclient/WEB-INF/server-config_wse.wsdd
webservices/pubscribe/trunk/src/examples/pubsubclient/WEB-INF/server-config_wsn.wsdd
webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/SubscriptionHome.java
webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/client-config.wsdd
webservices/pubscribe/trunk/src/webapp/WEB-INF/server-config.wsdd
Modified: webservices/pubscribe/trunk/project.xml
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/project.xml?rev=233066&r1=233065&r2=233066&view=diff
==============================================================================
--- webservices/pubscribe/trunk/project.xml (original)
+++ webservices/pubscribe/trunk/project.xml Tue Aug 16 15:04:18 2005
@@ -87,18 +87,6 @@
<dependencies>
<dependency>
- <groupId>addressing</groupId>
- <artifactId>addressing</artifactId>
- <version>SNAPSHOT</version>
- <url>http://ws.apache.org/ws-fx/addressing/</url>
- <properties>
- <license>ApacheLicense-2.0.txt</license>
- <usage>Needed for handling WS-Addressing.</usage>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
-
- <dependency>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
<version>1.6.2</version>
Modified: webservices/pubscribe/trunk/src/examples/broker/WEB-INF/server-config.wsdd
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/examples/broker/WEB-INF/server-config.wsdd?rev=233066&r1=233065&r2=233066&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/examples/broker/WEB-INF/server-config.wsdd (original)
+++ webservices/pubscribe/trunk/src/examples/broker/WEB-INF/server-config.wsdd Tue Aug 16 15:04:18 2005
@@ -6,12 +6,6 @@
<parameter name="sendXsiTypes" value="true"/>
<parameter name="sendMultiRefs" value="true"/>
<parameter name="sendXMLDeclaration" value="true"/>
- <requestFlow>
- <handler type="java:org.apache.axis.message.addressing.handler.AddressingHandler"/>
- </requestFlow>
- <responseFlow>
- <handler type="java:org.apache.axis.message.addressing.handler.AddressingHandler"/>
- </responseFlow>
</globalConfiguration>
<handler name="LocalResponder" type="java:org.apache.axis.transport.local.LocalResponder"/>
<handler name="URLMapper" type="java:org.apache.axis.handlers.http.URLMapper"/>
Modified: webservices/pubscribe/trunk/src/examples/broker/WEB-INF/server-config_wse.wsdd
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/examples/broker/WEB-INF/server-config_wse.wsdd?rev=233066&r1=233065&r2=233066&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/examples/broker/WEB-INF/server-config_wse.wsdd (original)
+++ webservices/pubscribe/trunk/src/examples/broker/WEB-INF/server-config_wse.wsdd Tue Aug 16 15:04:18 2005
@@ -6,12 +6,6 @@
<parameter name="sendXsiTypes" value="true"/>
<parameter name="sendMultiRefs" value="true"/>
<parameter name="sendXMLDeclaration" value="true"/>
- <requestFlow>
- <handler type="java:org.apache.axis.message.addressing.handler.AddressingHandler"/>
- </requestFlow>
- <responseFlow>
- <handler type="java:org.apache.axis.message.addressing.handler.AddressingHandler"/>
- </responseFlow>
</globalConfiguration>
<handler name="LocalResponder" type="java:org.apache.axis.transport.local.LocalResponder"/>
<handler name="URLMapper" type="java:org.apache.axis.handlers.http.URLMapper"/>
Modified: webservices/pubscribe/trunk/src/examples/broker/WEB-INF/server-config_wsn.wsdd
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/examples/broker/WEB-INF/server-config_wsn.wsdd?rev=233066&r1=233065&r2=233066&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/examples/broker/WEB-INF/server-config_wsn.wsdd (original)
+++ webservices/pubscribe/trunk/src/examples/broker/WEB-INF/server-config_wsn.wsdd Tue Aug 16 15:04:18 2005
@@ -6,12 +6,6 @@
<parameter name="sendXsiTypes" value="true"/>
<parameter name="sendMultiRefs" value="true"/>
<parameter name="sendXMLDeclaration" value="true"/>
- <requestFlow>
- <handler type="java:org.apache.axis.message.addressing.handler.AddressingHandler"/>
- </requestFlow>
- <responseFlow>
- <handler type="java:org.apache.axis.message.addressing.handler.AddressingHandler"/>
- </responseFlow>
</globalConfiguration>
<handler name="LocalResponder" type="java:org.apache.axis.transport.local.LocalResponder"/>
<handler name="URLMapper" type="java:org.apache.axis.handlers.http.URLMapper"/>
Modified: webservices/pubscribe/trunk/src/examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/Filesystem_deploy.wsdd
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/Filesystem_deploy.wsdd?rev=233066&r1=233065&r2=233066&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/Filesystem_deploy.wsdd (original)
+++ webservices/pubscribe/trunk/src/examples/filesystem/src/java/org/apache/ws/resource/example/filesystem/Filesystem_deploy.wsdd Tue Aug 16 15:04:18 2005
@@ -3,24 +3,8 @@
<deployment xmlns="http://xml.apache.org/axis/wsdd/"
xmlns:java="http://xml.apache.org/axis/wsdd/providers/java">
- <service name="filesystem" provider="java:WSRF" style="document" use="literal">
-
+ <service name="filesystem" provider="java:WSRF" style="document" use="literal">
<wsdlFile>/wsdl/FileSystem.wsdl</wsdlFile>
-
- <requestFlow>
- <handler type="java:org.apache.axis.handlers.JAXRPCHandler">
- <parameter name="className" value="org.apache.axis.message.addressing.handler.AxisServerSideAddressingHandler" />
- <parameter name="referencePropertyNames" value="*" />
- </handler>
- </requestFlow>
-
- <responseFlow>
- <handler type="java:org.apache.axis.handlers.JAXRPCHandler">
- <parameter name="className" value="org.apache.axis.message.addressing.handler.AxisServerSideAddressingHandler" />
- <parameter name="referencePropertyNames" value="*" />
- </handler>
- </responseFlow>
-
</service>
</deployment>
Modified: webservices/pubscribe/trunk/src/examples/pubsubclient/WEB-INF/server-config.wsdd
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/examples/pubsubclient/WEB-INF/server-config.wsdd?rev=233066&r1=233065&r2=233066&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/examples/pubsubclient/WEB-INF/server-config.wsdd (original)
+++ webservices/pubscribe/trunk/src/examples/pubsubclient/WEB-INF/server-config.wsdd Tue Aug 16 15:04:18 2005
@@ -6,12 +6,6 @@
<parameter name="sendXsiTypes" value="true"/>
<parameter name="sendMultiRefs" value="true"/>
<parameter name="sendXMLDeclaration" value="true"/>
- <requestFlow>
- <handler type="java:org.apache.axis.message.addressing.handler.AddressingHandler"/>
- </requestFlow>
- <responseFlow>
- <handler type="java:org.apache.axis.message.addressing.handler.AddressingHandler"/>
- </responseFlow>
</globalConfiguration>
<handler name="LocalResponder" type="java:org.apache.axis.transport.local.LocalResponder"/>
<handler name="URLMapper" type="java:org.apache.axis.handlers.http.URLMapper"/>
Modified: webservices/pubscribe/trunk/src/examples/pubsubclient/WEB-INF/server-config_wse.wsdd
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/examples/pubsubclient/WEB-INF/server-config_wse.wsdd?rev=233066&r1=233065&r2=233066&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/examples/pubsubclient/WEB-INF/server-config_wse.wsdd (original)
+++ webservices/pubscribe/trunk/src/examples/pubsubclient/WEB-INF/server-config_wse.wsdd Tue Aug 16 15:04:18 2005
@@ -6,12 +6,6 @@
<parameter name="sendXsiTypes" value="true"/>
<parameter name="sendMultiRefs" value="true"/>
<parameter name="sendXMLDeclaration" value="true"/>
- <requestFlow>
- <handler type="java:org.apache.axis.message.addressing.handler.AddressingHandler"/>
- </requestFlow>
- <responseFlow>
- <handler type="java:org.apache.axis.message.addressing.handler.AddressingHandler"/>
- </responseFlow>
</globalConfiguration>
<handler name="LocalResponder" type="java:org.apache.axis.transport.local.LocalResponder"/>
<handler name="URLMapper" type="java:org.apache.axis.handlers.http.URLMapper"/>
Modified: webservices/pubscribe/trunk/src/examples/pubsubclient/WEB-INF/server-config_wsn.wsdd
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/examples/pubsubclient/WEB-INF/server-config_wsn.wsdd?rev=233066&r1=233065&r2=233066&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/examples/pubsubclient/WEB-INF/server-config_wsn.wsdd (original)
+++ webservices/pubscribe/trunk/src/examples/pubsubclient/WEB-INF/server-config_wsn.wsdd Tue Aug 16 15:04:18 2005
@@ -6,12 +6,6 @@
<parameter name="sendXsiTypes" value="true"/>
<parameter name="sendMultiRefs" value="true"/>
<parameter name="sendXMLDeclaration" value="true"/>
- <requestFlow>
- <handler type="java:org.apache.axis.message.addressing.handler.AddressingHandler"/>
- </requestFlow>
- <responseFlow>
- <handler type="java:org.apache.axis.message.addressing.handler.AddressingHandler"/>
- </responseFlow>
</globalConfiguration>
<handler name="LocalResponder" type="java:org.apache.axis.transport.local.LocalResponder"/>
<handler name="URLMapper" type="java:org.apache.axis.handlers.http.URLMapper"/>
Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/SubscriptionHome.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/SubscriptionHome.java?rev=233066&r1=233065&r2=233066&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/SubscriptionHome.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/SubscriptionHome.java Tue Aug 16 15:04:18 2005
@@ -20,7 +20,6 @@
import edu.berkeley.cs.db.yfilterplus.queryparser.Query;
import edu.berkeley.cs.db.yfilterplus.queryparser.XPQuery;
import edu.berkeley.cs.db.yfilterplus.xmltree.XMLTree;
-import org.apache.axis.message.addressing.Constants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ws.addressing.EndpointReference;
@@ -159,11 +158,7 @@
{
Subscription rs = new Subscription( filter, expires, delivery );
rs.setResourceHome( this );
- String id = (String) rs.getID( );
-
- //TODO !!!!! woher kommt publisher epr url ??? HACK for tcpmon 12345-8080
- String subscriptionAddress = "http://localhost:12345/axis/services/SubscriptionManager";
- EndpointReference subscriptionEPR = getEndpointReference( id );
+ EndpointReference subscriptionEPR = getEndpointReference( rs.getID() );
rs.setEpr( subscriptionEPR );
addSubscription( rs );
return rs;
Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/client-config.wsdd
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/client-config.wsdd?rev=233066&r1=233065&r2=233066&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/client-config.wsdd (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/client-config.wsdd Tue Aug 16 15:04:18 2005
@@ -5,13 +5,6 @@
xmlns:java="http://xml.apache.org/axis/wsdd/providers/java">
<globalConfiguration>
- <requestFlow>
- <handler type="java:org.apache.axis.message.addressing.handler.AddressingHandler"/>
- </requestFlow>
-
- <responseFlow>
- <handler type="java:org.apache.axis.message.addressing.handler.AddressingHandler"/>
- </responseFlow>
</globalConfiguration>
<transport name="http" pivot="java:org.apache.axis.transport.http.HTTPSender"/>
Modified: webservices/pubscribe/trunk/src/webapp/WEB-INF/server-config.wsdd
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/webapp/WEB-INF/server-config.wsdd?rev=233066&r1=233065&r2=233066&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/webapp/WEB-INF/server-config.wsdd (original)
+++ webservices/pubscribe/trunk/src/webapp/WEB-INF/server-config.wsdd Tue Aug 16 15:04:18 2005
@@ -29,24 +29,8 @@
<parameter name="className" value="org.apache.axis.Version"/>
</service>
- <service name="SubscriptionManager" provider="java:WSRF" style="document" use="literal">
-
- <wsdlFile>/wsdl/SubscriptionManager.wsdl</wsdlFile>
-
- <requestFlow>
- <handler type="java:org.apache.axis.handlers.JAXRPCHandler">
- <parameter name="className" value="org.apache.axis.message.addressing.handler.AxisServerSideAddressingHandler" />
- <parameter name="referencePropertyNames" value="*" />
- </handler>
- </requestFlow>
-
- <responseFlow>
- <handler type="java:org.apache.axis.handlers.JAXRPCHandler">
- <parameter name="className" value="org.apache.axis.message.addressing.handler.AxisServerSideAddressingHandler" />
- <parameter name="referencePropertyNames" value="*" />
- </handler>
- </responseFlow>
-
+ <service name="SubscriptionManager" provider="java:WSRF" style="document" use="literal">
+ <wsdlFile>/wsdl/SubscriptionManager.wsdl</wsdlFile>
</service>
<transport name="http">