JBossWS SVN: r4582 - stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-09-18 06:43:43 -0400 (Tue, 18 Sep 2007)
New Revision: 4582
Added:
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/DeliveryAssurance.java
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/DeliveryAssuranceFactory.java
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/DeliveryQuality.java
Log:
adding new classes
Added: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/DeliveryAssurance.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/DeliveryAssurance.java (rev 0)
+++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/DeliveryAssurance.java 2007-09-18 10:43:43 UTC (rev 4582)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ws.extensions.wsrm;
+
+/**
+ * Represents message delivery assurance
+ *
+ * @author richard.opalka(a)jboss.com
+ * @see org.jboss.ws.extensions.wsrm.DeliveryAssuranceFactory
+ */
+public interface DeliveryAssurance
+{
+
+ /**
+ * Returns associated message delivery assurance
+ * @return non null delivery assurance object
+ */
+ DeliveryQuality getDeliveryQuality();
+
+ /**
+ * Specifies whether messages are to be delivered in order to the service instance or client proxy
+ * @return <b>true</b> if in order delivery is required, <b>false</b> otherwise
+ */
+ boolean inOrder();
+
+}
Property changes on: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/DeliveryAssurance.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/DeliveryAssuranceFactory.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/DeliveryAssuranceFactory.java (rev 0)
+++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/DeliveryAssuranceFactory.java 2007-09-18 10:43:43 UTC (rev 4582)
@@ -0,0 +1,154 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.ws.extensions.wsrm;
+
+/**
+ * Encapsulates generation of reliable messaging quality assurance configurations
+ *
+ * @author richard.opalka(a)jboss.com
+ * @see org.jboss.ws.extensions.wsrm.DeliveryQuality
+ */
+public final class DeliveryAssuranceFactory
+{
+
+ private static final DeliveryAssuranceFactory INSTANCE = new DeliveryAssuranceFactory();
+ private static final String[] ACCEPTABLE_IN_ORDER_VALUES = { "0", "1", "false", "true" };
+ private static final DeliveryAssurance EXACTLY_ONCE_WITH_ORDER;
+ private static final DeliveryAssurance EXACTLY_ONCE_WITHOUT_ORDER;
+ private static final DeliveryAssurance AT_MOST_ONCE_WITH_ORDER;
+ private static final DeliveryAssurance AT_MOST_ONCE_WITHOUT_ORDER;
+ private static final DeliveryAssurance AT_LEAST_ONCE_WITH_ORDER;
+ private static final DeliveryAssurance AT_LEAST_ONCE_WITHOUT_ORDER;
+
+ static
+ {
+ EXACTLY_ONCE_WITH_ORDER = new DeliveryAssuranceImpl(DeliveryQuality.EXACTLY_ONCE, true);
+ EXACTLY_ONCE_WITHOUT_ORDER = new DeliveryAssuranceImpl(DeliveryQuality.EXACTLY_ONCE, false);
+ AT_MOST_ONCE_WITH_ORDER = new DeliveryAssuranceImpl(DeliveryQuality.AT_MOST_ONCE, true);
+ AT_MOST_ONCE_WITHOUT_ORDER = new DeliveryAssuranceImpl(DeliveryQuality.AT_MOST_ONCE, false);
+ AT_LEAST_ONCE_WITH_ORDER = new DeliveryAssuranceImpl(DeliveryQuality.AT_LEAST_ONCE, true);
+ AT_LEAST_ONCE_WITHOUT_ORDER = new DeliveryAssuranceImpl(DeliveryQuality.AT_LEAST_ONCE, false);
+ }
+
+ // immutable object instance
+ private static final class DeliveryAssuranceImpl implements DeliveryAssurance
+ {
+
+ private final DeliveryQuality quality;
+ private final boolean inOrder;
+
+ private DeliveryAssuranceImpl(DeliveryQuality quality, boolean inOrder)
+ {
+ this.quality = quality;
+ this.inOrder = inOrder;
+ }
+
+ /*
+ * @see org.jboss.ws.extensions.wsrm.DeliveryAssurance#getDeliveryQuality()
+ */
+ public DeliveryQuality getDeliveryQuality()
+ {
+ return quality;
+ }
+
+ /*
+ * @see org.jboss.ws.extensions.wsrm.DeliveryAssurance#inOrder()
+ */
+ public boolean inOrder()
+ {
+ return inOrder;
+ }
+
+ }
+
+ private DeliveryAssuranceFactory()
+ {
+ // no instances
+ }
+
+ /**
+ * Factory getter
+ * @return factory instance
+ */
+ public static DeliveryAssuranceFactory getInstance()
+ {
+ return INSTANCE;
+ }
+
+ /**
+ * Returns constructed DeliveryAssurance object
+ * @param quality string representing quality value
+ * @param inOrder string representing inOrder value
+ * @return DeliveryAssurance object
+ * @throws IllegalArgumentException if <b>quality</b> or <b>inOrder</b> are null or contain incorrect values
+ */
+ public static DeliveryAssurance getDeliveryAssurance(String quality, String inOrder)
+ {
+ if ((quality == null) || (inOrder == null))
+ throw new IllegalArgumentException("Neither quality nor inOrder parameter cannot be null");
+
+ Boolean inOrderBoolean = null;
+ for (int i = 0; i < ACCEPTABLE_IN_ORDER_VALUES.length; i++)
+ {
+ if (ACCEPTABLE_IN_ORDER_VALUES[i].equals(inOrder))
+ {
+ inOrderBoolean = (i % 2 == 0) ? Boolean.FALSE : Boolean.TRUE;
+ break;
+ }
+ }
+
+ if (inOrderBoolean == null)
+ throw new IllegalArgumentException("Incorrect inOrder value: " + inOrder);
+
+ return getDeliveryAssurance(DeliveryQuality.parseDeliveryQuality(quality), inOrderBoolean);
+ }
+
+ /**
+ * Returns constructed DeliveryAssurance object
+ * @param quality object representing required quality
+ * @param inOrder string representing required inOrder value
+ * @return DeliveryAssurance object
+ * @throws IllegalArgumentException if <b>quality</b> is null
+ */
+ public static DeliveryAssurance getDeliveryAssurance(DeliveryQuality quality, boolean inOrder)
+ {
+ if (quality == null)
+ throw new IllegalArgumentException("Quality cannot be null");
+
+ if (inOrder)
+ {
+ if (quality == DeliveryQuality.EXACTLY_ONCE) return EXACTLY_ONCE_WITH_ORDER;
+ if (quality == DeliveryQuality.AT_LEAST_ONCE) return AT_LEAST_ONCE_WITH_ORDER;
+ if (quality == DeliveryQuality.AT_MOST_ONCE) return AT_MOST_ONCE_WITH_ORDER;
+ }
+ else
+ {
+ if (quality == DeliveryQuality.EXACTLY_ONCE) return EXACTLY_ONCE_WITHOUT_ORDER;
+ if (quality == DeliveryQuality.AT_LEAST_ONCE) return AT_LEAST_ONCE_WITHOUT_ORDER;
+ if (quality == DeliveryQuality.AT_MOST_ONCE) return AT_MOST_ONCE_WITHOUT_ORDER;
+ }
+
+ return null; // never happens
+ }
+
+}
Property changes on: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/DeliveryAssuranceFactory.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/DeliveryQuality.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/DeliveryQuality.java (rev 0)
+++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/DeliveryQuality.java 2007-09-18 10:43:43 UTC (rev 4582)
@@ -0,0 +1,89 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ws.extensions.wsrm;
+
+/**
+ * Represents message delivery quality
+ *
+ * @author richard.opalka(a)jboss.com
+ */
+public enum DeliveryQuality
+{
+
+ /**
+ * Each message is to be delivered at most once. The RM Source MAY retry transmission of
+ * unacknowledged messages, but is NOT REQUIRED to do so. The requirement on the RM
+ * Destination is that it MUST filter out duplicate messages, i.e. that it MUST NOT
+ * deliver a duplicate of a message that has already been delivered.
+ */
+ AT_MOST_ONCE("AtMostOnce"),
+
+ /**
+ * Each message is to be delivered exactly once; if a message cannot be delivered then an error
+ * MUST be raised by the RM Source and/or RM Destination. The requirement on an RM Source is
+ * that it SHOULD retry transmission of every message sent by the Application Source until it
+ * receives an acknowledgement from the RM Destination. The requirement on the RM Destination
+ * is that it SHOULD retry the transfer to the Application Destination of any message that it
+ * accepts from the RM Source until that message has been successfully delivered, and that it
+ * MUST NOT deliver a duplicate of a message that has already been delivered.
+ */
+ AT_LEAST_ONCE("AtLeastOnce"),
+
+ /**
+ * Each message is to be delivered at least once, or else an error MUST be raised by the RM
+ * Source and/or RM Destination. The requirement on an RM Source is that it SHOULD retry
+ * transmission of every message sent by the Application Source until it receives an
+ * acknowledgement from the RM Destination. The requirement on the RM Destination is that it
+ * SHOULD retry the transfer to the Application Destination of any message that it accepts
+ * from the RM Source, until that message has been successfully delivered. There is no
+ * requirement for the RM Destination to apply duplicate message filtering.
+ */
+ EXACTLY_ONCE("ExactlyOnce");
+
+ // associated string representation
+ private final String quality;
+
+ DeliveryQuality(String quality)
+ {
+ this.quality = quality;
+ }
+
+ /**
+ * Returns associated constant with passed <b>quality</b> string. Note this method is case sensitive.
+ * Allowed values are: <b>AtMostOnce</b>, <b>AtLeastOnce</b>, <b>ExactlyOnce</b>.
+ * @param quality to be parsed
+ * @return associated constant
+ * @throws IllegalArgumentException if <b>quality</b> string has no associated enumeration value
+ */
+ public static DeliveryQuality parseDeliveryQuality(String quality)
+ {
+ if (AT_MOST_ONCE.quality.equals(quality))
+ return AT_MOST_ONCE;
+ if (AT_LEAST_ONCE.quality.equals(quality))
+ return AT_LEAST_ONCE;
+ if (EXACTLY_ONCE.quality.equals(quality))
+ return EXACTLY_ONCE;
+
+ throw new IllegalArgumentException("Unrecognized string: " + quality);
+ }
+
+}
Property changes on: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/DeliveryQuality.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 8 months
JBossWS SVN: r4581 - spi/tags.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-09-18 06:35:12 -0400 (Tue, 18 Sep 2007)
New Revision: 4581
Added:
spi/tags/jbossws-spi-1.0.0.GA_SP1/
Log:
Release tag
Copied: spi/tags/jbossws-spi-1.0.0.GA_SP1 (from rev 4580, spi/trunk)
16 years, 8 months
JBossWS SVN: r4580 - container/jboss42/tags.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-09-18 06:32:01 -0400 (Tue, 18 Sep 2007)
New Revision: 4580
Added:
container/jboss42/tags/jbossws-jboss42-2.0.0.GA_SP1/
Log:
Release tag
Copied: container/jboss42/tags/jbossws-jboss42-2.0.0.GA_SP1 (from rev 4579, container/jboss42/branches/jboss42-2.0.0)
16 years, 8 months
JBossWS SVN: r4579 - in container/jboss42/branches/jboss42-2.0.0: src/main/java/org/jboss/wsf/container/jboss42 and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-09-18 06:28:27 -0400 (Tue, 18 Sep 2007)
New Revision: 4579
Added:
container/jboss42/branches/jboss42-2.0.0/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java
Modified:
container/jboss42/branches/jboss42-2.0.0/version.properties
Log:
Provide backwards compatibility with ESB 4.2
Added: container/jboss42/branches/jboss42-2.0.0/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java
===================================================================
--- container/jboss42/branches/jboss42-2.0.0/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java (rev 0)
+++ container/jboss42/branches/jboss42-2.0.0/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java 2007-09-18 10:28:27 UTC (rev 4579)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.container.jboss42;
+
+// $Id$
+
+import org.jboss.deployment.DeploymentInfo;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
+import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData;
+
+/**
+ * Build container independent web meta data
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 05-May-2006
+ */
+@Deprecated
+public class WebMetaDataAdapter extends JSEArchiveMetaDataAdapter
+{
+ public UnifiedWebMetaData buildUnifiedWebMetaData(Deployment dep, UnifiedDeploymentInfo udi, DeploymentInfo di)
+ {
+ throw new IllegalArgumentException("This class should not be executed. It just offers API backwards compatibility");
+ }
+
+}
Property changes on: container/jboss42/branches/jboss42-2.0.0/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: container/jboss42/branches/jboss42-2.0.0/version.properties
===================================================================
--- container/jboss42/branches/jboss42-2.0.0/version.properties 2007-09-18 10:25:55 UTC (rev 4578)
+++ container/jboss42/branches/jboss42-2.0.0/version.properties 2007-09-18 10:28:27 UTC (rev 4579)
@@ -5,8 +5,8 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-2.0
-version.id=2.0.1.GA
-repository.id=2.0.1.GA
+version.id=2.0.1.GA_SP1
+repository.id=2.0.1.GA_SP1
implementation.title=JBoss Web Services - Integration JBoss42
implementation.url=http://www.jboss.org/products/jbossws
@@ -15,9 +15,9 @@
# Thirdparty library versions
jbossws-common=1.0.0.GA
-jbossws-spi=1.0.0.GA
+jbossws-spi=1.0.0.GA_SP1
jbossws-framework=2.0.1.GA
dom4j=1.6.1
sun-jaxrpc=1.1
-sun-jaxws=2.1.1
\ No newline at end of file
+sun-jaxws=2.1.1
16 years, 8 months
JBossWS SVN: r4578 - container/jboss42/branches.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-09-18 06:25:55 -0400 (Tue, 18 Sep 2007)
New Revision: 4578
Added:
container/jboss42/branches/jboss42-2.0.0/
Log:
service pack branch
Copied: container/jboss42/branches/jboss42-2.0.0 (from rev 4577, container/jboss42/trunk)
16 years, 8 months
JBossWS SVN: r4577 - stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/metadata/wsse.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-09-18 04:18:50 -0400 (Tue, 18 Sep 2007)
New Revision: 4577
Modified:
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityOMFactory.java
Log:
fixing security issue - static constants must be final + fixing generics warnings
Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityOMFactory.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityOMFactory.java 2007-09-17 14:05:07 UTC (rev 4576)
+++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityOMFactory.java 2007-09-18 08:18:50 UTC (rev 4577)
@@ -47,11 +47,11 @@
public class WSSecurityOMFactory implements ObjectModelFactory
{
- public static String SERVER_RESOURCE_NAME = "jboss-wsse-server.xml";
+ public static final String SERVER_RESOURCE_NAME = "jboss-wsse-server.xml";
- public static String CLIENT_RESOURCE_NAME = "jboss-wsse-client.xml";
+ public static final String CLIENT_RESOURCE_NAME = "jboss-wsse-client.xml";
- private static HashMap options = new HashMap(6);
+ private static HashMap<String, String> options = new HashMap<String, String>(6);
static
{
@@ -143,7 +143,7 @@
public void setValue(WSSecurityConfiguration configuration, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
{
log.trace("setValue: [obj=" + configuration + ",value=" + value + "]");
- String method = (String)options.get(localName);
+ String method = options.get(localName);
if (method == null)
return;
@@ -170,7 +170,7 @@
}
if ("key-passwords".equals(localName))
{
- HashMap pwds = new HashMap();
+ HashMap<String, String> pwds = new HashMap<String, String>();
configuration.setKeyPasswords(pwds);
return pwds;
}
@@ -184,7 +184,7 @@
/**
* Called when parsing the contents of the <key-password> tag.
*/
- public Object newChild(HashMap passwords, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
+ public Object newChild(HashMap<String, String> passwords, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
log.trace("newChild: " + localName);
if ("key-password".equals(localName))
16 years, 8 months
JBossWS SVN: r4576 - stack/native/branches/ropalka/trunk/ant-import-tests.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-09-17 10:05:07 -0400 (Mon, 17 Sep 2007)
New Revision: 4576
Modified:
stack/native/branches/ropalka/trunk/ant-import-tests/build-jars-jaxws.xml
Log:
fix
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-17 14:02:21 UTC (rev 4575)
+++ stack/native/branches/ropalka/trunk/ant-import-tests/build-jars-jaxws.xml 2007-09-17 14:05:07 UTC (rev 4576)
@@ -484,9 +484,6 @@
<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>
<webinf dir="${tests.output.dir}/resources/jaxws/wsrm/WEB-INF">
<include name="jboss-wsrm-server.xml"/>
<include name="wsrm11_exactly_one_in_order.xml"/>
16 years, 8 months
JBossWS SVN: r4575 - in stack/native/branches/ropalka/trunk: src/test/java/org/jboss/test/ws/jaxws/wsrm and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-09-17 10:02:21 -0400 (Mon, 17 Sep 2007)
New Revision: 4575
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:
refactoring
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-17 13:39:32 UTC (rev 4574)
+++ stack/native/branches/ropalka/trunk/ant-import-tests/build-jars-jaxws.xml 2007-09-17 14:02:21 UTC (rev 4575)
@@ -487,6 +487,10 @@
<metainf dir="${tests.output.dir}/resources/jaxws/wsrm">
<include name="wsrm11_exactly_one_in_order.xml"/>
</metainf>
+ <webinf dir="${tests.output.dir}/resources/jaxws/wsrm/WEB-INF">
+ <include name="jboss-wsrm-server.xml"/>
+ <include name="wsrm11_exactly_one_in_order.xml"/>
+ </webinf>
</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-17 13:39:32 UTC (rev 4574)
+++ stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/OneWayServiceImpl.java 2007-09-17 14:02:21 UTC (rev 4575)
@@ -18,7 +18,7 @@
(
@Policy
(
- policyFileLocation = "META-INF/wsrm11_exactly_one_in_order.xml",
+ policyFileLocation = "WEB-INF/wsrm11_exactly_one_in_order.xml",
scope = PolicyScopeLevel.WSDL_BINDING
)
)
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-17 13:39:32 UTC (rev 4574)
+++ stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceImpl.java 2007-09-17 14:02:21 UTC (rev 4575)
@@ -26,7 +26,7 @@
(
@Policy
(
- policyFileLocation = "META-INF/wsrm11_exactly_one_in_order.xml",
+ policyFileLocation = "WEB-INF/wsrm11_exactly_one_in_order.xml",
scope = PolicyScopeLevel.WSDL_BINDING
)
)
16 years, 8 months
JBossWS SVN: r4574 - in stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm: META-INF and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-09-17 09:39:32 -0400 (Mon, 17 Sep 2007)
New Revision: 4574
Added:
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/META-INF/
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/META-INF/jboss-wsrm-client.xml
Log:
adding client side wsrm configuration
Added: 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 (rev 0)
+++ stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/META-INF/jboss-wsrm-client.xml 2007-09-17 13:39:32 UTC (rev 4574)
@@ -0,0 +1,19 @@
+<?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>
Property changes on: stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/META-INF/jboss-wsrm-client.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 8 months
JBossWS SVN: r4573 - in stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm: WEB-INF and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-09-17 09:35:51 -0400 (Mon, 17 Sep 2007)
New Revision: 4573
Added:
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
Removed:
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/wsrm11_exactly_one_in_order.xml
Log:
refactoring + adding wsrm server side configuration file
Added: 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 (rev 0)
+++ stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/WEB-INF/jboss-wsrm-server.xml 2007-09-17 13:35:51 UTC (rev 4573)
@@ -0,0 +1,19 @@
+<?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>
Property changes on: stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/WEB-INF/jboss-wsrm-server.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: 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 (rev 0)
+++ stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm11_exactly_one_in_order.xml 2007-09-17 13:35:51 UTC (rev 4573)
@@ -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/WEB-INF/wsrm11_exactly_one_in_order.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: 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 2007-09-17 13:28:24 UTC (rev 4572)
+++ stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/wsrm11_exactly_one_in_order.xml 2007-09-17 13:35:51 UTC (rev 4573)
@@ -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-wssecurity-utilit...">
- <wsrmp:DeliveryAssurance>
- <wsp:Policy>
- <wsrmp:ExactlyOnce/>
- <wsrmp:InOrder/>
- </wsp:Policy>
- </wsrmp:DeliveryAssurance>
-</wsp:Policy>
16 years, 8 months