November 2009 - riftsaw-commits - Jboss List Archives

riftsaw SVN: r302 - trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws.

by riftsaw-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-11-23 11:52:29 -0500 (Mon, 23 Nov 2009) New Revision: 302 Added: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/DeploymentBuilder.java Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ServiceEndpointReference.java Log: Copy WSDL artifacts when creating web service deployment Added: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/DeploymentBuilder.java =================================================================== --- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/DeploymentBuilder.java (rev 0) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/DeploymentBuilder.java 2009-11-23 16:52:29 UTC (rev 302) @@ -0,0 +1,127 @@ +/* + * 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.runtime.ws; + +import org.jboss.soa.bpel.runtime.integration.ServerConfig; + +import java.io.*; + +class DeploymentBuilder +{ + private File war; + private File webInf; + private File wsdlDir; + private DeploymentBuilder instance; + + private ServerConfig serverConfig; + + public DeploymentBuilder(ServerConfig serverConfig) + { + this.serverConfig = serverConfig; + } + + public DeploymentBuilder setEndpoint(String endpointId) + { + File tmpDir = new File(serverConfig.getServerTempDir(), "riftsaw"); + + tmpDir.mkdir(); + File fakeWebApp = new File(tmpDir, "riftsaw-"+endpointId+".war"); + File fakeWebInf = new File(fakeWebApp, "WEB-INF"); + fakeWebInf.mkdirs(); + + // Workaround + // See https://jira.jboss.org/jira/browse/JBWS-2718 + File fakeWSDLDir = new File(fakeWebInf, "wsdl"); + fakeWSDLDir.mkdirs(); + + this.war = fakeWebApp; + this.webInf = fakeWebInf; + this.wsdlDir = fakeWSDLDir; + + return this; + } + + public DeploymentBuilder setWSDL(File wsdl) + { + copy(wsdl, new File(this.wsdlDir, wsdl.getName())); + + // any related artifact as well (brute force, I know) + File parent = wsdl.getParentFile(); + assert parent.isDirectory(); + for(File f : parent.listFiles()) + { + if(f.equals(wsdl)) continue; + copy(f, new File(this.wsdlDir, f.getName())); + } + return this; + } + + public File build() + { + return this.war; + } + + public static synchronized void copy(File src, File dest) + { + InputStream in = null; + OutputStream out = null; + + try + { + in = new FileInputStream(src); + out = new FileOutputStream(dest); + + // Transfer bytes from in to out + byte[] buf = new byte[1024]; + int len; + while ((len = in.read(buf)) > 0) { + out.write(buf, 0, len); + } + in.close(); + out.close(); + } + catch (IOException e) + { + throw new RuntimeException("Failed to copy files", e); + } + finally + { + try + { + if(in!=null) in.close(); + } + catch (IOException e) + { + // + } + + try + { + if(out!=null) out.close(); + } + catch (IOException e) + { + // + } + } + } +} Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java =================================================================== --- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java 2009-11-23 16:51:40 UTC (rev 301) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java 2009-11-23 16:52:29 UTC (rev 302) @@ -51,7 +51,7 @@ /** * Manages creation and destroyal of web service endpoints and clients. - * This instance is stateful and retain references to both endpoints and clients. + * This instance is stateful and retains references to both endpoints and clients. * As such it should only exists once. * * @see org.jboss.soa.bpel.runtime.ws.AbstractWebServiceEndpoint @@ -81,9 +81,14 @@ try { - // create deployment structure + // create deployment structure (maybe replaced by shrinkwrap) + File warArchive = new DeploymentBuilder(serverConfig) + .setEndpoint(metaData.getEndpointId()) + .setWSDL(wsdlRef.getWsdlFile()) + .build(); + //Deployment deployment = createInMemoryDeployment(endpointId); - Deployment deployment = createVFSDeployment(metaData.getEndpointId()); + Deployment deployment = createVFSDeployment(warArchive); // generate provider impl WebServiceProviderFactory providerFactory = new WebServiceProviderFactory(); @@ -126,6 +131,8 @@ metaData.getEndpointId(), serviceUrl.toExternalForm(), deployment.getName() ); + ref.setArchiveLocation(warArchive.getAbsolutePath()); + endpointMapping.put( createEndpointKey(metaData.getServiceName(), metaData.getPortName()), ref @@ -173,18 +180,11 @@ return deployment; }*/ - private Deployment createVFSDeployment(String endpointId) + private Deployment createVFSDeployment(File war) throws IOException { - File tmpDir = new File(serverConfig.getServerTempDir(), "riftsaw"); - tmpDir.mkdir(); - File fakeWebApp = new File(tmpDir, "riftsaw-"+endpointId+".war"); - File fakeWebInf = new File(fakeWebApp, "WEB-INF"); - fakeWebInf.mkdirs(); - - VirtualFile webAppVFS = VFS.getRoot(fakeWebApp.toURL()); - Deployment deployment = VFSDeploymentFactory.getInstance().createVFSDeployment(webAppVFS); - return deployment; + VirtualFile webAppVFS = VFS.getRoot(war.toURL()); + return VFSDeploymentFactory.getInstance().createVFSDeployment(webAppVFS); } public void removeEndpoint(QName service, String port) throws EndpointManagementException @@ -207,7 +207,7 @@ } else { - log.warn("Endpoint not found for removal:"+key); + log.warn("Endpoint not found for removal: "+key); } } Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ServiceEndpointReference.java =================================================================== --- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ServiceEndpointReference.java 2009-11-23 16:51:40 UTC (rev 301) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ServiceEndpointReference.java 2009-11-23 16:52:29 UTC (rev 302) @@ -32,7 +32,8 @@ private String endpointId; private String location; private String deploymentName; - + private String archiveLocation; + public ServiceEndpointReference(String endpointId, String location, String deploymentName) { this.endpointId = endpointId; @@ -40,6 +41,16 @@ this.deploymentName = deploymentName; } + public String getArchiveLocation() + { + return archiveLocation; + } + + public void setArchiveLocation(String archiveLocation) + { + this.archiveLocation = archiveLocation; + } + public Document toXML() { Document ret=null;

15 years, 1 month

1
0
0 / 0

riftsaw SVN: r301 - in trunk/samples/esb/webservice_esb_bpel/bpel: wsdl and 1 other directory.

by riftsaw-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-11-23 11:51:40 -0500 (Mon, 23 Nov 2009) New Revision: 301 Added: trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/Customer.xsd trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/CustomerOrder.xsd trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/StandardTypes.xsd Removed: trunk/samples/esb/webservice_esb_bpel/bpel/schema/ Modified: trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/BPELRetailer.wsdl trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/Customer.wsdl trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/OrderManager.wsdl trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/Retailer.wsdl Log: Move imported files to single directory Modified: trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/BPELRetailer.wsdl =================================================================== --- trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/BPELRetailer.wsdl 2009-11-23 16:50:50 UTC (rev 300) +++ trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/BPELRetailer.wsdl 2009-11-23 16:51:40 UTC (rev 301) @@ -1,28 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> <wsdl:definitions name="BPELRetailer" targetNamespace="http://www.jboss.org/samples/bpel/BPELRetailer.wsdl" xmlns:tns="http://www.jboss.org/samples/bpel/BPELRetailer.wsdl" xmlns:ord="http://www.jboss.org/samples/bpel/CustomerOrder.xsd" xmlns:cust="http://www.jboss.org/samples/bpel/Customer.xsd" xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns="http://org.jboss.esb/quickstarts/bpel/ABI_OrderManager" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:rws="http://www.jboss.org/samples/bpel/Retailer.wsdl" xmlns:cws="http://www.jboss.org/samples/bpel/Customer.wsdl"> - <wsdl:import namespace="http://www.jboss.org/samples/bpel/Retailer.wsdl" location="Retailer.wsdl"/> - <wsdl:import namespace="http://www.jboss.org/samples/bpel/Customer.wsdl" location="Customer.wsdl"/> - <wsdl:import namespace="http://org.jboss.esb/quickstarts/bpel/ABI_OrderManager" location="OrderManager.wsdl"/> -<plnk:partnerLinkType xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" name="PurchasingPLT"> - <plnk:role name="Buyer" portType="cws:CustomerPortType"/> - <plnk:role name="Seller" portType="rws:RetailerPortType"/> -</plnk:partnerLinkType> -<vprop:property xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" name="customerNumber" type="xsd:string"/> -<vprop:property xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" name="poNumber" type="xsd:string"/> -<vprop:propertyAlias xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" messageType="cws:SendOrderConfirmationRequest" part="Document" propertyName="tns:poNumber"> - <vprop:query>/cust:orderConfirmation/cust:poNumber</vprop:query> -</vprop:propertyAlias> -<vprop:propertyAlias xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" messageType="rws:SubmitOrderRequest" part="Document" propertyName="tns:poNumber"> - <vprop:query> - /ord:customerOrder/ord:header/ord:poNumber - </vprop:query> -</vprop:propertyAlias> -<vprop:property xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" name="orderNum" type="xsd:string"/> -<vprop:propertyAlias xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" messageType="ns:OrderManagerPortType_customerOrderResponse" part="result" propertyName="tns:orderNum"/> -<vprop:propertyAlias xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" messageType="ns:SendSalesOrderNotificationRequest" part="Document" propertyName="tns:orderNum"> - <vprop:query>ns:orderNumber</vprop:query> -</vprop:propertyAlias> -<vprop:propertyAlias xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" messageType="rws:SubmitOrderRequest" part="Document" propertyName="tns:customerNumber"> - <vprop:query>ord:header/ord:customerNumber</vprop:query> -</vprop:propertyAlias> + <wsdl:import namespace="http://www.jboss.org/samples/bpel/Retailer.wsdl" location="Retailer.wsdl"/> + <wsdl:import namespace="http://www.jboss.org/samples/bpel/Customer.wsdl" location="Customer.wsdl"/> + <wsdl:import namespace="http://org.jboss.esb/quickstarts/bpel/ABI_OrderManager" location="OrderManager.wsdl"/> + + <plnk:partnerLinkType xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" name="PurchasingPLT"> + <plnk:role name="Buyer" portType="cws:CustomerPortType"/> + <plnk:role name="Seller" portType="rws:RetailerPortType"/> + </plnk:partnerLinkType> + <vprop:property xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" name="customerNumber" type="xsd:string"/> + <vprop:property xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" name="poNumber" type="xsd:string"/> + <vprop:propertyAlias xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" messageType="cws:SendOrderConfirmationRequest" part="Document" propertyName="tns:poNumber"> + <vprop:query>/cust:orderConfirmation/cust:poNumber</vprop:query> + </vprop:propertyAlias> + <vprop:propertyAlias xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" messageType="rws:SubmitOrderRequest" part="Document" propertyName="tns:poNumber"> + <vprop:query> + /ord:customerOrder/ord:header/ord:poNumber + </vprop:query> + </vprop:propertyAlias> + <vprop:property xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" name="orderNum" type="xsd:string"/> + <vprop:propertyAlias xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" messageType="ns:OrderManagerPortType_customerOrderResponse" part="result" propertyName="tns:orderNum"/> + <vprop:propertyAlias xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" messageType="ns:SendSalesOrderNotificationRequest" part="Document" propertyName="tns:orderNum"> + <vprop:query>ns:orderNumber</vprop:query> + </vprop:propertyAlias> + <vprop:propertyAlias xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" messageType="rws:SubmitOrderRequest" part="Document" propertyName="tns:customerNumber"> + <vprop:query>ord:header/ord:customerNumber</vprop:query> + </vprop:propertyAlias> </wsdl:definitions> Modified: trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/Customer.wsdl =================================================================== --- trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/Customer.wsdl 2009-11-23 16:50:50 UTC (rev 300) +++ trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/Customer.wsdl 2009-11-23 16:51:40 UTC (rev 301) @@ -10,7 +10,7 @@ <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:import namespace="http://www.jboss.org/samples/bpel/Customer.xsd" - schemaLocation="../schema/Customer.xsd" /> + schemaLocation="Customer.xsd" /> </xs:schema> </wsdl:types> @@ -26,7 +26,7 @@ <wsdl:operation name="SendOrderConfirmation"> <wsdl:input message="tns:SendOrderConfirmationRequest" /> <wsdl:output message="tns:SendOrderConfirmationResponse" /> - </wsdl:operation> + </wsdl:operation> </wsdl:portType> Copied: trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/Customer.xsd (from rev 296, trunk/samples/esb/webservice_esb_bpel/bpel/schema/Customer.xsd) =================================================================== --- trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/Customer.xsd (rev 0) +++ trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/Customer.xsd 2009-11-23 16:51:40 UTC (rev 301) @@ -0,0 +1,20 @@ +<?xml version='1.0' encoding='UTF-8' ?> + +<xs:schema elementFormDefault="qualified" + attributeFormDefault="unqualified" + targetNamespace="http://www.jboss.org/samples/bpel/Customer.xsd" + xmlns:tns="http://www.jboss.org/samples/bpel/Customer.xsd" + xmlns:xs="http://www.w3.org/2001/XMLSchema"> + + <xs:element name="orderConfirmation" type="tns:OrderConfirmation" /> + <xs:element name="orderConfirmationAck" type="xs:boolean" /> + + <xs:complexType name="OrderConfirmation"> + <xs:sequence> + <xs:element name="customerNumber" type="xs:string" /> + <xs:element name="poNumber" type="xs:string" /> + <xs:element name="orderNumber" type="xs:string" /> + </xs:sequence> + </xs:complexType> + +</xs:schema> Copied: trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/CustomerOrder.xsd (from rev 296, trunk/samples/esb/webservice_esb_bpel/bpel/schema/CustomerOrder.xsd) =================================================================== --- trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/CustomerOrder.xsd (rev 0) +++ trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/CustomerOrder.xsd 2009-11-23 16:51:40 UTC (rev 301) @@ -0,0 +1,78 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xs:schema elementFormDefault="qualified" + attributeFormDefault="unqualified" + targetNamespace="http://www.jboss.org/samples/bpel/CustomerOrder.xsd" + xmlns:tns="http://www.jboss.org/samples/bpel/CustomerOrder.xsd" + xmlns:std="http://www.jboss.org/samples/bpel/StandardTypes.xsd" + xmlns:xs="http://www.w3.org/2001/XMLSchema"> + + <xs:import + namespace="http://www.jboss.org/samples/bpel/StandardTypes.xsd" + schemaLocation="StandardTypes.xsd" /> + + <xs:element name="customerOrder" type="tns:CustomerOrder" /> + <xs:element name="header" type="tns:OrderHeader" /> + <xs:element name="items" type="tns:OrderItems" /> + <xs:element name="item" type="tns:Item" /> + <xs:element name="customerOrderAck" type="xs:boolean" /> + <xs:element name="orderInquiry" type="tns:OrderInquiry" /> + <xs:element name="customerNumber" type="xs:string" /> + <xs:element name="poNumber" type="xs:string" /> + <xs:element name="orderStatus" type="xs:string" /> + <xs:element name="cancelOrder" type="tns:CancelOrder" /> + + <xs:complexType name="CustomerOrder"> + <xs:sequence> + <xs:element ref="tns:header" /> + <xs:element ref="tns:items" /> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="OrderHeader"> + <xs:sequence> + <xs:element ref="tns:customerNumber" /> + <xs:element ref="tns:poNumber" /> + <xs:element name="orderDate" type="xs:date" /> + <xs:element name="orderTotal" type="std:Amount" /> + <xs:element name="billTo" type="std:Party" /> + <xs:element name="shipTo" type="std:Party" /> + <xs:element name="billTerms" type="xs:string" minOccurs="0" + maxOccurs="1" /> + <xs:element name="shipTerms" type="xs:string" minOccurs="0" + maxOccurs="1" /> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="OrderItems"> + <xs:sequence> + <xs:element ref="tns:item" maxOccurs="unbounded" + minOccurs="1" /> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="Item"> + <xs:sequence> + <xs:element name="partNumber" type="std:SKU" /> + <xs:element name="description" type="xs:string" /> + <xs:element name="quantity" type="xs:unsignedShort" /> + <xs:element name="price" type="std:Amount" /> + <xs:element name="extensionAmount" type="std:Amount" /> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="OrderInquiry"> + <xs:sequence> + <xs:element ref="tns:customerNumber" /> + <xs:element ref="tns:poNumber" /> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="CancelOrder"> + <xs:sequence> + <xs:element ref="tns:orderInquiry" /> + </xs:sequence> + </xs:complexType> + + + +</xs:schema> Modified: trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/OrderManager.wsdl =================================================================== --- trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/OrderManager.wsdl 2009-11-23 16:50:50 UTC (rev 300) +++ trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/OrderManager.wsdl 2009-11-23 16:51:40 UTC (rev 301) @@ -18,7 +18,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <import namespace="http://www.jboss.org/samples/bpel/CustomerOrder.xsd" - schemaLocation="../schema/CustomerOrder.xsd" /> + schemaLocation="CustomerOrder.xsd" /> <!-- <complexType name="CancelOrder"> Modified: trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/Retailer.wsdl =================================================================== --- trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/Retailer.wsdl 2009-11-23 16:50:50 UTC (rev 300) +++ trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/Retailer.wsdl 2009-11-23 16:51:40 UTC (rev 301) @@ -12,7 +12,7 @@ <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"> <xsd:import namespace="http://www.jboss.org/samples/bpel/CustomerOrder.xsd" - schemaLocation="../schema/CustomerOrder.xsd" /> + schemaLocation="CustomerOrder.xsd" /> </xsd:schema> </wsdl:types> @@ -32,21 +32,21 @@ </wsdl:portType> <wsdl:binding name="RetailerBinding" type="tns:RetailerPortType"> <soap:binding style="document" - transport="http://schemas.xmlsoap.org/soap/http" /> - <wsdl:operation name="SubmitOrder"> + transport="http://schemas.xmlsoap.org/soap/http" /> + <wsdl:operation name="SubmitOrder"> <soap:operation - soapAction="http://www.jboss.org/samples/bpel/Retailer.wsdl/SubmitOrder" /> - <wsdl:input> + soapAction="http://www.jboss.org/samples/bpel/Retailer.wsdl/SubmitOrder" /> + <wsdl:input> <soap:body use="literal" /> - </wsdl:input> - <wsdl:output> + </wsdl:input> + <wsdl:output> <soap:body use="literal" /> </wsdl:output> </wsdl:operation> - </wsdl:binding> - <wsdl:service name="RetailerService"> - <wsdl:port name="RetailerPort" binding="tns:RetailerBinding"> + </wsdl:binding> + <wsdl:service name="RetailerService"> + <wsdl:port name="RetailerPort" binding="tns:RetailerBinding"> <soap:address location="http://localhost:8080/bpel/processes/Retailer" /> </wsdl:port> - </wsdl:service> + </wsdl:service> </wsdl:definitions> Copied: trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/StandardTypes.xsd (from rev 296, trunk/samples/esb/webservice_esb_bpel/bpel/schema/StandardTypes.xsd) =================================================================== --- trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/StandardTypes.xsd (rev 0) +++ trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/StandardTypes.xsd 2009-11-23 16:51:40 UTC (rev 301) @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xs:schema elementFormDefault="qualified" + attributeFormDefault="unqualified" + targetNamespace="http://www.jboss.org/samples/bpel/StandardTypes.xsd" + xmlns:tns="http://www.jboss.org/samples/bpel/StandardTypes.xsd" + xmlns:xs="http://www.w3.org/2001/XMLSchema"> + + <xs:complexType name="Party"> + <xs:sequence> + <xs:element name="company" type="xs:string" /> + <xs:element name="contact" type="tns:Contact" /> + <xs:element name="address" type="tns:Address" /> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="Contact"> + <xs:sequence> + <xs:element name="name" type="xs:string" /> + <xs:element name="phone" type="xs:string" /> + <xs:element name="fax" type="xs:string" /> + <xs:element name="email" type="xs:string" /> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="Address"> + <xs:sequence> + <xs:element name="street1" type="xs:string" /> + <xs:element name="street2" type="xs:string" minOccurs="0" + maxOccurs="1" /> + <xs:element name="city" type="xs:string" /> + <xs:element name="state" type="xs:string" /> + <xs:element name="zip" type="xs:string" /> + </xs:sequence> + </xs:complexType> + + <xs:simpleType name="SKU"> + <xs:restriction base="xs:string"> + <xs:length value="8" /> + <xs:pattern value="[A-Z]{3}[0-9]{5}" /> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="Amount"> + <xs:restriction base="xs:decimal"> + <xs:totalDigits value="8" /> + <xs:fractionDigits value="2" /> + <xs:minExclusive value="0" /> + </xs:restriction> + </xs:simpleType> + +</xs:schema>

15 years, 1 month

1
0
0 / 0

riftsaw SVN: r300 - trunk/distribution/src/main/assembly.

by riftsaw-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-11-23 11:50:50 -0500 (Mon, 23 Nov 2009) New Revision: 300 Modified: trunk/distribution/src/main/assembly/bin.xml Log: Include webservice_esb_bpel example in distribution Modified: trunk/distribution/src/main/assembly/bin.xml =================================================================== --- trunk/distribution/src/main/assembly/bin.xml 2009-11-23 16:05:50 UTC (rev 299) +++ trunk/distribution/src/main/assembly/bin.xml 2009-11-23 16:50:50 UTC (rev 300) @@ -79,6 +79,7 @@ <include>quickstart/loan_approval/**</include> <include>esb/bpel_helloworld/**</include> <include>esb/bpel_loan_fault/**</include> + <include>esb/webservice_esb_bpel/**</include> </includes> </fileSet>

15 years, 1 month

1
0
0 / 0

riftsaw SVN: r299 - in trunk: console and 13 other directories.

by riftsaw-commits＠lists.jboss.org

Author: jeff.yuchang Date: 2009-11-23 11:05:50 -0500 (Mon, 23 Nov 2009) New Revision: 299 Modified: trunk/console/identity/pom.xml trunk/console/integration/pom.xml trunk/console/pom.xml trunk/distribution/pom.xml trunk/docs/docbook/gettingstartedguide/pom.xml trunk/docs/docbook/pom.xml trunk/docs/docbook/userguide/pom.xml trunk/integration-tests/pom.xml trunk/pom.xml trunk/runtime/deployer/pom.xml trunk/runtime/engine-assembly/pom.xml trunk/runtime/engine/pom.xml trunk/runtime/jbossesb-bpel-assembly/pom.xml trunk/runtime/jbossesb-bpel/pom.xml trunk/runtime/pom.xml Log: * update the trunk version back to 2.0-SNAPSHOT * separate the riftsaw.ode.version and riftsaw.engine.version Modified: trunk/console/identity/pom.xml =================================================================== --- trunk/console/identity/pom.xml 2009-11-23 15:06:00 UTC (rev 298) +++ trunk/console/identity/pom.xml 2009-11-23 16:05:50 UTC (rev 299) @@ -4,14 +4,13 @@ <groupId>org.jboss.soa.bpel.console</groupId> <artifactId>identity</artifactId> <packaging>jar</packaging> - <version>2.0-M2</version> + <version>2.0-SNAPSHOT</version> <name>RiftSaw::Console::Identity</name> - <url>http://www.jboss.org</url> <parent> <groupId>org.jboss.soa.bpel.console</groupId> <artifactId>parent</artifactId> - <version>2.0-M2</version> + <version>2.0-SNAPSHOT</version> </parent> <build> Modified: trunk/console/integration/pom.xml =================================================================== --- trunk/console/integration/pom.xml 2009-11-23 15:06:00 UTC (rev 298) +++ trunk/console/integration/pom.xml 2009-11-23 16:05:50 UTC (rev 299) @@ -4,14 +4,13 @@ <groupId>org.jboss.soa.bpel.console</groupId> <artifactId>integration</artifactId> <packaging>jar</packaging> - <version>2.0-M2</version> + <version>2.0-SNAPSHOT</version> <name>RiftSaw::Console::Integration</name> - <url>http://www.jboss.org</url> <parent> <groupId>org.jboss.soa.bpel.console</groupId> <artifactId>parent</artifactId> - <version>2.0-M2</version> + <version>2.0-SNAPSHOT</version> </parent>  @@ -34,13 +33,11 @@ <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-bpel-api</artifactId> - <version>${riftsaw.engine.version}</version> </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-bpel-schemas</artifactId> - <version>${riftsaw.engine.version}</version> </dependency> <dependency> @@ -52,28 +49,24 @@ <dependency> <groupId>org.jboss.soa.bpel.runtime</groupId> <artifactId>riftsaw-engine</artifactId> - <version>${version}</version> + <version>${riftsaw.engine.version}</version> </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-bpel-store</artifactId> - <version>${riftsaw.engine.version}</version> </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-bpel-dao</artifactId> - <version>${riftsaw.engine.version}</version> </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-bpel-api</artifactId> - <version>${riftsaw.engine.version}</version> </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-utils</artifactId> - <version>${riftsaw.engine.version}</version> </dependency>  Modified: trunk/console/pom.xml =================================================================== --- trunk/console/pom.xml 2009-11-23 15:06:00 UTC (rev 298) +++ trunk/console/pom.xml 2009-11-23 16:05:50 UTC (rev 299) @@ -5,13 +5,13 @@ <groupId>org.jboss.soa.bpel.console</groupId> <artifactId>parent</artifactId> <packaging>pom</packaging> - <version>2.0-M2</version> + <version>2.0-SNAPSHOT</version> <name>RiftSaw::Console</name> <parent> <groupId>org.jboss.soa</groupId> <artifactId>bpel</artifactId> - <version>2.0-M2</version> + <version>2.0-SNAPSHOT</version> </parent> <modules> Modified: trunk/distribution/pom.xml =================================================================== --- trunk/distribution/pom.xml 2009-11-23 15:06:00 UTC (rev 298) +++ trunk/distribution/pom.xml 2009-11-23 16:05:50 UTC (rev 299) @@ -23,20 +23,17 @@ <artifactId>distribution</artifactId> <packaging>pom</packaging> <name>RiftSaw::Distribution</name> - <version>2.0-M2</version> - <url>http://www.jboss.org/riftsaw</url> + <version>2.0-SNAPSHOT</version> <parent> <groupId>org.jboss.soa</groupId> <artifactId>bpel</artifactId> - <version>2.0-M2</version> + <version>2.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <properties> <maven.test.skip>true</maven.test.skip> - <bpel.version>${project.version}</bpel.version> - <mysql.connector.version>5.0.8</mysql.connector.version> <postgresql.version>8.3-603.jdbc3</postgresql.version> <jtds.version>1.2.2</jtds.version> @@ -49,17 +46,14 @@ <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-tools</artifactId> - <version>${pom.version}</version> </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-bpel-compiler</artifactId> - <version>${pom.version}</version> </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-bpel-obj</artifactId> - <version>${pom.version}</version> </dependency> <dependency> <groupId>commons-codec</groupId> @@ -242,37 +236,5 @@ </plugins> </build> - <repositories> - <repository> - <id>jboss</id> - <url>http://repository.jboss.com/maven2/</url> - </repository> - - <repository> - <id>jboss-snapshot</id> - <url>http://snapshots.jboss.org/maven2</url> - </repository> - - <repository> - <id>maven.repo</id> - <name>maven repository</name> - <url>http://repo1.maven.org/maven2</url> - </repository> - - <repository> - <id>ibiblio</id> - <name>ibiblio repository</name> - <url>http://mirrors.ibiblio.org/pub/mirrors/maven2</url> - </repository> - - <repository> - <id>codehaus</id> - <name>codehaus repository</name> - <url>http://repo1.maven.org/maven2</url> - </repository> - - </repositories> - - </project> Modified: trunk/docs/docbook/gettingstartedguide/pom.xml =================================================================== --- trunk/docs/docbook/gettingstartedguide/pom.xml 2009-11-23 15:06:00 UTC (rev 298) +++ trunk/docs/docbook/gettingstartedguide/pom.xml 2009-11-23 16:05:50 UTC (rev 299) @@ -6,14 +6,14 @@ <groupId>org.jboss.soa.bpel.docs</groupId> <artifactId>gettingstartedguide</artifactId> - <version>2.0-M1</version> + <version>2.0-SNAPSHOT</version> <packaging>jdocbook</packaging> <name>RiftSaw::Docs::gettingstartedguide</name> <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>docs</artifactId> - <version>2.0-M2</version> + <version>2.0-SNAPSHOT</version> </parent> Modified: trunk/docs/docbook/pom.xml =================================================================== --- trunk/docs/docbook/pom.xml 2009-11-23 15:06:00 UTC (rev 298) +++ trunk/docs/docbook/pom.xml 2009-11-23 16:05:50 UTC (rev 299) @@ -6,14 +6,14 @@ <groupId>org.jboss.soa.bpel</groupId> <artifactId>docs</artifactId> - <version>2.0-M2</version> + <version>2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>RiftSaw::Docs</name> <parent> <groupId>org.jboss.soa</groupId> <artifactId>bpel</artifactId> - <version>2.0-M2</version> + <version>2.0-SNAPSHOT</version> </parent> <profiles> @@ -25,27 +25,4 @@ </modules> </profile> </profiles> - - <repositories> - <repository> - <snapshots> - <enabled>false</enabled> - </snapshots> - <id>jboss.release</id> - <name>JBoss releases</name> - <url>http://repository.jboss.org/maven2</url> - </repository> - </repositories> - - <pluginRepositories> - <pluginRepository> - <snapshots> - <enabled>false</enabled> - </snapshots> - <id>jboss.release</id> - <name>JBoss releases</name> - <url>http://repository.jboss.org/maven2</url> - </pluginRepository> - </pluginRepositories> - </project> Modified: trunk/docs/docbook/userguide/pom.xml =================================================================== --- trunk/docs/docbook/userguide/pom.xml 2009-11-23 15:06:00 UTC (rev 298) +++ trunk/docs/docbook/userguide/pom.xml 2009-11-23 16:05:50 UTC (rev 299) @@ -6,14 +6,14 @@ <groupId>org.jboss.soa.bpel.docs</groupId> <artifactId>userguide</artifactId> - <version>2.0-M1</version> + <version>2.0-SNAPSHOT</version> <packaging>jdocbook</packaging> <name>RiftSaw::Docs::userguide</name> <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>docs</artifactId> - <version>2.0-M2</version> + <version>2.0-SNAPSHOT</version> </parent> Modified: trunk/integration-tests/pom.xml =================================================================== --- trunk/integration-tests/pom.xml 2009-11-23 15:06:00 UTC (rev 298) +++ trunk/integration-tests/pom.xml 2009-11-23 16:05:50 UTC (rev 299) @@ -5,13 +5,13 @@ <groupId>org.jboss.soa.bpel</groupId> <artifactId>integration-tests</artifactId> <packaging>pom</packaging> - <version>2.0-M2</version> + <version>2.0-SNAPSHOT</version> <name>RiftSaw::Integration-Tests</name> <parent> <groupId>org.jboss.soa</groupId> <artifactId>bpel</artifactId> - <version>2.0-M2</version> + <version>2.0-SNAPSHOT</version> </parent> <properties> @@ -24,7 +24,6 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>3.8.1</version> <scope>test</scope> </dependency> <dependency> @@ -37,7 +36,7 @@ <dependency> <groupId>org.jboss.soa.bpel.dependencies.esb</groupId> <artifactId>jbossesb-rosetta</artifactId> - <version>4.6</version> + <version>${jbossesb.version}</version> <scope>test</scope> </dependency> <dependency> @@ -49,7 +48,7 @@ <dependency> <groupId>org.jboss.soa.bpel.dependencies.esb</groupId> <artifactId>jbossts-common</artifactId> - <version>4.6</version> + <version>${jbossesb.version}</version> <scope>test</scope> </dependency> <dependency> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-23 15:06:00 UTC (rev 298) +++ trunk/pom.xml 2009-11-23 16:05:50 UTC (rev 299) @@ -4,10 +4,10 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.soa</groupId> <artifactId>bpel</artifactId> - <version>2.0-M2</version> + <version>2.0-SNAPSHOT</version> <packaging>pom</packaging> <name>RiftSaw</name> - <url>http://www.jboss.org/bpel</url> + <url>http://www.jboss.org/riftsaw</url> <description> RiftSaw - the JBoss BPEL engine. </description> @@ -66,13 +66,15 @@ </profiles> <properties> - <riftsaw.engine.version>2.0-M2</riftsaw.engine.version> + <riftsaw.ode.version>2.0-M2</riftsaw.ode.version> + <riftsaw.engine.version>2.0-SNAPSHOT</riftsaw.engine.version> <bpm.console.version>1.2.0</bpm.console.version> <commons.logging.version>1.1.1</commons.logging.version> <junit.version>3.8.1</junit.version> <jboss.version>5.0.0.GA</jboss.version> <log4j.version>1.2.14</log4j.version> - <rosetta.version>4.5</rosetta.version> + <rosetta.version>4.6</rosetta.version> + <jbossesb.version>4.6</jbossesb.version> <wsdl4j.version>1.6.2</wsdl4j.version> </properties> @@ -111,32 +113,44 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <version>${commons.logging.version}</version> - </dependency> + </dependency> + +  <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-bpel-store</artifactId> - <version>${riftsaw.engine.version}</version> + <version>${riftsaw.ode.version}</version> </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-bpel-dao</artifactId> - <version>${riftsaw.engine.version}</version> + <version>${riftsaw.ode.version}</version> </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-bpel-api</artifactId> - <version>${riftsaw.engine.version}</version> + <version>${riftsaw.ode.version}</version> </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-bpel-compiler</artifactId> - <version>${riftsaw.engine.version}</version> + <version>${riftsaw.ode.version}</version> </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-utils</artifactId> - <version>${riftsaw.engine.version}</version> + <version>${riftsaw.ode.version}</version> </dependency> + <dependency> + <groupId>org.jboss.soa.bpel</groupId> + <artifactId>riftsaw-agents</artifactId> + <version>${riftsaw.ode.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.soa.bpel</groupId> + <artifactId>riftsaw-schedule-simpler</artifactId> + <version>${riftsaw.ode.version}</version> + </dependency>  - - <dependency> + <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-scheduler-simple</artifactId> - <version>${riftsaw.engine.version}</version> - </dependency> - <dependency> + <version>${riftsaw.ode.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.soa.bpel</groupId> + <artifactId>riftsaw-bpel-obj</artifactId> + <version>${riftsaw.ode.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.soa.bpel</groupId> + <artifactId>riftsaw-bpel-ql</artifactId> + <version>${riftsaw.ode.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.soa.bpel</groupId> + <artifactId>riftsaw-bpel-schemas</artifactId> + <version>${riftsaw.ode.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.soa.bpel</groupId> + <artifactId>riftsaw-dao-hibernate</artifactId> + <version>${riftsaw.ode.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.soa.bpel</groupId> + <artifactId>riftsaw-jacob</artifactId> + <version>${riftsaw.ode.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.soa.bpel</groupId> + <artifactId>riftsaw-tools</artifactId> + <version>${riftsaw.ode.version}</version> + </dependency> + + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>${junit.version}</version> @@ -179,16 +222,6 @@ </dependencyManagement> <distributionManagement> -  <repository> <id>jboss</id> <name>JBoss Maven Repository</name> @@ -273,19 +306,7 @@ <repositories> -  - - <repository> <id>jboss</id> <url>http://repository.jboss.com/maven2/</url> </repository> @@ -325,10 +346,7 @@ <url>http://www.intalio.org/public/maven2</url> </repository> - - -  Modified: trunk/runtime/deployer/pom.xml =================================================================== --- trunk/runtime/deployer/pom.xml 2009-11-23 15:06:00 UTC (rev 298) +++ trunk/runtime/deployer/pom.xml 2009-11-23 16:05:50 UTC (rev 299) @@ -4,14 +4,13 @@ <groupId>org.jboss.soa.bpel.runtime</groupId> <artifactId>deployer</artifactId> <packaging>jar</packaging> - <version>2.0-M2</version> + <version>2.0-SNAPSHOT</version> <name>RiftSaw::Runtime::Deployer</name> - <url>http://www.jboss.org</url> <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>runtime</artifactId> - <version>2.0-M2</version> + <version>2.0-SNAPSHOT</version> </parent> <dependencies> @@ -161,41 +160,4 @@ </plugins> </reporting> - <repositories> - <repository> - <id>jboss</id> - <url>http://repository.jboss.com/maven2/</url> - </repository> - <repository> - <id>jboss-snapshot</id> - <url>http://snapshots.jboss.org/maven2</url> - </repository> - <repository> - <id>maven.repo</id> - <name>maven repository</name> - <url>http://repo1.maven.org/maven2</url> - </repository> - <repository> - <id>ibiblio</id> - <name>ibiblio repository</name> - <url>http://mirrors.ibiblio.org/pub/mirrors/maven2</url> - </repository> - <repository> - <id>codehaus</id> - <name>codehaus repository</name> - <url>http://repo1.maven.org/maven2</url> - </repository> - - </repositories> - - <distributionManagement> - <repository> -  - <id>repository.jboss.org</id> - - <url>file://${jboss.repository.root}</url> - </repository> - </distributionManagement> - </project> Modified: trunk/runtime/engine/pom.xml =================================================================== --- trunk/runtime/engine/pom.xml 2009-11-23 15:06:00 UTC (rev 298) +++ trunk/runtime/engine/pom.xml 2009-11-23 16:05:50 UTC (rev 299) @@ -4,14 +4,13 @@ <groupId>org.jboss.soa.bpel.runtime</groupId> <artifactId>riftsaw-engine</artifactId> <packaging>jar</packaging> - <version>2.0-M2</version> + <version>2.0-SNAPSHOT</version> <name>RiftSaw::Runtime::Engine</name> - <url>http://www.jboss.org</url> <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>runtime</artifactId> - <version>2.0-M2</version> + <version>2.0-SNAPSHOT</version> </parent> <dependencies> @@ -28,22 +27,18 @@ <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-bpel-store</artifactId> - <version>${riftsaw.engine.version}</version> </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-bpel-dao</artifactId> - <version>${riftsaw.engine.version}</version> </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-bpel-api</artifactId> - <version>${riftsaw.engine.version}</version> </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-utils</artifactId> - <version>${riftsaw.engine.version}</version> </dependency>  <dependency> <groupId>org.jboss.soa.bpel</groupId> @@ -85,7 +76,7 @@ <dependency> <groupId>org.jboss.soa.bpel.runtime</groupId> <artifactId>deployer</artifactId> - <version>2.0-M2</version> + <version>${pom.version}</version> <scope>provided</scope> </dependency> <dependency> @@ -123,7 +114,6 @@ <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-bpel-compiler</artifactId> - <version>${riftsaw.engine.version}</version> <scope>provided</scope> </dependency> Modified: trunk/runtime/engine-assembly/pom.xml =================================================================== --- trunk/runtime/engine-assembly/pom.xml 2009-11-23 15:06:00 UTC (rev 298) +++ trunk/runtime/engine-assembly/pom.xml 2009-11-23 16:05:50 UTC (rev 299) @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.soa.bpel.runtime</groupId> <artifactId>riftsaw</artifactId> - <version>2.0-M2</version> + <version>2.0-SNAPSHOT</version> <packaging>jboss-sar</packaging> <name>RiftSaw::Runtime::Engine-Assembly</name> <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>runtime</artifactId> - <version>2.0-M2</version> + <version>2.0-SNAPSHOT</version> </parent> <dependencies> @@ -18,37 +18,31 @@ <dependency> <groupId>org.jboss.soa.bpel.runtime</groupId> <artifactId>riftsaw-engine</artifactId> - <version>${version}</version> + <version>${riftsaw.engine.version}</version> </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-bpel-compiler</artifactId> - <version>${riftsaw.engine.version}</version> </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-bpel-obj</artifactId> - <version>${riftsaw.engine.version}</version> </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-bpel-ql</artifactId> - <version>${riftsaw.engine.version}</version> </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-bpel-schemas</artifactId> - <version>${riftsaw.engine.version}</version> </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-dao-hibernate</artifactId> - <version>${riftsaw.engine.version}</version> </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-jacob</artifactId> - <version>${riftsaw.engine.version}</version> </dependency> <dependency> <groupId>org.apache.xmlbeans</groupId> @@ -140,4 +134,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> Modified: trunk/runtime/jbossesb-bpel/pom.xml =================================================================== --- trunk/runtime/jbossesb-bpel/pom.xml 2009-11-23 15:06:00 UTC (rev 298) +++ trunk/runtime/jbossesb-bpel/pom.xml 2009-11-23 16:05:50 UTC (rev 299) @@ -4,31 +4,30 @@ <groupId>org.jboss.soa.bpel.runtime</groupId> <artifactId>jbossesb-bpel</artifactId> <packaging>jar</packaging> - <version>2.0-M2</version> + <version>2.0-SNAPSHOT</version> <name>RiftSaw::Runtime::JBossESB-BPEL</name> - <url>http://www.jboss.org</url> <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>runtime</artifactId> - <version>2.0-M2</version> + <version>2.0-SNAPSHOT</version> </parent> <dependencies> <dependency> <groupId>org.jboss.soa.bpel.runtime</groupId> <artifactId>riftsaw-engine</artifactId> - <version>2.0-M2</version> + <version>${riftsaw.engine.version}</version> </dependency> <dependency> <groupId>org.jboss.soa.bpel.dependencies.esb</groupId> <artifactId>jbossesb-rosetta</artifactId> - <version>4.5.GA</version> + <version>${jbossesb.version}</version> </dependency> <dependency> <groupId>org.jboss.soa.bpel.dependencies.esb</groupId> <artifactId>jbossts-common</artifactId> - <version>4.5.GA</version> + <version>${jbossesb.version}</version> <scope>test</scope> </dependency> <dependency> @@ -40,7 +39,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>3.8.1</version> + <version>${junit.version}</version> <scope>test</scope> </dependency> <dependency> Modified: trunk/runtime/jbossesb-bpel-assembly/pom.xml =================================================================== --- trunk/runtime/jbossesb-bpel-assembly/pom.xml 2009-11-23 15:06:00 UTC (rev 298) +++ trunk/runtime/jbossesb-bpel-assembly/pom.xml 2009-11-23 16:05:50 UTC (rev 299) @@ -3,19 +3,20 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.soa.bpel.runtime</groupId> <artifactId>bpel.esb</artifactId> - <version>2.0-M2</version> + <version>2.0-SNAPSHOT</version> <packaging>jboss-esb</packaging> <name>RiftSaw::Runtime::JBossESB-BPEL-Assembly</name> <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>runtime</artifactId> - <version>2.0-M2</version> + <version>2.0-SNAPSHOT</version> </parent> + <dependencies> <dependency> <groupId>org.jboss.soa.bpel.runtime</groupId> <artifactId>jbossesb-bpel</artifactId> - <version>2.0-M2</version> + <version>${riftsaw.engine.version}</version> </dependency> </dependencies> @@ -49,4 +50,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> Modified: trunk/runtime/pom.xml =================================================================== --- trunk/runtime/pom.xml 2009-11-23 15:06:00 UTC (rev 298) +++ trunk/runtime/pom.xml 2009-11-23 16:05:50 UTC (rev 299) @@ -5,13 +5,13 @@ <groupId>org.jboss.soa.bpel</groupId> <artifactId>runtime</artifactId> <packaging>pom</packaging> - <version>2.0-M2</version> + <version>2.0-SNAPSHOT</version> <name>RiftSaw::Runtime</name> <parent> <groupId>org.jboss.soa</groupId> <artifactId>bpel</artifactId> - <version>2.0-M2</version> + <version>2.0-SNAPSHOT</version> </parent> <modules>

15 years, 1 month

1
0
0 / 0

riftsaw SVN: r298 - in trunk: integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages and 2 other directories.

by riftsaw-commits＠lists.jboss.org

Author: objectiser Date: 2009-11-23 10:06:00 -0500 (Mon, 23 Nov 2009) New Revision: 298 Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELLoanApprovalTestCase.java trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages/loanresp3.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages/loanresp4.xml trunk/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/BPELInvoke.java trunk/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/ESBInvocationAdapter.java trunk/runtime/jbossesb-bpel/src/test/java/org/jboss/soa/esb/actions/bpel/BPELInvokeTest.java trunk/runtime/jbossesb-bpel/src/test/java/org/jboss/soa/esb/actions/bpel/TestBPELEngine.java Log: Fixed ESB/BPEL integration to cope with fact that BPELFault exception is no longer thrown, and instead the InvocationAdapter needs to indicate fact that fault occurred. Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELLoanApprovalTestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELLoanApprovalTestCase.java 2009-11-23 13:25:27 UTC (rev 297) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELLoanApprovalTestCase.java 2009-11-23 15:06:00 UTC (rev 298) @@ -56,7 +56,6 @@ assertMessageFromFile(result, "loanresp2.xml"); } - /* public void testSendLoanRequest3() throws Exception { String result=sendSOAPMessage("loanreq3.xml", "http://localhost:8080/Quickstart_bpel_loan_approvalWS"); @@ -70,5 +69,4 @@ assertMessageFromFile(result, "loanresp4.xml"); } - */ } Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages/loanresp3.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages/loanresp3.xml 2009-11-23 13:25:27 UTC (rev 297) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages/loanresp3.xml 2009-11-23 15:06:00 UTC (rev 298) @@ -1 +1 @@ -<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:Header></env:Header><env:Body><message><accept>yes</accept></message></env:Body></env:Envelope> \ No newline at end of file +<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:Header></env:Header><env:Body><env:Fault xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><faultcode xmlns:valueNS='http://example.com/loan-approval/wsdl/'>valueNS:unableToHandleRequest</faultcode><detail><ns1:integer xmlns:ns1='http://example.com/loan-approval/xsd/error-messages/'>21000</ns1:integer></detail></env:Fault></env:Body></env:Envelope> \ No newline at end of file Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages/loanresp4.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages/loanresp4.xml 2009-11-23 13:25:27 UTC (rev 297) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages/loanresp4.xml 2009-11-23 15:06:00 UTC (rev 298) @@ -1 +1 @@ -<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:Header></env:Header><env:Body><message><accept>yes</accept></message></env:Body></env:Envelope> \ No newline at end of file +<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:Header></env:Header><env:Body><env:Fault xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><faultcode xmlns:valueNS='http://example.com/loan-approval/wsdl/'>valueNS:unableToHandleRequest</faultcode><detail><integer xmlns='http://example.com/loan-approval/xsd/error-messages/'>1</integer></detail></env:Fault></env:Body></env:Envelope> \ No newline at end of file Modified: trunk/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/BPELInvoke.java =================================================================== --- trunk/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/BPELInvoke.java 2009-11-23 13:25:27 UTC (rev 297) +++ trunk/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/BPELInvoke.java 2009-11-23 15:06:00 UTC (rev 298) @@ -178,8 +178,6 @@ org.w3c.dom.Element resp=null; javax.xml.namespace.QName faultName=null; - try - { QName serviceQName = new QName(getNamespace(serviceName), getLocalPart(serviceName)); // Create invocationContext @@ -190,12 +188,7 @@ // invoke ODE engine.invoke(invocationContext); resp = invocationContext.getInvocationResult(); - } - catch(BPELFault fault) - { - resp = fault.getFaultMessage(); - faultName = fault.getFaultName(); - } + faultName = invocationContext.getFaultName(); if (resp != null) { ret = MessageFactory.getInstance().getMessage(); Modified: trunk/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/ESBInvocationAdapter.java =================================================================== --- trunk/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/ESBInvocationAdapter.java 2009-11-23 13:25:27 UTC (rev 297) +++ trunk/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/ESBInvocationAdapter.java 2009-11-23 15:06:00 UTC (rev 298) @@ -35,6 +35,7 @@ { private String operationName; private QName serviceName; + private QName faultName; private Element requestXML; private Element responseXML; @@ -48,6 +49,15 @@ { return operationName; } + + public QName getFaultName() + { + return faultName; + } + + public void setFaultName(QName fname) { + this.faultName = fname; + } public QName getServiceName() { @@ -74,6 +84,7 @@ public void createFault(MyRoleMessageExchange mex) { this.responseXML = mex.getFaultResponse().getMessage(); + this.faultName = mex.getFault(); } public Element getInvocationResult() Modified: trunk/runtime/jbossesb-bpel/src/test/java/org/jboss/soa/esb/actions/bpel/BPELInvokeTest.java =================================================================== --- trunk/runtime/jbossesb-bpel/src/test/java/org/jboss/soa/esb/actions/bpel/BPELInvokeTest.java 2009-11-23 13:25:27 UTC (rev 297) +++ trunk/runtime/jbossesb-bpel/src/test/java/org/jboss/soa/esb/actions/bpel/BPELInvokeTest.java 2009-11-23 15:06:00 UTC (rev 298) @@ -614,13 +614,9 @@ TestBPELEngine bpelEngine=null; javax.xml.namespace.QName faultName=new javax.xml.namespace.QName("ns","lp"); - BPELFault fault=null; - - try { - fault = new BPELFault(faultName, (org.w3c.dom.Element)BPELInvoke.getNode("<data/>")); + try { + bpelEngine=new TestBPELEngine(faultName, (org.w3c.dom.Element)BPELInvoke.getNode("<data/>")); - bpelEngine=new TestBPELEngine(fault); - BPELInvoke invoke=new BPELInvoke(config); invoke.setBPELEngine(bpelEngine); @@ -656,13 +652,9 @@ TestBPELEngine bpelEngine=null; javax.xml.namespace.QName faultName=new javax.xml.namespace.QName("ns","lp"); - BPELFault fault=null; - try { - fault = new BPELFault(faultName, (org.w3c.dom.Element)BPELInvoke.getNode("<data/>")); + bpelEngine=new TestBPELEngine(faultName, (org.w3c.dom.Element)BPELInvoke.getNode("<data/>")); - bpelEngine=new TestBPELEngine(fault); - BPELInvoke invoke=new BPELInvoke(config); invoke.setBPELEngine(bpelEngine); Modified: trunk/runtime/jbossesb-bpel/src/test/java/org/jboss/soa/esb/actions/bpel/TestBPELEngine.java =================================================================== --- trunk/runtime/jbossesb-bpel/src/test/java/org/jboss/soa/esb/actions/bpel/TestBPELEngine.java 2009-11-23 13:25:27 UTC (rev 297) +++ trunk/runtime/jbossesb-bpel/src/test/java/org/jboss/soa/esb/actions/bpel/TestBPELEngine.java 2009-11-23 15:06:00 UTC (rev 298) @@ -18,11 +18,13 @@ package org.jboss.soa.esb.actions.bpel; import org.jboss.soa.bpel.runtime.engine.BPELEngine; + import org.jboss.soa.bpel.runtime.engine.BPELFault; import org.jboss.soa.bpel.runtime.engine.IntegrationLayer; import org.jboss.soa.bpel.runtime.engine.InvocationAdapter; import org.w3c.dom.Document; import org.w3c.dom.Element; +import javax.xml.namespace.QName; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -36,8 +38,9 @@ m_response = resp; } - public TestBPELEngine(BPELFault fault) { - m_fault = fault; + public TestBPELEngine(QName faultName, Element faultResp) { + m_response = faultResp; + m_faultName = faultName; } public TestBPELEngine(String resp) throws Exception { @@ -70,14 +73,10 @@ public void invoke(InvocationAdapter invocationAdapter) throws BPELFault, Exception { - if (m_fault != null) { - throw m_fault; - } - - - ESBInvocationAdapter esbCtx = (ESBInvocationAdapter) invocationAdapter; - m_request = esbCtx.getRequestXML(); - esbCtx.setResponseXML(m_response); + ESBInvocationAdapter esbCtx = (ESBInvocationAdapter) invocationAdapter; + m_request = esbCtx.getRequestXML(); + esbCtx.setResponseXML(m_response); + esbCtx.setFaultName(m_faultName); } public void removeIntegrationLayer(IntegrationLayer il) { @@ -96,5 +95,5 @@ private Element m_request=null; private Element m_response=null; - private BPELFault m_fault=null; + private QName m_faultName=null; }

15 years, 1 month

1
0
0 / 0

riftsaw SVN: r297 - in trunk/runtime: engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode and 2 other directories.

by riftsaw-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-11-23 08:25:27 -0500 (Mon, 23 Nov 2009) New Revision: 297 Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/InvocationAdapter.java trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/SOAPMessageAdapter.java trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WSInvocationAdapter.java trunk/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/ESBInvocationAdapter.java Log: Fix RIFTSAW-91: Incorrect fault returned to client Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/InvocationAdapter.java =================================================================== --- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/InvocationAdapter.java 2009-11-21 00:02:07 UTC (rev 296) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/InvocationAdapter.java 2009-11-23 13:25:27 UTC (rev 297) @@ -55,6 +55,7 @@ */ void createResponse(MyRoleMessageExchange mex); + void createFault(MyRoleMessageExchange mex); /** * Access the invocation result (response) * @return T Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java =================================================================== --- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java 2009-11-21 00:02:07 UTC (rev 296) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java 2009-11-23 13:25:27 UTC (rev 297) @@ -89,11 +89,6 @@ * This method invokes a BPEL process, associated with the supplied * service and operation, using the supplied message. * - * @param operation The operation name - * @param service The service QName - * @param message The message - * @return A response to the message, or null if no response is - * required. * @throws Exception Failed to invoke the operation */ public void invoke(InvocationAdapter invocationAdapter) @@ -242,15 +237,13 @@ case FAULT: if (__log.isDebugEnabled()) __log.debug("Fault response message: " + mex.getFault()); - throw new BPELFault(mex.getFault(), mex.getFaultResponse().getMessage()); + invocationAdapter.createFault(mex); + // throw new BPELFault(mex.getFault(), mex.getFaultResponse().getMessage()); + break; case ASYNC: case RESPONSE: - if(true) - { - invocationAdapter.createResponse(mex); - } - + invocationAdapter.createResponse(mex); if (__log.isDebugEnabled()) __log.debug("Response message " + ret); break; Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/SOAPMessageAdapter.java =================================================================== --- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/SOAPMessageAdapter.java 2009-11-21 00:02:07 UTC (rev 296) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/SOAPMessageAdapter.java 2009-11-23 13:25:27 UTC (rev 297) @@ -192,7 +192,7 @@ { Element srcPartEl = DOMUtils.findChildByName(message, new QName(null, part.getName())); if (srcPartEl == null) - throw new RuntimeException("Part is missing" +part.getName()); + throw new RuntimeException("Part is missing: " +part.getName()); SOAPElement partElement = soapFactory.createElement(srcPartEl); if (isRPC) @@ -249,16 +249,62 @@ BindingInput bi = bop.getBindingInput(); if (bi == null) - throw new RuntimeException("Binding inout not found"+serviceName+"/"+portName); - + throw new RuntimeException("Binding input not found"+serviceName+"/"+portName); + extractSoapBodyParts(odeMessage, soapMessage, getSOAPBody(bi), op.getInput().getMessage(), op.getName()); extractSoapHeaderParts(odeMessage, soapMessage, op.getInput().getMessage()); } - public SOAPFault createSoapFault(Element message, QName faultName, Operation op) { - throw new RuntimeException("Not implemented"); + public void createSoapFault(SOAPMessage soapMessage, Element message, QName faultName, Operation op) + { + try + { + Element detail = buildSoapDetail(message, faultName, op); + SOAPFault fault = soapMessage.getSOAPBody().addFault(); + fault.setFaultCode(faultName); + if(detail!=null) + fault.addDetail().addChildElement(soapFactory.createElement(detail)); + } + catch (SOAPException e) + { + throw new RuntimeException("Failed to create fault", e); + } } + private Element buildSoapDetail(Element message, QName faultName, Operation op) + { + if (faultName.getNamespaceURI() == null) + return toFaultDetail(faultName, message); + if (op == null) { + return toFaultDetail(faultName, message); + } + Fault f = op.getFault(faultName.getLocalPart()); + if (f == null) + return toFaultDetail(faultName, message); + + // For faults, there will be exactly one part. + Part p = (Part)f.getMessage().getParts().values().iterator().next(); + if (p == null) + return toFaultDetail(faultName, message); + Element partEl= DOMUtils.findChildByName(message,new QName(null,p.getName())); + if (partEl == null) + return toFaultDetail(faultName, message); + Element detail = DOMUtils.findChildByName(partEl, p.getElementName()); + if (detail == null) + return toFaultDetail(faultName, message); + + return detail; + } + + private Element toFaultDetail(QName fault, Element message) { + if (message == null) return null; + Element firstPart = DOMUtils.getFirstChildElement(message); + if (firstPart == null) return null; + Element detail = DOMUtils.getFirstChildElement(firstPart); + if (detail == null) return firstPart; + return detail; + } + private void extractSoapHeaderParts(Message odeMessage, SOAPMessage soapMessage, javax.wsdl.Message wsdlMessageDef) { log.warn("extractSoapHeaderParts() not implemented"); Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WSInvocationAdapter.java =================================================================== --- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WSInvocationAdapter.java 2009-11-21 00:02:07 UTC (rev 296) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WSInvocationAdapter.java 2009-11-23 13:25:27 UTC (rev 297) @@ -79,10 +79,23 @@ } catch (SOAPException e) { - throw new RuntimeException("Failed to parse SOAP response", e); + throw new RuntimeException("Failed to create SOAP response", e); } } + public void createFault(MyRoleMessageExchange mex) + { + try + { + soapResponseMessage = MessageFactory.newInstance().createMessage(); + soapAdapter.createSoapFault(soapResponseMessage, mex.getFaultResponse().getMessage(), mex.getFault(), mex.getOperation() ); + } + catch (SOAPException e) + { + throw new RuntimeException("Failed to create SOAP fault", e); + } + } + public SOAPMessage getInvocationResult() { if(null==soapResponseMessage) Modified: trunk/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/ESBInvocationAdapter.java =================================================================== --- trunk/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/ESBInvocationAdapter.java 2009-11-21 00:02:07 UTC (rev 296) +++ trunk/runtime/jbossesb-bpel/src/main/java/org/jboss/soa/esb/actions/bpel/ESBInvocationAdapter.java 2009-11-23 13:25:27 UTC (rev 297) @@ -71,6 +71,11 @@ this.responseXML = mex.getResponse().getMessage(); } + public void createFault(MyRoleMessageExchange mex) + { + this.responseXML = mex.getFaultResponse().getMessage(); + } + public Element getInvocationResult() { return this.responseXML;

15 years, 1 month

1
0
0 / 0

riftsaw SVN: r296 - in trunk: console/integration and 9 other directories.

by riftsaw-commits＠lists.jboss.org

Author: alex.guizar(a)jboss.com Date: 2009-11-20 19:02:07 -0500 (Fri, 20 Nov 2009) New Revision: 296 Modified: trunk/console/identity/ trunk/console/integration/ trunk/distribution/ trunk/docs/docbook/gettingstartedguide/ trunk/docs/docbook/userguide/ trunk/integration-tests/ trunk/runtime/deployer/ trunk/runtime/engine-assembly/ trunk/runtime/engine/ trunk/runtime/jbossesb-bpel-assembly/ trunk/runtime/jbossesb-bpel/ Log: ignore eclipse .settings directory Property changes on: trunk/console/identity ___________________________________________________________________ Name: svn:ignore - target .project *.iml + target .project *.iml .settings Property changes on: trunk/console/integration ___________________________________________________________________ Name: svn:ignore - target .project .classpath *.iml + target .project .classpath *.iml .settings Property changes on: trunk/distribution ___________________________________________________________________ Name: svn:ignore - *.iml *.ipr *.iws target .project + *.iml *.ipr *.iws target .project .settings Property changes on: trunk/docs/docbook/gettingstartedguide ___________________________________________________________________ Name: svn:ignore - target .project + target .project .settings Property changes on: trunk/docs/docbook/userguide ___________________________________________________________________ Name: svn:ignore - target .project + target .project .settings Property changes on: trunk/integration-tests ___________________________________________________________________ Name: svn:ignore - target .classpath .project + target .classpath .project .settings Property changes on: trunk/runtime/deployer ___________________________________________________________________ Name: svn:ignore - *.iml *.ipr *.iws target .classpath bin .project + *.iml *.ipr *.iws target .classpath bin .project .settings Property changes on: trunk/runtime/engine ___________________________________________________________________ Name: svn:ignore - *.iml *.ipr *.iws .classpath .project target classes + *.iml *.ipr *.iws .classpath .project target classes .settings Property changes on: trunk/runtime/engine-assembly ___________________________________________________________________ Name: svn:ignore - *.iml *.ipr *.iws target .project + *.iml *.ipr *.iws target .project .settings Property changes on: trunk/runtime/jbossesb-bpel ___________________________________________________________________ Name: svn:ignore - *.iml *.ipr *.iws target bin .classpath .project + *.iml *.ipr *.iws target bin .classpath .project .settings Property changes on: trunk/runtime/jbossesb-bpel-assembly ___________________________________________________________________ Name: svn:ignore - *.iml *.ipr *.iws target .project + *.iml *.ipr *.iws target .project .settings

15 years, 1 month

1
0
0 / 0

riftsaw SVN: r295 - in trunk/distribution: src/main/assembly and 1 other directories.

by riftsaw-commits＠lists.jboss.org

Author: jeff.yuchang Date: 2009-11-20 11:15:03 -0500 (Fri, 20 Nov 2009) New Revision: 295 Modified: trunk/distribution/pom.xml trunk/distribution/src/main/assembly/bin.xml trunk/distribution/src/main/release/install/build.xml Log: * install the h2 db into server.lib.dir for hsql Modified: trunk/distribution/pom.xml =================================================================== --- trunk/distribution/pom.xml 2009-11-20 15:30:28 UTC (rev 294) +++ trunk/distribution/pom.xml 2009-11-20 16:15:03 UTC (rev 295) @@ -41,6 +41,7 @@ <postgresql.version>8.3-603.jdbc3</postgresql.version> <jtds.version>1.2.2</jtds.version> <derby.version>10.4.1.3</derby.version> + <h2.version>1.0.68</h2.version> </properties> <dependencies> @@ -152,8 +153,12 @@ <artifactId>derbytools</artifactId> <version>${derby.version}</version> </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>${h2.version}</version> + </dependency> -  Modified: trunk/distribution/src/main/assembly/bin.xml =================================================================== --- trunk/distribution/src/main/assembly/bin.xml 2009-11-20 15:30:28 UTC (rev 294) +++ trunk/distribution/src/main/assembly/bin.xml 2009-11-20 16:15:03 UTC (rev 295) @@ -147,6 +147,7 @@ <include>mysql:mysql-connector-java</include> <include>org.apache.derby:derby</include> <include>org.apache.derby:derbytools</include> + <include>com.h2database:h2</include> </includes> </dependencySet> Modified: trunk/distribution/src/main/release/install/build.xml =================================================================== --- trunk/distribution/src/main/release/install/build.xml 2009-11-20 15:30:28 UTC (rev 294) +++ trunk/distribution/src/main/release/install/build.xml 2009-11-20 16:15:03 UTC (rev 295) @@ -133,7 +133,13 @@  - <target name="internal.install.riftsaw.into.jboss.db.hsql" /> + <target name="internal.install.riftsaw.into.jboss.db.hsql"> + <copy todir="${server.lib.dir}"> + <fileset dir="../db/drivers"> + <include name="h2*.jar" /> + </fileset> + </copy> + </target> <target name="internal.install.riftsaw.into.jboss.db.derby"> <copy todir="${server.lib.dir}" overwrite="true"> @@ -175,7 +181,9 @@ </target>  - <target name="internal.uninstall.riftsaw.into.jboss.db.hsql" /> + <target name="internal.uninstall.riftsaw.into.jboss.db.hsql"> + <delete file="${server.lib.dir}/h2-1.0.68.jar" /> + </target> <target name="internal.uninstall.riftsaw.into.jboss.db.derby"> <delete file="${server.lib.dir}/derby-10.4.1.3.jar"/>

15 years, 1 month

1
0
0 / 0

riftsaw SVN: r294 - in tags/RiftSaw-2.0-M2/docs/docbook: userguide and 1 other directory.

by riftsaw-commits＠lists.jboss.org

Author: jeff.yuchang Date: 2009-11-20 10:30:28 -0500 (Fri, 20 Nov 2009) New Revision: 294 Modified: tags/RiftSaw-2.0-M2/docs/docbook/gettingstartedguide/pom.xml tags/RiftSaw-2.0-M2/docs/docbook/userguide/pom.xml Log: * update version. Modified: tags/RiftSaw-2.0-M2/docs/docbook/gettingstartedguide/pom.xml =================================================================== --- tags/RiftSaw-2.0-M2/docs/docbook/gettingstartedguide/pom.xml 2009-11-20 15:16:23 UTC (rev 293) +++ tags/RiftSaw-2.0-M2/docs/docbook/gettingstartedguide/pom.xml 2009-11-20 15:30:28 UTC (rev 294) @@ -6,7 +6,7 @@ <groupId>org.jboss.soa.bpel.docs</groupId> <artifactId>gettingstartedguide</artifactId> - <version>2.0-M1</version> + <version>2.0-M2</version> <packaging>jdocbook</packaging> <name>RiftSaw::Docs::gettingstartedguide</name> Modified: tags/RiftSaw-2.0-M2/docs/docbook/userguide/pom.xml =================================================================== --- tags/RiftSaw-2.0-M2/docs/docbook/userguide/pom.xml 2009-11-20 15:16:23 UTC (rev 293) +++ tags/RiftSaw-2.0-M2/docs/docbook/userguide/pom.xml 2009-11-20 15:30:28 UTC (rev 294) @@ -6,7 +6,7 @@ <groupId>org.jboss.soa.bpel.docs</groupId> <artifactId>userguide</artifactId> - <version>2.0-M1</version> + <version>2.0-M2</version> <packaging>jdocbook</packaging> <name>RiftSaw::Docs::userguide</name>

15 years, 1 month

1
0
0 / 0

riftsaw SVN: r293 - tags.

by riftsaw-commits＠lists.jboss.org

Author: jeff.yuchang Date: 2009-11-20 10:16:23 -0500 (Fri, 20 Nov 2009) New Revision: 293 Added: tags/ODE-1.x-fixes-RiftSaw-2.0-M2/ Log: * tag the ODE-1.x-fixes-RiftSaw-2.0-M2 Copied: tags/ODE-1.x-fixes-RiftSaw-2.0-M2 (from rev 292, branches/ODE/ODE-1.x-fixes)

15 years, 1 month

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

riftsaw-commits November 2009