JBossWS SVN: r10219 - spi/tags.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-06-23 06:37:47 -0400 (Tue, 23 Jun 2009)
New Revision: 10219
Added:
spi/tags/jbossws-spi-1.1.2.SP1/
Log:
[JBPAPP-2094] Tagging jbossws-spi-1.1.2.SP1
Copied: spi/tags/jbossws-spi-1.1.2.SP1 (from rev 10218, spi/branches/jbossws-spi-1.1.2)
16 years, 10 months
JBossWS SVN: r10218 - common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/test.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-06-23 06:28:28 -0400 (Tue, 23 Jun 2009)
New Revision: 10218
Modified:
common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
Log:
Loose check in JBossWSTestHelper to support EAP 5.0.0 which is based on AS 5.1.0
Modified: common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
===================================================================
--- common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2009-06-23 08:48:28 UTC (rev 10217)
+++ common/branches/jbossws-common-1.1.0/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2009-06-23 10:28:28 UTC (rev 10218)
@@ -92,7 +92,7 @@
public boolean isTargetJBoss51()
{
String target = getIntegrationTarget();
- return target.startsWith("jboss51");
+ return target.startsWith("jboss5"); //loose check to support EAP 5.0.0 which is based on AS 5.1.0, should have been startsWith("jboss51")
}
/** True, if -Djbossws.integration.target=jboss6x */
@@ -222,7 +222,7 @@
if (jbossVersion.startsWith("5.1"))
jbossVersion = "jboss51";
else if (jbossVersion.startsWith("5.0"))
- jbossVersion = "jboss50";
+ jbossVersion = "jboss5"; //loose check to support EAP 5.0.0 which is based on AS 5.1.0, should have been "jboss51"
else if (jbossVersion.startsWith("6.1"))
jbossVersion = "jboss61";
else if (jbossVersion.startsWith("6.0"))
16 years, 10 months
JBossWS SVN: r10217 - stack/native/branches/jbossws-native-3.1.2.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-06-23 04:48:28 -0400 (Tue, 23 Jun 2009)
New Revision: 10217
Modified:
stack/native/branches/jbossws-native-3.1.2/pom.xml
Log:
Using JAXB 2.1.9 impl
Modified: stack/native/branches/jbossws-native-3.1.2/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/pom.xml 2009-06-22 14:35:08 UTC (rev 10216)
+++ stack/native/branches/jbossws-native-3.1.2/pom.xml 2009-06-23 08:48:28 UTC (rev 10217)
@@ -63,7 +63,7 @@
<commons.logging.version>1.1.1</commons.logging.version>
<javassist.version>3.6.0.GA</javassist.version>
<jaxb.api.version>2.1</jaxb.api.version>
- <jaxb.impl.version>2.1.6</jaxb.impl.version>
+ <jaxb.impl.version>2.1.9</jaxb.impl.version>
<jboss.common.version>1.2.1.GA</jboss.common.version>
<jboss.jaxbintros.version>1.0.0.GA</jboss.jaxbintros.version>
<jboss.logging.version>2.0.5.GA</jboss.logging.version>
16 years, 10 months
JBossWS SVN: r10216 - stack/native/branches/dlofthouse/JBWS-2681/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-06-22 10:35:08 -0400 (Mon, 22 Jun 2009)
New Revision: 10216
Modified:
stack/native/branches/dlofthouse/JBWS-2681/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java
Log:
Synchronize on initialization to eliminate concurrency related failures.
Modified: stack/native/branches/dlofthouse/JBWS-2681/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2681/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2009-06-22 14:34:35 UTC (rev 10215)
+++ stack/native/branches/dlofthouse/JBWS-2681/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2009-06-22 14:35:08 UTC (rev 10216)
@@ -182,7 +182,7 @@
// com/sun/ts/tests/jaxws/api/javax_xml_ws/Service#GetPort1NegTest1WithWsdl
EndpointMetaData epMetaData = serviceMetaData.getEndpoint(portName);
- if (serviceMetaData.getEndpoints().size() > 0 && epMetaData == null)
+ if (epMetaData == null && serviceMetaData.getEndpoints().size() > 0)
throw new WebServiceException("Cannot get port meta data for: " + portName);
// This is the case when the service could not be created from wsdl
@@ -265,9 +265,15 @@
// Adjust the endpoint meta data according to the annotations
if (annotatedPorts.contains(portName) == false)
{
- JAXWSClientMetaDataBuilder metaDataBuilder = new JAXWSClientMetaDataBuilder();
- metaDataBuilder.rebuildEndpointMetaData(epMetaData, seiClass);
- annotatedPorts.add(portName);
+ synchronized (epMetaData)
+ {
+ if (annotatedPorts.contains(portName) == false)
+ {
+ JAXWSClientMetaDataBuilder metaDataBuilder = new JAXWSClientMetaDataBuilder();
+ metaDataBuilder.rebuildEndpointMetaData(epMetaData, seiClass);
+ annotatedPorts.add(portName);
+ }
+ }
}
return (T)createProxy(seiClass, epMetaData);
16 years, 10 months
JBossWS SVN: r10215 - in stack/native/branches/ropalka/modules/testsuite/native-tests/src/test/resources: jaxrpc/xop/doclit/handlerconfig/WEB-INF and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-06-22 10:34:35 -0400 (Mon, 22 Jun 2009)
New Revision: 10215
Modified:
stack/native/branches/ropalka/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws165/META-INF-pcuri/webservices.xml
stack/native/branches/ropalka/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/webservices.xml
stack/native/branches/ropalka/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF/webservices.xml
stack/native/branches/ropalka/modules/testsuite/native-tests/src/test/resources/jaxws/wsdd/WEB-INF/webservices.xml
Log:
[JBWS-2689] fixing DDs to be schema valid
Modified: stack/native/branches/ropalka/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws165/META-INF-pcuri/webservices.xml
===================================================================
--- stack/native/branches/ropalka/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws165/META-INF-pcuri/webservices.xml 2009-06-22 14:33:58 UTC (rev 10214)
+++ stack/native/branches/ropalka/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws165/META-INF-pcuri/webservices.xml 2009-06-22 14:34:35 UTC (rev 10215)
@@ -1,6 +1,6 @@
<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://org.jboss.test.webservice/jbws165' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'>
<webservice-description>
- <webservice-description-name>HelloServicePcURI</webservice-description-name>
+ <webservice-description-name>HelloServicePcURI1</webservice-description-name>
<wsdl-file>META-INF/wsdl/HelloServicePcURI.wsdl</wsdl-file>
<jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
<port-component>
@@ -13,7 +13,7 @@
</port-component>
</webservice-description>
<webservice-description>
- <webservice-description-name>HelloServicePcURI</webservice-description-name>
+ <webservice-description-name>HelloServicePcURI2</webservice-description-name>
<wsdl-file>META-INF/wsdl/HelloServicePcURI.wsdl</wsdl-file>
<jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
<port-component>
Modified: stack/native/branches/ropalka/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/webservices.xml
===================================================================
--- stack/native/branches/ropalka/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/webservices.xml 2009-06-22 14:33:58 UTC (rev 10214)
+++ stack/native/branches/ropalka/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/webservices.xml 2009-06-22 14:34:35 UTC (rev 10215)
@@ -14,13 +14,13 @@
<port-component-name>TestServicePort</port-component-name>
<wsdl-port>impl:TestServicePort</wsdl-port>
<service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing</service-endpoint-interface>
+ <service-impl-bean>
+ <servlet-link>TestService</servlet-link>
+ </service-impl-bean>
<handler>
<handler-name>XOPInlineHandler</handler-name>
<handler-class>org.jboss.test.ws.jaxrpc.xop.doclit.InlineHandler</handler-class>
</handler>
- <service-impl-bean>
- <servlet-link>TestService</servlet-link>
- </service-impl-bean>
</port-component>
</webservice-description>
</webservices>
Modified: stack/native/branches/ropalka/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF/webservices.xml
===================================================================
--- stack/native/branches/ropalka/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF/webservices.xml 2009-06-22 14:33:58 UTC (rev 10214)
+++ stack/native/branches/ropalka/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF/webservices.xml 2009-06-22 14:34:35 UTC (rev 10215)
@@ -14,13 +14,13 @@
<port-component-name>TestServicePort</port-component-name>
<wsdl-port>impl:TestServicePort</wsdl-port>
<service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing</service-endpoint-interface>
+ <service-impl-bean>
+ <servlet-link>TestService</servlet-link>
+ </service-impl-bean>
<handler>
<handler-name>XOPInlineHandler</handler-name>
<handler-class>org.jboss.test.ws.jaxrpc.xop.rpclit.InlineHandler</handler-class>
</handler>
- <service-impl-bean>
- <servlet-link>TestService</servlet-link>
- </service-impl-bean>
</port-component>
</webservice-description>
</webservices>
Modified: stack/native/branches/ropalka/modules/testsuite/native-tests/src/test/resources/jaxws/wsdd/WEB-INF/webservices.xml
===================================================================
--- stack/native/branches/ropalka/modules/testsuite/native-tests/src/test/resources/jaxws/wsdd/WEB-INF/webservices.xml 2009-06-22 14:33:58 UTC (rev 10214)
+++ stack/native/branches/ropalka/modules/testsuite/native-tests/src/test/resources/jaxws/wsdd/WEB-INF/webservices.xml 2009-06-22 14:34:35 UTC (rev 10215)
@@ -10,10 +10,10 @@
<wsdl-service>wsdl:WSDDEndpointImplService</wsdl-service>
<wsdl-port>wsdl:WSDDEndpointImplPort</wsdl-port>
<!--service-endpoint-interface>com.sun.ts.tests.webservices12.ejb.descriptors.WSEjbOverrideWSRefHCWithDDsTest.Hello</service-endpoint-interface-->
+ <enable-mtom>true</enable-mtom>
<service-impl-bean>
<servlet-link>Endpoint</servlet-link>
</service-impl-bean>
- <enable-mtom>true</enable-mtom>
<handler-chains>
<handler-chain>
<handler>
16 years, 10 months
JBossWS SVN: r10214 - stack/native/branches/dlofthouse.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-06-22 10:33:58 -0400 (Mon, 22 Jun 2009)
New Revision: 10214
Added:
stack/native/branches/dlofthouse/JBWS-2681/
Log:
Branch to hold code
Copied: stack/native/branches/dlofthouse/JBWS-2681 (from rev 10213, stack/native/trunk)
16 years, 10 months
JBossWS SVN: r10213 - in container/jboss50/branches/ropalka-jboss510/src/main: resources/jbossws-jboss50.deployer/META-INF and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-06-22 10:27:25 -0400 (Mon, 22 Jun 2009)
New Revision: 10213
Added:
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebservicesMetaDataDeployer.java
Modified:
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHookJSE.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/ArchiveDeployerHook.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPreJSE.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPreJSE.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPostJSE.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java
container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml
Log:
[JBWS-2689][JBWS-2333][JBWS-2690] fixing issues
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHookJSE.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHookJSE.java 2009-06-22 12:48:53 UTC (rev 10212)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHookJSE.java 2009-06-22 14:27:25 UTC (rev 10213)
@@ -21,8 +21,13 @@
*/
package org.jboss.wsf.container.jboss50.deployer;
+import java.util.ArrayList;
import java.util.List;
+import javax.jws.WebService;
+import javax.servlet.Servlet;
+import javax.xml.ws.WebServiceProvider;
+
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.metadata.javaee.spec.ParamValueMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
@@ -62,4 +67,60 @@
}
return endpointClass;
}
+
+ protected final List<ServletMetaData> getRelevantJAXWSServlets(JBossWebMetaData webMetaData, ClassLoader loader)
+ {
+ return getRelevantServlets( webMetaData, loader, true );
+ }
+
+ protected final List<ServletMetaData> getRelevantJAXRPCServlets(JBossWebMetaData webMetaData, ClassLoader loader)
+ {
+ return getRelevantServlets( webMetaData, loader, false );
+ }
+
+ private final List<ServletMetaData> getRelevantServlets(JBossWebMetaData webMetaData, ClassLoader loader, boolean jaxws)
+ {
+ List<ServletMetaData> endpoints = new ArrayList<ServletMetaData>();
+ for (ServletMetaData servlet : webMetaData.getServlets())
+ {
+ String servletClassName = getTargetBean(servlet);
+
+ // Skip JSPs
+ if (servletClassName == null || servletClassName.length() == 0)
+ continue;
+
+ try
+ {
+ Class<?> servletClass = loader.loadClass(servletClassName.trim());
+ boolean isServlet = servletClass.isAssignableFrom(Servlet.class);
+ if (false == isServlet)
+ {
+ boolean isWebService = servletClass.isAnnotationPresent(WebService.class);
+ boolean isWebServiceProvider = servletClass.isAnnotationPresent(WebServiceProvider.class);
+ if ( jaxws )
+ {
+ if (isWebService || isWebServiceProvider)
+ {
+ endpoints.add(servlet); // jaxws endpoint
+ }
+ }
+ else
+ {
+ if (!isWebService && !isWebServiceProvider)
+ {
+ endpoints.add(servlet); // jaxrpc endpoint
+ }
+ }
+ }
+ }
+ catch (ClassNotFoundException ex)
+ {
+ log.warn("Cannot load servlet class: " + servletClassName);
+ continue;
+ }
+ }
+
+ return endpoints;
+ }
+
}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/ArchiveDeployerHook.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/ArchiveDeployerHook.java 2009-06-22 12:48:53 UTC (rev 10212)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/ArchiveDeployerHook.java 2009-06-22 14:27:25 UTC (rev 10213)
@@ -111,39 +111,7 @@
*/
protected WebservicesMetaData getWebservicesMetaData(DeploymentUnit unit)
{
- WebservicesMetaData wsMetaData = unit.getAttachment(WebservicesMetaData.class);
- UnifiedVirtualFile vfWebservices = getWebservicesFile(unit);
- if (wsMetaData == null && vfWebservices != null)
- {
- try
- {
- URL wsURL = vfWebservices.toURL();
- Element root = DOMUtils.parse(wsURL.openStream());
- String namespaceURI = root.getNamespaceURI();
- if (namespaceURI.equals("http://java.sun.com/xml/ns/j2ee"))
- {
- Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
- ObjectModelFactory factory = new WebservicesFactory(wsURL);
- wsMetaData = (WebservicesMetaData)unmarshaller.unmarshal(wsURL.openStream(), factory, null);
- unit.addAttachment(WebservicesMetaData.class, wsMetaData);
- }
- }
- catch (Exception ex)
- {
- throw new WSFDeploymentException(ex);
- }
- }
- return wsMetaData;
+ return unit.getAttachment(WebservicesMetaData.class);
}
- private UnifiedVirtualFile getWebservicesFile(DeploymentUnit unit)
- {
- UnifiedVirtualFile wsFile = null;
- if (unit instanceof VFSDeploymentUnit)
- {
- VirtualFile vf = ((VFSDeploymentUnit)unit).getMetaDataFile("webservices.xml");
- wsFile = vf != null ? new VirtualFileAdaptor(vf) : null;
- }
- return wsFile;
- }
}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPreJSE.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPreJSE.java 2009-06-22 12:48:53 UTC (rev 10212)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPreJSE.java 2009-06-22 14:27:25 UTC (rev 10213)
@@ -21,6 +21,8 @@
*/
package org.jboss.wsf.container.jboss50.deployer;
+import java.util.List;
+
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.metadata.serviceref.VirtualFileAdaptor;
@@ -117,6 +119,23 @@
return false;
WebservicesMetaData wsMetaData = getWebservicesMetaData(unit);
- return wsMetaData != null;
+ if ( wsMetaData == null )
+ {
+ return false;
+ }
+
+ boolean isWebServiceDeployment = false;
+ try
+ {
+ JBossWebMetaData webMetaData = unit.getAttachment(JBossWebMetaData.class);
+ List<ServletMetaData> servlets = getRelevantJAXRPCServlets(webMetaData, unit.getClassLoader());
+ isWebServiceDeployment = servlets.size() > 0;
+ }
+ catch (Exception ex)
+ {
+ log.error("Cannot process web deployment", ex);
+ }
+
+ return isWebServiceDeployment;
}
}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPreJSE.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPreJSE.java 2009-06-22 12:48:53 UTC (rev 10212)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPreJSE.java 2009-06-22 14:27:25 UTC (rev 10213)
@@ -69,7 +69,7 @@
// Copy the attachments
dep.addAttachment(JBossWebMetaData.class, webMetaData);
- List<ServletMetaData> servlets = getRelevantServlets(webMetaData, unit.getClassLoader());
+ List<ServletMetaData> servlets = getRelevantJAXWSServlets(webMetaData, unit.getClassLoader());
for (ServletMetaData servlet : servlets)
{
String servletName = servlet.getName();
@@ -94,7 +94,7 @@
try
{
JBossWebMetaData webMetaData = unit.getAttachment(JBossWebMetaData.class);
- List<ServletMetaData> servlets = getRelevantServlets(webMetaData, unit.getClassLoader());
+ List<ServletMetaData> servlets = getRelevantJAXWSServlets(webMetaData, unit.getClassLoader());
isWebServiceDeployment = servlets.size() > 0;
}
catch (Exception ex)
@@ -105,31 +105,4 @@
return isWebServiceDeployment;
}
- private List<ServletMetaData> getRelevantServlets(JBossWebMetaData webMetaData, ClassLoader loader)
- {
- List<ServletMetaData> servlets = new ArrayList<ServletMetaData>();
- for (ServletMetaData servlet : webMetaData.getServlets())
- {
- String servletClassName = getTargetBean(servlet);
-
- // Skip JSPs
- if (servletClassName == null || servletClassName.length() == 0)
- continue;
-
- try
- {
- Class<?> servletClass = loader.loadClass(servletClassName.trim());
- boolean isWebService = servletClass.isAnnotationPresent(WebService.class);
- boolean isWebServiceProvider = servletClass.isAnnotationPresent(WebServiceProvider.class);
- if (isWebService || isWebServiceProvider)
- servlets.add(servlet);
- }
- catch (ClassNotFoundException ex)
- {
- log.warn("Cannot load servlet class: " + servletClassName);
- continue;
- }
- }
- return servlets;
- }
}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java 2009-06-22 12:48:53 UTC (rev 10212)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java 2009-06-22 14:27:25 UTC (rev 10213)
@@ -42,6 +42,7 @@
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration;
import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
+import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
/**
* This it the web service deployer for EJB. Adopts EJB deployments to
@@ -64,6 +65,8 @@
addInput(EjbDeployment.class);
addInput(Ejb3Deployment.class);
+
+ addInput(WebservicesMetaData.class);
// Input for the TomcatDeployer
addOutput(JBossWebMetaData.class);
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPostJSE.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPostJSE.java 2009-06-22 12:48:53 UTC (rev 10212)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPostJSE.java 2009-06-22 14:27:25 UTC (rev 10213)
@@ -22,6 +22,7 @@
package org.jboss.wsf.container.jboss50.deployer;
import org.jboss.web.deployers.WarDeployment;
+import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
/**
* @author Heiko.Braun(a)jboss.com
@@ -32,5 +33,6 @@
{
// Output from the TomcatDeployer
addInput(WarDeployment.class);
+ addInput(WebservicesMetaData.class);
}
}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java 2009-06-22 12:48:53 UTC (rev 10212)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java 2009-06-22 14:27:25 UTC (rev 10213)
@@ -22,6 +22,7 @@
package org.jboss.wsf.container.jboss50.deployer;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
/**
* This is the web service deployer for JSE
@@ -36,6 +37,7 @@
public WebServiceDeployerPreJSE()
{
addInput(JBossWebMetaData.class);
+ addInput(WebservicesMetaData.class);
addOutput(JBossWebMetaData.class);
}
Added: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebservicesMetaDataDeployer.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebservicesMetaDataDeployer.java (rev 0)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/WebservicesMetaDataDeployer.java 2009-06-22 14:27:25 UTC (rev 10213)
@@ -0,0 +1,55 @@
+/*
+ * 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.wsf.container.jboss50.deployer;
+
+import org.jboss.deployers.vfs.spi.deployer.ObjectModelFactoryDeployer;
+import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory;
+import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
+import org.jboss.xb.binding.ObjectModelFactory;
+
+/**
+ * webservices.xml deployer.
+ *
+ * @author <a href="ropalka(a)redhat.com">Richard Opalka</a>
+ */
+public final class WebservicesMetaDataDeployer
+extends ObjectModelFactoryDeployer< WebservicesMetaData >
+{
+
+ /**
+ * Constructor.
+ */
+ public WebservicesMetaDataDeployer()
+ {
+ super(WebservicesMetaData.class);
+ }
+
+ /**
+ * Model factory generator.
+ */
+ @Override
+ protected ObjectModelFactory getObjectModelFactory( final WebservicesMetaData root )
+ {
+ return new WebservicesFactory( null );
+ }
+
+}
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-22 12:48:53 UTC (rev 10212)
+++ container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2009-06-22 14:27:25 UTC (rev 10213)
@@ -75,6 +75,14 @@
Finally, each Endpoint is registered with the EndpointRegistry.
********************************************************************************************************************* -->
+
+ <!--
+ A deployer that processes webservices.xml file
+ -->
+ <bean name="WebservicesMetaDataDeployer" class="org.jboss.wsf.container.jboss50.deployer.WebservicesMetaDataDeployer">
+ <property name="name">webservices.xml</property>
+ <property name="useSchemaValidation">true</property>
+ </bean>
<!--
A web service deployer that hooks in after the EJB deployers
16 years, 10 months
JBossWS SVN: r10212 - stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/addressing/map.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-06-22 08:48:53 -0400 (Mon, 22 Jun 2009)
New Revision: 10212
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/addressing/map/CXFMAPBuilder.java
Log:
Removing useless import
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/addressing/map/CXFMAPBuilder.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/addressing/map/CXFMAPBuilder.java 2009-06-22 10:39:26 UTC (rev 10211)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/extensions/addressing/map/CXFMAPBuilder.java 2009-06-22 12:48:53 UTC (rev 10212)
@@ -24,7 +24,6 @@
import java.util.Map;
import javax.xml.namespace.QName;
-import javax.xml.ws.handler.MessageContext;
import org.apache.cxf.ws.addressing.AddressingBuilder;
import org.apache.cxf.ws.addressing.AddressingConstants;
16 years, 10 months
JBossWS SVN: r10211 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/utils.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-06-22 06:39:26 -0400 (Mon, 22 Jun 2009)
New Revision: 10211
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/utils/MimeUtils.java
Log:
[JBWS-2685] Removing dependency on com.sun.image.codec.jpeg.* API
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/utils/MimeUtils.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/utils/MimeUtils.java 2009-06-22 10:10:03 UTC (rev 10210)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/utils/MimeUtils.java 2009-06-22 10:39:26 UTC (rev 10211)
@@ -22,15 +22,18 @@
package org.jboss.ws.core.utils;
import java.awt.image.BufferedImage;
-import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
-import java.io.InputStreamReader;
import java.io.OutputStream;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
+import javax.imageio.ImageIO;
+import javax.imageio.ImageReader;
+import javax.imageio.ImageWriter;
+import javax.imageio.stream.ImageInputStream;
+import javax.imageio.stream.ImageOutputStream;
import javax.mail.internet.ContentType;
import javax.mail.internet.MimeMultipart;
import javax.mail.internet.ParseException;
@@ -42,10 +45,6 @@
import org.jboss.wsf.common.IOUtils;
import org.jboss.wsf.common.JavaUtils;
-import com.sun.image.codec.jpeg.JPEGCodec;
-import com.sun.image.codec.jpeg.JPEGImageDecoder;
-import com.sun.image.codec.jpeg.JPEGImageEncoder;
-
/**
* Generic mime utility class.
*
@@ -218,15 +217,18 @@
{
public Object readFrom(InputStream in) {
Object converted = null;
+
try
{
- JPEGImageDecoder dec = JPEGCodec.createJPEGDecoder(in);
- BufferedImage bim = dec.decodeAsBufferedImage();
+ ImageReader decoder = ImageIO.getImageReadersByFormatName("JPEG").next();
+ ImageInputStream iis = ImageIO.createImageInputStream(in);
+ decoder.setInput(iis);
+ BufferedImage bim = decoder.read(0);
converted = bim;
}
catch (Exception e)
{
- // ignore
+ e.printStackTrace();
}
return converted;
@@ -235,10 +237,12 @@
public void writeTo(Object obj, OutputStream out) {
if(obj instanceof BufferedImage)
{
- JPEGImageEncoder enc = JPEGCodec.createJPEGEncoder(out);
+ ImageWriter encoder = ImageIO.getImageWritersByFormatName("JPEG").next();
try
{
- enc.encode((BufferedImage)obj);
+ ImageOutputStream ios = ImageIO.createImageOutputStream(out);
+ encoder.setOutput(ios);
+ encoder.write((BufferedImage)obj);
}
catch (IOException e)
{
16 years, 10 months
JBossWS SVN: r10210 - stack/native/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-06-22 06:10:03 -0400 (Mon, 22 Jun 2009)
New Revision: 10210
Modified:
stack/native/trunk/pom.xml
Log:
Using JAXB 2.1.9 impl
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2009-06-21 00:56:24 UTC (rev 10209)
+++ stack/native/trunk/pom.xml 2009-06-22 10:10:03 UTC (rev 10210)
@@ -64,7 +64,7 @@
<commons.logging.version>1.1.1</commons.logging.version>
<javassist.version>3.6.0.GA</javassist.version>
<jaxb.api.version>2.1</jaxb.api.version>
- <jaxb.impl.version>2.1.6</jaxb.impl.version>
+ <jaxb.impl.version>2.1.9</jaxb.impl.version>
<jboss.common.version>1.2.1.GA</jboss.common.version>
<jboss.jaxbintros.version>1.0.0.GA</jboss.jaxbintros.version>
<jboss.logging.version>2.0.5.GA</jboss.logging.version>
16 years, 10 months