JBossWS SVN: r10269 - stack/native/branches/dlofthouse.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-06-30 12:49:45 -0400 (Tue, 30 Jun 2009)
New Revision: 10269
Removed:
stack/native/branches/dlofthouse/JBWS-2693/
Log:
Branch no longer required.
14 years, 11 months
- 1
- 0
JBossWS SVN: r10268 - in stack/native/trunk/modules: testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-06-30 12:49:13 -0400 (Tue, 30 Jun 2009)
New Revision: 10268
Added:
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/soap/jbws2693.xml
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java
Log:
[JBWS-2693] Implement Node.setTextContent().
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java 2009-06-30 15:36:17 UTC (rev 10267)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java 2009-06-30 16:49:13 UTC (rev 10268)
@@ -657,8 +657,17 @@
public void setTextContent(String textContent) throws DOMException
{
- // FIXME setTextContent
- throw new NotImplementedException("setTextContent");
+ NodeList nodes = getChildNodes();
+ for (int i = 0; i < nodes.getLength(); i++)
+ {
+ removeChild((Node)nodes.item(i));
+ }
+
+ if (textContent != null && textContent.length() > 0)
+ {
+ Node node = domNode.getOwnerDocument().createTextNode(textContent);
+ appendChild(node);
+ }
}
public Object setUserData(String key, Object data, UserDataHandler handler)
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java 2009-06-30 15:36:17 UTC (rev 10267)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java 2009-06-30 16:49:13 UTC (rev 10268)
@@ -22,6 +22,7 @@
package org.jboss.test.ws.common.soap;
import java.io.ByteArrayInputStream;
+import java.io.File;
import java.io.InputStream;
import java.util.Iterator;
@@ -155,7 +156,41 @@
assertEquals(soapFactory.createName("name"), it.next());
assertEquals(soapFactory.createName("species", null, "http://zoofan.net"), it.next());
}
+
+ public void testSetTextContent() throws Exception
+ {
+ InputStream is = getResourceURL("common/soap/jbws2693.xml").openStream();
+ MessageFactory messageFactory = MessageFactory.newInstance();
+ SOAPMessage soapMessage = messageFactory.createMessage(null, is);
+ NodeList nl = soapMessage.getSOAPBody().getChildNodes();
+ SOAPElement echo = null;
+ for (int i = 0; i < nl.getLength() && echo == null; i++)
+ {
+ Object current = nl.item(i);
+ if (current instanceof SOAPElement)
+ {
+ echo = (SOAPElement)current;
+ }
+ }
+ nl = echo.getChildNodes();
+ SOAPElement arg0 = null;
+ for (int i = 0; i < nl.getLength() && arg0 == null; i++)
+ {
+ Object current = nl.item(i);
+ if (current instanceof SOAPElement)
+ {
+ arg0 = (SOAPElement)current;
+ }
+ }
+ String value = arg0.getTextContent();
+ assertEquals("Expected value", "123", value);
+
+ arg0.setTextContent("456");
+ value = arg0.getTextContent();
+ assertEquals("Expected value", "456", value);
+ }
+
/** Return the count of iterator elements, rendering the iterator unusable.
*/
private int getIteratorCount(Iterator i)
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/soap/jbws2693.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/soap/jbws2693.xml (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/soap/jbws2693.xml 2009-06-30 16:49:13 UTC (rev 10268)
@@ -0,0 +1,8 @@
+<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/' xmlns:jbw='http://ws.jboss.org/jbws2693'>
+ <soapenv:Header/>
+ <soapenv:Body>
+ <jbw:echo>
+ <arg0>123</arg0>
+ </jbw:echo>
+ </soapenv:Body>
+</soapenv:Envelope>
\ No newline at end of file
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/soap/jbws2693.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
14 years, 11 months
- 1
- 0
JBossWS SVN: r10267 - in stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests: src/test/java/org/jboss/test/ws/jaxws and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-06-30 11:36:17 -0400 (Tue, 30 Jun 2009)
New Revision: 10267
Added:
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2682/
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2682/Endpoint.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2682/EndpointImpl.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2682/JBWS2682TestCase.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2682/
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2682/WEB-INF/
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2682/WEB-INF/web.xml
Removed:
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2682/Endpoint.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2682/EndpointImpl.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2682/JBWS2682TestCase.java
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2682/WEB-INF/
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2682/WEB-INF/web.xml
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
Log:
[JBPAPP-2161] Test case for 'Incorrect Parsing of Badly Formed int.'
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2009-06-30 14:36:43 UTC (rev 10266)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2009-06-30 15:36:17 UTC (rev 10267)
@@ -552,6 +552,14 @@
</metainf>
</jar>
+ <!-- jaxws-jbws2682 -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2682.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2682/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws2682/Endpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws2682/EndpointImpl.class"/>
+ </classes>
+ </war>
+
<!-- jaxws-webserviceref -->
<war warfile="${tests.output.dir}/test-libs/jaxws-webserviceref.war" webxml="${tests.output.dir}/test-resources/jaxws/webserviceref/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2682 (from rev 10202, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2682)
Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2682/Endpoint.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2682/Endpoint.java 2009-06-17 17:06:56 UTC (rev 10202)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2682/Endpoint.java 2009-06-30 15:36:17 UTC (rev 10267)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.jbws2682;
-
-import javax.jws.WebService;
-
-/**
- * Test Endpoint.
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 16th June 2009
- */
-@WebService(name = "Endpoint", targetNamespace = "http://ws.jboss.org/jbws2682")
-public interface Endpoint
-{
-
- public int echo(final int value);
-
-}
Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2682/Endpoint.java (from rev 10202, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2682/Endpoint.java)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2682/Endpoint.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2682/Endpoint.java 2009-06-30 15:36:17 UTC (rev 10267)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jbws2682;
+
+import javax.jws.WebService;
+
+/**
+ * Test Endpoint.
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 16th June 2009
+ */
+@WebService(name = "Endpoint", targetNamespace = "http://ws.jboss.org/jbws2682")
+public interface Endpoint
+{
+
+ public int echo(final int value);
+
+}
Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2682/EndpointImpl.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2682/EndpointImpl.java 2009-06-17 17:06:56 UTC (rev 10202)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2682/EndpointImpl.java 2009-06-30 15:36:17 UTC (rev 10267)
@@ -1,46 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.jbws2682;
-
-import org.jboss.logging.Logger;
-
-import javax.jws.WebService;
-
-/**
- * Test Endpoint implementation.
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 16th June 2009
- */
-@WebService(name = "Endpoint", targetNamespace = "http://ws.jboss.org/jbws2682", endpointInterface = "org.jboss.test.ws.jaxws.jbws2682.Endpoint")
-public class EndpointImpl implements Endpoint
-{
-
- private static final Logger log = Logger.getLogger(EndpointImpl.class);
-
- public int echo(final int value)
- {
- log.debug("echoing '" + value + "'");
- return value;
- }
-
-}
Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2682/EndpointImpl.java (from rev 10202, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2682/EndpointImpl.java)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2682/EndpointImpl.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2682/EndpointImpl.java 2009-06-30 15:36:17 UTC (rev 10267)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jbws2682;
+
+import org.jboss.logging.Logger;
+
+import javax.jws.WebService;
+
+/**
+ * Test Endpoint implementation.
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 16th June 2009
+ */
+@WebService(name = "Endpoint", targetNamespace = "http://ws.jboss.org/jbws2682", endpointInterface = "org.jboss.test.ws.jaxws.jbws2682.Endpoint")
+public class EndpointImpl implements Endpoint
+{
+
+ private static final Logger log = Logger.getLogger(EndpointImpl.class);
+
+ public int echo(final int value)
+ {
+ log.debug("echoing '" + value + "'");
+ return value;
+ }
+
+}
Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2682/JBWS2682TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2682/JBWS2682TestCase.java 2009-06-17 17:06:56 UTC (rev 10202)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2682/JBWS2682TestCase.java 2009-06-30 15:36:17 UTC (rev 10267)
@@ -1,120 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.jbws2682;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.util.Iterator;
-
-import javax.xml.namespace.QName;
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.SOAPBody;
-import javax.xml.soap.SOAPConnection;
-import javax.xml.soap.SOAPConnectionFactory;
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPEnvelope;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPFault;
-import javax.xml.soap.SOAPMessage;
-
-import junit.framework.Test;
-
-import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
-
-/**
- * JBWS2682 Test Case
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 16th June 2009
- * @see https://jira.jboss.org/jira/browse/JBWS-2682
- */
-public class JBWS2682TestCase extends JBossWSTest
-{
-
- public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2682/TestEndpoint";
-
- private String badMsgString =
- "<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/' xmlns:jbw='http://ws.jboss.org/jbws2682'>" +
- " <soapenv:Header/>" + " <soapenv:Body>" +
- " <jbw:echo>" +
- " <arg0>1-1</arg0>" +
- " </jbw:echo>" +
- " </soapenv:Body>" +
- "</soapenv:Envelope>";
-
- private String goodMsgString =
- "<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/' xmlns:jbw='http://ws.jboss.org/jbws2682'>" +
- " <soapenv:Header/>" +
- " <soapenv:Body>" +
- " <jbw:echo>" +
- " <arg0>646</arg0>" +
- " </jbw:echo>" +
- " </soapenv:Body>" +
- "</soapenv:Envelope>";
-
- public static Test suite() throws Exception
- {
- return new JBossWSTestSetup(JBWS2682TestCase.class, "jaxws-jbws2682.war");
- }
-
- public void testGoodMessage() throws Exception
- {
- SOAPMessage response = sendMessage(this.goodMsgString);
- SOAPEnvelope resEnv = response.getSOAPPart().getEnvelope();
- SOAPBody resBody = resEnv.getBody();
-
- Iterator it = resBody.getChildElements(new QName("http://ws.jboss.org/jbws2682", "echoResponse"));
- SOAPElement echoResponse = (SOAPElement)it.next();
- it = echoResponse.getChildElements(new QName("return"));
- SOAPElement returnElement = (SOAPElement)it.next();
-
- String value = returnElement.getValue();
- assertEquals("Expected return value", "646", returnElement.getValue());
- }
-
- public void testBadMessage() throws Exception
- {
- if (true)
- {
- System.out.println("FIXME [JBWS-2682] Incorrect Parsing of Badly Formed int.");
- return;
- }
-
- SOAPMessage response = sendMessage(this.badMsgString);
- SOAPEnvelope resEnv = response.getSOAPPart().getEnvelope();
- SOAPFault fault = resEnv.getBody().getFault();
- assertNotNull("Expected fault to be raised", fault);
- }
-
- private SOAPMessage sendMessage(final String message) throws SOAPException, IOException
- {
- MessageFactory msgFactory = MessageFactory.newInstance();
- SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(message.getBytes()));
-
- SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection();
- SOAPMessage resMsg = con.call(reqMsg, TARGET_ENDPOINT_ADDRESS);
-
- return resMsg;
- }
-
-}
Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2682/JBWS2682TestCase.java (from rev 10202, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2682/JBWS2682TestCase.java)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2682/JBWS2682TestCase.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2682/JBWS2682TestCase.java 2009-06-30 15:36:17 UTC (rev 10267)
@@ -0,0 +1,120 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jbws2682;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.util.Iterator;
+
+import javax.xml.namespace.QName;
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.SOAPBody;
+import javax.xml.soap.SOAPConnection;
+import javax.xml.soap.SOAPConnectionFactory;
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPEnvelope;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPFault;
+import javax.xml.soap.SOAPMessage;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * JBWS2682 Test Case
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 16th June 2009
+ * @see https://jira.jboss.org/jira/browse/JBWS-2682
+ */
+public class JBWS2682TestCase extends JBossWSTest
+{
+
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2682/TestEndpoint";
+
+ private String badMsgString =
+ "<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/' xmlns:jbw='http://ws.jboss.org/jbws2682'>" +
+ " <soapenv:Header/>" + " <soapenv:Body>" +
+ " <jbw:echo>" +
+ " <arg0>1-1</arg0>" +
+ " </jbw:echo>" +
+ " </soapenv:Body>" +
+ "</soapenv:Envelope>";
+
+ private String goodMsgString =
+ "<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/' xmlns:jbw='http://ws.jboss.org/jbws2682'>" +
+ " <soapenv:Header/>" +
+ " <soapenv:Body>" +
+ " <jbw:echo>" +
+ " <arg0>646</arg0>" +
+ " </jbw:echo>" +
+ " </soapenv:Body>" +
+ "</soapenv:Envelope>";
+
+ public static Test suite() throws Exception
+ {
+ return new JBossWSTestSetup(JBWS2682TestCase.class, "jaxws-jbws2682.war");
+ }
+
+ public void testGoodMessage() throws Exception
+ {
+ SOAPMessage response = sendMessage(this.goodMsgString);
+ SOAPEnvelope resEnv = response.getSOAPPart().getEnvelope();
+ SOAPBody resBody = resEnv.getBody();
+
+ Iterator it = resBody.getChildElements(new QName("http://ws.jboss.org/jbws2682", "echoResponse"));
+ SOAPElement echoResponse = (SOAPElement)it.next();
+ it = echoResponse.getChildElements(new QName("return"));
+ SOAPElement returnElement = (SOAPElement)it.next();
+
+ String value = returnElement.getValue();
+ assertEquals("Expected return value", "646", returnElement.getValue());
+ }
+
+ public void testBadMessage() throws Exception
+ {
+ if (true)
+ {
+ System.out.println("FIXME [JBWS-2682] Incorrect Parsing of Badly Formed int.");
+ return;
+ }
+
+ SOAPMessage response = sendMessage(this.badMsgString);
+ SOAPEnvelope resEnv = response.getSOAPPart().getEnvelope();
+ SOAPFault fault = resEnv.getBody().getFault();
+ assertNotNull("Expected fault to be raised", fault);
+ }
+
+ private SOAPMessage sendMessage(final String message) throws SOAPException, IOException
+ {
+ MessageFactory msgFactory = MessageFactory.newInstance();
+ SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(message.getBytes()));
+
+ SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection();
+ SOAPMessage resMsg = con.call(reqMsg, TARGET_ENDPOINT_ADDRESS);
+
+ return resMsg;
+ }
+
+}
Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2682 (from rev 10202, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2682)
Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2682/WEB-INF (from rev 10202, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2682/WEB-INF)
Deleted: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2682/WEB-INF/web.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2682/WEB-INF/web.xml 2009-06-17 17:06:56 UTC (rev 10202)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2682/WEB-INF/web.xml 2009-06-30 15:36:17 UTC (rev 10267)
@@ -1,18 +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>TestEndpoint</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxws.jbws2682.EndpointImpl</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>TestEndpoint</servlet-name>
- <url-pattern>/TestEndpoint</url-pattern>
- </servlet-mapping>
-
-</web-app>
Copied: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2682/WEB-INF/web.xml (from rev 10202, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2682/WEB-INF/web.xml)
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2682/WEB-INF/web.xml (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2682/WEB-INF/web.xml 2009-06-30 15:36:17 UTC (rev 10267)
@@ -0,0 +1,18 @@
+<?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>TestEndpoint</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws2682.EndpointImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestEndpoint</servlet-name>
+ <url-pattern>/TestEndpoint</url-pattern>
+ </servlet-mapping>
+
+</web-app>
14 years, 11 months
- 1
- 0
JBossWS SVN: r10266 - in stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws: core/soap and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-06-30 10:36:43 -0400 (Tue, 30 Jun 2009)
New Revision: 10266
Modified:
stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/core/client/NettyClient.java
stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/core/client/WSResponseHandler.java
stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshallerHTTP.java
stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMSender.java
Log:
Fix
Modified: stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/core/client/NettyClient.java
===================================================================
--- stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/core/client/NettyClient.java 2009-06-30 14:28:21 UTC (rev 10265)
+++ stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/core/client/NettyClient.java 2009-06-30 14:36:43 UTC (rev 10266)
@@ -68,6 +68,9 @@
*/
public class NettyClient
{
+ public static final String RESPONSE_CODE = "ResponseCode";
+ public static final String RESPONSE_CODE_MESSAGE = "ResponseCodeMessage";
+
private Marshaller marshaller;
private UnMarshaller unmarshaller;
private Long timeout;
Modified: stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/core/client/WSResponseHandler.java
===================================================================
--- stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/core/client/WSResponseHandler.java 2009-06-30 14:28:21 UTC (rev 10265)
+++ stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/core/client/WSResponseHandler.java 2009-06-30 14:36:43 UTC (rev 10266)
@@ -62,9 +62,8 @@
reset();
HttpResponse response = (HttpResponse)e.getMessage();
- //TODO!! fix constants
- responseHeaders.put("ResponseCode", response.getStatus().getCode());
- responseHeaders.put("ResponseCodeMessage", response.getStatus().getReasonPhrase());
+ responseHeaders.put(NettyClient.RESPONSE_CODE, response.getStatus().getCode());
+ responseHeaders.put(NettyClient.RESPONSE_CODE_MESSAGE, response.getStatus().getReasonPhrase());
for (String headerName : response.getHeaderNames())
{
responseHeaders.put(headerName, response.getHeaders(headerName));
Modified: stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshallerHTTP.java
===================================================================
--- stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshallerHTTP.java 2009-06-30 14:28:21 UTC (rev 10265)
+++ stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshallerHTTP.java 2009-06-30 14:36:43 UTC (rev 10266)
@@ -34,6 +34,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.WSException;
+import org.jboss.ws.core.client.NettyClient;
import org.jboss.ws.core.client.UnMarshaller;
/**
@@ -62,8 +63,7 @@
try
{
- //TODO!!!! fix constants
- Integer resCode = (Integer)metadata.get("ResponseCode");
+ Integer resCode = (Integer)metadata.get(NettyClient.RESPONSE_CODE);
if (resCode == null)
{
log.warn("No HTTP resonse code, assuming: SC_OK");
Modified: stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMSender.java
===================================================================
--- stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMSender.java 2009-06-30 14:28:21 UTC (rev 10265)
+++ stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMSender.java 2009-06-30 14:36:43 UTC (rev 10266)
@@ -33,7 +33,7 @@
import javax.servlet.http.HttpServletResponse;
import org.jboss.logging.Logger;
-import org.jboss.remoting.transport.http.HTTPMetadataConstants;
+import org.jboss.ws.core.client.NettyClient;
import org.jboss.ws.extensions.wsrm.api.RMException;
import org.jboss.ws.extensions.wsrm.config.RMMessageRetransmissionConfig;
@@ -124,7 +124,7 @@
Map<String, Object> remotingCtx = result.getResponse().getMetadata().getContext(RMChannelConstants.REMOTING_INVOCATION_CONTEXT);
if (remotingCtx != null)
{
- if (Integer.valueOf(HttpServletResponse.SC_INTERNAL_SERVER_ERROR).equals(remotingCtx.get(HTTPMetadataConstants.RESPONSE_CODE)))
+ if (Integer.valueOf(HttpServletResponse.SC_INTERNAL_SERVER_ERROR).equals(remotingCtx.get(NettyClient.RESPONSE_CODE)))
{
logger.debug("Response message received in " + (endTime - startTime) + " miliseconds, but contains internal server code, going to resend the request message");
continue;
14 years, 11 months
- 1
- 0
JBossWS SVN: r10265 - in stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws: core/soap and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-06-30 10:28:21 -0400 (Tue, 30 Jun 2009)
New Revision: 10265
Added:
stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RemotingRMUnMarshaller.java
Modified:
stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java
stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPConnectionImpl.java
stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelTask.java
stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMarshaller.java
stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMetadata.java
stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMUnMarshaller.java
stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/backchannel/RMBackPortsServer.java
Log:
WS-RM impl now using Netty on client side
Modified: stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java
===================================================================
--- stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2009-06-30 12:42:15 UTC (rev 10264)
+++ stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2009-06-30 14:28:21 UTC (rev 10265)
@@ -34,6 +34,7 @@
import org.jboss.ws.core.MessageAbstraction;
import org.jboss.ws.core.MessageTrace;
import org.jboss.ws.extensions.wsrm.transport.RMChannel;
+import org.jboss.ws.extensions.wsrm.transport.RMMetadata;
import org.jboss.ws.extensions.wsrm.transport.RMTransportHelper;
/**
@@ -153,18 +154,19 @@
if (RMTransportHelper.isRMMessage(callProps))
{
-// try
-// {
-// RMMetadata rmMetadata = new RMMetadata(null, targetAddress, marshaller, unmarshaller, callProps, metadata, null); //TODO!! remoting version, client config, etc.
-// return RM_CHANNEL.send(reqMessage, rmMetadata);
-// }
-// catch (Throwable t)
-// {
-// IOException io = new IOException();
-// io.initCause(t);
-// throw io;
-// }
- return null; //TODO!!!
+ try
+ {
+ Map<String, Object> additionalHeaders = new HashMap<String, Object>();
+ populateHeaders(reqMessage, additionalHeaders);
+ RMMetadata rmMetadata = new RMMetadata(targetAddress, getMarshaller(), getUnmarshaller(), callProps, additionalHeaders);
+ return RM_CHANNEL.send(reqMessage, rmMetadata);
+ }
+ catch (Throwable t)
+ {
+ IOException io = new IOException();
+ io.initCause(t);
+ throw io;
+ }
}
else
{
Modified: stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPConnectionImpl.java
===================================================================
--- stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPConnectionImpl.java 2009-06-30 12:42:15 UTC (rev 10264)
+++ stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPConnectionImpl.java 2009-06-30 14:28:21 UTC (rev 10265)
@@ -84,7 +84,7 @@
if (reqMessage == null)
throw new IllegalArgumentException("Given SOAPMessage cannot be null");
- MessageAbstraction resMessage = callInternal(reqMessage, endpoint, true);
+ MessageAbstraction resMessage = callInternal(reqMessage, endpoint, false);
return (SOAPMessage)resMessage;
}
@@ -140,7 +140,7 @@
try
{
remotingConnection = getRemotingConnection(endpoint);
- MessageAbstraction resMessage = remotingConnection.invoke((SOAPMessageImpl)reqMessage, endpoint, oneway);
+ MessageAbstraction resMessage = remotingConnection.invoke((SOAPMessageImpl)reqMessage, endpoint, oneway, false);
return resMessage;
}
catch (Exception ex)
Modified: stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelTask.java
===================================================================
--- stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelTask.java 2009-06-30 12:42:15 UTC (rev 10264)
+++ stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelTask.java 2009-06-30 14:28:21 UTC (rev 10265)
@@ -23,15 +23,13 @@
import java.io.IOException;
import java.net.URI;
+import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.Callable;
import org.jboss.logging.Logger;
-import org.jboss.remoting.CannotConnectException;
-import org.jboss.remoting.Client;
-import org.jboss.remoting.InvokerLocator;
-import org.jboss.remoting.marshal.MarshalFactory;
import org.jboss.ws.core.MessageTrace;
+import org.jboss.ws.core.client.NettyClient;
import org.jboss.ws.extensions.wsrm.RMClientSequence;
import org.jboss.ws.extensions.wsrm.transport.backchannel.RMCallbackHandler;
import org.jboss.ws.extensions.wsrm.transport.backchannel.RMCallbackHandlerFactory;
@@ -44,7 +42,6 @@
final class RMChannelTask implements Callable<RMChannelResponse>
{
private static final Logger logger = Logger.getLogger(RMChannelTask.class);
- private static final String JBOSSWS_SUBSYSTEM = "jbossws-wsrm";
private final RMMessage rmRequest;
RMChannelTask(RMMessage rmRequest)
@@ -58,14 +55,6 @@
try
{
String targetAddress = (String)rmRequest.getMetadata().getContext(RMChannelConstants.INVOCATION_CONTEXT).get(RMChannelConstants.TARGET_ADDRESS);
- String version = (String)rmRequest.getMetadata().getContext(RMChannelConstants.INVOCATION_CONTEXT).get(RMChannelConstants.REMOTING_VERSION);
-
- if (version.startsWith("1.4"))
- {
- MarshalFactory.addMarshaller("JBossWSMessage", RMMarshaller.getInstance(), RMUnMarshaller.getInstance());
- }
-
- InvokerLocator locator = new InvokerLocator(targetAddress);
URI backPort = RMTransportHelper.getBackPortURI(rmRequest);
String messageId = RMTransportHelper.getAddressingMessageId(rmRequest);
@@ -83,39 +72,19 @@
}
boolean oneWay = RMTransportHelper.isOneWayOperation(rmRequest);
- Client client = new Client(locator, JBOSSWS_SUBSYSTEM, rmRequest.getMetadata().getContext(RMChannelConstants.REMOTING_CONFIGURATION_CONTEXT));
- client.connect();
-
- client.setMarshaller(RMMarshaller.getInstance());
-
- if ((false == oneWay) && (null == backPort))
- client.setUnMarshaller(RMUnMarshaller.getInstance());
-
- Map<String, Object> remotingInvocationContext = rmRequest.getMetadata().getContext(RMChannelConstants.REMOTING_INVOCATION_CONTEXT);
-
- // debug the outgoing request message
- MessageTrace.traceMessage("Outgoing RM Request Message", rmRequest.getPayload());
-
+ NettyClient client = new NettyClient(RMMarshaller.getInstance(), RMUnMarshaller.getInstance());
+ Map<String, Object> additionalHeaders = rmRequest.getMetadata().getContext(RMChannelConstants.REMOTING_INVOCATION_CONTEXT);
+ Map<String, Object> callProps = new HashMap<String, Object>();
+ callProps.putAll(rmRequest.getMetadata().getContext(RMChannelConstants.INVOCATION_CONTEXT));
+
RMMessage rmResponse = null;
if (oneWay && (null == backPort))
{
- client.invokeOneway(rmRequest.getPayload(), remotingInvocationContext, false);
+ client.invoke(rmRequest.getPayload(), targetAddress, false, additionalHeaders, callProps);
}
else
{
- Object retVal = null;
- try
- {
- retVal = client.invoke(rmRequest.getPayload(), remotingInvocationContext);
- }
- catch (CannotConnectException cce)
- {
- // remoting hack - ignore NullPointerException cause
- if (false == (cce.getCause() instanceof NullPointerException))
- {
- throw cce;
- }
- }
+ Object retVal = client.invoke(rmRequest.getPayload(), targetAddress, true, additionalHeaders, callProps);
if ((null != retVal) && (false == (retVal instanceof RMMessage)))
{
String msg = retVal.getClass().getName() + ": '" + retVal + "'";
@@ -124,10 +93,8 @@
}
rmResponse = (RMMessage)retVal;
}
+ rmRequest.getMetadata().getContext(RMChannelConstants.INVOCATION_CONTEXT).putAll(callProps);
- // Disconnect the remoting client
- client.disconnect();
-
// trace the incomming response message
if ((rmResponse != null) && (backPort == null))
MessageTrace.traceMessage("Incoming RM Response Message", rmResponse.getPayload());
@@ -148,4 +115,4 @@
return new RMChannelResponse(t);
}
}
-}
+}
\ No newline at end of file
Modified: stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMarshaller.java
===================================================================
--- stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMarshaller.java 2009-06-30 12:42:15 UTC (rev 10264)
+++ stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMarshaller.java 2009-06-30 14:28:21 UTC (rev 10265)
@@ -24,9 +24,7 @@
import java.io.IOException;
import java.io.OutputStream;
-import org.jboss.remoting.InvocationRequest;
-import org.jboss.remoting.invocation.OnewayInvocation;
-import org.jboss.remoting.marshal.Marshaller;
+import org.jboss.ws.core.client.Marshaller;
/**
* Marshalls byte array to the output stream
@@ -49,12 +47,6 @@
public void write(Object dataObject, OutputStream output) throws IOException
{
- if (dataObject instanceof InvocationRequest)
- dataObject = ((InvocationRequest)dataObject).getParameter();
-
- if (dataObject instanceof OnewayInvocation)
- dataObject = ((OnewayInvocation)dataObject).getParameters()[0];
-
if ((dataObject instanceof byte[]) == false)
throw new IllegalArgumentException("Not a byte array: " + dataObject);
Modified: stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMetadata.java
===================================================================
--- stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMetadata.java 2009-06-30 12:42:15 UTC (rev 10264)
+++ stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMMetadata.java 2009-06-30 14:28:21 UTC (rev 10265)
@@ -37,19 +37,16 @@
private Map<String, Map<String, Object>> contexts = new HashMap<String, Map<String, Object>>();
public RMMetadata(
- String remotingVersion,
String targetAddress,
Marshaller marshaller,
UnMarshaller unmarshaller,
Map<String, Object> invocationContext,
- Map<String, Object> remotingInvocationContext,
- Map<String, Object> remotingConfigurationContext)
+ Map<String, Object> remotingInvocationContext)
{
if (targetAddress == null)
throw new IllegalArgumentException("Target address cannot be null");
invocationContext.put(RMChannelConstants.TARGET_ADDRESS, targetAddress);
- invocationContext.put(RMChannelConstants.REMOTING_VERSION, remotingVersion);
setContext(RMChannelConstants.INVOCATION_CONTEXT, invocationContext);
if (marshaller == null || unmarshaller == null)
@@ -64,11 +61,6 @@
throw new IllegalArgumentException("Remoting invocation context cannot be null");
setContext(RMChannelConstants.REMOTING_INVOCATION_CONTEXT, remotingInvocationContext);
-
- if (remotingConfigurationContext == null)
- throw new IllegalArgumentException("Remoting configuraton context cannot be null");
-
- setContext(RMChannelConstants.REMOTING_CONFIGURATION_CONTEXT, remotingConfigurationContext);
}
public RMMetadata(Map<String, Object> remotingInvocationContext)
Modified: stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMUnMarshaller.java
===================================================================
--- stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMUnMarshaller.java 2009-06-30 12:42:15 UTC (rev 10264)
+++ stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMUnMarshaller.java 2009-06-30 14:28:21 UTC (rev 10265)
@@ -26,7 +26,7 @@
import java.io.InputStream;
import java.util.Map;
-import org.jboss.remoting.marshal.UnMarshaller;
+import org.jboss.ws.core.client.UnMarshaller;
/**
* Unmarshalls byte array from the input stream
@@ -41,13 +41,13 @@
{
return getInstance();
}
-
+
public static UnMarshaller getInstance()
{
return instance;
}
-
- public Object read(InputStream is, Map metadata) throws IOException, ClassNotFoundException
+
+ public Object read(InputStream is, Map metadata) throws IOException
{
if (is == null)
return RMMessageFactory.newMessage(null, new RMMetadata(metadata)); // TODO: investigate why is == null (WSAddressing reply-to test)
@@ -64,10 +64,4 @@
return RMMessageFactory.newMessage(baos.toByteArray(), new RMMetadata(metadata));
}
- public void setClassLoader(ClassLoader classloader)
- {
- // do nothing
- }
-
}
-
Added: stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RemotingRMUnMarshaller.java
===================================================================
--- stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RemotingRMUnMarshaller.java (rev 0)
+++ stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RemotingRMUnMarshaller.java 2009-06-30 14:28:21 UTC (rev 10265)
@@ -0,0 +1,74 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.transport;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Map;
+
+import org.jboss.remoting.marshal.UnMarshaller;
+
+
+/**
+ * Unmarshalls byte array from the input stream
+ *
+ * @author richard.opalka(a)jboss.com
+ */
+public final class RemotingRMUnMarshaller implements UnMarshaller
+{
+ private static final UnMarshaller instance = new RemotingRMUnMarshaller();
+
+ public UnMarshaller cloneUnMarshaller() throws CloneNotSupportedException
+ {
+ return getInstance();
+ }
+
+ public static UnMarshaller getInstance()
+ {
+ return instance;
+ }
+
+ public Object read(InputStream is, Map metadata) throws IOException
+ {
+ if (is == null)
+ return RMMessageFactory.newMessage(null, new RMMetadata(metadata)); // TODO: investigate why is == null (WSAddressing reply-to test)
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ byte[] buffer = new byte[1024];
+ int count = -1;
+ count = is.read(buffer);
+ while (count != -1)
+ {
+ baos.write(buffer, 0, count);
+ count = is.read(buffer);
+ }
+ return RMMessageFactory.newMessage(baos.toByteArray(), new RMMetadata(metadata));
+ }
+
+ public void setClassLoader(ClassLoader classloader)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+}
Property changes on: stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/RemotingRMUnMarshaller.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/backchannel/RMBackPortsServer.java
===================================================================
--- stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/backchannel/RMBackPortsServer.java 2009-06-30 12:42:15 UTC (rev 10264)
+++ stack/native/branches/netty/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/transport/backchannel/RMBackPortsServer.java 2009-06-30 14:28:21 UTC (rev 10265)
@@ -28,8 +28,7 @@
import org.jboss.remoting.InvokerLocator;
import org.jboss.remoting.transport.Connector;
import org.jboss.ws.extensions.wsrm.api.RMException;
-import org.jboss.ws.extensions.wsrm.transport.RMMarshaller;
-import org.jboss.ws.extensions.wsrm.transport.RMUnMarshaller;
+import org.jboss.ws.extensions.wsrm.transport.RemotingRMUnMarshaller;
/**
* Back ports server used by addressable clients
@@ -80,7 +79,7 @@
try
{
// we have to use custom unmarshaller because default one removes CRNLs
- String customUnmarshaller = "/?unmarshaller=" + RMUnMarshaller.class.getName();
+ String customUnmarshaller = "/?unmarshaller=" + RemotingRMUnMarshaller.class.getName();
InvokerLocator il = new InvokerLocator(this.scheme + "://" + this.host + ":" + this.port + customUnmarshaller);
this.connector = new Connector();
this.connector.setInvokerLocator(il.getLocatorURI());
14 years, 11 months
- 1
- 0
JBossWS SVN: r10264 - container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-06-30 08:42:15 -0400 (Tue, 30 Jun 2009)
New Revision: 10264
Modified:
container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml
Log:
[JBWS-2332][JBWS-2382] refactoring - removing duplicated DA (WIP)
Modified: container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2009-06-30 12:37:20 UTC (rev 10263)
+++ container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2009-06-30 12:42:15 UTC (rev 10264)
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
+
<!-- Locate the single instance of the kernel -->
<bean name="WSKernelLocator" class="org.jboss.wsf.spi.util.KernelLocator">
<property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
</bean>
-
+
<!-- Locate the single instance of the MBeanServer -->
<bean name="WSMBeanServerLocator" class="org.jboss.wsf.framework.management.MBeanServerLocator">
<property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
</bean>
-
- <!-- An abstraction of server configuration aspects. -->
+
+ <!-- An abstraction of server configuration aspects. -->
<bean name="WSServerConfig" class="org.jboss.wsf.container.jboss50.deployer.ServerConfigImpl">
<property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
@@ -30,21 +30,21 @@
<!--
Set these properties to explicitly define the ports that will be used for rewriting the SOAP address.
- Otherwise the ports will be identified by querying the list of installed connectors.
+ Otherwise the ports will be identified by querying the list of installed connectors.
If multiple connectors are found the port of the first connector is used.
<property name="webServiceSecurePort">8443</property>
<property name="webServicePort">8080</property>
-->
</bean>
- <!-- deployers -->
+ <!-- deployers -->
<bean name="WSDescriptorDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDescriptorDeployer">
<property name="name">webservices.xml</property>
<property name="useSchemaValidation">true</property>
</bean>
-
+
<bean name="WSEJBAdapterDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSEJBAdapterDeployer"/>
-
+
<bean name="WSTypeDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSTypeDeployer">
<property name="relativeOrder">1</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
@@ -56,10 +56,8 @@
<bean name="WSDeploymentAspectsDeployer" class="org.jboss.wsf.container.jboss50.deployer.WSDeploymentAspectDeployer">
<property name="relativeOrder">3</property> <!-- [JBDEPLOY-201] workaround -->
</bean>
-
- <!--
- Register DeployerHooks with JBoss deployers
- -->
+
+ <!-- Register DeployerHooks with JBoss deployers -->
<bean name="WSDeployerHook" class="org.jboss.wsf.container.jboss50.deployer.DeployerHookImpl">
<property name="deploymentManagerName">WSDeploymentAspectManager</property>
<install bean="WSDeploymentAspectsDeployer" method="addDeployerHook">
@@ -74,95 +72,85 @@
</uninstall>
<depends>WSDeploymentAspectsDeployer</depends>
</bean>
-
- <!--
- Each DeploymentAspectManger maintains a list of DeploymentAspects
- -->
+
+ <!-- Each DeploymentAspectManger maintains a list of DeploymentAspects -->
<bean name="WSDeploymentAspectManager" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl">
<property name="name">WSDeploymentAspectManager</property>
</bean>
-
- <!--
- The container deployment aspects
- -->
+
+ <!-- The container deployment aspects -->
<bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss50.deployment.metadata.ContainerMetaDataDeploymentAspect">
<property name="provides">ContainerMetaData, VFSRoot</property>
</bean>
-
+
<bean name="WSInjectionMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss50.deployment.metadata.InjectionMetaDataDeploymentAspect">
<property name="requires">WebMetaData</property>
<property name="provides">InjectionMetaData</property>
<property name="ejbReferenceResolver"><inject bean="org.jboss.ejb3.EjbReferenceResolver"/></property>
- </bean>
+ </bean>
<bean name="WSContextRootDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleContextRootDeploymentAspect">
<property name="requires">ContainerMetaData</property>
<property name="provides">ContextRoot</property>
</bean>
-
+
<bean name="WSVirtualHostDeploymentAspect" class="org.jboss.wsf.framework.deployment.VirtualHostDeploymentAspect">
<property name="requires">ContainerMetaData</property>
<property name="provides">VirtualHosts</property>
</bean>
-
+
<bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAddressDeploymentAspect">
<property name="requires">URLPattern</property>
<property name="provides">EndpointAddress</property>
</bean>
-
- <bean name="WSEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
- <property name="requires">ContainerMetaData</property>
- <property name="provides">ContainerEndpointHandler</property>
- </bean>
-
+
<bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointLifecycleDeploymentAspect">
<property name="requires">LAST_DEPLOYMENT_ASPECT</property>
</bean>
-
+
<bean name="WSEndpointMetricsDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointMetricsDeploymentAspect">
<property name="provides">EndpointMetrics</property>
</bean>
-
+
<bean name="WSEndpointNameDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointNameDeploymentAspect">
<property name="requires">URLPattern</property>
<property name="provides">EndpointName</property>
</bean>
-
+
<bean name="WSEndpointRegistryDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRegistryDeploymentAspect">
<property name="requires">EndpointName</property>
<property name="provides">RegisteredEndpoint</property>
</bean>
-
+
<bean name="WSRuntimeLoaderDeploymentAspect" class="org.jboss.wsf.container.jboss50.deployment.RuntimeLoaderDeploymentAspect">
<property name="requires">ContainerMetaData</property>
<property name="provides">RuntimeLoader</property>
</bean>
-
+
<bean name="WSURLPatternDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleURLPatternDeploymentAspect">
<property name="requires">ContextRoot, ContainerMetaData</property>
<property name="provides">URLPattern</property>
</bean>
-
+
<bean name="WSWebAppDeploymentAspect" class="org.jboss.wsf.container.jboss50.transport.WebAppDeploymentAspect">
<property name="requires">WebMetaData, ContextProperties, StackDescriptor</property>
<property name="provides">WebMetaData</property>
<property name="webMetaDataModifier"><inject bean="WSWebMetaDataModifier"/></property>
</bean>
-
+
<bean name="WSWebAppGeneratorDeploymentAspect" class="org.jboss.wsf.container.jboss50.transport.WebAppGeneratorDeploymentAspect">
<property name="requires">VirtualHosts,URLPattern</property>
<property name="provides">WebMetaData</property>
<property name="securityHandlerEJB21"><inject bean="WSSecurityHandlerEJB21"/></property>
<property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property>
</bean>
-
+
<!-- Deployment aspect helper beans -->
<bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss50.deployment.tomcat.SecurityHandlerEJB21"/>
<bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss50.deployment.tomcat.SecurityHandlerEJB3"/>
<bean name="WSWebMetaDataModifier" class="org.jboss.wsf.container.jboss50.deployment.tomcat.WebMetaDataModifierImpl"/>
-
+
<!-- Deployment aspect installers -->
-
<bean name="WSDeploymentAspectInstaller" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
<property name="manager"><inject bean="WSDeploymentAspectManager"/></property>
<property name="sortAspectsOnCreate">false</property>
@@ -173,7 +161,6 @@
<inject bean="WSInjectionMetaDataDeploymentAspect"/>
<inject bean="WSContextRootDeploymentAspect"/>
<inject bean="WSEndpointAddressDeploymentAspect"/>
- <inject bean="WSEndpointHandlerDeploymentAspect"/>
<inject bean="WSEndpointMetricsDeploymentAspect"/>
<inject bean="WSEndpointNameDeploymentAspect"/>
<inject bean="WSEndpointRegistryDeploymentAspect"/>
14 years, 11 months
- 1
- 0
JBossWS SVN: r10263 - stack/native/branches/ropalka/modules/core/src/main/resources.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-06-30 08:37:20 -0400 (Tue, 30 Jun 2009)
New Revision: 10263
Modified:
stack/native/branches/ropalka/modules/core/src/main/resources/jbossws-native-config.xml
Log:
[JBWS-2332][JBWS-2382] refactoring - fixing DAs ordering (WIP)
Modified: stack/native/branches/ropalka/modules/core/src/main/resources/jbossws-native-config.xml
===================================================================
--- stack/native/branches/ropalka/modules/core/src/main/resources/jbossws-native-config.xml 2009-06-30 12:35:46 UTC (rev 10262)
+++ stack/native/branches/ropalka/modules/core/src/main/resources/jbossws-native-config.xml 2009-06-30 12:37:20 UTC (rev 10263)
@@ -2,12 +2,12 @@
<bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry">
<property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
</bean>
-
+
<!-- A subscription manager for WS-Eventing -->
<bean name="WSSubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager">
<property name="bindAddress">${jboss.bind.address}</property>
</bean>
-
+
<!-- Installed Record Processors-->
<bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder">
<property name="recording">false</property>
@@ -15,10 +15,8 @@
<bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder">
<property name="recording">false</property>
</bean>
-
- <!--
- The stack specific deployment aspects
- -->
+
+ <!-- The stack specific deployment aspects -->
<bean name="WSNativeContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect">
<property name="provides">ContextProperties, StackDescriptor</property>
<property name="contextProperties">
@@ -27,21 +25,21 @@
</map>
</property>
</bean>
-
+
<bean name="WSNativeEagerInitializeDeploymentAspect" class="org.jboss.wsf.stack.jbws.EagerInitializeDeploymentAspect">
<property name="requires">UnifiedMetaDataModel</property>
<property name="provides">InitializedMetaDataModel</property>
</bean>
-
+
<bean name="WSNativeEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
- <property name="requires">ContainerEndpointHandler, ContainerMetaData</property>
- <property name="provides">StackEndpointHandler</property>
+ <property name="requires">ContainerMetaData</property>
+ <property name="provides">StackEndpointHandler</property>
</bean>
-
+
<bean name="WSNativeEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect">
<property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
<property name="requires">RegisteredEndpoint</property>
- <property name="provides">EndpointRecordProcessors</property>
+ <property name="provides">EndpointRecordProcessors</property>
<property name="processors">
<list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor">
<inject bean="WSMemoryBufferRecorder"/>
@@ -49,35 +47,34 @@
</list>
</property>
</bean>
-
+
<bean name="WSNativeEventingDeploymentAspect" class="org.jboss.wsf.stack.jbws.EventingDeploymentAspect">
<property name="requires">UnifiedMetaDataModel</property>
</bean>
-
+
<bean name="WSNativePublishContractDeploymentAspect" class="org.jboss.wsf.stack.jbws.PublishContractDeploymentAspect">
<property name="requires">UnifiedMetaDataModel, JAXBIntros</property>
<property name="provides">PublishedContract</property>
</bean>
-
+
<bean name="WSNativeServiceEndpointInvokerDeploymentAspect" class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeploymentAspect">
<property name="requires">UnifiedMetaDataModel</property>
</bean>
-
+
<bean name="WSNativeRMDeploymentAspect" class="org.jboss.ws.extensions.wsrm.server.RMDeploymentAspect">
<property name="requires">StackEndpointHandler, UnifiedMetaDataModel</property>
</bean>
-
+
<bean name="WSNativeUnifiedMetaDataDeploymentAspect" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect">
<property name="requires">RuntimeLoader, ContainerMetaData, URLPattern, VFSRoot, JAXBIntros</property>
<property name="provides">UnifiedMetaDataModel</property>
</bean>
- <bean name="WSJAXBIntroDeploymentAspect" class="org.jboss.wsf.stack.jbws.JAXBIntroDeploymentAspect">
+ <bean name="WSJAXBIntroDeploymentAspect" class="org.jboss.wsf.stack.jbws.JAXBIntroDeploymentAspect">
<property name="provides">JAXBIntros</property>
</bean>
<!-- Deployment aspect installers -->
- <!-- Phase 1 -->
<bean name="WSNativeDeploymentAspectInstaller" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
<property name="manager"><inject bean="WSDeploymentAspectManager"/></property>
<property name="sortAspectsOnCreate">true</property>
14 years, 11 months
- 1
- 0
JBossWS SVN: r10262 - stack/metro/branches/ropalka/modules/server/src/main/resources.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-06-30 08:35:46 -0400 (Tue, 30 Jun 2009)
New Revision: 10262
Modified:
stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-config.xml
Log:
[JBWS-2332][JBWS-2382] refactoring - fixing DAs ordering (WIP)
Modified: stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-config.xml
===================================================================
--- stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-config.xml 2009-06-30 12:35:18 UTC (rev 10261)
+++ stack/metro/branches/ropalka/modules/server/src/main/resources/jbossws-metro-config.xml 2009-06-30 12:35:46 UTC (rev 10262)
@@ -3,7 +3,7 @@
<bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry">
<property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
</bean>
-
+
<!-- Logging redirector -->
<bean name="JDKLogRedirector" class="org.jboss.wsf.common.logging.JDKLogRedirector">
<property name="namespaces">
@@ -13,7 +13,7 @@
</list>
</property>
</bean>
-
+
<!-- Installed Record Processors-->
<bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder">
<property name="recording">false</property>
@@ -21,28 +21,26 @@
<bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder">
<property name="recording">false</property>
</bean>
-
- <!--
- The stack specific deployment aspects
- -->
+
+ <!-- The stack specific deployment aspects -->
<bean name="WSMetroContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect">
<property name="provides">ContextProperties</property>
<property name="contextProperties">
<map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.metro.EndpointServlet</value></entry>
+ <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.metro.EndpointServlet</value></entry>
</map>
</property>
</bean>
<bean name="WSMetroEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
- <property name="requires">ContainerEndpointHandler</property>
+ <property name="requires">ContainerMetaData</property>
<property name="provides">StackEndpointHandler</property>
</bean>
-
+
<bean name="WSMetroEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect">
<property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
<property name="requires">RegisteredEndpoint</property>
- <property name="provides">EndpointRecordProcessors</property>
+ <property name="provides">EndpointRecordProcessors</property>
<property name="processors">
<list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor">
<inject bean="WSMemoryBufferRecorder"/>
@@ -62,7 +60,6 @@
</bean>
<!-- Deployment aspect installers -->
-
<bean name="WSMetroDeploymentAspectInstaller" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
<property name="manager"><inject bean="WSDeploymentAspectManager"/></property>
<property name="sortAspectsOnCreate">true</property>
14 years, 11 months
- 1
- 0
JBossWS SVN: r10261 - stack/cxf/branches/ropalka/modules/server/src/main/resources.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-06-30 08:35:18 -0400 (Tue, 30 Jun 2009)
New Revision: 10261
Modified:
stack/cxf/branches/ropalka/modules/server/src/main/resources/jbossws-cxf-config.xml
Log:
[JBWS-2332][JBWS-2382] refactoring - fixing DAs ordering (WIP)
Modified: stack/cxf/branches/ropalka/modules/server/src/main/resources/jbossws-cxf-config.xml
===================================================================
--- stack/cxf/branches/ropalka/modules/server/src/main/resources/jbossws-cxf-config.xml 2009-06-30 12:07:02 UTC (rev 10260)
+++ stack/cxf/branches/ropalka/modules/server/src/main/resources/jbossws-cxf-config.xml 2009-06-30 12:35:18 UTC (rev 10261)
@@ -1,9 +1,9 @@
-
+
<!-- The registry for web service endpoints -->
<bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry">
<property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
</bean>
-
+
<!-- Logging redirector -->
<bean name="JDKLogRedirector" class="org.jboss.wsf.common.logging.JDKLogRedirector">
<property name="namespaces">
@@ -21,9 +21,7 @@
<property name="recording">false</property>
</bean>
- <!--
- The stack specific deployment aspects
- -->
+ <!-- The stack specific deployment aspects -->
<bean name="WSCXFContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect">
<property name="provides">ContextProperties</property>
<property name="contextProperties">
@@ -41,8 +39,8 @@
</bean>
<bean name="WSCXFEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect">
- <property name="requires">ContainerEndpointHandler</property>
- <property name="provides">StackEndpointHandler</property>
+ <property name="requires">ContainerMetaData</property>
+ <property name="provides">StackEndpointHandler</property>
</bean>
<bean name="WSCXFEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect">
@@ -57,8 +55,7 @@
</property>
</bean>
- <!-- Deployment aspect installers -->
-
+ <!-- Deployment aspect installers -->
<bean name="WSCXFDeploymentAspectInstaller" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">
<property name="manager"><inject bean="WSDeploymentAspectManager"/></property>
<property name="sortAspectsOnCreate">true</property>
14 years, 11 months
- 1
- 0
JBossWS SVN: r10260 - container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-06-30 08:07:02 -0400 (Tue, 30 Jun 2009)
New Revision: 10260
Modified:
container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml
Log:
[JBWS-2332][JBWS-2382] refactoring - removing the notion of two phase deployers (WIP)
Modified: container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2009-06-30 09:27:55 UTC (rev 10259)
+++ container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2009-06-30 12:07:02 UTC (rev 10260)
@@ -60,8 +60,6 @@
<!--
Register DeployerHooks with JBoss deployers
-->
-
- <!-- Phase 1 deployer hook -->
<bean name="WSDeployerHook" class="org.jboss.wsf.container.jboss50.deployer.DeployerHookImpl">
<property name="deploymentManagerName">WSDeploymentAspectManager</property>
<install bean="WSDeploymentAspectsDeployer" method="addDeployerHook">
14 years, 11 months
- 1
- 0