JBossWS SVN: r17007 - in stack/native/trunk: modules/core/src/main/java/org/jboss/ws and 7 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2012-11-16 09:08:31 -0500 (Fri, 16 Nov 2012)
New Revision: 17007
Added:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/NativeServiceRefFactoryFactoryImpl.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/NativeServiceRefFactoryImpl.java
stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefFactoryFactory
Removed:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/NativeServiceRefBinderFactoryImpl.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/serviceref/NativeServiceRefBinderJAXRPC.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/serviceref/NativeServiceReferenceableJAXRPC.java
stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws637/
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws637/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/
Modified:
stack/native/trunk/
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/NativeMessages.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/serviceref/NativeServiceObjectFactoryJAXRPC.java
stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml
stack/native/trunk/pom.xml
Log:
[JBWS-3565] WS ref optimization
Property changes on: stack/native/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /stack/native/branches/asoldano:14057,14069
/stack/native/branches/ropalka:13836-13879
/stack/native/branches/ropalka_JBWS-3550:16746-16753
+ /stack/native/branches/asoldano:14057,14069
/stack/native/branches/ropalka:13836-13879,16969-17006
/stack/native/branches/ropalka_JBWS-3550:16746-16753
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/NativeMessages.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/NativeMessages.java 2012-11-16 13:59:51 UTC (rev 17006)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/NativeMessages.java 2012-11-16 14:08:31 UTC (rev 17007)
@@ -29,7 +29,6 @@
import java.util.Collection;
import javax.management.ObjectName;
-import javax.naming.NamingException;
import javax.wsdl.Part;
import javax.xml.namespace.QName;
import javax.xml.rpc.JAXRPCException;
@@ -687,7 +686,7 @@
JAXRPCException outputParamsNotAvailable();
@Message(id = 25268, value = "Cannot obtain path to PortComponentLinkServlet")
- NamingException cannotObtainPathToPCLServlet(@Cause Throwable cause);
+ Exception cannotObtainPathToPCLServlet(@Cause Throwable cause);
@Message(id = 25270, value = "The service interface does not implement javax.xml.rpc.Service: %s")
JAXRPCException interfaceDoesNotImplementJAXRPCService(String intf);
Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/NativeServiceRefBinderFactoryImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/NativeServiceRefBinderFactoryImpl.java 2012-11-16 13:59:51 UTC (rev 17006)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/NativeServiceRefBinderFactoryImpl.java 2012-11-16 14:08:31 UTC (rev 17007)
@@ -1,44 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ws.core.client;
-
-import org.jboss.ws.core.jaxrpc.client.serviceref.NativeServiceRefBinderJAXRPC;
-import org.jboss.wsf.spi.serviceref.ServiceRefBinder;
-import org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory;
-import org.jboss.wsf.spi.serviceref.ServiceRefHandler.Type;
-
-/**
- * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
- */
-public final class NativeServiceRefBinderFactoryImpl implements ServiceRefBinderFactory
-{
- private static final ServiceRefBinder JAXRPC_BINDER = new NativeServiceRefBinderJAXRPC();
-
- public ServiceRefBinder newServiceRefBinder(final Type type)
- {
- if (type == Type.JAXRPC)
- {
- return JAXRPC_BINDER;
- }
- throw new UnsupportedOperationException();
- }
-}
Copied: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/NativeServiceRefFactoryFactoryImpl.java (from rev 17006, stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/core/client/NativeServiceRefFactoryFactoryImpl.java)
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/NativeServiceRefFactoryFactoryImpl.java (rev 0)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/NativeServiceRefFactoryFactoryImpl.java 2012-11-16 14:08:31 UTC (rev 17007)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ws.core.client;
+
+import org.jboss.wsf.spi.serviceref.ServiceRefFactory;
+import org.jboss.wsf.spi.serviceref.ServiceRefFactoryFactory;
+
+/**
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public final class NativeServiceRefFactoryFactoryImpl implements ServiceRefFactoryFactory
+{
+ public ServiceRefFactory newServiceRefFactory()
+ {
+ return new NativeServiceRefFactoryImpl();
+ }
+}
Copied: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/NativeServiceRefFactoryImpl.java (from rev 17006, stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/core/client/NativeServiceRefFactoryImpl.java)
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/NativeServiceRefFactoryImpl.java (rev 0)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/NativeServiceRefFactoryImpl.java 2012-11-16 14:08:31 UTC (rev 17007)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ws.core.client;
+
+import org.jboss.ws.core.jaxrpc.client.serviceref.NativeServiceObjectFactoryJAXRPC;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
+import org.jboss.wsf.spi.serviceref.ServiceRefFactory;
+import org.jboss.wsf.spi.serviceref.ServiceRefType;
+
+/**
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+final class NativeServiceRefFactoryImpl implements ServiceRefFactory
+{
+ public Object newServiceRef(final UnifiedServiceRefMetaData serviceRefMD)
+ {
+ if (serviceRefMD.getType() == ServiceRefType.JAXRPC) {
+ return new NativeServiceObjectFactoryJAXRPC().getObjectInstance(serviceRefMD);
+ }
+ throw new UnsupportedOperationException();
+ }
+}
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2012-11-16 13:59:51 UTC (rev 17006)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2012-11-16 14:08:31 UTC (rev 17007)
@@ -58,7 +58,6 @@
import org.jboss.ws.metadata.umdm.OperationMetaData;
import org.jboss.ws.metadata.umdm.ServiceMetaData;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedInitParamMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData;
@@ -204,7 +203,6 @@
String nsURI = portName.getNamespaceURI();
serviceMetaData.assertTargetNamespace(nsURI);
CallImpl call = new CallImpl(this, portName, null);
- initCallProperties(call, null);
return call;
}
@@ -226,7 +224,6 @@
serviceMetaData.assertTargetNamespace(nsURI);
QName opName = new QName(nsURI, operationName);
CallImpl call = new CallImpl(this, portName, opName);
- initCallProperties(call, null);
return call;
}
@@ -247,7 +244,6 @@
serviceMetaData.assertTargetNamespace(portName.getNamespaceURI());
serviceMetaData.assertTargetNamespace(opName.getNamespaceURI());
CallImpl call = new CallImpl(this, portName, opName);
- initCallProperties(call, null);
return call;
}
@@ -263,7 +259,6 @@
public Call createCall() throws ServiceException
{
CallImpl call = new CallImpl(this);
- initCallProperties(call, null);
return call;
}
@@ -445,10 +440,6 @@
CallImpl call = new CallImpl(this, epMetaData);
initStubProperties(call, seiClass.getName());
- // JBoss-4.0.x does not support <stub-properties>
- if (initCallProperties(call, seiClass.getName()) > 0)
- NativeLoggers.JAXRPC_LOGGER.deprecatedUseOfCallPropsOnJAXRPCStub();
-
PortProxy handler = new PortProxy(call);
ClassLoader cl = epMetaData.getClassLoader();
Remote proxy = (Remote)Proxy.newProxyInstance(cl, new Class[] { seiClass, Stub.class, StubExt.class }, handler);
@@ -480,41 +471,6 @@
return propCount;
}
- private int initCallProperties(CallImpl call, String seiName)
- {
- setupHandlerChain(call.getEndpointMetaData());
-
- // nothing to do
- if (usrMetaData == null)
- return 0;
-
- int propCount = 0;
-
- // General properties
- for (UnifiedCallPropertyMetaData prop : usrMetaData.getCallProperties())
- {
- call.setProperty(prop.getPropName(), prop.getPropValue());
- propCount++;
- }
-
- if (seiName != null)
- {
- for (UnifiedPortComponentRefMetaData upcRef : usrMetaData.getPortComponentRefs())
- {
- if (seiName.equals(upcRef.getServiceEndpointInterface()))
- {
- for (UnifiedCallPropertyMetaData prop : upcRef.getCallProperties())
- {
- call.setProperty(prop.getPropName(), prop.getPropValue());
- propCount++;
- }
- }
- }
- }
-
- return propCount;
- }
-
/**
* Get the handler chain for the given endpoint name, maybe null.
*/
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/serviceref/NativeServiceObjectFactoryJAXRPC.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/serviceref/NativeServiceObjectFactoryJAXRPC.java 2012-11-16 13:59:51 UTC (rev 17006)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/serviceref/NativeServiceObjectFactoryJAXRPC.java 2012-11-16 14:08:31 UTC (rev 17007)
@@ -24,11 +24,8 @@
import static org.jboss.ws.NativeMessages.MESSAGES;
import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.io.ObjectInputStream;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Proxy;
import java.net.URL;
@@ -36,22 +33,15 @@
import java.rmi.Remote;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Hashtable;
import java.util.List;
import java.util.Map;
-import java.util.Properties;
-import javax.naming.Context;
-import javax.naming.Name;
-import javax.naming.NamingException;
-import javax.naming.RefAddr;
-import javax.naming.Reference;
-import javax.naming.spi.ObjectFactory;
import javax.xml.namespace.QName;
import javax.xml.rpc.Service;
import org.jboss.logging.Logger;
import org.jboss.ws.NativeLoggers;
+import org.jboss.ws.NativeMessages;
import org.jboss.ws.common.Constants;
import org.jboss.ws.core.jaxrpc.client.ServiceExt;
import org.jboss.ws.core.jaxrpc.client.ServiceImpl;
@@ -67,7 +57,8 @@
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.management.EndpointRegistry;
import org.jboss.wsf.spi.management.EndpointRegistryFactory;
-import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData;
+import org.jboss.wsf.spi.management.ServerConfig;
+import org.jboss.wsf.spi.management.ServerConfigFactory;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
@@ -80,54 +71,15 @@
* @author Thomas.Diesler(a)jboss.org
* @since 15-April-2004
*/
-public final class NativeServiceObjectFactoryJAXRPC implements ObjectFactory
+public final class NativeServiceObjectFactoryJAXRPC
{
// provide logging
private static final Logger log = Logger.getLogger(NativeServiceObjectFactoryJAXRPC.class);
- /**
- * Creates an object using the location or reference information specified.
- * <p/>
- *
- * @param obj The possibly null object containing location or reference
- * information that can be used in creating an object.
- * @param name The name of this object relative to <code>nameCtx</code>,
- * or null if no name is specified.
- * @param nameCtx The context relative to which the <code>name</code>
- * parameter is specified, or null if <code>name</code> is
- * relative to the default initial context.
- * @param environment The possibly null environment that is used in
- * creating the object.
- * @return The object created; null if an object cannot be created.
- * @throws Exception if this object factory encountered an exception
- * while attempting to create an object, and no other object factories are
- * to be tried.
- * @see javax.naming.spi.NamingManager#getObjectInstance
- * @see javax.naming.spi.NamingManager#getURLContext
- */
- public Object getObjectInstance(Object obj, Name name, Context nameCtx, Hashtable environment) throws Exception
+ public Object getObjectInstance(final UnifiedServiceRefMetaData serviceRef)
{
try
{
- Reference ref = (Reference)obj;
-
- // Unmarshall the ServiceRefMetaData
- UnifiedServiceRefMetaData serviceRef = null;
- RefAddr metaRefAddr = ref.get(NativeServiceReferenceableJAXRPC.SERVICE_REF_META_DATA);
- ByteArrayInputStream bais = new ByteArrayInputStream((byte[])metaRefAddr.getContent());
- try
- {
- ObjectInputStream ois = new ObjectInputStream(bais);
- serviceRef = (UnifiedServiceRefMetaData)ois.readObject();
- ois.close();
- }
- catch (IOException ex)
- {
- NamingException ne = new NamingException();
- ne.setRootCause(ex);
- throw ne;
- }
-
ServiceImpl jaxrpcService = null;
URL wsdlLocation = serviceRef.getWsdlLocation();
if (wsdlLocation != null)
@@ -149,21 +101,11 @@
ServiceMetaData serviceMetaData = jaxrpcService.getServiceMetaData();
- // Set any service level properties
- if (serviceRef.getCallProperties().size() > 0)
- {
- Properties callProps = new Properties();
- serviceMetaData.setProperties(callProps);
- for (UnifiedCallPropertyMetaData prop : serviceRef.getCallProperties())
- callProps.setProperty(prop.getPropName(), prop.getPropValue());
- }
-
// The web service client using a port-component-link, the contet is the URL to
// the PortComponentLinkServlet that will return the actual endpoint address
- RefAddr pcLinkRef = ref.get(NativeServiceReferenceableJAXRPC.PORT_COMPONENT_LINK);
- if (pcLinkRef != null)
+ String pcLink = getPortComponentLink(serviceRef);
+ if (pcLink != null)
{
- String pcLink = (String)pcLinkRef.getContent();
log.debug("Resolving port-component-link: " + pcLink);
// First try to obtain the endpoint address loacally
@@ -187,7 +129,7 @@
// We may be remote in the esoteric case where an appclient uses the port-comonent-link feature
if (endpointAddress == null)
{
- String servletPath = (String)ref.get(NativeServiceReferenceableJAXRPC.PORT_COMPONENT_LINK_SERVLET).getContent();
+ String servletPath = getPortComponentLinkServlet();
servletPath += "?pcLink=" + URLEncoder.encode(pcLink, "UTF-8");
InputStream is = new URL(servletPath).openStream();
BufferedReader br = new BufferedReader(new InputStreamReader(is));
@@ -242,10 +184,33 @@
catch (Exception ex)
{
NativeLoggers.JAXRPC_LOGGER.cannotCreateService(ex);
- throw ex;
+ throw new RuntimeException(ex);
}
}
+ private String getPortComponentLink(UnifiedServiceRefMetaData refMetaData) {
+ for (UnifiedPortComponentRefMetaData pcr : refMetaData.getPortComponentRefs())
+ {
+ return pcr.getPortComponentLink();
+ }
+ return null;
+ }
+
+ private String getPortComponentLinkServlet() throws Exception {
+ try {
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
+
+ String host = config.getWebServiceHost();
+ int port = config.getWebServicePort();
+
+ String servletURL = "http://" + host + ":" + port + "/jbossws/pclink";
+ return servletURL;
+ } catch (Exception ex) {
+ throw NativeMessages.MESSAGES.cannotObtainPathToPCLServlet(ex);
+ }
+ }
+
/**
* Narrow available endpoints by <port-component-ref> declarations.
* Service.getPort(SEI) must be able to retrieve a distinct port definition.
Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/serviceref/NativeServiceRefBinderJAXRPC.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/serviceref/NativeServiceRefBinderJAXRPC.java 2012-11-16 13:59:51 UTC (rev 17006)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/serviceref/NativeServiceRefBinderJAXRPC.java 2012-11-16 14:08:31 UTC (rev 17007)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ws.core.jaxrpc.client.serviceref;
-
-import javax.naming.Referenceable;
-
-import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
-import org.jboss.wsf.spi.serviceref.ServiceRefBinder;
-
-/**
- * Binds a JAXRPC Service object to the client's ENC.
- *
- * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
- */
-public final class NativeServiceRefBinderJAXRPC implements ServiceRefBinder
-{
- @Override
- public Referenceable createReferenceable(final UnifiedServiceRefMetaData serviceRefMD)
- {
- return new NativeServiceReferenceableJAXRPC(serviceRefMD);
- }
-}
Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/serviceref/NativeServiceReferenceableJAXRPC.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/serviceref/NativeServiceReferenceableJAXRPC.java 2012-11-16 13:59:51 UTC (rev 17006)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/client/serviceref/NativeServiceReferenceableJAXRPC.java 2012-11-16 14:08:31 UTC (rev 17007)
@@ -1,126 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ws.core.jaxrpc.client.serviceref;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectOutputStream;
-
-import javax.naming.BinaryRefAddr;
-import javax.naming.NamingException;
-import javax.naming.Reference;
-import javax.naming.Referenceable;
-import javax.naming.StringRefAddr;
-
-import org.jboss.ws.NativeMessages;
-import org.jboss.wsf.spi.SPIProvider;
-import org.jboss.wsf.spi.SPIProviderResolver;
-import org.jboss.wsf.spi.management.ServerConfig;
-import org.jboss.wsf.spi.management.ServerConfigFactory;
-import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
-
-/**
- * A JNDI reference to a javax.xml.rpc.Service
- * <p/>
- * It holds the information to reconstrut the javax.xml.rpc.Service
- * when the client does a JNDI lookup.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 15-April-2004
- */
-public final class NativeServiceReferenceableJAXRPC implements Referenceable
-{
- public static final String SERVICE_REF_META_DATA = "SERVICE_REF_META_DATA";
- public static final String PORT_COMPONENT_LINK = "PORT_COMPONENT_LINK";
- public static final String PORT_COMPONENT_LINK_SERVLET = "PORT_COMPONENT_LINK_SERVLET";
-
- private UnifiedServiceRefMetaData refMetaData;
-
- /**
- * A service referenceable for a WSDL document that is part of the deployment
- */
- public NativeServiceReferenceableJAXRPC(UnifiedServiceRefMetaData refMetaData)
- {
- this.refMetaData = refMetaData;
- }
-
- /**
- * Retrieves the Reference of this object.
- *
- * @return The non-null Reference of this object.
- * @throws javax.naming.NamingException If a naming exception was encountered while retrieving the reference.
- */
- public Reference getReference() throws NamingException
- {
- Reference myRef = new Reference(NativeServiceReferenceableJAXRPC.class.getName(), NativeServiceObjectFactoryJAXRPC.class.getName(), null);
-
- // Add a reference to the ServiceRefMetaData and WSDLDefinitions
- myRef.add(new BinaryRefAddr(SERVICE_REF_META_DATA, marshallServiceRef()));
-
- // Add references to port component links
- for (UnifiedPortComponentRefMetaData pcr : refMetaData.getPortComponentRefs())
- {
- String pcLink = pcr.getPortComponentLink();
- if (pcLink != null)
- {
- myRef.add(new StringRefAddr(PORT_COMPONENT_LINK, pcLink));
- try
- {
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- ServerConfig config = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
-
- String host = config.getWebServiceHost();
- int port = config.getWebServicePort();
-
- String servletURL = "http://" + host + ":" + port + "/jbossws/pclink";
- myRef.add(new StringRefAddr(PORT_COMPONENT_LINK_SERVLET, servletURL));
- }
- catch (Exception ex)
- {
- throw NativeMessages.MESSAGES.cannotObtainPathToPCLServlet(ex);
- }
- }
- }
-
- return myRef;
- }
-
- /** Marshall the ServiceRefMetaData to an byte array
- */
- private byte[] marshallServiceRef() throws NamingException
- {
- ByteArrayOutputStream baos = new ByteArrayOutputStream(512);
- try
- {
- ObjectOutputStream oos = new ObjectOutputStream(baos);
- oos.writeObject(refMetaData);
- oos.close();
- }
- catch (IOException e)
- {
- throw new NamingException(e.toString());
- }
- return baos.toByteArray();
- }
-
-}
Deleted: stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory
===================================================================
--- stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory 2012-11-16 13:59:51 UTC (rev 17006)
+++ stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory 2012-11-16 14:08:31 UTC (rev 17007)
@@ -1 +0,0 @@
-org.jboss.ws.core.client.NativeServiceRefBinderFactoryImpl
\ No newline at end of file
Copied: stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefFactoryFactory (from rev 17006, stack/native/branches/ropalka/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefFactoryFactory)
===================================================================
--- stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefFactoryFactory (rev 0)
+++ stack/native/trunk/modules/services/src/main/resources/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefFactoryFactory 2012-11-16 14:08:31 UTC (rev 17007)
@@ -0,0 +1 @@
+org.jboss.ws.core.client.NativeServiceRefFactoryFactoryImpl
\ No newline at end of file
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-11-16 13:59:51 UTC (rev 17006)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-11-16 14:08:31 UTC (rev 17007)
@@ -1652,28 +1652,6 @@
</fileset>
</jar>
- <!-- jaxrpc-jbws637 -->
- <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws637-appclient.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxrpc/jbws637/*.class"/>
- <exclude name="org/jboss/test/ws/jaxrpc/jbws637/*TestCase.class"/>
- <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/>
- </fileset>
- <manifest>
- <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/>
- </manifest>
- <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws637/META-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="application-client.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
- <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws637-appclient.ear">
- <fileset dir="${tests.output.dir}/test-libs">
- <include name="jaxrpc-jbws637-appclient.jar"/>
- </fileset>
- </jar>
-
<!-- jaxrpc-jbws643 -->
<war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws643.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws643/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
@@ -2005,47 +1983,6 @@
</fileset>
</jar>
- <!-- jaxrpc-jbws723 -->
- <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-jbws723.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationService.class"/>
- <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationHome.class"/>
- <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationRemote.class"/>
- <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationImpl.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws723/META-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="ejb-jar.xml"/>
- <include name="jboss-ejb3.xml"/>
- <include name="jboss.xml"/>
- <include name="jboss-webservices.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
- <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-jbws723-appclient.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationService.class"/>
- <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationHome.class"/>
- <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationRemote.class"/>
- <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/>
- </fileset>
- <manifest>
- <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/>
- </manifest>
- <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws723/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
- <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws723-appclient.ear">
- <fileset dir="${tests.output.dir}/test-libs">
- <include name="jaxrpc-jbws723-appclient.jar"/>
- </fileset>
- </jar>
-
<!-- jaxrpc-jbws732 -->
<war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws732.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws732/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2012-11-16 13:59:51 UTC (rev 17006)
+++ stack/native/trunk/pom.xml 2012-11-16 14:08:31 UTC (rev 17007)
@@ -57,8 +57,8 @@
<!-- Properties -->
<properties>
<jbossws.api.version>1.0.1.Final</jbossws.api.version>
- <jbossws.spi.version>2.1.0.Final</jbossws.spi.version>
- <jbossws.common.version>2.1.0.Final</jbossws.common.version>
+ <jbossws.spi.version>2.1.1-SNAPSHOT</jbossws.spi.version>
+ <jbossws.common.version>2.1.1-SNAPSHOT</jbossws.common.version>
<jbossws.common.tools.version>1.1.0.Final</jbossws.common.tools.version>
<jbossws.shared.testsuite.version>4.1.0.Final</jbossws.shared.testsuite.version>
<jbossws.jboss713.version>4.1.1-SNAPSHOT</jbossws.jboss713.version>
12 years, 1 month
- 1
- 0
JBossWS SVN: r17006 - container/jboss71/branches.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2012-11-16 08:59:51 -0500 (Fri, 16 Nov 2012)
New Revision: 17006
Removed:
container/jboss71/branches/jbossws-jboss710/
Log:
removing obsolete branch
12 years, 1 month
- 1
- 0
JBossWS SVN: r17005 - common/branches.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2012-11-16 08:55:29 -0500 (Fri, 16 Nov 2012)
New Revision: 17005
Removed:
common/branches/ropalka/
Log:
removing obsolete branch
12 years, 1 month
- 1
- 0
JBossWS SVN: r17004 - in common/trunk: src/main/java/org/jboss/ws/common and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2012-11-16 08:54:26 -0500 (Fri, 16 Nov 2012)
New Revision: 17004
Removed:
common/trunk/src/main/java/org/jboss/ws/common/serviceref/
Modified:
common/trunk/
common/trunk/pom.xml
common/trunk/src/main/java/org/jboss/ws/common/Messages.java
common/trunk/src/main/java/org/jboss/ws/common/spi/DefaultSPIProvider.java
Log:
[JBWS-3565] WS ref optimization
Property changes on: common/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /common/branches/asoldano:14028-14056
/common/branches/ropalka_JBWS-3550:16756
+ /common/branches/asoldano:14028-14056
/common/branches/ropalka:16964-17003
/common/branches/ropalka_JBWS-3550:16756
Modified: common/trunk/pom.xml
===================================================================
--- common/trunk/pom.xml 2012-11-16 13:52:59 UTC (rev 17003)
+++ common/trunk/pom.xml 2012-11-16 13:54:26 UTC (rev 17004)
@@ -27,7 +27,7 @@
<!-- Properties -->
<properties>
- <jbossws.spi.version>2.1.0.Final</jbossws.spi.version>
+ <jbossws.spi.version>2.1.1-SNAPSHOT</jbossws.spi.version>
<jboss.jaxbintros.version>1.0.2.GA</jboss.jaxbintros.version>
<jboss.common.core.version>2.2.17.GA</jboss.common.core.version>
<jboss-logging.version>3.1.2.GA</jboss-logging.version>
Modified: common/trunk/src/main/java/org/jboss/ws/common/Messages.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/Messages.java 2012-11-16 13:52:59 UTC (rev 17003)
+++ common/trunk/src/main/java/org/jboss/ws/common/Messages.java 2012-11-16 13:54:26 UTC (rev 17004)
@@ -29,7 +29,6 @@
import java.util.Collection;
import javax.management.ObjectName;
-import javax.naming.NamingException;
import javax.xml.ws.WebServiceException;
import org.jboss.logging.Cause;
@@ -113,12 +112,6 @@
@Message(id = 22031, value = "Cycle detected in sub-graph: %s")
IllegalStateException cycleDetectedInSubGraph(Collection<?> c);
- @Message(id = 22032, value = "Cannot marshall service ref meta data")
- NamingException cannotMarshallServiceRefMetaData(@Cause Throwable cause);
-
- @Message(id = 22033, value = "Cannot unmarshall service ref meta data")
- NamingException cannotUnMarshallServiceRefMetaData(@Cause Throwable cause);
-
@Message(id = 22034, value = "Missing VFS root for service-ref: %s")
IllegalStateException missingVFSRootInServiceRef(String serviceRefName);
Modified: common/trunk/src/main/java/org/jboss/ws/common/spi/DefaultSPIProvider.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/spi/DefaultSPIProvider.java 2012-11-16 13:52:59 UTC (rev 17003)
+++ common/trunk/src/main/java/org/jboss/ws/common/spi/DefaultSPIProvider.java 2012-11-16 13:54:26 UTC (rev 17004)
@@ -29,7 +29,6 @@
import org.jboss.ws.common.management.DefaultEndpointRegistryFactory;
import org.jboss.ws.common.management.DefaultJMSEndpointResolver;
import org.jboss.ws.common.security.DefaultSecurityAdapterFactory;
-import org.jboss.ws.common.serviceref.DefaultServiceRefHandlerFactory;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.deployment.DeploymentModelFactory;
import org.jboss.wsf.spi.deployment.LifecycleHandlerFactory;
@@ -37,7 +36,6 @@
import org.jboss.wsf.spi.management.EndpointMetricsFactory;
import org.jboss.wsf.spi.management.EndpointRegistryFactory;
import org.jboss.wsf.spi.management.JMSEndpointResolver;
-import org.jboss.wsf.spi.serviceref.ServiceRefHandlerFactory;
/**
* @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a>
@@ -66,10 +64,6 @@
{
returnType = loadService(spiType, DefaultLifecycleHandlerFactory.class, loader);
}
- else if (ServiceRefHandlerFactory.class.equals(spiType))
- {
- returnType = loadService(spiType, DefaultServiceRefHandlerFactory.class, loader);
- }
else if (SecurityAdaptorFactory.class.equals(spiType))
{
returnType = loadService(spiType, DefaultSecurityAdapterFactory.class, loader);
12 years, 1 month
- 1
- 0
JBossWS SVN: r17003 - spi/branches.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2012-11-16 08:52:59 -0500 (Fri, 16 Nov 2012)
New Revision: 17003
Removed:
spi/branches/ropalka/
Log:
removing obsolete branch
12 years, 1 month
- 1
- 0
JBossWS SVN: r17002 - in spi/trunk: src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2012-11-16 08:50:10 -0500 (Fri, 16 Nov 2012)
New Revision: 17002
Added:
spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefFactory.java
spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefFactoryFactory.java
spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefType.java
Removed:
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedCallPropertyMetaData.java
spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinder.java
spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinderFactory.java
spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefElement.java
spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefHandler.java
spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefHandlerFactory.java
Modified:
spi/trunk/
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerChainMetaData.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerChainsMetaData.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedInitParamMetaData.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedStubPropertyMetaData.java
Log:
[JBWS-3565] WS ref optimization
Property changes on: spi/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /spi/branches/JBWS-3286:14506
/spi/branches/asoldano:14017-14042
/spi/branches/ropalka_JBWS-3550:16742
+ /spi/branches/JBWS-3286:14506
/spi/branches/asoldano:14017-14042
/spi/branches/ropalka:16962-17001
/spi/branches/ropalka_JBWS-3550:16742
Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedCallPropertyMetaData.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedCallPropertyMetaData.java 2012-11-15 13:55:24 UTC (rev 17001)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedCallPropertyMetaData.java 2012-11-16 13:50:10 UTC (rev 17002)
@@ -1,71 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.spi.metadata.j2ee.serviceref;
-
-import org.jboss.wsf.spi.serviceref.ServiceRefElement;
-
-/**
- * @author Thomas.Diesler(a)jboss.org
- * @since 06-May-2004
- */
-public class UnifiedCallPropertyMetaData extends ServiceRefElement
-{
- // The required <prop-name> element
- private String propName;
- // The required <prop-value> element
- private String propValue;
-
- public UnifiedCallPropertyMetaData(String propName, String propValue)
- {
- this.propName = propName;
- this.propValue = propValue;
- }
-
- public UnifiedCallPropertyMetaData()
- {
- }
-
- public String getPropName()
- {
- return propName;
- }
-
- public void setPropName(String paramName)
- {
- this.propName = paramName;
- }
-
- public String getPropValue()
- {
- return propValue;
- }
-
- public void setPropValue(String paramValue)
- {
- this.propValue = paramValue;
- }
-
- public String toString()
- {
- return "[name=" + propName + ",value=" + propValue + "]";
- }
-}
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerChainMetaData.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerChainMetaData.java 2012-11-15 13:55:24 UTC (rev 17001)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerChainMetaData.java 2012-11-16 13:50:10 UTC (rev 17002)
@@ -21,19 +21,19 @@
*/
package org.jboss.wsf.spi.metadata.j2ee.serviceref;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import javax.xml.namespace.QName;
-import org.jboss.wsf.spi.serviceref.ServiceRefElement;
-
/** The unified metadata data for a handler chain element
*
* @author Thomas.Diesler(a)jboss.org
*/
-public class UnifiedHandlerChainMetaData extends ServiceRefElement
+public class UnifiedHandlerChainMetaData implements Serializable
{
+ private static final long serialVersionUID = 1L;
private QName serviceNamePattern;
private QName portNamePattern;
private String protocolBindings;
@@ -41,11 +41,6 @@
private boolean excluded;
private String id;
- @Deprecated
- public UnifiedHandlerChainMetaData(UnifiedHandlerChainsMetaData handlerChains)
- {
- }
-
public UnifiedHandlerChainMetaData()
{
}
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerChainsMetaData.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerChainsMetaData.java 2012-11-15 13:55:24 UTC (rev 17001)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerChainsMetaData.java 2012-11-16 13:50:10 UTC (rev 17002)
@@ -21,26 +21,20 @@
*/
package org.jboss.wsf.spi.metadata.j2ee.serviceref;
+import java.io.Serializable;
import java.util.LinkedList;
import java.util.List;
-import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType;
-import org.jboss.wsf.spi.serviceref.ServiceRefElement;
-
/** The unified metadata data for a handler chains element
*
* @author Thomas.Diesler(a)jboss.org
*/
-public class UnifiedHandlerChainsMetaData extends ServiceRefElement
+public class UnifiedHandlerChainsMetaData implements Serializable
{
- private HandlerType handlerType;
+ private static final long serialVersionUID = 1L;
+
private List<UnifiedHandlerChainMetaData> handlerChains = new LinkedList<UnifiedHandlerChainMetaData>();
- public UnifiedHandlerChainsMetaData(HandlerType handlerType)
- {
- this.handlerType = handlerType;
- }
-
public UnifiedHandlerChainsMetaData()
{
}
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java 2012-11-15 13:55:24 UTC (rev 17001)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedHandlerMetaData.java 2012-11-16 13:50:10 UTC (rev 17002)
@@ -21,6 +21,7 @@
*/
package org.jboss.wsf.spi.metadata.j2ee.serviceref;
+import java.io.Serializable;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
@@ -28,15 +29,15 @@
import javax.xml.namespace.QName;
-import org.jboss.wsf.spi.serviceref.ServiceRefElement;
-
/**
* The unified metadata data for a handler element
*
* @author Thomas.Diesler(a)jboss.org
*/
-public class UnifiedHandlerMetaData extends ServiceRefElement
+public class UnifiedHandlerMetaData implements Serializable
{
+ private static final long serialVersionUID = 1L;
+
public enum HandlerType
{
PRE, ENDPOINT, POST, ALL
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedInitParamMetaData.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedInitParamMetaData.java 2012-11-15 13:55:24 UTC (rev 17001)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedInitParamMetaData.java 2012-11-16 13:50:10 UTC (rev 17002)
@@ -21,14 +21,15 @@
*/
package org.jboss.wsf.spi.metadata.j2ee.serviceref;
-import org.jboss.wsf.spi.serviceref.ServiceRefElement;
+import java.io.Serializable;
/**
* @author Thomas.Diesler(a)jboss.org
* @since 06-May-2004
*/
-public class UnifiedInitParamMetaData extends ServiceRefElement
+public class UnifiedInitParamMetaData implements Serializable
{
+ private static final long serialVersionUID = 1L;
// The required <param-name> element
private String paramName;
// The required <param-value> element
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java 2012-11-15 13:55:24 UTC (rev 17001)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java 2012-11-16 13:50:10 UTC (rev 17002)
@@ -21,23 +21,22 @@
*/
package org.jboss.wsf.spi.metadata.j2ee.serviceref;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import javax.xml.namespace.QName;
import org.jboss.wsf.spi.Messages;
-import org.jboss.wsf.spi.serviceref.ServiceRefElement;
/** The metadata data from service-ref/port-component-ref element in web.xml, ejb-jar.xml, and application-client.xml.
*
* @author Thomas.Diesler(a)jboss.org
* @author alessio.soldano(a)jboss.com
*/
-public class UnifiedPortComponentRefMetaData extends ServiceRefElement
+public class UnifiedPortComponentRefMetaData implements Serializable
{
- private static final long serialVersionUID = 8622309745808960649L;
-
+ private static final long serialVersionUID = 1L;
// The parent service-ref
private UnifiedServiceRefMetaData serviceRefMetaData;
@@ -47,8 +46,6 @@
private String portComponentLink;
// The optional <port-qname> element
private QName portQName;
- // Arbitrary proxy properties given by <call-property>
- private List<UnifiedCallPropertyMetaData> callProperties = new ArrayList<UnifiedCallPropertyMetaData>(2);
// Arbitrary proxy properties given by <stub-property>
private List<UnifiedStubPropertyMetaData> stubProperties = new ArrayList<UnifiedStubPropertyMetaData>(2);
// The optional JBossWS config-name
@@ -192,21 +189,6 @@
this.portQName = portQName;
}
- public List<UnifiedCallPropertyMetaData> getCallProperties()
- {
- return callProperties;
- }
-
- public void setCallProperties(List<UnifiedCallPropertyMetaData> callProps)
- {
- callProperties = callProps;
- }
-
- public void addCallProperty(UnifiedCallPropertyMetaData callProp)
- {
- callProperties.add(callProp);
- }
-
public List<UnifiedStubPropertyMetaData> getStubProperties()
{
return stubProperties;
@@ -275,7 +257,6 @@
str.append("\n respectBindingAnnotationSpecified=" + respectBindingAnnotationSpecified);
str.append("\n respectBindingEnabled=" + respectBindingEnabled);
str.append("\n portComponentLink=" + portComponentLink);
- str.append("\n callProperties=" + callProperties);
str.append("\n stubProperties=" + stubProperties);
str.append("\n configName=" + configName);
str.append("\n configFile=" + configFile);
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2012-11-15 13:55:24 UTC (rev 17001)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2012-11-16 13:50:10 UTC (rev 17002)
@@ -23,15 +23,7 @@
import static org.jboss.wsf.spi.Messages.MESSAGES;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.OutputStream;
+import java.io.Serializable;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
@@ -42,10 +34,7 @@
import org.jboss.wsf.spi.Loggers;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
-import org.jboss.wsf.spi.deployment.WritableUnifiedVirtualFile;
-import org.jboss.wsf.spi.serviceref.ServiceRefElement;
-import org.jboss.wsf.spi.serviceref.ServiceRefHandler;
-import org.jboss.wsf.spi.util.URLLoaderAdapter;
+import org.jboss.wsf.spi.serviceref.ServiceRefType;
/**
* The metadata from service-ref element in web.xml, ejb-jar.xml, and
@@ -55,16 +44,15 @@
* @author alessio.soldano(a)jboss.com
* @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
*/
-public final class UnifiedServiceRefMetaData extends ServiceRefElement
+public final class UnifiedServiceRefMetaData implements Serializable
{
- private static final long serialVersionUID = -926464174132493955L;
-
+ private static final long serialVersionUID = 1L;
private transient UnifiedVirtualFile vfsRoot;
-
- // Standard properties
-
+
+ // Standard properties
+
// Service reference type - either JAX-RPC or JAXWS
- private ServiceRefHandler.Type type;
+ private ServiceRefType type;
// The required <service-ref-name> element
private String serviceRefName;
// The JAXRPC required <service-interface> element
@@ -94,8 +82,6 @@
private String wsdlOverride;
// The optional <handler-chain> element. JAX-WS handler chain declared in the JBoss JavaEE5 descriptor
private String handlerChain;
- // Arbitrary proxy properties given by <call-property>
- private List<UnifiedCallPropertyMetaData> callProperties = new ArrayList<UnifiedCallPropertyMetaData>(2);
// @Addressing annotation metadata
private boolean isAddressingAnnotationSpecified;
private boolean addressingEnabled;
@@ -117,7 +103,7 @@
public UnifiedServiceRefMetaData()
{
}
-
+
public void setAddressingAnnotationSpecified(final boolean isAddressingAnnotationSpecified) {
this.isAddressingAnnotationSpecified = isAddressingAnnotationSpecified;
}
@@ -205,12 +191,12 @@
this.vfsRoot = vfsRoot;
}
- public ServiceRefHandler.Type getType()
+ public ServiceRefType getType()
{
return type;
}
- public void setType(ServiceRefHandler.Type type)
+ public void setType(ServiceRefType type)
{
this.type = type;
}
@@ -238,16 +224,19 @@
public URL getMappingLocation()
{
URL mappingURL = null;
- if (mappingFile != null)
- {
- try
- {
- mappingURL = vfsRoot.findChild(mappingFile).toURL();
- }
- catch (Exception e)
- {
- throw MESSAGES.cannotFindFile(e, mappingFile);
- }
+ if (mappingFile != null) {
+ if (vfsRoot != null) {
+ try
+ {
+ mappingURL = vfsRoot.findChild(mappingFile).toURL();
+ }
+ catch (Exception e)
+ {
+ throw MESSAGES.cannotFindFile(e, mappingFile);
+ }
+ } else {
+ mappingURL = Thread.currentThread().getContextClassLoader().getResource(mappingFile);
+ }
}
return mappingURL;
}
@@ -349,14 +338,18 @@
}
catch (MalformedURLException e1)
{
- try
- {
- wsdlLocation = vfsRoot.findChild(wsdlOverride).toURL();
+ if (vfsRoot != null) {
+ try
+ {
+ wsdlLocation = vfsRoot.findChild(wsdlOverride).toURL();
+ }
+ catch (Exception e)
+ {
+ throw MESSAGES.cannotFindFile(e, wsdlOverride);
+ }
+ } else {
+ wsdlLocation = Thread.currentThread().getContextClassLoader().getResource(wsdlOverride);
}
- catch (Exception e)
- {
- throw MESSAGES.cannotFindFile(e, wsdlOverride);
- }
}
}
@@ -368,17 +361,20 @@
}
catch (MalformedURLException e1)
{
- try
- {
- wsdlLocation = vfsRoot.findChild(wsdlFile).toURL();
+ if (vfsRoot != null) {
+ try
+ {
+ wsdlLocation = vfsRoot.findChild(wsdlFile).toURL();
+ }
+ catch (Exception e)
+ {
+ throw MESSAGES.cannotFindFile(e, wsdlFile);
+ }
+ } else {
+ wsdlLocation = Thread.currentThread().getContextClassLoader().getResource(wsdlFile);
}
- catch (Exception e)
- {
- throw MESSAGES.cannotFindFile(e, wsdlFile);
- }
}
}
-
return wsdlLocation;
}
@@ -412,21 +408,6 @@
this.wsdlOverride = wsdlOverride;
}
- public List<UnifiedCallPropertyMetaData> getCallProperties()
- {
- return callProperties;
- }
-
- public void setCallProperties(List<UnifiedCallPropertyMetaData> callProps)
- {
- callProperties = callProps;
- }
-
- public void addCallProperty(UnifiedCallPropertyMetaData callProp)
- {
- callProperties.add(callProp);
- }
-
public UnifiedHandlerChainsMetaData getHandlerChains()
{
return handlerChains;
@@ -447,76 +428,6 @@
this.handlerChain = handlerChain;
}
- private void writeObject(ObjectOutputStream out) throws IOException
- {
- out.defaultWriteObject();
- out.writeObject(vfsRoot);
- if (vfsRoot instanceof WritableUnifiedVirtualFile)
- {
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
- ((WritableUnifiedVirtualFile)vfsRoot).writeContent(bos, new WritableUnifiedVirtualFile.NameFilter() {
- public boolean accept(String fileName)
- {
- boolean result = fileName.contains("META-INF");
- result = result || fileName.endsWith(".wsdl");
- result = result || fileName.endsWith(".xsd");
- result = result || fileName.endsWith(".xml");
- return result;
- }
- });
- out.writeObject(bos.toByteArray());
- out.writeObject(vfsRoot.getName());
- }
- }
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException
- {
- in.defaultReadObject();
- UnifiedVirtualFile obj = (UnifiedVirtualFile)in.readObject();
- if (obj.toURL() == null && (obj instanceof WritableUnifiedVirtualFile))
- {
- //the virtual file has been created in a different VM (or is even pointing to a different filesystem), try getting the serialized contents
- byte[] bytes = (byte[])in.readObject();
- String vfName = (String)in.readObject();
- ByteArrayInputStream bis = new ByteArrayInputStream(bytes);
- File tempFile = File.createTempFile("jbossws-vf-", "-" + vfName);
- tempFile.deleteOnExit();
- FileOutputStream fos = new FileOutputStream(tempFile);
- copyStreamAndClose(fos, bis);
- this.vfsRoot = new URLLoaderAdapter(tempFile.toURI().toURL());
- }
- else
- {
- this.vfsRoot = (UnifiedVirtualFile)obj;
- }
- }
-
- private static void copyStreamAndClose(OutputStream outs, InputStream ins) throws IOException
- {
- try
- {
- byte[] bytes = new byte[1024];
- int r = ins.read(bytes);
- while (r > 0)
- {
- outs.write(bytes, 0, r);
- r = ins.read(bytes);
- }
- }
- catch (IOException e)
- {
- throw e;
- }
- finally{
- try {
- ins.close();
- } catch (Exception e) {}
- try {
- outs.close();
- } catch (Exception e) {}
- }
- }
-
public String toString()
{
StringBuilder str = new StringBuilder();
@@ -532,7 +443,6 @@
str.append("\n mappingFile=" + mappingFile);
str.append("\n configName=" + configName);
str.append("\n configFile=" + configFile);
- str.append("\n callProperties=" + callProperties);
str.append("\n addressingAnnotationSpecified=" + isAddressingAnnotationSpecified);
str.append("\n addressingEnabled=" + addressingEnabled);
str.append("\n addressingRequired=" + addressingRequired);
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedStubPropertyMetaData.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedStubPropertyMetaData.java 2012-11-15 13:55:24 UTC (rev 17001)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedStubPropertyMetaData.java 2012-11-16 13:50:10 UTC (rev 17002)
@@ -21,14 +21,15 @@
*/
package org.jboss.wsf.spi.metadata.j2ee.serviceref;
-import org.jboss.wsf.spi.serviceref.ServiceRefElement;
+import java.io.Serializable;
/**
* @author Thomas.Diesler(a)jboss.org
* @since 06-May-2004
*/
-public class UnifiedStubPropertyMetaData extends ServiceRefElement
+public class UnifiedStubPropertyMetaData implements Serializable
{
+ private static final long serialVersionUID = 1L;
// The required <prop-name> element
private String propName;
// The required <prop-value> element
Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinder.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinder.java 2012-11-15 13:55:24 UTC (rev 17001)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinder.java 2012-11-16 13:50:10 UTC (rev 17002)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.spi.serviceref;
-
-import javax.naming.Referenceable;
-
-import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
-
-/**
- * Creates a ServiceReferenceable and binds it to JNDI.
- *
- * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
- */
-public interface ServiceRefBinder
-{
- Referenceable createReferenceable(final UnifiedServiceRefMetaData serviceRef);
-}
Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinderFactory.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinderFactory.java 2012-11-15 13:55:24 UTC (rev 17001)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinderFactory.java 2012-11-16 13:50:10 UTC (rev 17002)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.spi.serviceref;
-
-import org.jboss.wsf.spi.SPIView;
-
-/**
- * @author Thomas.Diesler(a)jboss.com
- */
-public interface ServiceRefBinderFactory extends SPIView
-{
- ServiceRefBinder newServiceRefBinder(ServiceRefHandler.Type type);
-}
Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefElement.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefElement.java 2012-11-15 13:55:24 UTC (rev 17001)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefElement.java 2012-11-16 13:50:10 UTC (rev 17002)
@@ -1,34 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.spi.serviceref;
-
-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
-{
-}
Copied: spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefFactory.java (from rev 17001, spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefFactory.java)
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefFactory.java (rev 0)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefFactory.java 2012-11-16 13:50:10 UTC (rev 17002)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.spi.serviceref;
+
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
+
+/**
+ * Creates service ref instance.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public interface ServiceRefFactory
+{
+ Object newServiceRef(final UnifiedServiceRefMetaData serviceRef);
+}
Copied: spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefFactoryFactory.java (from rev 17001, spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefFactoryFactory.java)
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefFactoryFactory.java (rev 0)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefFactoryFactory.java 2012-11-16 13:50:10 UTC (rev 17002)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.spi.serviceref;
+
+import org.jboss.wsf.spi.SPIView;
+
+/**
+ * @author Thomas.Diesler(a)jboss.com
+ */
+public interface ServiceRefFactoryFactory extends SPIView
+{
+ ServiceRefFactory newServiceRefFactory();
+}
Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefHandler.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefHandler.java 2012-11-15 13:55:24 UTC (rev 17001)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefHandler.java 2012-11-16 13:50:10 UTC (rev 17002)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.spi.serviceref;
-
-import javax.naming.Referenceable;
-
-import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
-
-/**
- * An implementation of this interface handles all service-ref binding concerns.
- *
- * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
- */
-public interface ServiceRefHandler
-{
- enum Type
- {
- JAXRPC, JAXWS
- };
-
- Referenceable createReferenceable(UnifiedServiceRefMetaData serviceRefUMDM);
-}
Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefHandlerFactory.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefHandlerFactory.java 2012-11-15 13:55:24 UTC (rev 17001)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefHandlerFactory.java 2012-11-16 13:50:10 UTC (rev 17002)
@@ -1,29 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.spi.serviceref;
-
-import org.jboss.wsf.spi.SPIView;
-
-public interface ServiceRefHandlerFactory extends SPIView
-{
- ServiceRefHandler getServiceRefHandler();
-}
Copied: spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefType.java (from rev 17001, spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefType.java)
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefType.java (rev 0)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefType.java 2012-11-16 13:50:10 UTC (rev 17002)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.spi.serviceref;
+
+/**
+ * Creates a ServiceReferenceable and binds it to JNDI.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public enum ServiceRefType
+{
+ JAXRPC, JAXWS
+}
12 years, 1 month
- 1
- 0
JBossWS SVN: r17001 - spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2012-11-15 08:55:24 -0500 (Thu, 15 Nov 2012)
New Revision: 17001
Modified:
spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java
Log:
[JBWS-3565] implement lookup fallback to make most of the JAXRPC tests pass
Modified: spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java
===================================================================
--- spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2012-11-15 13:53:58 UTC (rev 17000)
+++ spi/branches/ropalka/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2012-11-15 13:55:24 UTC (rev 17001)
@@ -63,7 +63,6 @@
private String wsdlFile;
// The optional <jaxrpc-mapping-file> element
private String mappingFile;
- private URL mappingURL;
// The optional <service-qname> element
private QName serviceQName;
// The list <port-component-ref> elements
@@ -81,7 +80,6 @@
private String configFile;
// The optional URL of the actual WSDL to use, <wsdl-override>
private String wsdlOverride;
- private URL wsdlLocation;
// The optional <handler-chain> element. JAX-WS handler chain declared in the JBoss JavaEE5 descriptor
private String handlerChain;
// @Addressing annotation metadata
@@ -220,21 +218,26 @@
public void setMappingFile(String mappingFile)
{
- if (mappingFile != null) {
- try
- {
- mappingURL = vfsRoot.findChild(mappingFile).toURL();
- }
- catch (Exception e)
- {
- throw MESSAGES.cannotFindFile(e, mappingFile);
- }
- }
this.mappingFile = mappingFile;
}
public URL getMappingLocation()
{
+ URL mappingURL = null;
+ if (mappingFile != null) {
+ if (vfsRoot != null) {
+ try
+ {
+ mappingURL = vfsRoot.findChild(mappingFile).toURL();
+ }
+ catch (Exception e)
+ {
+ throw MESSAGES.cannotFindFile(e, mappingFile);
+ }
+ } else {
+ mappingURL = Thread.currentThread().getContextClassLoader().getResource(mappingFile);
+ }
+ }
return mappingURL;
}
@@ -322,15 +325,11 @@
public void setWsdlFile(String wsdlFile)
{
this.wsdlFile = wsdlFile;
- initWsdlLocation();
}
-
- public URL getWsdlLocation() {
- return wsdlLocation;
- }
- public void initWsdlLocation()
+ public URL getWsdlLocation()
{
+ URL wsdlLocation = null;
if (wsdlOverride != null)
{
try
@@ -339,14 +338,18 @@
}
catch (MalformedURLException e1)
{
- try
- {
- wsdlLocation = vfsRoot.findChild(wsdlOverride).toURL();
+ if (vfsRoot != null) {
+ try
+ {
+ wsdlLocation = vfsRoot.findChild(wsdlOverride).toURL();
+ }
+ catch (Exception e)
+ {
+ throw MESSAGES.cannotFindFile(e, wsdlOverride);
+ }
+ } else {
+ wsdlLocation = Thread.currentThread().getContextClassLoader().getResource(wsdlOverride);
}
- catch (Exception e)
- {
- throw MESSAGES.cannotFindFile(e, wsdlOverride);
- }
}
}
@@ -358,16 +361,21 @@
}
catch (MalformedURLException e1)
{
- try
- {
- wsdlLocation = vfsRoot.findChild(wsdlFile).toURL();
+ if (vfsRoot != null) {
+ try
+ {
+ wsdlLocation = vfsRoot.findChild(wsdlFile).toURL();
+ }
+ catch (Exception e)
+ {
+ throw MESSAGES.cannotFindFile(e, wsdlFile);
+ }
+ } else {
+ wsdlLocation = Thread.currentThread().getContextClassLoader().getResource(wsdlFile);
}
- catch (Exception e)
- {
- throw MESSAGES.cannotFindFile(e, wsdlFile);
- }
}
}
+ return wsdlLocation;
}
public String getConfigFile()
@@ -398,7 +406,6 @@
public void setWsdlOverride(String wsdlOverride)
{
this.wsdlOverride = wsdlOverride;
- initWsdlLocation();
}
public UnifiedHandlerChainsMetaData getHandlerChains()
12 years, 1 month
- 1
- 0
JBossWS SVN: r17000 - in stack/native/branches/ropalka/modules/testsuite/native-tests: src/test/java/org/jboss/test/ws/jaxrpc and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2012-11-15 08:53:58 -0500 (Thu, 15 Nov 2012)
New Revision: 17000
Removed:
stack/native/branches/ropalka/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws637/
stack/native/branches/ropalka/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/
stack/native/branches/ropalka/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws637/
stack/native/branches/ropalka/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/
Modified:
stack/native/branches/ropalka/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml
Log:
[JBWS-3565] removing obsolete tests
Modified: stack/native/branches/ropalka/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml
===================================================================
--- stack/native/branches/ropalka/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-11-15 13:50:24 UTC (rev 16999)
+++ stack/native/branches/ropalka/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-11-15 13:53:58 UTC (rev 17000)
@@ -1652,28 +1652,6 @@
</fileset>
</jar>
- <!-- jaxrpc-jbws637 -->
- <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws637-appclient.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxrpc/jbws637/*.class"/>
- <exclude name="org/jboss/test/ws/jaxrpc/jbws637/*TestCase.class"/>
- <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/>
- </fileset>
- <manifest>
- <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/>
- </manifest>
- <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws637/META-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="application-client.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
- <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws637-appclient.ear">
- <fileset dir="${tests.output.dir}/test-libs">
- <include name="jaxrpc-jbws637-appclient.jar"/>
- </fileset>
- </jar>
-
<!-- jaxrpc-jbws643 -->
<war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws643.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws643/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
@@ -2005,47 +1983,6 @@
</fileset>
</jar>
- <!-- jaxrpc-jbws723 -->
- <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-jbws723.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationService.class"/>
- <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationHome.class"/>
- <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationRemote.class"/>
- <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationImpl.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws723/META-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="ejb-jar.xml"/>
- <include name="jboss-ejb3.xml"/>
- <include name="jboss.xml"/>
- <include name="jboss-webservices.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
- <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-jbws723-appclient.jar">
- <fileset dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationService.class"/>
- <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationHome.class"/>
- <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationRemote.class"/>
- <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/>
- </fileset>
- <manifest>
- <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/>
- </manifest>
- <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws723/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
- <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws723-appclient.ear">
- <fileset dir="${tests.output.dir}/test-libs">
- <include name="jaxrpc-jbws723-appclient.jar"/>
- </fileset>
- </jar>
-
<!-- jaxrpc-jbws732 -->
<war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws732.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws732/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
12 years, 1 month
- 1
- 0
JBossWS SVN: r16999 - shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2012-11-15 08:50:24 -0500 (Thu, 15 Nov 2012)
New Revision: 16999
Removed:
shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/secureejb/
Log:
[JBWS-3565] removing obsolete test cases
12 years, 1 month
- 1
- 0
JBossWS SVN: r16998 - stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer.
by jbossws-commits＠lists.jboss.org
Author: rsvoboda(a)redhat.com
Date: 2012-11-15 07:12:12 -0500 (Thu, 15 Nov 2012)
New Revision: 16998
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/Install.txt
Log:
JBPAPP-5021 minor changes in TP reference
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/Install.txt
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/Install.txt 2012-11-15 09:45:52 UTC (rev 16997)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/src/main/installer/Install.txt 2012-11-15 12:12:12 UTC (rev 16998)
@@ -1,3 +1,3 @@
This is the JBossWS-CXF installer for JBoss EAP.
-Simply run "ant" from the jbossws-cxf-tp-installer dir you got after
-extracting the jbossws-cxf-installer.zip in your EAP JBOSS_HOME.
+Simply run "ant" from the jbossws-cxf-installer dir you got after
+extracting the jbossws-cxf-installer zip in your EAP JBOSS_HOME.
12 years, 1 month
- 1
- 0