[jboss-cvs] JBossAS SVN: r60845 - in trunk: server/src/main/org/jboss/deployment and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Feb 23 12:34:57 EST 2007
Author: thomas.diesler at jboss.com
Date: 2007-02-23 12:34:57 -0500 (Fri, 23 Feb 2007)
New Revision: 60845
Added:
trunk/server/src/main/org/jboss/metadata/serviceref/
trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefHandler.java
trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefHandlerFactory.java
Removed:
trunk/server/src/main/org/jboss/webservice/
Modified:
trunk/server/src/main/org/jboss/deployment/ClientDeployer.java
trunk/server/src/main/org/jboss/deployment/EjbJarObjectFactory.java
trunk/server/src/main/org/jboss/deployment/JBossEjbObjectFactory.java
trunk/server/src/main/org/jboss/ejb/Container.java
trunk/server/src/main/org/jboss/metadata/BeanMetaData.java
trunk/server/src/main/org/jboss/metadata/ClientMetaData.java
trunk/server/src/main/org/jboss/metadata/DDObjectFactory.java
trunk/server/src/main/org/jboss/metadata/WebMetaData.java
trunk/server/src/main/org/jboss/metadata/serviceref/HandlerMetaData.java
trunk/server/src/main/org/jboss/metadata/serviceref/InitParamMetaData.java
trunk/server/src/main/org/jboss/metadata/serviceref/PortComponentRefMetaData.java
trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefMetaData.java
trunk/server/src/main/org/jboss/metadata/web/JBossWebMetaDataObjectFactory.java
trunk/server/src/main/org/jboss/metadata/web/WebMetaDataObjectFactory.java
trunk/server/src/main/org/jboss/metamodel/descriptor/DDObjectFactory.java
trunk/server/src/main/org/jboss/metamodel/descriptor/PortInfo.java
trunk/server/src/main/org/jboss/metamodel/descriptor/WebServiceRefMetaData.java
trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java
trunk/server/src/resources/dtd/jboss-client_5_0.dtd
trunk/server/src/resources/dtd/jboss-web_5_0.dtd
trunk/server/src/resources/dtd/jboss_5_0.dtd
trunk/server/src/resources/dtd/webservice-ref_5_0.dtd
trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/TomcatDeployment.java
Log:
Fix <service-ref> handling
Modified: trunk/server/src/main/org/jboss/deployment/ClientDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/ClientDeployer.java 2007-02-23 16:56:37 UTC (rev 60844)
+++ trunk/server/src/main/org/jboss/deployment/ClientDeployer.java 2007-02-23 17:34:57 UTC (rev 60845)
@@ -48,11 +48,11 @@
import org.jboss.metadata.ResourceEnvRefMetaData;
import org.jboss.metadata.ResourceRefMetaData;
import org.jboss.metadata.XmlFileLoader;
+import org.jboss.metadata.serviceref.ServiceRefHandler;
+import org.jboss.metadata.serviceref.ServiceRefHandlerFactory;
import org.jboss.naming.Util;
import org.jboss.util.xml.DOMUtils;
import org.jboss.virtual.VirtualFile;
-import org.jboss.webservice.ServiceRefHandler;
-import org.jboss.webservice.ServiceRefHandlerFactory;
import org.w3c.dom.Element;
import org.w3c.dom.DocumentType;
Modified: trunk/server/src/main/org/jboss/deployment/EjbJarObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/EjbJarObjectFactory.java 2007-02-23 16:56:37 UTC (rev 60844)
+++ trunk/server/src/main/org/jboss/deployment/EjbJarObjectFactory.java 2007-02-23 17:34:57 UTC (rev 60845)
@@ -48,7 +48,7 @@
import org.jboss.metadata.SecurityRoleMetaData;
import org.jboss.metadata.SecurityRoleRefMetaData;
import org.jboss.metadata.SessionMetaData;
-import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData;
+import org.jboss.metadata.serviceref.ServiceRefMetaData;
import org.jboss.xb.binding.ObjectModelFactory;
import org.jboss.xb.binding.UnmarshallingContext;
import org.xml.sax.Attributes;
Modified: trunk/server/src/main/org/jboss/deployment/JBossEjbObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/JBossEjbObjectFactory.java 2007-02-23 16:56:37 UTC (rev 60844)
+++ trunk/server/src/main/org/jboss/deployment/JBossEjbObjectFactory.java 2007-02-23 17:34:57 UTC (rev 60845)
@@ -53,8 +53,8 @@
import org.jboss.metadata.SecurityIdentityMetaData;
import org.jboss.metadata.SecurityRoleMetaData;
import org.jboss.metadata.SessionMetaData;
+import org.jboss.metadata.serviceref.ServiceRefMetaData;
import org.jboss.mx.util.ObjectNameFactory;
-import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData;
import org.jboss.xb.binding.UnmarshallingContext;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: trunk/server/src/main/org/jboss/ejb/Container.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/Container.java 2007-02-23 16:56:37 UTC (rev 60844)
+++ trunk/server/src/main/org/jboss/ejb/Container.java 2007-02-23 17:34:57 UTC (rev 60845)
@@ -73,6 +73,8 @@
import org.jboss.metadata.MessageDestinationRefMetaData;
import org.jboss.metadata.ResourceEnvRefMetaData;
import org.jboss.metadata.ResourceRefMetaData;
+import org.jboss.metadata.serviceref.ServiceRefHandler;
+import org.jboss.metadata.serviceref.ServiceRefHandlerFactory;
import org.jboss.mx.util.ObjectNameConverter;
import org.jboss.mx.util.ObjectNameFactory;
import org.jboss.naming.ENCThreadLocalKey;
@@ -86,8 +88,6 @@
import org.jboss.system.ServiceMBeanSupport;
import org.jboss.util.NestedError;
import org.jboss.util.NestedRuntimeException;
-import org.jboss.webservice.ServiceRefHandler;
-import org.jboss.webservice.ServiceRefHandlerFactory;
import org.omg.CORBA.ORB;
/**
Modified: trunk/server/src/main/org/jboss/metadata/BeanMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/BeanMetaData.java 2007-02-23 16:56:37 UTC (rev 60844)
+++ trunk/server/src/main/org/jboss/metadata/BeanMetaData.java 2007-02-23 17:34:57 UTC (rev 60845)
@@ -35,11 +35,11 @@
import org.jboss.deployment.DeploymentException;
import org.jboss.invocation.InvocationType;
+import org.jboss.metadata.serviceref.ServiceRefMetaData;
import org.jboss.mx.util.ObjectNameFactory;
import org.jboss.security.AnybodyPrincipal;
import org.jboss.security.NobodyPrincipal;
import org.jboss.security.SimplePrincipal;
-import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData;
import org.w3c.dom.Element;
import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
Modified: trunk/server/src/main/org/jboss/metadata/ClientMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/ClientMetaData.java 2007-02-23 16:56:37 UTC (rev 60844)
+++ trunk/server/src/main/org/jboss/metadata/ClientMetaData.java 2007-02-23 17:34:57 UTC (rev 60845)
@@ -30,7 +30,7 @@
import org.jboss.deployment.DeploymentException;
import org.jboss.logging.Logger;
-import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData;
+import org.jboss.metadata.serviceref.ServiceRefMetaData;
import org.w3c.dom.Element;
/** The metdata data from a j2ee application-client.xml descriptor
Modified: trunk/server/src/main/org/jboss/metadata/DDObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/DDObjectFactory.java 2007-02-23 16:56:37 UTC (rev 60844)
+++ trunk/server/src/main/org/jboss/metadata/DDObjectFactory.java 2007-02-23 17:34:57 UTC (rev 60845)
@@ -23,10 +23,10 @@
import javax.persistence.PersistenceContextType;
-import org.jboss.webservice.metadata.serviceref.HandlerMetaData;
-import org.jboss.webservice.metadata.serviceref.InitParamMetaData;
-import org.jboss.webservice.metadata.serviceref.PortComponentRefMetaData;
-import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData;
+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.xb.binding.ObjectModelFactory;
import org.jboss.xb.binding.UnmarshallingContext;
import org.xml.sax.Attributes;
Modified: trunk/server/src/main/org/jboss/metadata/WebMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/WebMetaData.java 2007-02-23 16:56:37 UTC (rev 60844)
+++ trunk/server/src/main/org/jboss/metadata/WebMetaData.java 2007-02-23 17:34:57 UTC (rev 60845)
@@ -36,6 +36,7 @@
import org.jboss.deployment.DeploymentException;
import org.jboss.logging.Logger;
+import org.jboss.metadata.serviceref.ServiceRefMetaData;
import org.jboss.metadata.web.ErrorPage;
import org.jboss.metadata.web.Filter;
import org.jboss.metadata.web.FilterMapping;
@@ -53,7 +54,6 @@
import org.jboss.mx.loading.LoaderRepositoryFactory.LoaderRepositoryConfig;
import org.jboss.mx.util.ObjectNameFactory;
import org.jboss.security.RunAsIdentity;
-import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData;
import org.w3c.dom.Element;
/** A representation of the web.xml and jboss-web.xml deployment
Copied: trunk/server/src/main/org/jboss/metadata/serviceref (from rev 60843, trunk/server/src/main/org/jboss/webservice/metadata/serviceref)
Modified: trunk/server/src/main/org/jboss/metadata/serviceref/HandlerMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/webservice/metadata/serviceref/HandlerMetaData.java 2007-02-23 16:47:51 UTC (rev 60843)
+++ trunk/server/src/main/org/jboss/metadata/serviceref/HandlerMetaData.java 2007-02-23 17:34:57 UTC (rev 60845)
@@ -19,7 +19,7 @@
* 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.webservice.metadata.serviceref;
+package org.jboss.metadata.serviceref;
// $Id$
Modified: trunk/server/src/main/org/jboss/metadata/serviceref/InitParamMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/webservice/metadata/serviceref/InitParamMetaData.java 2007-02-23 16:47:51 UTC (rev 60843)
+++ trunk/server/src/main/org/jboss/metadata/serviceref/InitParamMetaData.java 2007-02-23 17:34:57 UTC (rev 60845)
@@ -19,7 +19,7 @@
* 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.webservice.metadata.serviceref;
+package org.jboss.metadata.serviceref;
// $Id$
Modified: trunk/server/src/main/org/jboss/metadata/serviceref/PortComponentRefMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/webservice/metadata/serviceref/PortComponentRefMetaData.java 2007-02-23 16:47:51 UTC (rev 60843)
+++ trunk/server/src/main/org/jboss/metadata/serviceref/PortComponentRefMetaData.java 2007-02-23 17:34:57 UTC (rev 60845)
@@ -19,7 +19,7 @@
* 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.webservice.metadata.serviceref;
+package org.jboss.metadata.serviceref;
// $Id$
Copied: trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefHandler.java (from rev 60843, trunk/server/src/main/org/jboss/webservice/ServiceRefHandler.java)
===================================================================
--- trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefHandler.java (rev 0)
+++ trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefHandler.java 2007-02-23 17:34:57 UTC (rev 60845)
@@ -0,0 +1,50 @@
+/*
+* 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.metadata.serviceref;
+
+// $Id$
+
+import java.util.Iterator;
+
+import javax.naming.Context;
+
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.deployer.DeploymentUnit;
+
+/**
+ * Implemtent to bind JAXRPC ServiceRefs
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 05-May-2004
+ */
+public interface 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);
+}
Copied: trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefHandlerFactory.java (from rev 60843, trunk/server/src/main/org/jboss/webservice/ServiceRefHandlerFactory.java)
===================================================================
--- trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefHandlerFactory.java (rev 0)
+++ trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefHandlerFactory.java 2007-02-23 17:34:57 UTC (rev 60845)
@@ -0,0 +1,63 @@
+/*
+ * 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.metadata.serviceref;
+
+// $Id$
+
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+
+import org.jboss.logging.Logger;
+import org.jboss.mx.util.MBeanProxyExt;
+import org.jboss.mx.util.MBeanServerLocator;
+import org.jboss.mx.util.ObjectNameFactory;
+
+/**
+ * Factory for ServiceRefHandler
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 05-May-2004
+ */
+public class ServiceRefHandlerFactory
+{
+ // provide logging
+ private static final Logger log = Logger.getLogger(ServiceRefHandlerFactory.class);
+
+ /** Get the ServiceRefHandler MBean proxy
+ */
+ public static ServiceRefHandler newInstance()
+ {
+ MBeanServer server = MBeanServerLocator.locateJBoss();
+ ObjectName objectName = ObjectNameFactory.create("jboss.ws:service=ServiceRefHandler");
+
+ ServiceRefHandler refHandler = null;
+ if (server.isRegistered(objectName))
+ {
+ refHandler = (ServiceRefHandler)MBeanProxyExt.create(ServiceRefHandler.class, objectName, server);
+ }
+ else
+ {
+ log.warn("Not registered: " + objectName);
+ }
+ return refHandler;
+ }
+}
Modified: trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/webservice/metadata/serviceref/ServiceRefMetaData.java 2007-02-23 16:47:51 UTC (rev 60843)
+++ trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefMetaData.java 2007-02-23 17:34:57 UTC (rev 60845)
@@ -19,7 +19,7 @@
* 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.webservice.metadata.serviceref;
+package org.jboss.metadata.serviceref;
// $Id$
Modified: trunk/server/src/main/org/jboss/metadata/web/JBossWebMetaDataObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/web/JBossWebMetaDataObjectFactory.java 2007-02-23 16:56:37 UTC (rev 60844)
+++ trunk/server/src/main/org/jboss/metadata/web/JBossWebMetaDataObjectFactory.java 2007-02-23 17:34:57 UTC (rev 60845)
@@ -36,8 +36,8 @@
import org.jboss.metadata.ResourceRefMetaData;
import org.jboss.metadata.SecurityRoleMetaData;
import org.jboss.metadata.WebMetaData;
+import org.jboss.metadata.serviceref.ServiceRefMetaData;
import org.jboss.util.xml.JBossEntityResolver;
-import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData;
import org.jboss.xb.binding.JBossXBException;
import org.jboss.xb.binding.ObjectModelFactory;
import org.jboss.xb.binding.Unmarshaller;
Modified: trunk/server/src/main/org/jboss/metadata/web/WebMetaDataObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/web/WebMetaDataObjectFactory.java 2007-02-23 16:56:37 UTC (rev 60844)
+++ trunk/server/src/main/org/jboss/metadata/web/WebMetaDataObjectFactory.java 2007-02-23 17:34:57 UTC (rev 60845)
@@ -41,7 +41,7 @@
import org.jboss.metadata.WebMetaData;
import org.jboss.metadata.WebSecurityMetaData;
import org.jboss.metadata.WebSecurityMetaData.WebResourceCollection;
-import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData;
+import org.jboss.metadata.serviceref.ServiceRefMetaData;
import org.jboss.xb.binding.UnmarshallingContext;
import org.xml.sax.Attributes;
Modified: trunk/server/src/main/org/jboss/metamodel/descriptor/DDObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/metamodel/descriptor/DDObjectFactory.java 2007-02-23 16:56:37 UTC (rev 60844)
+++ trunk/server/src/main/org/jboss/metamodel/descriptor/DDObjectFactory.java 2007-02-23 17:34:57 UTC (rev 60845)
@@ -520,7 +520,7 @@
{
child = new MessageDestinationRef();
}
- else if (localName.equals("service-ref"))
+ else if (localName.equals("webservice-ref"))
{
child = new WebServiceRefMetaData();
}
Modified: trunk/server/src/main/org/jboss/metamodel/descriptor/PortInfo.java
===================================================================
--- trunk/server/src/main/org/jboss/metamodel/descriptor/PortInfo.java 2007-02-23 16:56:37 UTC (rev 60844)
+++ trunk/server/src/main/org/jboss/metamodel/descriptor/PortInfo.java 2007-02-23 17:34:57 UTC (rev 60845)
@@ -29,7 +29,7 @@
// $Id$
/**
- * Represents a <port-info> element in <service-ref>
+ * Represents a <port-info> element in <webservice-ref>
*
* @author Thomas.Diesler at jboss.com
*/
Modified: trunk/server/src/main/org/jboss/metamodel/descriptor/WebServiceRefMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/metamodel/descriptor/WebServiceRefMetaData.java 2007-02-23 16:56:37 UTC (rev 60844)
+++ trunk/server/src/main/org/jboss/metamodel/descriptor/WebServiceRefMetaData.java 2007-02-23 17:34:57 UTC (rev 60845)
@@ -29,8 +29,8 @@
// $Id$
/**
- * Represents a <service-ref> element of the jboss.xml, jboss-web.xml, jboss-client.xml deployment descriptor
- * for the 5.0 schema
+ * Represents a <webservice-ref> element of the jboss.xml, jboss-web.xml, jboss-client.xml
+ * deployment descriptor for the 5.0 schema
*
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
* @author Thomas.Diesler at jboss.com
@@ -123,7 +123,7 @@
public String toXMLFragment()
{
- StringBuilder xml = new StringBuilder("<service-ref>");
+ StringBuilder xml = new StringBuilder("<webservice-ref>");
xml.append("<service-ref-name>" + serviceRefName + "</service-ref-name>");
@@ -147,7 +147,7 @@
if (wsdlOverride != null)
xml.append("<wsdl-override>" + wsdlOverride + "</wsdl-override>");
- xml.append("</service-ref>");
+ xml.append("</webservice-ref>");
return xml.toString();
}
Modified: trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java
===================================================================
--- trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java 2007-02-23 16:56:37 UTC (rev 60844)
+++ trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java 2007-02-23 17:34:57 UTC (rev 60845)
@@ -51,14 +51,14 @@
import org.jboss.metadata.ResourceEnvRefMetaData;
import org.jboss.metadata.ResourceRefMetaData;
import org.jboss.metadata.WebMetaData;
+import org.jboss.metadata.serviceref.ServiceRefHandler;
+import org.jboss.metadata.serviceref.ServiceRefHandlerFactory;
import org.jboss.mx.loading.LoaderRepositoryFactory;
import org.jboss.naming.NonSerializableFactory;
import org.jboss.naming.Util;
import org.jboss.security.AuthorizationManager;
import org.jboss.security.authorization.PolicyRegistration;
import org.jboss.web.WebApplication;
-import org.jboss.webservice.ServiceRefHandler;
-import org.jboss.webservice.ServiceRefHandlerFactory;
import org.omg.CORBA.ORB;
/**
Modified: trunk/server/src/resources/dtd/jboss-client_5_0.dtd
===================================================================
--- trunk/server/src/resources/dtd/jboss-client_5_0.dtd 2007-02-23 16:56:37 UTC (rev 60844)
+++ trunk/server/src/resources/dtd/jboss-client_5_0.dtd 2007-02-23 17:34:57 UTC (rev 60845)
@@ -17,7 +17,7 @@
<!-- The jboss-client element is the root element.
-->
-<!ELEMENT jboss-client (jndi-name, ejb-ref*, service-ref*, resource-ref*,
+<!ELEMENT jboss-client (jndi-name, ejb-ref*, webservice-ref*, resource-ref*,
resource-env-ref*)>
<!-- The required jndi-name element specifies the JNDI name of a deployed
@@ -131,7 +131,7 @@
<message-destination-ref>
<message-destination-ref-name>MyQueue</message-destination-ref-name>
<jndi-name>queue/GlobalQueue</jndi-name>
- </service-ref>
+ </message-destination-ref>
-->
<!ELEMENT message-destination-ref (message-destination-ref-name, jndi-name)>
Modified: trunk/server/src/resources/dtd/jboss-web_5_0.dtd
===================================================================
--- trunk/server/src/resources/dtd/jboss-web_5_0.dtd 2007-02-23 16:56:37 UTC (rev 60844)
+++ trunk/server/src/resources/dtd/jboss-web_5_0.dtd 2007-02-23 17:34:57 UTC (rev 60845)
@@ -22,7 +22,7 @@
virtual-host*, use-session-cookies?, replication-config?, resource-env-ref*,
resource-ref*, security-role*, ejb-ref*, ejb-local-ref*,
message-destination-ref*, message-destination*,
- service-ref*, depends*, servlet*, max-active-sessions?, passivation-config?)>
+ webservice-ref*, depends*, servlet*, max-active-sessions?, passivation-config?)>
<!-- The class-loading element allows one to override the default class
loading behavior of the web container. You can specify the
Modified: trunk/server/src/resources/dtd/jboss_5_0.dtd
===================================================================
--- trunk/server/src/resources/dtd/jboss_5_0.dtd 2007-02-23 16:56:37 UTC (rev 60844)
+++ trunk/server/src/resources/dtd/jboss_5_0.dtd 2007-02-23 17:34:57 UTC (rev 60845)
@@ -31,7 +31,7 @@
<security-proxy>
<ejb-ref>
<ejb-local-ref>
- <service-ref>
+ <webservice-ref>
<security-identity>
<run-as-principal>
</security-identity>
@@ -53,7 +53,7 @@
<security-proxy>
<ejb-ref>
<ejb-local-ref>
- <service-ref>
+ <webservice-ref>
<security-identity>
<run-as-principal>
</security-identity>
@@ -83,7 +83,7 @@
<configuration-name>
<security-proxy>
<ejb-ref>
- <service-ref>
+ <webservice-ref>
<security-identity>
<run-as-principal>
</security-identity>
@@ -437,7 +437,7 @@
-->
<!ELEMENT entity (ejb-name , jndi-name? , local-jndi-name? , call-by-value?, read-only?,
exception-on-rollback?, timer-persistence?, configuration-name? , invoker-bindings?,
- security-proxy? , ejb-ref* , ejb-local-ref* , service-ref*, security-identity? ,
+ security-proxy? , ejb-ref* , ejb-local-ref* , webservice-ref*, security-identity? ,
resource-ref* , resource-env-ref*, message-destination-ref* , method-attributes? ,
clustered? , cluster-config?, cache-invalidation? , cache-invalidation-config?,
depends*, ior-security-config?)>
@@ -455,7 +455,7 @@
-->
<!ELEMENT session (ejb-name , jndi-name? , local-jndi-name?, call-by-value?,
exception-on-rollback?, timer-persistence?, configuration-name?, invoker-bindings?,
- security-proxy? , ejb-ref* , ejb-local-ref* , service-ref*, security-identity? ,
+ security-proxy? , ejb-ref* , ejb-local-ref* , webservice-ref*, security-identity? ,
resource-ref* , resource-env-ref*, message-destination-ref* , clustered? ,
cluster-config?, method-attributes?, depends*,
ior-security-config?, port-component*, ejb-timeout-identity?)>
@@ -475,7 +475,7 @@
local-jndi-name?,
mdb-user?, mdb-passwd? , mdb-client-id? , mdb-subscription-id? , resource-adapter-name? ,
exception-on-rollback?, timer-persistence?, configuration-name? , invoker-bindings?,
- security-proxy? , ejb-ref* , ejb-local-ref*, service-ref*, security-identity?, resource-ref*,
+ security-proxy? , ejb-ref* , ejb-local-ref*, webservice-ref*, security-identity?, resource-ref*,
resource-env-ref*, message-destination-ref*, depends*, ior-security-config?,
ejb-timeout-identity?)>
<!-- Allow the message-driven to have a unique id -->
Modified: trunk/server/src/resources/dtd/webservice-ref_5_0.dtd
===================================================================
--- trunk/server/src/resources/dtd/webservice-ref_5_0.dtd 2007-02-23 16:56:37 UTC (rev 60844)
+++ trunk/server/src/resources/dtd/webservice-ref_5_0.dtd 2007-02-23 17:34:57 UTC (rev 60845)
@@ -79,7 +79,7 @@
<!ELEMENT handler-chain (#PCDATA)>
<!--
- Information for a port within a service-reference.
+ Information for a port within a webservice-ref.
Either service-endpoint-interface or wsdl-port or both
(service-endpoint-interface and wsdl-port) should be specified.
@@ -88,11 +88,11 @@
port the container should choose for container-managed port selection.
The same wsdl-port value must not appear in
- more than one port-info entry within the same service-ref.
+ more than one port-info entry within the same webservice-ref.
If a particular service-endpoint-interface is using container-managed port
selection, it must not appear in more than one port-info entry
- within the same service-ref.
+ within the same webservice-ref.
-->
<!ELEMENT port-info (service-endpoint-interface?, port-qname?, config-name?, config-file?, stub-property*)>
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/TomcatDeployment.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/TomcatDeployment.java 2007-02-23 16:56:37 UTC (rev 60844)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/TomcatDeployment.java 2007-02-23 17:34:57 UTC (rev 60845)
@@ -50,6 +50,8 @@
import org.jboss.deployers.spi.deployer.DeploymentUnit;
import org.jboss.logging.Logger;
import org.jboss.metadata.WebMetaData;
+import org.jboss.metadata.serviceref.ServiceRefHandler;
+import org.jboss.metadata.serviceref.ServiceRefHandlerFactory;
import org.jboss.mx.util.MBeanServerLocator;
import org.jboss.naming.NonSerializableFactory;
import org.jboss.security.AuthorizationManager;
@@ -66,8 +68,6 @@
import org.jboss.web.tomcat.tc6.session.AbstractJBossManager;
import org.jboss.web.tomcat.tc6.session.ClusteringNotSupportedException;
import org.jboss.web.tomcat.tc6.session.JBossCacheManager;
-import org.jboss.webservice.ServiceRefHandler;
-import org.jboss.webservice.ServiceRefHandlerFactory;
import org.omg.CORBA.ORB;
/**
More information about the jboss-cvs-commits
mailing list