October 2009 - riftsaw-commits - Jboss List Archives

RiftSaw - Build # 7 - Still Failing!

by jboss-qa-internal＠redhat.com

RiftSaw Build number 7 status: Still Failing Details available at http://hudson.jboss.org/hudson/job/RiftSaw/7/

14 years, 6 months

1
0
0 / 0

riftsaw SVN: r198 - trunk/console/integration/src/main/java/org/jboss/soa/bpel/console.

by riftsaw-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-10-21 05:26:13 -0400 (Wed, 21 Oct 2009) New Revision: 198 Modified: trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ProcessMgmtImpl.java Log: Access process instance data from the console Modified: trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ProcessMgmtImpl.java =================================================================== --- trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ProcessMgmtImpl.java 2009-10-21 08:00:54 UTC (rev 197) +++ trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ProcessMgmtImpl.java 2009-10-21 09:26:13 UTC (rev 198) @@ -122,8 +122,8 @@ { String varName = varRef.getName(); TVariableInfo varInfo = mgmtFacade.getVariableInfo(scopeId, varName).getVariableInfo(); - Object obj = varInfo.getValue(); - variables.put(varName, obj); + Object obj = varInfo.getValue(); + variables.put(varName, "n/a"); // TODO: how to get to the value? } return variables;

14 years, 6 months

1
0
0 / 0

RiftSaw - Build # 6 - Still Failing!

by jboss-qa-internal＠redhat.com

RiftSaw Build number 6 status: Still Failing Details available at http://hudson.jboss.org/hudson/job/RiftSaw/6/

14 years, 6 months

1
0
0 / 0

riftsaw SVN: r197 - branches/ODE/ODE-1.x-fixes/scripts.

by riftsaw-commits＠lists.jboss.org

Author: jeff.yuchang Date: 2009-10-21 04:00:54 -0400 (Wed, 21 Oct 2009) New Revision: 197 Modified: branches/ODE/ODE-1.x-fixes/scripts/build.properties branches/ODE/ODE-1.x-fixes/scripts/build.xml Log: * update the snapshot build. Modified: branches/ODE/ODE-1.x-fixes/scripts/build.properties =================================================================== --- branches/ODE/ODE-1.x-fixes/scripts/build.properties 2009-10-20 15:33:22 UTC (rev 196) +++ branches/ODE/ODE-1.x-fixes/scripts/build.properties 2009-10-21 08:00:54 UTC (rev 197) @@ -1,3 +1,3 @@ -local.repo=/opt/m2/riftsaw-repo +local.repo=/opt/m2/riftsaw-repo/m2-snapshot-repository username= password= Modified: branches/ODE/ODE-1.x-fixes/scripts/build.xml =================================================================== --- branches/ODE/ODE-1.x-fixes/scripts/build.xml 2009-10-20 15:33:22 UTC (rev 196) +++ branches/ODE/ODE-1.x-fixes/scripts/build.xml 2009-10-21 08:00:54 UTC (rev 197) @@ -16,36 +16,34 @@ <attribute name="filename" default = "" /> <attribute name="filetype" default = "jar" /> <sequential> - <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="apache.maven.ant.tasks.classpath" /> - <artifact:install-provider artifactId="wagon-webdav" version="1.0-beta-2"/> - <condition property="pom.file" value="${artifact.dir}/@{filename}/${version}/(a){filename}-${version}.pom"> + <condition property="@{filename}.file" value="${artifact.dir}/@{filename}/${version}/(a){filename}-${version}.pom"> <equals arg1="@{filetype}" arg2="jar" /> </condition> - <condition property="pom.file" value="pom/(a){filename}.pom"> + <condition property="@{filename}.file" value="pom/(a){filename}.pom"> <available file="pom/(a){filename}.pom"/> </condition> - <artifact:pom id="pom-file" file = "${pom.file}" /> - - <echo>${pom.file}</echo> + <artifact:pom id="@{filename}-file" file = "${(a){filename}.file}" /> + + <echo> Publishing ${artifact.dir}/@{filename}/${version}/@{filename}-${version}.(a){filetype} ...</echo> + <echo> Its pom file is: ${(a){filename}.file}</echo> <artifact:deploy file="${artifact.dir}/@{filename}/${version}/@{filename}-${version}.(a){filetype}"> <remoteRepository url="${jboss.snapshot.repo}"> <authentication username="${username}" password="${password}"/> </remoteRepository> - <pom refid="pom-file"/> + <pom refid="@{filename}-file"/> </artifact:deploy> </sequential> </macrodef> <target name="deploy"> - <publish filename="jboss-riftsaw-docs" filetype="zip"/> - <publish filename="jboss-riftsaw-jbi" filetype="zip"/> - <publish filename="jboss-riftsaw-sources" filetype="zip" /> - <publish filename="jboss-riftsaw-war" filetype="zip"/> + <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="apache.maven.ant.tasks.classpath" /> + <artifact:install-provider artifactId="wagon-webdav" version="1.0-beta-2" /> + <publish filename="riftsaw-agents" /> <publish filename="riftsaw-axis2" /> - <publish filename="riftsaw-axis-war" filetype="war"/> + <publish filename="riftsaw-axis2-war" filetype="war"/> <publish filename="riftsaw-bpel-api" /> <publish filename="riftsaw-bpel-api-jca" /> <publish filename="riftsaw-bpel-compiler" /> @@ -71,6 +69,10 @@ <publish filename="riftsaw-scheduler-simple" /> <publish filename="riftsaw-tools" /> <publish filename="riftsaw-utils" /> + <publish filename="jboss-riftsaw-docs" filetype="zip"/> + <publish filename="jboss-riftsaw-jbi" filetype="zip"/> + <publish filename="jboss-riftsaw-sources" filetype="zip" /> + <publish filename="jboss-riftsaw-war" filetype="zip"/> </target> </project>

14 years, 6 months

1
0
0 / 0

RiftSaw - Build # 5 - Still Failing!

by jboss-qa-internal＠redhat.com

RiftSaw Build number 5 status: Still Failing Details available at http://hudson.jboss.org/hudson/job/RiftSaw/5/

14 years, 6 months

1
0
0 / 0

riftsaw SVN: r196 - in trunk: console/integration/src/main/java/org/jboss/soa/bpel/console and 1 other directory.

by riftsaw-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-10-20 11:33:22 -0400 (Tue, 20 Oct 2009) New Revision: 196 Modified: trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ModelAdaptor.java trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ProcessMgmtImpl.java trunk/pom.xml Log: Fix RIFTSAW-51: Instance filter doesn't work correctly Modified: trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ModelAdaptor.java =================================================================== --- trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ModelAdaptor.java 2009-10-20 15:12:05 UTC (rev 195) +++ trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ModelAdaptor.java 2009-10-20 15:33:22 UTC (rev 196) @@ -21,10 +21,7 @@ */ package org.jboss.soa.bpel.console; -import org.apache.ode.bpel.pmapi.ProcessInfoListDocument; -import org.apache.ode.bpel.pmapi.TProcessInfo; -import org.apache.ode.bpel.pmapi.InstanceInfoListDocument; -import org.apache.ode.bpel.pmapi.TInstanceInfo; +import org.apache.ode.bpel.pmapi.*; import org.jboss.bpm.console.client.model.ProcessDefinitionRef; import org.jboss.bpm.console.client.model.ProcessInstanceRef; @@ -73,7 +70,7 @@ encodeId(i0.getPid()), i0.getDtStarted().getTime(), null, - false + false // see filter criteria when selecting instances ); results.add(ref); Modified: trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ProcessMgmtImpl.java =================================================================== --- trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ProcessMgmtImpl.java 2009-10-20 15:12:05 UTC (rev 195) +++ trunk/console/integration/src/main/java/org/jboss/soa/bpel/console/ProcessMgmtImpl.java 2009-10-20 15:33:22 UTC (rev 196) @@ -25,14 +25,14 @@ import org.jboss.bpm.console.client.model.ProcessInstanceRef; import org.jboss.bpm.console.server.integration.ProcessManagement; import org.jboss.soa.bpel.runtime.engine.BPELEngine; -import org.apache.ode.bpel.pmapi.BpelManagementFacade; -import org.apache.ode.bpel.pmapi.InstanceInfoListDocument; +import org.apache.ode.bpel.pmapi.*; import javax.naming.InitialContext; import javax.naming.NamingException; import javax.xml.namespace.QName; import java.util.List; import java.util.Map; +import java.util.HashMap; /** * @author Heiko.Braun <heiko.braun(a)jboss.com> @@ -67,12 +67,12 @@ public ProcessDefinitionRef getProcessDefinition(String definitionId) { - return null; + throw new RuntimeException("Not implemented"); } public List<ProcessDefinitionRef> removeProcessDefinition(String definitionId) { - return null; + throw new RuntimeException("Not implemented"); } public List<ProcessInstanceRef> getProcessInstances(String definitionId) @@ -83,7 +83,7 @@ //TODO: qname.getLocalPart() includes the version number. InstanceInfoListDocument result = getMgmtFacade().listInstances( // filter, order, limit - "namespace=" + qname.getNamespaceURI(), "name", 1000); + "namespace=" + qname.getNamespaceURI()+" status=active", "name", 1000); return ModelAdaptor.adoptInstances(result); } @@ -105,7 +105,28 @@ public Map<String, Object> getInstanceData(String instanceId) { - throw new RuntimeException("Not implemented"); + Map<String,Object> variables = new HashMap<String,Object>(); + + String iid = ModelAdaptor.decodeId(instanceId); // what a crappy API... + + // get root scope id + BpelManagementFacade mgmtFacade = getMgmtFacade(); + TInstanceInfo instanceInfo = mgmtFacade.getInstanceInfo(Long.valueOf(iid)).getInstanceInfo(); + String scopeId = instanceInfo.getRootScope().getSiid(); + + // get scope info + TScopeInfo scopeInfo = mgmtFacade.getScopeInfo(scopeId).getScopeInfo(); + List<TVariableRef> varRefs = scopeInfo.getVariables().getVariableRefList(); + + for(TVariableRef varRef : varRefs) + { + String varName = varRef.getName(); + TVariableInfo varInfo = mgmtFacade.getVariableInfo(scopeId, varName).getVariableInfo(); + Object obj = varInfo.getValue(); + variables.put(varName, obj); + } + + return variables; } public void setInstanceData(String instanceId, Map<String, Object> data) @@ -114,8 +135,9 @@ } public void endInstance(String instanceId, ProcessInstanceRef.RESULT result) - { - throw new RuntimeException("Not implemented"); + { + String iid = ModelAdaptor.decodeId(instanceId); + getMgmtFacade().terminate(Long.valueOf(iid)); } public void deleteInstance(String instanceId) @@ -131,5 +153,5 @@ public void signalExecution(String executionId, String signal) { throw new RuntimeException("Not implemented"); - } + } } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-20 15:12:05 UTC (rev 195) +++ trunk/pom.xml 2009-10-20 15:33:22 UTC (rev 196) @@ -67,7 +67,7 @@ <properties> <riftsaw.engine.version>2.0-SNAPSHOT</riftsaw.engine.version> - <bpm.console.version>1.1.2-SNAPSHOT</bpm.console.version> + <bpm.console.version>1.2.0-SNAPSHOT</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>

14 years, 6 months

1
0
0 / 0

RiftSaw - Build # 4 - Still Failing!

by jboss-qa-internal＠redhat.com

RiftSaw Build number 4 status: Still Failing Details available at http://hudson.jboss.org/hudson/job/RiftSaw/4/

14 years, 6 months

1
0
0 / 0

riftsaw SVN: r195 - in trunk: integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world/messages and 4 other directories.

by riftsaw-commits＠lists.jboss.org

Author: objectiser Date: 2009-10-20 11:12:05 -0400 (Tue, 20 Oct 2009) New Revision: 195 Modified: trunk/integration-tests/src/test/resources/deployment.properties trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world/messages/hello_response1.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages/loanresp1.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_simple_correlation/messages/goodbye_response1.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_simple_correlation/messages/hello_response1.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_simple_invoke/messages/hello_response1.xml trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/db/DatabaseInitializer.java Log: Updated expected results so all tests now pass with hsql. Modified: trunk/integration-tests/src/test/resources/deployment.properties =================================================================== --- trunk/integration-tests/src/test/resources/deployment.properties 2009-10-20 14:14:47 UTC (rev 194) +++ trunk/integration-tests/src/test/resources/deployment.properties 2009-10-20 15:12:05 UTC (rev 195) @@ -17,3 +17,8 @@ # The directory for JBossESB home # (e.g. /var/local/jbossesb-4.6.GA) org.jboss.esb.home=/home/gbrown/NotBackedUp/testing/riftsawIT/jbossesb-4.6.GA + +# database +# (e.g. hsql derby mysql) +database=hsql + Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world/messages/hello_response1.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world/messages/hello_response1.xml 2009-10-20 14:14:47 UTC (rev 194) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_hello_world/messages/hello_response1.xml 2009-10-20 15:12:05 UTC (rev 195) @@ -1 +1,3 @@ -<?xml version='1.0' encoding='UTF-8'?><soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"><soapenv:Body><odens:helloResponse xmlns:odens="http://www.jboss.org/bpel/examples/wsdl"><TestPart xmlns:wsdl="http://www.jboss.org/bpel/examples/wsdl">Hello World</TestPart></odens:helloResponse></soapenv:Body></soapenv:Envelope> \ No newline at end of file +<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:Header></env:Header><env:Body><wsdl:hello xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/' xmlns:wsdl='http://www.jboss.org/bpel/examples/wsdl'> + <TestPart>Hello World</TestPart> + </wsdl:hello></env:Body></env:Envelope> \ No newline at end of file Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages/loanresp1.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages/loanresp1.xml 2009-10-20 14:14:47 UTC (rev 194) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/messages/loanresp1.xml 2009-10-20 15:12:05 UTC (rev 195) @@ -1 +1 @@ -<?xml version='1.0' encoding='UTF-8'?><soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"><soapenv:Body><odens:requestResponse xmlns:odens="http://example.com/loan-approval/wsdl/"><accept>yes</accept></odens:requestResponse></soapenv:Body></soapenv:Envelope> \ No newline at end of file +<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 Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_simple_correlation/messages/goodbye_response1.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_simple_correlation/messages/goodbye_response1.xml 2009-10-20 14:14:47 UTC (rev 194) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_simple_correlation/messages/goodbye_response1.xml 2009-10-20 15:12:05 UTC (rev 195) @@ -1,3 +1,6 @@ -<?xml version='1.0' encoding='UTF-8'?><soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"><soapenv:Body><odens:goodbyeResponse xmlns:odens="http://www.jboss.org/bpel/examples/wsdl"><ID xmlns:wsdl="http://www.jboss.org/bpel/examples/wsdl"> +<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:Header></env:Header><env:Body><wsdl:goodbye xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/' xmlns:wsdl='http://www.jboss.org/bpel/examples/wsdl'> + <ID> <id>1</id> - </ID><Message xmlns:wsdl="http://www.jboss.org/bpel/examples/wsdl">Goodbye World</Message></odens:goodbyeResponse></soapenv:Body></soapenv:Envelope> \ No newline at end of file + </ID> + <Message>Goodbye World</Message> + </wsdl:goodbye></env:Body></env:Envelope> \ No newline at end of file Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_simple_correlation/messages/hello_response1.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_simple_correlation/messages/hello_response1.xml 2009-10-20 14:14:47 UTC (rev 194) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_simple_correlation/messages/hello_response1.xml 2009-10-20 15:12:05 UTC (rev 195) @@ -1,3 +1,6 @@ -<?xml version='1.0' encoding='UTF-8'?><soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"><soapenv:Body><odens:helloResponse xmlns:odens="http://www.jboss.org/bpel/examples/wsdl"><ID xmlns:wsdl="http://www.jboss.org/bpel/examples/wsdl"> +<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:Header></env:Header><env:Body><wsdl:hello xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/' xmlns:wsdl='http://www.jboss.org/bpel/examples/wsdl'> + <ID> <id>1</id> - </ID><Message xmlns:wsdl="http://www.jboss.org/bpel/examples/wsdl">Hello World</Message></odens:helloResponse></soapenv:Body></soapenv:Envelope> \ No newline at end of file + </ID> + <Message>Hello World</Message> + </wsdl:hello></env:Body></env:Envelope> \ No newline at end of file Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_simple_invoke/messages/hello_response1.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_simple_invoke/messages/hello_response1.xml 2009-10-20 14:14:47 UTC (rev 194) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_simple_invoke/messages/hello_response1.xml 2009-10-20 15:12:05 UTC (rev 195) @@ -1 +1,3 @@ -<?xml version='1.0' encoding='UTF-8'?><soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"><soapenv:Body><odens:sayHelloToResponse xmlns:odens="http://www.jboss.org/bpel/examples/wsdl"><ToWhom xmlns:wsdl="http://www.jboss.org/bpel/examples/wsdl">Hello ME. Sincerely, JBossWS and BPEL</ToWhom></odens:sayHelloToResponse></soapenv:Body></soapenv:Envelope> \ No newline at end of file +<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:Header></env:Header><env:Body><wsdl:sayHelloTo xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/' xmlns:wsdl='http://www.jboss.org/bpel/examples/wsdl'> + <ToWhom>Hello ME. Sincerely, JBossWS and BPEL</ToWhom> + </wsdl:sayHelloTo></env:Body></env:Envelope> \ No newline at end of file Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/db/DatabaseInitializer.java =================================================================== --- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/db/DatabaseInitializer.java 2009-10-20 14:14:47 UTC (rev 194) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/db/DatabaseInitializer.java 2009-10-20 15:12:05 UTC (rev 195) @@ -135,11 +135,11 @@ tx = (UserTransaction)new InitialContext().lookup("UserTransaction"); tx.begin(); - log.info("Execute SQL from resource: "+resource); + log.debug("Execute SQL from resource: "+resource); URL url = Thread.currentThread().getContextClassLoader().getResource(resource); - log.info("Execute SQL from resource URL: "+url); + log.debug("Execute SQL from resource URL: "+url); String sql = getStringFromStream(url.openStream()); sql = sql.replaceAll("(?m)^--([^\n]+)?$", ""); // Remove all commented lines

14 years, 6 months

1
0
0 / 0

RiftSaw - Build # 3 - Still Failing!

by jboss-qa-internal＠redhat.com

RiftSaw Build number 3 status: Still Failing Details available at http://hudson.jboss.org/hudson/job/RiftSaw/3/

14 years, 6 months

1
0
0 / 0

riftsaw SVN: r194 - in trunk: distribution/src/main/assembly and 4 other directories.

by riftsaw-commits＠lists.jboss.org

Author: objectiser Date: 2009-10-20 10:14:47 -0400 (Tue, 20 Oct 2009) New Revision: 194 Modified: trunk/distribution/pom.xml trunk/distribution/src/main/assembly/bin.xml trunk/distribution/src/main/release/db/datasource/bpel-derby-ds.xml trunk/distribution/src/main/release/db/hibernate/derby.properties trunk/distribution/src/main/release/install/build.xml trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/db/DatabaseInitializer.java Log: Applied changes to get derby deploy working. Modified: trunk/distribution/pom.xml =================================================================== --- trunk/distribution/pom.xml 2009-10-20 06:07:02 UTC (rev 193) +++ trunk/distribution/pom.xml 2009-10-20 14:14:47 UTC (rev 194) @@ -39,6 +39,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> </properties> <dependencies> @@ -86,6 +87,16 @@ <artifactId>jtds</artifactId> <version>${jtds.version}</version> </dependency> + <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derby</artifactId> + <version>${derby.version}</version> + </dependency> + <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derbytools</artifactId> + <version>${derby.version}</version> + </dependency>  - <user-name>@usernmae@</user-name> + <user-name>@username@</user-name> <password>@password@</password>  Modified: trunk/distribution/src/main/release/db/hibernate/derby.properties =================================================================== --- trunk/distribution/src/main/release/db/hibernate/derby.properties 2009-10-20 06:07:02 UTC (rev 193) +++ trunk/distribution/src/main/release/db/hibernate/derby.properties 2009-10-20 14:14:47 UTC (rev 194) @@ -1 +1,4 @@ -dialect=org.hibernate.dialect.DerbyDialect \ No newline at end of file +dialect=org.hibernate.dialect.DerbyDialect + +username=sa +password= Modified: trunk/distribution/src/main/release/install/build.xml =================================================================== --- trunk/distribution/src/main/release/install/build.xml 2009-10-20 06:07:02 UTC (rev 193) +++ trunk/distribution/src/main/release/install/build.xml 2009-10-20 14:14:47 UTC (rev 194) @@ -92,9 +92,10 @@ <echo message="Undeploy the BPEL runtime from JBoss ESB server" /> <delete dir="${deployers.dir}/${bpel-deployer}" /> <delete dir="${deploy.dir}/${bpel-runtime}" /> - <delete file="${deploy.dir}/${jbossesb-bpel}" /> - <delete file="${server.lib.dir}/derby-10.4.1.3.jar"/> - <delete file="${server.lib.dir}/derbytools-10.4.1.3.jar"/> + <delete file="${deploy.dir}/${jbossesb-bpel}" /> + +  + <antcall target="internal.uninstall.riftsaw.into.jboss.db.${database}" />  <move file="${deployers.dir}/esb.deployer/lib/xbean-2.2.0.tmp" @@ -122,6 +123,14 @@  <target name="internal.install.riftsaw.into.jboss.db.hsql" /> + <target name="internal.install.riftsaw.into.jboss.db.derby"> + <copy todir="${server.lib.dir}" overwrite="true"> + <fileset dir="../db/drivers"> + <include name="derby*.jar"/> + </fileset> + </copy> + </target> + <target name="internal.install.riftsaw.into.jboss.db.mysql"> <copy todir="${deploy.dir}/${bpel-runtime}/lib" overwrite="true"> <fileset dir="../db/drivers"> @@ -130,4 +139,14 @@ </copy> </target> +  + <target name="internal.uninstall.riftsaw.into.jboss.db.hsql" /> + + <target name="internal.uninstall.riftsaw.into.jboss.db.derby"> + <delete file="${server.lib.dir}/derby-10.4.1.3.jar"/> + <delete file="${server.lib.dir}/derbytools-10.4.1.3.jar"/> + </target> + + <target name="internal.uninstall.riftsaw.into.jboss.db.mysql" /> + </project> Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/db/DatabaseInitializer.java =================================================================== --- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/db/DatabaseInitializer.java 2009-10-20 06:07:02 UTC (rev 193) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/db/DatabaseInitializer.java 2009-10-20 14:14:47 UTC (rev 194) @@ -134,8 +134,13 @@ { tx = (UserTransaction)new InitialContext().lookup("UserTransaction"); tx.begin(); + + log.info("Execute SQL from resource: "+resource); URL url = Thread.currentThread().getContextClassLoader().getResource(resource); + + log.info("Execute SQL from resource URL: "+url); + String sql = getStringFromStream(url.openStream()); sql = sql.replaceAll("(?m)^--([^\n]+)?$", ""); // Remove all commented lines final String[] statements ;

14 years, 6 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

riftsaw-commits October 2009