November 2009 - riftsaw-commits - Jboss List Archives

riftsaw SVN: r319 - trunk/distribution/src/main/release/db/datasource.

by riftsaw-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-11-24 11:20:55 -0500 (Tue, 24 Nov 2009) New Revision: 319 Modified: trunk/distribution/src/main/release/db/datasource/bpel-hsql-ds.xml Log: Best H2 settings I could figure out Modified: trunk/distribution/src/main/release/db/datasource/bpel-hsql-ds.xml =================================================================== --- trunk/distribution/src/main/release/db/datasource/bpel-hsql-ds.xml 2009-11-24 15:35:01 UTC (rev 318) +++ trunk/distribution/src/main/release/db/datasource/bpel-hsql-ds.xml 2009-11-24 16:20:55 UTC (rev 319) @@ -2,23 +2,24 @@ <datasources> - <local-tx-datasource> - <jndi-name>BPELDB</jndi-name> - <connection-url>@connection.url@</connection-url> - <driver-class>@driver@</driver-class> - <user-name>@username@</user-name> - <password>@password@</password> - <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation> - <min-pool-size>5</min-pool-size> - <max-pool-size>20</max-pool-size> - <idle-timeout-minutes>0</idle-timeout-minutes> - <prepared-statement-cache-size>32</prepared-statement-cache-size> - <depends>jboss:service=h2,database=BPELDB</depends> - </local-tx-datasource> - <mbean code="org.jboss.soa.bpel.runtime.db.H2Database" - name="jboss:service=h2,database=BPELDB"> - <attribute name="Database">BPELDB</attribute> - <attribute name="DataDir">${jboss.server.data.dir}</attribute> - </mbean> + <local-tx-datasource> + <jndi-name>BPELDB</jndi-name> + <connection-url>@connection.url@</connection-url> + <driver-class>@driver@</driver-class> + <user-name>@username@</user-name> + <password>@password@</password> + <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation> + <min-pool-size>5</min-pool-size> + <max-pool-size>20</max-pool-size> + <idle-timeout-minutes>0</idle-timeout-minutes> + <prepared-statement-cache-size>32</prepared-statement-cache-size> + <depends>jboss:service=h2,database=BPELDB</depends> + </local-tx-datasource> + <mbean code="org.jboss.soa.bpel.runtime.db.H2Database" + name="jboss:service=h2,database=BPELDB"> + <attribute name="Database">BPELDB</attribute> + <attribute name="DataDir">${jboss.server.data.dir}</attribute> + <attribute name="Flags">;MVCC=true;LOCK_MODE=3;LOG=2</attribute> + </mbean> </datasources>

14 years, 5 months

1
0
0 / 0

riftsaw SVN: r318 - in trunk: runtime/engine-assembly/src/main/resources and 1 other directory.

by riftsaw-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-11-24 10:35:01 -0500 (Tue, 24 Nov 2009) New Revision: 318 Removed: trunk/runtime/engine-assembly/src/main/resources/bpel-ds.xml Modified: trunk/distribution/src/main/release/db/jdbc/hsql.properties Log: Rollback H2 settings until properly verified Modified: trunk/distribution/src/main/release/db/jdbc/hsql.properties =================================================================== --- trunk/distribution/src/main/release/db/jdbc/hsql.properties 2009-11-24 15:21:52 UTC (rev 317) +++ trunk/distribution/src/main/release/db/jdbc/hsql.properties 2009-11-24 15:35:01 UTC (rev 318) @@ -1,4 +1,4 @@ -connection.url=jdbc:h2:${jboss.server.data.dir}${/}h2${/}BPELDB;MVCC=false;LOCK_MODE=1;MULTI_THREADED=TRUE +connection.url=jdbc:h2:${jboss.server.data.dir}${/}h2${/}BPELDB driver=org.h2.Driver username=sa password= Deleted: trunk/runtime/engine-assembly/src/main/resources/bpel-ds.xml =================================================================== --- trunk/runtime/engine-assembly/src/main/resources/bpel-ds.xml 2009-11-24 15:21:52 UTC (rev 317) +++ trunk/runtime/engine-assembly/src/main/resources/bpel-ds.xml 2009-11-24 15:35:01 UTC (rev 318) @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<datasources> - <local-tx-datasource> - <jndi-name>BPELDB</jndi-name> - <connection-url>jdbc:h2:${jboss.server.data.dir}${/}h2${/}BPELDB;MVCC=false;LOCK_MODE=1;MULTI_THREADED=TRUE</connection-url> - <driver-class>org.h2.Driver</driver-class> - <user-name>sa</user-name> - <password/> - <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation> - <min-pool-size>5</min-pool-size> - <max-pool-size>20</max-pool-size> - <idle-timeout-minutes>0</idle-timeout-minutes> - <prepared-statement-cache-size>32</prepared-statement-cache-size> - <depends>jboss:service=h2,database=BPELDB</depends> - </local-tx-datasource> - <mbean code="org.jboss.soa.bpel.runtime.db.H2Database" - name="jboss:service=h2,database=BPELDB"> - <attribute name="Database">BPELDB</attribute> - <attribute name="DataDir">${jboss.server.data.dir}</attribute> - </mbean> - -</datasources>

14 years, 5 months

1
0
0 / 0

riftsaw SVN: r317 - trunk/distribution/src/main/release/install.

by riftsaw-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-11-24 10:21:52 -0500 (Tue, 24 Nov 2009) New Revision: 317 Modified: trunk/distribution/src/main/release/install/build.xml Log: remove h2.jar from server/default/lib when uninstalled Modified: trunk/distribution/src/main/release/install/build.xml =================================================================== --- trunk/distribution/src/main/release/install/build.xml 2009-11-24 15:15:55 UTC (rev 316) +++ trunk/distribution/src/main/release/install/build.xml 2009-11-24 15:21:52 UTC (rev 317) @@ -182,9 +182,11 @@  <target name="internal.uninstall.riftsaw.into.jboss.db.hsql"> - <delete dir="${server.lib.dir}"> - <include>h2*.jar</include> - </delete> + <delete> + <fileset dir="${server.lib.dir}"> + <include name="h2*.jar"/> + </fileset> + </delete> </target> <target name="internal.uninstall.riftsaw.into.jboss.db.derby">

14 years, 5 months

1
0
0 / 0

riftsaw SVN: r316 - in trunk: distribution and 5 other directories.

by riftsaw-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-11-24 10:15:55 -0500 (Tue, 24 Nov 2009) New Revision: 316 Modified: trunk/distribution/pom.xml trunk/distribution/src/main/assembly/bin.xml trunk/distribution/src/main/release/db/datasource/bpel-hsql-ds.xml trunk/distribution/src/main/release/db/jdbc/hsql.properties trunk/distribution/src/main/release/install/build.xml trunk/pom.xml trunk/runtime/engine-assembly/src/main/resources/bpel-ds.xml Log: Update to h2 version 1.2.124; Use TX_ISO serializable and multithreaded=true when running H2 Modified: trunk/distribution/pom.xml =================================================================== --- trunk/distribution/pom.xml 2009-11-24 15:14:06 UTC (rev 315) +++ trunk/distribution/pom.xml 2009-11-24 15:15:55 UTC (rev 316) @@ -37,8 +37,7 @@ <mysql.connector.version>5.0.8</mysql.connector.version> <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> + <derby.version>10.4.1.3</derby.version> </properties> <dependencies> @@ -121,8 +120,13 @@ <version>9.x</version> </dependency> -  <dependency> + <artifactId>h2</artifactId> + <groupId>com.h2database</groupId> + </dependency> + +  + <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> <version>${mysql.connector.version}</version> @@ -149,8 +153,7 @@ </dependency> <dependency> <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>${h2.version}</version> + <artifactId>h2</artifactId> </dependency>  <antcall target="internal.install.riftsaw.into.jboss.db.${database}" /> - +  <mkdir dir="${deploy.dir}/bpel-console"/> @@ -182,7 +182,9 @@  <target name="internal.uninstall.riftsaw.into.jboss.db.hsql"> - <delete file="${server.lib.dir}/h2-1.0.68.jar" /> + <delete dir="${server.lib.dir}"> + <include>h2*.jar</include> + </delete> </target> <target name="internal.uninstall.riftsaw.into.jboss.db.derby"> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-24 15:14:06 UTC (rev 315) +++ trunk/pom.xml 2009-11-24 15:15:55 UTC (rev 316) @@ -73,9 +73,10 @@ <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.6</rosetta.version> + <rosetta.version>4.6</rosetta.version> <jbossesb.version>4.6</jbossesb.version> <wsdl4j.version>1.6.2</wsdl4j.version> + <h2.version>1.2.124</h2.version> </properties> <dependencyManagement> @@ -113,8 +114,13 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <version>${commons.logging.version}</version> - </dependency> - + </dependency> + + <dependency> + <artifactId>h2</artifactId> + <groupId>com.h2database</groupId> + <version>${h2.version}</version> + </dependency>  <dependency> <groupId>org.jboss.soa.bpel</groupId> @@ -145,7 +151,7 @@ <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-agents</artifactId> <version>${riftsaw.ode.version}</version> - </dependency> + </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-schedule-simpler</artifactId> @@ -180,37 +186,37 @@ <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-scheduler-simple</artifactId> <version>${riftsaw.ode.version}</version> - </dependency> + </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-bpel-obj</artifactId> <version>${riftsaw.ode.version}</version> - </dependency> + </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-bpel-ql</artifactId> <version>${riftsaw.ode.version}</version> - </dependency> + </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-bpel-schemas</artifactId> <version>${riftsaw.ode.version}</version> - </dependency> + </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-dao-hibernate</artifactId> <version>${riftsaw.ode.version}</version> - </dependency> + </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-jacob</artifactId> <version>${riftsaw.ode.version}</version> - </dependency> + </dependency> <dependency> <groupId>org.jboss.soa.bpel</groupId> <artifactId>riftsaw-tools</artifactId> <version>${riftsaw.ode.version}</version> - </dependency> + </dependency> <dependency> <groupId>junit</groupId> Modified: trunk/runtime/engine-assembly/src/main/resources/bpel-ds.xml =================================================================== --- trunk/runtime/engine-assembly/src/main/resources/bpel-ds.xml 2009-11-24 15:14:06 UTC (rev 315) +++ trunk/runtime/engine-assembly/src/main/resources/bpel-ds.xml 2009-11-24 15:15:55 UTC (rev 316) @@ -4,7 +4,7 @@ <datasources> <local-tx-datasource> <jndi-name>BPELDB</jndi-name> - <connection-url>jdbc:h2:${jboss.server.data.dir}${/}h2${/}BPELDB</connection-url> + <connection-url>jdbc:h2:${jboss.server.data.dir}${/}h2${/}BPELDB;MVCC=false;LOCK_MODE=1;MULTI_THREADED=TRUE</connection-url> <driver-class>org.h2.Driver</driver-class> <user-name>sa</user-name> <password/>

14 years, 5 months

1
0
0 / 0

riftsaw SVN: r315 - in trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime: ws and 1 other directory.

by riftsaw-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-11-24 10:14:06 -0500 (Tue, 24 Nov 2009) New Revision: 315 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/ws/SOAPMessageAdapter.java Log: Don't waste CPU cycles 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-24 15:13:34 UTC (rev 314) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java 2009-11-24 15:14:06 UTC (rev 315) @@ -221,7 +221,7 @@ String messageId = new GUID().toString(); MyRoleMessageExchange odeMex = _bpelServer.getEngine() .createMessageExchange(messageId, adapter.getServiceName(), adapter.getOperationName()); - __log.debug("ODE routed to operation " + odeMex.getOperation() + " from service " + adapter.getServiceName()); + if (__log.isDebugEnabled()) __log.debug("ODE routed to operation " + odeMex.getOperation() + " from service " + adapter.getServiceName()); return odeMex; } 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-24 15:13:34 UTC (rev 314) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/SOAPMessageAdapter.java 2009-11-24 15:14:06 UTC (rev 315) @@ -35,9 +35,6 @@ import javax.wsdl.extensions.ElementExtensible; import javax.wsdl.extensions.soap.SOAPBinding; import javax.xml.namespace.QName; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; import javax.xml.soap.*; import java.util.*; @@ -339,7 +336,7 @@ if (srcPart == null) throw new RuntimeException("Soap body does not contain required part +"+part.getName()); - odeMessage.setPart(srcPart.getLocalName(), cloneElement(srcPart)); + odeMessage.setPart(srcPart.getLocalName(), srcPart); } } else @@ -353,7 +350,7 @@ Document doc = DOMUtils.newDocument(); Element destPart = doc.createElementNS(null, part.getName()); destPart.appendChild(doc.importNode(srcPart, true)); - odeMessage.setPart(part.getName(), cloneElement(destPart)); + odeMessage.setPart(part.getName(), destPart); } } } @@ -374,7 +371,7 @@ return match; } - private static Element cloneElement(Element source) + /*private static Element cloneElement(Element source) { // TODO: https://jira.jboss.org/jira/browse/RIFTSAW-38 // For now create a deep copy (performance hit) @@ -388,7 +385,7 @@ { throw new RuntimeException(e); } - } + } */ public static <T> T getFirstExtensibilityElement(ElementExtensible parent, Class<T> cls) { Collection<T> ee = CollectionsX.filter(parent.getExtensibilityElements(), cls);

14 years, 5 months

1
0
0 / 0

riftsaw SVN: r314 - 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-24 10:13:34 -0500 (Tue, 24 Nov 2009) New Revision: 314 Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/DeploymentBuilder.java Log: Copy subdirectores when creating WS deployment Modified: 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 2009-11-24 15:12:55 UTC (rev 313) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/DeploymentBuilder.java 2009-11-24 15:13:34 UTC (rev 314) @@ -56,12 +56,12 @@ 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) @@ -72,7 +72,11 @@ { public boolean accept(File f) { - return (f.getName().endsWith(".wsdl") || f.getName().endsWith(".xsd")); + return ( + f.getName().endsWith(".wsdl") + || f.getName().endsWith(".xsd") + || f.isDirectory() + ); } }; @@ -96,17 +100,32 @@ try { - in = new FileInputStream(src); - out = new FileOutputStream(dest); + if (src.isDirectory()) + { + if (!dest.exists()) { + dest.mkdir(); + } - // Transfer bytes from in to out - byte[] buf = new byte[1024]; - int len; - while ((len = in.read(buf)) > 0) { - out.write(buf, 0, len); + String[] children = src.list(); + for (int i=0; i<children.length; i++) { + copy(new File(src, children[i]), + new File(dest, children[i])); + } + } else { + + in = new FileInputStream(src); + out = new FileOutputStream(dest); + + // Copy the bits from instream to outstream + byte[] buf = new byte[1024]; + int len; + while ((len = in.read(buf)) > 0) { + out.write(buf, 0, len); + } + in.close(); + out.close(); } - in.close(); - out.close(); + } catch (IOException e) {

14 years, 5 months

1
0
0 / 0

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

by riftsaw-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-11-24 10:12:55 -0500 (Tue, 24 Nov 2009) New Revision: 313 Added: trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/xsd/ trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/xsd/Customer.xsd trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/xsd/CustomerOrder.xsd trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/xsd/StandardTypes.xsd Removed: 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 Modified: 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 xsd to subdirectory Modified: trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/Customer.wsdl =================================================================== --- trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/Customer.wsdl 2009-11-24 14:46:40 UTC (rev 312) +++ trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/Customer.wsdl 2009-11-24 15:12:55 UTC (rev 313) @@ -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="Customer.xsd" /> + schemaLocation="xsd/Customer.xsd" /> </xs:schema> </wsdl:types> Deleted: trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/Customer.xsd =================================================================== --- trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/Customer.xsd 2009-11-24 14:46:40 UTC (rev 312) +++ trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/Customer.xsd 2009-11-24 15:12:55 UTC (rev 313) @@ -1,20 +0,0 @@ -<?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> Deleted: trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/CustomerOrder.xsd =================================================================== --- trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/CustomerOrder.xsd 2009-11-24 14:46:40 UTC (rev 312) +++ trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/CustomerOrder.xsd 2009-11-24 15:12:55 UTC (rev 313) @@ -1,78 +0,0 @@ -<?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-24 14:46:40 UTC (rev 312) +++ trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/OrderManager.wsdl 2009-11-24 15:12:55 UTC (rev 313) @@ -18,7 +18,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <import namespace="http://www.jboss.org/samples/bpel/CustomerOrder.xsd" - schemaLocation="CustomerOrder.xsd" /> + schemaLocation="xsd/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-24 14:46:40 UTC (rev 312) +++ trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/Retailer.wsdl 2009-11-24 15:12:55 UTC (rev 313) @@ -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="CustomerOrder.xsd" /> + schemaLocation="xsd/CustomerOrder.xsd" /> </xsd:schema> </wsdl:types> Deleted: trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/StandardTypes.xsd =================================================================== --- trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/StandardTypes.xsd 2009-11-24 14:46:40 UTC (rev 312) +++ trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/StandardTypes.xsd 2009-11-24 15:12:55 UTC (rev 313) @@ -1,51 +0,0 @@ -<?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> Copied: trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/xsd/Customer.xsd (from rev 306, trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/Customer.xsd) =================================================================== --- trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/xsd/Customer.xsd (rev 0) +++ trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/xsd/Customer.xsd 2009-11-24 15:12:55 UTC (rev 313) @@ -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/xsd/CustomerOrder.xsd (from rev 306, trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/CustomerOrder.xsd) =================================================================== --- trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/xsd/CustomerOrder.xsd (rev 0) +++ trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/xsd/CustomerOrder.xsd 2009-11-24 15:12:55 UTC (rev 313) @@ -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> Copied: trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/xsd/StandardTypes.xsd (from rev 306, trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/StandardTypes.xsd) =================================================================== --- trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/xsd/StandardTypes.xsd (rev 0) +++ trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/xsd/StandardTypes.xsd 2009-11-24 15:12:55 UTC (rev 313) @@ -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>

14 years, 5 months

1
0
0 / 0

riftsaw SVN: r312 - trunk/runtime/deployer/src/main/java/org/jboss/soa/bpel/deployer.

by riftsaw-commits＠lists.jboss.org

Author: objectiser Date: 2009-11-24 09:46:40 -0500 (Tue, 24 Nov 2009) New Revision: 312 Modified: trunk/runtime/deployer/src/main/java/org/jboss/soa/bpel/deployer/BPELDeployer.java Log: RIFTSAW-117 - if the deployment unit being undeployed still exists, then check whether the deployment unit has a more recent 'last modified time' than the cached deployment unit for the same name (i.e. indicating it had been updated). Modified: trunk/runtime/deployer/src/main/java/org/jboss/soa/bpel/deployer/BPELDeployer.java =================================================================== --- trunk/runtime/deployer/src/main/java/org/jboss/soa/bpel/deployer/BPELDeployer.java 2009-11-24 12:45:27 UTC (rev 311) +++ trunk/runtime/deployer/src/main/java/org/jboss/soa/bpel/deployer/BPELDeployer.java 2009-11-24 14:46:40 UTC (rev 312) @@ -120,8 +120,16 @@ du.getRelativePath()); try { + BPELDeploymentUnit prev=m_deploymentUnits.get(top.getSimpleName()); + + // Undeploy if deployment unit no longer exists on the filesystem, OR + // the last modified time of the cached deployment unit is older than + // the last modified time of the current deployment unit, signifying + // it has been updated and therefore must be undeployed first if (top instanceof VFSDeploymentUnit && - ((VFSDeploymentUnit)top).getRoot().exists() == false) { + (((VFSDeploymentUnit)top).getRoot().exists() == false || + (prev != null && prev.getLastModified() < + ((VFSDeploymentUnit)top).getRoot().getLastModified()))) { // TODO: Unique name - see deploy BPELDeploymentUnit unit=new BPELDeploymentUnit(top.getSimpleName(), 0);

14 years, 5 months

1
0
0 / 0

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

by riftsaw-commits＠lists.jboss.org

Author: objectiser Date: 2009-11-24 07:45:27 -0500 (Tue, 24 Nov 2009) New Revision: 311 Modified: trunk/distribution/src/main/assembly/bin.xml Log: Remove restriction (added for M2 release) on the examples included in the distribution. Modified: trunk/distribution/src/main/assembly/bin.xml =================================================================== --- trunk/distribution/src/main/assembly/bin.xml 2009-11-24 12:27:11 UTC (rev 310) +++ trunk/distribution/src/main/assembly/bin.xml 2009-11-24 12:45:27 UTC (rev 311) @@ -69,18 +69,6 @@ <fileSet> <directory>../samples</directory> <outputDirectory>samples</outputDirectory> - -  - <includes> - <include>quickstart/hello_world/**</include> - <include>quickstart/simple_correlation/**</include> - <include>quickstart/simple_invoke/**</include> - <include>quickstart/loan_approval/**</include> - <include>esb/bpel_helloworld/**</include> - <include>esb/bpel_loan_fault/**</include> - <include>esb/webservice_esb_bpel/**</include> - </includes> </fileSet> <fileSet>

14 years, 5 months

1
0
0 / 0

riftsaw SVN: r310 - in trunk: samples/quickstart/hello_world and 3 other directories.

by riftsaw-commits＠lists.jboss.org

Author: objectiser Date: 2009-11-24 07:27:11 -0500 (Tue, 24 Nov 2009) New Revision: 310 Modified: trunk/docs/docbook/gettingstartedguide/src/main/module/examples.xml trunk/docs/docbook/gettingstartedguide/src/main/module/installation.xml trunk/samples/quickstart/hello_world/readme.txt trunk/samples/quickstart/loan_approval/readme.txt trunk/samples/quickstart/simple_correlation/readme.txt trunk/samples/quickstart/simple_invoke/readme.txt Log: RIFTSAW-96 and some minor fixes to the getting started guide. Modified: trunk/docs/docbook/gettingstartedguide/src/main/module/examples.xml =================================================================== --- trunk/docs/docbook/gettingstartedguide/src/main/module/examples.xml 2009-11-24 12:21:00 UTC (rev 309) +++ trunk/docs/docbook/gettingstartedguide/src/main/module/examples.xml 2009-11-24 12:27:11 UTC (rev 310) @@ -16,8 +16,8 @@ Before deploying any of the examples, you need to start the JBossAS server and ensure that RiftSaw has been installed. This can be achieved by testing whether the - <ulink url="http://localhost:8080/bpel">BPEL Console</ulink> - (as discussed in the previous chapter) is available. + <ulink url="http://localhost:8080/bpel-console">BPEL Console</ulink> + (as discussed in the User Guide) is available. </para> </section> @@ -167,7 +167,6 @@ </section> - + <section> <title>Importing Examples into Eclipse</title> Modified: trunk/docs/docbook/gettingstartedguide/src/main/module/installation.xml =================================================================== --- trunk/docs/docbook/gettingstartedguide/src/main/module/installation.xml 2009-11-24 12:21:00 UTC (rev 309) +++ trunk/docs/docbook/gettingstartedguide/src/main/module/installation.xml 2009-11-24 12:27:11 UTC (rev 310) @@ -25,7 +25,8 @@ <listitem>JBossESB (version 4.6.GA or higher), should download the <emphasis role="bold">jbossesb-4.6.GA.zip</emphasis>, available from <ulink url="http://www.jboss.org/jbossesb">http://www.jboss.org/jbossesb</ulink>. This is only required to run the ESB/BPEL example.</listitem> <listitem>RiftSaw (version 2.0-M2 or higher), available from <ulink url="http://www.jboss.org/riftsaw">http://www.jboss.org/riftsaw</ulink></listitem> - <listitem>If using JBossAS 5.1.GA, then it will also be necessary to upgrade JBossWS (version 3.2.1.GA or higher), + <listitem>If using version 5.1.GA of JBossAS, or wish to use the CXF version of + JBossWS, then it will be necessary to upgrade JBossWS (version 3.2.1.GA or higher), available from <ulink url="http://www.jboss.org/jbossws">http://www.jboss.org/jbossws</ulink></listitem> <listitem> Ant, available from <ulink url="http://ant.apache.org/">http://ant.apache.org</ulink> @@ -67,7 +68,8 @@ <listitem> Upgrade JBossWS <para> - This is only required if you are using JBossAS 5.1.GA. + This is only required if you are using 5.1.GA of JBossAS, or wish to switch from jbossws-native + to jbossws-cxf. </para> <para> Unpack the JBossWS installation into a location alongside the JBossAS installation. Modified: trunk/samples/quickstart/hello_world/readme.txt =================================================================== --- trunk/samples/quickstart/hello_world/readme.txt 2009-11-24 12:21:00 UTC (rev 309) +++ trunk/samples/quickstart/hello_world/readme.txt 2009-11-24 12:27:11 UTC (rev 310) @@ -19,3 +19,7 @@ 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_hello_worldWS?wsdl is the URL to the BPEL process' WSDL Modified: trunk/samples/quickstart/loan_approval/readme.txt =================================================================== --- trunk/samples/quickstart/loan_approval/readme.txt 2009-11-24 12:21:00 UTC (rev 309) +++ trunk/samples/quickstart/loan_approval/readme.txt 2009-11-24 12:27:11 UTC (rev 310) @@ -38,3 +38,9 @@ Feel free to change the logic in the JAX-WS implemented services and re-deploy the example to see the effects. + +Some handy URLs: +http://localhost:8080/bpel-console is the BPEL console +http://localhost:8080/Quickstart_bpel_loan_approvalWS?wsdl is the URL to the BPEL process' WSDL +http://localhost:8080/Quickstart_bpel_loan_approval/LoanApproval?wsdl is the URL to the Loan Approval service +http://localhost:8080/Quickstart_bpel_loan_approval/RiskAssessment?wsdl is the URL to the Risk Assessment service Modified: trunk/samples/quickstart/simple_correlation/readme.txt =================================================================== --- trunk/samples/quickstart/simple_correlation/readme.txt 2009-11-24 12:21:00 UTC (rev 309) +++ trunk/samples/quickstart/simple_correlation/readme.txt 2009-11-24 12:27:11 UTC (rev 310) @@ -25,3 +25,7 @@ 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 Modified: trunk/samples/quickstart/simple_invoke/readme.txt =================================================================== --- trunk/samples/quickstart/simple_invoke/readme.txt 2009-11-24 12:21:00 UTC (rev 309) +++ trunk/samples/quickstart/simple_invoke/readme.txt 2009-11-24 12:27:11 UTC (rev 310) @@ -27,5 +27,5 @@ Some handy URLs: http://localhost:8080/bpel-console is the BPEL console -http://localhost:8080/bpel/processes/simpleInvoke?wsdl is the URL to the BPEL process' WSDL +http://localhost:8080/Quickstart_bpel_simple_invokeWS?wsdl is the URL to the BPEL process' WSDL http://localhost:8080/Quickstart_bpel_simple_invoke/HelloWorldWS?wsdl is the JBossWS endpoint's WSDL

14 years, 5 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

riftsaw-commits November 2009