JBossWS SVN: r5336 - container/jboss40/tags.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-12-17 10:42:15 -0500 (Mon, 17 Dec 2007)
New Revision: 5336
Removed:
container/jboss40/tags/jbossws-jboss-4.0.5.SP2/
Log:
Undo SP2
17 years, 1 month
- 1
- 0
JBossWS SVN: r5335 - container/jboss40/tags/jbossws-jboss-4.0.5.SP1.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-12-17 10:29:00 -0500 (Mon, 17 Dec 2007)
New Revision: 5335
Modified:
container/jboss40/tags/jbossws-jboss-4.0.5.SP1/version.properties
Log:
Update version props
Modified: container/jboss40/tags/jbossws-jboss-4.0.5.SP1/version.properties
===================================================================
--- container/jboss40/tags/jbossws-jboss-4.0.5.SP1/version.properties 2007-12-17 15:11:37 UTC (rev 5334)
+++ container/jboss40/tags/jbossws-jboss-4.0.5.SP1/version.properties 2007-12-17 15:29:00 UTC (rev 5335)
@@ -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=4.0.5.SP1
+repository.id=4.0.5.SP1
implementation.title=JBoss Web Services - Integration JBoss40
implementation.url=http://www.jboss.org/products/jbossws
17 years, 1 month
- 1
- 0
JBossWS SVN: r5334 - framework/trunk.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-12-17 10:11:37 -0500 (Mon, 17 Dec 2007)
New Revision: 5334
Modified:
framework/trunk/.classpath
Log:
Use common,spi project instead of binaries
Modified: framework/trunk/.classpath
===================================================================
--- framework/trunk/.classpath 2007-12-17 14:56:31 UTC (rev 5333)
+++ framework/trunk/.classpath 2007-12-17 15:11:37 UTC (rev 5334)
@@ -14,7 +14,7 @@
<classpathentry kind="lib" path="thirdparty/saaj-api.jar"/>
<classpathentry kind="lib" path="thirdparty/activation.jar"/>
<classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/>
- <classpathentry kind="lib" path="thirdparty/jbossws-common.jar"/>
- <classpathentry kind="lib" path="thirdparty/jbossws-spi.jar" sourcepath="thirdparty/jbossws-spi-src.zip"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/common"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/spi"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
17 years, 1 month
- 1
- 0
JBossWS SVN: r5333 - container/jboss40/tags.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-12-17 09:56:31 -0500 (Mon, 17 Dec 2007)
New Revision: 5333
Added:
container/jboss40/tags/jbossws-jboss-4.0.5.SP2/
Log:
Prepare SP2
Copied: container/jboss40/tags/jbossws-jboss-4.0.5.SP2 (from rev 5332, container/jboss40/tags/jbossws-jboss-4.0.5.SP1)
17 years, 1 month
- 1
- 0
JBossWS SVN: r5332 - in framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework: management/recording and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2007-12-17 07:56:13 -0500 (Mon, 17 Dec 2007)
New Revision: 5332
Modified:
framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/invocation/RecordingServerHandler.java
framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/AbstractRecordProcessor.java
framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/LogRecorder.java
framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/ManagedRecordProcessor.java
framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/ManagedRecordProcessorMBean.java
framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordImpl.java
Log:
Update due to previous spi changes
Modified: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/invocation/RecordingServerHandler.java
===================================================================
--- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/invocation/RecordingServerHandler.java 2007-12-17 12:54:45 UTC (rev 5331)
+++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/invocation/RecordingServerHandler.java 2007-12-17 12:56:13 UTC (rev 5332)
@@ -85,12 +85,12 @@
record.setHeaders((Map<String,List<String>>)(ctx.get(MessageContext.HTTP_REQUEST_HEADERS)));
record.setMessageType(MessageType.INBOUND);
record.setOperation((QName)ctx.get(MessageContext.WSDL_OPERATION));
- boolean processMessage = false;
- for (Iterator<RecordProcessor> it = endpoint.getRecordProcessors().iterator(); it.hasNext() && !processMessage; )
+ boolean processEnvelope = false;
+ for (Iterator<RecordProcessor> it = endpoint.getRecordProcessors().iterator(); it.hasNext() && !processEnvelope; )
{
- processMessage = it.next().isProcessMessage();
+ processEnvelope = it.next().isProcessEnvelope();
}
- if (processMessage) //skip message processing if not required since it's very time-consuming
+ if (processEnvelope) //skip message processing if not required since it's very time-consuming
{
SOAPMessageContext soapCtx = (SOAPMessageContext)ctx;
try
@@ -123,12 +123,12 @@
record.setHeaders((Map<String,List<String>>)(ctx.get(MessageContext.HTTP_RESPONSE_HEADERS)));
record.setMessageType(MessageType.OUTBOUND);
record.setOperation((QName)ctx.get(MessageContext.WSDL_OPERATION));
- boolean processMessage = false;
- for (Iterator<RecordProcessor> it = endpoint.getRecordProcessors().iterator(); it.hasNext() && !processMessage; )
+ boolean processEnvelope = false;
+ for (Iterator<RecordProcessor> it = endpoint.getRecordProcessors().iterator(); it.hasNext() && !processEnvelope; )
{
- processMessage = it.next().isProcessMessage();
+ processEnvelope = it.next().isProcessEnvelope();
}
- if (processMessage) //skip message processing if not required since it's very time-consuming
+ if (processEnvelope) //skip message processing if not required since it's very time-consuming
{
SOAPMessageContext soapCtx = (SOAPMessageContext)ctx;
try
Modified: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/AbstractRecordProcessor.java
===================================================================
--- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/AbstractRecordProcessor.java 2007-12-17 12:54:45 UTC (rev 5331)
+++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/AbstractRecordProcessor.java 2007-12-17 12:56:13 UTC (rev 5332)
@@ -44,7 +44,7 @@
protected boolean processDestinationHost = true;
protected boolean processSourceHost = true;
protected boolean processHeaders = true;
- protected boolean processMessage = true;
+ protected boolean processEnvelope = true;
protected boolean processMessageType = true;
protected boolean processOperation = true;
protected boolean processDate = true;
@@ -108,14 +108,14 @@
this.processHeaders = processHeaders;
}
- public boolean isProcessMessage()
+ public boolean isProcessEnvelope()
{
- return processMessage;
+ return processEnvelope;
}
- public void setProcessMessage(boolean processMessage)
+ public void setProcessEnvelope(boolean processEnvelope)
{
- this.processMessage = processMessage;
+ this.processEnvelope = processEnvelope;
}
public boolean isProcessMessageType()
@@ -170,8 +170,8 @@
sb.append(processSourceHost);
sb.append(", processHeaders = ");
sb.append(processHeaders);
- sb.append(", processMessage = ");
- sb.append(processMessage);
+ sb.append(", processEnvelope = ");
+ sb.append(processEnvelope);
sb.append(", processMessageType = ");
sb.append(processMessageType);
sb.append(", processOperation = ");
Modified: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/LogRecorder.java
===================================================================
--- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/LogRecorder.java 2007-12-17 12:54:45 UTC (rev 5331)
+++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/LogRecorder.java 2007-12-17 12:56:13 UTC (rev 5332)
@@ -23,8 +23,6 @@
//$Id$
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
import java.util.List;
import java.util.Map;
@@ -115,23 +113,8 @@
sb.append("\n");
}
sb.append("\n");
- if (this.isProcessMessage())
+ if (this.isProcessEnvelope())
{
- if (record.getPayload() != null)
- {
- try
- {
- ByteArrayOutputStream out = new ByteArrayOutputStream(1024);
- out.write(record.getPayload());
- out.close();
- sb.append(out.toString()); //improve this...
- sb.append("\n");
- }
- catch (IOException e)
- {
- log.warn("Error while writing the payload!");
- }
- }
sb.append(record.getEnvelope());
}
log.debug(sb.toString());
Modified: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/ManagedRecordProcessor.java
===================================================================
--- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/ManagedRecordProcessor.java 2007-12-17 12:54:45 UTC (rev 5331)
+++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/ManagedRecordProcessor.java 2007-12-17 12:56:13 UTC (rev 5332)
@@ -69,9 +69,9 @@
return processor.isProcessHeaders();
}
- public boolean isProcessMessage()
+ public boolean isProcessEnvelope()
{
- return processor.isProcessMessage();
+ return processor.isProcessEnvelope();
}
public boolean isProcessMessageType()
@@ -114,9 +114,9 @@
processor.setProcessHeaders(value);
}
- public void setProcessMessage(boolean value)
+ public void setProcessEnvelope(boolean value)
{
- processor.setProcessMessage(value);
+ processor.setProcessEnvelope(value);
}
public void setProcessMessageType(boolean value)
Modified: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/ManagedRecordProcessorMBean.java
===================================================================
--- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/ManagedRecordProcessorMBean.java 2007-12-17 12:54:45 UTC (rev 5331)
+++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/ManagedRecordProcessorMBean.java 2007-12-17 12:56:13 UTC (rev 5332)
@@ -60,9 +60,9 @@
public void setProcessMessageType(boolean value);
- public boolean isProcessMessage();
+ public boolean isProcessEnvelope();
- public void setProcessMessage(boolean value);
+ public void setProcessEnvelope(boolean value);
public boolean isProcessHeaders();
Modified: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordImpl.java
===================================================================
--- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordImpl.java 2007-12-17 12:54:45 UTC (rev 5331)
+++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/recording/RecordImpl.java 2007-12-17 12:56:13 UTC (rev 5332)
@@ -43,7 +43,6 @@
private String sourceHost;
private String destinationHost;
private Map<String, List<String>> headers = new HashMap<String, List<String>>();
- private byte[] payload;
private MessageType messageType;
private QName operation;
private String groupID;
@@ -66,21 +65,11 @@
return messageType;
}
- public byte[] getPayload()
- {
- return payload;
- }
-
public void setMessageType(MessageType messageType)
{
this.messageType = messageType;
}
- public void setPayload(byte[] payload)
- {
- this.payload = payload;
- }
-
public String getSourceHost()
{
return sourceHost;
17 years, 1 month
- 1
- 0
JBossWS SVN: r5331 - spi/branches/asoldano/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2007-12-17 07:54:45 -0500 (Mon, 17 Dec 2007)
New Revision: 5331
Modified:
spi/branches/asoldano/trunk/.project
Log:
Modified: spi/branches/asoldano/trunk/.project
===================================================================
--- spi/branches/asoldano/trunk/.project 2007-12-17 12:53:02 UTC (rev 5330)
+++ spi/branches/asoldano/trunk/.project 2007-12-17 12:54:45 UTC (rev 5331)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>spi-asoldano</name>
+ <name>spi</name>
<comment></comment>
<projects>
</projects>
17 years, 1 month
- 1
- 0
JBossWS SVN: r5330 - in spi/branches/asoldano/trunk: src/main/java/org/jboss/wsf/spi/management/recording and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2007-12-17 07:53:02 -0500 (Mon, 17 Dec 2007)
New Revision: 5330
Modified:
spi/branches/asoldano/trunk/.project
spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/Record.java
spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordProcessor.java
Log:
Code clean up
Modified: spi/branches/asoldano/trunk/.project
===================================================================
--- spi/branches/asoldano/trunk/.project 2007-12-17 11:57:30 UTC (rev 5329)
+++ spi/branches/asoldano/trunk/.project 2007-12-17 12:53:02 UTC (rev 5330)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>spi</name>
+ <name>spi-asoldano</name>
<comment></comment>
<projects>
</projects>
Modified: spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/Record.java
===================================================================
--- spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/Record.java 2007-12-17 11:57:30 UTC (rev 5329)
+++ spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/Record.java 2007-12-17 12:53:02 UTC (rev 5330)
@@ -38,10 +38,20 @@
{
public enum MessageType {INBOUND, OUTBOUND};
+ /**
+ * Gets the group ID corresponding to the current message exchange flow
+ *
+ * @return
+ */
public String getGroupID();
public void setGroupID(String groupID);
+ /**
+ * Gets the date of this record
+ *
+ * @return
+ */
public Date getDate();
public void setDate(Date date);
@@ -73,17 +83,15 @@
public void setMessageType(MessageType type);
+
/**
- * Gets the message payload contents as a byte[].
+ * Gets the SOAP message envelope
*
- * @return the payload
+ * @return
*/
- public byte[] getPayload();
+ public String getEnvelope();
- public void setPayload(byte[] payload);
-
public void setEnvelope(String envelope);
- public String getEnvelope();
/**
* Gets the HTTP headers
Modified: spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordProcessor.java
===================================================================
--- spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordProcessor.java 2007-12-17 11:57:30 UTC (rev 5329)
+++ spi/branches/asoldano/trunk/src/main/java/org/jboss/wsf/spi/management/recording/RecordProcessor.java 2007-12-17 12:53:02 UTC (rev 5330)
@@ -37,7 +37,7 @@
{
public String getName();
- public void setName(String epName);
+ public void setName(String name);
public boolean isRecording();
@@ -63,9 +63,9 @@
public void setProcessMessageType(boolean value);
- public boolean isProcessMessage();
+ public boolean isProcessEnvelope();
- public void setProcessMessage(boolean value);
+ public void setProcessEnvelope(boolean value);
public boolean isProcessHeaders();
17 years, 1 month
- 1
- 0
JBossWS SVN: r5329 - in stack/native/trunk: src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-12-17 06:57:30 -0500 (Mon, 17 Dec 2007)
New Revision: 5329
Added:
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractSecuredOneWayTest.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMSecuredAddressableOneWayTestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMSecuredAnonymousOneWayTestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractSecuredReqResTest.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMSecuredAddressableReqResTestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMSecuredAnonymousReqResTestCase.java
stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/secure/
stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/secure/web.xml
stack/native/trunk/src/test/resources/jaxws/wsrm/properties/RMAbstractSecuredOneWayTest.properties
stack/native/trunk/src/test/resources/jaxws/wsrm/properties/RMAbstractSecuredReqResTest.properties
Modified:
stack/native/trunk/ant-import-tests/build-jars-jaxws.xml
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAddressableOneWayTestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractReqResTest.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAnonymousReqResTestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceIface.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceImpl.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceIface.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceImpl.java
Log:
prepared WS-RM + WS-Security test case (but WS-Security isn't integrated into test yet)
Modified: stack/native/trunk/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2007-12-17 11:07:18 UTC (rev 5328)
+++ stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2007-12-17 11:57:30 UTC (rev 5329)
@@ -669,6 +669,20 @@
</webinf>
</war>
+ <war warfile="${tests.output.dir}/libs/jaxws-secured-wsrm.war"
+ webxml="${tests.output.dir}/resources/jaxws/wsrm/WEB-INF/secure/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceIface.class"/>
+ <include name="org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceIface.class"/>
+ <include name="org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceImpl.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/wsrm/WEB-INF">
+ <include name="wsrm-exactly-once-in-order-policy.xml"/>
+ <include name="wsrm-jaxws-endpoint-config.xml"/>
+ </webinf>
+ </war>
+
<war warfile="${tests.output.dir}/libs/jaxws-wsrm-one-way-emulator.war"
webxml="${tests.output.dir}/resources/jaxws/wsrm/emulator/oneway/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
@@ -695,6 +709,12 @@
</metainf>
</jar>
+ <jar jarfile="${tests.output.dir}/libs/jaxws-secured-wsrm-client.jar">
+ <metainf dir="${tests.output.dir}/resources/jaxws/wsrm/META-INF">
+ <include name="wsrm-jaxws-client-config.xml"/>
+ </metainf>
+ </jar>
+
<!-- Please add alphabetically -->
<antcall target="build-interop-jars"/>
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java 2007-12-17 11:07:18 UTC (rev 5328)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java 2007-12-17 11:57:30 UTC (rev 5329)
@@ -41,7 +41,8 @@
* Reliable JBoss WebService client invoking one way methods
*
* @author richard.opalka(a)jboss.com
- * @since 22-Aug-2007
+ *
+ * @since Aug 22, 2007
*/
public abstract class RMAbstractOneWayTest extends JBossWSTest
{
@@ -93,5 +94,4 @@
}
protected abstract boolean isClientAddressable();
-
}
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractSecuredOneWayTest.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractSecuredOneWayTest.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractSecuredOneWayTest.java 2007-12-17 11:57:30 UTC (rev 5329)
@@ -0,0 +1,98 @@
+/*
+ * 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.test.ws.jaxws.wsrm.oneway;
+
+import static org.jboss.test.ws.jaxws.wsrm.Helper.setAddrProps;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Properties;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import org.jboss.test.ws.jaxws.wsrm.services.SecuredOneWayServiceIface;
+import org.jboss.ws.extensions.wsrm.api.RMProvider;
+import org.jboss.ws.extensions.wsrm.api.RMSequence;
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ * Secure Reliable JBoss WebService client invoking one way methods
+ *
+ * @author richard.opalka(a)jboss.com
+ *
+ * @since Dec 17, 2007
+ */
+public abstract class RMAbstractSecuredOneWayTest extends JBossWSTest
+{
+ private static final Properties props = new Properties();
+ private final String serviceURL = "http://" + getServerHost() + ":" + props.getProperty("port") + props.getProperty("path");
+ private String targetNS = "http://org.jboss.ws/jaxws/wsrm";
+ private SecuredOneWayServiceIface proxy;
+
+ static
+ {
+ try
+ {
+ props.load(
+ new FileInputStream(
+ new File("resources/jaxws/wsrm/properties/RMAbstractSecuredOneWayTest.properties")));
+ }
+ catch (IOException ioe)
+ {
+ ioe.printStackTrace();
+ }
+ }
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ QName serviceName = new QName(targetNS, "SecuredOneWayService");
+ URL wsdlURL = new URL(serviceURL + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ proxy = (SecuredOneWayServiceIface)service.getPort(SecuredOneWayServiceIface.class);
+ // TODO: activate WS-Security
+ }
+
+ public void testOneWayMethods() throws Exception
+ {
+ RMSequence sequence = ((RMProvider)proxy).createSequence(isClientAddressable());
+ setAddrProps(proxy, "http://useless/action1", serviceURL);
+ proxy.method1();
+ setAddrProps(proxy, "http://useless/action2", serviceURL);
+ proxy.method2("Hello World");
+ setAddrProps(proxy, "http://useless/action3", serviceURL);
+ proxy.method3(new String[] {"Hello","World"});
+ sequence.close();
+ }
+
+ public static String getClasspath()
+ {
+ return props.getProperty("archives");
+ }
+
+ protected abstract boolean isClientAddressable();
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractSecuredOneWayTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAddressableOneWayTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAddressableOneWayTestCase.java 2007-12-17 11:07:18 UTC (rev 5328)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAddressableOneWayTestCase.java 2007-12-17 11:57:30 UTC (rev 5329)
@@ -34,7 +34,6 @@
*/
public final class RMAddressableOneWayTestCase extends RMAbstractOneWayTest
{
-
public static Test suite()
{
return new JBossWSTestSetup(RMAddressableOneWayTestCase.class, getClasspath());
@@ -44,5 +43,4 @@
{
return true;
}
-
}
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMSecuredAddressableOneWayTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMSecuredAddressableOneWayTestCase.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMSecuredAddressableOneWayTestCase.java 2007-12-17 11:57:30 UTC (rev 5329)
@@ -0,0 +1,46 @@
+/*
+ * 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.test.ws.jaxws.wsrm.oneway;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * Secured addressable version of one way WS-RM message exchange
+ *
+ * @author richard.opalka(a)jboss.com
+ *
+ * @since Dec 17, 2007
+ */
+public class RMSecuredAddressableOneWayTestCase extends RMAbstractSecuredOneWayTest
+{
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(RMSecuredAddressableOneWayTestCase.class, getClasspath());
+ }
+
+ public final boolean isClientAddressable()
+ {
+ return true;
+ }
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMSecuredAddressableOneWayTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMSecuredAnonymousOneWayTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMSecuredAnonymousOneWayTestCase.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMSecuredAnonymousOneWayTestCase.java 2007-12-17 11:57:30 UTC (rev 5329)
@@ -0,0 +1,46 @@
+/*
+ * 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.test.ws.jaxws.wsrm.oneway;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * Secured anonymous version of one way WS-RM message exchange
+ *
+ * @author richard.opalka(a)jboss.com
+ *
+ * @since Dec 17, 2007
+ */
+public class RMSecuredAnonymousOneWayTestCase extends RMAbstractSecuredOneWayTest
+{
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(RMSecuredAnonymousOneWayTestCase.class, getClasspath());
+ }
+
+ public final boolean isClientAddressable()
+ {
+ return false;
+ }
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMSecuredAnonymousOneWayTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractReqResTest.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractReqResTest.java 2007-12-17 11:07:18 UTC (rev 5328)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractReqResTest.java 2007-12-17 11:57:30 UTC (rev 5329)
@@ -49,7 +49,8 @@
* Reliable JBoss WebService client invoking req/res methods
*
* @author richard.opalka(a)jboss.com
- * @since 22-Aug-2007
+ *
+ * @since Aug 22, 2007
*/
public abstract class RMAbstractReqResTest extends JBossWSTest
{
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractSecuredReqResTest.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractSecuredReqResTest.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractSecuredReqResTest.java 2007-12-17 11:57:30 UTC (rev 5329)
@@ -0,0 +1,189 @@
+/*
+ * 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.test.ws.jaxws.wsrm.reqres;
+
+import static org.jboss.test.ws.jaxws.wsrm.Helper.setAddrProps;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Properties;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Future;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.AsyncHandler;
+import javax.xml.ws.Response;
+import javax.xml.ws.Service;
+
+import org.jboss.test.ws.jaxws.wsrm.services.SecuredReqResServiceIface;
+import org.jboss.ws.extensions.wsrm.api.RMProvider;
+import org.jboss.ws.extensions.wsrm.api.RMSequence;
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ * Secured reliable JBoss WebService client invoking req/res methods
+ *
+ * @author richard.opalka(a)jboss.com
+ *
+ * @since Dec 17, 2007
+ */
+public abstract class RMAbstractSecuredReqResTest extends JBossWSTest
+{
+ private static final String HELLO_WORLD_MSG = "Hello World";
+ private static final String TARGET_NS = "http://org.jboss.ws/jaxws/wsrm";
+ private static final Properties props = new Properties();
+ private final String serviceURL = "http://" + getServerHost() + ":" + props.getProperty("port") + props.getProperty("path");
+ private Exception handlerException;
+ private boolean asyncHandlerCalled;
+ private SecuredReqResServiceIface proxy;
+ private static final TimeUnit testTimeUnit = TimeUnit.SECONDS;
+ private static final long testWaitPeriod = 300L;
+ private static final Executor testExecutor = new ThreadPoolExecutor(
+ 0, 5, testWaitPeriod, testTimeUnit, new SynchronousQueue<Runnable>()
+ );
+
+ static
+ {
+ try
+ {
+ props.load(
+ new FileInputStream(
+ new File("resources/jaxws/wsrm/properties/RMAbstractSecuredReqResTest.properties")));
+ }
+ catch (IOException ioe)
+ {
+ ioe.printStackTrace();
+ }
+ }
+
+ private enum InvocationType
+ {
+ SYNC, ASYNC, ASYNC_FUTURE
+ }
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ if (proxy == null)
+ {
+ QName serviceName = new QName(TARGET_NS, "SecuredReqResService");
+ URL wsdlURL = new URL(serviceURL + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ service.setExecutor(testExecutor);
+ proxy = (SecuredReqResServiceIface)service.getPort(SecuredReqResServiceIface.class);
+ // TODO: activate WS-Security
+ }
+ }
+
+ public void testSynchronousInvocation() throws Exception
+ {
+ doReliableMessageExchange(proxy, InvocationType.SYNC);
+ }
+
+ public void testAsynchronousInvocation() throws Exception
+ {
+ doReliableMessageExchange(proxy, InvocationType.ASYNC);
+ }
+
+ public void testAsynchronousInvocationUsingFuture() throws Exception
+ {
+ doReliableMessageExchange(proxy, InvocationType.ASYNC_FUTURE);
+ }
+
+ private void doSynchronousInvocation() throws Exception
+ {
+ assertEquals(proxy.echo(HELLO_WORLD_MSG), HELLO_WORLD_MSG);
+ }
+
+ private void doAsynchronousInvocation() throws Exception
+ {
+ Response<String> response = proxy.echoAsync(HELLO_WORLD_MSG);
+ assertEquals(response.get(), HELLO_WORLD_MSG); // hidden future pattern
+ }
+
+ private void doAsynchronousInvocationUsingFuture() throws Exception
+ {
+ AsyncHandler<String> handler = new AsyncHandler<String>()
+ {
+ public void handleResponse(Response<String> response)
+ {
+ try
+ {
+ String retStr = (String) response.get(testWaitPeriod, testTimeUnit);
+ assertEquals(HELLO_WORLD_MSG, retStr);
+ asyncHandlerCalled = true;
+ }
+ catch (Exception ex)
+ {
+ handlerException = ex;
+ }
+ }
+ };
+ Future<?> future = proxy.echoAsync(HELLO_WORLD_MSG, handler);
+ future.get(testWaitPeriod, testTimeUnit);
+ ensureAsyncStatus();
+ }
+
+ private void ensureAsyncStatus() throws Exception
+ {
+ if (handlerException != null) throw handlerException;
+ assertTrue("Async handler called", asyncHandlerCalled);
+ handlerException = null;
+ asyncHandlerCalled = false;
+ }
+
+ private void invokeWebServiceMethod(InvocationType invocationType) throws Exception
+ {
+ switch (invocationType) {
+ case SYNC: doSynchronousInvocation(); break;
+ case ASYNC: doAsynchronousInvocation(); break;
+ case ASYNC_FUTURE: doAsynchronousInvocationUsingFuture(); break;
+ default : fail("Unknown invocation type");
+ }
+ }
+
+ private void doReliableMessageExchange(Object proxyObject, InvocationType invocationType) throws Exception
+ {
+ RMSequence sequence = ((RMProvider)proxyObject).createSequence(isClientAddressable());
+ setAddrProps(proxy, "http://useless/action", serviceURL);
+ invokeWebServiceMethod(invocationType);
+ setAddrProps(proxy, "http://useless/action", serviceURL);
+ invokeWebServiceMethod(invocationType);
+ setAddrProps(proxy, "http://useless/action", serviceURL);
+ invokeWebServiceMethod(invocationType);
+ sequence.close();
+ }
+
+ public static String getClasspath()
+ {
+ return props.getProperty("archives");
+ }
+
+ protected abstract boolean isClientAddressable();
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractSecuredReqResTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAnonymousReqResTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAnonymousReqResTestCase.java 2007-12-17 11:07:18 UTC (rev 5328)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAnonymousReqResTestCase.java 2007-12-17 11:57:30 UTC (rev 5329)
@@ -34,7 +34,6 @@
*/
public final class RMAnonymousReqResTestCase extends RMAbstractReqResTest
{
-
public static Test suite()
{
return new JBossWSTestSetup(RMAnonymousReqResTestCase.class, getClasspath());
@@ -44,5 +43,4 @@
{
return false;
}
-
}
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMSecuredAddressableReqResTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMSecuredAddressableReqResTestCase.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMSecuredAddressableReqResTestCase.java 2007-12-17 11:57:30 UTC (rev 5329)
@@ -0,0 +1,46 @@
+/*
+ * 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.test.ws.jaxws.wsrm.reqres;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * Secured addressable version of request reply WS-RM message exchange
+ *
+ * @author richard.opalka(a)jboss.com
+ *
+ * @since Dec 17, 2007
+ */
+public class RMSecuredAddressableReqResTestCase extends RMAbstractSecuredReqResTest
+{
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(RMSecuredAddressableReqResTestCase.class, getClasspath());
+ }
+
+ public final boolean isClientAddressable()
+ {
+ return true;
+ }
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMSecuredAddressableReqResTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMSecuredAnonymousReqResTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMSecuredAnonymousReqResTestCase.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMSecuredAnonymousReqResTestCase.java 2007-12-17 11:57:30 UTC (rev 5329)
@@ -0,0 +1,46 @@
+/*
+ * 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.test.ws.jaxws.wsrm.reqres;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * Secured anonymous version of request reply WS-RM message exchange
+ *
+ * @author richard.opalka(a)jboss.com
+ *
+ * @since Dec 17, 2007
+ */
+public class RMSecuredAnonymousReqResTestCase extends RMAbstractSecuredReqResTest
+{
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(RMSecuredAnonymousReqResTestCase.class, getClasspath());
+ }
+
+ public final boolean isClientAddressable()
+ {
+ return false;
+ }
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMSecuredAnonymousReqResTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceIface.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceIface.java 2007-12-17 11:07:18 UTC (rev 5328)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceIface.java 2007-12-17 11:57:30 UTC (rev 5329)
@@ -29,7 +29,8 @@
@WebService
@EndpointConfig
(
- configName = "Secured WSRM Client",
+// configName = "Secured WSRM Client", TODO: uncommented
+ configName = "Standard WSRM Client",
configFile = "META-INF/wsrm-jaxws-client-config.xml"
)
public interface SecuredOneWayServiceIface
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceImpl.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceImpl.java 2007-12-17 11:07:18 UTC (rev 5328)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceImpl.java 2007-12-17 11:57:30 UTC (rev 5329)
@@ -49,7 +49,8 @@
)
@EndpointConfig
(
- configName = "Secured WSRM Endpoint",
+// configName = "Secured WSRM Endpoint", TODO: uncomment
+ configName = "Standard WSRM Endpoint",
configFile = "WEB-INF/wsrm-jaxws-endpoint-config.xml"
)
public class SecuredOneWayServiceImpl implements SecuredOneWayServiceIface
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceIface.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceIface.java 2007-12-17 11:07:18 UTC (rev 5328)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceIface.java 2007-12-17 11:57:30 UTC (rev 5329)
@@ -33,6 +33,7 @@
@WebService
@EndpointConfig
(
+// configName = "Secured WSRM Client", TODO: uncomment
configName = "Standard WSRM Client",
configFile = "META-INF/wsrm-jaxws-client-config.xml"
)
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceImpl.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceImpl.java 2007-12-17 11:07:18 UTC (rev 5328)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceImpl.java 2007-12-17 11:57:30 UTC (rev 5329)
@@ -22,10 +22,7 @@
package org.jboss.test.ws.jaxws.wsrm.services;
import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
import javax.jws.WebService;
-import javax.xml.ws.addressing.Action;
import org.jboss.logging.Logger;
import org.jboss.ws.annotation.EndpointConfig;
@@ -50,6 +47,7 @@
)
@EndpointConfig
(
+// configName = "Standard WSRM Endpoint", TODO: uncomment
configName = "Standard WSRM Endpoint",
configFile = "WEB-INF/wsrm-jaxws-endpoint-config.xml"
)
Added: stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/secure/web.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/secure/web.xml (rev 0)
+++ stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/secure/web.xml 2007-12-17 11:57:30 UTC (rev 5329)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+
+ <servlet>
+ <servlet-name>SecuredOneWayService</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.wsrm.services.SecuredOneWayServiceImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>SecuredOneWayService</servlet-name>
+ <url-pattern>/SecuredOneWayService</url-pattern>
+ </servlet-mapping>
+
+ <servlet>
+ <servlet-name>SecuredReqResService</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.wsrm.services.SecuredReqResServiceImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>SecuredReqResService</servlet-name>
+ <url-pattern>/SecuredReqResService</url-pattern>
+ </servlet-mapping>
+
+</web-app>
Property changes on: stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/secure/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/jaxws/wsrm/properties/RMAbstractSecuredOneWayTest.properties
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/wsrm/properties/RMAbstractSecuredOneWayTest.properties (rev 0)
+++ stack/native/trunk/src/test/resources/jaxws/wsrm/properties/RMAbstractSecuredOneWayTest.properties 2007-12-17 11:57:30 UTC (rev 5329)
@@ -0,0 +1,3 @@
+port=8080
+path=/jaxws-secured-wsrm/SecuredOneWayService
+archives=jaxws-secured-wsrm.war, jaxws-secured-wsrm-client.jar
Added: stack/native/trunk/src/test/resources/jaxws/wsrm/properties/RMAbstractSecuredReqResTest.properties
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/wsrm/properties/RMAbstractSecuredReqResTest.properties (rev 0)
+++ stack/native/trunk/src/test/resources/jaxws/wsrm/properties/RMAbstractSecuredReqResTest.properties 2007-12-17 11:57:30 UTC (rev 5329)
@@ -0,0 +1,3 @@
+port=8080
+path=/jaxws-secured-wsrm/SecuredReqResService
+archives=jaxws-secured-wsrm.war, jaxws-secured-wsrm-client.jar
17 years, 1 month
- 1
- 0
JBossWS SVN: r5328 - in stack/native/trunk: src/test/java/org/jboss/test/ws/jaxws/wsrm and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-12-17 06:07:18 -0500 (Mon, 17 Dec 2007)
New Revision: 5328
Added:
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceIface.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceImpl.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceIface.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceImpl.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceIface.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceImpl.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceIface.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceImpl.java
stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/unsecure/
stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/unsecure/web.xml
Removed:
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/OneWayServiceIface.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/OneWayServiceImpl.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceIface.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceImpl.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/TODO
stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/web.xml
Modified:
stack/native/trunk/ant-import-tests/build-jars-jaxws.xml
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractReqResTest.java
stack/native/trunk/src/test/resources/jaxws/wsrm/META-INF/wsrm-jaxws-client-config.xml
stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-jaxws-endpoint-config.xml
Log:
refactoring test services + adding new services with WSSecurity enabled
Modified: stack/native/trunk/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2007-12-17 10:39:26 UTC (rev 5327)
+++ stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2007-12-17 11:07:18 UTC (rev 5328)
@@ -656,12 +656,12 @@
<!-- jaxws-wsrm -->
<war warfile="${tests.output.dir}/libs/jaxws-wsrm.war"
- webxml="${tests.output.dir}/resources/jaxws/wsrm/WEB-INF/web.xml">
+ webxml="${tests.output.dir}/resources/jaxws/wsrm/WEB-INF/unsecure/web.xml">
<classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxws/wsrm/OneWayServiceIface.class"/>
- <include name="org/jboss/test/ws/jaxws/wsrm/OneWayServiceImpl.class"/>
- <include name="org/jboss/test/ws/jaxws/wsrm/ReqResServiceIface.class"/>
- <include name="org/jboss/test/ws/jaxws/wsrm/ReqResServiceImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceIface.class"/>
+ <include name="org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceIface.class"/>
+ <include name="org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceImpl.class"/>
</classes>
<webinf dir="${tests.output.dir}/resources/jaxws/wsrm/WEB-INF">
<include name="wsrm-exactly-once-in-order-policy.xml"/>
Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/OneWayServiceIface.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/OneWayServiceIface.java 2007-12-17 10:39:26 UTC (rev 5327)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/OneWayServiceIface.java 2007-12-17 11:07:18 UTC (rev 5328)
@@ -1,28 +0,0 @@
-package org.jboss.test.ws.jaxws.wsrm;
-
-import javax.jws.Oneway;
-import javax.jws.WebService;
-import javax.xml.ws.addressing.Action;
-
-import org.jboss.ws.annotation.EndpointConfig;
-
-@WebService
-@EndpointConfig
-(
- configName = "Standard WSRM Client",
- configFile = "META-INF/wsrm-jaxws-client-config.xml"
-)
-public interface OneWayServiceIface
-{
- @Oneway
- @Action(input="http://wsrm.example/oneway/method1")
- void method1();
-
- @Action(input="http://wsrm.example/oneway/method2")
- @Oneway
- void method2(String s);
-
- @Action(input="http://wsrm.example/oneway/method3")
- @Oneway
- void method3(String[] sa);
-}
Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/OneWayServiceImpl.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/OneWayServiceImpl.java 2007-12-17 10:39:26 UTC (rev 5327)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/OneWayServiceImpl.java 2007-12-17 11:07:18 UTC (rev 5328)
@@ -1,58 +0,0 @@
-package org.jboss.test.ws.jaxws.wsrm;
-
-import javax.jws.Oneway;
-import javax.jws.WebService;
-import javax.xml.ws.addressing.Action;
-
-import org.jboss.logging.Logger;
-import org.jboss.ws.annotation.EndpointConfig;
-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
-(
- name = "OneWay",
- serviceName = "OneWayService",
- endpointInterface = "org.jboss.test.ws.jaxws.wsrm.OneWayServiceIface"
-)
-@PolicyAttachment
-(
- @Policy
- (
- policyFileLocation = "WEB-INF/wsrm-exactly-once-in-order-policy.xml",
- scope = PolicyScopeLevel.WSDL_BINDING
- )
-)
-@EndpointConfig
-(
- configName = "Standard WSRM Endpoint",
- configFile = "WEB-INF/wsrm-jaxws-endpoint-config.xml"
-)
-public class OneWayServiceImpl implements OneWayServiceIface
-{
- private Logger log = Logger.getLogger(OneWayServiceImpl.class);
-
- @Action(input="http://wsrm.example/oneway/method1")
- @Oneway
- public void method1()
- {
- log.info("method1()");
- }
-
- @Action(input="http://wsrm.example/oneway/method2")
- @Oneway
- public void method2(String s)
- {
- log.info("method2(" + s + ")");
- }
-
- @Action(input="http://wsrm.example/oneway/method3")
- @Oneway
- public void method3(String[] sa)
- {
- log.info("method3(" + Arrays.asList(sa) + ")");
- }
-}
Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceIface.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceIface.java 2007-12-17 10:39:26 UTC (rev 5327)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceIface.java 2007-12-17 11:07:18 UTC (rev 5328)
@@ -1,36 +0,0 @@
-package org.jboss.test.ws.jaxws.wsrm;
-
-import java.util.concurrent.Future;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-
-import javax.xml.ws.addressing.Action;
-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")
-@EndpointConfig
-(
- configName = "Standard WSRM Client",
- configFile = "META-INF/wsrm-jaxws-client-config.xml"
-)
-public interface ReqResServiceIface
-{
- @WebMethod(operationName = "echo")
- @Action(input="http://wsrm.example/reqres/echo/input", output="http://wsrm.example/reqres/echo/output")
- public Response<String> echoAsync(@WebParam(name = "String_1") String string1);
-
- @WebMethod(operationName = "echo")
- @Action(input="http://wsrm.example/reqres/echo/input", output="http://wsrm.example/reqres/echo/output")
- public Future<?> echoAsync(@WebParam(name = "String_1") String string1, @WebParam(name = "asyncHandler") AsyncHandler<String> asyncHandler);
-
- @WebMethod
- @WebResult(name = "result")
- @Action(input="http://wsrm.example/reqres/echo/input", output="http://wsrm.example/reqres/echo/output")
- public String echo(@WebParam(name = "String_1") String string1);
-}
Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceImpl.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceImpl.java 2007-12-17 10:39:26 UTC (rev 5327)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceImpl.java 2007-12-17 11:07:18 UTC (rev 5328)
@@ -1,46 +0,0 @@
-package org.jboss.test.ws.jaxws.wsrm;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.xml.ws.addressing.Action;
-
-import org.jboss.logging.Logger;
-import org.jboss.ws.annotation.EndpointConfig;
-import org.jboss.ws.extensions.policy.PolicyScopeLevel;
-import org.jboss.ws.extensions.policy.annotation.Policy;
-import org.jboss.ws.extensions.policy.annotation.PolicyAttachment;
-
-@WebService
-(
- name = "ReqRes",
- serviceName = "ReqResService",
- targetNamespace = "http://org.jboss.ws/jaxws/wsrm"
-)
-@PolicyAttachment
-(
- @Policy
- (
- policyFileLocation = "WEB-INF/wsrm-exactly-once-in-order-policy.xml",
- scope = PolicyScopeLevel.WSDL_BINDING
- )
-)
-@EndpointConfig
-(
- configName = "Standard WSRM Endpoint",
- configFile = "WEB-INF/wsrm-jaxws-endpoint-config.xml"
-)
-public class ReqResServiceImpl
-{
- private static Logger log = Logger.getLogger(ReqResServiceImpl.class);
-
- @WebMethod
- @WebResult(name = "result")
- @Action(input="http://wsrm.example/reqres/echo/input", output="http://wsrm.example/reqres/echo/output")
- public String echo(@WebParam(name = "String_1") String msg)
- {
- log.info("echo: " + msg);
- return msg;
- }
-}
Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/TODO
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/TODO 2007-12-17 10:39:26 UTC (rev 5327)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/TODO 2007-12-17 11:07:18 UTC (rev 5328)
@@ -1,32 +0,0 @@
-Priority | Task
---------------------------------------------------------------------------------
-MUST | Server can send AckRequested, CloseSequence or TerminateSequence
- | asynchronously any time. RMSender must count with that and thus
- | register a callback handler that will listen for these messages.
- | Once such message arrives (applies to backports only), it will
- | call sequence registry and notifies the sequence that there's a
- | message for it in the RMTransport. SequenceManager in next iteration
- | will detect that sequence is in the special state and initiates
- | dummy method call (dummy method call is the call that will not go
- | to the wire and will not be executed through the outbound handler
- | chain. When such dummy method call will arrive to the RMTransport,
- | RMSender will return it the arrived AckRequested, CloseSequence or
- | TerminateSequence message, this message will be executed throught
- | inbound message handlers (WS-Security will be executed properly)
- | and sequence state will change (e.g. when AckRequested message will
- | arrive for req/res message exchange pattern, then sequence state will
- | change to SequenceAcknowledgement requested). SequenceManager
- | in later iteration will detect this new state and will send sequence
- | acknowledgement message to the server (or CloseSequenceResponse)
---------------------------------------------------------------------------------
-MUST | Create the test for above use-cases (AckRequested, Close(Terminate)S
---------------------------------------------------------------------------------
-MUST | Implement one way method call in the same way as above investigation.
---------------------------------------------------------------------------------
-MUST | Users must be able to specify in sequence creation code whether
- | reliable sequence is simplex (for one way messages only) or duplex
- | (req-res message exchange pattern) - default will be duplex
---------------------------------------------------------------------------------
-MUST | Users must be able to specify wether client is anonymous or
- | addressable - default will be addressable
---------------------------------------------------------------------------------
\ No newline at end of file
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java 2007-12-17 10:39:26 UTC (rev 5327)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java 2007-12-17 11:07:18 UTC (rev 5328)
@@ -35,7 +35,7 @@
import org.jboss.ws.extensions.wsrm.api.RMProvider;
import org.jboss.ws.extensions.wsrm.api.RMSequence;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.test.ws.jaxws.wsrm.OneWayServiceIface;
+import org.jboss.test.ws.jaxws.wsrm.services.OneWayServiceIface;
/**
* Reliable JBoss WebService client invoking one way methods
@@ -47,7 +47,7 @@
{
private static final Properties props = new Properties();
private final String serviceURL = "http://" + getServerHost() + ":" + props.getProperty("port") + props.getProperty("path");
- private String targetNS = "http://wsrm.jaxws.ws.test.jboss.org/";
+ private String targetNS = "http://org.jboss.ws/jaxws/wsrm";
private OneWayServiceIface proxy;
static
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractReqResTest.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractReqResTest.java 2007-12-17 10:39:26 UTC (rev 5327)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractReqResTest.java 2007-12-17 11:07:18 UTC (rev 5328)
@@ -40,7 +40,7 @@
import javax.xml.ws.Service;
import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.test.ws.jaxws.wsrm.ReqResServiceIface;
+import org.jboss.test.ws.jaxws.wsrm.services.ReqResServiceIface;
import org.jboss.ws.extensions.wsrm.api.RMProvider;
import org.jboss.ws.extensions.wsrm.api.RMSequence;
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceIface.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceIface.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceIface.java 2007-12-17 11:07:18 UTC (rev 5328)
@@ -0,0 +1,24 @@
+package org.jboss.test.ws.jaxws.wsrm.services;
+
+import javax.jws.Oneway;
+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
+{
+ @Oneway
+ void method1();
+
+ @Oneway
+ void method2(String s);
+
+ @Oneway
+ void method3(String[] sa);
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceIface.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceImpl.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceImpl.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceImpl.java 2007-12-17 11:07:18 UTC (rev 5328)
@@ -0,0 +1,55 @@
+package org.jboss.test.ws.jaxws.wsrm.services;
+
+import javax.jws.Oneway;
+import javax.jws.WebService;
+
+import org.jboss.logging.Logger;
+import org.jboss.ws.annotation.EndpointConfig;
+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
+(
+ name = "OneWay",
+ serviceName = "OneWayService",
+ targetNamespace = "http://org.jboss.ws/jaxws/wsrm",
+ endpointInterface = "org.jboss.test.ws.jaxws.wsrm.services.OneWayServiceIface"
+)
+@PolicyAttachment
+(
+ @Policy
+ (
+ policyFileLocation = "WEB-INF/wsrm-exactly-once-in-order-policy.xml",
+ scope = PolicyScopeLevel.WSDL_BINDING
+ )
+)
+@EndpointConfig
+(
+ configName = "Standard WSRM Endpoint",
+ configFile = "WEB-INF/wsrm-jaxws-endpoint-config.xml"
+)
+public class OneWayServiceImpl implements OneWayServiceIface
+{
+ private Logger log = Logger.getLogger(OneWayServiceImpl.class);
+
+ @Oneway
+ public void method1()
+ {
+ log.info("method1()");
+ }
+
+ @Oneway
+ public void method2(String s)
+ {
+ log.info("method2(" + s + ")");
+ }
+
+ @Oneway
+ public void method3(String[] sa)
+ {
+ log.info("method3(" + Arrays.asList(sa) + ")");
+ }
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/OneWayServiceImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceIface.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceIface.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceIface.java 2007-12-17 11:07:18 UTC (rev 5328)
@@ -0,0 +1,29 @@
+package org.jboss.test.ws.jaxws.wsrm.services;
+
+import java.util.concurrent.Future;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
+import javax.xml.ws.AsyncHandler;
+import javax.xml.ws.Response;
+
+import org.jboss.ws.annotation.EndpointConfig;
+
+@WebService
+@EndpointConfig
+(
+ configName = "Standard WSRM Client",
+ configFile = "META-INF/wsrm-jaxws-client-config.xml"
+)
+public interface ReqResServiceIface
+{
+ @WebMethod(operationName = "echo")
+ public Response<String> echoAsync(String s);
+
+ @WebMethod(operationName = "echo")
+ public Future<?> echoAsync(String s, AsyncHandler<String> h);
+
+ @WebMethod
+ public String echo(String s);
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceIface.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceImpl.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceImpl.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceImpl.java 2007-12-17 11:07:18 UTC (rev 5328)
@@ -0,0 +1,42 @@
+package org.jboss.test.ws.jaxws.wsrm.services;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
+import org.jboss.logging.Logger;
+import org.jboss.ws.annotation.EndpointConfig;
+import org.jboss.ws.extensions.policy.PolicyScopeLevel;
+import org.jboss.ws.extensions.policy.annotation.Policy;
+import org.jboss.ws.extensions.policy.annotation.PolicyAttachment;
+
+@WebService
+(
+ name = "ReqRes",
+ serviceName = "ReqResService",
+ targetNamespace = "http://org.jboss.ws/jaxws/wsrm",
+ endpointInterface = "org.jboss.test.ws.jaxws.wsrm.services.ReqResServiceIface"
+)
+@PolicyAttachment
+(
+ @Policy
+ (
+ policyFileLocation = "WEB-INF/wsrm-exactly-once-in-order-policy.xml",
+ scope = PolicyScopeLevel.WSDL_BINDING
+ )
+)
+@EndpointConfig
+(
+ configName = "Standard WSRM Endpoint",
+ configFile = "WEB-INF/wsrm-jaxws-endpoint-config.xml"
+)
+public class ReqResServiceImpl
+{
+ private static Logger log = Logger.getLogger(ReqResServiceImpl.class);
+
+ @WebMethod
+ public String echo(String s)
+ {
+ log.info("echo(" + s + ")");
+ return s;
+ }
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/ReqResServiceImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceIface.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceIface.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceIface.java 2007-12-17 11:07:18 UTC (rev 5328)
@@ -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.test.ws.jaxws.wsrm.services;
+
+import javax.jws.Oneway;
+import javax.jws.WebService;
+
+import org.jboss.ws.annotation.EndpointConfig;
+
+@WebService
+@EndpointConfig
+(
+ configName = "Secured WSRM Client",
+ configFile = "META-INF/wsrm-jaxws-client-config.xml"
+)
+public interface SecuredOneWayServiceIface
+{
+ @Oneway
+ void method1();
+
+ @Oneway
+ void method2(String s);
+
+ @Oneway
+ void method3(String[] sa);
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceIface.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceImpl.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceImpl.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceImpl.java 2007-12-17 11:07:18 UTC (rev 5328)
@@ -0,0 +1,76 @@
+/*
+ * 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.test.ws.jaxws.wsrm.services;
+
+import java.util.Arrays;
+
+import javax.jws.Oneway;
+import javax.jws.WebService;
+
+import org.jboss.logging.Logger;
+import org.jboss.ws.annotation.EndpointConfig;
+import org.jboss.ws.extensions.policy.PolicyScopeLevel;
+import org.jboss.ws.extensions.policy.annotation.Policy;
+import org.jboss.ws.extensions.policy.annotation.PolicyAttachment;
+
+@WebService
+(
+ name = "SecuredOneWay",
+ serviceName = "SecuredOneWayService",
+ targetNamespace = "http://org.jboss.ws/jaxws/wsrm",
+ endpointInterface = "org.jboss.test.ws.jaxws.wsrm.services.SecuredOneWayServiceIface"
+)
+@PolicyAttachment
+(
+ @Policy
+ (
+ policyFileLocation = "WEB-INF/wsrm-exactly-once-in-order-policy.xml",
+ scope = PolicyScopeLevel.WSDL_BINDING
+ )
+)
+@EndpointConfig
+(
+ configName = "Secured WSRM Endpoint",
+ configFile = "WEB-INF/wsrm-jaxws-endpoint-config.xml"
+)
+public class SecuredOneWayServiceImpl implements SecuredOneWayServiceIface
+{
+ private Logger log = Logger.getLogger(SecuredOneWayServiceImpl.class);
+
+ @Oneway
+ public void method1()
+ {
+ log.info("method1()");
+ }
+
+ @Oneway
+ public void method2(String s)
+ {
+ log.info("method2(" + s + ")");
+ }
+
+ @Oneway
+ public void method3(String[] sa)
+ {
+ log.info("method3(" + Arrays.asList(sa) + ")");
+ }
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredOneWayServiceImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceIface.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceIface.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceIface.java 2007-12-17 11:07:18 UTC (rev 5328)
@@ -0,0 +1,49 @@
+/*
+ * 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.test.ws.jaxws.wsrm.services;
+
+import java.util.concurrent.Future;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.xml.ws.AsyncHandler;
+import javax.xml.ws.Response;
+
+import org.jboss.ws.annotation.EndpointConfig;
+
+@WebService
+@EndpointConfig
+(
+ configName = "Standard WSRM Client",
+ configFile = "META-INF/wsrm-jaxws-client-config.xml"
+)
+public interface SecuredReqResServiceIface
+{
+ @WebMethod(operationName = "echo")
+ public Response<String> echoAsync(String s);
+
+ @WebMethod(operationName = "echo")
+ public Future<?> echoAsync(String s, AsyncHandler<String> h);
+
+ @WebMethod
+ public String echo(String s);
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceIface.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceImpl.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceImpl.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceImpl.java 2007-12-17 11:07:18 UTC (rev 5328)
@@ -0,0 +1,66 @@
+/*
+ * 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.test.ws.jaxws.wsrm.services;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.xml.ws.addressing.Action;
+
+import org.jboss.logging.Logger;
+import org.jboss.ws.annotation.EndpointConfig;
+import org.jboss.ws.extensions.policy.PolicyScopeLevel;
+import org.jboss.ws.extensions.policy.annotation.Policy;
+import org.jboss.ws.extensions.policy.annotation.PolicyAttachment;
+
+@WebService
+(
+ name = "SecuredReqRes",
+ serviceName = "SecuredReqResService",
+ targetNamespace = "http://org.jboss.ws/jaxws/wsrm",
+ endpointInterface = "org.jboss.test.ws.jaxws.wsrm.services.SecuredReqResServiceIface"
+)
+@PolicyAttachment
+(
+ @Policy
+ (
+ policyFileLocation = "WEB-INF/wsrm-exactly-once-in-order-policy.xml",
+ scope = PolicyScopeLevel.WSDL_BINDING
+ )
+)
+@EndpointConfig
+(
+ configName = "Standard WSRM Endpoint",
+ configFile = "WEB-INF/wsrm-jaxws-endpoint-config.xml"
+)
+public class SecuredReqResServiceImpl
+{
+ private static Logger log = Logger.getLogger(SecuredReqResServiceImpl.class);
+
+ @WebMethod
+ public String echo(String s)
+ {
+ log.info("echo(" + s + ")");
+ return s;
+ }
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/services/SecuredReqResServiceImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/native/trunk/src/test/resources/jaxws/wsrm/META-INF/wsrm-jaxws-client-config.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/wsrm/META-INF/wsrm-jaxws-client-config.xml 2007-12-17 10:39:26 UTC (rev 5327)
+++ stack/native/trunk/src/test/resources/jaxws/wsrm/META-INF/wsrm-jaxws-client-config.xml 2007-12-17 11:07:18 UTC (rev 5328)
@@ -27,4 +27,29 @@
</post-handler-chains>
</client-config>
+ <client-config>
+ <config-name>Secured WSRM Client</config-name>
+ <reliable-messaging>
+ <backports-server port="7777"/>
+ <message-retransmission attempts="50" interval="10" timeout="3"/>
+ </reliable-messaging>
+ <post-handler-chains>
+ <javaee:handler-chain>
+ <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings>
+ <javaee:handler>
+ <javaee:handler-name>WSAddressing Handler</javaee:handler-name>
+ <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler</javaee:handler-class>
+ </javaee:handler>
+ <javaee:handler>
+ <javaee:handler-name>WSRM Handler</javaee:handler-name>
+ <javaee:handler-class>org.jboss.ws.extensions.wsrm.jaxws.RMClientHandler</javaee:handler-class>
+ </javaee:handler>
+ <javaee:handler>
+ <javaee:handler-name>WSSecurity Handler</javaee:handler-name>
+ <javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerClient</javaee:handler-class>
+ </javaee:handler>
+ </javaee:handler-chain>
+ </post-handler-chains>
+ </client-config>
+
</jaxws-config>
Added: stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/unsecure/web.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/unsecure/web.xml (rev 0)
+++ stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/unsecure/web.xml 2007-12-17 11:07:18 UTC (rev 5328)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+
+ <servlet>
+ <servlet-name>OneWayService</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.wsrm.services.OneWayServiceImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>OneWayService</servlet-name>
+ <url-pattern>/OneWayService</url-pattern>
+ </servlet-mapping>
+
+ <servlet>
+ <servlet-name>ReqResService</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.wsrm.services.ReqResServiceImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>ReqResService</servlet-name>
+ <url-pattern>/ReqResService</url-pattern>
+ </servlet-mapping>
+
+</web-app>
Property changes on: stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/unsecure/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/web.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/web.xml 2007-12-17 10:39:26 UTC (rev 5327)
+++ stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/web.xml 2007-12-17 11:07:18 UTC (rev 5328)
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- version="2.4">
-
- <servlet>
- <servlet-name>OneWayService</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxws.wsrm.OneWayServiceImpl</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>OneWayService</servlet-name>
- <url-pattern>/OneWayService</url-pattern>
- </servlet-mapping>
-
- <servlet>
- <servlet-name>ReqResService</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxws.wsrm.ReqResServiceImpl</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>ReqResService</servlet-name>
- <url-pattern>/ReqResService</url-pattern>
- </servlet-mapping>
-
-</web-app>
Modified: stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-jaxws-endpoint-config.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-jaxws-endpoint-config.xml 2007-12-17 10:39:26 UTC (rev 5327)
+++ stack/native/trunk/src/test/resources/jaxws/wsrm/WEB-INF/wsrm-jaxws-endpoint-config.xml 2007-12-17 11:07:18 UTC (rev 5328)
@@ -23,4 +23,25 @@
</post-handler-chains>
</endpoint-config>
+ <endpoint-config>
+ <config-name>Secured WSRM Endpoint</config-name>
+ <post-handler-chains>
+ <javaee:handler-chain>
+ <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings>
+ <javaee:handler>
+ <javaee:handler-name>WSAddressing Handler</javaee:handler-name>
+ <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</javaee:handler-class>
+ </javaee:handler>
+ <javaee:handler>
+ <javaee:handler-name>WSRM Handler</javaee:handler-name>
+ <javaee:handler-class>org.jboss.ws.extensions.wsrm.jaxws.RMServerHandler</javaee:handler-class>
+ </javaee:handler>
+ <javaee:handler>
+ <javaee:handler-name>WSSecurity Handler</javaee:handler-name>
+ <javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerServer</javaee:handler-class>
+ </javaee:handler>
+ </javaee:handler-chain>
+ </post-handler-chains>
+ </endpoint-config>
+
</jaxws-config>
17 years, 1 month
- 1
- 0
JBossWS SVN: r5327 - in framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework: management and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2007-12-17 05:39:26 -0500 (Mon, 17 Dec 2007)
New Revision: 5327
Modified:
framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointRecordProcessorDeploymentAspect.java
framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/ManagedEndpoint.java
Log:
Unregister processors during undeploy and whenever new processors are set
Modified: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointRecordProcessorDeploymentAspect.java
===================================================================
--- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointRecordProcessorDeploymentAspect.java 2007-12-17 08:49:20 UTC (rev 5326)
+++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointRecordProcessorDeploymentAspect.java 2007-12-17 10:39:26 UTC (rev 5327)
@@ -30,10 +30,10 @@
import javax.management.MBeanServer;
import org.jboss.wsf.common.ObjectNameFactory;
+import org.jboss.wsf.framework.management.recording.LogRecorder;
import org.jboss.wsf.framework.management.recording.ManagedRecordExtractor;
import org.jboss.wsf.framework.management.recording.ManagedRecordProcessor;
import org.jboss.wsf.framework.management.recording.MemoryBufferRecorder;
-import org.jboss.wsf.framework.management.recording.LogRecorder;
import org.jboss.wsf.framework.management.recording.RecordExtractor;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
@@ -70,6 +70,19 @@
ep.setRecordProcessors(recordProcessorList);
}
}
+
+ @Override
+ public void destroy(Deployment dep)
+ {
+ for (Endpoint ep : dep.getService().getEndpoints())
+ {
+ List<RecordProcessor> processors = ep.getRecordProcessors();
+ for (RecordProcessor processor : processors)
+ {
+ this.unregisterRecordProcessor(processor, ep);
+ }
+ }
+ }
private void registerRecordProcessor(RecordProcessor processor, Endpoint ep)
{
@@ -88,6 +101,22 @@
}
}
+ private void unregisterRecordProcessor(RecordProcessor processor, Endpoint ep)
+ {
+ try
+ {
+ mbeanServer.unregisterMBean(ObjectNameFactory.create(ep.getName() + ",recordProcessor=" + processor.getName()));
+ if (processor instanceof RecordExtractor)
+ {
+ mbeanServer.unregisterMBean(ObjectNameFactory.create(ep.getName() + ",recordExtractor=" + processor.getName()));
+ }
+ }
+ catch (JMException ex)
+ {
+ log.error("Cannot unregister record processor with JMX server", ex);
+ }
+ }
+
public MBeanServer getMbeanServer()
{
return mbeanServer;
Modified: framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/ManagedEndpoint.java
===================================================================
--- framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/ManagedEndpoint.java 2007-12-17 08:49:20 UTC (rev 5326)
+++ framework/branches/asoldano/trunk/src/main/java/org/jboss/wsf/framework/management/ManagedEndpoint.java 2007-12-17 10:39:26 UTC (rev 5327)
@@ -150,6 +150,23 @@
public void setRecordProcessors(List<RecordProcessor> processors)
{
+ //unregister current processors
+ for (RecordProcessor processor : processors)
+ {
+ try
+ {
+ mbeanServer.unregisterMBean(ObjectNameFactory.create(endpoint.getName() + ",recordProcessor=" + processor.getName()));
+ if (processor instanceof RecordExtractor)
+ {
+ mbeanServer.unregisterMBean(ObjectNameFactory.create(endpoint.getName() + ",recordExtractor=" + processor.getName()));
+ }
+ }
+ catch (JMException ex)
+ {
+ log.error("Cannot unregister record processor with JMX server", ex);
+ }
+ }
+ //set and register the new processors
endpoint.setRecordProcessors(processors);
for (RecordProcessor processor : processors)
{
17 years, 1 month
- 1
- 0