JBossWS SVN: r12890 - framework/trunk/src/main/java/org/jboss/wsf/framework/deployment.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-09-03 05:07:12 -0400 (Fri, 03 Sep 2010)
New Revision: 12890
Modified:
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java
Log:
fix NPE
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java 2010-09-03 08:22:27 UTC (rev 12889)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java 2010-09-03 09:07:12 UTC (rev 12890)
@@ -123,7 +123,7 @@
String fullClassName = beanClass.getName();
urlPattern = fullClassName.substring(fullClassName.lastIndexOf('.') + 1);
}
- if (!"".equals(webServiceAnnotation.serviceName()))
+ if (webServiceAnnotation != null && !"".equals(webServiceAnnotation.serviceName()))
{
urlPattern = webServiceAnnotation.serviceName() + "/" + urlPattern;
}
13 years, 8 months
JBossWS SVN: r12889 - stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-09-03 04:22:27 -0400 (Fri, 03 Sep 2010)
New Revision: 12889
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-installer-macros.xml
Log:
[JBPAPP-4818] Rollback , jaxrpc-api required by jboss ejb3
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-installer-macros.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-installer-macros.xml 2010-09-03 06:49:03 UTC (rev 12888)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/resources/src/main/resources/resources/jbossws-installer-macros.xml 2010-09-03 08:22:27 UTC (rev 12889)
@@ -71,7 +71,7 @@
<include name="**/cxf-*.jar"/>
<!-- ws-metadata -->
<include name="**/jsr181-api.jar"/>
- <!-- <include name="**/jaxrpc-api.jar"/> -->
+ <include name="**/jaxrpc-api.jar"/>
<include name="**/jaxws-api.jar"/>
<include name="**/jbossws-cxf-client*.jar"/>
<include name="**/jbossws-cxf-server*.jar"/>
13 years, 8 months
JBossWS SVN: r12888 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-09-03 02:49:03 -0400 (Fri, 03 Sep 2010)
New Revision: 12888
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java
Log:
fixing wrong import
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java 2010-09-02 14:45:16 UTC (rev 12887)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java 2010-09-03 06:49:03 UTC (rev 12888)
@@ -69,8 +69,6 @@
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
import org.jboss.wsf.common.JavaUtils;
-import com.sun.corba.se.spi.orb.Operation;
-
/** Provides support for the dynamic invocation of a service endpoint.
* The javax.xml.rpc.Service interface acts as a factory for the creation of Call instances.
*
13 years, 8 months
JBossWS SVN: r12887 - common/branches/jbossws-common-1.1.0.SP2_CP01_JBPAPP-4647/src/main/java/org/jboss/wsf/common.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-09-02 10:45:16 -0400 (Thu, 02 Sep 2010)
New Revision: 12887
Modified:
common/branches/jbossws-common-1.1.0.SP2_CP01_JBPAPP-4647/src/main/java/org/jboss/wsf/common/DOMUtils.java
Log:
[JBPAPP-4647] Disable external-general-entities and external-parameter-entities.
Modified: common/branches/jbossws-common-1.1.0.SP2_CP01_JBPAPP-4647/src/main/java/org/jboss/wsf/common/DOMUtils.java
===================================================================
--- common/branches/jbossws-common-1.1.0.SP2_CP01_JBPAPP-4647/src/main/java/org/jboss/wsf/common/DOMUtils.java 2010-09-02 12:59:13 UTC (rev 12886)
+++ common/branches/jbossws-common-1.1.0.SP2_CP01_JBPAPP-4647/src/main/java/org/jboss/wsf/common/DOMUtils.java 2010-09-02 14:45:16 UTC (rev 12887)
@@ -92,6 +92,8 @@
{
factory.setFeature(DEFER_NODE_EXPANSION_FEATURE, false);
}
+ factory.setFeature("http://xml.org/sax/features/external-general-entities", false);
+ factory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
}
catch (ParserConfigurationException pce)
{
13 years, 8 months
JBossWS SVN: r12886 - in framework/trunk: testsuite/test/ant-import and 8 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-09-02 08:59:13 -0400 (Thu, 02 Sep 2010)
New Revision: 12886
Added:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2957/
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2957/EjbInWarWebInfLib/
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2957/EjbInWarWebInfLib/JBWS2957TestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2957/common/
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2957/common/HelloIface.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2957/common/HelloImpl.java
framework/trunk/testsuite/test/resources/jaxws/jbws2957/
framework/trunk/testsuite/test/resources/jaxws/jbws2957/WEB-INF/
framework/trunk/testsuite/test/resources/jaxws/jbws2957/WEB-INF/ejb-jar.xml
framework/trunk/testsuite/test/resources/jaxws/jbws2957/WEB-INF/wsdl/
framework/trunk/testsuite/test/resources/jaxws/jbws2957/WEB-INF/wsdl/HelloService.wsdl
Modified:
framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java
framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
Log:
[JBWS-2957] providing EJB3 webservice in war test case + URL pattern fix to include WSDL service name in request path
Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java
===================================================================
--- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java 2010-09-02 11:21:45 UTC (rev 12885)
+++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java 2010-09-02 12:59:13 UTC (rev 12886)
@@ -123,6 +123,11 @@
String fullClassName = beanClass.getName();
urlPattern = fullClassName.substring(fullClassName.lastIndexOf('.') + 1);
}
+ if (!"".equals(webServiceAnnotation.serviceName()))
+ {
+ urlPattern = webServiceAnnotation.serviceName() + "/" + urlPattern;
+ }
+
}
}
Modified: framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml
===================================================================
--- framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2010-09-02 11:21:45 UTC (rev 12885)
+++ framework/trunk/testsuite/test/ant-import/build-jars-jaxws.xml 2010-09-02 12:59:13 UTC (rev 12886)
@@ -891,6 +891,29 @@
</webinf>
</war>
+ <!-- jaxws-jbws2957 -->
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2957-ejbinwarwebinflib_ejb.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws2957/common/*.class" />
+ </fileset>
+ </jar>
+
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2957-ejbinwarwebinflib_web.war" needxmlfile="false">
+ <lib dir="${tests.output.dir}/test-libs/">
+ <include name="jaxws-jbws2957-ejbinwarwebinflib_ejb.jar"/>
+ </lib>
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2957/WEB-INF">
+ <include name="wsdl/**" />
+ <include name="ejb-jar.xml"/>
+ </webinf>
+ </war>
+
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2957-ejbinwarwebinflib.ear">
+ <fileset dir="${tests.output.dir}/test-libs">
+ <include name="jaxws-jbws2957-ejbinwarwebinflib_web.war"/>
+ </fileset>
+ </jar>
+
<!-- jaxws-jbws2985 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws2985.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2985/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2957/EjbInWarWebInfLib/JBWS2957TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2957/EjbInWarWebInfLib/JBWS2957TestCase.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2957/EjbInWarWebInfLib/JBWS2957TestCase.java 2010-09-02 12:59:13 UTC (rev 12886)
@@ -0,0 +1,57 @@
+/*
+ * 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.test.ws.jaxws.jbws2957;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+import org.jboss.test.ws.jaxws.jbws2957.common.HelloIface;
+
+/**
+ * [JBWS-2957] Tests EJB3 service in web inf lib directory.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public class JBWS2957TestCase extends JBossWSTest
+{
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS2957TestCase.class, "jaxws-jbws2957-ejbinwarwebinflib.ear");
+ }
+
+ public void testEJB() throws Exception
+ {
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2957-ejbinwarwebinflib_web/Service/HelloImpl?wsdl");
+ QName serviceName = new QName("http://www.jboss.org/test/ws/jaxws/jbws2957", "Service");
+ Service.create(wsdlURL, serviceName);
+ Service service = Service.create(wsdlURL, serviceName);
+ HelloIface port = (HelloIface)service.getPort(HelloIface.class);
+ assertEquals("Hello", port.sayHello());
+ }
+}
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2957/common/HelloIface.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2957/common/HelloIface.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2957/common/HelloIface.java 2010-09-02 12:59:13 UTC (rev 12886)
@@ -0,0 +1,35 @@
+/*
+ * 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.test.ws.jaxws.jbws2957.common;
+
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+/**
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+@WebService(targetNamespace = "http://www.jboss.org/test/ws/jaxws/jbws2957")
+@SOAPBinding(style = SOAPBinding.Style.RPC)
+public interface HelloIface
+{
+ String sayHello();
+}
Added: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2957/common/HelloImpl.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2957/common/HelloImpl.java (rev 0)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2957/common/HelloImpl.java 2010-09-02 12:59:13 UTC (rev 12886)
@@ -0,0 +1,45 @@
+/*
+ * 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.test.ws.jaxws.jbws2957.common;
+
+import javax.ejb.Stateless;
+import javax.jws.WebService;
+
+import org.jboss.wsf.spi.annotation.WebContext;
+
+/**
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+@Stateless
+@WebService(
+ endpointInterface = "org.jboss.test.ws.jaxws.jbws2957.common.HelloIface",
+ targetNamespace = "http://www.jboss.org/test/ws/jaxws/jbws2957",
+ wsdlLocation="WEB-INF/wsdl/HelloService.wsdl",
+ serviceName = "Service"
+)
+public class HelloImpl implements HelloIface
+{
+ public String sayHello()
+ {
+ return "Hello";
+ }
+}
Added: framework/trunk/testsuite/test/resources/jaxws/jbws2957/WEB-INF/ejb-jar.xml
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws2957/WEB-INF/ejb-jar.xml (rev 0)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws2957/WEB-INF/ejb-jar.xml 2010-09-02 12:59:13 UTC (rev 12886)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ejb-jar version="3.1" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd">
+ <display-name>JBWS2957</display-name>
+ <enterprise-beans>
+ <session>
+ <display-name>JBWS2957Test</display-name>
+ <ejb-name>JBWS2957Test</ejb-name>
+ <business-remote>org.jboss.test.ws.jaxws.jbws2957.common.HelloIface</business-remote>
+ <ejb-class>org.jboss.test.ws.jaxws.jbws2957.common.HelloImpl</ejb-class>
+ <session-type>Stateless</session-type>
+ <transaction-type>Container</transaction-type>
+ <security-identity>
+ <description></description>
+ <use-caller-identity></use-caller-identity>
+ </security-identity>
+ </session>
+ </enterprise-beans>
+
+ <assembly-descriptor>
+ <container-transaction>
+ <method>
+ <ejb-name>JBWS2957Test</ejb-name>
+ <method-name>sayHello</method-name>
+ </method>
+ <trans-attribute>Supports</trans-attribute>
+ </container-transaction>
+ </assembly-descriptor>
+</ejb-jar>
Added: framework/trunk/testsuite/test/resources/jaxws/jbws2957/WEB-INF/wsdl/HelloService.wsdl
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws2957/WEB-INF/wsdl/HelloService.wsdl (rev 0)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws2957/WEB-INF/wsdl/HelloService.wsdl 2010-09-02 12:59:13 UTC (rev 12886)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name="Service" targetNamespace="http://www.jboss.org/test/ws/jaxws/jbws2957" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.jboss.org/test/ws/jaxws/jbws2957" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <types/>
+ <message name="HelloIface_sayHello"/>
+ <message name="HelloIface_sayHelloResponse">
+ <part name="return" type="xsd:string"/>
+ </message>
+ <portType name="HelloIface">
+ <operation name="sayHello">
+ <input message="tns:HelloIface_sayHello"/>
+ <output message="tns:HelloIface_sayHelloResponse"/>
+ </operation>
+ </portType>
+ <binding name="HelloIfaceBinding" type="tns:HelloIface">
+ <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <operation name="sayHello">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body namespace="http://www.jboss.org/test/ws/jaxws/jbws2957" use="literal"/>
+ </input>
+ <output>
+ <soap:body namespace="http://www.jboss.org/test/ws/jaxws/jbws2957" use="literal"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="Service">
+ <port binding="tns:HelloIfaceBinding" name="HelloImplPort">
+ <soap:address location="http://localhost:8080/foo/bar"/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
13 years, 8 months
JBossWS SVN: r12885 - stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-09-02 07:21:45 -0400 (Thu, 02 Sep 2010)
New Revision: 12885
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java
Log:
[JBWS-2957] accept vfs: protocol too
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2010-09-02 10:51:24 UTC (rev 12884)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2010-09-02 11:21:45 UTC (rev 12885)
@@ -179,7 +179,9 @@
wsdlLocation = wsdlLocation.substring(wsdlLocation.indexOf(expLocation) + expLocation.length());
result = new File(locationFile + "/" + wsdlLocation);
}
- else if (wsdlLocation.startsWith("vfsfile:") || wsdlLocation.startsWith("file:") || wsdlLocation.startsWith("jar:") || wsdlLocation.startsWith("vfszip:"))
+ else if (wsdlLocation.startsWith("vfs:") || wsdlLocation.startsWith("vfsfile:")
+ || wsdlLocation.startsWith("file:") || wsdlLocation.startsWith("jar:")
+ || wsdlLocation.startsWith("vfszip:"))
{
wsdlLocation = wsdlLocation.substring(wsdlLocation.lastIndexOf("/") + 1);
result = new File(locationFile + "/" + wsdlLocation);
13 years, 8 months
JBossWS SVN: r12884 - container/jboss60/branches/jbossws-jboss600M4/src/main/java/org/jboss/webservices/integration/tomcat.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-09-02 06:51:24 -0400 (Thu, 02 Sep 2010)
New Revision: 12884
Modified:
container/jboss60/branches/jbossws-jboss600M4/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java
Log:
[JBWS-2957] fix AS IL porting layer to handle EJB3s in web archives properly
Modified: container/jboss60/branches/jbossws-jboss600M4/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java
===================================================================
--- container/jboss60/branches/jbossws-jboss600M4/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java 2010-09-02 09:58:40 UTC (rev 12883)
+++ container/jboss60/branches/jbossws-jboss600M4/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java 2010-09-02 10:51:24 UTC (rev 12884)
@@ -32,11 +32,11 @@
import org.jboss.metadata.web.spec.SecurityConstraintMetaData;
import org.jboss.metadata.web.spec.ServletMappingMetaData;
import org.jboss.metadata.web.spec.WebResourceCollectionsMetaData;
+import org.jboss.webservices.integration.util.ASHelper;
import org.jboss.webservices.integration.util.WebMetaDataHelper;
import org.jboss.wsf.common.integration.WSHelper;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.deployment.HttpEndpoint;
/**
* Creator of web app meta data for EJB endpoints.
@@ -75,7 +75,11 @@
void create(final Deployment dep)
{
final DeploymentUnit unit = WSHelper.getRequiredAttachment(dep, DeploymentUnit.class);
- final JBossWebMetaData jbossWebMD = new JBossWebMetaData();
+ JBossWebMetaData jbossWebMD = ASHelper.getOptionalAttachment(unit, JBossWebMetaData.class);
+ if (jbossWebMD == null)
+ {
+ jbossWebMD = new JBossWebMetaData();
+ }
this.createWebAppDescriptor(dep, jbossWebMD);
this.createJBossWebAppDescriptor(dep, jbossWebMD);
@@ -186,7 +190,7 @@
for (final Endpoint ep : dep.getService().getEndpoints())
{
final String endpointName = ep.getShortName();
- final List<String> urlPatterns = WebMetaDataHelper.getUrlPatterns(((HttpEndpoint)ep).getURLPattern());
+ final List<String> urlPatterns = WebMetaDataHelper.getUrlPatterns(ep.getURLPattern());
this.log.debug("Servlet name: " + endpointName + ", URL patterns: " + urlPatterns);
WebMetaDataHelper.newServletMapping(endpointName, urlPatterns, servletMappings);
@@ -242,7 +246,7 @@
final WebResourceCollectionsMetaData webResourceCollections = WebMetaDataHelper
.getWebResourceCollections(securityConstraint);
final String endpointName = ejbEndpoint.getShortName();
- final String urlPattern = ((HttpEndpoint)ejbEndpoint).getURLPattern();
+ final String urlPattern = ejbEndpoint.getURLPattern();
this.log.debug("Creating web resource collection for endpoint: " + endpointName + ", URL pattern: "
+ urlPattern);
WebMetaDataHelper.newWebResourceCollection(endpointName, urlPattern, secureWsdlAccess,
13 years, 8 months
JBossWS SVN: r12883 - spi/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-09-02 05:58:40 -0400 (Thu, 02 Sep 2010)
New Revision: 12883
Modified:
spi/trunk/pom.xml
Log:
[JBWS-3115] Initial clean of dependencies on jbossws-spi (i.e. can easily be done on non-transient ones)
Modified: spi/trunk/pom.xml
===================================================================
--- spi/trunk/pom.xml 2010-09-02 09:57:20 UTC (rev 12882)
+++ spi/trunk/pom.xml 2010-09-02 09:58:40 UTC (rev 12883)
@@ -28,11 +28,13 @@
<ant.version>1.7.1</ant.version>
<dom4j.version>1.6.1</dom4j.version>
<getopt.version>1.0.13</getopt.version>
- <sun.jaxb.version>2.2</sun.jaxb.version>
- <jaxws.api.version>2.2</jaxws.api.version>
- <jms.api.version>1.1</jms.api.version>
+ <jaxb.api.version>1.0.0.Beta1</jaxb.api.version>
+ <jaxws.api.version>1.0.0.Beta1</jaxws.api.version>
+ <jms.api.version>1.0.0.Beta1</jms.api.version>
<jboss.microcontainer.version>2.0.8.GA</jboss.microcontainer.version>
- <jboss.web.version>2.1.3.GA</jboss.web.version>
+ <jbossxb.version>2.0.1.GA</jbossxb.version>
+ <jboss-logging-spi.version>2.0.5.GA</jboss-logging-spi.version>
+ <servlet.api.version>1.0.0.Beta2</servlet.api.version>
<junit.version>3.8.2</junit.version>
<log4j.version>1.2.14</log4j.version>
</properties>
@@ -42,36 +44,49 @@
<!-- provided apis -->
<dependency>
- <groupId>jboss.web</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${jboss.web.version}</version>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+ <version>${servlet.api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>${sun.jaxb.version}</version>
+ <groupId>org.jboss.spec.javax.xml.bind</groupId>
+ <artifactId>jboss-jaxb-api_2.2_spec</artifactId>
+ <version>${jaxb.api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.jms</groupId>
- <artifactId>jms</artifactId>
+ <groupId>org.jboss.spec.javax.jms</groupId>
+ <artifactId>jboss-jms-api_1.1_spec</artifactId>
<version>${jms.api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
+ <groupId>org.jboss.spec.javax.xml.ws</groupId>
+ <artifactId>jboss-jaxws-api_2.2_spec</artifactId>
<version>${jaxws.api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- <version>${jboss.microcontainer.version}</version>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ <version>${jboss-logging-spi.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <version>${jbossxb.version}</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>sun-jaxb</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
13 years, 8 months
JBossWS SVN: r12882 - in spi/trunk/src/main/java/org/jboss/wsf/spi: metadata/j2ee/serviceref and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-09-02 05:57:20 -0400 (Thu, 02 Sep 2010)
New Revision: 12882
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/HttpEndpoint.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java
Log:
Fix deprecated warnings
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/HttpEndpoint.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/HttpEndpoint.java 2010-08-31 13:20:26 UTC (rev 12881)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/HttpEndpoint.java 2010-09-02 09:57:20 UTC (rev 12882)
@@ -29,8 +29,10 @@
public interface HttpEndpoint extends Endpoint
{
/** Get the URL pattern for this endpoint */
+ @Deprecated
String getURLPattern();
/** Set the URL pattern for this endpoint */
+ @Deprecated
void setURLPattern(String urlPattern);
}
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2010-08-31 13:20:26 UTC (rev 12881)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2010-09-02 09:57:20 UTC (rev 12882)
@@ -425,6 +425,7 @@
}
@Override
+ @Deprecated
public void importStandardXml(Element root)
{
SPIProvider provider = SPIProviderResolver.getInstance().getProvider();
@@ -433,6 +434,7 @@
}
@Override
+ @Deprecated
public void importJBossXml(Element root)
{
SPIProvider provider = SPIProviderResolver.getInstance().getProvider();
13 years, 8 months