5:54 a.m.
Author: richard.opalka(a)jboss.com
Date: 2007-09-27 06:54:30 -0400 (Thu, 27 Sep 2007)
New Revision: 4638
Added:
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/META-INF/wsrm-jaxws-client-config.xml
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-exactly-once-in-order-policy.xml
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-jaxws-endpoint-config.xml
Removed:
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/META-INF/jboss-wsrm-client.xml
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/WEB-INF/jboss-wsrm-server.xml
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm11_exactly_one_in_order.xml
Modified:
stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/OneWayServiceIface.java
stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/OneWayServiceImpl.java
stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceIface.java
stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceImpl.java
stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/OneWayTestCase.java
stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/ReqResTestCase.java
Log:
refactoring WSRM configuration to standard JAXWS config
Modified:
stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/OneWayServiceIface.java
===================================================================
---
stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/OneWayServiceIface.java 2007-09-27
07:15:53 UTC (rev 4637)
+++
stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/OneWayServiceIface.java 2007-09-27
10:54:30 UTC (rev 4638)
@@ -2,7 +2,10 @@
import javax.jws.WebService;
+import org.jboss.ws.annotation.EndpointConfig;
+
@WebService
+@EndpointConfig(configName = "Standard WSRM Client", configFile =
"META-INF/wsrm-jaxws-client-config.xml")
public interface OneWayServiceIface
{
void method1();
Modified:
stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/OneWayServiceImpl.java
===================================================================
---
stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/OneWayServiceImpl.java 2007-09-27
07:15:53 UTC (rev 4637)
+++
stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/OneWayServiceImpl.java 2007-09-27
10:54:30 UTC (rev 4638)
@@ -18,7 +18,7 @@
(
@Policy
(
- policyFileLocation = "WEB-INF/wsrm11_exactly_one_in_order.xml",
+ policyFileLocation = "WEB-INF/wsrm-exactly-once-in-order-policy.xml",
scope = PolicyScopeLevel.WSDL_BINDING
)
)
Modified:
stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceIface.java
===================================================================
---
stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceIface.java 2007-09-27
07:15:53 UTC (rev 4637)
+++
stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceIface.java 2007-09-27
10:54:30 UTC (rev 4638)
@@ -12,8 +12,11 @@
import javax.xml.ws.AsyncHandler;
import javax.xml.ws.Response;
+import org.jboss.ws.annotation.EndpointConfig;
+
@WebService(name = "ReqRes", targetNamespace =
"http://org.jboss.ws/jaxws/wsrm")
@SOAPBinding(style = Style.RPC)
+@EndpointConfig(configName = "Standard WSRM Client", configFile =
"META-INF/wsrm-jaxws-client-config.xml")
public interface ReqResServiceIface
{
@WebMethod(operationName = "echo")
Modified:
stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceImpl.java
===================================================================
---
stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceImpl.java 2007-09-27
07:15:53 UTC (rev 4637)
+++
stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceImpl.java 2007-09-27
10:54:30 UTC (rev 4638)
@@ -26,7 +26,7 @@
(
@Policy
(
- policyFileLocation = "WEB-INF/wsrm11_exactly_one_in_order.xml",
+ policyFileLocation = "WEB-INF/wsrm-exactly-once-in-order-policy.xml",
scope = PolicyScopeLevel.WSDL_BINDING
)
)
Modified:
stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/OneWayTestCase.java
===================================================================
---
stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/OneWayTestCase.java 2007-09-27
07:15:53 UTC (rev 4637)
+++
stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/OneWayTestCase.java 2007-09-27
10:54:30 UTC (rev 4638)
@@ -48,7 +48,7 @@
public static Test suite()
{
- return new JBossWSTestSetup(OneWayTestCase.class, "jaxws-wsrm.war");
+ return new JBossWSTestSetup(OneWayTestCase.class, "jaxws-wsrm.war,
jaxws-wsrm-client.jar");
}
@Override
Modified:
stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/ReqResTestCase.java
===================================================================
---
stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/ReqResTestCase.java 2007-09-27
07:15:53 UTC (rev 4637)
+++
stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/ReqResTestCase.java 2007-09-27
10:54:30 UTC (rev 4638)
@@ -72,7 +72,7 @@
public static Test suite()
{
- return new JBossWSTestSetup(ReqResTestCase.class, "jaxws-wsrm.war");
+ return new JBossWSTestSetup(ReqResTestCase.class, "jaxws-wsrm.war,
jaxws-wsrm-client.jar");
}
@Override
Deleted:
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/META-INF/jboss-wsrm-client.xml
===================================================================
---
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/META-INF/jboss-wsrm-client.xml 2007-09-27
07:15:53 UTC (rev 4637)
+++
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/META-INF/jboss-wsrm-client.xml 2007-09-27
10:54:30 UTC (rev 4638)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<jboss-ws-rm
- xmlns="http://www.jboss.com/ws-rm/config"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.jboss.com/ws-rm/config
- http://www.jboss.com/ws-rm/schema/jboss-ws-rm_1_0.xsd">
-
- <!-- Provider to be used for reliable messaging on client side. -->
- <provider specVersion="http://docs.oasis-open.org/ws-rx/wsrm/200702"/>
-
- <!-- Message store to be used for reliable messaging on client side. -->
- <message-store
- name="Database Based Message Store"
- class="org.jboss.ws.extensions.wsrm.msgstores.DBMessageStore"
- storeId="clientStore">
- <config-file>META-INF/db-msgstore-config.xml</config-file>
- </message-store>
-
-</jboss-ws-rm>
Added:
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/META-INF/wsrm-jaxws-client-config.xml
===================================================================
---
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/META-INF/wsrm-jaxws-client-config.xml
(rev 0)
+++
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/META-INF/wsrm-jaxws-client-config.xml 2007-09-27
10:54:30 UTC (rev 4638)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jaxws-config
+ xmlns="urn:jboss:jaxws-config:2.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:javaee="http://java.sun.com/xml/ns/javaee"
+ xsi:schemaLocation="urn:jboss:jaxws-config:2.0 jaxws-config_2_0.xsd">
+
+ <client-config>
+ <config-name>Standard WSRM Client</config-name>
+ <reliable-messaging>
+ <delivery-assurance inOrder="true"
quality="AtLeastOnce"/>
+ <provider
specVersion="http://docs.oasis-open.org/ws-rx/wsrm/200702"/>
+ <message-store
+ id="wsrmStoreId"
+ class="custom.MessageStoreImpl">
+ <config-file>META-INF/config.xml</config-file>
+ </message-store>
+ <port name="{http://org.jboss.ws/jaxws/wsrm}ReqResPort">
+ <delivery-assurance inOrder="false"
quality="AtMostOnce"/>
+ </port>
+ </reliable-messaging>
+ </client-config>
+
+</jaxws-config>
Property changes on:
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/META-INF/wsrm-jaxws-client-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted:
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/WEB-INF/jboss-wsrm-server.xml
===================================================================
---
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/WEB-INF/jboss-wsrm-server.xml 2007-09-27
07:15:53 UTC (rev 4637)
+++
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/WEB-INF/jboss-wsrm-server.xml 2007-09-27
10:54:30 UTC (rev 4638)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<jboss-ws-rm
- xmlns="http://www.jboss.com/ws-rm/config"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.jboss.com/ws-rm/config
- http://www.jboss.com/ws-rm/schema/jboss-ws-rm_1_0.xsd">
-
- <!-- Provider to be used for reliable messaging. -->
- <provider specVersion="http://docs.oasis-open.org/ws-rx/wsrm/200702"/>
-
- <!-- Message store to be used for reliable messaging. -->
- <message-store
- name="Database Based Message Store"
- class="org.jboss.ws.extensions.wsrm.msgstores.DBMessageStore"
- storeId="serverStore">
- <config-file>WEB-INF/db-msgstore-config.xml</config-file>
- </message-store>
-
-</jboss-ws-rm>
Added:
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-exactly-once-in-order-policy.xml
===================================================================
---
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-exactly-once-in-order-policy.xml
(rev 0)
+++
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-exactly-once-in-order-policy.xml 2007-09-27
10:54:30 UTC (rev 4638)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsp:Policy
+ wsu:Id="exactly_one_in_order_rm_delivery"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+ xmlns:wsrmp="http://docs.oasis-open.org/ws-rx/wsrmp/200702"
+
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w...
+ <wsrmp:DeliveryAssurance>
+ <wsp:Policy>
+ <wsrmp:ExactlyOnce/>
+ <wsrmp:InOrder/>
+ </wsp:Policy>
+ </wsrmp:DeliveryAssurance>
+</wsp:Policy>
Property changes on:
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-exactly-once-in-order-policy.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added:
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-jaxws-endpoint-config.xml
===================================================================
---
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-jaxws-endpoint-config.xml
(rev 0)
+++
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-jaxws-endpoint-config.xml 2007-09-27
10:54:30 UTC (rev 4638)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jaxws-config
+ xmlns="urn:jboss:jaxws-config:2.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:javaee="http://java.sun.com/xml/ns/javaee"
+ xsi:schemaLocation="urn:jboss:jaxws-config:2.0 jaxws-config_2_0.xsd">
+
+ <endpoint-config>
+ <config-name>Standard WSRM Endpoint</config-name>
+ <reliable-messaging>
+ <delivery-assurance inOrder="true"
quality="AtLeastOnce"/>
+ <provider
specVersion="http://docs.oasis-open.org/ws-rx/wsrm/200702"/>
+ <message-store
+ id="wsrmStoreId"
+ class="custom.MessageStoreImpl">
+ <config-file>META-INF/config.xml</config-file>
+ </message-store>
+ <port name="{http://org.jboss.ws/jaxws/wsrm}ReqResPort">
+ <delivery-assurance inOrder="false"
quality="AtMostOnce"/>
+ </port>
+ </reliable-messaging>
+ </endpoint-config>
+
+</jaxws-config>
Property changes on:
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-jaxws-endpoint-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted:
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm11_exactly_one_in_order.xml
===================================================================
---
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm11_exactly_one_in_order.xml 2007-09-27
07:15:53 UTC (rev 4637)
+++
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm11_exactly_one_in_order.xml 2007-09-27
10:54:30 UTC (rev 4638)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsp:Policy
- wsu:Id="exactly_one_in_order_rm_delivery"
- xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
- xmlns:wsrmp="http://docs.oasis-open.org/ws-rx/wsrmp/200702"
-
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w...
- <wsrmp:DeliveryAssurance>
- <wsp:Policy>
- <wsrmp:ExactlyOnce/>
- <wsrmp:InOrder/>
- </wsp:Policy>
- </wsrmp:DeliveryAssurance>
-</wsp:Policy>