JBossWS SVN: r4572 - stack/native/branches/ropalka/trunk/src/main/resources/schema.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-09-17 09:28:24 -0400 (Mon, 17 Sep 2007)
New Revision: 4572
Modified:
stack/native/branches/ropalka/trunk/src/main/resources/schema/jboss-ws-rm_1.0.xsd
Log:
fix
Modified: stack/native/branches/ropalka/trunk/src/main/resources/schema/jboss-ws-rm_1.0.xsd
===================================================================
--- stack/native/branches/ropalka/trunk/src/main/resources/schema/jboss-ws-rm_1.0.xsd 2007-09-17 12:55:40 UTC (rev 4571)
+++ stack/native/branches/ropalka/trunk/src/main/resources/schema/jboss-ws-rm_1.0.xsd 2007-09-17 13:28:24 UTC (rev 4572)
@@ -12,7 +12,7 @@
</xs:annotation>
<xs:complexType>
<xs:sequence>
- <xs:element name="delivery-assurance" type="deliveryAssuranceType">
+ <xs:element name="delivery-assurance" type="deliveryAssuranceType" minOccurs="0">
<xs:annotation>
<xs:documentation>
Global WS-RM delivery assurance configuration that applies to all WSDL ports.
16 years, 8 months
JBossWS SVN: r4571 - stack/native/branches/ropalka/trunk/src/main/resources/schema.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-09-17 08:55:40 -0400 (Mon, 17 Sep 2007)
New Revision: 4571
Added:
stack/native/branches/ropalka/trunk/src/main/resources/schema/jboss-ws-rm_1.0.xsd
Log:
adding ws-rm configuration schema
Added: stack/native/branches/ropalka/trunk/src/main/resources/schema/jboss-ws-rm_1.0.xsd
===================================================================
--- stack/native/branches/ropalka/trunk/src/main/resources/schema/jboss-ws-rm_1.0.xsd (rev 0)
+++ stack/native/branches/ropalka/trunk/src/main/resources/schema/jboss-ws-rm_1.0.xsd 2007-09-17 12:55:40 UTC (rev 4571)
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<xs:schema
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns="http://www.jboss.com/ws-rm/config"
+ targetNamespace="http://www.jboss.com/ws-rm/config"
+ elementFormDefault="qualified">
+ <xs:element name="jboss-ws-rm">
+ <xs:annotation>
+ <xs:documentation>
+ This WS-RM configuration file will be used on both client and server sides.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="delivery-assurance" type="deliveryAssuranceType">
+ <xs:annotation>
+ <xs:documentation>
+ Global WS-RM delivery assurance configuration that applies to all WSDL ports.
+ If there is the WS-Policy with attached WS-RM assertion in WSDL
+ associated with some port or its associated binding it
+ will always override this global configuration.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="provider" type="providerType">
+ <xs:annotation>
+ <xs:documentation>
+ WS-RM specification version to be used for reliable messaging.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="message-store" type="msgStoreType">
+ <xs:annotation>
+ <xs:documentation>
+ WS-RM message store to be used for reliable messaging.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="port" type="portType" minOccurs="0" maxOccurs="unbounded">
+ <xs:annotation>
+ <xs:documentation>
+ WSDL port specific WS-RM delivery assurance configuration.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:complexType name="msgStoreType">
+ <xs:sequence>
+ <xs:element name="config-file" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>
+ Message store specific configuration file.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:string" use="required">
+ <xs:annotation>
+ <xs:documentation>
+ Message store name.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="class" type="xs:string" use="required">
+ <xs:annotation>
+ <xs:documentation>
+ Message store class name providing public default constructor.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="storeId" type="xs:string" use="required">
+ <xs:annotation>
+ <xs:documentation>
+ Message store identifier.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+ <xs:complexType name="deliveryAssuranceType">
+ <xs:attribute name="quality" use="required">
+ <xs:annotation>
+ <xs:documentation>
+ Quality of service to be ensured.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="at-least-once"/>
+ <xs:enumeration value="at-most-once"/>
+ <xs:enumeration value="exactly-once"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="inOrder" type="xs:boolean" use="required" default="false">
+ <xs:annotation>
+ <xs:documentation>
+ In order quality of service to be ensured. Set this attribute to 'true' to ensure in order message delivery.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+ <xs:complexType name="providerType">
+ <xs:attribute name="specVersion" use="required">
+ <xs:annotation>
+ <xs:documentation>
+ WS-RM spec. version to be used for reliable messaging.
+ </xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="http://docs.oasis-open.org/ws-rx/wsrm/200702"/>
+ <xs:enumeration value="http://schemas.xmlsoap.org/ws/2005/02/rm"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:complexType>
+ <xs:complexType name="portType">
+ <xs:sequence>
+ <xs:element name="delivery-assurance" type="deliveryAssuranceType">
+ <xs:annotation>
+ <xs:documentation>
+ This WSDL port specific WS-RM delivery assurance configuration
+ applies to all operations on this port.
+ This configuration always overrides the global configuration.
+ If there is the WS-Policy with attached WS-RM assertion in WSDL
+ associated with this port or its associated binding it
+ will always override this port specific configuration.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:string" use="required">
+ <xs:annotation>
+ <xs:documentation>
+ WSDL port name specified in the form {namespace}localPart.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+</xs:schema>
\ No newline at end of file
Property changes on: stack/native/branches/ropalka/trunk/src/main/resources/schema/jboss-ws-rm_1.0.xsd
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 8 months
JBossWS SVN: r4570 - stack/native/trunk/src/test/resources/jaxrpc/jbws1792/WEB-INF.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-09-17 08:44:46 -0400 (Mon, 17 Sep 2007)
New Revision: 4570
Modified:
stack/native/trunk/src/test/resources/jaxrpc/jbws1792/WEB-INF/web.xml
Log:
[JBWS-1792] init-param for handler defined in jaxrpc-config not processed
Fix invalid web.xml
Modified: stack/native/trunk/src/test/resources/jaxrpc/jbws1792/WEB-INF/web.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxrpc/jbws1792/WEB-INF/web.xml 2007-09-17 12:37:19 UTC (rev 4569)
+++ stack/native/trunk/src/test/resources/jaxrpc/jbws1792/WEB-INF/web.xml 2007-09-17 12:44:46 UTC (rev 4570)
@@ -6,11 +6,11 @@
version="2.4">
<context-param>
- <param-name>jbossws-config-name</param-name>>
+ <param-name>jbossws-config-name</param-name>
<param-value>Custom Endpoint Config</param-value>
</context-param>
<context-param>
- <param-name>jbossws-config-file</param-name>>
+ <param-name>jbossws-config-file</param-name>
<param-value>WEB-INF/custom-endpoint-config.xml</param-value>
</context-param>
16 years, 8 months
JBossWS SVN: r4569 - stack/native/trunk/ant-import-tests.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-09-17 08:37:19 -0400 (Mon, 17 Sep 2007)
New Revision: 4569
Modified:
stack/native/trunk/ant-import-tests/build-testsuite.xml
Log:
Resurrect wsprovide for wssecurity tests
Modified: stack/native/trunk/ant-import-tests/build-testsuite.xml
===================================================================
--- stack/native/trunk/ant-import-tests/build-testsuite.xml 2007-09-14 16:46:25 UTC (rev 4568)
+++ stack/native/trunk/ant-import-tests/build-testsuite.xml 2007-09-17 12:37:19 UTC (rev 4569)
@@ -177,8 +177,8 @@
<classpath location="${tests.output.dir}/resources/jaxws/samples/wssecurityAnnotatedpolicy"/>
</taskdef>
- <!--wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurity" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean"/>
- <wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurityAnnotatedpolicy" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy.HelloJavaBean"/-->
+ <wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurity" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean"/>
+ <wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurityAnnotatedpolicy" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy.HelloJavaBean"/>
</target>
<target name="tests-compile-generated-resources" depends="servicegen,wstools,wsprovide">
16 years, 8 months
JBossWS SVN: r4568 - stack/native/trunk/src/main/java/org/jboss/ws/tools.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-09-14 12:46:25 -0400 (Fri, 14 Sep 2007)
New Revision: 4568
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java
Log:
[JBWS-1810] In wstools use String.replace(char,char) instead of String.replace(CharSequence,CharSequence).
Modified: stack/native/trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-09-14 16:41:42 UTC (rev 4567)
+++ stack/native/trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-09-14 16:46:25 UTC (rev 4568)
@@ -797,7 +797,7 @@
private File getLocationForJavaGeneration()
{
- return new File(this.directoryToGenerate + "/" + seiPkgName.replace(".", "/"));
+ return new File(this.directoryToGenerate + "/" + seiPkgName.replace('.', '/'));
}
private void generateJavaSource(XSComplexTypeDefinition xt, JBossXSModel xsmodel, String containingElement) throws IOException
16 years, 8 months
JBossWS SVN: r4567 - stack/native/branches/native-2.0.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-09-14 12:41:42 -0400 (Fri, 14 Sep 2007)
New Revision: 4567
Modified:
stack/native/branches/native-2.0/mergeinfo.txt
Log:
[JBWS-1810] In wstools use String.replace(char,char) instead of String.replace(CharSequence,CharSequence).
Modified: stack/native/branches/native-2.0/mergeinfo.txt
===================================================================
--- stack/native/branches/native-2.0/mergeinfo.txt 2007-09-14 16:40:59 UTC (rev 4566)
+++ stack/native/branches/native-2.0/mergeinfo.txt 2007-09-14 16:41:42 UTC (rev 4567)
@@ -53,3 +53,6 @@
darran.lofthouse(a)jboss.com 11-September-2007
svn merge -r4542:4543 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0
+
+darran.lofthouse(a)jboss.com 14-September-2007
+svn merge -r4565:4566 https://svn.jboss.org/repos/jbossws/stack/native/branches/native-2.0
16 years, 8 months
JBossWS SVN: r4566 - stack/native/branches/native-2.0/src/main/java/org/jboss/ws/tools.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-09-14 12:40:59 -0400 (Fri, 14 Sep 2007)
New Revision: 4566
Modified:
stack/native/branches/native-2.0/src/main/java/org/jboss/ws/tools/WSDLToJava.java
Log:
[JBWS-1810] In wstools use String.replace(char,char) instead of String.replace(CharSequence,CharSequence).
Modified: stack/native/branches/native-2.0/src/main/java/org/jboss/ws/tools/WSDLToJava.java
===================================================================
--- stack/native/branches/native-2.0/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-09-14 16:35:27 UTC (rev 4565)
+++ stack/native/branches/native-2.0/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-09-14 16:40:59 UTC (rev 4566)
@@ -797,7 +797,7 @@
private File getLocationForJavaGeneration()
{
- return new File(this.directoryToGenerate + "/" + seiPkgName.replace(".", "/"));
+ return new File(this.directoryToGenerate + "/" + seiPkgName.replace('.', '/'));
}
private void generateJavaSource(XSComplexTypeDefinition xt, JBossXSModel xsmodel, String containingElement) throws IOException
16 years, 8 months
JBossWS SVN: r4565 - legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-core/src/java/org/jboss/ws/tools.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-09-14 12:35:27 -0400 (Fri, 14 Sep 2007)
New Revision: 4565
Modified:
legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java
Log:
[JBWS-1788] In wstools use String.replace(char,char) instead of String.replace(CharSequence,CharSequence).
Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java 2007-09-14 10:23:30 UTC (rev 4564)
+++ legacy/branches/jbossws-1.2.1.GA_JBWS-1788/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java 2007-09-14 16:35:27 UTC (rev 4565)
@@ -797,7 +797,7 @@
private File getLocationForJavaGeneration()
{
- return new File(this.directoryToGenerate + "/" + seiPkgName.replace(".", "/"));
+ return new File(this.directoryToGenerate + "/" + seiPkgName.replace('.', '/'));
}
private void generateJavaSource(XSComplexTypeDefinition xt, JBossXSModel xsmodel, String containingElement) throws IOException
16 years, 8 months
JBossWS SVN: r4564 - in stack/native/branches/ropalka/trunk: src/test/java/org/jboss/test/ws/jaxws/wsrm and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-09-14 06:23:30 -0400 (Fri, 14 Sep 2007)
New Revision: 4564
Added:
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/wsrm11_exactly_one_in_order.xml
Modified:
stack/native/branches/ropalka/trunk/ant-import-tests/build-jars-jaxws.xml
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/ReqResServiceImpl.java
Log:
associating RM-Policy with tested wsdls
Modified: stack/native/branches/ropalka/trunk/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- stack/native/branches/ropalka/trunk/ant-import-tests/build-jars-jaxws.xml 2007-09-14 10:05:45 UTC (rev 4563)
+++ stack/native/branches/ropalka/trunk/ant-import-tests/build-jars-jaxws.xml 2007-09-14 10:23:30 UTC (rev 4564)
@@ -484,6 +484,9 @@
<include name="org/jboss/test/ws/jaxws/wsrm/ReqResServiceIface.class"/>
<include name="org/jboss/test/ws/jaxws/wsrm/ReqResServiceImpl.class"/>
</classes>
+ <metainf dir="${tests.output.dir}/resources/jaxws/wsrm">
+ <include name="wsrm11_exactly_one_in_order.xml"/>
+ </metainf>
</war>
<!-- Please add alphabetically -->
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-14 10:05:45 UTC (rev 4563)
+++ stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/OneWayServiceImpl.java 2007-09-14 10:23:30 UTC (rev 4564)
@@ -2,13 +2,26 @@
import javax.jws.WebService;
import org.jboss.logging.Logger;
+import org.jboss.ws.extensions.policy.PolicyScopeLevel;
+import org.jboss.ws.extensions.policy.annotation.Policy;
+import org.jboss.ws.extensions.policy.annotation.PolicyAttachment;
+
import java.util.Arrays;
-@WebService(
+@WebService
+(
name = "OneWay",
serviceName = "OneWayService",
endpointInterface = "org.jboss.test.ws.jaxws.wsrm.OneWayServiceIface"
)
+@PolicyAttachment
+(
+ @Policy
+ (
+ policyFileLocation = "META-INF/wsrm11_exactly_one_in_order.xml",
+ scope = PolicyScopeLevel.WSDL_BINDING
+ )
+)
public class OneWayServiceImpl implements OneWayServiceIface
{
private Logger log = Logger.getLogger(OneWayServiceImpl.class);
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-14 10:05:45 UTC (rev 4563)
+++ stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceImpl.java 2007-09-14 10:23:30 UTC (rev 4564)
@@ -8,13 +8,28 @@
import javax.jws.soap.SOAPBinding.Style;
import org.jboss.logging.Logger;
+import org.jboss.ws.extensions.policy.PolicyScopeLevel;
+import org.jboss.ws.extensions.policy.annotation.Policy;
+import org.jboss.ws.extensions.policy.annotation.PolicyAttachment;
-@WebService(
+@WebService
+(
name = "ReqRes",
serviceName = "ReqResService",
targetNamespace = "http://org.jboss.ws/jaxws/wsrm"
)
-@SOAPBinding(style = Style.RPC)
+@SOAPBinding
+(
+ style = Style.RPC
+)
+@PolicyAttachment
+(
+ @Policy
+ (
+ policyFileLocation = "META-INF/wsrm11_exactly_one_in_order.xml",
+ scope = PolicyScopeLevel.WSDL_BINDING
+ )
+)
public class ReqResServiceImpl
{
private static Logger log = Logger.getLogger(ReqResServiceImpl.class);
Added: stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/wsrm11_exactly_one_in_order.xml
===================================================================
--- stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/wsrm11_exactly_one_in_order.xml (rev 0)
+++ stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/wsrm11_exactly_one_in_order.xml 2007-09-14 10:23:30 UTC (rev 4564)
@@ -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-wssecurity-utilit...">
+ <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/wsrm11_exactly_one_in_order.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 8 months
JBossWS SVN: r4563 - stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wspolicy.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-09-14 06:05:45 -0400 (Fri, 14 Sep 2007)
New Revision: 4563
Modified:
stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyDeployerTestCase.java
stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java
Log:
reparing test to use repaired generics
Modified: stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyDeployerTestCase.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyDeployerTestCase.java 2007-09-14 10:04:23 UTC (rev 4562)
+++ stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyDeployerTestCase.java 2007-09-14 10:05:45 UTC (rev 4563)
@@ -32,8 +32,9 @@
import org.apache.ws.policy.XorCompositeAssertion;
import org.jboss.ws.WSException;
import org.jboss.ws.extensions.policy.deployer.PolicyDeployer;
+import org.jboss.ws.extensions.policy.deployer.domainAssertion.AssertionDeployer;
import org.jboss.ws.extensions.policy.deployer.domainAssertion.NopAssertionDeployer;
-import org.jboss.ws.extensions.policy.deployer.exceptions.UnsupportedPolicy;
+import org.jboss.ws.extensions.policy.deployer.exceptions.UnsupportedPolicyException;
import org.jboss.wsf.test.JBossWSTest;
/**
@@ -46,7 +47,7 @@
public void testDeployEmptyPolicy() throws Exception
{
- Map<String,Class> map = new HashMap<String,Class>();
+ Map<String,Class<? extends AssertionDeployer>> map = new HashMap<String,Class<? extends AssertionDeployer>>();
map.put("http://www.jboss.com/test/policy", NopAssertionDeployer.class);
PolicyDeployer deployer = PolicyDeployer.newInstance(map);
try
@@ -64,7 +65,7 @@
public void testDeploySingleAssertion() throws Exception
{
- Map<String,Class> map = new HashMap<String,Class>();
+ Map<String,Class<? extends AssertionDeployer>> map = new HashMap<String,Class<? extends AssertionDeployer>>();
map.put("http://www.jboss.com/test/policy", NopAssertionDeployer.class);
PolicyDeployer deployer = PolicyDeployer.newInstance(map);
Policy policy = new Policy("myID");
@@ -79,7 +80,7 @@
deployer.deployServerside(policy, null);
fail("deployServerSide shouldn't be able to deploy this policy!");
}
- catch (UnsupportedPolicy up)
+ catch (UnsupportedPolicyException up)
{
//OK
}
@@ -87,7 +88,7 @@
public void testDeployMultipleAssertion() throws Exception
{
- Map<String,Class> map = new HashMap<String,Class>();
+ Map<String,Class<? extends AssertionDeployer>> map = new HashMap<String,Class<? extends AssertionDeployer>>();
map.put("http://www.jboss.com/test/policy", NopAssertionDeployer.class);
map.put("http://www.jboss.com/test/policy2", NopAssertionDeployer.class);
map.put("http://www.jboss.com/test/policy3", NopAssertionDeployer.class);
@@ -103,7 +104,7 @@
deployer.deployServerside(policy, null);
fail("deployServerSide shouldn't be able to deploy this policy!");
}
- catch (UnsupportedPolicy up)
+ catch (UnsupportedPolicyException up)
{
//OK
}
@@ -111,7 +112,7 @@
public void testDeployMultipleAlternative() throws Exception
{
- Map<String,Class> map = new HashMap<String,Class>();
+ Map<String,Class<? extends AssertionDeployer>> map = new HashMap<String,Class<? extends AssertionDeployer>>();
map.put("http://www.jboss.com/test/policy", NopAssertionDeployer.class);
map.put("http://www.jboss.com/test/policy2", NopAssertionDeployer.class);
PolicyDeployer deployer = PolicyDeployer.newInstance(map);
@@ -135,7 +136,7 @@
deployer.deployServerside(policy, null);
fail("deployServerSide shouldn't be able to deploy this policy (no alternative supported)!");
}
- catch (UnsupportedPolicy up)
+ catch (UnsupportedPolicyException up)
{
//OK
}
@@ -143,7 +144,7 @@
public void testDeployMultipleComplexAlternative() throws Exception
{
- Map<String,Class> map = new HashMap<String,Class>();
+ Map<String,Class<? extends AssertionDeployer>> map = new HashMap<String,Class<? extends AssertionDeployer>>();
map.put("http://www.jboss.com/test/policy", NopAssertionDeployer.class);
map.put("http://www.jboss.com/test/policy2", NopAssertionDeployer.class);
map.put("http://www.jboss.com/test/policy3", NopAssertionDeployer.class);
@@ -171,7 +172,7 @@
deployer.deployServerside(policy, null);
fail("deployServerSide shouldn't be able to deploy this policy (no alternative supported)!");
}
- catch (UnsupportedPolicy up)
+ catch (UnsupportedPolicyException up)
{
//OK
}
Modified: stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java 2007-09-14 10:04:23 UTC (rev 4562)
+++ stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java 2007-09-14 10:05:45 UTC (rev 4563)
@@ -33,6 +33,7 @@
import org.jboss.ws.Constants;
import org.jboss.ws.extensions.policy.PolicyScopeLevel;
import org.jboss.ws.extensions.policy.deployer.PolicyDeployer;
+import org.jboss.ws.extensions.policy.deployer.domainAssertion.AssertionDeployer;
import org.jboss.ws.extensions.policy.deployer.domainAssertion.NopAssertionDeployer;
import org.jboss.ws.extensions.policy.metadata.PolicyMetaDataBuilder;
import org.jboss.ws.extensions.policy.metadata.PolicyMetaExtension;
@@ -65,7 +66,7 @@
QName portTypeName = new QName("http://org.jboss.ws/jaxws/endpoint", "EndpointInterface");
EndpointMetaData epMetaData = new ServerEndpointMetaData(serviceMetaData, null, portName, portTypeName, Type.JAXWS);
- Map<String, Class> map = new HashMap<String, Class>();
+ Map<String, Class<? extends AssertionDeployer>> map = new HashMap<String, Class<? extends AssertionDeployer>>();
map.put("http://schemas.xmlsoap.org/ws/2005/02/rm/policy", NopAssertionDeployer.class);
map.put("http://www.fabrikam123.example.com/stock", NopAssertionDeployer.class);
map.put("http://schemas.xmlsoap.org/ws/2005/07/securitypolicy", NopAssertionDeployer.class);
@@ -102,7 +103,7 @@
public void testAnnotationEndpointScopePolicies() throws Exception
{
- Map<String, Class> map = new HashMap<String, Class>();
+ Map<String, Class<? extends AssertionDeployer>> map = new HashMap<String, Class<? extends AssertionDeployer>>();
map.put("http://www.fabrikam123.example.com/stock", NopAssertionDeployer.class);
PolicyDeployer deployer = PolicyDeployer.newInstance(map);
PolicyMetaDataBuilder builder = new PolicyMetaDataBuilder(deployer);
16 years, 8 months