riftsaw SVN: r1139 - branches/RiftSaw-ODE-2.1.x/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath10/runtime.
by riftsaw-commits@lists.jboss.org
Author: jeff.yuchang
Date: 2010-11-23 23:14:27 -0500 (Tue, 23 Nov 2010)
New Revision: 1139
Modified:
branches/RiftSaw-ODE-2.1.x/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath10/runtime/JaxenContexts.java
Log:
* RIFTSAW-312, return boolean value for xsd:boolean data type.
Modified: branches/RiftSaw-ODE-2.1.x/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath10/runtime/JaxenContexts.java
===================================================================
--- branches/RiftSaw-ODE-2.1.x/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath10/runtime/JaxenContexts.java 2010-11-23 13:58:05 UTC (rev 1138)
+++ branches/RiftSaw-ODE-2.1.x/bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath10/runtime/JaxenContexts.java 2010-11-24 04:14:27 UTC (rev 1139)
@@ -68,6 +68,8 @@
/** Static, thread-safe singleton implementing default XPath functions */
private static final FunctionContext __defaultXPathFunctions = XPathFunctionContext.getInstance();
+
+ private static final QName BOOLEAN = new QName("http://www.w3.org/2001/XMLSchema", "boolean");
private OXPath10Expression _oxpath;
private EvaluationContext _xpathEvalCtx;
@@ -186,7 +188,13 @@
}
if (_xpathEvalCtx.narrowTypes() && type instanceof OXsdTypeVarType && ((OXsdTypeVarType)type).simple) {
- return variableNode.getTextContent();
+ String value = variableNode.getTextContent();
+ OXsdTypeVarType theType = (OXsdTypeVarType)type;
+
+ if (BOOLEAN.equals(theType.xsdType)) {
+ return new Boolean(value) ;
+ }
+ return value;
} else {
return variableNode;
}
14 years, 3 months
riftsaw SVN: r1138 - in trunk: console/integration/src/main/java/org/jboss/soa/bpel/console and 15 other directories.
by riftsaw-commits@lists.jboss.org
Author: objectiser
Date: 2010-11-23 08:58:05 -0500 (Tue, 23 Nov 2010)
New Revision: 1138
Added:
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/JBossWSCXFBuildProcessor.java
Modified:
trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/SVGPlugin.java
trunk/distribution/src/main/release/db/jboss/jboss-beans.xml
trunk/pom.xml
trunk/runtime/clustering/src/main/resources/META-INF/jboss-beans.xml
trunk/runtime/engine-assembly/src/main/assembly/sar.xml
trunk/runtime/engine/pom.xml
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/BPELEngine.java
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/UDDIRegistration.java
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ODEMessageAdapter.java
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ODEServiceEndpointReference.java
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ODEWebServiceFactory.java
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WSDLHelper.java
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java
trunk/runtime/engine/src/test/java/riftsaw124/Riftsaw124TestCase.java
trunk/runtime/engine/src/test/java/riftsaw277/Riftsaw277TestCase.java
trunk/runtime/jbossesb-bpel-assembly/src/main/assembly/esb.xml
trunk/runtime/jbossesb-bpel/pom.xml
trunk/runtime/jbossesb-bpel/src/main/java/org/jboss/internal/soa/esb/actions/bpel/ESBInvocationAdapter.java
trunk/runtime/jbossesb-bpel/src/test/java/org/jboss/soa/esb/actions/bpel/TestBPELEngine.java
trunk/runtime/uddi/pom.xml
trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java
Log:
Changed dwsp package/artifact to dsp, to be web service independent.
Modified: trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/SVGPlugin.java
===================================================================
--- trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/SVGPlugin.java 2010-11-23 13:54:42 UTC (rev 1137)
+++ trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/SVGPlugin.java 2010-11-23 13:58:05 UTC (rev 1138)
@@ -29,8 +29,8 @@
import org.jboss.soa.bpel.bpel2svg.BPEL2SVGUtil;
import org.jboss.soa.bpel.runtime.engine.BPELEngine;
import org.jboss.soa.bpel.runtime.engine.ode.BPELEngineImpl;
-import org.jboss.soa.dwsp.server.ServerConfig;
-import org.jboss.soa.dwsp.server.jboss.ServerConfigFactory;
+import org.jboss.soa.dsp.server.ServerConfig;
+import org.jboss.soa.dsp.server.jboss.ServerConfigFactory;
import org.wso2.carbon.bpel.ui.bpel2svg.ActivityInterface;
import org.wso2.carbon.bpel.ui.bpel2svg.SVGInterface;
Modified: trunk/distribution/src/main/release/db/jboss/jboss-beans.xml
===================================================================
--- trunk/distribution/src/main/release/db/jboss/jboss-beans.xml 2010-11-23 13:54:42 UTC (rev 1137)
+++ trunk/distribution/src/main/release/db/jboss/jboss-beans.xml 2010-11-23 13:58:05 UTC (rev 1138)
@@ -24,7 +24,7 @@
Locate the single instance of the kernel
-->
<bean name="org.jboss.soa.bpel.runtime.util:service=KernelLocator"
- class="org.jboss.soa.dwsp.server.jboss.KernelLocator">
+ class="org.jboss.soa.dsp.server.jboss.KernelLocator">
<property name="kernel">
<inject bean="jboss.kernel:service=Kernel" />
</property>
@@ -34,7 +34,7 @@
ServerConfig
-->
<bean name="org.jboss.soa.bpel.runtime.util:service=ServerConfig"
- class="org.jboss.soa.dwsp.server.jboss.ServerConfigImpl">
+ class="org.jboss.soa.dsp.server.jboss.ServerConfigImpl">
<property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
<property name="webServiceHost">${jboss.bind.address}</property>
</bean>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-11-23 13:54:42 UTC (rev 1137)
+++ trunk/pom.xml 2010-11-23 13:58:05 UTC (rev 1138)
@@ -111,7 +111,7 @@
<axiom.version>1.2.8</axiom.version>
<commons.codec.version>1.4</commons.codec.version>
<picketlink.version>1.0.3.final</picketlink.version>
- <dwsp.version>1.0.0-SNAPSHOT</dwsp.version>
+ <dsp.version>1.0.0-SNAPSHOT</dsp.version>
</properties>
<dependencyManagement>
@@ -231,8 +231,8 @@
</dependency>
<dependency>
<groupId>org.jboss.soa</groupId>
- <artifactId>dwsp</artifactId>
- <version>${dwsp.version}</version>
+ <artifactId>dsp</artifactId>
+ <version>${dsp.version}</version>
</dependency>
<!-- ODE1.3.3 dependencies -->
<dependency>
Modified: trunk/runtime/clustering/src/main/resources/META-INF/jboss-beans.xml
===================================================================
--- trunk/runtime/clustering/src/main/resources/META-INF/jboss-beans.xml 2010-11-23 13:54:42 UTC (rev 1137)
+++ trunk/runtime/clustering/src/main/resources/META-INF/jboss-beans.xml 2010-11-23 13:58:05 UTC (rev 1138)
@@ -25,7 +25,7 @@
Locate the single instance of the kernel
-->
<bean name="org.jboss.soa.bpel.runtime.util:service=KernelLocator"
- class="org.jboss.soa.dwsp.server.jboss.KernelLocator">
+ class="org.jboss.soa.dsp.server.jboss.KernelLocator">
<property name="kernel">
<inject bean="jboss.kernel:service=Kernel" />
</property>
@@ -35,7 +35,7 @@
ServerConfig
-->
<bean name="org.jboss.soa.bpel.runtime.util:service=ServerConfig"
- class="org.jboss.soa.dwsp.server.jboss.ServerConfigImpl">
+ class="org.jboss.soa.dsp.server.jboss.ServerConfigImpl">
<property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
<property name="webServiceHost">${jboss.bind.address}</property>
<property name="clusterNodeName"><inject bean="HAPartition" property="nodeName" /></property>
Modified: trunk/runtime/engine/pom.xml
===================================================================
--- trunk/runtime/engine/pom.xml 2010-11-23 13:54:42 UTC (rev 1137)
+++ trunk/runtime/engine/pom.xml 2010-11-23 13:58:05 UTC (rev 1138)
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.jboss.soa</groupId>
- <artifactId>dwsp</artifactId>
+ <artifactId>dsp</artifactId>
</dependency>
<!-- ODE2 dependencies
Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/BPELEngine.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/BPELEngine.java 2010-11-23 13:54:42 UTC (rev 1137)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/BPELEngine.java 2010-11-23 13:58:05 UTC (rev 1138)
@@ -17,8 +17,8 @@
*/
package org.jboss.soa.bpel.runtime.engine;
-import org.jboss.soa.dwsp.InvocationAdapter;
-import org.jboss.soa.dwsp.ServiceProvider;
+import org.jboss.soa.dsp.InvocationAdapter;
+import org.jboss.soa.dsp.ServiceProvider;
/**
* This interface represents a BPEL engine.
Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java 2010-11-23 13:54:42 UTC (rev 1137)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java 2010-11-23 13:58:05 UTC (rev 1138)
@@ -42,8 +42,8 @@
import org.apache.ode.utils.Properties;
import org.jboss.soa.bpel.runtime.engine.BPELEngine;
import org.jboss.soa.bpel.runtime.ws.ODEMessageAdapter;
-import org.jboss.soa.dwsp.InvocationAdapter;
-import org.jboss.soa.dwsp.server.jboss.ServerConfigFactory;
+import org.jboss.soa.dsp.InvocationAdapter;
+import org.jboss.soa.dsp.server.jboss.ServerConfigFactory;
import org.w3c.dom.Element;
import javax.transaction.*;
Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java 2010-11-23 13:54:42 UTC (rev 1137)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java 2010-11-23 13:58:05 UTC (rev 1138)
@@ -22,9 +22,9 @@
import org.apache.ode.bpel.iapi.*;
import org.jboss.soa.bpel.runtime.engine.PartnerChannel;
import org.jboss.soa.bpel.runtime.ws.*;
-import org.jboss.soa.dwsp.EndpointMetaData;
-import org.jboss.soa.dwsp.server.jboss.ServerConfigFactory;
-import org.jboss.soa.dwsp.ws.WSDLReference;
+import org.jboss.soa.dsp.EndpointMetaData;
+import org.jboss.soa.dsp.server.jboss.ServerConfigFactory;
+import org.jboss.soa.dsp.ws.WSDLReference;
import javax.wsdl.Definition;
Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/UDDIRegistration.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/UDDIRegistration.java 2010-11-23 13:54:42 UTC (rev 1137)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/UDDIRegistration.java 2010-11-23 13:58:05 UTC (rev 1138)
@@ -25,7 +25,7 @@
import javax.xml.namespace.QName;
-import org.jboss.soa.dwsp.ws.WSDLReference;
+import org.jboss.soa.dsp.ws.WSDLReference;
/**
*
Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java 2010-11-23 13:54:42 UTC (rev 1137)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java 2010-11-23 13:58:05 UTC (rev 1138)
@@ -40,17 +40,17 @@
import org.jboss.soa.bpel.runtime.engine.ode.ExecutionEnvironment;
import org.jboss.soa.bpel.runtime.engine.ode.UDDIClientFactory;
import org.jboss.soa.bpel.runtime.engine.ode.UDDIRegistration;
-import org.jboss.soa.dwsp.EndpointMetaData;
-import org.jboss.soa.dwsp.ServiceEndpointReference;
-import org.jboss.soa.dwsp.deployer.jboss.JBossServiceDeployer;
-import org.jboss.soa.dwsp.server.ServerConfig;
-import org.jboss.soa.dwsp.server.jboss.KernelLocator;
-import org.jboss.soa.dwsp.server.jboss.ServerConfigFactory;
-import org.jboss.soa.dwsp.ws.BaseWebServiceEndpoint;
-import org.jboss.soa.dwsp.ws.DeploymentBuilder;
-import org.jboss.soa.dwsp.ws.WSDLParser;
-import org.jboss.soa.dwsp.ws.WSDLReference;
-import org.jboss.soa.dwsp.ws.WebServiceProviderGenerator;
+import org.jboss.soa.dsp.EndpointMetaData;
+import org.jboss.soa.dsp.ServiceEndpointReference;
+import org.jboss.soa.dsp.deployer.jboss.JBossServiceDeployer;
+import org.jboss.soa.dsp.server.ServerConfig;
+import org.jboss.soa.dsp.server.jboss.KernelLocator;
+import org.jboss.soa.dsp.server.jboss.ServerConfigFactory;
+import org.jboss.soa.dsp.ws.BaseWebServiceEndpoint;
+import org.jboss.soa.dsp.ws.DeploymentBuilder;
+import org.jboss.soa.dsp.ws.WSDLParser;
+import org.jboss.soa.dsp.ws.WSDLReference;
+import org.jboss.soa.dsp.ws.WebServiceProviderGenerator;
import org.jboss.virtual.VFS;
import org.jboss.virtual.VirtualFile;
@@ -66,7 +66,7 @@
* This instance is stateful and retains references to both endpoints and clients.
* As such it should only exists once.
*
- * @see org.jboss.soa.dwsp.ws.BaseWebServiceEndpoint
+ * @see org.jboss.soa.dsp.ws.BaseWebServiceEndpoint
* @see org.jboss.soa.bpel.runtime.ws.WebServiceClient
* @see org.jboss.soa.bpel.runtime.engine.ode.JAXWSBindingContext
*
@@ -133,24 +133,18 @@
// Check if a handler file has been specified
File handlerFile=new File(root, "jws_handlers.xml");
+ String handlerFilePath=null;
- if (handlerFile.exists() == false) {
- handlerFile = null;
+ if (handlerFile.exists()) {
+ handlerFilePath = "/"+handlerFile.getName();
}
// generate provider impl
WebServiceProviderGenerator providerFactory = new WebServiceProviderGenerator();
BaseWebServiceEndpoint providerImpl =
- providerFactory.createProvider(
- metaData.getServiceName(),
- metaData.getPortName(),
- metaData.getEndpointId(),
- wsdlRef,
- classLoader,
- handlerFile,
- ODEWebServiceFactory.class
- );
+ providerFactory.createProvider(metaData, wsdlRef, classLoader,
+ handlerFilePath, ODEWebServiceFactory.class);
log.debug("Created dynamic endpoint class " + providerImpl.getClass().getName());
@@ -159,6 +153,7 @@
.setEndpoint(metaData.getEndpointId())
.setWSDL(wsdlFile, root)
.setProvider(providerImpl)
+ .process(new JBossWSCXFBuildProcessor(providerImpl))
.build();
if (!stableInterface) {
Added: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/JBossWSCXFBuildProcessor.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/JBossWSCXFBuildProcessor.java (rev 0)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/JBossWSCXFBuildProcessor.java 2010-11-23 13:58:05 UTC (rev 1138)
@@ -0,0 +1,87 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * 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,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.soa.bpel.runtime.ws;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+/**
+ * This build processor implementation sets the JAXWS web service provider class
+ * name in the JBossWS CXF configuration file, in one has been defined.
+ *
+ */
+public class JBossWSCXFBuildProcessor implements org.jboss.soa.dsp.ws.BuildProcessor {
+
+ private javax.xml.ws.Provider<?> provider;
+
+ public JBossWSCXFBuildProcessor(javax.xml.ws.Provider<?> provider) {
+ this.provider = provider;
+ }
+
+ public void process(File war, File webInf, File wsdlDir) {
+ // Check if jbossws-cxf.xml is present, and if so, updated the provider implementation class attribute
+ File f=new File(webInf, "jbossws-cxf.xml");
+
+ if (f.exists()) {
+ FileInputStream fis=null;
+ FileOutputStream fos=null;
+
+ try {
+ fis=new FileInputStream(f);
+
+ byte[] b=new byte[fis.available()];
+ fis.read(b);
+
+ String str=new String(b);
+
+ fis.close();
+ fis = null;
+
+ if (str.indexOf("@provider@") != -1) {
+ fos=new FileOutputStream(f);
+
+ str = str.replaceAll("@provider@", provider.getClass().getName());
+
+ fos.write(str.getBytes());
+
+ fos.flush();
+ fos.close();
+
+ fos = null;
+ } else {
+ // Report error
+ System.err.println("jbossws-cxf.xml file does not contain @provider@ field");
+ }
+
+ } catch (IOException e) {
+ throw new RuntimeException("Failed to copy files", e);
+ } finally {
+ try {
+ if (fis != null) fis.close();
+ } catch (IOException e) {
+ }
+ try {
+ if (fos != null) fos.close();
+ } catch (IOException e) {
+ }
+ }
+ }
+ }
+}
Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ODEMessageAdapter.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ODEMessageAdapter.java 2010-11-23 13:54:42 UTC (rev 1137)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ODEMessageAdapter.java 2010-11-23 13:58:05 UTC (rev 1138)
@@ -18,7 +18,7 @@
package org.jboss.soa.bpel.runtime.ws;
import org.apache.ode.bpel.iapi.Message;
-import org.jboss.soa.dwsp.MessageAdapter;
+import org.jboss.soa.dsp.MessageAdapter;
public class ODEMessageAdapter implements MessageAdapter {
Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ODEServiceEndpointReference.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ODEServiceEndpointReference.java 2010-11-23 13:54:42 UTC (rev 1137)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ODEServiceEndpointReference.java 2010-11-23 13:58:05 UTC (rev 1138)
@@ -23,7 +23,7 @@
import org.apache.ode.bpel.iapi.EndpointReference;
import org.w3c.dom.Document;
-import org.jboss.soa.dwsp.ServiceEndpointReference;
+import org.jboss.soa.dsp.ServiceEndpointReference;
/**
* References webservice endpoint deployment properties.
Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ODEWebServiceFactory.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ODEWebServiceFactory.java 2010-11-23 13:54:42 UTC (rev 1137)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ODEWebServiceFactory.java 2010-11-23 13:58:05 UTC (rev 1138)
@@ -22,10 +22,10 @@
import javax.xml.namespace.QName;
import org.jboss.soa.bpel.runtime.engine.BPELEngine;
-import org.jboss.soa.dwsp.ServiceProvider;
-import org.jboss.soa.dwsp.ws.SOAPMessageAdapter;
-import org.jboss.soa.dwsp.ws.WSInvocationAdapter;
-import org.jboss.soa.dwsp.ws.WebServiceProviderFactory;
+import org.jboss.soa.dsp.ServiceProvider;
+import org.jboss.soa.dsp.ws.SOAPMessageAdapter;
+import org.jboss.soa.dsp.ws.WSInvocationAdapter;
+import org.jboss.soa.dsp.ws.WebServiceProviderFactory;
public class ODEWebServiceFactory implements WebServiceProviderFactory {
Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WSDLHelper.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WSDLHelper.java 2010-11-23 13:54:42 UTC (rev 1137)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WSDLHelper.java 2010-11-23 13:58:05 UTC (rev 1138)
@@ -14,8 +14,8 @@
import org.apache.ode.bpel.iapi.ContextException;
import org.apache.ode.bpel.iapi.ProcessConf;
import org.jboss.soa.bpel.runtime.engine.ode.BPELEngineImpl;
-import org.jboss.soa.dwsp.ws.WSDLParser;
-import org.jboss.soa.dwsp.ws.WSDLReference;
+import org.jboss.soa.dsp.ws.WSDLParser;
+import org.jboss.soa.dsp.ws.WSDLReference;
public class WSDLHelper {
Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java 2010-11-23 13:54:42 UTC (rev 1137)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java 2010-11-23 13:58:05 UTC (rev 1138)
@@ -52,12 +52,12 @@
import org.jboss.soa.bpel.runtime.engine.ode.ExecutionEnvironment;
import org.jboss.soa.bpel.runtime.engine.ode.UDDIClientFactory;
import org.jboss.soa.bpel.runtime.engine.ode.UDDIRegistration;
-import org.jboss.soa.dwsp.EndpointMetaData;
-import org.jboss.soa.dwsp.server.jboss.ServerConfigFactory;
-import org.jboss.soa.dwsp.ws.DOMWriter;
-import org.jboss.soa.dwsp.ws.JavaUtils;
-import org.jboss.soa.dwsp.ws.SOAPMessageAdapter;
-import org.jboss.soa.dwsp.ws.WSDLReference;
+import org.jboss.soa.dsp.EndpointMetaData;
+import org.jboss.soa.dsp.server.jboss.ServerConfigFactory;
+import org.jboss.soa.dsp.ws.DOMWriter;
+import org.jboss.soa.dsp.ws.JavaUtils;
+import org.jboss.soa.dsp.ws.SOAPMessageAdapter;
+import org.jboss.soa.dsp.ws.WSDLReference;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: trunk/runtime/engine/src/test/java/riftsaw124/Riftsaw124TestCase.java
===================================================================
--- trunk/runtime/engine/src/test/java/riftsaw124/Riftsaw124TestCase.java 2010-11-23 13:54:42 UTC (rev 1137)
+++ trunk/runtime/engine/src/test/java/riftsaw124/Riftsaw124TestCase.java 2010-11-23 13:58:05 UTC (rev 1138)
@@ -23,7 +23,7 @@
import junit.framework.TestCase;
-import org.jboss.soa.dwsp.ws.WSDLParser;
+import org.jboss.soa.dsp.ws.WSDLParser;
import javax.wsdl.Definition;
import javax.wsdl.Operation;
Modified: trunk/runtime/engine/src/test/java/riftsaw277/Riftsaw277TestCase.java
===================================================================
--- trunk/runtime/engine/src/test/java/riftsaw277/Riftsaw277TestCase.java 2010-11-23 13:54:42 UTC (rev 1137)
+++ trunk/runtime/engine/src/test/java/riftsaw277/Riftsaw277TestCase.java 2010-11-23 13:58:05 UTC (rev 1138)
@@ -23,7 +23,7 @@
import javax.xml.soap.SOAPMessage;
-import org.jboss.soa.dwsp.ws.SOAPMessageAdapter;
+import org.jboss.soa.dsp.ws.SOAPMessageAdapter;
import junit.framework.TestCase;
Modified: trunk/runtime/engine-assembly/src/main/assembly/sar.xml
===================================================================
--- trunk/runtime/engine-assembly/src/main/assembly/sar.xml 2010-11-23 13:54:42 UTC (rev 1137)
+++ trunk/runtime/engine-assembly/src/main/assembly/sar.xml 2010-11-23 13:58:05 UTC (rev 1138)
@@ -57,7 +57,7 @@
<include>org.jboss.soa.bpel:riftsaw-dao-jpa-hibernate</include>
<!--include>org.jboss.soa.bpel:riftsaw-dao-hibernate</include-->
<include>org.jboss.soa.bpel.runtime:riftsaw-engine</include>
- <include>org.jboss.soa:dwsp</include>
+ <include>org.jboss.soa:dsp</include>
<include>org.jboss.soa.bpel:riftsaw-jacob</include>
<include>org.jboss.soa.bpel:riftsaw-scheduler-simple</include>
<include>org.jboss.soa.bpel.runtime:riftsaw-uddi</include>
Modified: trunk/runtime/jbossesb-bpel/pom.xml
===================================================================
--- trunk/runtime/jbossesb-bpel/pom.xml 2010-11-23 13:54:42 UTC (rev 1137)
+++ trunk/runtime/jbossesb-bpel/pom.xml 2010-11-23 13:58:05 UTC (rev 1138)
@@ -22,7 +22,7 @@
</dependency>
<dependency>
<groupId>org.jboss.soa</groupId>
- <artifactId>dwsp</artifactId>
+ <artifactId>dsp</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.soa.bpel.dependencies.esb</groupId>
Modified: trunk/runtime/jbossesb-bpel/src/main/java/org/jboss/internal/soa/esb/actions/bpel/ESBInvocationAdapter.java
===================================================================
--- trunk/runtime/jbossesb-bpel/src/main/java/org/jboss/internal/soa/esb/actions/bpel/ESBInvocationAdapter.java 2010-11-23 13:54:42 UTC (rev 1137)
+++ trunk/runtime/jbossesb-bpel/src/main/java/org/jboss/internal/soa/esb/actions/bpel/ESBInvocationAdapter.java 2010-11-23 13:58:05 UTC (rev 1138)
@@ -21,8 +21,8 @@
*/
package org.jboss.internal.soa.esb.actions.bpel;
-import org.jboss.soa.dwsp.InvocationAdapter;
-import org.jboss.soa.dwsp.MessageAdapter;
+import org.jboss.soa.dsp.InvocationAdapter;
+import org.jboss.soa.dsp.MessageAdapter;
import org.w3c.dom.Element;
import javax.xml.namespace.QName;
Modified: trunk/runtime/jbossesb-bpel/src/test/java/org/jboss/soa/esb/actions/bpel/TestBPELEngine.java
===================================================================
--- trunk/runtime/jbossesb-bpel/src/test/java/org/jboss/soa/esb/actions/bpel/TestBPELEngine.java 2010-11-23 13:54:42 UTC (rev 1137)
+++ trunk/runtime/jbossesb-bpel/src/test/java/org/jboss/soa/esb/actions/bpel/TestBPELEngine.java 2010-11-23 13:58:05 UTC (rev 1138)
@@ -20,7 +20,7 @@
import org.jboss.internal.soa.esb.actions.bpel.ESBInvocationAdapter;
import org.jboss.soa.bpel.runtime.engine.BPELEngine;
-import org.jboss.soa.dwsp.InvocationAdapter;
+import org.jboss.soa.dsp.InvocationAdapter;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import javax.xml.namespace.QName;
Modified: trunk/runtime/jbossesb-bpel-assembly/src/main/assembly/esb.xml
===================================================================
--- trunk/runtime/jbossesb-bpel-assembly/src/main/assembly/esb.xml 2010-11-23 13:54:42 UTC (rev 1137)
+++ trunk/runtime/jbossesb-bpel-assembly/src/main/assembly/esb.xml 2010-11-23 13:58:05 UTC (rev 1138)
@@ -41,7 +41,7 @@
<outputDirectory>/lib</outputDirectory>
<includes>
<include>org.jboss.soa.bpel.runtime:riftsaw-engine</include>
- <include>org.jboss.soa:dwsp</include>
+ <include>org.jboss.soa:dsp</include>
<include>org.jboss.soa.bpel.dependencies.esb:jbossesb-rosetta</include>
<include>org.jboss.soa.bpel:riftsaw-agents</include>
<include>org.jboss.soa.bpel:riftsaw-bpel-runtime</include>
Modified: trunk/runtime/uddi/pom.xml
===================================================================
--- trunk/runtime/uddi/pom.xml 2010-11-23 13:54:42 UTC (rev 1137)
+++ trunk/runtime/uddi/pom.xml 2010-11-23 13:58:05 UTC (rev 1138)
@@ -37,7 +37,7 @@
</dependency>
<dependency>
<groupId>org.jboss.soa</groupId>
- <artifactId>dwsp</artifactId>
+ <artifactId>dsp</artifactId>
</dependency>
<dependency>
Modified: trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java
===================================================================
--- trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java 2010-11-23 13:54:42 UTC (rev 1137)
+++ trunk/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/UDDIRegistrationImpl.java 2010-11-23 13:58:05 UTC (rev 1138)
@@ -46,8 +46,8 @@
import org.apache.juddi.v3.client.transport.TransportException;
import org.jboss.soa.bpel.runtime.engine.ode.UDDIRegistration;
import org.jboss.soa.bpel.runtime.ws.WebServiceClient;
-import org.jboss.soa.dwsp.server.jboss.ServerConfigFactory;
-import org.jboss.soa.dwsp.ws.WSDLReference;
+import org.jboss.soa.dsp.server.jboss.ServerConfigFactory;
+import org.jboss.soa.dsp.ws.WSDLReference;
import org.uddi.api_v3.AccessPoint;
import org.uddi.api_v3.BindingTemplate;
import org.uddi.api_v3.BindingTemplates;
14 years, 3 months
riftsaw SVN: r1137 - dsp/trunk/src/main/java/org/jboss/soa/dsp/ws.
by riftsaw-commits@lists.jboss.org
Author: objectiser
Date: 2010-11-23 08:54:42 -0500 (Tue, 23 Nov 2010)
New Revision: 1137
Added:
dsp/trunk/src/main/java/org/jboss/soa/dsp/ws/BuildProcessor.java
Modified:
dsp/trunk/src/main/java/org/jboss/soa/dsp/ws/DeploymentBuilder.java
dsp/trunk/src/main/java/org/jboss/soa/dsp/ws/WebServiceProviderGenerator.java
Log:
Update interface for generator, and enable a 'build processor' to be processed when building the deployment, as a means of performing platform specific steps.
Added: dsp/trunk/src/main/java/org/jboss/soa/dsp/ws/BuildProcessor.java
===================================================================
--- dsp/trunk/src/main/java/org/jboss/soa/dsp/ws/BuildProcessor.java (rev 0)
+++ dsp/trunk/src/main/java/org/jboss/soa/dsp/ws/BuildProcessor.java 2010-11-23 13:54:42 UTC (rev 1137)
@@ -0,0 +1,26 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * 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,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.soa.dsp.ws;
+
+import java.io.File;
+
+public interface BuildProcessor {
+
+ public void process(File war, File webInf, File wsdl);
+
+}
Modified: dsp/trunk/src/main/java/org/jboss/soa/dsp/ws/DeploymentBuilder.java
===================================================================
--- dsp/trunk/src/main/java/org/jboss/soa/dsp/ws/DeploymentBuilder.java 2010-11-23 11:02:48 UTC (rev 1136)
+++ dsp/trunk/src/main/java/org/jboss/soa/dsp/ws/DeploymentBuilder.java 2010-11-23 13:54:42 UTC (rev 1137)
@@ -27,12 +27,13 @@
public class DeploymentBuilder
{
- private static final String SI = "si";
+ private static final String DSP = "dsp";
private File war;
private File webInf;
private File wsdlDir;
- private DeploymentBuilder instance;
+
+ private javax.xml.ws.Provider<?> provider;
private ServerConfig serverConfig;
@@ -43,10 +44,10 @@
public DeploymentBuilder setEndpoint(String endpointId)
{
- File tmpDir = new File(serverConfig.getServerTempDir(), SI);
+ File tmpDir = new File(serverConfig.getServerTempDir(), DSP);
tmpDir.mkdir();
- File fakeWebApp = new File(tmpDir, SI+"-"+endpointId+".war");
+ File fakeWebApp = new File(tmpDir, DSP+"-"+endpointId+".war");
File fakeWebInf = new File(fakeWebApp, "WEB-INF");
fakeWebInf.mkdirs();
@@ -103,56 +104,15 @@
}
public DeploymentBuilder setProvider(javax.xml.ws.Provider<?> provider) {
+ this.provider = provider;
- // Check if jbossws-cxf.xml is present, and if so, updated the provider implementation class attribute
- File f=new File(this.webInf, "jbossws-cxf.xml");
+ return(this);
+ }
+
+ public DeploymentBuilder process(BuildProcessor processor) {
+ processor.process(this.war, this.webInf, this.wsdlDir);
- if (f.exists()) {
- FileInputStream fis=null;
- FileOutputStream fos=null;
-
- try {
- fis=new FileInputStream(f);
-
- byte[] b=new byte[fis.available()];
- fis.read(b);
-
- String str=new String(b);
-
- fis.close();
- fis = null;
-
- if (str.indexOf("@provider@") != -1) {
- fos=new FileOutputStream(f);
-
- str = str.replaceAll("@provider@", provider.getClass().getName());
-
- fos.write(str.getBytes());
-
- fos.flush();
- fos.close();
-
- fos = null;
- } else {
- // Report error
- System.err.println("jbossws-cxf.xml file does not contain @provider@ field");
- }
-
- } catch (IOException e) {
- throw new RuntimeException("Failed to copy files", e);
- } finally {
- try {
- if (fis != null) fis.close();
- } catch (IOException e) {
- }
- try {
- if (fos != null) fos.close();
- } catch (IOException e) {
- }
- }
- }
-
- return this;
+ return(this);
}
public File build()
Modified: dsp/trunk/src/main/java/org/jboss/soa/dsp/ws/WebServiceProviderGenerator.java
===================================================================
--- dsp/trunk/src/main/java/org/jboss/soa/dsp/ws/WebServiceProviderGenerator.java 2010-11-23 11:02:48 UTC (rev 1136)
+++ dsp/trunk/src/main/java/org/jboss/soa/dsp/ws/WebServiceProviderGenerator.java 2010-11-23 13:54:42 UTC (rev 1137)
@@ -31,7 +31,9 @@
import javax.xml.namespace.QName;
+import org.jboss.soa.dsp.EndpointMetaData;
+
/**
* Creates JAX-WS Provider classes using javassist.
* These provider classes can then be deployed to JBossWS in memory.<p>
@@ -45,11 +47,10 @@
private final static String PKG_PREFIX = WebServiceProviderGenerator.class.getPackage().getName()+".generated.";
public BaseWebServiceEndpoint createProvider(
- QName service, String port,
- String endpointId,
+ EndpointMetaData metaData,
WSDLReference wsdlRef,
ClassLoader loader,
- java.io.File handlerFile,
+ String handlerFilePath,
Class<? extends WebServiceProviderFactory> providerFactory
)
throws Exception
@@ -64,7 +65,7 @@
CtClass stringType = pool.get("java.lang.String");
- String implClassName = PKG_PREFIX+"WebServiceEndpoint_"+endpointId;
+ String implClassName = PKG_PREFIX+"WebServiceEndpoint_"+metaData.getEndpointId();
//CtClass impl = pool.makeClass(implClassName);
// Load an existing class representing the template for a Web Service provider
@@ -78,12 +79,12 @@
// AbstractWebServiceEndpoint.endpointId property
CtField idField = new CtField(stringType, "endpointId", impl);
idField.setModifiers(Modifier.PUBLIC);
- impl.addField(idField, "\""+endpointId+"\"");
+ impl.addField(idField, "\""+metaData.getEndpointId()+"\"");
// AbstractWebServiceEndpoint.serviceName property
CtField serviceField = new CtField(stringType, "serviceName", impl);
serviceField.setModifiers(Modifier.PUBLIC);
- impl.addField(serviceField, "\""+service.toString()+"\"");
+ impl.addField(serviceField, "\""+metaData.getServiceName().toString()+"\"");
// AbstractWebServiceEndpoint.wsdlLocation property
CtField wsdlLocationField = new CtField(stringType, "wsdlLocation", impl);
@@ -93,7 +94,7 @@
// AbstractWebServiceEndpoint.portName property
CtField portNameField = new CtField(stringType, "portName", impl);
portNameField.setModifiers(Modifier.PUBLIC);
- impl.addField(portNameField, "\""+port+"\"");
+ impl.addField(portNameField, "\""+metaData.getPortName()+"\"");
// Annotations
ClassFile classFile = impl.getClassFile();
@@ -118,15 +119,15 @@
providerAnnotation.addMemberValue(
"serviceName",
- new StringMemberValue(service.getLocalPart(), constantPool)
+ new StringMemberValue(metaData.getServiceName().getLocalPart(), constantPool)
);
providerAnnotation.addMemberValue(
"portName",
- new StringMemberValue(port, constantPool)
+ new StringMemberValue(metaData.getPortName(), constantPool)
);
providerAnnotation.addMemberValue(
"targetNamespace",
- new StringMemberValue(service.getNamespaceURI(), constantPool)
+ new StringMemberValue(metaData.getServiceName().getNamespaceURI(), constantPool)
);
providerAnnotation.addMemberValue(
"wsdlLocation",
@@ -158,11 +159,11 @@
// Check if handler chain should be established
- if (handlerFile != null) {
+ if (handlerFilePath != null) {
Annotation handlerChain = new Annotation("javax.jws.HandlerChain", constantPool);
handlerChain.addMemberValue("file",
- new StringMemberValue("/"+handlerFile.getName(), constantPool));
+ new StringMemberValue(handlerFilePath, constantPool));
attr.addAnnotation(handlerChain);
}
14 years, 3 months
riftsaw SVN: r1136 - /.
by riftsaw-commits@lists.jboss.org
Author: objectiser
Date: 2010-11-23 06:02:48 -0500 (Tue, 23 Nov 2010)
New Revision: 1136
Added:
dsp/
Removed:
dwsp/
Log:
Rename module, as may not remain web service specific.
Copied: dsp (from rev 1135, dwsp)
14 years, 3 months
riftsaw SVN: r1135 - in dwsp/trunk: src/main/java/org/jboss/soa and 9 other directories.
by riftsaw-commits@lists.jboss.org
Author: objectiser
Date: 2010-11-23 06:00:41 -0500 (Tue, 23 Nov 2010)
New Revision: 1135
Added:
dwsp/trunk/src/main/java/org/jboss/soa/dsp/
dwsp/trunk/src/main/java/org/jboss/soa/dsp/EndpointMetaData.java
dwsp/trunk/src/main/java/org/jboss/soa/dsp/InvocationAdapter.java
dwsp/trunk/src/main/java/org/jboss/soa/dsp/MessageAdapter.java
dwsp/trunk/src/main/java/org/jboss/soa/dsp/ServiceEndpointReference.java
dwsp/trunk/src/main/java/org/jboss/soa/dsp/ServiceProvider.java
dwsp/trunk/src/main/java/org/jboss/soa/dsp/deployer/
dwsp/trunk/src/main/java/org/jboss/soa/dsp/deployer/ServiceDeployer.java
dwsp/trunk/src/main/java/org/jboss/soa/dsp/deployer/jboss/
dwsp/trunk/src/main/java/org/jboss/soa/dsp/server/
dwsp/trunk/src/main/java/org/jboss/soa/dsp/server/ServerConfig.java
dwsp/trunk/src/main/java/org/jboss/soa/dsp/server/jboss/
dwsp/trunk/src/main/java/org/jboss/soa/dsp/ws/
Removed:
dwsp/trunk/src/main/java/org/jboss/soa/dwsp/EndpointMetaData.java
dwsp/trunk/src/main/java/org/jboss/soa/dwsp/InvocationAdapter.java
dwsp/trunk/src/main/java/org/jboss/soa/dwsp/MessageAdapter.java
dwsp/trunk/src/main/java/org/jboss/soa/dwsp/ServiceEndpointReference.java
dwsp/trunk/src/main/java/org/jboss/soa/dwsp/ServiceProvider.java
dwsp/trunk/src/main/java/org/jboss/soa/dwsp/deployer/ServiceDeployer.java
dwsp/trunk/src/main/java/org/jboss/soa/dwsp/deployer/jboss/
dwsp/trunk/src/main/java/org/jboss/soa/dwsp/server/ServerConfig.java
dwsp/trunk/src/main/java/org/jboss/soa/dwsp/server/jboss/
dwsp/trunk/src/main/java/org/jboss/soa/dwsp/ws/
Modified:
dwsp/trunk/pom.xml
dwsp/trunk/src/main/java/org/jboss/soa/dsp/deployer/jboss/JBossServiceDeployer.java
dwsp/trunk/src/main/java/org/jboss/soa/dsp/deployer/jboss/WebMetaDataFactory.java
dwsp/trunk/src/main/java/org/jboss/soa/dsp/server/jboss/KernelAwareSPIFactory.java
dwsp/trunk/src/main/java/org/jboss/soa/dsp/server/jboss/KernelLocator.java
dwsp/trunk/src/main/java/org/jboss/soa/dsp/server/jboss/MBeanServerLocator.java
dwsp/trunk/src/main/java/org/jboss/soa/dsp/server/jboss/ObjectNameFactory.java
dwsp/trunk/src/main/java/org/jboss/soa/dsp/server/jboss/ServerConfigFactory.java
dwsp/trunk/src/main/java/org/jboss/soa/dsp/server/jboss/ServerConfigImpl.java
dwsp/trunk/src/main/java/org/jboss/soa/dsp/ws/BaseWebServiceEndpoint.java
dwsp/trunk/src/main/java/org/jboss/soa/dsp/ws/DOMWriter.java
dwsp/trunk/src/main/java/org/jboss/soa/dsp/ws/DeploymentBuilder.java
dwsp/trunk/src/main/java/org/jboss/soa/dsp/ws/JavaUtils.java
dwsp/trunk/src/main/java/org/jboss/soa/dsp/ws/SOAPMessageAdapter.java
dwsp/trunk/src/main/java/org/jboss/soa/dsp/ws/TemplateWebServiceEndpoint.java
dwsp/trunk/src/main/java/org/jboss/soa/dsp/ws/WSDLParser.java
dwsp/trunk/src/main/java/org/jboss/soa/dsp/ws/WSDLReference.java
dwsp/trunk/src/main/java/org/jboss/soa/dsp/ws/WSInvocationAdapter.java
dwsp/trunk/src/main/java/org/jboss/soa/dsp/ws/WebServiceDetails.java
dwsp/trunk/src/main/java/org/jboss/soa/dsp/ws/WebServiceProviderFactory.java
dwsp/trunk/src/main/java/org/jboss/soa/dsp/ws/WebServiceProviderGenerator.java
Log:
Rename packages to dsp, as may be web service independent in the future.
Modified: dwsp/trunk/pom.xml
===================================================================
--- dwsp/trunk/pom.xml 2010-11-22 17:10:43 UTC (rev 1134)
+++ dwsp/trunk/pom.xml 2010-11-23 11:00:41 UTC (rev 1135)
@@ -3,10 +3,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.soa</groupId>
- <artifactId>dwsp</artifactId>
+ <artifactId>dsp</artifactId>
<packaging>jar</packaging>
<version>1.0.0-SNAPSHOT</version>
- <name>SOA::DWSP</name>
+ <name>SOA::DSP</name>
<properties>
<junit.version>4.8.1</junit.version>
@@ -167,16 +167,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
</plugin>
- <!--plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <xmlOutput>true</xmlOutput>
- <xmlOutputDirectory>target/site</xmlOutputDirectory>
- <onlyAnalyze>org.jboss.soa.bpel.*</onlyAnalyze>
- </configuration>
- </plugin-->
</plugins>
</reporting>
@@ -198,86 +188,4 @@
</repositories>
-<!--
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <aggregate>true</aggregate>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jboss-packaging-maven-plugin</artifactId>
- <version>2.1.1</version>
- <extensions>true</extensions>
- <configuration>
- <excludes>
- <exclude>jboss:jboss-common</exclude>
- <exclude>jboss:jboss-system</exclude>
- <exclude>jboss:jboss-jmx</exclude>
- </excludes>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
-
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <showDeprecation>false</showDeprecation>
- <showWarnings>false</showWarnings>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>verify</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*TestCase.java</include>
- <include>**/*Test.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
--->
-
</project>
Copied: dwsp/trunk/src/main/java/org/jboss/soa/dsp/EndpointMetaData.java (from rev 1130, dwsp/trunk/src/main/java/org/jboss/soa/dwsp/EndpointMetaData.java)
===================================================================
--- dwsp/trunk/src/main/java/org/jboss/soa/dsp/EndpointMetaData.java (rev 0)
+++ dwsp/trunk/src/main/java/org/jboss/soa/dsp/EndpointMetaData.java 2010-11-23 11:00:41 UTC (rev 1135)
@@ -0,0 +1,72 @@
+/*
+ * 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.soa.dsp;
+
+import javax.xml.namespace.QName;
+
+/**
+ * Minimum endpoint meta data that's required to create
+ * endpoints. Anything else is derived by the {@link org.jboss.soa.bpel.runtime.ws.EndpointManager}
+ * itself.
+ *
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class EndpointMetaData
+{
+ private QName serviceName;
+ private String portName;
+ private String endpointId;
+ private QName processId;
+
+ public EndpointMetaData(QName serviceName, String portName, QName processId, String endpointId)
+ {
+ this.serviceName = serviceName;
+ this.portName = portName;
+ this.processId = processId;
+ this.endpointId = endpointId;
+ }
+
+ public QName getServiceName()
+ {
+ return serviceName;
+ }
+
+ public String getPortName()
+ {
+ return portName;
+ }
+
+ public QName getProcessId()
+ {
+ return processId;
+ }
+
+ public String getEndpointId()
+ {
+ return endpointId;
+ }
+
+ public void setEndpointId(String endpointId)
+ {
+ this.endpointId = endpointId;
+ }
+}
Copied: dwsp/trunk/src/main/java/org/jboss/soa/dsp/InvocationAdapter.java (from rev 1130, dwsp/trunk/src/main/java/org/jboss/soa/dwsp/InvocationAdapter.java)
===================================================================
--- dwsp/trunk/src/main/java/org/jboss/soa/dsp/InvocationAdapter.java (rev 0)
+++ dwsp/trunk/src/main/java/org/jboss/soa/dsp/InvocationAdapter.java 2010-11-23 11:00:41 UTC (rev 1135)
@@ -0,0 +1,66 @@
+/*
+ * 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.soa.dsp;
+
+import javax.xml.namespace.QName;
+
+/**
+ * Hides the message translation details when invoking ODE from
+ * an external component (i.e. ESB or WS).
+ *
+ * @see org.jboss.soa.bpel.runtime.engine.BPELEngine#invoke(InvocationAdapter)
+ *
+ * @author Heiko Braun <hbraun(a)redhat.com>
+ */
+public interface InvocationAdapter<T> {
+
+ String getOperationName();
+
+ QName getServiceName();
+
+ String getPortName();
+
+ /**
+ * Callback from the Service towards the adapter when
+ * turning an external message representation into a Service request.
+ *
+ * @param mex
+ * @param odeRequest
+ */
+ void initRequest(javax.wsdl.Operation op, MessageAdapter request);
+
+ /**
+ * Callback from the Engine towards the adapter when
+ * turning an ODE response {@link org.apache.ode.bpel.iapi.Message} into an external format <T>
+ * @param mex
+ */
+ void createResponse(javax.wsdl.Operation wsdl, MessageAdapter resp);
+
+ void createFault(javax.wsdl.Operation op, QName faultName, MessageAdapter fault);
+
+ /**
+ * Access the invocation result (response)
+ * @return T
+ */
+ T getInvocationResult();
+
+}
Copied: dwsp/trunk/src/main/java/org/jboss/soa/dsp/MessageAdapter.java (from rev 1130, dwsp/trunk/src/main/java/org/jboss/soa/dwsp/MessageAdapter.java)
===================================================================
--- dwsp/trunk/src/main/java/org/jboss/soa/dsp/MessageAdapter.java (rev 0)
+++ dwsp/trunk/src/main/java/org/jboss/soa/dsp/MessageAdapter.java 2010-11-23 11:00:41 UTC (rev 1135)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * 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,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.soa.dsp;
+
+public interface MessageAdapter {
+
+ public org.w3c.dom.Element getMessage();
+
+ public void setPart(String name, org.w3c.dom.Element elem);
+
+ public org.w3c.dom.Element getPart(String name);
+
+ public void setHeaderPart(String name, org.w3c.dom.Element elem);
+
+ public java.util.Map<String, org.w3c.dom.Node> getHeaderParts();
+
+}
Copied: dwsp/trunk/src/main/java/org/jboss/soa/dsp/ServiceEndpointReference.java (from rev 1130, dwsp/trunk/src/main/java/org/jboss/soa/dwsp/ServiceEndpointReference.java)
===================================================================
--- dwsp/trunk/src/main/java/org/jboss/soa/dsp/ServiceEndpointReference.java (rev 0)
+++ dwsp/trunk/src/main/java/org/jboss/soa/dsp/ServiceEndpointReference.java 2010-11-23 11:00:41 UTC (rev 1135)
@@ -0,0 +1,98 @@
+/*
+ * 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.soa.dsp;
+
+/**
+ * References webservice endpoint deployment properties.
+ *
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class ServiceEndpointReference
+{
+ private String endpointId;
+ private java.net.URL serviceUrl;
+ private String deploymentName;
+ private String archiveLocation;
+
+ public ServiceEndpointReference(String endpointId, java.net.URL location, String deploymentName,
+ String archiveLocation)
+ {
+ this.endpointId = endpointId;
+ this.serviceUrl = location;
+ this.deploymentName = deploymentName;
+ this.archiveLocation = archiveLocation;
+System.out.println("GPB: SER endpointId="+endpointId+" location="+location+" deploymentName="+deploymentName+" arch="+archiveLocation);
+ }
+
+ public String getArchiveLocation()
+ {
+ return archiveLocation;
+ }
+
+ /*
+ public void setArchiveLocation(String archiveLocation)
+ {
+ this.archiveLocation = archiveLocation;
+ }
+ */
+
+ public String getEndpointId()
+ {
+ return endpointId;
+ }
+
+ public java.net.URL getServiceUrl()
+ {
+ return serviceUrl;
+ }
+
+ public String getDeploymentName()
+ {
+ return deploymentName;
+ }
+
+ @Override
+ public boolean equals(Object o)
+ {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ ServiceEndpointReference that = (ServiceEndpointReference) o;
+
+ if (!archiveLocation.equals(that.archiveLocation)) return false;
+ if (!deploymentName.equals(that.deploymentName)) return false;
+ if (!endpointId.equals(that.endpointId)) return false;
+ if (!serviceUrl.equals(that.serviceUrl)) return false;
+
+ return true;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ int result = endpointId.hashCode();
+ result = 31 * result + serviceUrl.hashCode();
+ result = 31 * result + deploymentName.hashCode();
+ result = 31 * result + archiveLocation.hashCode();
+ return result;
+ }
+}
Copied: dwsp/trunk/src/main/java/org/jboss/soa/dsp/ServiceProvider.java (from rev 1130, dwsp/trunk/src/main/java/org/jboss/soa/dwsp/ServiceProvider.java)
===================================================================
--- dwsp/trunk/src/main/java/org/jboss/soa/dsp/ServiceProvider.java (rev 0)
+++ dwsp/trunk/src/main/java/org/jboss/soa/dsp/ServiceProvider.java 2010-11-23 11:00:41 UTC (rev 1135)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * 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,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.soa.dsp;
+
+public interface ServiceProvider {
+
+ /**
+ * This method initializes the service invoker. This method must
+ * be called before using the invoker.
+ *
+ * @throws Exception Failed to initialize
+ */
+ public void init() throws Exception;
+
+ /**
+ * This method invokes the associated service using the invocation
+ * adapter supplied.
+ *
+ * @param invocationAdapter The invocation adapter
+ * @throws Exception Failed to invoke the service
+ */
+ public void invoke(InvocationAdapter<?> invocationAdapter) throws Exception;
+
+ /**
+ * This method closes the service invoker.
+ *
+ * @throws Exception Failed to close
+ */
+ public void close() throws Exception;
+
+}
Copied: dwsp/trunk/src/main/java/org/jboss/soa/dsp/deployer/ServiceDeployer.java (from rev 1130, dwsp/trunk/src/main/java/org/jboss/soa/dwsp/deployer/ServiceDeployer.java)
===================================================================
--- dwsp/trunk/src/main/java/org/jboss/soa/dsp/deployer/ServiceDeployer.java (rev 0)
+++ dwsp/trunk/src/main/java/org/jboss/soa/dsp/deployer/ServiceDeployer.java 2010-11-23 11:00:41 UTC (rev 1135)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * 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,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.jboss.soa.dsp.deployer;
+
+import java.net.URL;
+
+import org.jboss.soa.dsp.EndpointMetaData;
+import org.jboss.soa.dsp.ServiceEndpointReference;
+
+public interface ServiceDeployer {
+
+ public ServiceEndpointReference deploy(EndpointMetaData metaData, Class<?> providerImpl, URL serviceUrl,
+ ClassLoader classLoader, java.io.File deployment) throws Exception;
+
+ public void undeploy(ServiceEndpointReference ref) throws Exception;
+
+}
Copied: dwsp/trunk/src/main/java/org/jboss/soa/dsp/deployer/jboss (from rev 1130, dwsp/trunk/src/main/java/org/jboss/soa/dwsp/deployer/jboss)
Modified: dwsp/trunk/src/main/java/org/jboss/soa/dsp/deployer/jboss/JBossServiceDeployer.java
===================================================================
--- dwsp/trunk/src/main/java/org/jboss/soa/dwsp/deployer/jboss/JBossServiceDeployer.java 2010-11-22 13:22:37 UTC (rev 1130)
+++ dwsp/trunk/src/main/java/org/jboss/soa/dsp/deployer/jboss/JBossServiceDeployer.java 2010-11-23 11:00:41 UTC (rev 1135)
@@ -15,7 +15,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.soa.dwsp.deployer.jboss;
+package org.jboss.soa.dsp.deployer.jboss;
import java.io.File;
import java.io.IOException;
@@ -31,10 +31,10 @@
import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
import org.jboss.kernel.Kernel;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
-import org.jboss.soa.dwsp.EndpointMetaData;
-import org.jboss.soa.dwsp.ServiceEndpointReference;
-import org.jboss.soa.dwsp.deployer.ServiceDeployer;
-import org.jboss.soa.dwsp.server.jboss.KernelLocator;
+import org.jboss.soa.dsp.EndpointMetaData;
+import org.jboss.soa.dsp.ServiceEndpointReference;
+import org.jboss.soa.dsp.deployer.ServiceDeployer;
+import org.jboss.soa.dsp.server.jboss.KernelLocator;
import org.jboss.virtual.VFS;
import org.jboss.virtual.VirtualFile;
Modified: dwsp/trunk/src/main/java/org/jboss/soa/dsp/deployer/jboss/WebMetaDataFactory.java
===================================================================
--- dwsp/trunk/src/main/java/org/jboss/soa/dwsp/deployer/jboss/WebMetaDataFactory.java 2010-11-22 13:22:37 UTC (rev 1130)
+++ dwsp/trunk/src/main/java/org/jboss/soa/dsp/deployer/jboss/WebMetaDataFactory.java 2010-11-23 11:00:41 UTC (rev 1135)
@@ -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.soa.dwsp.deployer.jboss;
+package org.jboss.soa.dsp.deployer.jboss;
import org.jboss.metadata.web.jboss.JBossServletMetaData;
import org.jboss.metadata.web.jboss.JBossServletsMetaData;
Copied: dwsp/trunk/src/main/java/org/jboss/soa/dsp/server/ServerConfig.java (from rev 1130, dwsp/trunk/src/main/java/org/jboss/soa/dwsp/server/ServerConfig.java)
===================================================================
--- dwsp/trunk/src/main/java/org/jboss/soa/dsp/server/ServerConfig.java (rev 0)
+++ dwsp/trunk/src/main/java/org/jboss/soa/dsp/server/ServerConfig.java 2010-11-23 11:00:41 UTC (rev 1135)
@@ -0,0 +1,52 @@
+/*
+ * 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.soa.dsp.server;
+
+import java.io.File;
+
+/**
+ * Interface to container independent config
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 08-May-2006
+ */
+public interface ServerConfig
+{
+ String getImplementationTitle();
+
+ String getImplementationVersion();
+
+ File getServerTempDir();
+
+ File getServerDataDir();
+
+ String getWebServiceHost();
+
+ int getWebServicePort();
+
+ int getWebServiceSecurePort();
+
+ String getClusterNodeName();
+
+ String getUddiNodeName();
+
+}
\ No newline at end of file
Copied: dwsp/trunk/src/main/java/org/jboss/soa/dsp/server/jboss (from rev 1130, dwsp/trunk/src/main/java/org/jboss/soa/dwsp/server/jboss)
Modified: dwsp/trunk/src/main/java/org/jboss/soa/dsp/server/jboss/KernelAwareSPIFactory.java
===================================================================
--- dwsp/trunk/src/main/java/org/jboss/soa/dwsp/server/jboss/KernelAwareSPIFactory.java 2010-11-22 13:22:37 UTC (rev 1130)
+++ dwsp/trunk/src/main/java/org/jboss/soa/dsp/server/jboss/KernelAwareSPIFactory.java 2010-11-23 11:00:41 UTC (rev 1135)
@@ -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.soa.dwsp.server.jboss;
+package org.jboss.soa.dsp.server.jboss;
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.kernel.spi.dependency.KernelController;
Modified: dwsp/trunk/src/main/java/org/jboss/soa/dsp/server/jboss/KernelLocator.java
===================================================================
--- dwsp/trunk/src/main/java/org/jboss/soa/dwsp/server/jboss/KernelLocator.java 2010-11-22 13:22:37 UTC (rev 1130)
+++ dwsp/trunk/src/main/java/org/jboss/soa/dsp/server/jboss/KernelLocator.java 2010-11-23 11:00:41 UTC (rev 1135)
@@ -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.soa.dwsp.server.jboss;
+package org.jboss.soa.dsp.server.jboss;
//$Id$
Modified: dwsp/trunk/src/main/java/org/jboss/soa/dsp/server/jboss/MBeanServerLocator.java
===================================================================
--- dwsp/trunk/src/main/java/org/jboss/soa/dwsp/server/jboss/MBeanServerLocator.java 2010-11-22 13:22:37 UTC (rev 1130)
+++ dwsp/trunk/src/main/java/org/jboss/soa/dsp/server/jboss/MBeanServerLocator.java 2010-11-23 11:00:41 UTC (rev 1135)
@@ -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.soa.dwsp.server.jboss;
+package org.jboss.soa.dsp.server.jboss;
import javax.management.MBeanServer;
import javax.management.MBeanServerFactory;
Modified: dwsp/trunk/src/main/java/org/jboss/soa/dsp/server/jboss/ObjectNameFactory.java
===================================================================
--- dwsp/trunk/src/main/java/org/jboss/soa/dwsp/server/jboss/ObjectNameFactory.java 2010-11-22 13:22:37 UTC (rev 1130)
+++ dwsp/trunk/src/main/java/org/jboss/soa/dsp/server/jboss/ObjectNameFactory.java 2010-11-23 11:00:41 UTC (rev 1135)
@@ -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.soa.dwsp.server.jboss;
+package org.jboss.soa.dsp.server.jboss;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
Modified: dwsp/trunk/src/main/java/org/jboss/soa/dsp/server/jboss/ServerConfigFactory.java
===================================================================
--- dwsp/trunk/src/main/java/org/jboss/soa/dwsp/server/jboss/ServerConfigFactory.java 2010-11-22 13:22:37 UTC (rev 1130)
+++ dwsp/trunk/src/main/java/org/jboss/soa/dsp/server/jboss/ServerConfigFactory.java 2010-11-23 11:00:41 UTC (rev 1135)
@@ -19,9 +19,9 @@
* 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.soa.dwsp.server.jboss;
+package org.jboss.soa.dsp.server.jboss;
-import org.jboss.soa.dwsp.server.ServerConfig;
+import org.jboss.soa.dsp.server.ServerConfig;
/**
Modified: dwsp/trunk/src/main/java/org/jboss/soa/dsp/server/jboss/ServerConfigImpl.java
===================================================================
--- dwsp/trunk/src/main/java/org/jboss/soa/dwsp/server/jboss/ServerConfigImpl.java 2010-11-22 13:22:37 UTC (rev 1130)
+++ dwsp/trunk/src/main/java/org/jboss/soa/dsp/server/jboss/ServerConfigImpl.java 2010-11-23 11:00:41 UTC (rev 1135)
@@ -19,11 +19,11 @@
* 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.soa.dwsp.server.jboss;
+package org.jboss.soa.dsp.server.jboss;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.jboss.soa.dwsp.server.ServerConfig;
+import org.jboss.soa.dsp.server.ServerConfig;
import org.jboss.util.id.GUID;
import javax.management.AttributeNotFoundException;
Copied: dwsp/trunk/src/main/java/org/jboss/soa/dsp/ws (from rev 1130, dwsp/trunk/src/main/java/org/jboss/soa/dwsp/ws)
Modified: dwsp/trunk/src/main/java/org/jboss/soa/dsp/ws/BaseWebServiceEndpoint.java
===================================================================
--- dwsp/trunk/src/main/java/org/jboss/soa/dwsp/ws/BaseWebServiceEndpoint.java 2010-11-22 13:22:37 UTC (rev 1130)
+++ dwsp/trunk/src/main/java/org/jboss/soa/dsp/ws/BaseWebServiceEndpoint.java 2010-11-23 11:00:41 UTC (rev 1135)
@@ -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.soa.dwsp.ws;
+package org.jboss.soa.dsp.ws;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -40,7 +40,7 @@
* Base class for BPEL endpoints that are created through javassist.
* Represents a JAX-WS {@link javax.xml.ws.Provider} implementation.
*
- * @see org.jboss.soa.dwsp.ws.WebServiceProviderGenerator
+ * @see org.jboss.soa.dsp.ws.WebServiceProviderGenerator
*
* @author Heiko.Braun <heiko.braun(a)jboss.com>
*/
Modified: dwsp/trunk/src/main/java/org/jboss/soa/dsp/ws/DOMWriter.java
===================================================================
--- dwsp/trunk/src/main/java/org/jboss/soa/dwsp/ws/DOMWriter.java 2010-11-22 13:22:37 UTC (rev 1130)
+++ dwsp/trunk/src/main/java/org/jboss/soa/dsp/ws/DOMWriter.java 2010-11-23 11:00:41 UTC (rev 1135)
@@ -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.soa.dwsp.ws;
+package org.jboss.soa.dsp.ws;
/*
* ====================================================================
Modified: dwsp/trunk/src/main/java/org/jboss/soa/dsp/ws/DeploymentBuilder.java
===================================================================
--- dwsp/trunk/src/main/java/org/jboss/soa/dwsp/ws/DeploymentBuilder.java 2010-11-22 13:22:37 UTC (rev 1130)
+++ dwsp/trunk/src/main/java/org/jboss/soa/dsp/ws/DeploymentBuilder.java 2010-11-23 11:00:41 UTC (rev 1135)
@@ -19,9 +19,9 @@
* 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.soa.dwsp.ws;
+package org.jboss.soa.dsp.ws;
-import org.jboss.soa.dwsp.server.ServerConfig;
+import org.jboss.soa.dsp.server.ServerConfig;
import java.io.*;
Modified: dwsp/trunk/src/main/java/org/jboss/soa/dsp/ws/JavaUtils.java
===================================================================
--- dwsp/trunk/src/main/java/org/jboss/soa/dwsp/ws/JavaUtils.java 2010-11-22 13:22:37 UTC (rev 1130)
+++ dwsp/trunk/src/main/java/org/jboss/soa/dsp/ws/JavaUtils.java 2010-11-23 11:00:41 UTC (rev 1135)
@@ -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.soa.dwsp.ws;
+package org.jboss.soa.dsp.ws;
import java.io.ByteArrayOutputStream;
import java.lang.reflect.Method;
Modified: dwsp/trunk/src/main/java/org/jboss/soa/dsp/ws/SOAPMessageAdapter.java
===================================================================
--- dwsp/trunk/src/main/java/org/jboss/soa/dwsp/ws/SOAPMessageAdapter.java 2010-11-22 13:22:37 UTC (rev 1130)
+++ dwsp/trunk/src/main/java/org/jboss/soa/dsp/ws/SOAPMessageAdapter.java 2010-11-23 11:00:41 UTC (rev 1135)
@@ -19,12 +19,12 @@
* 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.soa.dwsp.ws;
+package org.jboss.soa.dsp.ws;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
//import org.apache.xerces.jaxp.DocumentBuilderFactoryImpl;
-import org.jboss.soa.dwsp.MessageAdapter;
+import org.jboss.soa.dsp.MessageAdapter;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
Modified: dwsp/trunk/src/main/java/org/jboss/soa/dsp/ws/TemplateWebServiceEndpoint.java
===================================================================
--- dwsp/trunk/src/main/java/org/jboss/soa/dwsp/ws/TemplateWebServiceEndpoint.java 2010-11-22 13:22:37 UTC (rev 1130)
+++ dwsp/trunk/src/main/java/org/jboss/soa/dsp/ws/TemplateWebServiceEndpoint.java 2010-11-23 11:00:41 UTC (rev 1135)
@@ -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.soa.dwsp.ws;
+package org.jboss.soa.dsp.ws;
import javax.xml.soap.*;
@@ -34,7 +34,7 @@
* be the specific endpoint implementation. This is necessary as
* javassist does not provide a way to set a interface that uses generics.
*
- * @see org.jboss.soa.dwsp.ws.WebServiceProviderGenerator
+ * @see org.jboss.soa.dsp.ws.WebServiceProviderGenerator
*
*/
public class TemplateWebServiceEndpoint extends BaseWebServiceEndpoint implements Provider<SOAPMessage>
Modified: dwsp/trunk/src/main/java/org/jboss/soa/dsp/ws/WSDLParser.java
===================================================================
--- dwsp/trunk/src/main/java/org/jboss/soa/dwsp/ws/WSDLParser.java 2010-11-22 13:22:37 UTC (rev 1130)
+++ dwsp/trunk/src/main/java/org/jboss/soa/dsp/ws/WSDLParser.java 2010-11-23 11:00:41 UTC (rev 1135)
@@ -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.soa.dwsp.ws;
+package org.jboss.soa.dsp.ws;
import javax.wsdl.*;
import javax.wsdl.extensions.soap.SOAPAddress;
Modified: dwsp/trunk/src/main/java/org/jboss/soa/dsp/ws/WSDLReference.java
===================================================================
--- dwsp/trunk/src/main/java/org/jboss/soa/dwsp/ws/WSDLReference.java 2010-11-22 13:22:37 UTC (rev 1130)
+++ dwsp/trunk/src/main/java/org/jboss/soa/dsp/ws/WSDLReference.java 2010-11-23 11:00:41 UTC (rev 1135)
@@ -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.soa.dwsp.ws;
+package org.jboss.soa.dsp.ws;
import javax.wsdl.Definition;
Modified: dwsp/trunk/src/main/java/org/jboss/soa/dsp/ws/WSInvocationAdapter.java
===================================================================
--- dwsp/trunk/src/main/java/org/jboss/soa/dwsp/ws/WSInvocationAdapter.java 2010-11-22 13:22:37 UTC (rev 1130)
+++ dwsp/trunk/src/main/java/org/jboss/soa/dsp/ws/WSInvocationAdapter.java 2010-11-23 11:00:41 UTC (rev 1135)
@@ -19,10 +19,10 @@
* 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.soa.dwsp.ws;
+package org.jboss.soa.dsp.ws;
-import org.jboss.soa.dwsp.InvocationAdapter;
-import org.jboss.soa.dwsp.MessageAdapter;
+import org.jboss.soa.dsp.InvocationAdapter;
+import org.jboss.soa.dsp.MessageAdapter;
import javax.xml.namespace.QName;
import javax.xml.soap.MessageFactory;
Modified: dwsp/trunk/src/main/java/org/jboss/soa/dsp/ws/WebServiceDetails.java
===================================================================
--- dwsp/trunk/src/main/java/org/jboss/soa/dwsp/ws/WebServiceDetails.java 2010-11-22 13:22:37 UTC (rev 1130)
+++ dwsp/trunk/src/main/java/org/jboss/soa/dsp/ws/WebServiceDetails.java 2010-11-23 11:00:41 UTC (rev 1135)
@@ -15,7 +15,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.soa.dwsp.ws;
+package org.jboss.soa.dsp.ws;
import java.lang.annotation.*;
Modified: dwsp/trunk/src/main/java/org/jboss/soa/dsp/ws/WebServiceProviderFactory.java
===================================================================
--- dwsp/trunk/src/main/java/org/jboss/soa/dwsp/ws/WebServiceProviderFactory.java 2010-11-22 13:22:37 UTC (rev 1130)
+++ dwsp/trunk/src/main/java/org/jboss/soa/dsp/ws/WebServiceProviderFactory.java 2010-11-23 11:00:41 UTC (rev 1135)
@@ -15,11 +15,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.jboss.soa.dwsp.ws;
+package org.jboss.soa.dsp.ws;
import javax.xml.namespace.QName;
-import org.jboss.soa.dwsp.ServiceProvider;
+import org.jboss.soa.dsp.ServiceProvider;
public interface WebServiceProviderFactory {
Modified: dwsp/trunk/src/main/java/org/jboss/soa/dsp/ws/WebServiceProviderGenerator.java
===================================================================
--- dwsp/trunk/src/main/java/org/jboss/soa/dwsp/ws/WebServiceProviderGenerator.java 2010-11-22 13:22:37 UTC (rev 1130)
+++ dwsp/trunk/src/main/java/org/jboss/soa/dsp/ws/WebServiceProviderGenerator.java 2010-11-23 11:00:41 UTC (rev 1135)
@@ -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.soa.dwsp.ws;
+package org.jboss.soa.dsp.ws;
import javassist.*;
import javassist.bytecode.AnnotationsAttribute;
@@ -36,7 +36,7 @@
* Creates JAX-WS Provider classes using javassist.
* These provider classes can then be deployed to JBossWS in memory.<p>
* The javassist generated class basically just carries the meta data,
- * while the actual implementation resides in {@link org.jboss.soa.dwsp.ws.BaseWebServiceEndpoint}
+ * while the actual implementation resides in {@link org.jboss.soa.dsp.ws.BaseWebServiceEndpoint}
*
* @author Heiko.Braun <heiko.braun(a)jboss.com>
*/
@@ -72,7 +72,7 @@
// interface that supports generics. Although the super class (AbstractWebServiceEndpoint)
// implements this Provider<SOAPMessage> interface, CXF requires the actual web service
// implementation class to directly define this interface. (RIFTSAW-123)
- CtClass impl = pool.get(org.jboss.soa.dwsp.ws.TemplateWebServiceEndpoint.class.getName());
+ CtClass impl = pool.get(org.jboss.soa.dsp.ws.TemplateWebServiceEndpoint.class.getName());
impl.setName(implClassName);
// AbstractWebServiceEndpoint.endpointId property
@@ -146,7 +146,7 @@
// Specify the web service providerdetails
Annotation detailsAnnotation = new Annotation(
- org.jboss.soa.dwsp.ws.WebServiceDetails.class.getName(), constantPool);
+ org.jboss.soa.dsp.ws.WebServiceDetails.class.getName(), constantPool);
detailsAnnotation.addMemberValue("factory",
new StringMemberValue(providerFactory.getName(), constantPool));
Deleted: dwsp/trunk/src/main/java/org/jboss/soa/dwsp/EndpointMetaData.java
===================================================================
--- dwsp/trunk/src/main/java/org/jboss/soa/dwsp/EndpointMetaData.java 2010-11-22 17:10:43 UTC (rev 1134)
+++ dwsp/trunk/src/main/java/org/jboss/soa/dwsp/EndpointMetaData.java 2010-11-23 11:00:41 UTC (rev 1135)
@@ -1,72 +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.soa.dwsp;
-
-import javax.xml.namespace.QName;
-
-/**
- * Minimum endpoint meta data that's required to create
- * endpoints. Anything else is derived by the {@link org.jboss.soa.bpel.runtime.ws.EndpointManager}
- * itself.
- *
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-public class EndpointMetaData
-{
- private QName serviceName;
- private String portName;
- private String endpointId;
- private QName processId;
-
- public EndpointMetaData(QName serviceName, String portName, QName processId, String endpointId)
- {
- this.serviceName = serviceName;
- this.portName = portName;
- this.processId = processId;
- this.endpointId = endpointId;
- }
-
- public QName getServiceName()
- {
- return serviceName;
- }
-
- public String getPortName()
- {
- return portName;
- }
-
- public QName getProcessId()
- {
- return processId;
- }
-
- public String getEndpointId()
- {
- return endpointId;
- }
-
- public void setEndpointId(String endpointId)
- {
- this.endpointId = endpointId;
- }
-}
Deleted: dwsp/trunk/src/main/java/org/jboss/soa/dwsp/InvocationAdapter.java
===================================================================
--- dwsp/trunk/src/main/java/org/jboss/soa/dwsp/InvocationAdapter.java 2010-11-22 17:10:43 UTC (rev 1134)
+++ dwsp/trunk/src/main/java/org/jboss/soa/dwsp/InvocationAdapter.java 2010-11-23 11:00:41 UTC (rev 1135)
@@ -1,66 +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.soa.dwsp;
-
-import javax.xml.namespace.QName;
-
-/**
- * Hides the message translation details when invoking ODE from
- * an external component (i.e. ESB or WS).
- *
- * @see org.jboss.soa.bpel.runtime.engine.BPELEngine#invoke(InvocationAdapter)
- *
- * @author Heiko Braun <hbraun(a)redhat.com>
- */
-public interface InvocationAdapter<T> {
-
- String getOperationName();
-
- QName getServiceName();
-
- String getPortName();
-
- /**
- * Callback from the Service towards the adapter when
- * turning an external message representation into a Service request.
- *
- * @param mex
- * @param odeRequest
- */
- void initRequest(javax.wsdl.Operation op, MessageAdapter request);
-
- /**
- * Callback from the Engine towards the adapter when
- * turning an ODE response {@link org.apache.ode.bpel.iapi.Message} into an external format <T>
- * @param mex
- */
- void createResponse(javax.wsdl.Operation wsdl, MessageAdapter resp);
-
- void createFault(javax.wsdl.Operation op, QName faultName, MessageAdapter fault);
-
- /**
- * Access the invocation result (response)
- * @return T
- */
- T getInvocationResult();
-
-}
Deleted: dwsp/trunk/src/main/java/org/jboss/soa/dwsp/MessageAdapter.java
===================================================================
--- dwsp/trunk/src/main/java/org/jboss/soa/dwsp/MessageAdapter.java 2010-11-22 17:10:43 UTC (rev 1134)
+++ dwsp/trunk/src/main/java/org/jboss/soa/dwsp/MessageAdapter.java 2010-11-23 11:00:41 UTC (rev 1135)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * 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,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.soa.dwsp;
-
-public interface MessageAdapter {
-
- public org.w3c.dom.Element getMessage();
-
- public void setPart(String name, org.w3c.dom.Element elem);
-
- public org.w3c.dom.Element getPart(String name);
-
- public void setHeaderPart(String name, org.w3c.dom.Element elem);
-
- public java.util.Map<String, org.w3c.dom.Node> getHeaderParts();
-
-}
Deleted: dwsp/trunk/src/main/java/org/jboss/soa/dwsp/ServiceEndpointReference.java
===================================================================
--- dwsp/trunk/src/main/java/org/jboss/soa/dwsp/ServiceEndpointReference.java 2010-11-22 17:10:43 UTC (rev 1134)
+++ dwsp/trunk/src/main/java/org/jboss/soa/dwsp/ServiceEndpointReference.java 2010-11-23 11:00:41 UTC (rev 1135)
@@ -1,98 +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.soa.dwsp;
-
-/**
- * References webservice endpoint deployment properties.
- *
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-public class ServiceEndpointReference
-{
- private String endpointId;
- private java.net.URL serviceUrl;
- private String deploymentName;
- private String archiveLocation;
-
- public ServiceEndpointReference(String endpointId, java.net.URL location, String deploymentName,
- String archiveLocation)
- {
- this.endpointId = endpointId;
- this.serviceUrl = location;
- this.deploymentName = deploymentName;
- this.archiveLocation = archiveLocation;
-System.out.println("GPB: SER endpointId="+endpointId+" location="+location+" deploymentName="+deploymentName+" arch="+archiveLocation);
- }
-
- public String getArchiveLocation()
- {
- return archiveLocation;
- }
-
- /*
- public void setArchiveLocation(String archiveLocation)
- {
- this.archiveLocation = archiveLocation;
- }
- */
-
- public String getEndpointId()
- {
- return endpointId;
- }
-
- public java.net.URL getServiceUrl()
- {
- return serviceUrl;
- }
-
- public String getDeploymentName()
- {
- return deploymentName;
- }
-
- @Override
- public boolean equals(Object o)
- {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
-
- ServiceEndpointReference that = (ServiceEndpointReference) o;
-
- if (!archiveLocation.equals(that.archiveLocation)) return false;
- if (!deploymentName.equals(that.deploymentName)) return false;
- if (!endpointId.equals(that.endpointId)) return false;
- if (!serviceUrl.equals(that.serviceUrl)) return false;
-
- return true;
- }
-
- @Override
- public int hashCode()
- {
- int result = endpointId.hashCode();
- result = 31 * result + serviceUrl.hashCode();
- result = 31 * result + deploymentName.hashCode();
- result = 31 * result + archiveLocation.hashCode();
- return result;
- }
-}
Deleted: dwsp/trunk/src/main/java/org/jboss/soa/dwsp/ServiceProvider.java
===================================================================
--- dwsp/trunk/src/main/java/org/jboss/soa/dwsp/ServiceProvider.java 2010-11-22 17:10:43 UTC (rev 1134)
+++ dwsp/trunk/src/main/java/org/jboss/soa/dwsp/ServiceProvider.java 2010-11-23 11:00:41 UTC (rev 1135)
@@ -1,46 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * 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,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.soa.dwsp;
-
-public interface ServiceProvider {
-
- /**
- * This method initializes the service invoker. This method must
- * be called before using the invoker.
- *
- * @throws Exception Failed to initialize
- */
- public void init() throws Exception;
-
- /**
- * This method invokes the associated service using the invocation
- * adapter supplied.
- *
- * @param invocationAdapter The invocation adapter
- * @throws Exception Failed to invoke the service
- */
- public void invoke(InvocationAdapter<?> invocationAdapter) throws Exception;
-
- /**
- * This method closes the service invoker.
- *
- * @throws Exception Failed to close
- */
- public void close() throws Exception;
-
-}
Deleted: dwsp/trunk/src/main/java/org/jboss/soa/dwsp/deployer/ServiceDeployer.java
===================================================================
--- dwsp/trunk/src/main/java/org/jboss/soa/dwsp/deployer/ServiceDeployer.java 2010-11-22 17:10:43 UTC (rev 1134)
+++ dwsp/trunk/src/main/java/org/jboss/soa/dwsp/deployer/ServiceDeployer.java 2010-11-23 11:00:41 UTC (rev 1135)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * 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,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.jboss.soa.dwsp.deployer;
-
-import java.net.URL;
-
-import org.jboss.soa.dwsp.EndpointMetaData;
-import org.jboss.soa.dwsp.ServiceEndpointReference;
-
-public interface ServiceDeployer {
-
- public ServiceEndpointReference deploy(EndpointMetaData metaData, Class<?> providerImpl, URL serviceUrl,
- ClassLoader classLoader, java.io.File deployment) throws Exception;
-
- public void undeploy(ServiceEndpointReference ref) throws Exception;
-
-}
Deleted: dwsp/trunk/src/main/java/org/jboss/soa/dwsp/server/ServerConfig.java
===================================================================
--- dwsp/trunk/src/main/java/org/jboss/soa/dwsp/server/ServerConfig.java 2010-11-22 17:10:43 UTC (rev 1134)
+++ dwsp/trunk/src/main/java/org/jboss/soa/dwsp/server/ServerConfig.java 2010-11-23 11:00:41 UTC (rev 1135)
@@ -1,52 +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.soa.dwsp.server;
-
-import java.io.File;
-
-/**
- * Interface to container independent config
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 08-May-2006
- */
-public interface ServerConfig
-{
- String getImplementationTitle();
-
- String getImplementationVersion();
-
- File getServerTempDir();
-
- File getServerDataDir();
-
- String getWebServiceHost();
-
- int getWebServicePort();
-
- int getWebServiceSecurePort();
-
- String getClusterNodeName();
-
- String getUddiNodeName();
-
-}
\ No newline at end of file
14 years, 3 months