You are viewing a plain text version of this content. The canonical link for it is here.
Posted to muse-commits@ws.apache.org by da...@apache.org on 2006/07/28 17:43:54 UTC
svn commit: r426575 - in /webservices/muse/trunk/samples: simple/config/
wsrf/config/ wsrf/router-entries/ wsrf/router-entries/ServiceGroup/
wsrf/router-entries/WsResourceFactory/ wsrf/src/org/apache/muse/test/wsrf/
wsrf/wsdl/
Author: danj
Date: Fri Jul 28 08:43:52 2006
New Revision: 426575
URL: http://svn.apache.org/viewvc?rev=426575&view=rev
Log:
Updated samples to include router and SG persistence usage.
Added:
webservices/muse/trunk/samples/wsrf/router-entries/
webservices/muse/trunk/samples/wsrf/router-entries/ServiceGroup/
webservices/muse/trunk/samples/wsrf/router-entries/ServiceGroup/resource-instance-1.xml
webservices/muse/trunk/samples/wsrf/router-entries/WsResourceFactory/
webservices/muse/trunk/samples/wsrf/router-entries/WsResourceFactory/resource-instance-2.xml
webservices/muse/trunk/samples/wsrf/src/org/apache/muse/test/wsrf/MyFactory.java
webservices/muse/trunk/samples/wsrf/src/org/apache/muse/test/wsrf/MyFactoryImpl.java
webservices/muse/trunk/samples/wsrf/wsdl/WsResourceFactory.wsdl
Modified:
webservices/muse/trunk/samples/simple/config/muse.xml
webservices/muse/trunk/samples/wsrf/config/muse.xml
webservices/muse/trunk/samples/wsrf/config/services.xml
webservices/muse/trunk/samples/wsrf/src/org/apache/muse/test/wsrf/WsrfTestClient.java
webservices/muse/trunk/samples/wsrf/wsdl/WS-ServiceGroup-1_2.xsd
webservices/muse/trunk/samples/wsrf/wsdl/WsResource.wsdl
Modified: webservices/muse/trunk/samples/simple/config/muse.xml
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/samples/simple/config/muse.xml?rev=426575&r1=426574&r2=426575&view=diff
==============================================================================
--- webservices/muse/trunk/samples/simple/config/muse.xml (original)
+++ webservices/muse/trunk/samples/simple/config/muse.xml Fri Jul 28 08:43:52 2006
@@ -9,11 +9,15 @@
<log-file>log/muse.log</log-file>
<log-level>FINE</log-level>
</logging>
+ <persistence>
+ <java-persistence-class>org.apache.muse.core.routing.RouterFilePersistence</java-persistence-class>
+ <persistence-location>router-entries</persistence-location>
+ </persistence>
</router>
<resource-type>
<context-path>SimpleResource</context-path>
<wsdl>
- <wsdl-file>/wsdl/SimpleResource.wsdl</wsdl-file>
+ <wsdl-file>wsdl/SimpleResource.wsdl</wsdl-file>
<wsdl-port-type>test:SimpleResourcePortType</wsdl-port-type>
</wsdl>
<java-id-factory-class>org.apache.muse.core.routing.CounterResourceIdFactory</java-id-factory-class>
Modified: webservices/muse/trunk/samples/wsrf/config/muse.xml
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/samples/wsrf/config/muse.xml?rev=426575&r1=426574&r2=426575&view=diff
==============================================================================
--- webservices/muse/trunk/samples/wsrf/config/muse.xml (original)
+++ webservices/muse/trunk/samples/wsrf/config/muse.xml Fri Jul 28 08:43:52 2006
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<muse xmlns="http://ws.apache.org/muse/descriptor"
xmlns:wsrf-sgw="http://docs.oasis-open.org/wsrf/sgw-2"
- xmlns:wsrmd="http://docs.oasis-open.org/wsrf/rmd-1"
xmlns:test="http://ws.apache.org/muse/test/wsrf"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://ws.apache.org/muse/descriptor muse-descriptor.xsd">
@@ -11,20 +10,45 @@
<log-file>log/muse.log</log-file>
<log-level>FINE</log-level>
</logging>
+ <persistence>
+ <java-persistence-class>org.apache.muse.core.routing.RouterFilePersistence</java-persistence-class>
+ <persistence-location>router-entries</persistence-location>
+ </persistence>
</router>
<resource-type>
- <context-path>ServiceGroup</context-path>
+ <context-path>WsResourceFactory</context-path>
<wsdl>
- <wsdl-file>/wsdl/WS-ServiceGroup-1_2.wsdl</wsdl-file>
- <wsdl-port-type>wsrf-sgw:ServiceGroupPortType</wsdl-port-type>
+ <wsdl-file>/wsdl/WsResourceFactory.wsdl</wsdl-file>
+ <wsdl-port-type>test:WsResourceFactoryPortType</wsdl-port-type>
</wsdl>
- <java-id-factory-class>org.apache.muse.core.routing.CounterResourceIdFactory</java-id-factory-class>
+ <java-id-factory-class>org.apache.muse.core.routing.RandomResourceIdFactory</java-id-factory-class>
+ <java-resource-class>org.apache.muse.core.SimpleResource</java-resource-class>
+ <capability>
+ <capability-uri>http://ws.apache.org/muse/test/wsrf/MyFactory</capability-uri>
+ <java-capability-class>org.apache.muse.test.wsrf.MyFactoryImpl</java-capability-class>
+ </capability>
+ </resource-type>
+ <resource-type>
+ <context-path>WsResource</context-path>
+ <wsdl>
+ <wsdl-file>/wsdl/WsResource.wsdl</wsdl-file>
+ <wsdl-port-type>test:WsResourcePortType</wsdl-port-type>
+ </wsdl>
+ <java-id-factory-class>org.apache.muse.core.routing.RandomResourceIdFactory</java-id-factory-class>
<java-resource-class>org.apache.muse.ws.resource.impl.SimpleWsResource</java-resource-class>
<capability>
<capability-uri>http://schemas.xmlsoap.org/ws/2004/09/mex/GetMetadata</capability-uri>
<java-capability-class>org.apache.muse.ws.metadata.impl.SimpleMetadataExchange</java-capability-class>
</capability>
<capability>
+ <capability-uri>http://docs.oasis-open.org/wsrf/rlw-2/ImmediateResourceTermination</capability-uri>
+ <java-capability-class>org.apache.muse.ws.resource.lifetime.impl.SimpleImmediateTermination</java-capability-class>
+ </capability>
+ <capability>
+ <capability-uri>http://docs.oasis-open.org/wsrf/rlw-2/ScheduledResourceTermination</capability-uri>
+ <java-capability-class>org.apache.muse.ws.resource.lifetime.impl.SimpleScheduledTermination</java-capability-class>
+ </capability>
+ <capability>
<capability-uri>http://docs.oasis-open.org/wsrf/rpw-2/Get</capability-uri>
<java-capability-class>org.apache.muse.ws.resource.properties.get.impl.SimpleGetCapability</java-capability-class>
</capability>
@@ -33,8 +57,12 @@
<java-capability-class>org.apache.muse.ws.resource.properties.query.impl.SimpleQueryCapability</java-capability-class>
</capability>
<capability>
- <capability-uri>http://docs.oasis-open.org/wsrf/sgw-2/ServiceGroup</capability-uri>
- <java-capability-class>org.apache.muse.ws.resource.sg.impl.SimpleServiceGroup</java-capability-class>
+ <capability-uri>http://docs.oasis-open.org/wsrf/rpw-2/Set</capability-uri>
+ <java-capability-class>org.apache.muse.ws.resource.properties.set.impl.SimpleSetCapability</java-capability-class>
+ </capability>
+ <capability>
+ <capability-uri>http://ws.apache.org/muse/test/wsrf/MyCapability</capability-uri>
+ <java-capability-class>org.apache.muse.test.wsrf.MyCapabilityImpl</java-capability-class>
</capability>
</resource-type>
<resource-type>
@@ -43,7 +71,7 @@
<wsdl-file>/wsdl/WS-ServiceGroupEntry-1_2.wsdl</wsdl-file>
<wsdl-port-type>wsrf-sgw:ServiceGroupEntryPortType</wsdl-port-type>
</wsdl>
- <java-id-factory-class>org.apache.muse.core.routing.CounterResourceIdFactory</java-id-factory-class>
+ <java-id-factory-class>org.apache.muse.core.routing.RandomResourceIdFactory</java-id-factory-class>
<java-resource-class>org.apache.muse.ws.resource.impl.SimpleWsResource</java-resource-class>
<capability>
<capability-uri>http://schemas.xmlsoap.org/ws/2004/09/mex/GetMetadata</capability-uri>
@@ -57,29 +85,16 @@
<capability-uri>http://docs.oasis-open.org/wsrf/sgw-2/ServiceGroupEntry</capability-uri>
<java-capability-class>org.apache.muse.ws.resource.sg.impl.SimpleEntry</java-capability-class>
</capability>
+ <init-param>
+ <param-name>validate-wsrp-schema</param-name>
+ <param-value>false</param-value>
+ </init-param>
</resource-type>
<resource-type>
- <context-path>MetadataResource</context-path>
- <wsdl>
- <wsdl-file>/wsdl/WS-ResourceMetadataDescriptor-CD-01.wsdl</wsdl-file>
- <wsdl-port-type>wsrmd:MetadataResourcePortType</wsdl-port-type>
- </wsdl>
- <java-id-factory-class>org.apache.muse.core.routing.CounterResourceIdFactory</java-id-factory-class>
- <java-resource-class>org.apache.muse.ws.resource.impl.SimpleWsResource</java-resource-class>
- <capability>
- <capability-uri>http://docs.oasis-open.org/wsrf/rpw-2/Get</capability-uri>
- <java-capability-class>org.apache.muse.ws.resource.properties.get.impl.SimpleGetCapability</java-capability-class>
- </capability>
- <capability>
- <capability-uri>http://docs.oasis-open.org/wsrf/rmd-1/MetadataResource</capability-uri>
- <java-capability-class>org.apache.muse.ws.resource.metadata.impl.SimpleMetadataResource</java-capability-class>
- </capability>
- </resource-type>
- <resource-type>
- <context-path>WsResource</context-path>
+ <context-path>ServiceGroup</context-path>
<wsdl>
- <wsdl-file>/wsdl/WsResource.wsdl</wsdl-file>
- <wsdl-port-type>test:WsResourcePortType</wsdl-port-type>
+ <wsdl-file>/wsdl/WS-ServiceGroup-1_2.wsdl</wsdl-file>
+ <wsdl-port-type>wsrf-sgw:ServiceGroupPortType</wsdl-port-type>
</wsdl>
<java-id-factory-class>org.apache.muse.core.routing.CounterResourceIdFactory</java-id-factory-class>
<java-resource-class>org.apache.muse.ws.resource.impl.SimpleWsResource</java-resource-class>
@@ -88,18 +103,6 @@
<java-capability-class>org.apache.muse.ws.metadata.impl.SimpleMetadataExchange</java-capability-class>
</capability>
<capability>
- <capability-uri>http://docs.oasis-open.org/wsrf/rmd-1/ResourceMetadataCapability</capability-uri>
- <java-capability-class>org.apache.muse.ws.resource.metadata.impl.SimpleResourceMetadataCapability</java-capability-class>
- </capability>
- <capability>
- <capability-uri>http://docs.oasis-open.org/wsrf/rlw-2/ImmediateResourceTermination</capability-uri>
- <java-capability-class>org.apache.muse.ws.resource.lifetime.impl.SimpleImmediateTermination</java-capability-class>
- </capability>
- <capability>
- <capability-uri>http://docs.oasis-open.org/wsrf/rlw-2/ScheduledResourceTermination</capability-uri>
- <java-capability-class>org.apache.muse.ws.resource.lifetime.impl.SimpleScheduledTermination</java-capability-class>
- </capability>
- <capability>
<capability-uri>http://docs.oasis-open.org/wsrf/rpw-2/Get</capability-uri>
<java-capability-class>org.apache.muse.ws.resource.properties.get.impl.SimpleGetCapability</java-capability-class>
</capability>
@@ -108,12 +111,12 @@
<java-capability-class>org.apache.muse.ws.resource.properties.query.impl.SimpleQueryCapability</java-capability-class>
</capability>
<capability>
- <capability-uri>http://docs.oasis-open.org/wsrf/rpw-2/Set</capability-uri>
- <java-capability-class>org.apache.muse.ws.resource.properties.set.impl.SimpleSetCapability</java-capability-class>
- </capability>
- <capability>
- <capability-uri>http://ws.apache.org/muse/test/wsrf/MyCapability</capability-uri>
- <java-capability-class>org.apache.muse.test.wsrf.MyCapabilityImpl</java-capability-class>
+ <capability-uri>http://docs.oasis-open.org/wsrf/sgw-2/ServiceGroup</capability-uri>
+ <java-capability-class>org.apache.muse.ws.resource.sg.impl.SimpleServiceGroup</java-capability-class>
+ <persistence>
+ <java-persistence-class>org.apache.muse.ws.resource.sg.impl.ServiceGroupFilePersistence</java-persistence-class>
+ <persistence-location>service-group-entries</persistence-location>
+ </persistence>
</capability>
</resource-type>
</muse>
Modified: webservices/muse/trunk/samples/wsrf/config/services.xml
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/samples/wsrf/config/services.xml?rev=426575&r1=426574&r2=426575&view=diff
==============================================================================
--- webservices/muse/trunk/samples/wsrf/config/services.xml (original)
+++ webservices/muse/trunk/samples/wsrf/config/services.xml Fri Jul 28 08:43:52 2006
@@ -43,15 +43,4 @@
</operation>
</service>
-<service name="MetadataResource">
- <description>This is the Apache Muse router service.</description>
- <parameter name="ServiceClass" locked="false">org.apache.muse.core.platform.axis2.AxisIsolationLayer</parameter>
- <operation name="handleRequest">
- <messageReceiver class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
- <actionMapping>http://docs.oasis-open.org/wsrf/rpw-2/GetResourceProperty/GetResourcePropertyRequest</actionMapping>
- <actionMapping>http://docs.oasis-open.org/wsrf/rpw-2/GetResourcePropertyDocument/GetResourcePropertyDocumentRequest</actionMapping>
- <actionMapping>http://docs.oasis-open.org/wsrf/rpw-2/GetMultipleResourceProperties/GetMultipleResourcePropertiesRequest</actionMapping>
- </operation>
-</service>
-
</serviceGroup>
Added: webservices/muse/trunk/samples/wsrf/router-entries/ServiceGroup/resource-instance-1.xml
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/samples/wsrf/router-entries/ServiceGroup/resource-instance-1.xml?rev=426575&view=auto
==============================================================================
--- webservices/muse/trunk/samples/wsrf/router-entries/ServiceGroup/resource-instance-1.xml (added)
+++ webservices/muse/trunk/samples/wsrf/router-entries/ServiceGroup/resource-instance-1.xml Fri Jul 28 08:43:52 2006
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing">
+ <wsa:Address>http://localhost:8080/wsrf/services/ServiceGroup</wsa:Address>
+ <wsa:ReferenceParameters>
+ <muse-wsa:ResourceId xmlns:muse-wsa="http://ws.apache.org/muse/addressing">MuseResource-1</muse-wsa:ResourceId>
+ </wsa:ReferenceParameters>
+</wsa:EndpointReference>
Added: webservices/muse/trunk/samples/wsrf/router-entries/WsResourceFactory/resource-instance-2.xml
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/samples/wsrf/router-entries/WsResourceFactory/resource-instance-2.xml?rev=426575&view=auto
==============================================================================
--- webservices/muse/trunk/samples/wsrf/router-entries/WsResourceFactory/resource-instance-2.xml (added)
+++ webservices/muse/trunk/samples/wsrf/router-entries/WsResourceFactory/resource-instance-2.xml Fri Jul 28 08:43:52 2006
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing">
+ <wsa:Address>http://localhost:8080/wsrf/services/WsResourceFactory</wsa:Address>
+ <wsa:ReferenceParameters>
+ <muse-wsa:ResourceId xmlns:muse-wsa="http://ws.apache.org/muse/addressing">MuseResource-1</muse-wsa:ResourceId>
+ </wsa:ReferenceParameters>
+</wsa:EndpointReference>
Added: webservices/muse/trunk/samples/wsrf/src/org/apache/muse/test/wsrf/MyFactory.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/samples/wsrf/src/org/apache/muse/test/wsrf/MyFactory.java?rev=426575&view=auto
==============================================================================
--- webservices/muse/trunk/samples/wsrf/src/org/apache/muse/test/wsrf/MyFactory.java (added)
+++ webservices/muse/trunk/samples/wsrf/src/org/apache/muse/test/wsrf/MyFactory.java Fri Jul 28 08:43:52 2006
@@ -0,0 +1,24 @@
+/*=============================================================================*
+ * Copyright 2006 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.
+ *=============================================================================*/
+
+package org.apache.muse.test.wsrf;
+
+import org.apache.muse.core.Capability;
+
+public interface MyFactory extends Capability
+{
+
+}
Added: webservices/muse/trunk/samples/wsrf/src/org/apache/muse/test/wsrf/MyFactoryImpl.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/samples/wsrf/src/org/apache/muse/test/wsrf/MyFactoryImpl.java?rev=426575&view=auto
==============================================================================
--- webservices/muse/trunk/samples/wsrf/src/org/apache/muse/test/wsrf/MyFactoryImpl.java (added)
+++ webservices/muse/trunk/samples/wsrf/src/org/apache/muse/test/wsrf/MyFactoryImpl.java Fri Jul 28 08:43:52 2006
@@ -0,0 +1,55 @@
+/*=============================================================================*
+ * Copyright 2006 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.
+ *=============================================================================*/
+
+package org.apache.muse.test.wsrf;
+
+import org.apache.muse.core.AbstractCapability;
+import org.apache.muse.core.Resource;
+import org.apache.muse.core.ResourceManager;
+import org.apache.muse.ws.addressing.soap.SoapFault;
+
+public class MyFactoryImpl extends AbstractCapability implements MyFactory
+{
+ public void initializeCompleted()
+ throws SoapFault
+ {
+ super.initializeCompleted();
+
+ Thread resourceCreationThread = new Thread(){
+ public void run()
+ {
+ ResourceManager manager = getResource().getResourceManager();
+
+ try
+ {
+ while (true)
+ {
+ Thread.currentThread().sleep(7000);
+ Resource next = manager.createResource("WsResource");
+ next.initialize();
+ manager.addResource(next.getEndpointReference(), next);
+ }
+ }
+
+ catch (Throwable error)
+ {
+ error.printStackTrace();
+ }
+ }
+ };
+ resourceCreationThread.start();
+ }
+}
Modified: webservices/muse/trunk/samples/wsrf/src/org/apache/muse/test/wsrf/WsrfTestClient.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/samples/wsrf/src/org/apache/muse/test/wsrf/WsrfTestClient.java?rev=426575&r1=426574&r2=426575&view=diff
==============================================================================
--- webservices/muse/trunk/samples/wsrf/src/org/apache/muse/test/wsrf/WsrfTestClient.java (original)
+++ webservices/muse/trunk/samples/wsrf/src/org/apache/muse/test/wsrf/WsrfTestClient.java Fri Jul 28 08:43:52 2006
@@ -146,21 +146,59 @@
// change these to point to different applications/servers
//
String webAppRoot = "/test-wsrf/services";
- String contextPath = webAppRoot + "/WsResource";
int port = 8080;
-
+
//
- // create EPR for test resource
+ // test WSSG directory
//
+
+ String contextPath = webAppRoot + "/ServiceGroup";
+
URI address = getLocalAddress(contextPath, port);
EndpointReference epr = new EndpointReference(address);
addReferenceParameter(epr);
+
+ ServiceGroupClient sg = new ServiceGroupClient(epr);
+
+ //
+ // ping SG, wait a few seconds, then check for members
+ // that were added by the simulation factory
+ //
+ /*
+ System.out.println("Pinging Muse to initialize the endpoint...");
+ sg.getResourcePropertyDocument();
+ System.out.println("Waiting 10 seconds while simulation creates WS-resources...");
+ Thread.currentThread().sleep(10000);
+ System.out.println("Done waiting - reading service group entries...");
+ */
+ //
+ // turn on tracing of SOAP messages
+ //
+ sg.setTrace(true);
+
+ WsResourceClient[] members = sg.getMembers();
+
+ System.out.println("Addresses of each service group entry:\n");
+
+ for (int n = 0; n < members.length; ++n)
+ System.out.println(members[n].getEndpointReference().getAddress());
+
+ //
+ // no ws-resources to test
+ //
+ if (members.length == 0)
+ System.exit(0);
//
- // create proxy - turn on tracing of SOAP messages
+ // test first WsResource we find
//
- WsResourceClient client = new WsResourceClient(epr);
+ WsResourceClient client = null;
+
+ for (int n = 0; n < members.length && client == null; ++n)
+ if (members[n].getEndpointReference().getAddress().toString().endsWith("WsResource"))
+ client = members[n];
+
client.setTrace(true);
//
@@ -175,7 +213,7 @@
getResourceProperty(client);
getMultipleResourceProperties(client);
getResourcePropertyDocument(client);
-
+
//
// test WSRP query operation
//
@@ -185,30 +223,6 @@
// test WSRP write operation
//
setResourceProperties(client);
-
- client.getRMD();
-
- //
- // test WSSG directory
- //
-
- contextPath = webAppRoot + "/ServiceGroup";
-
- address = getLocalAddress(contextPath, port);
- epr = new EndpointReference(address);
-
- addReferenceParameter(epr);
-
- ServiceGroupClient sg = new ServiceGroupClient(epr);
- sg.setTrace(true);
-
- WsResourceClient[] members = sg.getMembers();
-
- System.out.println("Addresses of each service group entry:\n");
-
- for (int n = 0; n < members.length; ++n)
- System.out.println(members[n].getEndpointReference().getAddress());
-
}
catch (Throwable error)
Modified: webservices/muse/trunk/samples/wsrf/wsdl/WS-ServiceGroup-1_2.xsd
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/samples/wsrf/wsdl/WS-ServiceGroup-1_2.xsd?rev=426575&r1=426574&r2=426575&view=diff
==============================================================================
--- webservices/muse/trunk/samples/wsrf/wsdl/WS-ServiceGroup-1_2.xsd (original)
+++ webservices/muse/trunk/samples/wsrf/wsdl/WS-ServiceGroup-1_2.xsd Fri Jul 28 08:43:52 2006
@@ -18,7 +18,8 @@
xmlns="http://www.w3.org/2001/XMLSchema"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:wsrf-bf="http://docs.oasis-open.org/wsrf/bf-2"
+ xmlns:wsrf-bf="http://docs.oasis-open.org/wsrf/bf-2"
+ xmlns:wsrf-rp="http://docs.oasis-open.org/wsrf/rp-2"
xmlns:wsrf-sg="http://docs.oasis-open.org/wsrf/sg-2"
xmlns:wsa="http://www.w3.org/2005/08/addressing"
elementFormDefault="qualified"
@@ -32,6 +33,9 @@
<xsd:import
namespace="http://docs.oasis-open.org/wsrf/bf-2"
schemaLocation="WS-BaseFaults-1_2.xsd" />
+ <xsd:import
+ namespace="http://docs.oasis-open.org/wsrf/rp-2"
+ schemaLocation="WS-ResourceProperties-1_2.xsd" />
<!-- =============== Resource Property Related =================== -->
<!-- ============ Resource Properties for ServiceGroup ============ -->
@@ -112,6 +116,8 @@
<xsd:element name="ServiceGroupRP">
<xsd:complexType>
<xsd:sequence>
+ <xsd:element ref="wsrf-rp:QueryExpressionDialect"
+ minOccurs="0" maxOccurs="unbounded"/>
<xsd:element ref="wsrf-sg:MembershipContentRule"
minOccurs="0" maxOccurs="unbounded"/>
<xsd:element ref="wsrf-sg:Entry"
Modified: webservices/muse/trunk/samples/wsrf/wsdl/WsResource.wsdl
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/samples/wsrf/wsdl/WsResource.wsdl?rev=426575&r1=426574&r2=426575&view=diff
==============================================================================
--- webservices/muse/trunk/samples/wsrf/wsdl/WsResource.wsdl (original)
+++ webservices/muse/trunk/samples/wsrf/wsdl/WsResource.wsdl Fri Jul 28 08:43:52 2006
@@ -56,8 +56,8 @@
<xsd:sequence>
<xsd:element ref="wsrf-rl:CurrentTime" />
<xsd:element ref="wsrf-rl:TerminationTime" />
- <xsd:element ref="wsrmd:MetadataDescriptorReference" />
- <xsd:element ref="tns:MyProperty" minOccurs="0" maxOccurs="unbounded" />
+ <xsd:element ref="wsrf-rp:QueryExpressionDialect" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element ref="tns:MyProperty" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
Added: webservices/muse/trunk/samples/wsrf/wsdl/WsResourceFactory.wsdl
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/samples/wsrf/wsdl/WsResourceFactory.wsdl?rev=426575&view=auto
==============================================================================
--- webservices/muse/trunk/samples/wsrf/wsdl/WsResourceFactory.wsdl (added)
+++ webservices/muse/trunk/samples/wsrf/wsdl/WsResourceFactory.wsdl Fri Jul 28 08:43:52 2006
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions
+ targetNamespace="http://ws.apache.org/muse/test/wsrf"
+ xmlns:tns="http://ws.apache.org/muse/test/wsrf"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:wsdl-soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ name="WsResourceFactory">
+ <wsdl:types>
+ </wsdl:types>
+ <wsdl:portType name="WsResourceFactoryPortType" >
+ </wsdl:portType>
+ <wsdl:binding name="WsResourceFactoryBinding" type="tns:WsResourceFactoryPortType">
+ <wsdl-soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
+ </wsdl:binding>
+ <wsdl:service name="WsResourceFactoryService">
+ <wsdl:port name="WsResourceFactoryPort" binding="tns:WsResourceFactoryBinding">
+ <wsdl-soap:address location="http://localhost:8080/wsrf/services/WsResourceFactory"/>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
---------------------------------------------------------------------
To unsubscribe, e-mail: muse-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-commits-help@ws.apache.org