riftsaw SVN: r1358 - dsp/trunk/integration/jbossas6/src/main/java/org/jboss/soa/dsp/deployer/jbossas6.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2011-04-15 10:43:52 -0400 (Fri, 15 Apr 2011)
New Revision: 1358
Added:
dsp/trunk/integration/jbossas6/src/main/java/org/jboss/soa/dsp/deployer/jbossas6/WebMetaDataFactory.java
Log:
Added: dsp/trunk/integration/jbossas6/src/main/java/org/jboss/soa/dsp/deployer/jbossas6/WebMetaDataFactory.java
===================================================================
--- dsp/trunk/integration/jbossas6/src/main/java/org/jboss/soa/dsp/deployer/jbossas6/WebMetaDataFactory.java (rev 0)
+++ dsp/trunk/integration/jbossas6/src/main/java/org/jboss/soa/dsp/deployer/jbossas6/WebMetaDataFactory.java 2011-04-15 14:43:52 UTC (rev 1358)
@@ -0,0 +1,214 @@
+/*
+ * Copyright 2010 Red Hat, Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.jboss.soa.dsp.deployer.jbossas6;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.jboss.metadata.web.jboss.JBossServletMetaData;
+import org.jboss.metadata.web.jboss.JBossServletsMetaData;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.metadata.web.spec.AuthConstraintMetaData;
+import org.jboss.metadata.web.spec.LoginConfigMetaData;
+import org.jboss.metadata.web.spec.SecurityConstraintMetaData;
+import org.jboss.metadata.web.spec.ServletMappingMetaData;
+import org.jboss.metadata.web.spec.TransportGuaranteeType;
+import org.jboss.metadata.web.spec.UserDataConstraintMetaData;
+import org.jboss.metadata.web.spec.WebResourceCollectionMetaData;
+import org.jboss.metadata.web.spec.WebResourceCollectionsMetaData;
+import org.jboss.soa.dsp.annotation.SecurityDomain;
+import org.jboss.soa.dsp.annotation.WebMetaData;
+
+/**
+ * Creates an in-memory representation of web meta data.
+ * Based on http://anonsvn.jboss.org/repos/jbossas/tags/JBoss_5_1_0_GA/webservices/sr...
+ *
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class WebMetaDataFactory
+{
+ private String endpointId;
+ private String servletClassName = null;
+ private String webContext = null;
+ private String urlPattern = null;
+
+ public WebMetaDataFactory(String endpointId, String webContext, String urlPattern, String servletClassName)
+ {
+ this.endpointId = endpointId;
+ this.servletClassName = servletClassName;
+ this.webContext = webContext;
+ this.urlPattern = urlPattern;
+ }
+
+ public JBossWebMetaData createWebMetaData(ClassLoader loader)
+ {
+ JBossWebMetaData jbwmd = new JBossWebMetaData();
+ try {
+ Class<?> providerFactory = Class.forName(servletClassName);
+ createWebAppDescriptor(jbwmd, providerFactory);
+ createJBossWebAppDescriptor(jbwmd, providerFactory);
+ } catch (ClassNotFoundException ex) {
+
+ }
+
+ return jbwmd;
+ }
+
+ private void createWebAppDescriptor(JBossWebMetaData jbwmd, Class<?> providerFactory)
+ {
+ /*
+ <servlet>
+ <servlet-name>
+ <servlet-class>
+ </servlet>
+ */
+ JBossServletsMetaData servlets = jbwmd.getServlets();
+ JBossServletMetaData servlet = new JBossServletMetaData();
+ servlet.setServletName("Endpoint-"+endpointId);
+ servlet.setServletClass(servletClassName);
+ servlets.add(servlet);
+
+
+ /*
+ <servlet-mapping>
+ <servlet-name>
+ <url-pattern>
+ </servlet-mapping>
+ */
+ List<ServletMappingMetaData> servletMappings = jbwmd.getServletMappings();
+ if (servletMappings == null) {
+ servletMappings = new ArrayList<ServletMappingMetaData>();
+ jbwmd.setServletMappings(servletMappings);
+ }
+ ServletMappingMetaData servletMapping = new ServletMappingMetaData();
+ servletMapping.setServletName("Endpoint-"+endpointId);
+ ArrayList<String> urlPatterns = new ArrayList<String>();
+ urlPatterns.add(urlPattern);
+ servletMapping.setUrlPatterns(urlPatterns);
+ servletMappings.add(servletMapping);
+
+ WebMetaData metaData = providerFactory.getAnnotation(WebMetaData.class);
+ if (metaData != null)
+ configureSecurity(jbwmd, metaData);
+ }
+
+ /**
+ * @param jbwmd
+ */
+ protected void configureSecurity(JBossWebMetaData jbwmd, WebMetaData metaData) {
+ Boolean secureWSDLAccess = null;
+ String transportGuarantee = null;
+ String beanAuthMethod = null;
+
+ if (metaData != null) {
+ if (metaData.authMethod().length() > 0)
+ beanAuthMethod = metaData.authMethod();
+ if (metaData.transportGuarantee().length() > 0)
+ transportGuarantee = metaData.transportGuarantee();
+ if (metaData.secureWSDLAccess())
+ secureWSDLAccess = metaData.secureWSDLAccess();
+ }
+
+ String authMethod = null;
+ if (beanAuthMethod != null || transportGuarantee != null) {
+ List<SecurityConstraintMetaData> securityContraints = jbwmd.getSecurityContraints();
+ if (securityContraints == null) {
+ securityContraints = new ArrayList<SecurityConstraintMetaData>();
+ jbwmd.setSecurityContraints(securityContraints);
+ }
+
+ SecurityConstraintMetaData securityConstraint = new SecurityConstraintMetaData();
+ securityContraints.add(securityConstraint);
+
+ WebResourceCollectionsMetaData resourceCollections = securityConstraint.getResourceCollections();
+ if (resourceCollections == null) {
+ resourceCollections = new WebResourceCollectionsMetaData();
+ securityConstraint.setResourceCollections(resourceCollections);
+ }
+
+ WebResourceCollectionMetaData resourceCollection = new WebResourceCollectionMetaData();
+ resourceCollections.add(resourceCollection);
+
+ resourceCollection.setWebResourceName(endpointId);
+ resourceCollection.setUrlPatterns(Arrays.asList(new String[] { urlPattern }));
+ ArrayList<String> httpMethods = new ArrayList<String>();
+ resourceCollection.setHttpMethods(httpMethods);
+ if (Boolean.TRUE.equals(secureWSDLAccess)) {
+ httpMethods.add("GET");
+ }
+ httpMethods.add("POST");
+
+ if (beanAuthMethod != null) {
+ // Only the first auth-method gives the war login-config/auth-method
+ if (authMethod == null)
+ authMethod = beanAuthMethod;
+
+ AuthConstraintMetaData authConstraint = new AuthConstraintMetaData();
+ authConstraint.setRoleNames(Arrays.asList(new String[] { "*" }));
+ securityConstraint.setAuthConstraint(authConstraint);
+ }
+
+ if (transportGuarantee != null) {
+ UserDataConstraintMetaData userDataConstraint = new UserDataConstraintMetaData();
+ userDataConstraint.setTransportGuarantee(TransportGuaranteeType.valueOf(transportGuarantee));
+ securityConstraint.setUserDataConstraint(userDataConstraint);
+ }
+
+ if (authMethod != null) {
+ LoginConfigMetaData loginConfig = jbwmd.getLoginConfig();
+ if (loginConfig == null) {
+ loginConfig = new LoginConfigMetaData();
+ jbwmd.setLoginConfig(loginConfig);
+ }
+ loginConfig.setAuthMethod(authMethod);
+ loginConfig.setRealmName("DSP Security Realm");
+ }
+ }
+ }
+
+ /**
+ * @param jbwmd
+ * @param providerFactory
+ */
+ private void createJBossWebAppDescriptor(JBossWebMetaData jbwmd, Class<?> providerFactory)
+ {
+ /* Create a jboss-web
+ <jboss-web>
+ <security-domain>java:/jaas/cts</security-domain>
+ <context-root>/ws/ejbN/</context-root>
+ <virtual-host>some.domain.com</virtual-host>
+ </jboss-web>
+ */
+ SecurityDomain domain = providerFactory.getAnnotation(SecurityDomain.class);
+ if (domain != null)
+ addSecurityDomain(jbwmd, domain.value());
+ jbwmd.setContextRoot(webContext);
+ }
+
+ public void addSecurityDomain(JBossWebMetaData jbossWeb, String securityDomain)
+ {
+
+ if (securityDomain != null)
+ {
+ if (securityDomain.startsWith("java:/jaas/") == false)
+ securityDomain = "java:/jaas/" + securityDomain;
+
+ jbossWeb.setSecurityDomain(securityDomain);
+ }
+ }
+}
13 years, 8 months
- 1
- 0
riftsaw SVN: r1357 - dsp/trunk/integration/jbossas6/src/main/java/org/jboss/soa/dsp/deployer/jbossas6.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2011-04-15 10:43:17 -0400 (Fri, 15 Apr 2011)
New Revision: 1357
Removed:
dsp/trunk/integration/jbossas6/src/main/java/org/jboss/soa/dsp/deployer/jbossas6/WebMetaDataFactory.java
Log:
Deleted: dsp/trunk/integration/jbossas6/src/main/java/org/jboss/soa/dsp/deployer/jbossas6/WebMetaDataFactory.java
===================================================================
--- dsp/trunk/integration/jbossas6/src/main/java/org/jboss/soa/dsp/deployer/jbossas6/WebMetaDataFactory.java 2011-04-15 14:31:54 UTC (rev 1356)
+++ dsp/trunk/integration/jbossas6/src/main/java/org/jboss/soa/dsp/deployer/jbossas6/WebMetaDataFactory.java 2011-04-15 14:43:17 UTC (rev 1357)
@@ -1,104 +0,0 @@
-/*
- * Copyright 2010 Red Hat, Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package org.jboss.soa.dsp.deployer.jbossas6;
-
-import org.jboss.metadata.web.jboss.JBossServletMetaData;
-import org.jboss.metadata.web.jboss.JBossServletsMetaData;
-import org.jboss.metadata.web.jboss.JBossWebMetaData;
-import org.jboss.metadata.web.spec.ServletMappingMetaData;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Creates an in-memory representation of web meta data.
- * Based on http://anonsvn.jboss.org/repos/jbossas/tags/JBoss_5_1_0_GA/webservices/sr...
- *
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-public class WebMetaDataFactory
-{
- private String endpointId;
- private String servletClassName = null;
- private String webContext = null;
- private String urlPattern = null;
-
- public WebMetaDataFactory(String endpointId, String webContext, String urlPattern, String servletClassName)
- {
- this.endpointId = endpointId;
- this.servletClassName = servletClassName;
- this.webContext = webContext;
- this.urlPattern = urlPattern;
- }
-
- public JBossWebMetaData createWebMetaData(ClassLoader loader)
- {
- JBossWebMetaData jbwmd = new JBossWebMetaData();
- createWebAppDescriptor(jbwmd);
- createJBossWebAppDescriptor(jbwmd);
- return jbwmd;
- }
-
- private void createWebAppDescriptor(JBossWebMetaData jbwmd)
- {
- /*
- <servlet>
- <servlet-name>
- <servlet-class>
- </servlet>
- */
- JBossServletsMetaData servlets = jbwmd.getServlets();
- JBossServletMetaData servlet = new JBossServletMetaData();
- servlet.setServletName("Endpoint-"+endpointId);
- servlet.setServletClass(servletClassName);
- servlets.add(servlet);
-
-
- /*
- <servlet-mapping>
- <servlet-name>
- <url-pattern>
- </servlet-mapping>
- */
- List<ServletMappingMetaData> servletMappings = jbwmd.getServletMappings();
- if (servletMappings == null)
- {
- servletMappings = new ArrayList<ServletMappingMetaData>();
- jbwmd.setServletMappings(servletMappings);
- }
- ServletMappingMetaData servletMapping = new ServletMappingMetaData();
- servletMapping.setServletName("Endpoint-"+endpointId);
- ArrayList<String> urlPatterns = new ArrayList<String>();
- urlPatterns.add(urlPattern);
- servletMapping.setUrlPatterns(urlPatterns);
- servletMappings.add(servletMapping);
-
- }
-
- private void createJBossWebAppDescriptor(JBossWebMetaData jbwmd)
- {
- /* Create a jboss-web
- <jboss-web>
- <security-domain>java:/jaas/cts</security-domain>
- <context-root>/ws/ejbN/</context-root>
- <virtual-host>some.domain.com</virtual-host>
- </jboss-web>
- */
-
- jbwmd.setContextRoot(webContext);
- }
-}
13 years, 8 months
- 1
- 0
riftsaw SVN: r1356 - in dsp/trunk: api and 11 other directories.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2011-04-15 10:31:54 -0400 (Fri, 15 Apr 2011)
New Revision: 1356
Added:
dsp/trunk/api/src/main/java/org/jboss/soa/dsp/annotation/
dsp/trunk/api/src/main/java/org/jboss/soa/dsp/annotation/SecurityDomain.java
dsp/trunk/api/src/main/java/org/jboss/soa/dsp/annotation/WebMetaData.java
dsp/trunk/api/src/main/java/org/jboss/soa/dsp/ws/IDeploymentBuilder.java
Modified:
dsp/trunk/api/pom.xml
dsp/trunk/api/src/main/java/org/jboss/soa/dsp/InvocationAdapter.java
dsp/trunk/api/src/main/java/org/jboss/soa/dsp/ws/BaseWebServiceEndpoint.java
dsp/trunk/api/src/main/java/org/jboss/soa/dsp/ws/BuildProcessor.java
dsp/trunk/api/src/main/java/org/jboss/soa/dsp/ws/DeploymentBuilder.java
dsp/trunk/api/src/main/java/org/jboss/soa/dsp/ws/TemplateWebServiceEndpoint.java
dsp/trunk/api/src/main/java/org/jboss/soa/dsp/ws/WSInvocationAdapter.java
dsp/trunk/api/src/main/java/org/jboss/soa/dsp/ws/WebServiceProviderFactory.java
dsp/trunk/api/src/main/java/org/jboss/soa/dsp/ws/WebServiceProviderGenerator.java
dsp/trunk/distribution/pom.xml
dsp/trunk/integration/jbossas5/pom.xml
dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/deployer/jbossas5/WebMetaDataFactory.java
dsp/trunk/integration/jbossas6/pom.xml
dsp/trunk/integration/pom.xml
dsp/trunk/integration/tomcat/pom.xml
dsp/trunk/integration/tomcat/src/main/java/org/jboss/soa/dsp/deployer/tomcat/TomcatServiceDeployer.java
dsp/trunk/pom.xml
dsp/trunk/samples/example-deployer/provider/src/org/jboss/soa/dsp/example/provider/ExampleWebServiceFactory.java
Log:
RIFTSAW-373 - applied contribution from David Vilaverde. Thanks David.
Modified: dsp/trunk/api/pom.xml
===================================================================
--- dsp/trunk/api/pom.xml 2011-04-15 06:02:02 UTC (rev 1355)
+++ dsp/trunk/api/pom.xml 2011-04-15 14:31:54 UTC (rev 1356)
@@ -5,13 +5,13 @@
<groupId>org.jboss.soa.dsp</groupId>
<artifactId>dsp-api</artifactId>
<packaging>jar</packaging>
- <version>1.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<name>SOA::DSP::API</name>
<parent>
<groupId>org.jboss.soa.dsp</groupId>
<artifactId>dsp</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: dsp/trunk/api/src/main/java/org/jboss/soa/dsp/InvocationAdapter.java
===================================================================
--- dsp/trunk/api/src/main/java/org/jboss/soa/dsp/InvocationAdapter.java 2011-04-15 06:02:02 UTC (rev 1355)
+++ dsp/trunk/api/src/main/java/org/jboss/soa/dsp/InvocationAdapter.java 2011-04-15 14:31:54 UTC (rev 1356)
@@ -17,6 +17,7 @@
package org.jboss.soa.dsp;
import javax.xml.namespace.QName;
+import javax.xml.ws.WebServiceContext;
/**
* Hides the message translation details when invoking ODE from
@@ -33,6 +34,11 @@
QName getServiceName();
String getPortName();
+
+ /**
+ * Get the web service context.
+ */
+ public WebServiceContext getContext();
/**
* Callback from the Service towards the adapter when
@@ -46,13 +52,22 @@
/**
* 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);
+ /**
+ * @param op
+ * @param faultName
+ * @param fault
+ */
void createFault(javax.wsdl.Operation op, QName faultName, MessageAdapter fault);
/**
+ * @param message
+ */
+ public void setMessage(T message);
+
+ /**
* Access the invocation result (response)
* @return T
*/
Added: dsp/trunk/api/src/main/java/org/jboss/soa/dsp/annotation/SecurityDomain.java
===================================================================
--- dsp/trunk/api/src/main/java/org/jboss/soa/dsp/annotation/SecurityDomain.java (rev 0)
+++ dsp/trunk/api/src/main/java/org/jboss/soa/dsp/annotation/SecurityDomain.java 2011-04-15 14:31:54 UTC (rev 1356)
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2011 Red Hat, Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.jboss.soa.dsp.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotation for specifying the JBoss security domain of dynamically deployed services.
+ * This annotation needs to be specified on the {@see WebServiceProviderFactory}.
+ **/
+(a)Target(ElementType.TYPE)
+(a)Retention(RetentionPolicy.RUNTIME)
+public @interface SecurityDomain {
+ String value();
+}
Added: dsp/trunk/api/src/main/java/org/jboss/soa/dsp/annotation/WebMetaData.java
===================================================================
--- dsp/trunk/api/src/main/java/org/jboss/soa/dsp/annotation/WebMetaData.java (rev 0)
+++ dsp/trunk/api/src/main/java/org/jboss/soa/dsp/annotation/WebMetaData.java 2011-04-15 14:31:54 UTC (rev 1356)
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2011 Red Hat, Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.jboss.soa.dsp.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Provides web context specific meta data to DSP based web service endpoints.
+ */
+@Retention(value = RetentionPolicy.RUNTIME)
+@Target(value = { ElementType.TYPE })
+public @interface WebMetaData {
+ /**
+ * The authMethod is used to configure the authentication mechanism for the web service.
+ * As a prerequisite to gaining access to any web service which are protected by an authorization
+ * constraint, a user must have authenticated using the configured mechanism.
+ *
+ * Legal values for this element are "BASIC", or "CLIENT-CERT".
+ */
+ String authMethod() default "";
+
+ /**
+ * The transportGuarantee specifies that the communication
+ * between client and server should be NONE, INTEGRAL, or
+ * CONFIDENTIAL. NONE means that the application does not require any
+ * transport guarantees. A value of INTEGRAL means that the application
+ * requires that the data sent between the client and server be sent in
+ * such a way that it can't be changed in transit. CONFIDENTIAL means
+ * that the application requires that the data be transmitted in a
+ * fashion that prevents other entities from observing the contents of
+ * the transmission. In most cases, the presence of the INTEGRAL or
+ * CONFIDENTIAL flag will indicate that the use of SSL is required.
+ */
+ String transportGuarantee() default "";
+
+ /**
+ * A secure endpoint does not secure wsdl access by default.
+ * Explicitly setting secureWSDLAccess overrides this behaviour.
+ *
+ * Protect access to WSDL. See http://jira.jboss.org/jira/browse/JBWS-723
+ */
+ boolean secureWSDLAccess() default false;
+}
Modified: dsp/trunk/api/src/main/java/org/jboss/soa/dsp/ws/BaseWebServiceEndpoint.java
===================================================================
--- dsp/trunk/api/src/main/java/org/jboss/soa/dsp/ws/BaseWebServiceEndpoint.java 2011-04-15 06:02:02 UTC (rev 1355)
+++ dsp/trunk/api/src/main/java/org/jboss/soa/dsp/ws/BaseWebServiceEndpoint.java 2011-04-15 14:31:54 UTC (rev 1356)
@@ -18,10 +18,12 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.soa.dsp.InvocationAdapter;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+import javax.annotation.Resource;
import javax.wsdl.Definition;
import javax.wsdl.Operation;
import javax.wsdl.WSDLException;
@@ -30,6 +32,7 @@
import javax.xml.namespace.QName;
import javax.xml.soap.*;
import javax.xml.ws.Provider;
+import javax.xml.ws.WebServiceContext;
/**
* Base class for BPEL endpoints that are created through javassist.
@@ -46,10 +49,13 @@
private SOAPMessageAdapter soapAdapter;
private QName serviceQName;
private Definition wsdlDefinition;
- private WebServiceProviderFactory serviceFactory;
+ private WebServiceProviderFactory<SOAPMessage> serviceFactory;
private boolean isInitialized;
-
+ @Resource
+ private WebServiceContext context;
+
+ @SuppressWarnings("unchecked")
private void init()
{
if(!isInitialized)
@@ -105,10 +111,10 @@
// Create invocation context
final String operationName = resolveOperationName(messageElement);
- WSInvocationAdapter invocationContext = serviceFactory.getInvocationAdapter(operationName,
- serviceQName, getPortName(), soapAdapter);
+ InvocationAdapter<SOAPMessage> invocationContext = serviceFactory.getInvocationAdapter(operationName,
+ serviceQName, getPortName(), soapAdapter, getContext());
- invocationContext.setSOAPMessage(soapMessage);
+ invocationContext.setMessage(soapMessage);
// Invoke ODE
serviceFactory.getServiceProvider().invoke(invocationContext);
@@ -138,7 +144,7 @@
}
catch (Exception e)
{
- throw new RuntimeException("Failed to invoke BPEL process: "+e.getMessage(), e);
+ throw new RuntimeException("Failed to invoke endpoint: "+e.getMessage(), e);
}
}
@@ -203,6 +209,13 @@
return messageElement;
}
+ /**
+ *
+ */
+ protected WebServiceContext getContext() {
+ return context;
+ }
+
public String getEndpointId() {
return(null);
}
Modified: dsp/trunk/api/src/main/java/org/jboss/soa/dsp/ws/BuildProcessor.java
===================================================================
--- dsp/trunk/api/src/main/java/org/jboss/soa/dsp/ws/BuildProcessor.java 2011-04-15 06:02:02 UTC (rev 1355)
+++ dsp/trunk/api/src/main/java/org/jboss/soa/dsp/ws/BuildProcessor.java 2011-04-15 14:31:54 UTC (rev 1356)
@@ -18,6 +18,6 @@
public interface BuildProcessor {
- public void process(DeploymentBuilder builder);
+ public void process(IDeploymentBuilder builder);
}
Modified: dsp/trunk/api/src/main/java/org/jboss/soa/dsp/ws/DeploymentBuilder.java
===================================================================
--- dsp/trunk/api/src/main/java/org/jboss/soa/dsp/ws/DeploymentBuilder.java 2011-04-15 06:02:02 UTC (rev 1355)
+++ dsp/trunk/api/src/main/java/org/jboss/soa/dsp/ws/DeploymentBuilder.java 2011-04-15 14:31:54 UTC (rev 1356)
@@ -20,7 +20,7 @@
import java.io.*;
-public class DeploymentBuilder
+public class DeploymentBuilder implements IDeploymentBuilder
{
private static final String DSP = "dsp";
@@ -61,18 +61,30 @@
return this;
}
+ /**
+ * @see org.jboss.soa.dsp.ws.IDeploymentBuilder#getWar()
+ */
public File getWar() {
return(this.war);
}
+ /**
+ * @see org.jboss.soa.dsp.ws.IDeploymentBuilder#getWebInf()
+ */
public File getWebInf() {
return(this.webInf);
}
+ /**
+ * @see org.jboss.soa.dsp.ws.IDeploymentBuilder#getWSDLDir()
+ */
public File getWSDLDir() {
return(this.wsdlDir);
}
+ /**
+ * @see org.jboss.soa.dsp.ws.IDeploymentBuilder#getEndpoint()
+ */
public String getEndpoint() {
return(this.endpointId);
}
@@ -119,6 +131,9 @@
return this;
}
+ /**
+ * @see org.jboss.soa.dsp.ws.IDeploymentBuilder#getWSDL()
+ */
public File getWSDL() {
return(this.wsdl);
}
@@ -129,11 +144,17 @@
return(this);
}
+ /**
+ * @see org.jboss.soa.dsp.ws.IDeploymentBuilder#getProvider()
+ */
public javax.xml.ws.Provider<?> getProvider() {
return(this.provider);
}
- public DeploymentBuilder process(BuildProcessor processor) {
+ /**
+ * @see org.jboss.soa.dsp.ws.IDeploymentBuilder#process(org.jboss.soa.dsp.ws.BuildProcessor)
+ */
+ public IDeploymentBuilder process(BuildProcessor processor) {
if (processor != null) {
processor.process(this);
}
@@ -141,6 +162,9 @@
return(this);
}
+ /**
+ * @see org.jboss.soa.dsp.ws.IDeploymentBuilder#build()
+ */
public File build()
{
return this.war;
Added: dsp/trunk/api/src/main/java/org/jboss/soa/dsp/ws/IDeploymentBuilder.java
===================================================================
--- dsp/trunk/api/src/main/java/org/jboss/soa/dsp/ws/IDeploymentBuilder.java (rev 0)
+++ dsp/trunk/api/src/main/java/org/jboss/soa/dsp/ws/IDeploymentBuilder.java 2011-04-15 14:31:54 UTC (rev 1356)
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2011 Red Hat, Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.jboss.soa.dsp.ws;
+
+import java.io.File;
+
+/**
+ * This interface represents the deployment builder.
+ */
+public interface IDeploymentBuilder {
+
+ /**
+ * This method returns the location of the war file.
+ *
+ * @return The WAR file location
+ */
+ public File getWar();
+
+ /**
+ * This method returns the location of the WEB-INF folder within
+ * the war file.
+ *
+ * @return The location of the WEB-INF folder
+ */
+ public File getWebInf();
+
+ /**
+ * This method returns the location of the folder containing
+ * the WSDL files.
+ *
+ * @return The WSDL folder within the war
+ */
+ public File getWSDLDir();
+
+ /**
+ * This method returns the unique endpoint id associated with the
+ * deployment.
+ *
+ * @return The endpoint id
+ */
+ public String getEndpoint();
+
+ /**
+ * This method returns the location of the WSDL representing the
+ * interface to the deployed service.
+ *
+ * @return The WSDL
+ */
+ public File getWSDL();
+
+ /**
+ * This method returns the Web Service Provider.
+ *
+ * @return The web service provider
+ */
+ public javax.xml.ws.Provider<?> getProvider();
+
+ /**
+ * This method enables a deployment target to customise the deployment
+ * using a supplied build processor.
+ *
+ * @param processor The build processor for modifying the deployment
+ */
+ public IDeploymentBuilder process(BuildProcessor processor);
+
+ /**
+ * This method builds the deployment and returns a reference to the
+ * resulting file.
+ *
+ * @return The deployable file
+ */
+ public File build();
+
+}
\ No newline at end of file
Modified: dsp/trunk/api/src/main/java/org/jboss/soa/dsp/ws/TemplateWebServiceEndpoint.java
===================================================================
--- dsp/trunk/api/src/main/java/org/jboss/soa/dsp/ws/TemplateWebServiceEndpoint.java 2011-04-15 06:02:02 UTC (rev 1355)
+++ dsp/trunk/api/src/main/java/org/jboss/soa/dsp/ws/TemplateWebServiceEndpoint.java 2011-04-15 14:31:54 UTC (rev 1356)
@@ -17,7 +17,7 @@
package org.jboss.soa.dsp.ws;
-import javax.xml.soap.*;
+import javax.xml.soap.SOAPMessage;
import javax.xml.ws.Provider;
Modified: dsp/trunk/api/src/main/java/org/jboss/soa/dsp/ws/WSInvocationAdapter.java
===================================================================
--- dsp/trunk/api/src/main/java/org/jboss/soa/dsp/ws/WSInvocationAdapter.java 2011-04-15 06:02:02 UTC (rev 1355)
+++ dsp/trunk/api/src/main/java/org/jboss/soa/dsp/ws/WSInvocationAdapter.java 2011-04-15 14:31:54 UTC (rev 1356)
@@ -23,6 +23,7 @@
import javax.xml.soap.MessageFactory;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.WebServiceContext;
/**
* @author Heiko Braun <hbraun(a)redhat.com>
@@ -35,16 +36,18 @@
private SOAPMessage soapRequestMessage;
private SOAPMessage soapResponseMessage;
+ private WebServiceContext context;
private final SOAPMessageAdapter soapAdapter;
public WSInvocationAdapter(String operationName,
- QName serviceName, String portName, SOAPMessageAdapter soapAdapter)
+ QName serviceName, String portName, SOAPMessageAdapter soapAdapter, WebServiceContext context)
{
this.operationName = operationName;
this.serviceName = serviceName;
this.portName = portName;
this.soapAdapter = soapAdapter;
+ this.context = context;
}
public String getOperationName()
@@ -105,8 +108,17 @@
return soapResponseMessage;
}
- public void setSOAPMessage(SOAPMessage soapMessage)
- {
- this.soapRequestMessage = soapMessage;
+ /**
+ * @see org.jboss.soa.dsp.InvocationAdapter#getContext()
+ */
+ public WebServiceContext getContext() {
+ return context;
}
+
+ /**
+ * @see org.jboss.soa.dsp.InvocationAdapter#setMessage(java.lang.Object)
+ */
+ public void setMessage(SOAPMessage message) {
+ this.soapRequestMessage = message;
+ }
}
Modified: dsp/trunk/api/src/main/java/org/jboss/soa/dsp/ws/WebServiceProviderFactory.java
===================================================================
--- dsp/trunk/api/src/main/java/org/jboss/soa/dsp/ws/WebServiceProviderFactory.java 2011-04-15 06:02:02 UTC (rev 1355)
+++ dsp/trunk/api/src/main/java/org/jboss/soa/dsp/ws/WebServiceProviderFactory.java 2011-04-15 14:31:54 UTC (rev 1356)
@@ -17,14 +17,33 @@
package org.jboss.soa.dsp.ws;
import javax.xml.namespace.QName;
+import javax.xml.ws.WebServiceContext;
+import org.jboss.soa.dsp.InvocationAdapter;
import org.jboss.soa.dsp.ServiceProvider;
-public interface WebServiceProviderFactory {
+/**
+ * This class provides implementations of the web service provider that
+ * can be dynamically invoked upon receiving requests to the Web Service
+ * interface.
+ */
+public interface WebServiceProviderFactory<T> {
+ /**
+ * This method returns a reference to the service provider.
+ *
+ * @return The service provider
+ */
public ServiceProvider getServiceProvider();
- public WSInvocationAdapter getInvocationAdapter(String operationName,
- QName serviceName, String portName, SOAPMessageAdapter soapAdapter);
+ /**
+ * @param operationName The operation name
+ * @param serviceName The WSDL service name
+ * @param portName The WSDL port name
+ * @param soapAdapter The soap adapter
+ * @param context The context
+ */
+ public InvocationAdapter<T> getInvocationAdapter(String operationName, QName serviceName,
+ String portName, SOAPMessageAdapter soapAdapter, WebServiceContext context);
}
Modified: dsp/trunk/api/src/main/java/org/jboss/soa/dsp/ws/WebServiceProviderGenerator.java
===================================================================
--- dsp/trunk/api/src/main/java/org/jboss/soa/dsp/ws/WebServiceProviderGenerator.java 2011-04-15 06:02:02 UTC (rev 1355)
+++ dsp/trunk/api/src/main/java/org/jboss/soa/dsp/ws/WebServiceProviderGenerator.java 2011-04-15 14:31:54 UTC (rev 1356)
@@ -16,15 +16,23 @@
*/
package org.jboss.soa.dsp.ws;
-import javassist.*;
+import javassist.ClassPool;
+import javassist.CtClass;
+import javassist.CtField;
+import javassist.CtMethod;
+import javassist.LoaderClassPath;
+import javassist.Modifier;
import javassist.bytecode.AnnotationsAttribute;
import javassist.bytecode.ClassFile;
import javassist.bytecode.ConstPool;
import javassist.bytecode.annotation.Annotation;
+import javassist.bytecode.annotation.BooleanMemberValue;
import javassist.bytecode.annotation.EnumMemberValue;
import javassist.bytecode.annotation.StringMemberValue;
import org.jboss.soa.dsp.EndpointMetaData;
+import org.jboss.soa.dsp.annotation.SecurityDomain;
+import org.jboss.soa.dsp.annotation.WebMetaData;
/**
@@ -148,11 +156,38 @@
new StringMemberValue(providerFactory.getName(), constantPool));
attr.addAnnotation(detailsAnnotation);
+
+
+ CtClass factoryProvider = pool.get(providerFactory.getName());
+ AnnotationsAttribute annotationsAttr = (AnnotationsAttribute) factoryProvider.getClassFile().getAttribute(AnnotationsAttribute.visibleTag);
+ if (annotationsAttr != null) {
+ Annotation sd = annotationsAttr.getAnnotation(SecurityDomain.class.getName());
+ if (sd != null) {
+ Annotation sdAnnotation = new Annotation(
+ org.jboss.soa.dsp.annotation.SecurityDomain.class.getName(), constantPool);
+ StringMemberValue value = (StringMemberValue) sd.getMemberValue("value");
+ sdAnnotation.addMemberValue("value", new StringMemberValue(value.getValue(), constantPool));
+ attr.addAnnotation(sdAnnotation);
+ }
+
+ Annotation wmd = annotationsAttr.getAnnotation(WebMetaData.class.getName());
+ if (wmd != null) {
+ Annotation wmdAnnotation = new Annotation(
+ org.jboss.soa.dsp.annotation.WebMetaData.class.getName(), constantPool);
+
+ StringMemberValue auth = (StringMemberValue) wmd.getMemberValue("authMethod");
+ StringMemberValue trans = (StringMemberValue) wmd.getMemberValue("transportGuarantee");
+ BooleanMemberValue secure = (BooleanMemberValue) wmd.getMemberValue("secureWSDLAccess");
+
+ wmdAnnotation.addMemberValue("authMethod", new StringMemberValue(auth.getValue(), constantPool));
+ wmdAnnotation.addMemberValue("transportGuarantee", new StringMemberValue(trans.getValue(), constantPool));
+ wmdAnnotation.addMemberValue("secureWSDLAccess", new BooleanMemberValue(secure.getValue(), constantPool));
+ attr.addAnnotation(wmdAnnotation);
+ }
+ }
-
classFile.addAttribute(attr);
-
// Check if handler chain should be established
if (handlerFilePath != null) {
Annotation handlerChain = new Annotation("javax.jws.HandlerChain", constantPool);
@@ -186,6 +221,10 @@
return obj;
}
+ /**
+ * @param war
+ * @throws Exception
+ */
public void writeClass(java.io.File war) throws Exception {
String dir=war.getAbsolutePath()+java.io.File.separatorChar+"WEB-INF"+
Modified: dsp/trunk/distribution/pom.xml
===================================================================
--- dsp/trunk/distribution/pom.xml 2011-04-15 06:02:02 UTC (rev 1355)
+++ dsp/trunk/distribution/pom.xml 2011-04-15 14:31:54 UTC (rev 1356)
@@ -4,13 +4,13 @@
<groupId>org.jboss.soa.dsp</groupId>
<artifactId>distribution</artifactId>
<packaging>pom</packaging>
- <version>1.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<name>SOA::DSP::Distribution</name>
<parent>
<groupId>org.jboss.soa.dsp</groupId>
<artifactId>dsp</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<properties>
Modified: dsp/trunk/integration/jbossas5/pom.xml
===================================================================
--- dsp/trunk/integration/jbossas5/pom.xml 2011-04-15 06:02:02 UTC (rev 1355)
+++ dsp/trunk/integration/jbossas5/pom.xml 2011-04-15 14:31:54 UTC (rev 1356)
@@ -5,13 +5,13 @@
<groupId>org.jboss.soa.dsp</groupId>
<artifactId>dsp-jbossas5</artifactId>
<packaging>jar</packaging>
- <version>1.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<name>SOA::DSP::Integration::JBossAS5</name>
<parent>
<groupId>org.jboss.soa.dsp</groupId>
<artifactId>integration</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<properties>
Modified: dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/deployer/jbossas5/WebMetaDataFactory.java
===================================================================
--- dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/deployer/jbossas5/WebMetaDataFactory.java 2011-04-15 06:02:02 UTC (rev 1355)
+++ dsp/trunk/integration/jbossas5/src/main/java/org/jboss/soa/dsp/deployer/jbossas5/WebMetaDataFactory.java 2011-04-15 14:31:54 UTC (rev 1356)
@@ -16,14 +16,24 @@
*/
package org.jboss.soa.dsp.deployer.jbossas5;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
import org.jboss.metadata.web.jboss.JBossServletMetaData;
import org.jboss.metadata.web.jboss.JBossServletsMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.metadata.web.spec.AuthConstraintMetaData;
+import org.jboss.metadata.web.spec.LoginConfigMetaData;
+import org.jboss.metadata.web.spec.SecurityConstraintMetaData;
import org.jboss.metadata.web.spec.ServletMappingMetaData;
+import org.jboss.metadata.web.spec.TransportGuaranteeType;
+import org.jboss.metadata.web.spec.UserDataConstraintMetaData;
+import org.jboss.metadata.web.spec.WebResourceCollectionMetaData;
+import org.jboss.metadata.web.spec.WebResourceCollectionsMetaData;
+import org.jboss.soa.dsp.annotation.SecurityDomain;
+import org.jboss.soa.dsp.annotation.WebMetaData;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* Creates an in-memory representation of web meta data.
* Based on http://anonsvn.jboss.org/repos/jbossas/tags/JBoss_5_1_0_GA/webservices/sr...
@@ -48,12 +58,18 @@
public JBossWebMetaData createWebMetaData(ClassLoader loader)
{
JBossWebMetaData jbwmd = new JBossWebMetaData();
- createWebAppDescriptor(jbwmd);
- createJBossWebAppDescriptor(jbwmd);
+ try {
+ Class<?> providerFactory = Class.forName(servletClassName);
+ createWebAppDescriptor(jbwmd, providerFactory);
+ createJBossWebAppDescriptor(jbwmd, providerFactory);
+ } catch (ClassNotFoundException ex) {
+
+ }
+
return jbwmd;
}
- private void createWebAppDescriptor(JBossWebMetaData jbwmd)
+ private void createWebAppDescriptor(JBossWebMetaData jbwmd, Class<?> providerFactory)
{
/*
<servlet>
@@ -75,8 +91,7 @@
</servlet-mapping>
*/
List<ServletMappingMetaData> servletMappings = jbwmd.getServletMappings();
- if (servletMappings == null)
- {
+ if (servletMappings == null) {
servletMappings = new ArrayList<ServletMappingMetaData>();
jbwmd.setServletMappings(servletMappings);
}
@@ -87,9 +102,90 @@
servletMapping.setUrlPatterns(urlPatterns);
servletMappings.add(servletMapping);
+ WebMetaData metaData = providerFactory.getAnnotation(WebMetaData.class);
+ if (metaData != null)
+ configureSecurity(jbwmd, metaData);
}
- private void createJBossWebAppDescriptor(JBossWebMetaData jbwmd)
+ /**
+ * @param jbwmd
+ */
+ protected void configureSecurity(JBossWebMetaData jbwmd, WebMetaData metaData) {
+ Boolean secureWSDLAccess = null;
+ String transportGuarantee = null;
+ String beanAuthMethod = null;
+
+ if (metaData != null) {
+ if (metaData.authMethod().length() > 0)
+ beanAuthMethod = metaData.authMethod();
+ if (metaData.transportGuarantee().length() > 0)
+ transportGuarantee = metaData.transportGuarantee();
+ if (metaData.secureWSDLAccess())
+ secureWSDLAccess = metaData.secureWSDLAccess();
+ }
+
+ String authMethod = null;
+ if (beanAuthMethod != null || transportGuarantee != null) {
+ List<SecurityConstraintMetaData> securityContraints = jbwmd.getSecurityContraints();
+ if (securityContraints == null) {
+ securityContraints = new ArrayList<SecurityConstraintMetaData>();
+ jbwmd.setSecurityContraints(securityContraints);
+ }
+
+ SecurityConstraintMetaData securityConstraint = new SecurityConstraintMetaData();
+ securityContraints.add(securityConstraint);
+
+ WebResourceCollectionsMetaData resourceCollections = securityConstraint.getResourceCollections();
+ if (resourceCollections == null) {
+ resourceCollections = new WebResourceCollectionsMetaData();
+ securityConstraint.setResourceCollections(resourceCollections);
+ }
+
+ WebResourceCollectionMetaData resourceCollection = new WebResourceCollectionMetaData();
+ resourceCollections.add(resourceCollection);
+
+ resourceCollection.setWebResourceName(endpointId);
+ resourceCollection.setUrlPatterns(Arrays.asList(new String[] { urlPattern }));
+ ArrayList<String> httpMethods = new ArrayList<String>();
+ resourceCollection.setHttpMethods(httpMethods);
+ if (Boolean.TRUE.equals(secureWSDLAccess)) {
+ httpMethods.add("GET");
+ }
+ httpMethods.add("POST");
+
+ if (beanAuthMethod != null) {
+ // Only the first auth-method gives the war login-config/auth-method
+ if (authMethod == null)
+ authMethod = beanAuthMethod;
+
+ AuthConstraintMetaData authConstraint = new AuthConstraintMetaData();
+ authConstraint.setRoleNames(Arrays.asList(new String[] { "*" }));
+ securityConstraint.setAuthConstraint(authConstraint);
+ }
+
+ if (transportGuarantee != null) {
+ UserDataConstraintMetaData userDataConstraint = new UserDataConstraintMetaData();
+ userDataConstraint.setTransportGuarantee(TransportGuaranteeType.valueOf(transportGuarantee));
+ securityConstraint.setUserDataConstraint(userDataConstraint);
+ }
+
+ if (authMethod != null) {
+ LoginConfigMetaData loginConfig = jbwmd.getLoginConfig();
+ if (loginConfig == null) {
+ loginConfig = new LoginConfigMetaData();
+ jbwmd.setLoginConfig(loginConfig);
+ }
+ loginConfig.setAuthMethod(authMethod);
+ loginConfig.setRealmName("DSP Security Realm");
+ }
+ }
+ }
+
+ /**
+ * @param jbwmd
+ * @param providerFactory
+ */
+ private void createJBossWebAppDescriptor(JBossWebMetaData jbwmd, Class<?> providerFactory)
{
/* Create a jboss-web
<jboss-web>
@@ -98,7 +194,21 @@
<virtual-host>some.domain.com</virtual-host>
</jboss-web>
*/
-
+ SecurityDomain domain = providerFactory.getAnnotation(SecurityDomain.class);
+ if (domain != null)
+ addSecurityDomain(jbwmd, domain.value());
jbwmd.setContextRoot(webContext);
}
+
+ public void addSecurityDomain(JBossWebMetaData jbossWeb, String securityDomain)
+ {
+
+ if (securityDomain != null)
+ {
+ if (securityDomain.startsWith("java:/jaas/") == false)
+ securityDomain = "java:/jaas/" + securityDomain;
+
+ jbossWeb.setSecurityDomain(securityDomain);
+ }
+ }
}
Modified: dsp/trunk/integration/jbossas6/pom.xml
===================================================================
--- dsp/trunk/integration/jbossas6/pom.xml 2011-04-15 06:02:02 UTC (rev 1355)
+++ dsp/trunk/integration/jbossas6/pom.xml 2011-04-15 14:31:54 UTC (rev 1356)
@@ -5,13 +5,13 @@
<groupId>org.jboss.soa.dsp</groupId>
<artifactId>dsp-jbossas6</artifactId>
<packaging>jar</packaging>
- <version>1.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<name>SOA::DSP::Integration::JBossAS6</name>
<parent>
<groupId>org.jboss.soa.dsp</groupId>
<artifactId>integration</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<properties>
Modified: dsp/trunk/integration/pom.xml
===================================================================
--- dsp/trunk/integration/pom.xml 2011-04-15 06:02:02 UTC (rev 1355)
+++ dsp/trunk/integration/pom.xml 2011-04-15 14:31:54 UTC (rev 1356)
@@ -5,13 +5,13 @@
<groupId>org.jboss.soa.dsp</groupId>
<artifactId>integration</artifactId>
<packaging>pom</packaging>
- <version>1.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<name>SOA::DSP::Integration</name>
<parent>
<groupId>org.jboss.soa.dsp</groupId>
<artifactId>dsp</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<modules>
Modified: dsp/trunk/integration/tomcat/pom.xml
===================================================================
--- dsp/trunk/integration/tomcat/pom.xml 2011-04-15 06:02:02 UTC (rev 1355)
+++ dsp/trunk/integration/tomcat/pom.xml 2011-04-15 14:31:54 UTC (rev 1356)
@@ -5,13 +5,13 @@
<groupId>org.jboss.soa.dsp</groupId>
<artifactId>dsp-tomcat</artifactId>
<packaging>jar</packaging>
- <version>1.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<name>SOA::DSP::Integration::Tomcat</name>
<parent>
<groupId>org.jboss.soa.dsp</groupId>
<artifactId>integration</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: dsp/trunk/integration/tomcat/src/main/java/org/jboss/soa/dsp/deployer/tomcat/TomcatServiceDeployer.java
===================================================================
--- dsp/trunk/integration/tomcat/src/main/java/org/jboss/soa/dsp/deployer/tomcat/TomcatServiceDeployer.java 2011-04-15 06:02:02 UTC (rev 1355)
+++ dsp/trunk/integration/tomcat/src/main/java/org/jboss/soa/dsp/deployer/tomcat/TomcatServiceDeployer.java 2011-04-15 14:31:54 UTC (rev 1356)
@@ -37,7 +37,7 @@
import org.jboss.soa.dsp.deployer.ServiceDeployer;
import org.jboss.soa.dsp.server.ServerConfig;
import org.jboss.soa.dsp.ws.BuildProcessor;
-import org.jboss.soa.dsp.ws.DeploymentBuilder;
+import org.jboss.soa.dsp.ws.IDeploymentBuilder;
public class TomcatServiceDeployer implements ServiceDeployer {
@@ -140,7 +140,7 @@
protected class TomcatBuildProcessor implements BuildProcessor {
- public void process(DeploymentBuilder builder) {
+ public void process(IDeploymentBuilder builder) {
String endpointId=builder.getEndpoint();
String provider=(builder.getProvider() == null ? null : builder.getProvider().getClass().getName());
java.util.List<String> urls=getURLs(builder.getWSDL());
Modified: dsp/trunk/pom.xml
===================================================================
--- dsp/trunk/pom.xml 2011-04-15 06:02:02 UTC (rev 1355)
+++ dsp/trunk/pom.xml 2011-04-15 14:31:54 UTC (rev 1356)
@@ -5,11 +5,11 @@
<groupId>org.jboss.soa.dsp</groupId>
<artifactId>dsp</artifactId>
<packaging>pom</packaging>
- <version>1.1.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<name>SOA::DSP</name>
<properties>
- <dsp.version>1.1.0-SNAPSHOT</dsp.version>
+ <dsp.version>2.0.0-SNAPSHOT</dsp.version>
<junit.version>4.8.1</junit.version>
<jaxws.version>2.1</jaxws.version>
<wsdl4j.version>1.6.2</wsdl4j.version>
Modified: dsp/trunk/samples/example-deployer/provider/src/org/jboss/soa/dsp/example/provider/ExampleWebServiceFactory.java
===================================================================
--- dsp/trunk/samples/example-deployer/provider/src/org/jboss/soa/dsp/example/provider/ExampleWebServiceFactory.java 2011-04-15 06:02:02 UTC (rev 1355)
+++ dsp/trunk/samples/example-deployer/provider/src/org/jboss/soa/dsp/example/provider/ExampleWebServiceFactory.java 2011-04-15 14:31:54 UTC (rev 1356)
@@ -17,21 +17,24 @@
package org.jboss.soa.dsp.example.provider;
import javax.xml.namespace.QName;
+import javax.xml.soap.SOAPMessage;
import org.jboss.soa.dsp.ServiceProvider;
import org.jboss.soa.dsp.ws.SOAPMessageAdapter;
+import org.jboss.soa.dsp.InvocationAdapter;
import org.jboss.soa.dsp.ws.WSInvocationAdapter;
import org.jboss.soa.dsp.ws.WebServiceProviderFactory;
-public class ExampleWebServiceFactory implements WebServiceProviderFactory {
+public class ExampleWebServiceFactory implements WebServiceProviderFactory<SOAPMessage> {
public ServiceProvider getServiceProvider() {
return(new ExampleServiceProvider());
}
- public WSInvocationAdapter getInvocationAdapter(String operationName,
- QName serviceName, String portName, SOAPMessageAdapter soapAdapter) {
+ public InvocationAdapter<SOAPMessage> getInvocationAdapter(String operationName,
+ QName serviceName, String portName, SOAPMessageAdapter soapAdapter,
+ javax.xml.ws.WebServiceContext context) {
return(new WSInvocationAdapter(operationName,
- serviceName, portName, soapAdapter));
+ serviceName, portName, soapAdapter, context));
}
}
13 years, 8 months
- 1
- 0
riftsaw SVN: r1355 - in trunk/distribution/src/main/release/conf: migration and 1 other directory.
by riftsaw-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2011-04-15 02:02:02 -0400 (Fri, 15 Apr 2011)
New Revision: 1355
Added:
trunk/distribution/src/main/release/conf/migration/db2220-230upgrade.sql
trunk/distribution/src/main/release/conf/migration/hsql220-230upgrade.sql
trunk/distribution/src/main/release/conf/migration/mysql220-230upgrade.sql
trunk/distribution/src/main/release/conf/migration/oracle220-230upgrade.sql
trunk/distribution/src/main/release/conf/migration/postgres220-230upgrade.sql
trunk/distribution/src/main/release/conf/migration/sqlserver220-230upgrade.sql
Modified:
trunk/distribution/src/main/release/conf/build.xml
Log:
*RIFTSAW-374, added db migrations cript.
Modified: trunk/distribution/src/main/release/conf/build.xml
===================================================================
--- trunk/distribution/src/main/release/conf/build.xml 2011-04-14 15:09:26 UTC (rev 1354)
+++ trunk/distribution/src/main/release/conf/build.xml 2011-04-15 06:02:02 UTC (rev 1355)
@@ -72,7 +72,7 @@
</target>
<!-- ### Upgrade RiftSaw SCHEMA ############################################### -->
- <target name="upgrade.riftsaw.schema"
+ <target name="upgrade.riftsaw.schema.220-230"
depends="log.properties"
description="upgrade riftsaw schema">
<sql driver="${driver}"
@@ -80,6 +80,23 @@
userid="${username}"
password="${password}"
onerror="continue"
+ src="migration/${database}220-230upgrade.sql">
+ <classpath>
+ <fileset dir="drivers">
+ <include name="*.jar"/>
+ </fileset>
+ </classpath>
+ </sql>
+ </target>
+
+ <target name="upgrade.riftsaw.schema.210-220"
+ depends="log.properties"
+ description="upgrade riftsaw schema">
+ <sql driver="${driver}"
+ url="${connection.url}"
+ userid="${username}"
+ password="${password}"
+ onerror="continue"
src="migration/${database}210-220upgrade.sql">
<classpath>
<fileset dir="drivers">
@@ -89,6 +106,7 @@
</sql>
</target>
+
<!-- ### Show tables in the database ############################### -->
<target name="db.show.tables"
depends="log.properties"
Added: trunk/distribution/src/main/release/conf/migration/db2220-230upgrade.sql
===================================================================
--- trunk/distribution/src/main/release/conf/migration/db2220-230upgrade.sql (rev 0)
+++ trunk/distribution/src/main/release/conf/migration/db2220-230upgrade.sql 2011-04-15 06:02:02 UTC (rev 1355)
@@ -0,0 +1,4 @@
+UPDATE ODE_SCHEMA_VERSION SET VERSION = 230;
+
+ALTER TABLE BPAF_EVENT_DATA
+ ALTER COLUMN VALUE clob(4000);
\ No newline at end of file
Added: trunk/distribution/src/main/release/conf/migration/hsql220-230upgrade.sql
===================================================================
--- trunk/distribution/src/main/release/conf/migration/hsql220-230upgrade.sql (rev 0)
+++ trunk/distribution/src/main/release/conf/migration/hsql220-230upgrade.sql 2011-04-15 06:02:02 UTC (rev 1355)
@@ -0,0 +1,4 @@
+UPDATE ODE_SCHEMA_VERSION SET VERSION = 230;
+
+ALTER TABLE BPAF_EVENT_DATA
+ ALTER COLUMN VALUE clob;
\ No newline at end of file
Added: trunk/distribution/src/main/release/conf/migration/mysql220-230upgrade.sql
===================================================================
--- trunk/distribution/src/main/release/conf/migration/mysql220-230upgrade.sql (rev 0)
+++ trunk/distribution/src/main/release/conf/migration/mysql220-230upgrade.sql 2011-04-15 06:02:02 UTC (rev 1355)
@@ -0,0 +1,4 @@
+UPDATE ODE_SCHEMA_VERSION SET VERSION = 230;
+
+ALTER TABLE BPAF_EVENT_DATA
+ ALTER COLUMN VALUE longtext;
\ No newline at end of file
Added: trunk/distribution/src/main/release/conf/migration/oracle220-230upgrade.sql
===================================================================
--- trunk/distribution/src/main/release/conf/migration/oracle220-230upgrade.sql (rev 0)
+++ trunk/distribution/src/main/release/conf/migration/oracle220-230upgrade.sql 2011-04-15 06:02:02 UTC (rev 1355)
@@ -0,0 +1,4 @@
+UPDATE ODE_SCHEMA_VERSION SET VERSION = 230;
+
+ALTER TABLE BPAF_EVENT_DATA
+ ALTER COLUMN VALUE clob;
\ No newline at end of file
Added: trunk/distribution/src/main/release/conf/migration/postgres220-230upgrade.sql
===================================================================
--- trunk/distribution/src/main/release/conf/migration/postgres220-230upgrade.sql (rev 0)
+++ trunk/distribution/src/main/release/conf/migration/postgres220-230upgrade.sql 2011-04-15 06:02:02 UTC (rev 1355)
@@ -0,0 +1,4 @@
+UPDATE ODE_SCHEMA_VERSION SET VERSION = 230;
+
+ALTER TABLE BPAF_EVENT_DATA
+ ALTER COLUMN VALUE text;
\ No newline at end of file
Added: trunk/distribution/src/main/release/conf/migration/sqlserver220-230upgrade.sql
===================================================================
--- trunk/distribution/src/main/release/conf/migration/sqlserver220-230upgrade.sql (rev 0)
+++ trunk/distribution/src/main/release/conf/migration/sqlserver220-230upgrade.sql 2011-04-15 06:02:02 UTC (rev 1355)
@@ -0,0 +1,4 @@
+UPDATE ODE_SCHEMA_VERSION SET VERSION = 230;
+
+ALTER TABLE BPAF_EVENT_DATA
+ ALTER COLUMN VALUE text null;
\ No newline at end of file
13 years, 8 months
- 1
- 0
riftsaw SVN: r1354 - in trunk: distribution/src/main/assembly and 11 other directories.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2011-04-14 11:09:26 -0400 (Thu, 14 Apr 2011)
New Revision: 1354
Added:
trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw372TestCase.java
trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/
trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/bpel/
trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/bpel/HelloGoodbye.bpel
trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/bpel/HelloGoodbye.wsdl
trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/bpel/deploy.xml
trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/build.xml
trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/messages/
trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/messages/goodbye_request1.xml
trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/messages/goodbye_response1.xml
trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/messages/hello_request1.xml
trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/messages/hello_response1.xml
trunk/samples/quickstart/simple_correlation_header/
trunk/samples/quickstart/simple_correlation_header/.project
trunk/samples/quickstart/simple_correlation_header/.settings/
trunk/samples/quickstart/simple_correlation_header/.settings/org.eclipse.wst.common.component
trunk/samples/quickstart/simple_correlation_header/.settings/org.eclipse.wst.common.project.facet.core.xml
trunk/samples/quickstart/simple_correlation_header/bpelContent/
trunk/samples/quickstart/simple_correlation_header/bpelContent/HelloGoodbye.bpel
trunk/samples/quickstart/simple_correlation_header/bpelContent/HelloGoodbye.wsdl
trunk/samples/quickstart/simple_correlation_header/bpelContent/deploy.xml
trunk/samples/quickstart/simple_correlation_header/build.xml
trunk/samples/quickstart/simple_correlation_header/messages/
trunk/samples/quickstart/simple_correlation_header/messages/goodbye_request1.xml
trunk/samples/quickstart/simple_correlation_header/messages/goodbye_request2.xml
trunk/samples/quickstart/simple_correlation_header/messages/goodbye_request3.xml
trunk/samples/quickstart/simple_correlation_header/messages/hello_request1.xml
trunk/samples/quickstart/simple_correlation_header/messages/hello_request2.xml
trunk/samples/quickstart/simple_correlation_header/messages/hello_request3.xml
trunk/samples/quickstart/simple_correlation_header/readme.txt
Modified:
trunk/distribution/src/main/assembly/bin.xml
trunk/integration-tests/build.xml
trunk/pom.xml
Log:
RIFTSAW-372 - added integration test, and also new quickstart example, to demonstrate correlation based on header properties.
Modified: trunk/distribution/src/main/assembly/bin.xml
===================================================================
--- trunk/distribution/src/main/assembly/bin.xml 2011-04-14 06:40:08 UTC (rev 1353)
+++ trunk/distribution/src/main/assembly/bin.xml 2011-04-14 15:09:26 UTC (rev 1354)
@@ -110,6 +110,7 @@
<include>quickstart/secure_service/**</include>
<include>quickstart/service_handler/**</include>
<include>quickstart/simple_correlation/**</include>
+ <include>quickstart/simple_correlation_header/**</include>
<include>quickstart/simple_invoke/**</include>
<include>quickstart/simple_pick/**</include>
<include>quickstart/while_wait/**</include>
Modified: trunk/integration-tests/build.xml
===================================================================
--- trunk/integration-tests/build.xml 2011-04-14 06:40:08 UTC (rev 1353)
+++ trunk/integration-tests/build.xml 2011-04-14 15:09:26 UTC (rev 1354)
@@ -211,6 +211,7 @@
<ant antfile="src/test/resources/testcases/RiftSaw_318/build.xml" />
<ant antfile="src/test/resources/testcases/RiftSaw_326/build.xml" />
<ant antfile="src/test/resources/testcases/RiftSaw_345/build.xml" />
+ <ant antfile="src/test/resources/testcases/RiftSaw_372/build.xml" />
<ant antfile="src/test/resources/management/RiftSaw_238/build.xml" />
Added: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw372TestCase.java
===================================================================
--- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw372TestCase.java (rev 0)
+++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw372TestCase.java 2011-04-14 15:09:26 UTC (rev 1354)
@@ -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.bpel.tests.testcases;
+
+import org.jboss.soa.bpel.tests.RiftSawTest;
+import org.jboss.soa.bpel.tests.RiftSawTestSetup;
+
+import junit.framework.Test;
+
+/**
+ * Test case for running the RiftSaw_372 testcase sample.
+ */
+public class RiftSaw372TestCase extends RiftSawTest {
+
+ private static final String TEST_NAME = "RiftSaw_372";
+
+ public RiftSaw372TestCase() {
+ super(TEST_NAME);
+ }
+
+ public static Test suite() {
+ return(new RiftSawTestSetup(RiftSaw372TestCase.class,
+ TEST_NAME, "RiftSaw_372-1.jar"));
+ }
+
+ public void testSendHelloGoodbye() throws Exception {
+
+ // Additional delay - this is the first test, and on loaded servers
+ // it can sometimes fail if the BPEL process has not had time to be
+ // compiled
+ try {
+ synchronized(this) {
+ wait(30000);
+ }
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
+
+ String result1=sendSOAPMessage("hello_request1.xml",
+ "http://localhost:8080/RiftSaw_372WS");
+
+ result1 = processResult(result1);
+
+ assertMessageFromFile(result1, "hello_response1.xml");
+
+ String result2=sendSOAPMessage("goodbye_request1.xml",
+ "http://localhost:8080/RiftSaw_372WS");
+
+ result2 = processResult(result2);
+
+ assertMessageFromFile(result2, "goodbye_response1.xml");
+ }
+}
Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/bpel/HelloGoodbye.bpel
===================================================================
--- trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/bpel/HelloGoodbye.bpel (rev 0)
+++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/bpel/HelloGoodbye.bpel 2011-04-14 15:09:26 UTC (rev 1354)
@@ -0,0 +1,112 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<process name="HelloGoodbye"
+ targetNamespace="http://www.jboss.org/bpel/examples"
+ xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+ xmlns:tns="http://www.jboss.org/bpel/examples"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:intf="http://www.jboss.org/bpel/examples/wsdl"
+ queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+ expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+
+ <import location="HelloGoodbye.wsdl"
+ namespace="http://www.jboss.org/bpel/examples/wsdl"
+ importType="http://schemas.xmlsoap.org/wsdl/" />
+
+ <partnerLinks>
+ <partnerLink name="helloGoodbyePartnerLink"
+ partnerLinkType="intf:HelloGoodbyePartnerLinkType"
+ myRole="me" />
+ </partnerLinks>
+
+ <correlationSets xmlns:cor="http://example.com/supplyCorrelation">
+ <correlationSet name="Session"
+ properties="intf:SessionID" />
+ </correlationSets>
+
+ <variables>
+ <variable name="myHelloVar" messageType="intf:HelloMessage"/>
+ <variable name="myGoodbyeVar" messageType="intf:GoodbyeMessage"/>
+ <variable name="mesgVar" type="xsd:string"/>
+ </variables>
+
+ <sequence>
+ <receive
+ name="start"
+ partnerLink="helloGoodbyePartnerLink"
+ portType="intf:HelloGoodbyePortType"
+ operation="hello"
+ variable="myHelloVar"
+ createInstance="yes">
+ <correlations>
+ <correlation set="Session" initiate="yes" />
+ </correlations>
+ </receive>
+
+ <assign name="assignHelloMesg">
+ <copy>
+ <from variable="myHelloVar" part="Message"/>
+ <to variable="mesgVar"/>
+ </copy>
+ <copy>
+ <from>concat($mesgVar,' World')</from>
+ <to variable="myHelloVar" part="Message"/>
+ </copy>
+ </assign>
+ <reply name="end"
+ partnerLink="helloGoodbyePartnerLink"
+ portType="intf:HelloGoodbyePortType"
+ operation="hello"
+ variable="myHelloVar">
+ <correlations>
+ <correlation set="Session" initiate="no" />
+ </correlations>
+ </reply>
+ <receive
+ name="start"
+ partnerLink="helloGoodbyePartnerLink"
+ portType="intf:HelloGoodbyePortType"
+ operation="goodbye"
+ variable="myGoodbyeVar">
+ <correlations>
+ <correlation set="Session" initiate="no" />
+ </correlations>
+ </receive>
+
+ <assign name="assignGoodbyeMesg">
+ <copy>
+ <from variable="myGoodbyeVar" part="Message"/>
+ <to variable="mesgVar"/>
+ </copy>
+ <copy>
+ <from>concat($mesgVar,' World')</from>
+ <to variable="myGoodbyeVar" part="Message"/>
+ </copy>
+ </assign>
+ <reply name="end"
+ partnerLink="helloGoodbyePartnerLink"
+ portType="intf:HelloGoodbyePortType"
+ operation="goodbye"
+ variable="myGoodbyeVar">
+ <correlations>
+ <correlation set="Session" initiate="no" />
+ </correlations>
+ </reply>
+ </sequence>
+</process>
Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/bpel/HelloGoodbye.wsdl
===================================================================
--- trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/bpel/HelloGoodbye.wsdl (rev 0)
+++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/bpel/HelloGoodbye.wsdl 2011-04-14 15:09:26 UTC (rev 1354)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<wsdl:definitions
+ targetNamespace="http://www.jboss.org/bpel/examples/wsdl"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:tns="http://www.jboss.org/bpel/examples/wsdl"
+ xmlns:types="http://www.jboss.org/bpel/examples/xsd"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop"
+ xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype">
+
+ <wsdl:types>
+ <xsd:schema targetNamespace="http://www.jboss.org/bpel/examples/xsd">
+ <xsd:element name="SessionIdentity" type="xsd:int" />
+ </xsd:schema>
+ </wsdl:types>
+
+ <wsdl:message name="HelloMessage">
+ <wsdl:part name="ID" element="types:SessionIdentity"/>
+ <wsdl:part name="Message" type="xsd:string"/>
+ </wsdl:message>
+
+ <wsdl:message name="GoodbyeMessage">
+ <wsdl:part name="ID" element="types:SessionIdentity"/>
+ <wsdl:part name="Message" type="xsd:string"/>
+ </wsdl:message>
+
+ <wsdl:portType name="HelloGoodbyePortType">
+ <wsdl:operation name="hello">
+ <wsdl:input message="tns:HelloMessage" name="HelloIn"/>
+ <wsdl:output message="tns:HelloMessage" name="HelloOut"/>
+ </wsdl:operation>
+ <wsdl:operation name="goodbye">
+ <wsdl:input message="tns:GoodbyeMessage" name="GoodbyeIn"/>
+ <wsdl:output message="tns:GoodbyeMessage" name="GoodbyeOut"/>
+ </wsdl:operation>
+ </wsdl:portType>
+
+ <wsdl:binding name="HelloGoodbyeSoapBinding" type="tns:HelloGoodbyePortType">
+ <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="hello">
+ <soap:operation soapAction="" style="rpc"/>
+ <wsdl:input>
+ <soap:body
+ namespace="http://www.jboss.org/bpel/examples/wsdl"
+ use="literal" parts="Message"/>
+ <soap:header message="tns:HelloMessage"
+ part="ID" use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body
+ namespace="http://www.jboss.org/bpel/examples/wsdl"
+ use="literal" parts="Message"/>
+ <soap:header message="tns:HelloMessage"
+ part="ID" use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="goodbye">
+ <soap:operation soapAction="" style="rpc"/>
+ <wsdl:input>
+ <soap:body
+ namespace="http://www.jboss.org/bpel/examples/wsdl"
+ use="literal" parts="Message"/>
+ <soap:header message="tns:GoodbyeMessage"
+ part="ID" use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body
+ namespace="http://www.jboss.org/bpel/examples/wsdl"
+ use="literal" parts="Message"/>
+ <soap:header message="tns:GoodbyeMessage"
+ part="ID" use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="HelloGoodbyeService">
+ <wsdl:port name="HelloGoodbyePort" binding="tns:HelloGoodbyeSoapBinding">
+ <soap:address location="http://localhost:8080/RiftSaw_372WS"/>
+ </wsdl:port>
+ </wsdl:service>
+
+ <plnk:partnerLinkType name="HelloGoodbyePartnerLinkType">
+ <plnk:role name="me" portType="tns:HelloGoodbyePortType"/>
+ <plnk:role name="you" portType="tns:HelloGoodbyePortType"/>
+ </plnk:partnerLinkType>
+
+ <vprop:property name="SessionID" type="xsd:int" />
+
+ <vprop:propertyAlias propertyName="tns:SessionID"
+ messageType="tns:HelloMessage" part="ID">
+ <vprop:query>text()</vprop:query>
+ </vprop:propertyAlias>
+
+ <vprop:propertyAlias propertyName="tns:SessionID"
+ messageType="tns:GoodbyeMessage" part="ID">
+ <vprop:query>text()</vprop:query>
+ </vprop:propertyAlias>
+
+
+</wsdl:definitions>
+
Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/bpel/deploy.xml
===================================================================
--- trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/bpel/deploy.xml (rev 0)
+++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/bpel/deploy.xml 2011-04-14 15:09:26 UTC (rev 1354)
@@ -0,0 +1,30 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
+ xmlns:bpl="http://www.jboss.org/bpel/examples"
+ xmlns:intf="http://www.jboss.org/bpel/examples/wsdl">
+
+ <process name="bpl:HelloGoodbye">
+ <active>true</active>
+ <process-events generate="all"/>
+ <provide partnerLink="helloGoodbyePartnerLink">
+ <service name="intf:HelloGoodbyeService" port="HelloGoodbyePort"/>
+ </provide>
+ </process>
+</deploy>
Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/build.xml
===================================================================
--- trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/build.xml (rev 0)
+++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/build.xml 2011-04-14 15:09:26 UTC (rev 1354)
@@ -0,0 +1,30 @@
+<project name="RiftSaw_372" default="deploy" basedir=".">
+
+ <description>
+ ${ant.project.name}
+ ${line.separator}
+ </description>
+
+ <property name="version" value="1" />
+
+ <property name="deploy.dir" value="${basedir}/target/tests"/>
+ <property name="test.dir" value="${basedir}/src/test/resources/testcases/${ant.project.name}" />
+
+ <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" />
+
+ <target name="deploy">
+ <echo>Deploy ${ant.project.name}</echo>
+ <mkdir dir="${deploy.dir}/${ant.project.name}" />
+ <jar basedir="${test.dir}/bpel" destfile="${deploy.dir}/${ant.project.name}/${sample.jar.name}" />
+
+ <copy todir="${deploy.dir}/${ant.project.name}">
+ <fileset dir="${test.dir}/messages"/>
+ </copy>
+ </target>
+
+ <target name="undeploy">
+ <echo>Undeploy ${ant.project.name}</echo>
+ <delete file="${deploy.dir}/${sample.jar.name}" />
+ </target>
+
+</project>
Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/messages/goodbye_request1.xml
===================================================================
--- trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/messages/goodbye_request1.xml (rev 0)
+++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/messages/goodbye_request1.xml 2011-04-14 15:09:26 UTC (rev 1354)
@@ -0,0 +1,10 @@
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:wsdl="http://www.jboss.org/bpel/examples/wsdl">
+ <soapenv:Header>
+ <ns:SessionIdentity xmlns:ns="http://www.jboss.org/bpel/examples/xsd">1</ns:SessionIdentity>
+ </soapenv:Header>
+ <soapenv:Body>
+ <wsdl:goodbye>
+ <Message>Goodbye</Message>
+ </wsdl:goodbye>
+ </soapenv:Body>
+</soapenv:Envelope>
Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/messages/goodbye_response1.xml
===================================================================
--- trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/messages/goodbye_response1.xml (rev 0)
+++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/messages/goodbye_response1.xml 2011-04-14 15:09:26 UTC (rev 1354)
@@ -0,0 +1 @@
+<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:Header><ns:SessionIdentity xmlns:ns='http://www.jboss.org/bpel/examples/xsd'>1</ns:SessionIdentity></env:Header><env:Body><odens:goodbyeResponse xmlns:odens='http://www.jboss.org/bpel/examples/wsdl'><Message>Goodbye World</Message></odens:goodbyeResponse></env:Body></env:Envelope>
\ No newline at end of file
Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/messages/hello_request1.xml
===================================================================
--- trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/messages/hello_request1.xml (rev 0)
+++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/messages/hello_request1.xml 2011-04-14 15:09:26 UTC (rev 1354)
@@ -0,0 +1,10 @@
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:wsdl="http://www.jboss.org/bpel/examples/wsdl">
+ <soapenv:Header>
+ <ns:SessionIdentity xmlns:ns="http://www.jboss.org/bpel/examples/xsd">1</ns:SessionIdentity>
+ </soapenv:Header>
+ <soapenv:Body>
+ <wsdl:hello>
+ <Message>Hello</Message>
+ </wsdl:hello>
+ </soapenv:Body>
+</soapenv:Envelope>
Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/messages/hello_response1.xml
===================================================================
--- trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/messages/hello_response1.xml (rev 0)
+++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_372/messages/hello_response1.xml 2011-04-14 15:09:26 UTC (rev 1354)
@@ -0,0 +1 @@
+<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:Header><ns:SessionIdentity xmlns:ns='http://www.jboss.org/bpel/examples/xsd'>1</ns:SessionIdentity></env:Header><env:Body><odens:helloResponse xmlns:odens='http://www.jboss.org/bpel/examples/wsdl'><Message>Hello World</Message></odens:helloResponse></env:Body></env:Envelope>
\ No newline at end of file
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-04-14 06:40:08 UTC (rev 1353)
+++ trunk/pom.xml 2011-04-14 15:09:26 UTC (rev 1354)
@@ -85,7 +85,7 @@
</profiles>
<properties>
- <riftsaw.ode.version>2.3.0.CR1</riftsaw.ode.version>
+ <riftsaw.ode.version>2.3.0-SNAPSHOT</riftsaw.ode.version>
<riftsaw.engine.version>2.3.0-SNAPSHOT</riftsaw.engine.version>
<bpel.console.version>2.2.5-SNAPSHOT</bpel.console.version>
<activity.monitor.model.version>1.0.0.CR1</activity.monitor.model.version>
Added: trunk/samples/quickstart/simple_correlation_header/.project
===================================================================
--- trunk/samples/quickstart/simple_correlation_header/.project (rev 0)
+++ trunk/samples/quickstart/simple_correlation_header/.project 2011-04-14 15:09:26 UTC (rev 1354)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>Quickstart_bpel_simple_correlation_header</name>
+ <comment></comment>
+ <projects>
+ <project>Quickstart_bpel_simple_correlation_header</project>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.bpel.validator.builder</name>
+ <arguments>
+ <dictionary>
+ <key>debug</key>
+ <value>false</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ </natures>
+</projectDescription>
Added: trunk/samples/quickstart/simple_correlation_header/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/samples/quickstart/simple_correlation_header/.settings/org.eclipse.wst.common.component (rev 0)
+++ trunk/samples/quickstart/simple_correlation_header/.settings/org.eclipse.wst.common.component 2011-04-14 15:09:26 UTC (rev 1354)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="Quickstart_bpel_simple_correlation">
+ <wb-resource deploy-path="/" source-path="/bpelContent"/>
+ <dependent-module deploy-path="/" handle="module:/org.jboss.ide.eclipse.as.wtp.core.vcf.outputFolders/">
+ <dependency-type>consumes</dependency-type>
+ </dependent-module>
+ </wb-module>
+</project-modules>
Added: trunk/samples/quickstart/simple_correlation_header/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/samples/quickstart/simple_correlation_header/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0)
+++ trunk/samples/quickstart/simple_correlation_header/.settings/org.eclipse.wst.common.project.facet.core.xml 2011-04-14 15:09:26 UTC (rev 1354)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <fixed facet="jbt.bpel.facet.core"/>
+ <installed facet="jbt.bpel.facet.core" version="2.0"/>
+</faceted-project>
Added: trunk/samples/quickstart/simple_correlation_header/bpelContent/HelloGoodbye.bpel
===================================================================
--- trunk/samples/quickstart/simple_correlation_header/bpelContent/HelloGoodbye.bpel (rev 0)
+++ trunk/samples/quickstart/simple_correlation_header/bpelContent/HelloGoodbye.bpel 2011-04-14 15:09:26 UTC (rev 1354)
@@ -0,0 +1,112 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<process name="HelloGoodbye"
+ targetNamespace="http://www.jboss.org/bpel/examples"
+ xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+ xmlns:tns="http://www.jboss.org/bpel/examples"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:intf="http://www.jboss.org/bpel/examples/wsdl"
+ queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+ expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+
+ <import location="HelloGoodbye.wsdl"
+ namespace="http://www.jboss.org/bpel/examples/wsdl"
+ importType="http://schemas.xmlsoap.org/wsdl/" />
+
+ <partnerLinks>
+ <partnerLink name="helloGoodbyePartnerLink"
+ partnerLinkType="intf:HelloGoodbyePartnerLinkType"
+ myRole="me" />
+ </partnerLinks>
+
+ <correlationSets xmlns:cor="http://example.com/supplyCorrelation">
+ <correlationSet name="Session"
+ properties="intf:SessionID" />
+ </correlationSets>
+
+ <variables>
+ <variable name="myHelloVar" messageType="intf:HelloMessage"/>
+ <variable name="myGoodbyeVar" messageType="intf:GoodbyeMessage"/>
+ <variable name="mesgVar" type="xsd:string"/>
+ </variables>
+
+ <sequence>
+ <receive
+ name="start"
+ partnerLink="helloGoodbyePartnerLink"
+ portType="intf:HelloGoodbyePortType"
+ operation="hello"
+ variable="myHelloVar"
+ createInstance="yes">
+ <correlations>
+ <correlation set="Session" initiate="yes" />
+ </correlations>
+ </receive>
+
+ <assign name="assignHelloMesg">
+ <copy>
+ <from variable="myHelloVar" part="Message"/>
+ <to variable="mesgVar"/>
+ </copy>
+ <copy>
+ <from>concat($mesgVar,' World')</from>
+ <to variable="myHelloVar" part="Message"/>
+ </copy>
+ </assign>
+ <reply name="end"
+ partnerLink="helloGoodbyePartnerLink"
+ portType="intf:HelloGoodbyePortType"
+ operation="hello"
+ variable="myHelloVar">
+ <correlations>
+ <correlation set="Session" initiate="no" />
+ </correlations>
+ </reply>
+ <receive
+ name="start"
+ partnerLink="helloGoodbyePartnerLink"
+ portType="intf:HelloGoodbyePortType"
+ operation="goodbye"
+ variable="myGoodbyeVar">
+ <correlations>
+ <correlation set="Session" initiate="no" />
+ </correlations>
+ </receive>
+
+ <assign name="assignGoodbyeMesg">
+ <copy>
+ <from variable="myGoodbyeVar" part="Message"/>
+ <to variable="mesgVar"/>
+ </copy>
+ <copy>
+ <from>concat($mesgVar,' World')</from>
+ <to variable="myGoodbyeVar" part="Message"/>
+ </copy>
+ </assign>
+ <reply name="end"
+ partnerLink="helloGoodbyePartnerLink"
+ portType="intf:HelloGoodbyePortType"
+ operation="goodbye"
+ variable="myGoodbyeVar">
+ <correlations>
+ <correlation set="Session" initiate="no" />
+ </correlations>
+ </reply>
+ </sequence>
+</process>
Added: trunk/samples/quickstart/simple_correlation_header/bpelContent/HelloGoodbye.wsdl
===================================================================
--- trunk/samples/quickstart/simple_correlation_header/bpelContent/HelloGoodbye.wsdl (rev 0)
+++ trunk/samples/quickstart/simple_correlation_header/bpelContent/HelloGoodbye.wsdl 2011-04-14 15:09:26 UTC (rev 1354)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<wsdl:definitions
+ targetNamespace="http://www.jboss.org/bpel/examples/wsdl"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:tns="http://www.jboss.org/bpel/examples/wsdl"
+ xmlns:types="http://www.jboss.org/bpel/examples/xsd"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop"
+ xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype">
+
+ <wsdl:types>
+ <xsd:schema targetNamespace="http://www.jboss.org/bpel/examples/xsd">
+ <xsd:element name="SessionIdentity" type="xsd:int" />
+ </xsd:schema>
+ </wsdl:types>
+
+ <wsdl:message name="HelloMessage">
+ <wsdl:part name="ID" element="types:SessionIdentity"/>
+ <wsdl:part name="Message" type="xsd:string"/>
+ </wsdl:message>
+
+ <wsdl:message name="GoodbyeMessage">
+ <wsdl:part name="ID" element="types:SessionIdentity"/>
+ <wsdl:part name="Message" type="xsd:string"/>
+ </wsdl:message>
+
+ <wsdl:portType name="HelloGoodbyePortType">
+ <wsdl:operation name="hello">
+ <wsdl:input message="tns:HelloMessage" name="HelloIn"/>
+ <wsdl:output message="tns:HelloMessage" name="HelloOut"/>
+ </wsdl:operation>
+ <wsdl:operation name="goodbye">
+ <wsdl:input message="tns:GoodbyeMessage" name="GoodbyeIn"/>
+ <wsdl:output message="tns:GoodbyeMessage" name="GoodbyeOut"/>
+ </wsdl:operation>
+ </wsdl:portType>
+
+ <wsdl:binding name="HelloGoodbyeSoapBinding" type="tns:HelloGoodbyePortType">
+ <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="hello">
+ <soap:operation soapAction="" style="rpc"/>
+ <wsdl:input>
+ <soap:body
+ namespace="http://www.jboss.org/bpel/examples/wsdl"
+ use="literal" parts="Message"/>
+ <soap:header message="tns:HelloMessage"
+ part="ID" use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body
+ namespace="http://www.jboss.org/bpel/examples/wsdl"
+ use="literal" parts="Message"/>
+ <soap:header message="tns:HelloMessage"
+ part="ID" use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="goodbye">
+ <soap:operation soapAction="" style="rpc"/>
+ <wsdl:input>
+ <soap:body
+ namespace="http://www.jboss.org/bpel/examples/wsdl"
+ use="literal" parts="Message"/>
+ <soap:header message="tns:GoodbyeMessage"
+ part="ID" use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body
+ namespace="http://www.jboss.org/bpel/examples/wsdl"
+ use="literal" parts="Message"/>
+ <soap:header message="tns:GoodbyeMessage"
+ part="ID" use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="HelloGoodbyeService">
+ <wsdl:port name="HelloGoodbyePort" binding="tns:HelloGoodbyeSoapBinding">
+ <soap:address location="http://localhost:8080/Quickstart_bpel_simple_correlation_headerWS"/>
+ </wsdl:port>
+ </wsdl:service>
+
+ <plnk:partnerLinkType name="HelloGoodbyePartnerLinkType">
+ <plnk:role name="me" portType="tns:HelloGoodbyePortType"/>
+ <plnk:role name="you" portType="tns:HelloGoodbyePortType"/>
+ </plnk:partnerLinkType>
+
+ <vprop:property name="SessionID" type="xsd:int" />
+
+ <vprop:propertyAlias propertyName="tns:SessionID"
+ messageType="tns:HelloMessage" part="ID">
+ <vprop:query>text()</vprop:query>
+ </vprop:propertyAlias>
+
+ <vprop:propertyAlias propertyName="tns:SessionID"
+ messageType="tns:GoodbyeMessage" part="ID">
+ <vprop:query>text()</vprop:query>
+ </vprop:propertyAlias>
+
+
+</wsdl:definitions>
+
Added: trunk/samples/quickstart/simple_correlation_header/bpelContent/deploy.xml
===================================================================
--- trunk/samples/quickstart/simple_correlation_header/bpelContent/deploy.xml (rev 0)
+++ trunk/samples/quickstart/simple_correlation_header/bpelContent/deploy.xml 2011-04-14 15:09:26 UTC (rev 1354)
@@ -0,0 +1,30 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
+ xmlns:bpl="http://www.jboss.org/bpel/examples"
+ xmlns:intf="http://www.jboss.org/bpel/examples/wsdl">
+
+ <process name="bpl:HelloGoodbye">
+ <active>true</active>
+ <process-events generate="all"/>
+ <provide partnerLink="helloGoodbyePartnerLink">
+ <service name="intf:HelloGoodbyeService" port="HelloGoodbyePort"/>
+ </provide>
+ </process>
+</deploy>
Added: trunk/samples/quickstart/simple_correlation_header/build.xml
===================================================================
--- trunk/samples/quickstart/simple_correlation_header/build.xml (rev 0)
+++ trunk/samples/quickstart/simple_correlation_header/build.xml 2011-04-14 15:09:26 UTC (rev 1354)
@@ -0,0 +1,78 @@
+<project name="Quickstart_bpel_simple_correlation_header" default="deploy" basedir=".">
+
+ <description>
+ ${ant.project.name}
+ ${line.separator}
+ </description>
+
+ <property file="../../../install/deployment.properties" />
+ <import file="../../common/base-build.xml"/>
+
+ <property name="version" value="1" />
+
+ <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" />
+
+ <target name="deploy">
+ <echo>Deploy ${ant.project.name}</echo>
+ <jar basedir="bpelContent" destfile="${deploy.dir}/${sample.jar.name}" />
+ </target>
+
+ <target name="undeploy">
+ <echo>Undeploy ${ant.project.name}</echo>
+ <delete file="${deploy.dir}/${sample.jar.name}" />
+ </target>
+
+ <target name="sendhello">
+ <echo>Send test message to: ${ant.project.name}</echo>
+ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender">
+ <arg value="http://localhost:8080/Quickstart_bpel_simple_correlation_headerWS"/>
+ <arg value="messages/hello_request1.xml"/>
+ <classpath refid="rs-exec-classpath"/>
+ </java>
+ </target>
+
+ <target name="sendgoodbye">
+ <echo>Send test message to: ${ant.project.name}</echo>
+ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender">
+ <arg value="http://localhost:8080/Quickstart_bpel_simple_correlation_headerWS"/>
+ <arg value="messages/goodbye_request1.xml"/>
+ <classpath refid="rs-exec-classpath"/>
+ </java>
+ </target>
+
+ <target name="sendhello2">
+ <echo>Send test message to: ${ant.project.name}</echo>
+ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender">
+ <arg value="http://localhost:8080/Quickstart_bpel_simple_correlation_headerWS"/>
+ <arg value="messages/hello_request2.xml"/>
+ <classpath refid="rs-exec-classpath"/>
+ </java>
+ </target>
+
+ <target name="sendgoodbye2">
+ <echo>Send test message to: ${ant.project.name}</echo>
+ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender">
+ <arg value="http://localhost:8080/Quickstart_bpel_simple_correlation_headerWS"/>
+ <arg value="messages/goodbye_request2.xml"/>
+ <classpath refid="rs-exec-classpath"/>
+ </java>
+ </target>
+
+ <target name="sendhello3">
+ <echo>Send test message to: ${ant.project.name}</echo>
+ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender">
+ <arg value="http://localhost:8080/Quickstart_bpel_simple_correlation_headerWS"/>
+ <arg value="messages/hello_request3.xml"/>
+ <classpath refid="rs-exec-classpath"/>
+ </java>
+ </target>
+
+ <target name="sendgoodbye3">
+ <echo>Send test message to: ${ant.project.name}</echo>
+ <java classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender">
+ <arg value="http://localhost:8080/Quickstart_bpel_simple_correlation_headerWS"/>
+ <arg value="messages/goodbye_request3.xml"/>
+ <classpath refid="rs-exec-classpath"/>
+ </java>
+ </target>
+</project>
Added: trunk/samples/quickstart/simple_correlation_header/messages/goodbye_request1.xml
===================================================================
--- trunk/samples/quickstart/simple_correlation_header/messages/goodbye_request1.xml (rev 0)
+++ trunk/samples/quickstart/simple_correlation_header/messages/goodbye_request1.xml 2011-04-14 15:09:26 UTC (rev 1354)
@@ -0,0 +1,10 @@
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:wsdl="http://www.jboss.org/bpel/examples/wsdl">
+ <soapenv:Header>
+ <ns:SessionIdentity xmlns:ns="http://www.jboss.org/bpel/examples/xsd">1</ns:SessionIdentity>
+ </soapenv:Header>
+ <soapenv:Body>
+ <wsdl:goodbye>
+ <Message>Goodbye</Message>
+ </wsdl:goodbye>
+ </soapenv:Body>
+</soapenv:Envelope>
Added: trunk/samples/quickstart/simple_correlation_header/messages/goodbye_request2.xml
===================================================================
--- trunk/samples/quickstart/simple_correlation_header/messages/goodbye_request2.xml (rev 0)
+++ trunk/samples/quickstart/simple_correlation_header/messages/goodbye_request2.xml 2011-04-14 15:09:26 UTC (rev 1354)
@@ -0,0 +1,10 @@
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:wsdl="http://www.jboss.org/bpel/examples/wsdl">
+ <soapenv:Header>
+ <ns:SessionIdentity xmlns:ns="http://www.jboss.org/bpel/examples/xsd">2</ns:SessionIdentity>
+ </soapenv:Header>
+ <soapenv:Body>
+ <wsdl:goodbye>
+ <Message>Goodbye</Message>
+ </wsdl:goodbye>
+ </soapenv:Body>
+</soapenv:Envelope>
Added: trunk/samples/quickstart/simple_correlation_header/messages/goodbye_request3.xml
===================================================================
--- trunk/samples/quickstart/simple_correlation_header/messages/goodbye_request3.xml (rev 0)
+++ trunk/samples/quickstart/simple_correlation_header/messages/goodbye_request3.xml 2011-04-14 15:09:26 UTC (rev 1354)
@@ -0,0 +1,10 @@
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:wsdl="http://www.jboss.org/bpel/examples/wsdl">
+ <soapenv:Header>
+ <ns:SessionIdentity xmlns:ns="http://www.jboss.org/bpel/examples/xsd">3</ns:SessionIdentity>
+ </soapenv:Header>
+ <soapenv:Body>
+ <wsdl:goodbye>
+ <Message>Goodbye</Message>
+ </wsdl:goodbye>
+ </soapenv:Body>
+</soapenv:Envelope>
Added: trunk/samples/quickstart/simple_correlation_header/messages/hello_request1.xml
===================================================================
--- trunk/samples/quickstart/simple_correlation_header/messages/hello_request1.xml (rev 0)
+++ trunk/samples/quickstart/simple_correlation_header/messages/hello_request1.xml 2011-04-14 15:09:26 UTC (rev 1354)
@@ -0,0 +1,10 @@
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:wsdl="http://www.jboss.org/bpel/examples/wsdl">
+ <soapenv:Header>
+ <ns:SessionIdentity xmlns:ns="http://www.jboss.org/bpel/examples/xsd">1</ns:SessionIdentity>
+ </soapenv:Header>
+ <soapenv:Body>
+ <wsdl:hello>
+ <Message>Hello</Message>
+ </wsdl:hello>
+ </soapenv:Body>
+</soapenv:Envelope>
Added: trunk/samples/quickstart/simple_correlation_header/messages/hello_request2.xml
===================================================================
--- trunk/samples/quickstart/simple_correlation_header/messages/hello_request2.xml (rev 0)
+++ trunk/samples/quickstart/simple_correlation_header/messages/hello_request2.xml 2011-04-14 15:09:26 UTC (rev 1354)
@@ -0,0 +1,10 @@
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:wsdl="http://www.jboss.org/bpel/examples/wsdl">
+ <soapenv:Header>
+ <ns:SessionIdentity xmlns:ns="http://www.jboss.org/bpel/examples/xsd">2</ns:SessionIdentity>
+ </soapenv:Header>
+ <soapenv:Body>
+ <wsdl:hello>
+ <Message>Hello</Message>
+ </wsdl:hello>
+ </soapenv:Body>
+</soapenv:Envelope>
Added: trunk/samples/quickstart/simple_correlation_header/messages/hello_request3.xml
===================================================================
--- trunk/samples/quickstart/simple_correlation_header/messages/hello_request3.xml (rev 0)
+++ trunk/samples/quickstart/simple_correlation_header/messages/hello_request3.xml 2011-04-14 15:09:26 UTC (rev 1354)
@@ -0,0 +1,10 @@
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:wsdl="http://www.jboss.org/bpel/examples/wsdl">
+ <soapenv:Header>
+ <ns:SessionIdentity xmlns:ns="http://www.jboss.org/bpel/examples/xsd">3</ns:SessionIdentity>
+ </soapenv:Header>
+ <soapenv:Body>
+ <wsdl:hello>
+ <Message>Hello</Message>
+ </wsdl:hello>
+ </soapenv:Body>
+</soapenv:Envelope>
Added: trunk/samples/quickstart/simple_correlation_header/readme.txt
===================================================================
--- trunk/samples/quickstart/simple_correlation_header/readme.txt (rev 0)
+++ trunk/samples/quickstart/simple_correlation_header/readme.txt 2011-04-14 15:09:26 UTC (rev 1354)
@@ -0,0 +1,33 @@
+Quickstart Examples - Simple Correlation Header
+===============================================
+
+This example is a variation of the 'simple_correlation' example that
+builds on the previous 'hello_world' example, to show a
+simple example of how two separate interactions can be correlated to the
+same BPEL process instance. This variation carries the information
+being correlated within the SOAP message header.
+
+In this case, a 'hello' message must be sent first, and then a 'goodbye'
+message must follow, where both messages must have the same ID field to
+enable them to be correlated to the same process instance.
+
+To deploy the example, open a command line window in the example's folder,
+and simply type 'ant deploy'. To undeploy, use the command 'ant undeploy'.
+
+To test the example, for example using the SOAPUI client, an example 'hello'
+and 'goodbye' message can be found in the messages sub-folder, with the
+relevant WSDL being located in the bpel sub-folder.
+
+Alternatively, use the 'ant sendhello' command (from a command line window)
+to send the initial message, and then 'ant sendgoodbye' to send the last
+message correlated to the same session.
+
+NOTE: The "ant deploy" command will by default deploy version 1 of the
+example to the server. If you wish to change the example, and redeploy,
+then you will need to update the version number in the build.xml, or
+override the version property, e.g. "ant -Dversion=2 deploy" (and similarly
+when undeploying "ant -Dversion=2 undeploy").
+
+Some handy URLs:
+http://localhost:8080/bpel-console is the BPEL console
+http://localhost:8080/Quickstart_bpel_simple_correlationWS?wsdl is the URL to the BPEL process' WSDL
13 years, 8 months
- 1
- 0
riftsaw SVN: r1353 - trunk/console/integration/src/main/java/org/jboss/soa/bpel/console.
by riftsaw-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2011-04-14 02:40:08 -0400 (Thu, 14 Apr 2011)
New Revision: 1353
Modified:
trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ProcessHistoryPluginImpl.java
Log:
*RIFTSAW-370, decode process definition id from the url.
Modified: trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ProcessHistoryPluginImpl.java
===================================================================
--- trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ProcessHistoryPluginImpl.java 2011-04-13 14:16:34 UTC (rev 1352)
+++ trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ProcessHistoryPluginImpl.java 2011-04-14 06:40:08 UTC (rev 1353)
@@ -164,18 +164,21 @@
public String getCompletedInstances4Chart(String processDefinition, String timespanValue) {
final Timespan timespan = TimespanFactory.fromValue(timespanValue);
- List<Event> events = ds.getInstanceEvents(processDefinition, timespan, State.Closed_Completed);
+ String decodedId = ModelAdaptor.decodeId(processDefinition);
+ List<Event> events = ds.getInstanceEvents(decodedId, timespan, State.Closed_Completed);
+
return createDatasetJSO(
new String[]{"Completed"}, timespan, true, events);
}
public String getFailedInstances4Chart(String processDefinition, String timespanValue) {
final Timespan timespan = TimespanFactory.fromValue(timespanValue);
+ String decodedId = ModelAdaptor.decodeId(processDefinition);
- List<Event> completed = ds.getInstanceEvents(processDefinition, timespan, State.Closed_Completed);
- List<Event> failed = ds.getInstanceEvents(processDefinition, timespan, State.Closed_Completed_Failed);
- List<Event> terminated = ds.getInstanceEvents(processDefinition, timespan, State.Closed_Cancelled_Terminated);
+ List<Event> completed = ds.getInstanceEvents(decodedId, timespan, State.Closed_Completed);
+ List<Event> failed = ds.getInstanceEvents(decodedId, timespan, State.Closed_Completed_Failed);
+ List<Event> terminated = ds.getInstanceEvents(decodedId, timespan, State.Closed_Cancelled_Terminated);
return createDatasetJSO(
new String[]{"Completed", "Failed", "Terminated"}, timespan, true, completed, failed, terminated);
13 years, 8 months
- 1
- 0
riftsaw SVN: r1352 - branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2011-04-13 10:16:34 -0400 (Wed, 13 Apr 2011)
New Revision: 1352
Modified:
branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkMyRoleImpl.java
Log:
RIFTSAW-372 - make header properties accessible to correlation of messages after the initial one.
Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java 2011-04-11 13:21:03 UTC (rev 1351)
+++ branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java 2011-04-13 14:16:34 UTC (rev 1352)
@@ -1294,7 +1294,7 @@
}
}
- private Element mergeHeaders(MessageDAO msg) {
+ protected static Element mergeHeaders(MessageDAO msg) {
if(msg==null) return null;
// Merging header data, it's all stored in the same variable
Element data = msg.getData();
Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkMyRoleImpl.java
===================================================================
--- branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkMyRoleImpl.java 2011-04-11 13:21:03 UTC (rev 1351)
+++ branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/PartnerLinkMyRoleImpl.java 2011-04-13 14:16:34 UTC (rev 1352)
@@ -291,7 +291,7 @@
CorrelationKeySet keySet = new CorrelationKeySet();
Operation operation = mex.getOperation();
- Element msg = mex.getRequest().getMessage();
+ Element msg = BpelRuntimeContextImpl.mergeHeaders(mex.getDAO().getRequest());
javax.wsdl.Message msgDescription = operation.getInput().getMessage();
Set<OScope.CorrelationSet> csets = _plinkDef.getNonInitiatingCorrelationSetsForOperation(operation);
13 years, 8 months
- 1
- 0
riftsaw SVN: r1351 - in trunk: docs/docbook/userguide/src/main/en-US/module and 1 other directories.
by riftsaw-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2011-04-11 09:21:03 -0400 (Mon, 11 Apr 2011)
New Revision: 1351
Modified:
trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ProcessHistoryPluginImpl.java
trunk/docs/docbook/userguide/src/main/en-US/module/riftsaw_restful_service.xml
trunk/samples/quickstart/management/src/org/jboss/riftsaw/management/ManagementClient.java
Log:
*RIFTSAW-370, replace the errai based services into RESTful services.
Modified: trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ProcessHistoryPluginImpl.java
===================================================================
--- trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ProcessHistoryPluginImpl.java 2011-04-04 14:31:39 UTC (rev 1350)
+++ trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ProcessHistoryPluginImpl.java 2011-04-11 13:21:03 UTC (rev 1351)
@@ -5,24 +5,24 @@
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.persistence.EntityManagerFactory;
import org.jboss.bpm.console.client.model.HistoryProcessInstanceRef;
+import org.jboss.bpm.console.client.model.ProcessDefinitionRef;
import org.jboss.bpm.console.server.plugin.ProcessHistoryPlugin;
import org.jboss.bpm.monitor.model.BPAFDataSource;
import org.jboss.bpm.monitor.model.DefaultBPAFDataSource;
import org.jboss.bpm.monitor.model.bpaf.Event;
import org.jboss.bpm.monitor.model.bpaf.State;
import org.jboss.bpm.monitor.model.bpaf.Tuple;
+import org.jboss.bpm.monitor.model.json.XYDataSetJSO;
+import org.jboss.bpm.monitor.model.metric.Grouping;
import org.jboss.bpm.monitor.model.metric.Timespan;
+import org.jboss.bpm.monitor.model.metric.TimespanFactory;
/**
* @author Jeff Yu
@@ -55,12 +55,7 @@
String definitionkey, String status, long starttime, long endtime,
String correlationkey) {
- String dkey = null;
- try {
- dkey = URLDecoder.decode(definitionkey, "UTF-8");
- } catch (UnsupportedEncodingException e1) {
- throw new IllegalStateException("Decode definition key of " + definitionkey + " failed.");
- }
+ String dkey = ModelAdaptor.decodeId(definitionkey);
List<Event> events = ds.getInstanceEvents(dkey, new Timespan(starttime, endtime, "Custom"), getStatus(status));
List<String> instanceIds = null;
if (correlationkey != null && !("".equals(correlationkey.trim()))) {
@@ -110,8 +105,135 @@
return refs;
}
-
- private State getStatus(String status) {
+
+
+
+ public List<ProcessDefinitionRef> getProcessDefinitions() {
+ List<ProcessDefinitionRef> refs = new ArrayList<ProcessDefinitionRef>();
+
+ List<String> keys = ds.getProcessDefinitions();
+
+ for (String id : keys) {
+ ProcessDefinitionRef ref = new ProcessDefinitionRef();
+ ref.setName(id);
+ ref.setId(ModelAdaptor.encodeId(id));
+
+ refs.add(ref);
+ }
+
+ return refs;
+ }
+
+ public List<String> getProcessInstanceKeys(String definitionId) {
+ String decodedId = ModelAdaptor.decodeId(definitionId);
+ return ds.getProcessInstances(decodedId);
+ }
+
+ public List<String> getActivityKeys(String instanceId) {
+ return ds.getActivityDefinitions(instanceId);
+ }
+
+ public List<String> getAllEvents(String instanceId) {
+ List<Event> events = ds.getPastActivities(instanceId);
+
+ List<String> result = new LinkedList<String>();
+ for (Event event: events) {
+ for (Tuple tuple : event.getDataElement()) {
+ if ("data".equals(tuple.getName())) {
+ result.add(tuple.getValue());
+ }
+ }
+ }
+
+ return result;
+ }
+
+ public Set<String> getCompletedInstances(String definitionKey, long timestamp, String timespan) {
+ return getInstances(definitionKey, timestamp, timespan, State.Closed_Completed);
+ }
+
+ public Set<String> getFailedInstances(String definitionKey, long timestamp, String timespan) {
+
+ return getInstances(definitionKey, timestamp, timespan, State.Closed_Completed_Failed);
+ }
+
+ public Set<String> getTerminatedInstances(String definitionKey, long timestamp, String timespan) {
+ return getInstances(definitionKey, timestamp, timespan, State.Closed_Cancelled_Terminated);
+ }
+
+ public String getCompletedInstances4Chart(String processDefinition, String timespanValue) {
+ final Timespan timespan = TimespanFactory.fromValue(timespanValue);
+
+ List<Event> events = ds.getInstanceEvents(processDefinition, timespan, State.Closed_Completed);
+
+ return createDatasetJSO(
+ new String[]{"Completed"}, timespan, true, events);
+ }
+
+ public String getFailedInstances4Chart(String processDefinition, String timespanValue) {
+ final Timespan timespan = TimespanFactory.fromValue(timespanValue);
+
+ List<Event> completed = ds.getInstanceEvents(processDefinition, timespan, State.Closed_Completed);
+ List<Event> failed = ds.getInstanceEvents(processDefinition, timespan, State.Closed_Completed_Failed);
+ List<Event> terminated = ds.getInstanceEvents(processDefinition, timespan, State.Closed_Cancelled_Terminated);
+
+ return createDatasetJSO(
+ new String[]{"Completed", "Failed", "Terminated"}, timespan, true, completed, failed, terminated);
+ }
+
+
+ private Set<String> getInstances(String definitionKey, long timestamp, String timespan, State completionState) {
+
+ String decodedId = ModelAdaptor.decodeId(definitionKey);
+
+ Set<String> instanceIds = new HashSet<String>();
+
+ Timespan chartTimespan = TimespanFactory.fromValue(timespan);
+ long[] bounds = TimespanFactory.getLeftBounds(chartTimespan, new Date(timestamp));
+
+ List<Event> events = ds.getInstanceEvents(
+ decodedId,
+ new Timespan(bounds[0], bounds[1], chartTimespan.getUnit(), "custom"),
+ completionState
+ );
+
+ // parity matched, only consider actual 'Closed_...' events
+ for(Event e : events)
+ {
+ if(e.getEventDetails().getCurrentState().equals(completionState))
+ instanceIds.add(e.getProcessInstanceID());
+ }
+
+ //Retrieve the Correlation information from the process instances.
+
+ Set<String> result = new HashSet<String>();
+
+ for (String instanceId : instanceIds) {
+ List<Event> theEvents = ds.getPastActivities(instanceId);
+ StringBuffer sbuffer = new StringBuffer();
+ sbuffer.append("Instance Id: " + instanceId + " ");
+ addCorrelationInformation(theEvents, sbuffer);
+ result.add(sbuffer.toString());
+ }
+
+ return result;
+ }
+
+
+ private void addCorrelationInformation(List<Event> theEvents, StringBuffer sbuffer) {
+ for (Event theEvent : theEvents) {
+ if ("CORRELATION_SET_WRITE".equals(theEvent.getActivityName())) {
+ for (Tuple tuple : theEvent.getDataElement()) {
+ if ("correlation-key".equals(tuple.getName())) {
+ sbuffer.append(" Correlation key: ");
+ sbuffer.append(tuple.getValue());
+ }
+ }
+ }
+ }
+ }
+
+ private State getStatus(String status) {
if ("COMPLETED".equalsIgnoreCase(status)) {
return State.Closed_Completed;
}
@@ -124,4 +246,61 @@
return null;
}
+
+ private static String createDatasetJSO(String[] title, Timespan timespan, boolean matchParity, List<Event>... events) {
+
+ XYDataSetJSO dataSet = new XYDataSetJSO(
+ title,
+ UUID.randomUUID().toString()
+ );
+
+ for(List<Event> subset : events)
+ {
+
+ SortedMap<Date, List<Event>> grouped = group(timespan, subset);
+
+ List<Long> domainData = new ArrayList<Long>(grouped.size());
+ List<Long> rangeData = new ArrayList<Long>(grouped.size());
+ for(Date d : grouped.keySet())
+ {
+ domainData.add(d.getTime());
+
+ // if parity matched datasets, then we get Open and Closed events.
+ int actualSize = matchParity ? grouped.get(d).size()/2 : grouped.get(d).size();
+ rangeData.add(new Integer(actualSize).longValue());
+ }
+
+ dataSet.getDomain().add(domainData);
+ dataSet.getRange().add(rangeData);
+ }
+
+ dataSet.setAxis("date");
+
+ return dataSet.toJSO();
+ }
+
+ private static SortedMap<Date, List<Event>> group(Timespan timespan, List<Event> events) {
+ SortedMap<Date, List<Event>> grouped;
+
+ switch (timespan.getUnit())
+ {
+ case HOUR:
+ grouped = Grouping.byHour(events, timespan);
+ break;
+ case DAY:
+ grouped = Grouping.byDay(events, timespan);
+ break;
+ case WEEK:
+ grouped = Grouping.byWeek(events, timespan);
+ break;
+ case MONTH:
+ grouped = Grouping.byMonth(events, timespan);
+ break;
+ default:
+ throw new IllegalArgumentException("UNIT not supported: "+timespan.getUnit());
+
+ }
+ return grouped;
+ }
+
}
Modified: trunk/docs/docbook/userguide/src/main/en-US/module/riftsaw_restful_service.xml
===================================================================
--- trunk/docs/docbook/userguide/src/main/en-US/module/riftsaw_restful_service.xml 2011-04-04 14:31:39 UTC (rev 1350)
+++ trunk/docs/docbook/userguide/src/main/en-US/module/riftsaw_restful_service.xml 2011-04-11 13:21:03 UTC (rev 1351)
@@ -24,7 +24,16 @@
<tr><td colspan="5"><emphasis>Process Engine(Process runtime state)</emphasis></td></tr>
<tr><td>GET</td><td>/gwt-console-server/rs/engine/deployments</td><td></td><td>*/*</td><td>application/json</td></tr>
<tr><td colspan="5"><emphasis>Process History(Process History Service)</emphasis></td></tr>
-<tr><td>GET</td><td>/gwt-console-server/rs//history/search</td><td></td><td>*/*</td><td>applications/json</td></tr>
+<tr><td>GET</td><td>/gwt-console-server/rs//history/definition/{id}/instances</td><td></td><td>*/*</td><td>applications/json</td></tr>
+<tr><td>GET</td><td>/gwt-console-server/rs//history/definitions</td><td></td><td>*/*</td><td>application/json</td></tr>
+<tr><td>GET</td><td>/gwt-console-server/rs//history/definition/{id}/instances</td><td></td><td>*/*</td><td>application/json</td></tr>
+<tr><td>GET</td><td>/gwt-console-server/rs//history/instance/{id}/activities</td><td></td><td>*/*</td><td>application/json</td></tr>
+<tr><td>GET</td><td>/gwt-console-server/rs//history/instance/{id}/events</td><td></td><td>*/*</td><td>application/json</td></tr>
+<tr><td>GET</td><td>/gwt-console-server/rs//history/definition/{id}/instances/completed</td><td></td><td>*/*</td><td>application/json</td></tr>
+<tr><td>GET</td><td>/gwt-console-server/rs//history/definition/{id}/instances/failed</td><td></td><td>*/*</td><td>application/json</td></tr>
+<tr><td>GET</td><td>/gwt-console-server/rs//history/definition/{id}/instances/terminated</td><td></td><td>*/*</td><td>application/json</td></tr>
+<tr><td>GET</td><td>/gwt-console-server/rs//history/definition/{id}/instances/chart/completed</td><td></td><td>*/*</td><td>application/json</td></tr>
+<tr><td>GET</td><td>/gwt-console-server/rs//history/definition/{id}/instances/chart/failed</td><td></td><td>*/*</td><td>application/json</td></tr>
</tbody>
</table>
</para>
Modified: trunk/samples/quickstart/management/src/org/jboss/riftsaw/management/ManagementClient.java
===================================================================
--- trunk/samples/quickstart/management/src/org/jboss/riftsaw/management/ManagementClient.java 2011-04-04 14:31:39 UTC (rev 1350)
+++ trunk/samples/quickstart/management/src/org/jboss/riftsaw/management/ManagementClient.java 2011-04-11 13:21:03 UTC (rev 1351)
@@ -26,7 +26,7 @@
private static final String authentication_url = "http://localhost:8080/gwt-console-server/rs/identity/secure/j_security_check";
- private static final String history_search_url = "http://localhost:8080/gwt-console-server/rs/history/search";
+ private static final String history_search_url = "http://localhost:8080/gwt-console-server/rs/history/definition/";
public void showAllDeployments() throws Exception {
System.out.println("-----------------------------");
@@ -84,13 +84,13 @@
public void getHistoricProcessInstance() throws Exception {
String processId = "{http://www.jboss.org/bpel/examples}HelloGoodbye-1";
- String encodedId = URLEncoder.encode(processId, "UTF-8");
+ String encodedId = ModelAdaptor.encodeId(processId);
String status = "COMPLETED";
Long starttime = new java.util.Date(103, 1, 1).getTime();
Long endtime = new java.util.Date().getTime();
- String search_url = history_search_url + "?definitionkey=" + encodedId + "&status=" + status
+ String search_url = history_search_url + encodedId + "/instances?status=" + status
+ "&starttime="+starttime + "&endtime=" + endtime;
System.out.println("-----------------------------");
13 years, 8 months
- 1
- 0
riftsaw SVN: r1350 - trunk/samples/quickstart/management.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2011-04-04 10:31:39 -0400 (Mon, 04 Apr 2011)
New Revision: 1350
Modified:
trunk/samples/quickstart/management/readme.txt
Log:
Minor changes to the readme.
Modified: trunk/samples/quickstart/management/readme.txt
===================================================================
--- trunk/samples/quickstart/management/readme.txt 2011-04-04 13:53:06 UTC (rev 1349)
+++ trunk/samples/quickstart/management/readme.txt 2011-04-04 14:31:39 UTC (rev 1350)
@@ -1,37 +1,39 @@
Quickstart Examples - Management
-===================================
+================================
-This is a simple example to demonstrate our management APIs that are exposed as Restful services.
+This is a simple example to demonstrate the management APIs that are exposed as RESTful services.
-To run this example with best output is to do as following:
+Before running this example, it is necessary to create some appropriate information upon which to
+issue the management commands. Therefore go to $RiftSaw/samples/quickstart/simple_correlation folder,
+and run the following commands:
-Go to $sample/quickstart/simple_correlation, run following commands:
-
1. ant deploy
2. ant sendhello
3. ant sendgoodbye
4. ant sendhello2
-With above commands, you've got one active process instance, one completed process instance.
+These commands will result in one active process instance, and one completed process instance.
+To run this management example, use the following command:
-This example shows four restful services:
+ ant runclient
-1). all deployments: This service returns all of deployed artifacts on the server.
-2). all process definitions: This services returns all of process definitions that are deployed on server.
-3). active process instances for simple_correlation example process definition.
-4). historic process instances for simple_correlation example process definition.
+The result from this command will show the output from four RESTful services:
-By default, all of restful services are secured by form authentication, except the status service and the deployments
-service.
+1) all deployments: This service returns all of the deployed artifacts on the server.
+2) all process definitions: This services returns all of the process definitions that are deployed on the server.
+3) active process instances: The list of active process instances, in this case for the simple_correlation example.
+4) historic process instances: The list of historic (completed) process instances, in this case for the simple_correlation example.
-In the example, firstly, we've invoked the restful service, and then with the JSON result, we've used the
-third party library (Gson) to marshall the JSON data into Java Objects, where you can find it on the gwt-console-rpc.jar.
+By default, all of the RESTful services are secured by form authentication, except the status and deployment services.
-These all restful services are built from the bpm console project, not on the riftsaw core itself.
-for details on bpm console, please refer to https://github.com/bpmc/bpm-console/
+In the example, the RESTful services are initially invoked, and then the JSON result is marshalled into Java Objects using
+the third party Gson library.
+All of the RESTful services are built within the bpm-console project. For further details please refer to
+https://github.com/bpmc/bpm-console/.
-some handy URLs:
-http://localhost:8080/gwt-console-server/rs/server/resources/riftsaw RiftSaw Restful Services document in html format.
\ No newline at end of file
+Some handy URLs:
+
+http://localhost:8080/gwt-console-server/rs/server/resources/riftsaw RiftSaw RESTful Services document in html format.
13 years, 8 months
- 1
- 0
riftsaw SVN: r1349 - trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2011-04-04 09:53:06 -0400 (Mon, 04 Apr 2011)
New Revision: 1349
Modified:
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java
Log:
RIFTSAW-360 - soapaction was not being sent for one-way invocations.
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 2011-04-04 02:45:16 UTC (rev 1348)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java 2011-04-04 13:53:06 UTC (rev 1349)
@@ -366,7 +366,7 @@
if(log.isDebugEnabled())
log.debug( "ODE outbound message: \n" +DOMWriter.printNode(mex.getRequest().getMessage(), true) );
- messageAdapter.createSoapRequest(soapRequestMessage,
+ String soapAction=messageAdapter.createSoapRequest(soapRequestMessage,
new ODEMessageAdapter(mex.getRequest()), mex.getOperation());
if (log.isDebugEnabled()) {
@@ -398,7 +398,18 @@
}
// The actual WS invocation
- Dispatch proxy = getDispatcher(epr, port);
+ Dispatch proxy = getDispatcher(epr, port);
+
+ // Set SOAPAction
+ if (soapAction != null) {
+ // Setting soap action using both approaches, as CXF needs one and JBossWS-Native the other
+ proxy.getRequestContext().put(Dispatch.SOAPACTION_URI_PROPERTY, soapAction);
+ MimeHeaders hd = soapRequestMessage.getMimeHeaders();
+ hd.addHeader("SOAPAction", soapAction);
+ } else if (log.isDebugEnabled()) {
+ log.debug("SOAPAction not set");
+ }
+
proxy.invokeOneWay(soapRequestMessage);
}
13 years, 8 months
- 1
- 0