JBossWS SVN: r14579 - in stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/attachment: jbws2903 and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: bmaxwell
Date: 2011-06-17 14:48:18 -0400 (Fri, 17 Jun 2011)
New Revision: 14579
Added:
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/attachment/jbws2903/
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/attachment/jbws2903/JBWS2903TestCase.java
Log:
[JBPAPP-6729] testcase for jbws2903 - Setting charset on content-type header
Added: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/attachment/jbws2903/JBWS2903TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/attachment/jbws2903/JBWS2903TestCase.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/attachment/jbws2903/JBWS2903TestCase.java 2011-06-17 18:48:18 UTC (rev 14579)
@@ -0,0 +1,73 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, 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.common.soap.attachment.jbws2903;
+
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.util.Iterator;
+
+import javax.xml.soap.AttachmentPart;
+import javax.xml.soap.SOAPMessage;
+
+import junit.framework.Test;
+
+import org.jboss.ws.core.soap.MessageFactoryImpl;
+import org.jboss.ws.core.soap.SOAPMessageImpl;
+import org.jboss.ws.core.soap.attachment.MimeConstants;
+import org.jboss.ws.core.soap.attachment.MultipartRelatedXOPEncoder;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * This tests to make sure the MTOM/XOP root MIME part contains the charset parameter
+ * @author bmaxwell
+ */
+public class JBWS2903TestCase extends JBossWSTest
+{
+ public static Test suite() throws Exception
+ {
+ return new JBossWSTestSetup(JBWS2903TestCase.class, "");
+ }
+
+ public void testCharEncodingInRootHeader() throws Exception
+ {
+ MessageFactoryImpl factory = new MessageFactoryImpl();
+ SOAPMessage msg1 = factory.createMessage();
+ AttachmentPart attachment1 = msg1.createAttachmentPart();
+ attachment1.setContent("this is a test", "text/plain; charset=UTF-8");
+ attachment1.setContentId("<attachment1(a)test.ws.jboss.org>");
+ msg1.addAttachmentPart(attachment1);
+
+ if (msg1.saveRequired())
+ msg1.saveChanges();
+
+ MultipartRelatedXOPEncoder mrxe = new MultipartRelatedXOPEncoder( (SOAPMessageImpl) msg1);
+ mrxe.encodeMultipartRelatedMessage();
+
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ mrxe.writeTo(out);
+
+ if ( ! out.toString().contains("Content-Type: application/xop+xml; charset=UTF-8; type=\"text/xml\""))
+ fail("Content-Type does not contain charset=UTF-8");
+ }
+}
13 years, 6 months
JBossWS SVN: r14578 - in stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6730/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/attachment: jbws2903 and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: bmaxwell
Date: 2011-06-17 14:46:37 -0400 (Fri, 17 Jun 2011)
New Revision: 14578
Added:
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6730/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/attachment/jbws2903/
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6730/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/attachment/jbws2903/JBWS2903TestCase.java
Log:
[JBPAPP-6730] testcase for jbws2903 - Setting charset on content-type header
Added: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6730/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/attachment/jbws2903/JBWS2903TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6730/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/attachment/jbws2903/JBWS2903TestCase.java (rev 0)
+++ stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6730/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/attachment/jbws2903/JBWS2903TestCase.java 2011-06-17 18:46:37 UTC (rev 14578)
@@ -0,0 +1,73 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, 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.common.soap.attachment.jbws2903;
+
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.util.Iterator;
+
+import javax.xml.soap.AttachmentPart;
+import javax.xml.soap.SOAPMessage;
+
+import junit.framework.Test;
+
+import org.jboss.ws.core.soap.MessageFactoryImpl;
+import org.jboss.ws.core.soap.SOAPMessageImpl;
+import org.jboss.ws.core.soap.attachment.MimeConstants;
+import org.jboss.ws.core.soap.attachment.MultipartRelatedXOPEncoder;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * This tests to make sure the MTOM/XOP root MIME part contains the charset parameter
+ * @author bmaxwell
+ */
+public class JBWS2903TestCase extends JBossWSTest
+{
+ public static Test suite() throws Exception
+ {
+ return new JBossWSTestSetup(JBWS2903TestCase.class, "");
+ }
+
+ public void testCharEncodingInRootHeader() throws Exception
+ {
+ MessageFactoryImpl factory = new MessageFactoryImpl();
+ SOAPMessage msg1 = factory.createMessage();
+ AttachmentPart attachment1 = msg1.createAttachmentPart();
+ attachment1.setContent("this is a test", "text/plain; charset=UTF-8");
+ attachment1.setContentId("<attachment1(a)test.ws.jboss.org>");
+ msg1.addAttachmentPart(attachment1);
+
+ if (msg1.saveRequired())
+ msg1.saveChanges();
+
+ MultipartRelatedXOPEncoder mrxe = new MultipartRelatedXOPEncoder( (SOAPMessageImpl) msg1);
+ mrxe.encodeMultipartRelatedMessage();
+
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ mrxe.writeTo(out);
+
+ if ( ! out.toString().contains("Content-Type: application/xop+xml; charset=UTF-8; type=\"text/xml\""))
+ fail("Content-Type does not contain charset=UTF-8");
+ }
+}
13 years, 6 months
JBossWS SVN: r14577 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-06-17 09:53:18 -0400 (Fri, 17 Jun 2011)
New Revision: 14577
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
updating excludes
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-06-17 13:48:04 UTC (rev 14576)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-06-17 13:53:18 UTC (rev 14577)
@@ -740,11 +740,12 @@
<phase>test-compile</phase>
<configuration>
<testExcludes>
- <!-- EJB3 client API dependencies -->
- <exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude>
+ <!-- TODO: tests using org.jboss.ejb3.client.ClientLauncher -->
<exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
+
+ <!-- TODO: tests using org.jboss.ejb3.annotation.SecurityDomain -->
<exclude>org/jboss/test/ws/jaxws/samples/news/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/securityDomain/**</exclude>
</testExcludes>
@@ -783,19 +784,10 @@
<!-- AS7 integration exclusions -->
<!-- ////////////////////////// -->
- <!-- EJB3 client API dependencies -->
- <exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude>
+ <!-- TODO: tests using org.jboss.ejb3.client.ClientLauncher -->
<exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/news/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/securityDomain/**</exclude>
- <!-- TODO: implement EJB security integration -->
- <exclude>org/jboss/test/ws/jaxws/jbws1991/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1988/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase*</exclude>
-
<!-- TODO: Unexpected element 'class-loading' encountered -->
<exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude>
@@ -803,10 +795,6 @@
<exclude>org/jboss/test/ws/jaxws/jbws2634/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude>
- <!-- TODO: <security-identity> element parsing is not yet implemented -->
- <exclude>org/jboss/test/ws/jaxws/jbws2957/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws2999/**</exclude>
-
<!-- TODO: EJB3 DD driven deployments -->
<exclude>org/jboss/test/ws/jaxws/jbws1309/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
@@ -817,7 +805,6 @@
<exclude>org/jboss/test/ws/jaxws/samples/dar/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/exception/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/advanced/retail/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**/*EJB3TestCase*</exclude>
<exclude>org/jboss/test/ws/management/recording/**</exclude>
<!-- # [JBWS-3219] unexpected element 'port-qname' encountered - we're waiting for jboss-metadata-common-7.0.0.Beta5 release in AS7 trunk -->
@@ -830,6 +817,7 @@
<!-- # [JBWS-3234] JNDI over RMI not available on AS7 -->
<exclude>org/jboss/test/ws/jaxrpc/**</exclude>
<exclude>org/jboss/test/ws/benchmark/jaxrpc/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/serviceref/**</exclude>
<exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/**</exclude>
@@ -840,6 +828,19 @@
<exclude>org/jboss/test/ws/jaxws/jbws2116/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws3182/**</exclude>
+ <!-- TODO: <security-identity> element parsing is not yet implemented -->
+ <exclude>org/jboss/test/ws/jaxws/jbws2957/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2999/**</exclude>
+
+ <!-- TODO: implement EJB security integration -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1991/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1988/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase*</exclude>
+
+ <!-- TODO: tests using org.jboss.ejb3.annotation.SecurityDomain -->
+ <exclude>org/jboss/test/ws/jaxws/samples/news/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/securityDomain/**</exclude>
</excludes>
</configuration>
</plugin>
13 years, 6 months
JBossWS SVN: r14576 - shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws944.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-06-17 09:48:04 -0400 (Fri, 17 Jun 2011)
New Revision: 14576
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java
Log:
fixing test to don't use EJB3 @RemoteHomeBinding & @RemoteBinding proprietary annotations
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java 2011-06-17 13:27:37 UTC (rev 14575)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.java 2011-06-17 13:48:04 UTC (rev 14576)
@@ -27,8 +27,6 @@
import javax.jws.WebMethod;
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
-import org.jboss.ejb3.annotation.RemoteHomeBinding;
-import org.jboss.ejb3.annotation.RemoteBinding;
import org.jboss.ws.api.annotation.WebContext;
@@ -37,8 +35,6 @@
@SOAPBinding(style = SOAPBinding.Style.RPC)
@Remote({EJB3RemoteBusinessInterface.class})
@RemoteHome(EJB3RemoteHome.class)
-@RemoteBinding(jndiBinding="FooBean01/remote")
-@RemoteHomeBinding(jndiBinding="FooBean01/remote")
@Stateless(name = "FooBean01")
public class EJB3Bean01 implements EJB3RemoteBusinessInterface
{
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java 2011-06-17 13:27:37 UTC (rev 14575)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java 2011-06-17 13:48:04 UTC (rev 14576)
@@ -69,7 +69,7 @@
public void testNarrowedRemoteAccess() throws Exception
{
InitialContext iniCtx = getInitialContext();
- Object obj = iniCtx.lookup("/FooBean01/remote");
+ Object obj = iniCtx.lookup("/FooBean01/home");
EJB3RemoteHome ejb3Home = (EJB3RemoteHome)PortableRemoteObject.narrow(obj, EJB3RemoteHome.class);
EJB3RemoteInterface ejb3Remote = ejb3Home.create();
13 years, 6 months
JBossWS SVN: r14575 - shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-06-17 09:27:37 -0400 (Fri, 17 Jun 2011)
New Revision: 14575
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307TestCase.java
Log:
fixing test to configure security domain for AS7 & above
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java 2011-06-17 09:59:37 UTC (rev 14574)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java 2011-06-17 13:27:37 UTC (rev 14575)
@@ -40,7 +40,7 @@
{
public static Test suite()
{
- return new JBossWSTestSetup(JBWS2307MTOMTestCase.class, "jaxws-jbws2307-client.war, jaxws-jbws2307-service.war");
+ return new JBossWSTestSetup(JBWS2307MTOMTestCase.class, "jaxws-jbws2307-client.war, jaxws-jbws2307-service.war", !isTargetJBoss6());
}
public void testMTOM() throws Exception
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307TestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307TestCase.java 2011-06-17 09:59:37 UTC (rev 14574)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307TestCase.java 2011-06-17 13:27:37 UTC (rev 14575)
@@ -40,7 +40,7 @@
{
public static Test suite()
{
- return new JBossWSTestSetup(JBWS2307TestCase.class, "jaxws-jbws2307-client.war, jaxws-jbws2307-service.war");
+ return new JBossWSTestSetup(JBWS2307TestCase.class, "jaxws-jbws2307-client.war, jaxws-jbws2307-service.war", !isTargetJBoss6());
}
public void testClient() throws Exception
13 years, 6 months
JBossWS SVN: r14574 - api/trunk.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2011-06-17 05:59:37 -0400 (Fri, 17 Jun 2011)
New Revision: 14574
Removed:
api/trunk/doc/
Modified:
api/trunk/pom.xml
Log:
[JBWS-2709]:Generate javadoc with maven plugin
Modified: api/trunk/pom.xml
===================================================================
--- api/trunk/pom.xml 2011-06-16 19:42:44 UTC (rev 14573)
+++ api/trunk/pom.xml 2011-06-17 09:59:37 UTC (rev 14574)
@@ -51,6 +51,20 @@
<autoVersionSubmodules>true</autoVersionSubmodules>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.8</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
13 years, 6 months
JBossWS SVN: r14573 - in stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6730: modules/core/src/main/java/org/jboss/ws/core/soap/attachment and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: bmaxwell
Date: 2011-06-16 15:42:44 -0400 (Thu, 16 Jun 2011)
New Revision: 14573
Modified:
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6730/
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6730/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedXOPEncoder.java
Log:
[JBPAPP-6730] Setting charset on content-type header
Property changes on: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6730
___________________________________________________________________
Added: svn:mergeinfo
+ /stack/native/trunk:11793
Modified: stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6730/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedXOPEncoder.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6730/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedXOPEncoder.java 2011-06-16 17:00:32 UTC (rev 14572)
+++ stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-6730/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedXOPEncoder.java 2011-06-16 19:42:44 UTC (rev 14573)
@@ -80,7 +80,7 @@
rootPart.setText(envStr, "UTF-8");
rootPart.setContentID(MimeConstants.ROOTPART_CID);
- rootPart.setHeader(MimeConstants.CONTENT_TYPE, MimeConstants.TYPE_APPLICATION_XOP_XML + "; type=\"" + soapType + "\"");
+ rootPart.setHeader(MimeConstants.CONTENT_TYPE, MimeConstants.TYPE_APPLICATION_XOP_XML + "; charset=UTF-8; type=\"" + soapType + "\"");
rootPart.setHeader(MimeConstants.CONTENT_TRANSFER_ENCODING, MimeConstants.TEXT_8BIT_ENCODING);
multipart.addBodyPart(rootPart);
13 years, 6 months
JBossWS SVN: r14572 - in common/trunk/src/main/java/org/jboss/ws/common: integration and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-06-16 13:00:32 -0400 (Thu, 16 Jun 2011)
New Revision: 14572
Modified:
common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultHttpEndpoint.java
common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultJMSEndpoint.java
common/trunk/src/main/java/org/jboss/ws/common/integration/WSHelper.java
Log:
[JBWS-3312] svn merge -r 14556:14557 https://svn.jboss.org/repos/jbossws/common/tags/jbossws-common-2.0.0.Beta4 .
Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultHttpEndpoint.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultHttpEndpoint.java 2011-06-16 16:59:37 UTC (rev 14571)
+++ common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultHttpEndpoint.java 2011-06-16 17:00:32 UTC (rev 14572)
@@ -24,7 +24,6 @@
import javax.naming.Context;
import javax.naming.NamingException;
-import org.jboss.logging.Logger;
import org.jboss.wsf.spi.deployment.HttpEndpoint;
import org.jboss.wsf.spi.management.EndpointMetrics;
@@ -36,8 +35,6 @@
public class DefaultHttpEndpoint extends AbstractDefaultEndpoint implements HttpEndpoint
{
- private static final Logger log = Logger.getLogger(DefaultHttpEndpoint.class);
-
DefaultHttpEndpoint(String targetBean)
{
super(targetBean);
Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultJMSEndpoint.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultJMSEndpoint.java 2011-06-16 16:59:37 UTC (rev 14571)
+++ common/trunk/src/main/java/org/jboss/ws/common/deployment/DefaultJMSEndpoint.java 2011-06-16 17:00:32 UTC (rev 14572)
@@ -45,18 +45,6 @@
super(targetBean);
}
- @Deprecated
- public String getURLPattern()
- {
- throw new UnsupportedOperationException();
- }
-
- @Deprecated
- public void setURLPattern(String urlPattern)
- {
- throw new UnsupportedOperationException();
- }
-
public String getTargetDestination()
{
return targetDestination;
@@ -102,7 +90,6 @@
return super.getAddress();
}
- //TODO:enable jms endpoint management
@Override
public EndpointMetrics getEndpointMetrics()
{
Modified: common/trunk/src/main/java/org/jboss/ws/common/integration/WSHelper.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/integration/WSHelper.java 2011-06-16 16:59:37 UTC (rev 14571)
+++ common/trunk/src/main/java/org/jboss/ws/common/integration/WSHelper.java 2011-06-16 17:00:32 UTC (rev 14572)
@@ -135,17 +135,6 @@
}
/**
- * Returns true if deployment represents JAXWS JMS deployment.
- *
- * @param dep webservice deployment
- * @return true if JAXWS JMS deployment, false otherwise
- */
- public static boolean isJaxwsJmsDeployment( final Deployment dep )
- {
- return DeploymentType.JAXWS_JMS.equals( dep.getType() );
- }
-
- /**
* Returns true if deployment represents either JAXWS JSE or JAXRPC JSE deployment.
*
* @param dep webservice deployment
13 years, 6 months
JBossWS SVN: r14571 - in spi/trunk/src/main/java/org/jboss/wsf/spi: metadata/j2ee/serviceref and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-06-16 12:59:37 -0400 (Thu, 16 Jun 2011)
New Revision: 14571
Removed:
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ServletClassProvider.java
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComponentMetaData.java
Log:
[JBWS-3312] svn merge -r 14552:14553 https://svn.jboss.org/repos/jbossws/spi/tags/jbossws-spi-2.0.0.Beta5 .
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2011-06-16 15:25:31 UTC (rev 14570)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2011-06-16 16:59:37 UTC (rev 14571)
@@ -52,21 +52,6 @@
UNDEFINED, STARTED, STOPPED
};
- /** Get the URL pattern for this endpoint.
- * This has been deprecated, getting the current URLPatter
- * makes sense for {@link HttpEndpoint} only.
- */
- @Deprecated
- String getURLPattern();
- /** Set the URL pattern for this endpoint
- * This has been deprecated, setting the current URLPatter
- * makes sense for {@link HttpEndpoint} only.
- *
- * @param urlPattern
- */
- @Deprecated
- void setURLPattern(String urlPattern);
-
/** Get the service this endpoint belongs to */
Service getService();
Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ServletClassProvider.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ServletClassProvider.java 2011-06-16 15:25:31 UTC (rev 14570)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ServletClassProvider.java 2011-06-16 16:59:37 UTC (rev 14571)
@@ -1,34 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, 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.wsf.spi.deployment;
-
-/**
- * Provides the name of the servlet class to be used for generating
- * the ws endpoint deployment.
- *
- * @author alessio.soldano(a)jboss.com
- *
- */
-public interface ServletClassProvider
-{
- public String getServletClassName();
-}
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java 2011-06-16 15:25:31 UTC (rev 14570)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java 2011-06-16 16:59:37 UTC (rev 14571)
@@ -74,24 +74,6 @@
return serviceRefMetaData;
}
- /**
- * @deprecated Use {@link #isMtomEnabled()} instead.
- */
- @Deprecated
- public Boolean getEnableMTOM()
- {
- return mtomEnabled;
- }
-
- /**
- * @deprecated Use {@link #setMtomEnabled(boolean)} instead.
- */
- @Deprecated
- public void setEnableMTOM(Boolean enableMTOM)
- {
- this.mtomEnabled = enableMTOM;
- }
-
public void setAddressingEnabled(final boolean addressingEnabled) {
this.addressingEnabled = addressingEnabled;
}
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComponentMetaData.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComponentMetaData.java 2011-06-16 15:25:31 UTC (rev 14570)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComponentMetaData.java 2011-06-16 16:59:37 UTC (rev 14571)
@@ -189,24 +189,6 @@
this.secureWSDLAccess = secureWSDLAccess;
}
- /**
- * @deprecated Use {@link #isMtomEnabled()} instead.
- */
- @Deprecated
- public boolean isEnableMtom()
- {
- return mtomEnabled;
- }
-
- /**
- * @deprecated Use {@link #setMtomEnabled(boolean)} instead.
- */
- @Deprecated
- public void setEnableMtom(boolean enableMtom)
- {
- this.mtomEnabled = enableMtom;
- }
-
public void setAddressingEnabled(final boolean addressingEnabled) {
this.addressingEnabled = addressingEnabled;
}
13 years, 6 months
JBossWS SVN: r14570 - thirdparty/cxf/branches/cxf-2.2.12/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/wsdl11.
by jbossws-commits＠lists.jboss.org
Author: bmaxwell
Date: 2011-06-16 11:25:31 -0400 (Thu, 16 Jun 2011)
New Revision: 14570
Modified:
thirdparty/cxf/branches/cxf-2.2.12/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProvider.java
Log:
[JBPAPP-6734] [CXF-3544]:ignore the build failed policy
Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProvider.java
===================================================================
--- thirdparty/cxf/branches/cxf-2.2.12/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProvider.java 2011-06-16 15:24:05 UTC (rev 14569)
+++ thirdparty/cxf/branches/cxf-2.2.12/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProvider.java 2011-06-16 15:25:31 UTC (rev 14570)
@@ -23,6 +23,7 @@
import java.util.List;
import java.util.Map;
import java.util.StringTokenizer;
+import java.util.logging.Logger;
import javax.wsdl.Definition;
import javax.wsdl.extensions.ExtensibilityElement;
@@ -30,6 +31,7 @@
import javax.xml.namespace.QName;
import org.apache.cxf.Bus;
+import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.service.model.AbstractDescriptionElement;
@@ -58,6 +60,7 @@
*/
public class Wsdl11AttachmentPolicyProvider extends AbstractPolicyProvider
implements PolicyProvider {
+ private static final Logger LOG = LogUtils.getL7dLogger(Wsdl11AttachmentPolicyProvider.class);
public Wsdl11AttachmentPolicyProvider() {
this(null);
@@ -179,10 +182,15 @@
if (PolicyConstants.isPolicyElem(e.getElementType())
&& !StringUtils.isEmpty(uri)) {
- Policy policy = builder.getPolicy(e.getElement());
- String fragement = "#" + uri;
- registry.register(fragement, policy);
- registry.register(di.getBaseURI() + fragement, policy);
+ try {
+ Policy policy = builder.getPolicy(e.getElement());
+ String fragement = "#" + uri;
+ registry.register(fragement, policy);
+ registry.register(di.getBaseURI() + fragement, policy);
+ } catch (Exception policyEx) {
+ //ignore the policy can not be built
+ LOG.warning("Failed to build the policy '" + uri + "':" + policyEx.getMessage());
+ }
}
}
}
13 years, 6 months