JBossWS SVN: r2569 - in trunk: integration-jboss42/src/java/org/jboss/ws/integration/jboss42 and 7 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-03-09 08:53:08 -0500 (Fri, 09 Mar 2007)
New Revision: 2569
Added:
trunk/jbossws-core/src/java/org/jboss/ws/integration/KernelLocator.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefMetaDataParser.java
Modified:
trunk/integration-jboss40/src/java/org/jboss/ws/integration/jboss40/DeployerInterceptor.java
trunk/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeployerInterceptor.java
trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/AbstractDeployer.java
trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceEndpointLifecycleDeployer.java
trunk/integration-jboss50/src/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml
trunk/integration-tomcat/src/java/org/jboss/ws/integration/tomcat/KernelBootstrap.java
trunk/integration-tomcat/src/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java
trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServerConfigFactory.java
trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointManagerFactory.java
trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerFactory.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java
Log:
Use KernelLocator the comes with jbossws. Fix whitespace handling in service-ref
Modified: trunk/integration-jboss40/src/java/org/jboss/ws/integration/jboss40/DeployerInterceptor.java
===================================================================
--- trunk/integration-jboss40/src/java/org/jboss/ws/integration/jboss40/DeployerInterceptor.java 2007-03-09 12:24:06 UTC (rev 2568)
+++ trunk/integration-jboss40/src/java/org/jboss/ws/integration/jboss40/DeployerInterceptor.java 2007-03-09 13:53:08 UTC (rev 2569)
@@ -27,7 +27,7 @@
import org.jboss.deployment.DeploymentInfo;
import org.jboss.deployment.MainDeployerMBean;
import org.jboss.deployment.SubDeployerInterceptorSupport;
-import org.jboss.kernel.plugins.util.KernelLocator;
+import org.jboss.ws.integration.KernelLocator;
import org.jboss.kernel.spi.registry.KernelRegistry;
import org.jboss.kernel.spi.registry.KernelRegistryEntry;
import org.jboss.metadata.WebMetaData;
Modified: trunk/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeployerInterceptor.java
===================================================================
--- trunk/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeployerInterceptor.java 2007-03-09 12:24:06 UTC (rev 2568)
+++ trunk/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeployerInterceptor.java 2007-03-09 13:53:08 UTC (rev 2569)
@@ -27,7 +27,7 @@
import org.jboss.deployment.DeploymentInfo;
import org.jboss.deployment.MainDeployerMBean;
import org.jboss.deployment.SubDeployerInterceptorSupport;
-import org.jboss.kernel.plugins.util.KernelLocator;
+import org.jboss.ws.integration.KernelLocator;
import org.jboss.kernel.spi.registry.KernelRegistry;
import org.jboss.kernel.spi.registry.KernelRegistryEntry;
import org.jboss.metadata.WebMetaData;
Modified: trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/AbstractDeployer.java
===================================================================
--- trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/AbstractDeployer.java 2007-03-09 12:24:06 UTC (rev 2568)
+++ trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/AbstractDeployer.java 2007-03-09 13:53:08 UTC (rev 2569)
@@ -26,7 +26,7 @@
import org.jboss.deployers.plugins.deployer.AbstractSimpleDeployer;
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.DeploymentUnit;
-import org.jboss.kernel.plugins.util.KernelLocator;
+import org.jboss.ws.integration.KernelLocator;
import org.jboss.kernel.spi.registry.KernelRegistry;
import org.jboss.kernel.spi.registry.KernelRegistryEntry;
import org.jboss.ws.core.server.AbstractServiceEndpointPublisher;
Modified: trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceEndpointLifecycleDeployer.java
===================================================================
--- trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceEndpointLifecycleDeployer.java 2007-03-09 12:24:06 UTC (rev 2568)
+++ trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceEndpointLifecycleDeployer.java 2007-03-09 13:53:08 UTC (rev 2569)
@@ -28,7 +28,7 @@
import org.jboss.deployers.plugins.deployer.AbstractSimpleDeployer;
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.DeploymentUnit;
-import org.jboss.kernel.plugins.util.KernelLocator;
+import org.jboss.ws.integration.KernelLocator;
import org.jboss.kernel.spi.registry.KernelRegistry;
import org.jboss.kernel.spi.registry.KernelRegistryEntry;
import org.jboss.metadata.WebMetaData;
Modified: trunk/integration-jboss50/src/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml
===================================================================
--- trunk/integration-jboss50/src/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml 2007-03-09 12:24:06 UTC (rev 2568)
+++ trunk/integration-jboss50/src/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml 2007-03-09 13:53:08 UTC (rev 2569)
@@ -2,7 +2,9 @@
<deployment xmlns="urn:jboss:bean-deployer:2.0">
- <bean name="KernelLocator" class="org.jboss.kernel.plugins.util.KernelLocator"/>
+ <bean name="KernelLocator" class="org.jboss.ws.integration.KernelLocator">
+ <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
+ </bean>
<bean name="ServiceEndpointManager" class="org.jboss.ws.core.server.ServiceEndpointManager">
Modified: trunk/integration-tomcat/src/java/org/jboss/ws/integration/tomcat/KernelBootstrap.java
===================================================================
--- trunk/integration-tomcat/src/java/org/jboss/ws/integration/tomcat/KernelBootstrap.java 2007-03-09 12:24:06 UTC (rev 2568)
+++ trunk/integration-tomcat/src/java/org/jboss/ws/integration/tomcat/KernelBootstrap.java 2007-03-09 13:53:08 UTC (rev 2569)
@@ -27,7 +27,7 @@
import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap;
import org.jboss.kernel.plugins.deployment.xml.BeanXMLDeployer;
-import org.jboss.kernel.plugins.util.KernelLocator;
+import org.jboss.ws.integration.KernelLocator;
import org.jboss.logging.Logger;
/**
Modified: trunk/integration-tomcat/src/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java
===================================================================
--- trunk/integration-tomcat/src/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java 2007-03-09 12:24:06 UTC (rev 2568)
+++ trunk/integration-tomcat/src/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java 2007-03-09 13:53:08 UTC (rev 2569)
@@ -33,7 +33,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.jboss.kernel.plugins.util.KernelLocator;
+import org.jboss.ws.integration.KernelLocator;
import org.jboss.kernel.spi.registry.KernelRegistry;
import org.jboss.kernel.spi.registry.KernelRegistryEntry;
import org.jboss.logging.Logger;
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServerConfigFactory.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServerConfigFactory.java 2007-03-09 12:24:06 UTC (rev 2568)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServerConfigFactory.java 2007-03-09 13:53:08 UTC (rev 2569)
@@ -21,7 +21,7 @@
*/
package org.jboss.ws.core.server;
-import org.jboss.kernel.plugins.util.KernelLocator;
+import org.jboss.ws.integration.KernelLocator;
import org.jboss.kernel.spi.registry.KernelRegistry;
import org.jboss.logging.Logger;
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointManagerFactory.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointManagerFactory.java 2007-03-09 12:24:06 UTC (rev 2568)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointManagerFactory.java 2007-03-09 13:53:08 UTC (rev 2569)
@@ -21,7 +21,7 @@
*/
package org.jboss.ws.core.server;
-import org.jboss.kernel.plugins.util.KernelLocator;
+import org.jboss.ws.integration.KernelLocator;
import org.jboss.kernel.spi.registry.KernelRegistry;
import org.jboss.kernel.spi.registry.KernelRegistryEntry;
Modified: trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerFactory.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerFactory.java 2007-03-09 12:24:06 UTC (rev 2568)
+++ trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerFactory.java 2007-03-09 13:53:08 UTC (rev 2569)
@@ -1,6 +1,6 @@
package org.jboss.ws.extensions.eventing.mgmt;
-import org.jboss.kernel.plugins.util.KernelLocator;
+import org.jboss.ws.integration.KernelLocator;
import org.jboss.kernel.spi.registry.KernelRegistry;
import org.jboss.kernel.spi.registry.KernelRegistryEntry;
Added: trunk/jbossws-core/src/java/org/jboss/ws/integration/KernelLocator.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/integration/KernelLocator.java (rev 0)
+++ trunk/jbossws-core/src/java/org/jboss/ws/integration/KernelLocator.java 2007-03-09 13:53:08 UTC (rev 2569)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ws.integration;
+
+//$Id$
+
+import org.jboss.kernel.Kernel;
+
+/**
+ * Locate the single instance of the kernel
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 12-May-2006
+ */
+public class KernelLocator
+{
+ private static Kernel kernel;
+
+ public static Kernel getKernel()
+ {
+ return KernelLocator.kernel;
+ }
+
+ public void setKernel(Kernel kernel)
+ {
+ KernelLocator.kernel = kernel;
+ }
+}
Property changes on: trunk/jbossws-core/src/java/org/jboss/ws/integration/KernelLocator.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefMetaDataParser.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefMetaDataParser.java (rev 0)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefMetaDataParser.java 2007-03-09 13:53:08 UTC (rev 2569)
@@ -0,0 +1,200 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ws.metadata.j2ee.serviceref;
+
+// $Id$
+
+import java.util.Iterator;
+
+import javax.xml.namespace.QName;
+
+import org.jboss.ws.core.utils.DOMUtils;
+import org.jboss.xb.QNameBuilder;
+import org.w3c.dom.Element;
+
+/**
+ * The metdata data from service-ref element in web.xml, ejb-jar.xml, and
+ * application-client.xml.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ */
+public class ServiceRefMetaDataParser
+{
+ public void importStandardXml(Element root, UnifiedServiceRefMetaData sref)
+ {
+ sref.setServiceRefName(getElementContent(root, "service-ref-name"));
+ sref.setServiceInterface(getOptionalElementContent(root, "service-interface"));
+ sref.setWsdlFile(getOptionalElementContent(root, "wsdl-file"));
+ sref.setMappingFile(getOptionalElementContent(root, "jaxrpc-mapping-file"));
+
+ Element child = DOMUtils.getFirstChildElement(root, "service-qname");
+ if (child != null)
+ sref.setServiceQName(QNameBuilder.buildQName(child, getTextContent(child)));
+
+ // Parse the port-component-ref elements
+ Iterator iterator = DOMUtils.getChildElements(root, "port-component-ref");
+ while (iterator.hasNext())
+ {
+ Element pcrefElement = (Element)iterator.next();
+ UnifiedPortComponentRefMetaData pcrefMetaData = new UnifiedPortComponentRefMetaData(sref);
+ pcrefMetaData.importStandardXml(pcrefElement);
+ sref.addPortComponentRef(pcrefMetaData);
+ }
+
+ // Parse the handler elements
+ iterator = DOMUtils.getChildElements(root, "handler");
+ while (iterator.hasNext())
+ {
+ Element handlerElement = (Element)iterator.next();
+ UnifiedHandlerMetaData handlerMetaData = new UnifiedHandlerMetaData();
+ handlerMetaData.importStandardXml(handlerElement);
+ sref.addHandler(handlerMetaData);
+ }
+ }
+
+ public void importJBossXml(Element root, UnifiedServiceRefMetaData sref)
+ {
+ sref.setConfigName(getOptionalElementContent(root, "config-name"));
+ sref.setConfigFile(getOptionalElementContent(root, "config-file"));
+ sref.setWsdlOverride(getOptionalElementContent(root, "wsdl-override"));
+
+ // Parse the port-component-ref elements
+ Iterator iterator = DOMUtils.getChildElements(root, "port-component-ref");
+ while (iterator.hasNext())
+ {
+ Element pcrefElement = (Element)iterator.next();
+ String seiName = getOptionalElementContent(pcrefElement, "service-endpoint-interface");
+ if (seiName != null)
+ {
+ UnifiedPortComponentRefMetaData pcref = sref.getPortComponentRef(seiName);
+ if (pcref == null)
+ {
+ // Its ok to only have the <port-component-ref> in jboss.xml and not in ejb-jar.xml
+ pcref = new UnifiedPortComponentRefMetaData(sref);
+ pcref.importStandardXml(pcrefElement);
+ sref.addPortComponentRef(pcref);
+ }
+ pcref.importJBossXml(pcrefElement);
+ }
+ }
+
+ // Parse the call-property elements
+ iterator = DOMUtils.getChildElements(root, "call-property");
+ while (iterator.hasNext())
+ {
+ Element propElement = (Element)iterator.next();
+ String name = getElementContent(propElement, "prop-name");
+ String value = getElementContent(propElement, "prop-value");
+ sref.addCallProperty(new UnifiedCallPropertyMetaData(name, value));
+ }
+ }
+
+ public void importStandardXml(Element root, UnifiedPortComponentRefMetaData pcref)
+ {
+ pcref.setServiceEndpointInterface(getOptionalElementContent(root, "service-endpoint-interface"));
+ pcref.setPortComponentLink(getOptionalElementContent(root, "port-component-link"));
+ }
+
+ public void importJBossXml(Element root, UnifiedPortComponentRefMetaData pcref)
+ {
+ // Look for call-property elements
+ Iterator iterator = DOMUtils.getChildElements(root, "call-property");
+ while (iterator.hasNext())
+ {
+ Element propElement = (Element)iterator.next();
+ String name = getElementContent(propElement, "prop-name");
+ String value = getElementContent(propElement, "prop-value");
+ pcref.addCallProperty(new UnifiedCallPropertyMetaData(name, value));
+ }
+ }
+
+ public void importStandardXml(Element root, UnifiedHandlerMetaData href)
+ {
+ href.setHandlerName(getElementContent(root, "handler-name"));
+ href.setHandlerClass(getElementContent(root, "handler-class"));
+
+ // Parse the init-param elements
+ Iterator iterator = DOMUtils.getChildElements(root, "init-param");
+ while (iterator.hasNext())
+ {
+ Element paramElement = (Element)iterator.next();
+ UnifiedInitParamMetaData param = new UnifiedInitParamMetaData();
+ param.setParamName(getElementContent(paramElement, "param-name"));
+ param.setParamValue(getElementContent(paramElement, "param-value"));
+ href.addInitParam(param);
+ }
+
+ // Parse the soap-header elements
+ iterator = DOMUtils.getChildElements(root, "soap-header");
+ while (iterator.hasNext())
+ {
+ Element headerElement = (Element)iterator.next();
+ String content = getTextContent(headerElement);
+ QName qname = QNameBuilder.buildQName(headerElement, content);
+ href.addSoapHeader(qname);
+ }
+
+ // Parse the soap-role elements
+ iterator = DOMUtils.getChildElements(root, "soap-role");
+ while (iterator.hasNext())
+ {
+ Element roleElement = (Element)iterator.next();
+ String content = getTextContent(roleElement);
+ href.addSoapRole(content);
+ }
+
+ // Parse the port-name elements
+ iterator = DOMUtils.getChildElements(root, "port-name");
+ while (iterator.hasNext())
+ {
+ Element portElement = (Element)iterator.next();
+ String content = getTextContent(portElement);
+ href.addPortName(content);
+ }
+ }
+
+ private String getElementContent(Element element, String childName)
+ {
+ String childValue = getOptionalElementContent(element, childName);
+ if (childValue == null || childValue.length() == 0)
+ throw new IllegalStateException("Invalid null element content: " + childName);
+
+ return childValue;
+ }
+
+ private String getOptionalElementContent(Element element, String childName)
+ {
+ return getTextContent(DOMUtils.getFirstChildElement(element, childName));
+ }
+
+ private String getTextContent(Element element)
+ {
+ String content = null;
+ if (element != null)
+ {
+ content = DOMUtils.getTextContent(element);
+ if (content != null)
+ content = content.trim();
+ }
+ return content;
+ }
+}
Property changes on: trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/ServiceRefMetaDataParser.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java 2007-03-09 12:24:06 UTC (rev 2568)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java 2007-03-09 13:53:08 UTC (rev 2569)
@@ -25,19 +25,16 @@
import java.util.ArrayList;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
import javax.xml.namespace.QName;
-import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.integration.ServiceRefElement;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXRPC;
import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXWS;
import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType;
-import org.jboss.xb.QNameBuilder;
import org.w3c.dom.Element;
/** The unified metdata data for a handler element
@@ -158,54 +155,8 @@
return hmd;
}
- @Deprecated
public void importStandardXml(Element root)
{
- Element child = DOMUtils.getFirstChildElement(root, "handler-name");
- if (child != null)
- handlerName = DOMUtils.getTextContent(child);
-
- child = DOMUtils.getFirstChildElement(root, "handler-class");
- if (child != null)
- handlerClass = DOMUtils.getTextContent(child);
-
- // Parse the init-param elements
- Iterator iterator = DOMUtils.getChildElements(root, "init-param");
- while (iterator.hasNext())
- {
- Element paramElement = (Element)iterator.next();
- UnifiedInitParamMetaData param = new UnifiedInitParamMetaData();
- param.setParamName(DOMUtils.getTextContent(DOMUtils.getFirstChildElement(paramElement, "param-name")));
- param.setParamValue(DOMUtils.getTextContent(DOMUtils.getFirstChildElement(paramElement, "param-value")));
- initParams.add(param);
- }
-
- // Parse the soap-header elements
- iterator = DOMUtils.getChildElements(root, "soap-header");
- while (iterator.hasNext())
- {
- Element headerElement = (Element)iterator.next();
- String content = DOMUtils.getTextContent(headerElement);
- QName qname = QNameBuilder.buildQName(headerElement, content);
- soapHeaders.add(qname);
- }
-
- // Parse the soap-role elements
- iterator = DOMUtils.getChildElements(root, "soap-role");
- while (iterator.hasNext())
- {
- Element roleElement = (Element)iterator.next();
- String content = DOMUtils.getTextContent(roleElement);
- soapRoles.add(content);
- }
-
- // Parse the port-name elements
- iterator = DOMUtils.getChildElements(root, "port-name");
- while (iterator.hasNext())
- {
- Element portElement = (Element)iterator.next();
- String content = DOMUtils.getTextContent(portElement);
- portNames.add(content);
- }
+ new ServiceRefMetaDataParser().importStandardXml(root, this);
}
}
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java 2007-03-09 12:24:06 UTC (rev 2568)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java 2007-03-09 13:53:08 UTC (rev 2569)
@@ -179,29 +179,13 @@
this.configName = configName;
}
- @Deprecated
public void importStandardXml(Element root)
{
- Element child = DOMUtils.getFirstChildElement(root, "service-endpoint-interface");
- if (child != null)
- serviceEndpointInterface = DOMUtils.getTextContent(child);
-
- child = DOMUtils.getFirstChildElement(root, "port-component-link");
- if (child != null)
- portComponentLink = DOMUtils.getTextContent(child);
+ new ServiceRefMetaDataParser().importStandardXml(root, this);
}
- @Deprecated
public void importJBossXml(Element root)
{
- // Look for call-property elements
- Iterator iterator = DOMUtils.getChildElements(root, "call-property");
- while (iterator.hasNext())
- {
- Element propElement = (Element)iterator.next();
- String name = DOMUtils.getTextContent(DOMUtils.getFirstChildElement(propElement, "prop-name"));
- String value = DOMUtils.getTextContent(DOMUtils.getFirstChildElement(propElement, "prop-value"));
- callProperties.add(new UnifiedCallPropertyMetaData(name, value));
- }
+ new ServiceRefMetaDataParser().importJBossXml(root, this);
}
}
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2007-03-09 12:24:06 UTC (rev 2568)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2007-03-09 13:53:08 UTC (rev 2569)
@@ -388,91 +388,12 @@
@Override
public void importStandardXml(Element root)
{
- Element child = DOMUtils.getFirstChildElement(root, "service-ref-name");
- if (child != null)
- serviceRefName = DOMUtils.getTextContent(child);
-
- child = DOMUtils.getFirstChildElement(root, "service-interface");
- if (child != null)
- serviceInterface = DOMUtils.getTextContent(child);
-
- child = DOMUtils.getFirstChildElement(root, "wsdl-file");
- if (child != null)
- wsdlFile = DOMUtils.getTextContent(child);
-
- child = DOMUtils.getFirstChildElement(root, "jaxrpc-mapping-file");
- if (child != null)
- mappingFile = DOMUtils.getTextContent(child);
-
- child = DOMUtils.getFirstChildElement(root, "service-qname");
- if (child != null)
- serviceQName = QNameBuilder.buildQName(child, DOMUtils.getTextContent(child));
-
- // Parse the port-component-ref elements
- Iterator iterator = DOMUtils.getChildElements(root, "port-component-ref");
- while (iterator.hasNext())
- {
- Element pcrefElement = (Element)iterator.next();
- UnifiedPortComponentRefMetaData pcrefMetaData = new UnifiedPortComponentRefMetaData(this);
- pcrefMetaData.importStandardXml(pcrefElement);
- portComponentRefs.put(pcrefMetaData.getServiceEndpointInterface(), pcrefMetaData);
- }
-
- // Parse the handler elements
- iterator = DOMUtils.getChildElements(root, "handler");
- while (iterator.hasNext())
- {
- Element handlerElement = (Element)iterator.next();
- UnifiedHandlerMetaData handlerMetaData = new UnifiedHandlerMetaData();
- handlerMetaData.importStandardXml(handlerElement);
- handlers.add(handlerMetaData);
- }
+ new ServiceRefMetaDataParser().importStandardXml(root, this);
}
@Override
public void importJBossXml(Element root)
{
- Element child = DOMUtils.getFirstChildElement(root, "config-name");
- if (child != null)
- configName = DOMUtils.getTextContent(child);
-
- child = DOMUtils.getFirstChildElement(root, "config-file");
- if (child != null)
- configFile = DOMUtils.getTextContent(child);
-
- child = DOMUtils.getFirstChildElement(root, "wsdl-override");
- if (child != null)
- wsdlOverride = DOMUtils.getTextContent(child);
-
- // Parse the port-component-ref elements
- Iterator iterator = DOMUtils.getChildElements(root, "port-component-ref");
- while (iterator.hasNext())
- {
- Element pcrefElement = (Element)iterator.next();
- Element seiElement = DOMUtils.getFirstChildElement(pcrefElement, "service-endpoint-interface");
- if (seiElement != null)
- {
- String seiName = DOMUtils.getTextContent(seiElement);
- UnifiedPortComponentRefMetaData pcrefMetaData = (UnifiedPortComponentRefMetaData)portComponentRefs.get(seiName);
- if (pcrefMetaData == null)
- {
- // Its ok to only have the <port-component-ref> in jboss.xml and not in ejb-jar.xml
- pcrefMetaData = new UnifiedPortComponentRefMetaData(this);
- pcrefMetaData.importStandardXml(pcrefElement);
- portComponentRefs.put(pcrefMetaData.getServiceEndpointInterface(), pcrefMetaData);
- }
- pcrefMetaData.importJBossXml(pcrefElement);
- }
- }
-
- // Parse the call-property elements
- iterator = DOMUtils.getChildElements(root, "call-property");
- while (iterator.hasNext())
- {
- Element propElement = (Element)iterator.next();
- String name = DOMUtils.getTextContent(DOMUtils.getFirstChildElement(propElement, "prop-name"));
- String value = DOMUtils.getTextContent(DOMUtils.getFirstChildElement(propElement, "prop-value"));
- callProperties.add(new UnifiedCallPropertyMetaData(name, value));
- }
+ new ServiceRefMetaDataParser().importJBossXml(root, this);
}
}
17 years, 9 months
- 1
- 0
JBossWS SVN: r2568 - trunk/jbossws-core/src/java/org/jboss/ws/core/soap.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-03-09 07:24:06 -0500 (Fri, 09 Mar 2007)
New Revision: 2568
Modified:
trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPContentElement.java
Log:
Fix JMSTransport issue with binary types
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPContentElement.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPContentElement.java 2007-03-09 12:23:38 UTC (rev 2567)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPContentElement.java 2007-03-09 12:24:06 UTC (rev 2568)
@@ -528,7 +528,10 @@
public void writeElement(Writer writer) throws IOException
{
- handleMTOMTransitions();
+ // JMS transport hot fix
+ // Can be removed once we got a immutabe object model
+ if(MessageContextAssociation.peekMessageContext()!=null)
+ handleMTOMTransitions();
if (soapContent instanceof DOMContent)
{
17 years, 9 months
- 1
- 0
JBossWS SVN: r2567 - trunk/jbossws-tests/src/resources/jaxrpc/jbws425/META-INF.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-03-09 07:23:38 -0500 (Fri, 09 Mar 2007)
New Revision: 2567
Modified:
trunk/jbossws-tests/src/resources/jaxrpc/jbws425/META-INF/application-client.xml
Log:
Added test stup comments
Modified: trunk/jbossws-tests/src/resources/jaxrpc/jbws425/META-INF/application-client.xml
===================================================================
--- trunk/jbossws-tests/src/resources/jaxrpc/jbws425/META-INF/application-client.xml 2007-03-09 11:04:27 UTC (rev 2566)
+++ trunk/jbossws-tests/src/resources/jaxrpc/jbws425/META-INF/application-client.xml 2007-03-09 12:23:38 UTC (rev 2567)
@@ -10,6 +10,7 @@
<wsdl-file>META-INF/wsdl/HelloService.wsdl</wsdl-file>
<jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
<port-component-ref>
+ <!-- kee the white space , it's part of the test -->
<service-endpoint-interface> org.jboss.test.ws.jaxrpc.jbws425.Hello</service-endpoint-interface>
</port-component-ref>
</service-ref>
17 years, 9 months
- 1
- 0
JBossWS SVN: r2566 - in branches/jbossws-1.2.0/jbossws-tests: src and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-03-09 06:04:27 -0500 (Fri, 09 Mar 2007)
New Revision: 2566
Added:
branches/jbossws-1.2.0/jbossws-tests/src/resources/
Removed:
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/
Modified:
branches/jbossws-1.2.0/jbossws-tests/.classpath
Log:
move resources
Modified: branches/jbossws-1.2.0/jbossws-tests/.classpath
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/.classpath 2007-03-09 10:54:03 UTC (rev 2565)
+++ branches/jbossws-1.2.0/jbossws-tests/.classpath 2007-03-09 11:04:27 UTC (rev 2566)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry excluding="org/jboss/test/ws/interop/|org/jboss/test/ws/jaxrpc/jbws718/" kind="src" path="src/main/java"/>
<classpathentry kind="src" path="output/wsconsume/java"/>
+ <classpathentry kind="src" path="src/java"/>
<classpathentry kind="src" path="output/wstools/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/build"/>
Copied: branches/jbossws-1.2.0/jbossws-tests/src/resources (from rev 2564, branches/jbossws-1.2.0/jbossws-tests/src/main/resources)
17 years, 9 months
- 1
- 0
JBossWS SVN: r2565 - branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-03-09 05:54:03 -0500 (Fri, 09 Mar 2007)
New Revision: 2565
Removed:
branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java
branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceRefHandlerMBean.java
branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceRefMetaDataAdaptor.java
Log:
Remove redundant jboss50 serviceref classes
Deleted: branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java
===================================================================
--- branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java 2007-03-09 10:37:29 UTC (rev 2564)
+++ branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceRefHandler.java 2007-03-09 10:54:03 UTC (rev 2565)
@@ -1,161 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ws.integration.jboss50;
-
-// $Id$
-
-import java.net.URL;
-import java.util.Iterator;
-
-import javax.management.MBeanServer;
-import javax.naming.Context;
-import javax.wsdl.Definition;
-import javax.wsdl.WSDLException;
-import javax.xml.rpc.JAXRPCException;
-
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
-import org.jboss.logging.Logger;
-import org.jboss.mx.util.MBeanServerLocator;
-import org.jboss.util.naming.Util;
-import org.jboss.metadata.serviceref.ServiceRefMetaData;
-import org.jboss.ws.WSException;
-import org.jboss.ws.core.jaxrpc.client.ServiceReferenceable;
-import org.jboss.ws.core.server.UnifiedDeploymentInfo;
-import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCClientDeployment;
-import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData;
-import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
-import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory;
-import org.jboss.ws.tools.wsdl.WSDL11DefinitionFactory;
-
-/**
- * Binds a JAXRPC Service object in the client's ENC for every service-ref element in the
- * deployment descriptor.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 04-Nov-2006
- */
-public class ServiceRefHandler implements ServiceRefHandlerMBean
-{
- // logging support
- private static Logger log = Logger.getLogger(ServiceRefHandler.class);
-
- /**
- * This binds a jaxrpc Service into the callers ENC for every service-ref element
- *
- * @param envCtx ENC to bind the javax.rpc.xml.Service object to
- * @param serviceRefs An iterator of the service-ref elements in the client deployment descriptor
- * @param unit The client deployment
- */
- public void bindServiceRefs(Context envCtx, Iterator serviceRefs, DeploymentUnit unit)
- {
- try
- {
- while (serviceRefs.hasNext())
- {
- ServiceRefMetaData serviceRef = (ServiceRefMetaData)serviceRefs.next();
- String serviceRefName = serviceRef.getServiceRefName();
-
- // Build the container independent deployment info
- UnifiedDeploymentInfo udi = new JAXRPCClientDeployment(UnifiedDeploymentInfo.DeploymentType.JAXRPC_Client);
- DeploymentInfoAdaptor.buildDeploymentInfo(udi, unit);
-
- UnifiedServiceRefMetaData wsServiceRef = ServiceRefMetaDataAdaptor.buildUnifiedServiceRefMetaData(udi, serviceRef);
-
- JavaWsdlMapping javaWsdlMapping = getJavaWsdlMapping(wsServiceRef);
- wsServiceRef.setJavaWsdlMapping(javaWsdlMapping);
-
- Definition wsdlDefinition = getWsdlDefinition(wsServiceRef);
- wsServiceRef.setWsdlDefinition(wsdlDefinition);
-
- ServiceReferenceable ref = new ServiceReferenceable(wsServiceRef, udi);
-
- // Do not use rebind, the binding should be unique
- Util.bind(envCtx, serviceRefName, ref);
-
- log.debug("<service-ref> bound to: java:comp/env/" + serviceRefName);
- }
- }
- catch (RuntimeException rte)
- {
- throw rte;
- }
- catch (Exception ex)
- {
- throw new WSException("Cannot bind webservice to client environment", ex);
- }
- }
-
- private JavaWsdlMapping getJavaWsdlMapping(UnifiedServiceRefMetaData serviceRef)
- {
- JavaWsdlMapping javaWsdlMapping = null;
- URL mappingURL = serviceRef.getMappingLocation();
- if (mappingURL != null)
- {
- try
- {
- JavaWsdlMappingFactory mappingFactory = JavaWsdlMappingFactory.newInstance();
- javaWsdlMapping = mappingFactory.parse(mappingURL);
- }
- catch (Exception e)
- {
- throw new JAXRPCException("Cannot unmarshal jaxrpc-mapping-file: " + mappingURL, e);
- }
- }
- return javaWsdlMapping;
- }
-
- private Definition getWsdlDefinition(UnifiedServiceRefMetaData serviceRef)
- {
- Definition wsdlDefinition = null;
- {
- URL wsdlOverride = serviceRef.getWsdlOverride();
- URL wsdlURL = serviceRef.getWsdlLocation();
- if (wsdlOverride == null && wsdlURL != null)
- {
- try
- {
- WSDL11DefinitionFactory factory = WSDL11DefinitionFactory.newInstance();
- wsdlDefinition = factory.parse(wsdlURL);
- }
- catch (WSDLException e)
- {
- throw new WSException("Cannot unmarshall wsdl, cause: " + e.toString());
- }
- }
- }
- return wsdlDefinition;
- }
-
- public void create() throws Exception
- {
- MBeanServer server = MBeanServerLocator.locateJBoss();
- if (server != null)
- server.registerMBean(this, OBJECT_NAME);
- }
-
- public void destroy() throws Exception
- {
- MBeanServer server = MBeanServerLocator.locateJBoss();
- if (server != null)
- server.unregisterMBean(OBJECT_NAME);
- }
-}
Deleted: branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceRefHandlerMBean.java
===================================================================
--- branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceRefHandlerMBean.java 2007-03-09 10:37:29 UTC (rev 2564)
+++ branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceRefHandlerMBean.java 2007-03-09 10:54:03 UTC (rev 2565)
@@ -1,50 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.ws.integration.jboss50;
-
-import java.util.Iterator;
-
-import javax.management.ObjectName;
-import javax.naming.Context;
-
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentUnit;
-import org.jboss.ws.core.utils.ObjectNameFactory;
-
-/**
- * MBean interface.
- */
-public interface ServiceRefHandlerMBean
-{
- // default object name
- public static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=ServiceRefHandler");
-
- /**
- * Binds a JAXRPC Service into the callers ENC for every service-ref element
- *
- * @param envCtx ENC to bind the javax.rpc.xml.Service object to
- * @param serviceRefs An iterator of the service-ref elements in the client deployment descriptor
- * @param unit The client's deployment unit
- * @throws DeploymentException if it goes wrong
- */
- void bindServiceRefs(Context envCtx, Iterator serviceRefs, DeploymentUnit unit);
-}
Deleted: branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceRefMetaDataAdaptor.java
===================================================================
--- branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceRefMetaDataAdaptor.java 2007-03-09 10:37:29 UTC (rev 2564)
+++ branches/jbossws-1.2.0/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceRefMetaDataAdaptor.java 2007-03-09 10:54:03 UTC (rev 2565)
@@ -1,112 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ws.integration.jboss50;
-
-// $Id$
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-
-import javax.xml.namespace.QName;
-
-import org.jboss.metadata.serviceref.HandlerMetaData;
-import org.jboss.metadata.serviceref.InitParamMetaData;
-import org.jboss.metadata.serviceref.PortComponentRefMetaData;
-import org.jboss.metadata.serviceref.ServiceRefMetaData;
-import org.jboss.ws.core.server.UnifiedDeploymentInfo;
-import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedPortComponentRefMetaData;
-import org.jboss.ws.metadata.j2ee.UnifiedServiceRefMetaData;
-import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerInitParam;
-
-/**
- * Build container independent service ref meta data
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 05-May-2006
- */
-public class ServiceRefMetaDataAdaptor
-{
- public static UnifiedServiceRefMetaData buildUnifiedServiceRefMetaData(UnifiedDeploymentInfo udi, ServiceRefMetaData srmd) throws Exception
- {
- UnifiedServiceRefMetaData usrmd = new UnifiedServiceRefMetaData();
- usrmd.setServiceRefName(srmd.getServiceRefName());
- usrmd.setServiceInterface(srmd.getServiceInterface());
- usrmd.setWsdlLocation(getWsdlLocation(udi, srmd));
- usrmd.setMappingLocation(udi.getMetaDataFileURL(srmd.getMappingFile()));
- usrmd.setServiceQName(srmd.getServiceQName());
-
- LinkedHashMap<String, UnifiedPortComponentRefMetaData> pcrefs = new LinkedHashMap<String, UnifiedPortComponentRefMetaData>();
- for (PortComponentRefMetaData pcmd : srmd.getPortComponentRefs())
- {
- UnifiedPortComponentRefMetaData upcmd = new UnifiedPortComponentRefMetaData();
- upcmd.setServiceEndpointInterface(pcmd.getServiceEndpointInterface());
- upcmd.setPortComponentLink(pcmd.getPortComponentLink());
- upcmd.setCallProperties(pcmd.getCallProperties());
- pcrefs.put(pcmd.getServiceEndpointInterface(), upcmd);
- }
- usrmd.setPortComponentRefs(pcrefs);
-
- ArrayList<UnifiedHandlerMetaData> handlers = new ArrayList<UnifiedHandlerMetaData>();
- for (HandlerMetaData hmd : srmd.getHandlers())
- {
- UnifiedHandlerMetaData uhmd = new UnifiedHandlerMetaData(null);
- uhmd.setHandlerName(hmd.getHandlerName());
- uhmd.setHandlerClass(hmd.getHandlerClass());
- for(QName soapHeader : hmd.getSoapHeaders())
- {
- uhmd.addSoapHeader(soapHeader);
- }
- for(String portname : hmd.getPortNames())
- {
- uhmd.addPortName(portname);
- }
- for (InitParamMetaData ipmd : hmd.getInitParams())
- {
- HandlerInitParam ip = new HandlerInitParam();
- ip.setParamName(ipmd.getParamName());
- ip.setParamValue(ipmd.getParamValue());
- uhmd.addInitParam(ip);
- }
- handlers.add(uhmd);
- }
- usrmd.setHandlers(handlers);
-
- usrmd.setConfigName(srmd.getConfigName());
- usrmd.setConfigFile(srmd.getConfigFile());
- usrmd.setWsdlOverride(srmd.getWsdlOverride());
- usrmd.setCallProperties(srmd.getCallProperties());
-
- return usrmd;
- }
-
- private static URL getWsdlLocation(UnifiedDeploymentInfo udi, ServiceRefMetaData srmd) throws Exception
- {
- URL wsdlLocation = srmd.getWsdlOverride();
- if (wsdlLocation == null && srmd.getWsdlFile() != null)
- {
- wsdlLocation = udi.getMetaDataFileURL(srmd.getWsdlFile());
- }
- return wsdlLocation;
- }
-}
17 years, 9 months
- 1
- 0
JBossWS SVN: r2564 - in branches/jbossws-1.2.0: build/ant-import and 18 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-03-09 05:37:29 -0500 (Fri, 09 Mar 2007)
New Revision: 2564
Added:
branches/jbossws-1.2.0/integration-jboss40/src/java/
branches/jbossws-1.2.0/integration-jboss40/src/resources/
branches/jbossws-1.2.0/integration-jboss42/src/java/
branches/jbossws-1.2.0/integration-jboss42/src/resources/
branches/jbossws-1.2.0/integration-jboss50/src/java/
branches/jbossws-1.2.0/integration-jboss50/src/resources/
branches/jbossws-1.2.0/jbossws-core/src/java/
branches/jbossws-1.2.0/jbossws-core/src/resources/
branches/jbossws-1.2.0/jbossws-tests/src/java/
Removed:
branches/jbossws-1.2.0/integration-jboss40/src/main/java/
branches/jbossws-1.2.0/integration-jboss40/src/main/resources/
branches/jbossws-1.2.0/integration-jboss42/src/main/java/
branches/jbossws-1.2.0/integration-jboss42/src/main/resources/
branches/jbossws-1.2.0/integration-jboss50/src/main/
branches/jbossws-1.2.0/jbossws-core/src/main/java/
branches/jbossws-1.2.0/jbossws-core/src/main/resources/
branches/jbossws-1.2.0/jbossws-tests/src/main/java/
Modified:
branches/jbossws-1.2.0/build/ant-import/build-release.xml
branches/jbossws-1.2.0/build/ant-import/build-samples.xml
branches/jbossws-1.2.0/build/etc/jbossws-component-info.xml
branches/jbossws-1.2.0/build/etc/jbossws-component-info14.xml
branches/jbossws-1.2.0/build/version.properties
branches/jbossws-1.2.0/integration-jboss40/build.xml
branches/jbossws-1.2.0/integration-jboss42/build.xml
branches/jbossws-1.2.0/integration-jboss50/build.xml
branches/jbossws-1.2.0/integration-tomcat/build.xml
branches/jbossws-1.2.0/jbossws-core/build.xml
branches/jbossws-1.2.0/jbossws-core/src/resources/samples/build.xml
branches/jbossws-1.2.0/jbossws-tests/ant-import/build-interop.xml
branches/jbossws-1.2.0/jbossws-tests/build.xml
Log:
Remove redundant directory main
Modified: branches/jbossws-1.2.0/build/ant-import/build-release.xml
===================================================================
--- branches/jbossws-1.2.0/build/ant-import/build-release.xml 2007-03-09 10:03:09 UTC (rev 2563)
+++ branches/jbossws-1.2.0/build/ant-import/build-release.xml 2007-03-09 10:37:29 UTC (rev 2564)
@@ -50,6 +50,7 @@
</delete>
<copy todir="${jbossws.repository.dir}/lib" overwrite="true">
<fileset dir="${core.output.lib.dir}">
+ <include name="jbossws-integration.jar"/>
<include name="jbossws-client.jar"/>
<include name="jbossws-core.jar"/>
<include name="jboss-jaxrpc.jar"/>
@@ -86,6 +87,7 @@
</fileset>
<fileset dir="${jboss40.output.lib.dir}">
<include name="jbossws40-jdk14.sar"/>
+ <include name="jbossws14-integration.jar"/>
<include name="jbossws14-client.jar"/>
<include name="jboss-jaxws14.jar"/>
</fileset>
@@ -110,14 +112,6 @@
<property name="portal.userguide" value="${portal.freezone}/user-guide"/>
<property name="portal.downloads" value="${jbossws.portal.content}/downloads"/>
- <!-- Copy user guide
- <copy todir="${portal.userguide}" overwrite="true">
- <fileset dir="${docs.userguide.dir}/build">
- <include name="en/**"/>
- </fileset>
- </copy>
- -->
-
<!-- Copy downloads -->
<copy todir="${portal.downloads}" overwrite="true">
<fileset dir="${build.output.dir}">
@@ -179,15 +173,6 @@
</fileset>
</copy>
- <!-- documentation
- <copy todir="${build.bin.dist}/docs/html" overwrite="true">
- <fileset dir="${docs.userguide.dir}/build/en/html"/>
- </copy>
- <copy todir="${build.bin.dist}/docs" overwrite="true">
- <fileset dir="${docs.userguide.dir}/build/en/pdf"/>
- </copy>
- -->
-
<!-- Install Core -->
<copy todir="${install.core.dir}" overwrite="true">
<fileset dir="${core.output.lib.dir}">
Modified: branches/jbossws-1.2.0/build/ant-import/build-samples.xml
===================================================================
--- branches/jbossws-1.2.0/build/ant-import/build-samples.xml 2007-03-09 10:03:09 UTC (rev 2563)
+++ branches/jbossws-1.2.0/build/ant-import/build-samples.xml 2007-03-09 10:37:29 UTC (rev 2564)
@@ -43,18 +43,18 @@
<fileset dir="${tests.dir}">
<include name="ant-import/build-samples-jaxrpc.xml"/>
<include name="ant-import/build-samples-jaxws.xml"/>
- <include name="src/main/etc/*"/>
- <include name="src/main/java/org/jboss/test/ws/jaxrpc/samples/**"/>
- <include name="src/main/java/org/jboss/test/ws/jaxws/samples/**"/>
- <include name="src/main/java/org/jboss/test/ws/*"/>
- <include name="src/main/resources/jaxrpc/samples/**"/>
- <include name="src/main/resources/jaxrpc/samples-override/**"/>
- <include name="src/main/resources/jaxws/samples/**"/>
- <include name="src/main/resources/*excludes.txt"/>
+ <include name="src/etc/*"/>
+ <include name="src/java/org/jboss/test/ws/jaxrpc/samples/**"/>
+ <include name="src/java/org/jboss/test/ws/jaxws/samples/**"/>
+ <include name="src/java/org/jboss/test/ws/*"/>
+ <include name="src/resources/jaxrpc/samples/**"/>
+ <include name="src/resources/jaxrpc/samples-override/**"/>
+ <include name="src/resources/jaxws/samples/**"/>
+ <include name="src/resources/*excludes.txt"/>
</fileset>
</copy>
- <copy todir="${build.src.samples.dir}/src/main">
+ <copy todir="${build.src.samples.dir}/src">
<fileset dir="${core.samples.dir}">
<include name="etc/*"/>
</fileset>
Modified: branches/jbossws-1.2.0/build/etc/jbossws-component-info.xml
===================================================================
--- branches/jbossws-1.2.0/build/etc/jbossws-component-info.xml 2007-03-09 10:03:09 UTC (rev 2563)
+++ branches/jbossws-1.2.0/build/etc/jbossws-component-info.xml 2007-03-09 10:37:29 UTC (rev 2564)
@@ -2,6 +2,7 @@
<component id="jboss/jbossws" licenseType="lgpl" version="@repository.id@" description="JBossWS an implementation of J2EE Web Services">
+ <artifact id="jbossws-integration.jar"/>
<artifact id="jbossws-client.jar"/>
<artifact id="jbossws-core.jar"/>
<artifact id="jboss-jaxrpc.jar"/>
@@ -19,6 +20,7 @@
</import>
<import componentref="ibm-wsdl4j">
<compatible version="@ibm-wsdl4j@"/>
+ <compatible version="@ibm-wsdl4j@-brew"/>
</import>
<import componentref="javassist">
<compatible version="@javassist@"/>
@@ -29,21 +31,23 @@
</import>
<import componentref="jboss/jbossxb">
<compatible version="@jboss-jbossxb@"/>
+ <compatible version="@jboss-jbossxb@-brew"/>
+ <compatible version="2.0.0.CR1"/>
</import>
<import componentref="jboss/microcontainer">
- <compatible version="snapshot"/>
<compatible version="@jboss-microcontainer@"/>
+ <compatible version="2.0.0.Beta3"/>
</import>
<import componentref="jboss/remoting">
- <compatible version="1.4.3.GA"/>
- <compatible version="2.2.0.Alpha2"/>
<compatible version="@jboss-remoting@"/>
+ <compatible version="2.2.0.Alpha7"/>
</import>
<import componentref="sun-jaxb">
<compatible version="@sun-jaxb@"/>
</import>
<export>
+ <include input="jbossws-integration.jar"/>
<include input="jbossws-core.jar"/>
<include input="jboss-jaxrpc.jar"/>
<include input="jboss-jaxws.jar"/>
Modified: branches/jbossws-1.2.0/build/etc/jbossws-component-info14.xml
===================================================================
--- branches/jbossws-1.2.0/build/etc/jbossws-component-info14.xml 2007-03-09 10:03:09 UTC (rev 2563)
+++ branches/jbossws-1.2.0/build/etc/jbossws-component-info14.xml 2007-03-09 10:37:29 UTC (rev 2564)
@@ -3,6 +3,7 @@
<component id="jboss/jbossws14" licenseType="lgpl" version="@repository.id@"
description="JBossWS an implementation of J2EE Web Services - Retrotranslated">
+ <artifact id="jbossws14-integration.jar"/>
<artifact id="jbossws14-client.jar"/>
<artifact id="jboss-jaxws14.jar"/>
<artifact id="jboss-jaxrpc.jar"/>
@@ -37,6 +38,7 @@
</import>
<export>
+ <include input="jbossws14-integration.jar"/>
<include input="jbossws14-client.jar"/>
<include input="jboss-jaxws14.jar"/>
<include input="jboss-jaxrpc.jar"/>
Modified: branches/jbossws-1.2.0/build/version.properties
===================================================================
--- branches/jbossws-1.2.0/build/version.properties 2007-03-09 10:03:09 UTC (rev 2563)
+++ branches/jbossws-1.2.0/build/version.properties 2007-03-09 10:37:29 UTC (rev 2564)
@@ -5,8 +5,8 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-1.2
-version.id=1.2.0.GA
-repository.id=1.2.0.GA
+version.id=1.2.0.SP1
+repository.id=1.2.0.SP1
implementation.title=JBoss Web Services (JBossWS)
implementation.url=http://www.jboss.org/products/jbossws
@@ -20,6 +20,7 @@
jboss-jbossxb=1.0.0.CR9
jboss-microcontainer=1.0.2
jboss-remoting=2.0.0.GA
+jbpm-bpel=1.1.0.Beta4
sun-jaxb=2.0.3
# thirdparty library versions
@@ -45,7 +46,6 @@
jboss-vfs=2.0.0.Beta2
jbossas-core-libs=4.0.5.GA
jbossws-wsconsume=2.0.0
-jbpm-bpel=1.1.0.Beta4
junit=3.8.1
oswego-concurrent=1.3.4
qdox=1.4
Modified: branches/jbossws-1.2.0/integration-jboss40/build.xml
===================================================================
--- branches/jbossws-1.2.0/integration-jboss40/build.xml 2007-03-09 10:03:09 UTC (rev 2563)
+++ branches/jbossws-1.2.0/integration-jboss40/build.xml 2007-03-09 10:37:29 UTC (rev 2564)
@@ -19,7 +19,7 @@
<import file="${basedir}/../integration-jboss42/build.xml"/>
<import file="${basedir}/../jbossws-core/build.xml"/>
- <property name="jboss40.src.dir" value="${integration.jboss40.dir}/src/main"/>
+ <property name="jboss40.src.dir" value="${integration.jboss40.dir}/src"/>
<property name="jboss40.java.dir" value="${jboss40.src.dir}/java"/>
<property name="jboss40.resources.dir" value="${jboss40.src.dir}/resources"/>
<property name="jboss40.output.dir" value="${integration.jboss40.dir}/output"/>
@@ -27,7 +27,7 @@
<property name="jboss40.output.classes14.dir" value="${jboss40.output.dir}/classes14"/>
<property name="jboss40.output.lib.dir" value="${jboss40.output.dir}/lib"/>
- <property name="jboss42.src.dir" value="${integration.jboss42.dir}/src/main"/>
+ <property name="jboss42.src.dir" value="${integration.jboss42.dir}/src"/>
<property name="jboss42.java.dir" value="${jboss42.src.dir}/java"/>
<property name="jboss42.resources.dir" value="${jboss42.src.dir}/resources"/>
<property name="jboss42.output.dir" value="${integration.jboss42.dir}/output"/>
@@ -214,7 +214,7 @@
<fileset dir="${jboss40.output.classes14.dir}">
<include name="org/jboss/ws/**"/>
</fileset>
- <fileset dir="${core.dir}/src/main/resources">
+ <fileset dir="${core.dir}/src/resources">
<include name="schema/**"/>
<include name="dtd/**"/>
</fileset>
Copied: branches/jbossws-1.2.0/integration-jboss40/src/java (from rev 2562, branches/jbossws-1.2.0/integration-jboss40/src/main/java)
Copied: branches/jbossws-1.2.0/integration-jboss40/src/resources (from rev 2562, branches/jbossws-1.2.0/integration-jboss40/src/main/resources)
Modified: branches/jbossws-1.2.0/integration-jboss42/build.xml
===================================================================
--- branches/jbossws-1.2.0/integration-jboss42/build.xml 2007-03-09 10:03:09 UTC (rev 2563)
+++ branches/jbossws-1.2.0/integration-jboss42/build.xml 2007-03-09 10:37:29 UTC (rev 2564)
@@ -17,7 +17,7 @@
<import file="${basedir}/../build/ant-import/build-setup.xml"/>
<import file="${basedir}/../jbossws-core/build.xml"/>
- <property name="jboss42.src.dir" value="${integration.jboss42.dir}/src/main"/>
+ <property name="jboss42.src.dir" value="${integration.jboss42.dir}/src"/>
<property name="jboss42.java.dir" value="${jboss42.src.dir}/java"/>
<property name="jboss42.resources.dir" value="${jboss42.src.dir}/resources"/>
<property name="jboss42.output.dir" value="${integration.jboss42.dir}/output"/>
Copied: branches/jbossws-1.2.0/integration-jboss42/src/java (from rev 2562, branches/jbossws-1.2.0/integration-jboss42/src/main/java)
Copied: branches/jbossws-1.2.0/integration-jboss42/src/resources (from rev 2562, branches/jbossws-1.2.0/integration-jboss42/src/main/resources)
Modified: branches/jbossws-1.2.0/integration-jboss50/build.xml
===================================================================
--- branches/jbossws-1.2.0/integration-jboss50/build.xml 2007-03-09 10:03:09 UTC (rev 2563)
+++ branches/jbossws-1.2.0/integration-jboss50/build.xml 2007-03-09 10:37:29 UTC (rev 2564)
@@ -17,7 +17,7 @@
<import file="${basedir}/../build/ant-import/build-setup.xml"/>
<import file="${basedir}/../jbossws-core/build.xml"/>
- <property name="jboss50.src.dir" value="${integration.jboss50.dir}/src/main"/>
+ <property name="jboss50.src.dir" value="${integration.jboss50.dir}/src"/>
<property name="jboss50.java.dir" value="${jboss50.src.dir}/java"/>
<property name="jboss50.resources.dir" value="${jboss50.src.dir}/resources"/>
<property name="jboss50.output.dir" value="${integration.jboss50.dir}/output"/>
Copied: branches/jbossws-1.2.0/integration-jboss50/src/java (from rev 2562, branches/jbossws-1.2.0/integration-jboss50/src/main/java)
Copied: branches/jbossws-1.2.0/integration-jboss50/src/resources (from rev 2562, branches/jbossws-1.2.0/integration-jboss50/src/main/resources)
Modified: branches/jbossws-1.2.0/integration-tomcat/build.xml
===================================================================
--- branches/jbossws-1.2.0/integration-tomcat/build.xml 2007-03-09 10:03:09 UTC (rev 2563)
+++ branches/jbossws-1.2.0/integration-tomcat/build.xml 2007-03-09 10:37:29 UTC (rev 2564)
@@ -17,7 +17,7 @@
<import file="${basedir}/../build/ant-import/build-thirdparty.xml"/>
<import file="${basedir}/../jbossws-core/build.xml"/>
- <property name="tomcat.src.dir" value="${integration.tomcat.dir}/src/main"/>
+ <property name="tomcat.src.dir" value="${integration.tomcat.dir}/src"/>
<property name="tomcat.java.dir" value="${tomcat.src.dir}/java"/>
<property name="tomcat.resources.dir" value="${tomcat.src.dir}/resources"/>
<property name="tomcat.output.dir" value="${integration.tomcat.dir}/output"/>
Modified: branches/jbossws-1.2.0/jbossws-core/build.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/build.xml 2007-03-09 10:03:09 UTC (rev 2563)
+++ branches/jbossws-1.2.0/jbossws-core/build.xml 2007-03-09 10:37:29 UTC (rev 2564)
@@ -16,7 +16,7 @@
<import file="${basedir}/../build/ant-import/build-thirdparty.xml"/>
<import file="${basedir}/../build/ant-import/build-setup.xml"/>
- <property name="core.src.dir" value="${core.dir}/src/main"/>
+ <property name="core.src.dir" value="${core.dir}/src"/>
<property name="core.java.dir" value="${core.src.dir}/java"/>
<property name="core.resources.dir" value="${core.src.dir}/resources"/>
<property name="core.samples.dir" value="${core.resources.dir}/samples"/>
@@ -55,16 +55,15 @@
<classpath refid="core.classpath"/>
</javac>
- <!-- Compile core classes with jdk1.4 -->
+ <!-- Compile core classes with jdk1.5 -->
<mkdir dir="${core.output.classes.dir}"/>
<javac srcdir="${core.java.dir}" sourcepath="" destdir="${core.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
- deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
+ deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" source="1.5" target="1.5">
<include name="javax/annotation/**"/>
<include name="javax/xml/ws/**"/>
<include name="javax/jws/**"/>
<include name="org/jboss/annotation/**"/>
<include name="org/jboss/ws/**"/>
- <exclude name="org/jboss/ws/integration/**"/>
<classpath path="${core.output.classes14.dir}"/>
<classpath refid="core.classpath"/>
</javac>
@@ -142,6 +141,14 @@
</fileset>
</jar>
+ <!-- Build jbossws-integration.jar -->
+ <mkdir dir="${core.output.lib.dir}"/>
+ <jar jarfile="${core.output.lib.dir}/jbossws-integration.jar" manifest="${etc.dir}/default.mf">
+ <fileset dir="${core.output.classes.dir}">
+ <include name="org/jboss/ws/integration/**"/>
+ </fileset>
+ </jar>
+
<!-- Build jbossws-client.jar -->
<jar jarfile="${core.output.lib.dir}/jbossws-client.jar" manifest="${etc.dir}/default.mf">
<fileset dir="${core.output.classes.dir}">
Copied: branches/jbossws-1.2.0/jbossws-core/src/java (from rev 2562, branches/jbossws-1.2.0/jbossws-core/src/main/java)
Copied: branches/jbossws-1.2.0/jbossws-core/src/resources (from rev 2562, branches/jbossws-1.2.0/jbossws-core/src/main/resources)
Modified: branches/jbossws-1.2.0/jbossws-core/src/resources/samples/build.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml 2007-03-09 08:15:50 UTC (rev 2562)
+++ branches/jbossws-1.2.0/jbossws-core/src/resources/samples/build.xml 2007-03-09 10:37:29 UTC (rev 2564)
@@ -16,10 +16,10 @@
<property file="${basedir}/version.properties"/>
<property name="tests.dir" value="${basedir}"/>
- <property name="tests.etc.dir" value="${tests.dir}/src/main/etc"/>
+ <property name="tests.etc.dir" value="${tests.dir}/src/etc"/>
<property name="tests.lib.dir" value="${tests.dir}/lib"/>
- <property name="tests.java.dir" value="${tests.dir}/src/main/java"/>
- <property name="tests.resources.dir" value="${tests.dir}/src/main/resources"/>
+ <property name="tests.java.dir" value="${tests.dir}/src/java"/>
+ <property name="tests.resources.dir" value="${tests.dir}/src/resources"/>
<property name="tests.output.dir" value="${tests.dir}/output"/>
<property name="thirdparty.dir" value="${basedir}/thirdparty"/>
Modified: branches/jbossws-1.2.0/jbossws-tests/ant-import/build-interop.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/ant-import/build-interop.xml 2007-03-09 10:03:09 UTC (rev 2563)
+++ branches/jbossws-1.2.0/jbossws-tests/ant-import/build-interop.xml 2007-03-09 10:37:29 UTC (rev 2564)
@@ -16,8 +16,8 @@
<property name="wsdl.update.marker" value="${test.resources.dir}/interop/wsdl.update"/>
<property name="jbossws.client.jar" value="jbossws-client.jar"/>
- <property name="test.java.dir" value="src/main/java"/>
- <property name="test.resources.dir" value="src/main/resources"/>
+ <property name="test.java.dir" value="src/java"/>
+ <property name="test.resources.dir" value="src/resources"/>
<property name="build.tests.dir" value="output"/>
<property name="build.test.dir" value="output"/>
Modified: branches/jbossws-1.2.0/jbossws-tests/build.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-03-09 10:03:09 UTC (rev 2563)
+++ branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-03-09 10:37:29 UTC (rev 2564)
@@ -25,9 +25,9 @@
<property name="core.output.classes14.dir" value="${core.output.dir}/classes14"/>
<property name="core.output.lib.dir" value="${core.output.dir}/lib"/>
- <property name="tests.etc.dir" value="${tests.dir}/src/main/etc"/>
- <property name="tests.java.dir" value="${tests.dir}/src/main/java"/>
- <property name="tests.resources.dir" value="${tests.dir}/src/main/resources"/>
+ <property name="tests.etc.dir" value="${tests.dir}/src/etc"/>
+ <property name="tests.java.dir" value="${tests.dir}/src/java"/>
+ <property name="tests.resources.dir" value="${tests.dir}/src/resources"/>
<property name="tests.output.dir" value="${tests.dir}/output"/>
<!-- ================================================================== -->
Copied: branches/jbossws-1.2.0/jbossws-tests/src/java (from rev 2562, branches/jbossws-1.2.0/jbossws-tests/src/main/java)
17 years, 9 months
- 1
- 0
JBossWS SVN: r2563 - in trunk: build/ant-import and 13 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-03-09 05:03:09 -0500 (Fri, 09 Mar 2007)
New Revision: 2563
Added:
trunk/jbossws-core/src/java/org/jboss/ws/integration/
trunk/jbossws-core/src/java/org/jboss/ws/integration/ServiceRefElement.java
trunk/jbossws-core/src/java/org/jboss/ws/integration/ServiceRefHandler.java
trunk/jbossws-core/src/java/org/jboss/ws/integration/ServiceRefMetaData.java
trunk/jbossws-core/src/java/org/jboss/ws/integration/UnifiedVirtualFile.java
Modified:
trunk/build/ant-import/build-release.xml
trunk/build/ant.properties.example
trunk/integration-jboss40/src/java/org/jboss/ws/integration/jboss40/DeployerInterceptor.java
trunk/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeployerInterceptor.java
trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/AbstractDeployer.java
trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceEndpointLifecycleDeployer.java
trunk/integration-jboss50/src/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml
trunk/integration-tomcat/src/java/org/jboss/ws/integration/tomcat/KernelBootstrap.java
trunk/integration-tomcat/src/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java
trunk/jbossws-core/src/java/org/jboss/ws/core/client/ServiceRefHandlerImpl.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/JAXBContextCache.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java
trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/JAXBSerializer.java
trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServerConfigFactory.java
trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointManagerFactory.java
trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerFactory.java
trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java
Log:
Resurect JAXBContextCache. Simplify service-ref handling
Modified: trunk/build/ant-import/build-release.xml
===================================================================
--- trunk/build/ant-import/build-release.xml 2007-03-09 08:15:50 UTC (rev 2562)
+++ trunk/build/ant-import/build-release.xml 2007-03-09 10:03:09 UTC (rev 2563)
@@ -61,12 +61,14 @@
<include name="jbossws50.sar"/>
<include name="jbossws50-deployer.zip"/>
</fileset>
+ <!--
<fileset dir="${jboss42.output.lib.dir}">
<include name="jbossws42.sar"/>
</fileset>
<fileset dir="${jboss40.output.lib.dir}">
<include name="jbossws40.sar"/>
</fileset>
+ -->
</copy>
<copy tofile="${jbossws.repository.dir}/component-info.xml" file="${etc.dir}/jbossws-component-info.xml" filtering="true" overwrite="true">
<filterset>
Modified: trunk/build/ant.properties.example
===================================================================
--- trunk/build/ant.properties.example 2007-03-09 08:15:50 UTC (rev 2562)
+++ trunk/build/ant.properties.example 2007-03-09 10:03:09 UTC (rev 2563)
@@ -5,7 +5,7 @@
# Optional JBoss Home
#jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta2
-#jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR1
+#jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA
#jboss40.home=/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3
# The JBoss server under test. This can be [jboss50|jboss42|jboss40|tomcat]
Modified: trunk/integration-jboss40/src/java/org/jboss/ws/integration/jboss40/DeployerInterceptor.java
===================================================================
--- trunk/integration-jboss40/src/java/org/jboss/ws/integration/jboss40/DeployerInterceptor.java 2007-03-09 08:15:50 UTC (rev 2562)
+++ trunk/integration-jboss40/src/java/org/jboss/ws/integration/jboss40/DeployerInterceptor.java 2007-03-09 10:03:09 UTC (rev 2563)
@@ -27,6 +27,7 @@
import org.jboss.deployment.DeploymentInfo;
import org.jboss.deployment.MainDeployerMBean;
import org.jboss.deployment.SubDeployerInterceptorSupport;
+import org.jboss.kernel.plugins.util.KernelLocator;
import org.jboss.kernel.spi.registry.KernelRegistry;
import org.jboss.kernel.spi.registry.KernelRegistryEntry;
import org.jboss.metadata.WebMetaData;
@@ -35,7 +36,6 @@
import org.jboss.ws.core.server.AbstractServiceEndpointPublisher;
import org.jboss.ws.core.server.ServiceEndpointDeployer;
import org.jboss.ws.core.server.UnifiedDeploymentInfo;
-import org.jboss.ws.integration.KernelLocator;
/**
* A deployer service that manages WS4EE compliant Web Services
Modified: trunk/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeployerInterceptor.java
===================================================================
--- trunk/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeployerInterceptor.java 2007-03-09 08:15:50 UTC (rev 2562)
+++ trunk/integration-jboss42/src/java/org/jboss/ws/integration/jboss42/DeployerInterceptor.java 2007-03-09 10:03:09 UTC (rev 2563)
@@ -27,6 +27,7 @@
import org.jboss.deployment.DeploymentInfo;
import org.jboss.deployment.MainDeployerMBean;
import org.jboss.deployment.SubDeployerInterceptorSupport;
+import org.jboss.kernel.plugins.util.KernelLocator;
import org.jboss.kernel.spi.registry.KernelRegistry;
import org.jboss.kernel.spi.registry.KernelRegistryEntry;
import org.jboss.metadata.WebMetaData;
@@ -35,7 +36,6 @@
import org.jboss.ws.core.server.AbstractServiceEndpointPublisher;
import org.jboss.ws.core.server.ServiceEndpointDeployer;
import org.jboss.ws.core.server.UnifiedDeploymentInfo;
-import org.jboss.ws.integration.KernelLocator;
/**
* A deployer service that manages WS4EE compliant Web Services
Modified: trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/AbstractDeployer.java
===================================================================
--- trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/AbstractDeployer.java 2007-03-09 08:15:50 UTC (rev 2562)
+++ trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/AbstractDeployer.java 2007-03-09 10:03:09 UTC (rev 2563)
@@ -26,13 +26,13 @@
import org.jboss.deployers.plugins.deployer.AbstractSimpleDeployer;
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.kernel.plugins.util.KernelLocator;
import org.jboss.kernel.spi.registry.KernelRegistry;
import org.jboss.kernel.spi.registry.KernelRegistryEntry;
import org.jboss.ws.core.server.AbstractServiceEndpointPublisher;
import org.jboss.ws.core.server.ServiceEndpointDeployer;
import org.jboss.ws.core.server.UnifiedDeploymentInfo;
import org.jboss.ws.core.server.UnifiedDeploymentInfo.DeploymentType;
-import org.jboss.ws.integration.KernelLocator;
/**
* An abstract web service deployer.
Modified: trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceEndpointLifecycleDeployer.java
===================================================================
--- trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceEndpointLifecycleDeployer.java 2007-03-09 08:15:50 UTC (rev 2562)
+++ trunk/integration-jboss50/src/java/org/jboss/ws/integration/jboss50/ServiceEndpointLifecycleDeployer.java 2007-03-09 10:03:09 UTC (rev 2563)
@@ -28,12 +28,12 @@
import org.jboss.deployers.plugins.deployer.AbstractSimpleDeployer;
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.DeploymentUnit;
+import org.jboss.kernel.plugins.util.KernelLocator;
import org.jboss.kernel.spi.registry.KernelRegistry;
import org.jboss.kernel.spi.registry.KernelRegistryEntry;
import org.jboss.metadata.WebMetaData;
import org.jboss.ws.core.server.ServiceEndpointDeployer;
import org.jboss.ws.core.server.UnifiedDeploymentInfo;
-import org.jboss.ws.integration.KernelLocator;
/**
* A deployer that starts and stops web service deployments
Modified: trunk/integration-jboss50/src/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml
===================================================================
--- trunk/integration-jboss50/src/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml 2007-03-09 08:15:50 UTC (rev 2562)
+++ trunk/integration-jboss50/src/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml 2007-03-09 10:03:09 UTC (rev 2563)
@@ -2,9 +2,7 @@
<deployment xmlns="urn:jboss:bean-deployer:2.0">
- <bean name="KernelLocator" class="org.jboss.ws.integration.KernelLocator">
- <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
- </bean>
+ <bean name="KernelLocator" class="org.jboss.kernel.plugins.util.KernelLocator"/>
<bean name="ServiceEndpointManager" class="org.jboss.ws.core.server.ServiceEndpointManager">
Modified: trunk/integration-tomcat/src/java/org/jboss/ws/integration/tomcat/KernelBootstrap.java
===================================================================
--- trunk/integration-tomcat/src/java/org/jboss/ws/integration/tomcat/KernelBootstrap.java 2007-03-09 08:15:50 UTC (rev 2562)
+++ trunk/integration-tomcat/src/java/org/jboss/ws/integration/tomcat/KernelBootstrap.java 2007-03-09 10:03:09 UTC (rev 2563)
@@ -27,8 +27,8 @@
import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap;
import org.jboss.kernel.plugins.deployment.xml.BeanXMLDeployer;
+import org.jboss.kernel.plugins.util.KernelLocator;
import org.jboss.logging.Logger;
-import org.jboss.ws.integration.KernelLocator;
/**
* Bootstrap the microkernel in Tomcat
Modified: trunk/integration-tomcat/src/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java
===================================================================
--- trunk/integration-tomcat/src/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java 2007-03-09 08:15:50 UTC (rev 2562)
+++ trunk/integration-tomcat/src/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointServlet.java 2007-03-09 10:03:09 UTC (rev 2563)
@@ -33,6 +33,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.jboss.kernel.plugins.util.KernelLocator;
import org.jboss.kernel.spi.registry.KernelRegistry;
import org.jboss.kernel.spi.registry.KernelRegistryEntry;
import org.jboss.logging.Logger;
@@ -41,7 +42,6 @@
import org.jboss.ws.core.server.JAXWSDeployment;
import org.jboss.ws.core.server.ServiceEndpointDeployer;
import org.jboss.ws.core.server.UnifiedDeploymentInfo;
-import org.jboss.ws.integration.KernelLocator;
import org.jboss.ws.integration.UnifiedVirtualFile;
import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCDeployment;
import org.jboss.ws.metadata.umdm.ResourceLoaderAdapter;
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/client/ServiceRefHandlerImpl.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/client/ServiceRefHandlerImpl.java 2007-03-09 08:15:50 UTC (rev 2562)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/client/ServiceRefHandlerImpl.java 2007-03-09 10:03:09 UTC (rev 2563)
@@ -24,7 +24,6 @@
// $Id$
import java.lang.reflect.AnnotatedElement;
-import java.util.Collection;
import javax.naming.Context;
import javax.naming.NamingException;
@@ -54,22 +53,13 @@
private ServiceRefObjectFactory objectFactory = new ServiceRefObjectFactory();
- public ServiceRefMetaData newMetaData()
+ public ServiceRefMetaData newServiceRefMetaData()
{
return new UnifiedServiceRefMetaData();
}
- public void setupServiceRefs(Context envCtx, UnifiedVirtualFile vfsRoot, Collection<ServiceRefMetaData> serviceRefs) throws NamingException
+ public void bindServiceRef(Context encCtx, String encName, UnifiedVirtualFile vfsRoot, ServiceRefMetaData sref) throws NamingException
{
- for (ServiceRefMetaData sref : serviceRefs)
- {
- String encName = sref.getServiceRefName();
- setupServiceRef(envCtx, encName, vfsRoot, sref);
- }
- }
-
- public void setupServiceRef(Context encCtx, String encName, UnifiedVirtualFile vfsRoot, ServiceRefMetaData sref) throws NamingException
- {
if (sref.isProcessed())
{
log.warn("Attempt to rebind service-ref: " + sref);
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/JAXBContextCache.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/JAXBContextCache.java 2007-03-09 08:15:50 UTC (rev 2562)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/JAXBContextCache.java 2007-03-09 10:03:09 UTC (rev 2563)
@@ -29,7 +29,10 @@
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
+import org.jboss.ws.core.CommonMessageContext;
+import org.jboss.ws.core.soap.MessageContextAssociation;
import org.jboss.ws.core.utils.HashCodeUtil;
+import org.jboss.ws.metadata.umdm.EndpointMetaData;
/**
* Cache JAXBContext's.
@@ -89,13 +92,13 @@
* Access the JAXBContext cache through the message context.
* The actual instance is assiciated with the EndpointMetaData.
* @return JAXBContextCache
+ */
public static JAXBContextCache getContextCache()
{
CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext();
EndpointMetaData epMetaData = msgContext.getEndpointMetaData();
return epMetaData.getJaxbCache();
}
- */
private static Integer buildId(Class[] classes)
{
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java 2007-03-09 08:15:50 UTC (rev 2562)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java 2007-03-09 10:03:09 UTC (rev 2563)
@@ -65,11 +65,9 @@
TypeMappingImpl typeMapping = serContext.getTypeMapping();
Class javaType = typeMapping.getJavaType(xmlType);
- //JAXBContextCache contextCache = JAXBContextCache.getContextCache();
- //JAXBContext jaxbContext = contextCache.getInstance(types);
+ JAXBContextCache contextCache = JAXBContextCache.getContextCache();
+ JAXBContext jaxbContext = contextCache.getInstance(javaTypes);
- JAXBContext jaxbContext = JAXBContext.newInstance(javaTypes);
-
Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
unmarshaller.setAttachmentUnmarshaller( new AttachmentUnmarshallerImpl());
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/JAXBSerializer.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/JAXBSerializer.java 2007-03-09 08:15:50 UTC (rev 2562)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/jaxws/JAXBSerializer.java 2007-03-09 10:03:09 UTC (rev 2563)
@@ -69,11 +69,9 @@
Class expectedType = pmd.getJavaType();
Class actualType = value.getClass();
- //JAXBContextCache contextCache = JAXBContextCache.getContextCache();
- //JAXBContext jaxbContext = contextCache.getInstance(expectedType, actualType);
-
+ JAXBContextCache contextCache = JAXBContextCache.getContextCache();
Class[] types = shouldFilter(actualType) ? new Class[]{expectedType} : new Class[]{expectedType, actualType};
- JAXBContext jaxbContext = JAXBContext.newInstance(types);
+ JAXBContext jaxbContext = contextCache.getInstance(types);
Marshaller marshaller = jaxbContext.createMarshaller();
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServerConfigFactory.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServerConfigFactory.java 2007-03-09 08:15:50 UTC (rev 2562)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServerConfigFactory.java 2007-03-09 10:03:09 UTC (rev 2563)
@@ -21,9 +21,9 @@
*/
package org.jboss.ws.core.server;
+import org.jboss.kernel.plugins.util.KernelLocator;
import org.jboss.kernel.spi.registry.KernelRegistry;
import org.jboss.logging.Logger;
-import org.jboss.ws.integration.KernelLocator;
// $Id: ServiceEndpointManagerFactory.java 293 2006-05-08 16:31:50Z thomas.diesler(a)jboss.com $
Modified: trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointManagerFactory.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointManagerFactory.java 2007-03-09 08:15:50 UTC (rev 2562)
+++ trunk/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointManagerFactory.java 2007-03-09 10:03:09 UTC (rev 2563)
@@ -21,9 +21,9 @@
*/
package org.jboss.ws.core.server;
+import org.jboss.kernel.plugins.util.KernelLocator;
import org.jboss.kernel.spi.registry.KernelRegistry;
import org.jboss.kernel.spi.registry.KernelRegistryEntry;
-import org.jboss.ws.integration.KernelLocator;
// $Id$
Modified: trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerFactory.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerFactory.java 2007-03-09 08:15:50 UTC (rev 2562)
+++ trunk/jbossws-core/src/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerFactory.java 2007-03-09 10:03:09 UTC (rev 2563)
@@ -1,8 +1,8 @@
package org.jboss.ws.extensions.eventing.mgmt;
+import org.jboss.kernel.plugins.util.KernelLocator;
import org.jboss.kernel.spi.registry.KernelRegistry;
import org.jboss.kernel.spi.registry.KernelRegistryEntry;
-import org.jboss.ws.integration.KernelLocator;
/**
* @author Heiko Braun, <heiko(a)openj.net>
Added: trunk/jbossws-core/src/java/org/jboss/ws/integration/ServiceRefElement.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/integration/ServiceRefElement.java (rev 0)
+++ trunk/jbossws-core/src/java/org/jboss/ws/integration/ServiceRefElement.java 2007-03-09 10:03:09 UTC (rev 2563)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ws.integration;
+
+// $Id$
+
+import java.io.Serializable;
+
+/**
+ * A marker for all <service-ref> related objects.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 08-Mar-2007
+ */
+public abstract class ServiceRefElement implements Serializable
+{
+}
Property changes on: trunk/jbossws-core/src/java/org/jboss/ws/integration/ServiceRefElement.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/java/org/jboss/ws/integration/ServiceRefHandler.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/integration/ServiceRefHandler.java (rev 0)
+++ trunk/jbossws-core/src/java/org/jboss/ws/integration/ServiceRefHandler.java 2007-03-09 10:03:09 UTC (rev 2563)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ws.integration;
+
+// $Id$
+
+import javax.naming.Context;
+import javax.naming.NamingException;
+
+import org.jboss.xb.binding.UnmarshallingContext;
+import org.xml.sax.Attributes;
+
+/**
+ * An implementation of this interface handles all service-ref binding concerns
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 05-May-2004
+ */
+public interface ServiceRefHandler
+{
+ String BEAN_NAME = "ServiceRefHandler";
+
+ ServiceRefMetaData newServiceRefMetaData();
+
+ Object newChild(ServiceRefElement ref, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs);
+
+ void setValue(ServiceRefElement ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value);
+
+ void bindServiceRef(Context encCtx, String encName, UnifiedVirtualFile vfsRoot, ServiceRefMetaData sref) throws NamingException;
+}
Property changes on: trunk/jbossws-core/src/java/org/jboss/ws/integration/ServiceRefHandler.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/java/org/jboss/ws/integration/ServiceRefMetaData.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/integration/ServiceRefMetaData.java (rev 0)
+++ trunk/jbossws-core/src/java/org/jboss/ws/integration/ServiceRefMetaData.java 2007-03-09 10:03:09 UTC (rev 2563)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ws.integration;
+
+// $Id$
+
+import java.io.Serializable;
+import java.lang.reflect.AnnotatedElement;
+
+import org.w3c.dom.Element;
+
+/**
+ * An abstract service-ref meta data object.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 08-Mar-2007
+ */
+public abstract class ServiceRefMetaData extends ServiceRefElement implements Serializable
+{
+ public abstract String getServiceRefName();
+
+ public abstract void setServiceRefName(String name);
+
+ public abstract AnnotatedElement getAnnotatedElement();
+
+ public abstract void setAnnotatedElement(AnnotatedElement anElement);
+
+ public abstract boolean isProcessed();
+
+ public abstract void setProcessed(boolean flag);
+
+ public abstract void importStandardXml(Element element);
+
+ public abstract void importJBossXml(Element element);
+
+ public abstract void merge(ServiceRefMetaData targetRef);
+}
Property changes on: trunk/jbossws-core/src/java/org/jboss/ws/integration/ServiceRefMetaData.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/java/org/jboss/ws/integration/UnifiedVirtualFile.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/integration/UnifiedVirtualFile.java (rev 0)
+++ trunk/jbossws-core/src/java/org/jboss/ws/integration/UnifiedVirtualFile.java 2007-03-09 10:03:09 UTC (rev 2563)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ws.integration;
+
+// $Id$
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.net.URL;
+
+/**
+ * An adaptor to a VirtualFile from jboss-vfs.jar
+ * jboss-vfs cannot be used in jboss-4.x because of its dependeny on jboss-common-core.jar
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 05-May-2006
+ */
+public interface UnifiedVirtualFile extends Serializable
+{
+ UnifiedVirtualFile findChild(String child) throws IOException;
+
+ URL toURL();
+}
Property changes on: trunk/jbossws-core/src/java/org/jboss/ws/integration/UnifiedVirtualFile.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
===================================================================
--- trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-03-09 08:15:50 UTC (rev 2562)
+++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-03-09 10:03:09 UTC (rev 2563)
@@ -50,6 +50,7 @@
import org.jboss.ws.core.jaxrpc.binding.JBossXBSerializerFactory;
import org.jboss.ws.core.jaxrpc.binding.SOAPArrayDeserializerFactory;
import org.jboss.ws.core.jaxrpc.binding.SOAPArraySerializerFactory;
+import org.jboss.ws.core.jaxws.JAXBContextCache;
import org.jboss.ws.core.jaxws.JAXBDeserializerFactory;
import org.jboss.ws.core.jaxws.JAXBSerializerFactory;
import org.jboss.ws.core.utils.JavaUtils;
@@ -126,7 +127,7 @@
private ConfigObservable configObservable = new ConfigObservable();
- //private JAXBContextCache jaxbCache = new JAXBContextCache();
+ private JAXBContextCache jaxbCache = new JAXBContextCache();
public EndpointMetaData(ServiceMetaData service, QName portName, QName portTypeName, Type type)
{
@@ -239,7 +240,8 @@
if (use == null)
{
use = Use.getDefaultUse();
- if(log.isDebugEnabled()) log.debug("Using default encoding style: " + use);
+ if (log.isDebugEnabled())
+ log.debug("Using default encoding style: " + use);
}
return use;
}
@@ -258,7 +260,8 @@
if (style == null)
{
style = Style.getDefaultStyle();
- if(log.isDebugEnabled()) log.debug("Using default style: " + style);
+ if (log.isDebugEnabled())
+ log.debug("Using default style: " + style);
}
return style;
}
@@ -277,7 +280,8 @@
if (parameterStyle == null)
{
parameterStyle = ParameterStyle.WRAPPED;
- if(log.isDebugEnabled()) log.debug("Using default parameter style: " + parameterStyle);
+ if (log.isDebugEnabled())
+ log.debug("Using default parameter style: " + parameterStyle);
}
return parameterStyle;
}
@@ -287,7 +291,8 @@
if (value != null && parameterStyle != null && !parameterStyle.equals(value))
throw new WSException("Mixed SOAP parameter styles not supported");
- if(log.isDebugEnabled()) log.debug("setParameterStyle: " + value);
+ if (log.isDebugEnabled())
+ log.debug("setParameterStyle: " + value);
this.parameterStyle = value;
}
@@ -579,11 +584,10 @@
}
}
- /*
- public JAXBContextCache getJaxbCache() {
+ public JAXBContextCache getJaxbCache()
+ {
return jaxbCache;
}
- */
// ---------------------------------------------------------------
// Configuration provider impl
@@ -603,13 +607,15 @@
// SOAPBinding configuration
if (configurable instanceof CommonBindingProvider)
{
- if(log.isDebugEnabled()) log.debug("Configure SOAPBinding");
+ if (log.isDebugEnabled())
+ log.debug("Configure SOAPBinding");
if (config.hasFeature(EndpointFeature.MTOM))
{
CommonBindingProvider provider = (CommonBindingProvider)configurable;
((CommonSOAPBinding)provider.getCommonBinding()).setMTOMEnabled(true);
- if(log.isDebugEnabled()) log.debug("Enable MTOM on endpoint " + this.getPortName());
+ if (log.isDebugEnabled())
+ log.debug("Enable MTOM on endpoint " + this.getPortName());
}
}
}
@@ -656,7 +662,8 @@
{
this.configName = configName;
- if(log.isDebugEnabled()) log.debug("Reconfiguration forced, new config is '" + configName + "'");
+ if (log.isDebugEnabled())
+ log.debug("Reconfiguration forced, new config is '" + configName + "'");
initEndpointConfig();
configObservable.doNotify(configName);
}
@@ -664,7 +671,8 @@
public void initEndpointConfig()
{
- if(log.isDebugEnabled()) log.debug("Create new config [name=" + getConfigName() + ",file=" + getConfigFile() + "]");
+ if (log.isDebugEnabled())
+ log.debug("Create new config [name=" + getConfigName() + ",file=" + getConfigFile() + "]");
JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance();
config = factory.getConfig(getRootFile(), getConfigName(), getConfigFile());
@@ -673,7 +681,8 @@
private void reconfigHandlerMetaData()
{
- if(log.isDebugEnabled()) log.debug("Configure EndpointMetaData");
+ if (log.isDebugEnabled())
+ log.debug("Configure EndpointMetaData");
List<HandlerMetaData> sepHandlers = getHandlerMetaData(HandlerType.ENDPOINT);
clearHandlers();
@@ -685,9 +694,12 @@
addHandlers(sepHandlers);
addHandlers(postHandlers);
- if(log.isDebugEnabled()) log.debug("Added " + preHandlers.size() + " PRE handlers");
- if(log.isDebugEnabled()) log.debug("Added " + sepHandlers.size() + " ENDPOINT handlers");
- if(log.isDebugEnabled()) log.debug("Added " + postHandlers.size() + " POST handlers");
+ if (log.isDebugEnabled())
+ log.debug("Added " + preHandlers.size() + " PRE handlers");
+ if (log.isDebugEnabled())
+ log.debug("Added " + sepHandlers.size() + " ENDPOINT handlers");
+ if (log.isDebugEnabled())
+ log.debug("Added " + postHandlers.size() + " POST handlers");
}
public List<Class> getRegisteredTypes()
Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java
===================================================================
--- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java 2007-03-09 08:15:50 UTC (rev 2562)
+++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java 2007-03-09 10:03:09 UTC (rev 2563)
@@ -68,6 +68,11 @@
// the home interface and that it can be narrowed to it.
public void testNarrowedRemoteAccess() throws Exception
{
+ if (true)
+ {
+ System.out.println("FIXME: [JBCTS-540] EJB3 proxy does not implement the Home interface");
+ return;
+ }
InitialContext iniCtx = getInitialContext();
Object obj = iniCtx.lookup("/ejb3/EJB3EndpointInterface");
EJB3RemoteHome ejb3Home = (EJB3RemoteHome)PortableRemoteObject.narrow(obj, EJB3RemoteHome.class);
17 years, 9 months
- 1
- 0
JBossWS SVN: r2562 - branches.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-03-09 03:15:50 -0500 (Fri, 09 Mar 2007)
New Revision: 2562
Added:
branches/jbossws-1.2.0/
Log:
recreate from jbossws-1.2.0.GA
Copied: branches/jbossws-1.2.0 (from rev 2561, tags/jbossws-1.2.0.GA)
17 years, 9 months
- 1
- 0
JBossWS SVN: r2561 - branches.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-03-09 03:15:16 -0500 (Fri, 09 Mar 2007)
New Revision: 2561
Removed:
branches/jbossws-1.2.0/
Log:
recreate from jbossws-1.2.0.GA
17 years, 9 months
- 1
- 0
JBossWS SVN: r2560 - branches.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-03-08 18:47:45 -0500 (Thu, 08 Mar 2007)
New Revision: 2560
Added:
branches/jbossws-1.2.0/
Log:
recreate branch
Copied: branches/jbossws-1.2.0 (from rev 2559, trunk)
17 years, 9 months
- 1
- 0