riftsaw SVN: r734 - in branches/riftsaw-jpa: distribution/src/main/release/db and 4 other directories.
by riftsaw-commits@lists.jboss.org
Author: jeff.yuchang
Date: 2010-06-15 09:26:13 -0400 (Tue, 15 Jun 2010)
New Revision: 734
Modified:
branches/riftsaw-jpa/distribution/src/main/release/db/bpel.properties
branches/riftsaw-jpa/distribution/src/main/release/install/deployment.properties
branches/riftsaw-jpa/integration-tests/pom.xml
branches/riftsaw-jpa/pom.xml
branches/riftsaw-jpa/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java
branches/riftsaw-jpa/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/SOAPMessageAdapter.java
branches/riftsaw-jpa/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java
Log:
* fix the transaction issue, now only pass mexId, and then use it to get MEX from persistence layer. (almost make me crazy on finding this out. ;)
Modified: branches/riftsaw-jpa/distribution/src/main/release/db/bpel.properties
===================================================================
--- branches/riftsaw-jpa/distribution/src/main/release/db/bpel.properties 2010-06-15 13:09:12 UTC (rev 733)
+++ branches/riftsaw-jpa/distribution/src/main/release/db/bpel.properties 2010-06-15 13:26:13 UTC (rev 734)
@@ -110,11 +110,16 @@
bpel.jaxws.client.initializer.impl=(a)jaxws.client.initializer.impl@
+# all hibernate specific properties
+
hibernate.dialect=@dialect@
-hibernate.hbm2ddl.auto=update
+hibernate.hbm2ddl.auto=none
hibernate.current_session_context_class=jta
hibernate.transaction.manager_lookup_class=org.hibernate.transaction.JBossTransactionManagerLookup
+hibernate.show_sql=false
+hibernate.connection.isolation=2
+
jta.UserTransaction=UserTransaction
ode.persistence=hibernate
Modified: branches/riftsaw-jpa/distribution/src/main/release/install/deployment.properties
===================================================================
--- branches/riftsaw-jpa/distribution/src/main/release/install/deployment.properties 2010-06-15 13:09:12 UTC (rev 733)
+++ branches/riftsaw-jpa/distribution/src/main/release/install/deployment.properties 2010-06-15 13:26:13 UTC (rev 734)
@@ -19,5 +19,5 @@
org.jboss.esb.home=/var/local/jbossesb-4.7
# database
-# (e.g. hsql derby mysql)
+# (e.g. hsql postgres mysql)
database=hsql
Modified: branches/riftsaw-jpa/integration-tests/pom.xml
===================================================================
--- branches/riftsaw-jpa/integration-tests/pom.xml 2010-06-15 13:09:12 UTC (rev 733)
+++ branches/riftsaw-jpa/integration-tests/pom.xml 2010-06-15 13:26:13 UTC (rev 734)
@@ -278,6 +278,7 @@
<exclude>org/jboss/soa/bpel/tests/samples/TutorialBPELAtmTestCase.java</exclude>
<exclude>org/jboss/soa/bpel/tests/samples/TutorialBPELPurchaseTestCase.java</exclude>
<exclude>org/jboss/soa/bpel/tests/samples/TutorialBPELTravelAgencyTestCase.java</exclude>
+ <exclude>**/*RiftSaw163*.java</exclude>
</excludes>
</configuration>
<executions>
Modified: branches/riftsaw-jpa/pom.xml
===================================================================
--- branches/riftsaw-jpa/pom.xml 2010-06-15 13:09:12 UTC (rev 733)
+++ branches/riftsaw-jpa/pom.xml 2010-06-15 13:26:13 UTC (rev 734)
@@ -72,9 +72,9 @@
</profiles>
<properties>
- <riftsaw.ode.version>2.1.0.CR1-SNAPSHOT</riftsaw.ode.version>
+ <riftsaw.ode.version>2.1.0-SNAPSHOT</riftsaw.ode.version>
<riftsaw.engine.version>2.1.0-SNAPSHOT</riftsaw.engine.version>
- <bpm.console.version>2.1-SNAPSHOT</bpm.console.version>
+ <bpm.console.version>2.1</bpm.console.version>
<commons.logging.version>1.1.1</commons.logging.version>
<junit.version>3.8.1</junit.version>
<jboss.version>5.1.0.GA</jboss.version>
Modified: branches/riftsaw-jpa/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java
===================================================================
--- branches/riftsaw-jpa/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java 2010-06-15 13:09:12 UTC (rev 733)
+++ branches/riftsaw-jpa/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java 2010-06-15 13:26:13 UTC (rev 734)
@@ -165,7 +165,8 @@
__log.error(errorMsg, e);
throw new Exception(errorMsg);
}
-
+
+
// Hopefully we have a response
__log.debug("Handling response for MEX " + odeMex);
boolean commit = false;
@@ -758,4 +759,8 @@
{
return _odeConfig;
}
+
+ public BpelServerImpl getBpelServer() {
+ return _bpelServer;
+ }
}
Modified: branches/riftsaw-jpa/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/SOAPMessageAdapter.java
===================================================================
--- branches/riftsaw-jpa/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/SOAPMessageAdapter.java 2010-06-15 13:09:12 UTC (rev 733)
+++ branches/riftsaw-jpa/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/SOAPMessageAdapter.java 2010-06-15 13:26:13 UTC (rev 734)
@@ -230,7 +230,7 @@
javax.xml.soap.SOAPHeader soapHeader = soapMessage.getSOAPHeader();
if (soapHeader==null) soapHeader = soapMessage.getSOAPPart().getEnvelope().addHeader();
for (Node headerNode : headerParts.values()) {
- if (headerNode.getNodeType() == Node.ELEMENT_NODE) {
+ if (Node.ELEMENT_NODE == headerNode.getNodeType()) {
if (getFirstChildWithName(new QName(headerNode.getNamespaceURI(), headerNode.getLocalName()),soapHeader) == null) {
SOAPElement partElement = soapFactory.createElement((Element) headerNode);
soapHeader.addChildElement(partElement);
Modified: branches/riftsaw-jpa/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java
===================================================================
--- branches/riftsaw-jpa/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java 2010-06-15 13:09:12 UTC (rev 733)
+++ branches/riftsaw-jpa/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java 2010-06-15 13:26:13 UTC (rev 734)
@@ -140,6 +140,8 @@
wsdlDefinition = wsdlReference.getDefinition();
wsdlUrl = wsdlReference.getWsdlURL();
}
+
+ this.messageAdapter = new SOAPMessageAdapter(this.wsdlDefinition, serviceName, port.getLocalPart());
isInitialized=true;
}
@@ -164,7 +166,7 @@
{
// Defer the invoke until the transaction commits.
Scheduler scheduler = executionEnvironment.getScheduler();
- executionCallable = new TwoWayCallable(mex);
+ executionCallable = new TwoWayCallable(mex.getMessageExchangeId());
scheduler.registerSynchronizer(new Scheduler.Synchronizer() {
public void afterCompletion(boolean success)
@@ -188,7 +190,7 @@
{
// one-way invocation
ExecutorService executorService = executionEnvironment.getExecutorService();
- executionCallable = new OneWayCallable(mex);
+ executionCallable = new OneWayCallable(mex.getMessageExchangeId());
executorService.submit(executionCallable);
mex.replyOneWayOk();
@@ -197,10 +199,10 @@
private class TwoWayCallable implements Callable<Object> {
- private PartnerRoleMessageExchange mex;
+ private String mexId;
- public TwoWayCallable(PartnerRoleMessageExchange mex) {
- this.mex = mex;
+ public TwoWayCallable(String mexId) {
+ this.mexId = mexId;
}
public Object call() throws Exception {
@@ -208,6 +210,8 @@
return executionEnvironment.getScheduler().execTransaction(new Callable<Object>(){
public Object call() throws Exception {
+ //We need to get a new mex from persistence layer.
+ PartnerRoleMessageExchange mex = (PartnerRoleMessageExchange) engine.getBpelServer().getEngine().getMessageExchange(mexId);
try
{
// Create SOAPMessage
@@ -278,16 +282,18 @@
private class OneWayCallable implements Callable<Object> {
- private PartnerRoleMessageExchange mex;
+ private String mexId;
- public OneWayCallable(PartnerRoleMessageExchange mex) {
- this.mex = mex;
+ public OneWayCallable(String mex) {
+ this.mexId = mexId;
}
public Object call() throws Exception {
return executionEnvironment.getScheduler().execTransaction(new Callable<Object>(){
public Object call() throws Exception {
+ //We need to get a new mex from persistence layer.
+ PartnerRoleMessageExchange mex = (PartnerRoleMessageExchange) engine.getBpelServer().getEngine().getMessageExchange(mexId);
try
{
// Create SOAPMessage
@@ -365,7 +371,6 @@
if(null==dispatcher) {
log.debug("Creating Dispatcher ("+this.id+") on " + wsdlUrl + ": "+serviceName);
- this.messageAdapter = new SOAPMessageAdapter(this.wsdlDefinition, serviceName, port.getLocalPart());
initializeStack(portName);
Service service = Service.create(this.wsdlUrl, serviceName);
14 years, 6 months
riftsaw SVN: r733 - /.
by riftsaw-commits@lists.jboss.org
Author: jeff.yuchang
Date: 2010-06-15 09:09:12 -0400 (Tue, 15 Jun 2010)
New Revision: 733
Added:
workspace/
Log:
* create workspace for the development branch.
14 years, 6 months
riftsaw SVN: r732 - in branches/ODE/ODE-1.x-jpa: agents and 33 other directories.
by riftsaw-commits@lists.jboss.org
Author: jeff.yuchang
Date: 2010-06-15 08:57:36 -0400 (Tue, 15 Jun 2010)
New Revision: 732
Modified:
branches/ODE/ODE-1.x-jpa/agents/pom.xml
branches/ODE/ODE-1.x-jpa/axis2-war/pom.xml
branches/ODE/ODE-1.x-jpa/axis2/pom.xml
branches/ODE/ODE-1.x-jpa/bpel-api-jca/pom.xml
branches/ODE/ODE-1.x-jpa/bpel-api/pom.xml
branches/ODE/ODE-1.x-jpa/bpel-compiler/pom.xml
branches/ODE/ODE-1.x-jpa/bpel-connector/pom.xml
branches/ODE/ODE-1.x-jpa/bpel-dao/pom.xml
branches/ODE/ODE-1.x-jpa/bpel-epr/pom.xml
branches/ODE/ODE-1.x-jpa/bpel-obj/pom.xml
branches/ODE/ODE-1.x-jpa/bpel-ql/pom.xml
branches/ODE/ODE-1.x-jpa/bpel-runtime/pom.xml
branches/ODE/ODE-1.x-jpa/bpel-schemas/pom.xml
branches/ODE/ODE-1.x-jpa/bpel-scripts/pom.xml
branches/ODE/ODE-1.x-jpa/bpel-store/pom.xml
branches/ODE/ODE-1.x-jpa/bpel-test/pom.xml
branches/ODE/ODE-1.x-jpa/dao-hibernate-db/pom.xml
branches/ODE/ODE-1.x-jpa/dao-hibernate/pom.xml
branches/ODE/ODE-1.x-jpa/dao-jpa-db/pom.xml
branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/pom.xml
branches/ODE/ODE-1.x-jpa/dao-jpa-ojpa-derby/pom.xml
branches/ODE/ODE-1.x-jpa/dao-jpa-ojpa/pom.xml
branches/ODE/ODE-1.x-jpa/dao-jpa/pom.xml
branches/ODE/ODE-1.x-jpa/distro/pom.xml
branches/ODE/ODE-1.x-jpa/distro/src/examples-jbi/maven2/ping-pong-osgi/pom.xml
branches/ODE/ODE-1.x-jpa/jacob/pom.xml
branches/ODE/ODE-1.x-jpa/jbi-bundle/pom.xml
branches/ODE/ODE-1.x-jpa/jbi-karaf/pom.xml
branches/ODE/ODE-1.x-jpa/jbi/pom.xml
branches/ODE/ODE-1.x-jpa/jca-ra/pom.xml
branches/ODE/ODE-1.x-jpa/jca-server/pom.xml
branches/ODE/ODE-1.x-jpa/pom.xml
branches/ODE/ODE-1.x-jpa/scheduler-simple/pom.xml
branches/ODE/ODE-1.x-jpa/tools/pom.xml
branches/ODE/ODE-1.x-jpa/utils/pom.xml
Log:
* update to 2.1.0-SNAPSHOT version.
Modified: branches/ODE/ODE-1.x-jpa/agents/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/agents/pom.xml 2010-06-15 12:36:13 UTC (rev 731)
+++ branches/ODE/ODE-1.x-jpa/agents/pom.xml 2010-06-15 12:57:36 UTC (rev 732)
@@ -28,6 +28,6 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
</project>
Modified: branches/ODE/ODE-1.x-jpa/axis2/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/axis2/pom.xml 2010-06-15 12:36:13 UTC (rev 731)
+++ branches/ODE/ODE-1.x-jpa/axis2/pom.xml 2010-06-15 12:57:36 UTC (rev 732)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<properties>
Modified: branches/ODE/ODE-1.x-jpa/axis2-war/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/axis2-war/pom.xml 2010-06-15 12:36:13 UTC (rev 731)
+++ branches/ODE/ODE-1.x-jpa/axis2-war/pom.xml 2010-06-15 12:57:36 UTC (rev 732)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<properties>
Modified: branches/ODE/ODE-1.x-jpa/bpel-api/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/bpel-api/pom.xml 2010-06-15 12:36:13 UTC (rev 731)
+++ branches/ODE/ODE-1.x-jpa/bpel-api/pom.xml 2010-06-15 12:57:36 UTC (rev 732)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/bpel-api-jca/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/bpel-api-jca/pom.xml 2010-06-15 12:36:13 UTC (rev 731)
+++ branches/ODE/ODE-1.x-jpa/bpel-api-jca/pom.xml 2010-06-15 12:57:36 UTC (rev 732)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/bpel-compiler/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/bpel-compiler/pom.xml 2010-06-15 12:36:13 UTC (rev 731)
+++ branches/ODE/ODE-1.x-jpa/bpel-compiler/pom.xml 2010-06-15 12:57:36 UTC (rev 732)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/bpel-connector/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/bpel-connector/pom.xml 2010-06-15 12:36:13 UTC (rev 731)
+++ branches/ODE/ODE-1.x-jpa/bpel-connector/pom.xml 2010-06-15 12:57:36 UTC (rev 732)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/bpel-dao/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/bpel-dao/pom.xml 2010-06-15 12:36:13 UTC (rev 731)
+++ branches/ODE/ODE-1.x-jpa/bpel-dao/pom.xml 2010-06-15 12:57:36 UTC (rev 732)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/bpel-epr/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/bpel-epr/pom.xml 2010-06-15 12:36:13 UTC (rev 731)
+++ branches/ODE/ODE-1.x-jpa/bpel-epr/pom.xml 2010-06-15 12:57:36 UTC (rev 732)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/bpel-obj/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/bpel-obj/pom.xml 2010-06-15 12:36:13 UTC (rev 731)
+++ branches/ODE/ODE-1.x-jpa/bpel-obj/pom.xml 2010-06-15 12:57:36 UTC (rev 732)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/bpel-ql/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/bpel-ql/pom.xml 2010-06-15 12:36:13 UTC (rev 731)
+++ branches/ODE/ODE-1.x-jpa/bpel-ql/pom.xml 2010-06-15 12:57:36 UTC (rev 732)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/bpel-runtime/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/bpel-runtime/pom.xml 2010-06-15 12:36:13 UTC (rev 731)
+++ branches/ODE/ODE-1.x-jpa/bpel-runtime/pom.xml 2010-06-15 12:57:36 UTC (rev 732)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/bpel-schemas/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/bpel-schemas/pom.xml 2010-06-15 12:36:13 UTC (rev 731)
+++ branches/ODE/ODE-1.x-jpa/bpel-schemas/pom.xml 2010-06-15 12:57:36 UTC (rev 732)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/bpel-scripts/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/bpel-scripts/pom.xml 2010-06-15 12:36:13 UTC (rev 731)
+++ branches/ODE/ODE-1.x-jpa/bpel-scripts/pom.xml 2010-06-15 12:57:36 UTC (rev 732)
@@ -28,6 +28,6 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
</project>
Modified: branches/ODE/ODE-1.x-jpa/bpel-store/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/bpel-store/pom.xml 2010-06-15 12:36:13 UTC (rev 731)
+++ branches/ODE/ODE-1.x-jpa/bpel-store/pom.xml 2010-06-15 12:57:36 UTC (rev 732)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/bpel-test/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/bpel-test/pom.xml 2010-06-15 12:36:13 UTC (rev 731)
+++ branches/ODE/ODE-1.x-jpa/bpel-test/pom.xml 2010-06-15 12:57:36 UTC (rev 732)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/dao-hibernate/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-hibernate/pom.xml 2010-06-15 12:36:13 UTC (rev 731)
+++ branches/ODE/ODE-1.x-jpa/dao-hibernate/pom.xml 2010-06-15 12:57:36 UTC (rev 732)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/dao-hibernate-db/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-hibernate-db/pom.xml 2010-06-15 12:36:13 UTC (rev 731)
+++ branches/ODE/ODE-1.x-jpa/dao-hibernate-db/pom.xml 2010-06-15 12:57:36 UTC (rev 732)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa/pom.xml 2010-06-15 12:36:13 UTC (rev 731)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa/pom.xml 2010-06-15 12:57:36 UTC (rev 732)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/dao-jpa-db/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa-db/pom.xml 2010-06-15 12:36:13 UTC (rev 731)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa-db/pom.xml 2010-06-15 12:57:36 UTC (rev 732)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/pom.xml 2010-06-15 12:36:13 UTC (rev 731)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/pom.xml 2010-06-15 12:57:36 UTC (rev 732)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/dao-jpa-ojpa/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa-ojpa/pom.xml 2010-06-15 12:36:13 UTC (rev 731)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa-ojpa/pom.xml 2010-06-15 12:57:36 UTC (rev 732)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/dao-jpa-ojpa-derby/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa-ojpa-derby/pom.xml 2010-06-15 12:36:13 UTC (rev 731)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa-ojpa-derby/pom.xml 2010-06-15 12:57:36 UTC (rev 732)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/distro/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/distro/pom.xml 2010-06-15 12:36:13 UTC (rev 731)
+++ branches/ODE/ODE-1.x-jpa/distro/pom.xml 2010-06-15 12:57:36 UTC (rev 732)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<properties>
Modified: branches/ODE/ODE-1.x-jpa/distro/src/examples-jbi/maven2/ping-pong-osgi/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/distro/src/examples-jbi/maven2/ping-pong-osgi/pom.xml 2010-06-15 12:36:13 UTC (rev 731)
+++ branches/ODE/ODE-1.x-jpa/distro/src/examples-jbi/maven2/ping-pong-osgi/pom.xml 2010-06-15 12:57:36 UTC (rev 732)
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.soa.bpel.examples</groupId>
<artifactId>ping-pong-bundle</artifactId>
- <version>2.1.0.CR1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<name>ODE :: examples :: Ping Pong OSGi </name>
<packaging>bundle</packaging>
Modified: branches/ODE/ODE-1.x-jpa/jacob/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/jacob/pom.xml 2010-06-15 12:36:13 UTC (rev 731)
+++ branches/ODE/ODE-1.x-jpa/jacob/pom.xml 2010-06-15 12:57:36 UTC (rev 732)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/jbi/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/jbi/pom.xml 2010-06-15 12:36:13 UTC (rev 731)
+++ branches/ODE/ODE-1.x-jpa/jbi/pom.xml 2010-06-15 12:57:36 UTC (rev 732)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<properties>
Modified: branches/ODE/ODE-1.x-jpa/jbi-bundle/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/jbi-bundle/pom.xml 2010-06-15 12:36:13 UTC (rev 731)
+++ branches/ODE/ODE-1.x-jpa/jbi-bundle/pom.xml 2010-06-15 12:57:36 UTC (rev 732)
@@ -33,7 +33,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<build>
Modified: branches/ODE/ODE-1.x-jpa/jbi-karaf/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/jbi-karaf/pom.xml 2010-06-15 12:36:13 UTC (rev 731)
+++ branches/ODE/ODE-1.x-jpa/jbi-karaf/pom.xml 2010-06-15 12:57:36 UTC (rev 732)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<artifactId>riftsaw-jbi-karaf</artifactId>
Modified: branches/ODE/ODE-1.x-jpa/jca-ra/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/jca-ra/pom.xml 2010-06-15 12:36:13 UTC (rev 731)
+++ branches/ODE/ODE-1.x-jpa/jca-ra/pom.xml 2010-06-15 12:57:36 UTC (rev 732)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/jca-server/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/jca-server/pom.xml 2010-06-15 12:36:13 UTC (rev 731)
+++ branches/ODE/ODE-1.x-jpa/jca-server/pom.xml 2010-06-15 12:57:36 UTC (rev 732)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/pom.xml 2010-06-15 12:36:13 UTC (rev 731)
+++ branches/ODE/ODE-1.x-jpa/pom.xml 2010-06-15 12:57:36 UTC (rev 732)
@@ -6,7 +6,7 @@
<packaging>pom</packaging>
<modelVersion>4.0.0</modelVersion>
- <version>2.1.0.CR1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<url>http://ode.apache.org</url>
<issueManagement>
<system>jira</system>
@@ -36,7 +36,7 @@
</prerequisites>
-->
<properties>
- <ode.version>2.1.0.CR1-SNAPSHOT</ode.version>
+ <ode.version>2.1.0-SNAPSHOT</ode.version>
<activation.version>1.1</activation.version>
<annogen.version>0.1.0</annogen.version>
<antlr.version>2.7.7</antlr.version>
Modified: branches/ODE/ODE-1.x-jpa/scheduler-simple/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/scheduler-simple/pom.xml 2010-06-15 12:36:13 UTC (rev 731)
+++ branches/ODE/ODE-1.x-jpa/scheduler-simple/pom.xml 2010-06-15 12:57:36 UTC (rev 732)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/tools/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/tools/pom.xml 2010-06-15 12:36:13 UTC (rev 731)
+++ branches/ODE/ODE-1.x-jpa/tools/pom.xml 2010-06-15 12:57:36 UTC (rev 732)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/ODE/ODE-1.x-jpa/utils/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/utils/pom.xml 2010-06-15 12:36:13 UTC (rev 731)
+++ branches/ODE/ODE-1.x-jpa/utils/pom.xml 2010-06-15 12:57:36 UTC (rev 732)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>ode</artifactId>
- <version>2.1.0.CR1-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
14 years, 6 months
riftsaw SVN: r731 - in branches/ODE/ODE-1.x-jpa: dao-jpa/src/main/java/org/apache/ode/dao/jpa and 4 other directories.
by riftsaw-commits@lists.jboss.org
Author: jeff.yuchang
Date: 2010-06-15 08:36:13 -0400 (Tue, 15 Jun 2010)
New Revision: 731
Modified:
branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/build.xml
branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/resources/META-INF/persistence.xml
branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/JpaConnection.java
branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/BpelDAOConnectionImpl.java
branches/ODE/ODE-1.x-jpa/pom.xml
branches/ODE/ODE-1.x-jpa/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SimpleScheduler.java
Log:
* enable the clearOnComplete() method.
Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/JpaConnection.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/JpaConnection.java 2010-06-15 11:12:36 UTC (rev 730)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/JpaConnection.java 2010-06-15 12:36:13 UTC (rev 731)
@@ -55,12 +55,9 @@
}
public void close() {
- /* Connections are stored in thread locals so only destroying the factory
- * should close the connection
- _em.close();
- _em = null;
- _mgr = null;
- */
+ if (_em != null) {
+ _em.close();
+ }
}
public boolean isClosed() {
@@ -78,6 +75,9 @@
public void afterCompletion(int i) {
_em.clear();
+ if(__log.isDebugEnabled()) {
+ __log.debug("-------> clear the entity manager");
+ }
}
public void beforeCompletion() {
@@ -108,7 +108,7 @@
try {
if (_mgr.getStatus() == Status.STATUS_ACTIVE) {
_em.joinTransaction();
- //clearOnComplete();
+ clearOnComplete();
}
} catch (SystemException se) {
__log.error(se);
Modified: branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/BpelDAOConnectionImpl.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/BpelDAOConnectionImpl.java 2010-06-15 11:12:36 UTC (rev 730)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa/src/main/java/org/apache/ode/dao/jpa/bpel/BpelDAOConnectionImpl.java 2010-06-15 12:36:13 UTC (rev 731)
@@ -337,13 +337,9 @@
public MessageExchangeDAO getMessageExchange(String mexid) {
_txCtx.begin();
- List l = _em.createQuery("select x from MessageExchangeDAOImpl x where x._id = ?1").setParameter(1, mexid).getResultList();
+ MessageExchangeDAOImpl dao = _em.find(MessageExchangeDAOImpl.class, mexid);
_txCtx.commit();
- if (l.size() == 0) {
- return null;
- }
-
- return (MessageExchangeDAOImpl) l.get(0);
+ return dao;
}
public void deleteMessageExchange(MessageExchangeDAO mexDao) {
Modified: branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/build.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/build.xml 2010-06-15 11:12:36 UTC (rev 730)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/build.xml 2010-06-15 12:36:13 UTC (rev 731)
@@ -32,7 +32,7 @@
<mkdir dir="target/db" />
<mkdir dir="${db.scripts.dir}" />
- <create-ddl db="oracle"/>
+ <create-ddl db="hsql"/>
</target>
Modified: branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/resources/META-INF/persistence.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/resources/META-INF/persistence.xml 2010-06-15 11:12:36 UTC (rev 730)
+++ branches/ODE/ODE-1.x-jpa/dao-jpa-hibernate/src/main/resources/META-INF/persistence.xml 2010-06-15 12:36:13 UTC (rev 731)
@@ -45,7 +45,7 @@
<properties>
<property name="hibernate.show_sql" value="false" />
- <property name="hibernate.dialect" value="org.hibernate.dialect.OracleDialect" />
+ <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect" />
<property name="hibernate.connection.datasource" value="java:BPELDB" />
<property name="hibernate.transaction.factory_class" value="org.hibernate.transaction.JTATransactionFactory" />
<property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.JBossTransactionManagerLookup" />
Modified: branches/ODE/ODE-1.x-jpa/pom.xml
===================================================================
--- branches/ODE/ODE-1.x-jpa/pom.xml 2010-06-15 11:12:36 UTC (rev 730)
+++ branches/ODE/ODE-1.x-jpa/pom.xml 2010-06-15 12:36:13 UTC (rev 731)
@@ -135,11 +135,11 @@
<module>bpel-connector</module>
<module>bpel-test</module>
<module>axis2</module>
- <module>jbi</module>
+ <!--module>jbi</module>
<module>jbi-bundle</module>
<module>jbi-karaf</module>
<module>axis2-war</module>
- <module>distro</module>
+ <module>distro</module-->
</modules>
<build>
Modified: branches/ODE/ODE-1.x-jpa/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SimpleScheduler.java
===================================================================
--- branches/ODE/ODE-1.x-jpa/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SimpleScheduler.java 2010-06-15 11:12:36 UTC (rev 730)
+++ branches/ODE/ODE-1.x-jpa/scheduler-simple/src/main/java/org/apache/ode/scheduler/simple/SimpleScheduler.java 2010-06-15 12:36:13 UTC (rev 731)
@@ -286,14 +286,22 @@
ex = e;
} finally {
if (ex == null) {
- if (__log.isDebugEnabled()) __log.debug("Commiting on " + txm + "...");
+ if (__log.isDebugEnabled()) {
+ __log.debug("Commiting on " + txm + "...");
+ }
try {
txm.commit();
+ if (__log.isDebugEnabled()) {
+ __log.debug("committed on " + txm + " successfully.");
+ }
} catch( Exception e2 ) {
ex = e2;
+ __log.error("error in commiting transaction", e2);
}
} else {
- if (__log.isDebugEnabled()) __log.debug("Rollbacking on " + txm + "...");
+ if (__log.isDebugEnabled()) {
+ __log.debug("Rollbacking on " + txm + "...");
+ }
txm.rollback();
}
14 years, 6 months
riftsaw SVN: r730 - in branches/RiftSaw-2.1.x: integration-tests and 23 other directories.
by riftsaw-commits@lists.jboss.org
Author: objectiser
Date: 2010-06-15 07:12:36 -0400 (Tue, 15 Jun 2010)
New Revision: 730
Added:
branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSecureServiceTestCase.java
branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/secureservice/
branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/secureservice/ClientUsernamePasswordCallback.java
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/conf/samples/
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/messages/harness_request1.xml
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/build.xml
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/classes/
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/etc/
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/etc/Client_Encrypt.properties
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/etc/Client_Sign.properties
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/jbossws-cxf.xml
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/keystore/
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/keystore/client-keystore.jks
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/keystore/client-truststore.jks
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/lib/
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/web.xml
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/wssec.xml
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/ObjectFactory.java
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/RunTest.java
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/RunTestResponse.java
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarness.java
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarnessImpl.java
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarnessService.java
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarness_SecureServiceTestHarnessPort_Client.java
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarness_SecureServiceTestHarnessPort_Server.java
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/package-info.java
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/view/
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/view/index.jsp
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/wsdl/
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/wsdl/SecureServiceTestHarnessService.wsdl
Modified:
branches/RiftSaw-2.1.x/integration-tests/build.xml
branches/RiftSaw-2.1.x/integration-tests/pom.xml
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/build.xml
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/etc/Client_Encrypt.properties
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/etc/Client_Sign.properties
branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/wssec.xml
branches/RiftSaw-2.1.x/pom.xml
Log:
Added integration test for secure service.
Modified: branches/RiftSaw-2.1.x/integration-tests/build.xml
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/build.xml 2010-06-08 02:33:53 UTC (rev 729)
+++ branches/RiftSaw-2.1.x/integration-tests/build.xml 2010-06-15 11:12:36 UTC (rev 730)
@@ -6,6 +6,10 @@
<property file="${riftsaw.test.deployment.properties}" />
+ <condition property="is.cxf.ws.stack">
+ <equals arg1="${ws.stack}" arg2="cxf"/>
+ </condition>
+
<condition property="is.ojdbc.available">
<available file="${basedir}/../distribution/target/libs/ojdbc14.jar" />
</condition>
@@ -127,7 +131,6 @@
<ant antfile="src/test/resources/samples/Quickstart_bpel_hello_world_extended_timeout/build.xml" />
<ant antfile="src/test/resources/samples/Quickstart_bpel_hello_world_header_ode/build.xml" />
<ant antfile="src/test/resources/samples/Quickstart_bpel_hello_world_header_wsdl/build.xml" />
- <ant antfile="src/test/resources/samples/Quickstart_bpel_secure_invoke/build.xml" />
<ant antfile="src/test/resources/samples/Quickstart_bpel_simple_correlation/build.xml" />
<ant antfile="src/test/resources/samples/Quickstart_bpel_simple_correlation_with_oneway/build.xml" />
<ant antfile="src/test/resources/samples/Quickstart_bpel_simple_invoke/build.xml" />
@@ -155,5 +158,13 @@
<ant antfile="src/test/resources/tutorials/BluePrint4/build.xml" />
<ant antfile="src/test/resources/tutorials/BluePrint5/build.xml" />
+ <antcall target="package-tests-ws-stack" />
</target>
+
+ <target name="package-tests-ws-stack" if="is.cxf.ws.stack" >
+ <ant antfile="src/test/resources/samples/Quickstart_bpel_secure_invoke/build.xml" />
+ <ant antfile="src/test/resources/samples/Quickstart_bpel_secure_service/build.xml" />
+ <ant antfile="src/test/resources/samples/Quickstart_bpel_secure_service_testharness/build.xml" />
+ </target>
+
</project>
Modified: branches/RiftSaw-2.1.x/integration-tests/pom.xml
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/pom.xml 2010-06-08 02:33:53 UTC (rev 729)
+++ branches/RiftSaw-2.1.x/integration-tests/pom.xml 2010-06-15 11:12:36 UTC (rev 730)
@@ -150,6 +150,283 @@
<version>1.2.13</version>
<scope>test</scope>
</dependency>
+
+ <!-- CXF dependencies (copied from jbossws project) -->
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-security</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>saaj-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-soap</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>saaj-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-http</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-object</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-coloc</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.xml.fastinfoset</groupId>
+ <artifactId>FastInfoset</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-corba</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxws</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>saaj-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http-jetty</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-jms</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-local</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-rm</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-policy</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-tools-java2ws</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>saaj-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-tools-wsdlto-core</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>saaj-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-tools-wsdlto-databinding-jaxb</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-tools-wsdlto-frontend-jaxws</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.xjcplugins</groupId>
+ <artifactId>cxf-xjc-boolean</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.xjcplugins</groupId>
+ <artifactId>cxf-xjc-bug671</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-xjc-dv</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-xjc-ts</artifactId>
+ <version>${cxf.version}</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
<plugins>
@@ -177,6 +454,7 @@
value="${maven.dependency.org.jboss.soa.bpel.runtime.jb-bpel-store.jar.path}" />
<property name="dependency.rosetta.aop"
value="${maven.dependency.org.jboss.soa.bpel.dependencies.esb.aop.rosetta.aop.path}" />
+
<ant antfile="${basedir}/build.xml">
<target name="unpack-distribution" />
</ant>
@@ -243,6 +521,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<additionalClasspathElements>
+ <additionalClasspathElement>${basedir}/src/test/resources</additionalClasspathElement>
<additionalClasspathElement>${basedir}/src/test/resources/conf</additionalClasspathElement>
<additionalClasspathElement>${basedir}/target/rosetta.aop</additionalClasspathElement>
</additionalClasspathElements>
Added: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSecureServiceTestCase.java
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSecureServiceTestCase.java (rev 0)
+++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSecureServiceTestCase.java 2010-06-15 11:12:36 UTC (rev 730)
@@ -0,0 +1,80 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.soa.bpel.tests.samples;
+
+import org.jboss.soa.bpel.tests.RiftSawTest;
+import org.jboss.soa.bpel.tests.RiftSawTestSetup;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.Dispatch;
+import javax.xml.ws.Service;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor;
+import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
+
+import junit.framework.Test;
+
+/**
+ * Test case for running the Quickstart_bpel_secure_service sample.
+ */
+public class QuickstartBPELSecureServiceTestCase extends RiftSawTest {
+
+ private static final String TEST_NAME = "Quickstart_bpel_secure_service";
+ private static final QName SERVICE_NAME = new QName("http://www.jboss.org/bpel/examples/wsdl", "SecureHelloService");
+ private static final QName TH_SERVICE_NAME = new QName("http://harness.tests.bpel.soa.jboss.org/", "SecureServiceTestHarnessService");
+
+ public QuickstartBPELSecureServiceTestCase() {
+ super(TEST_NAME);
+ }
+
+ public static Test suite() {
+ if (System.getProperty("ws.stack","native").equals("cxf")) {
+ return(new RiftSawTestSetup(QuickstartBPELSecureServiceTestCase.class,
+ TEST_NAME, "Quickstart_bpel_secure_service-1.jar,Quickstart_bpel_secure_service_testharness.war"));
+ } else {
+ return(null);
+ }
+ }
+
+ public void testSendHello() throws Exception {
+ if (System.getProperty("ws.stack","native").equals("cxf") == false) {
+ return;
+ }
+
+ String result=sendSOAPMessage("harness_request1.xml",
+ "http://127.0.0.1:8080/Quickstart_bpel_secure_service_testharness/SecureSe...");
+
+ if (result.contains("<return>true</return>") == false) {
+ fail("Failed to receive successful response from remote test harness");
+ }
+ }
+}
Added: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/secureservice/ClientUsernamePasswordCallback.java
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/secureservice/ClientUsernamePasswordCallback.java (rev 0)
+++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/secureservice/ClientUsernamePasswordCallback.java 2010-06-15 11:12:36 UTC (rev 730)
@@ -0,0 +1,74 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jboss.soa.bpel.tests.samples.secureservice;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.UnsupportedCallbackException;
+
+import org.apache.ws.security.WSPasswordCallback;
+
+/**
+ */
+
+public class ClientUsernamePasswordCallback implements CallbackHandler {
+
+ private Map<String, String> passwords =
+ new HashMap<String, String>();
+
+ public ClientUsernamePasswordCallback() {
+ passwords.put("Alice", "ecilA");
+ passwords.put("abcd", "dcba");
+ passwords.put("clientx509v1", "storepassword");
+ passwords.put("serverx509v1", "storepassword");
+ }
+
+ /**
+ * Here, we attempt to get the password from the private
+ * alias/passwords map.
+ */
+ public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
+ for (int i = 0; i < callbacks.length; i++) {
+ WSPasswordCallback pc = (WSPasswordCallback)callbacks[i];
+
+System.out.println("GPB: Check identifier="+pc.getIdentifier());
+ String pass = passwords.get(pc.getIdentifier());
+ if (pass != null) {
+ pc.setPassword(pass);
+ return;
+ }
+ }
+
+ //
+ // Password not found
+ //
+ throw new IOException();
+ }
+
+ /**
+ * Add an alias/password pair to the callback mechanism.
+ */
+ public void setAliasPassword(String alias, String password) {
+ passwords.put(alias, password);
+ }
+}
Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/build.xml
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/build.xml 2010-06-08 02:33:53 UTC (rev 729)
+++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/build.xml 2010-06-15 11:12:36 UTC (rev 730)
@@ -38,10 +38,14 @@
<target name="deploy" depends="compileserver" >
<echo>Deploy ${ant.project.name}</echo>
- <jar destfile="${deploy.dir}/${sample.jar.name}" >
+ <jar destfile="${deploy.dir}/${ant.project.name}/${sample.jar.name}" >
<fileset dir="${test.dir}/bpelContent"/>
<fileset dir="${server.build.dir}"/>
</jar>
+
+ <copy todir="${deploy.dir}/${ant.project.name}">
+ <fileset dir="${test.dir}/messages"/>
+ </copy>
</target>
<target name="undeploy">
Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/etc/Client_Encrypt.properties
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/etc/Client_Encrypt.properties 2010-06-08 02:33:53 UTC (rev 729)
+++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/etc/Client_Encrypt.properties 2010-06-15 11:12:36 UTC (rev 730)
@@ -2,4 +2,4 @@
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=storepassword
org.apache.ws.security.crypto.merlin.keystore.alias=serverx509v1
-org.apache.ws.security.crypto.merlin.file=keystore/client-truststore.jks
\ No newline at end of file
+org.apache.ws.security.crypto.merlin.file=samples/Quickstart_bpel_secure_service/client/resources/keystore/client-truststore.jks
\ No newline at end of file
Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/etc/Client_Sign.properties
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/etc/Client_Sign.properties 2010-06-08 02:33:53 UTC (rev 729)
+++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/etc/Client_Sign.properties 2010-06-15 11:12:36 UTC (rev 730)
@@ -2,5 +2,5 @@
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=storepassword
org.apache.ws.security.crypto.merlin.keystore.alias=clientx509v1
-org.apache.ws.security.crypto.merlin.file=keystore/client-keystore.jks
+org.apache.ws.security.crypto.merlin.file=samples/Quickstart_bpel_secure_service/client/resources/keystore/client-keystore.jks
Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/wssec.xml
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/wssec.xml 2010-06-08 02:33:53 UTC (rev 729)
+++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/client/resources/wssec.xml 2010-06-15 11:12:36 UTC (rev 730)
@@ -42,8 +42,8 @@
<entry key="action" value="UsernameToken Timestamp Signature"/>
<entry key="passwordType" value="PasswordDigest"/>
<entry key="user" value="clientx509v1"/>
- <entry key="passwordCallbackClass" value="org.jboss.test.ws.jaxws.samples.wsse.ClientUsernamePasswordCallback"/>
- <entry key="signaturePropFile" value="etc/Client_Sign.properties"/>
+ <entry key="passwordCallbackClass" value="org.jboss.soa.bpel.tests.samples.secureservice.ClientUsernamePasswordCallback"/>
+ <entry key="signaturePropFile" value="samples/Quickstart_bpel_secure_service/client/resources/etc/Client_Sign.properties"/>
<entry key="signatureKeyIdentifier" value="DirectReference"/>
<entry key="signatureParts" value="{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body"/>
</map>
@@ -57,8 +57,8 @@
<entry key="action" value="UsernameToken Timestamp Signature"/>
<entry key="passwordType" value="PasswordText"/>
<entry key="user" value="serverx509v1"/>
- <entry key="passwordCallbackClass" value="org.jboss.test.ws.jaxws.samples.wsse.ClientUsernamePasswordCallback"/>
- <entry key="signaturePropFile" value="etc/Client_Encrypt.properties"/>
+ <entry key="passwordCallbackClass" value="org.jboss.soa.bpel.tests.samples.secureservice.ClientUsernamePasswordCallback"/>
+ <entry key="signaturePropFile" value="samples/Quickstart_bpel_secure_service/client/resources/etc/Client_Encrypt.properties"/>
<entry key="signatureKeyIdentifier" value="DirectReference"/>
</map>
</constructor-arg>
Added: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/messages/harness_request1.xml
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/messages/harness_request1.xml (rev 0)
+++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service/messages/harness_request1.xml 2010-06-15 11:12:36 UTC (rev 730)
@@ -0,0 +1,8 @@
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:har="http://harness.tests.bpel.soa.jboss.org/">
+ <soapenv:Header/>
+ <soapenv:Body>
+ <har:runTest>
+ <arg0>0</arg0>
+ </har:runTest>
+ </soapenv:Body>
+</soapenv:Envelope>
\ No newline at end of file
Added: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/build.xml
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/build.xml (rev 0)
+++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/build.xml 2010-06-15 11:12:36 UTC (rev 730)
@@ -0,0 +1,74 @@
+<project name="Quickstart_bpel_secure_service_testharness" default="deploy" basedir=".">
+
+ <description>
+ ${ant.project.name}
+ ${line.separator}
+ </description>
+
+ <property name="version" value="1" />
+
+ <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/>
+ <property name="conf.dir" value="${server.dir}/conf"/>
+
+ <property name="project.under.test" value="Quickstart_bpel_secure_service" />
+
+ <property name="deploy.dir" value="${basedir}/target/tests"/>
+ <property name="test.dir" value="${basedir}/src/test/resources/samples/${ant.project.name}" />
+
+ <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" />
+
+ <property name="war.build.dir" location="${deploy.dir}/${ant.project.name}/build/war/classes"/>
+
+ <path id="compile-classpath">
+ <fileset dir="${org.jboss.as.home}/client" includes="*.jar" /> <!-- Required for JMS Client Code. -->
+ </path>
+ <property name="compile-classpath" refid="compile-classpath"/>
+
+ <target name="makewar" description="make war">
+ <!-- Compile... -->
+ <mkdir dir="${war.build.dir}" />
+ <javac fork="true" srcdir="${test.dir}/war/src" destdir="${war.build.dir}" debug="true">
+ <classpath>
+ <path refid="compile-classpath" />
+ <fileset dir="${test.dir}/war/resources/WEB-INF/lib" includes="*.jar" />
+ </classpath>
+ </javac>
+
+ <!-- War... -->
+ <war warfile="${deploy.dir}/${project.under.test}/${ant.project.name}.war"
+ webxml="${test.dir}/war/resources/WEB-INF/web.xml">
+ <webinf dir="${test.dir}/war/resources/WEB-INF">
+ <include name="jboss-web.xml"/>
+ <include name="wssec.xml"/>
+ </webinf>
+ <classes dir="${war.build.dir}" includes="**/*.class"/>
+ <classes dir="${test.dir}/war/resources/WEB-INF" includes="wssec.xml"/>
+ <classes dir="${test.dir}/war/resources/WEB-INF">
+ <include name="etc/*"/>
+ <include name="keystore/*"/>
+ </classes>
+ <fileset dir="${test.dir}/war/view">
+ <include name="**/*"/>
+ </fileset>
+ <classes dir="${test.dir}">
+ <include name="juddi.properties"/>
+ </classes>
+ </war>
+ </target>
+
+ <target name="deploywar" depends="makewar" >
+ </target>
+
+ <target name="undeploywar">
+ <delete file="${deploy.dir}/${project.under.test}/${ant.project.name}.war"/>
+ </target>
+
+ <target name="deploy" depends="deploywar" >
+ <echo>Deploy ${ant.project.name}</echo>
+ </target>
+
+ <target name="undeploy" depends="undeploywar" >
+ <echo>Undeploy ${ant.project.name}</echo>
+ </target>
+
+</project>
Added: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/etc/Client_Encrypt.properties
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/etc/Client_Encrypt.properties (rev 0)
+++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/etc/Client_Encrypt.properties 2010-06-15 11:12:36 UTC (rev 730)
@@ -0,0 +1,5 @@
+org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
+org.apache.ws.security.crypto.merlin.keystore.type=jks
+org.apache.ws.security.crypto.merlin.keystore.password=storepassword
+org.apache.ws.security.crypto.merlin.keystore.alias=serverx509v1
+org.apache.ws.security.crypto.merlin.file=keystore/client-truststore.jks
\ No newline at end of file
Added: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/etc/Client_Sign.properties
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/etc/Client_Sign.properties (rev 0)
+++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/etc/Client_Sign.properties 2010-06-15 11:12:36 UTC (rev 730)
@@ -0,0 +1,6 @@
+org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
+org.apache.ws.security.crypto.merlin.keystore.type=jks
+org.apache.ws.security.crypto.merlin.keystore.password=storepassword
+org.apache.ws.security.crypto.merlin.keystore.alias=clientx509v1
+org.apache.ws.security.crypto.merlin.file=keystore/client-keystore.jks
+
Added: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/jbossws-cxf.xml
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/jbossws-cxf.xml (rev 0)
+++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/jbossws-cxf.xml 2010-06-15 11:12:36 UTC (rev 730)
@@ -0,0 +1,20 @@
+<beans
+ xmlns='http://www.springframework.org/schema/beans'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+ xmlns:beans='http://www.springframework.org/schema/beans'
+ xmlns:jaxws='http://cxf.apache.org/jaxws'
+ xsi:schemaLocation='http://cxf.apache.org/core
+ http://cxf.apache.org/schemas/core.xsd
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://cxf.apache.org/jaxws
+ http://cxf.apache.org/schemas/jaxws.xsd'>
+
+ <jaxws:endpoint
+ id='SecureServiceTestHarnessWS'
+ address='http://@jboss.bind.address@:8080/Quickstart_bpel_secure_service_testharness/SecureServiceTestHarnessWS'
+ implementor='org.jboss.soa.bpel.tests.harness.SecureServiceTestHarnessImpl'>
+ </jaxws:endpoint>
+
+
+</beans>
Added: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/keystore/client-keystore.jks
===================================================================
(Binary files differ)
Property changes on: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/keystore/client-keystore.jks
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/keystore/client-truststore.jks
===================================================================
(Binary files differ)
Property changes on: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/keystore/client-truststore.jks
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/web.xml
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/web.xml (rev 0)
+++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/web.xml 2010-06-15 11:12:36 UTC (rev 730)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+
+ <servlet>
+ <servlet-name>SecureServiceTestHarnessWS</servlet-name>
+ <servlet-class>org.jboss.soa.bpel.tests.harness.SecureServiceTestHarnessImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>SecureServiceTestHarnessWS</servlet-name>
+ <url-pattern>/SecureServiceTestHarnessWS</url-pattern>
+ </servlet-mapping>
+
+</web-app>
Added: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/wssec.xml
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/wssec.xml (rev 0)
+++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/resources/WEB-INF/wssec.xml 2010-06-15 11:12:36 UTC (rev 730)
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:wsa="http://cxf.apache.org/ws/addressing"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy"
+ xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager"
+ xmlns:beans='http://www.springframework.org/schema/beans'
+ xmlns:jaxws='http://cxf.apache.org/jaxws'
+ xmlns:ns1='http://secure_invoke/helloworld'
+ xsi:schemaLocation="
+ http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+ http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
+ http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd
+ http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+
+ <bean id="UsernameTokenSign_Request" class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor"
+ name="{http://secure_invoke/helloworld}SecureHelloWorldPort.Request" >
+ <constructor-arg>
+ <map>
+ <entry key="action" value="UsernameToken Timestamp Signature"/>
+ <entry key="passwordType" value="PasswordDigest"/>
+ <entry key="user" value="clientx509v1"/>
+ <entry key="passwordCallbackClass" value="org.jboss.test.ws.jaxws.samples.wsse.ClientUsernamePasswordCallback"/>
+ <entry key="signaturePropFile" value="etc/Client_Sign.properties"/>
+ <entry key="signatureKeyIdentifier" value="DirectReference"/>
+ <entry key="signatureParts" value="{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body"/>
+ </map>
+ </constructor-arg>
+ </bean>
+
+ <bean id="UsernameTokenSign_Response" class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor"
+ name="{http://secure_invoke/helloworld}SecureHelloWorldPort.Response" >
+ <constructor-arg>
+ <map>
+ <entry key="action" value="UsernameToken Timestamp Signature"/>
+ <entry key="passwordType" value="PasswordText"/>
+ <entry key="user" value="serverx509v1"/>
+ <entry key="passwordCallbackClass" value="org.jboss.test.ws.jaxws.samples.wsse.ClientUsernamePasswordCallback"/>
+ <entry key="signaturePropFile" value="etc/Client_Encrypt.properties"/>
+ <entry key="signatureKeyIdentifier" value="DirectReference"/>
+ </map>
+ </constructor-arg>
+ </bean>
+
+
+ <cxf:bus>
+ <cxf:outInterceptors>
+ <ref bean="UsernameTokenSign_Request"/>
+ <bean class="org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor"/>
+ </cxf:outInterceptors>
+ <cxf:inInterceptors>
+ <ref bean="UsernameTokenSign_Response"/>
+ <bean class="org.apache.cxf.binding.soap.saaj.SAAJInInterceptor"/>
+ </cxf:inInterceptors>
+ </cxf:bus>
+
+</beans>
Added: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/ObjectFactory.java
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/ObjectFactory.java (rev 0)
+++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/ObjectFactory.java 2010-06-15 11:12:36 UTC (rev 730)
@@ -0,0 +1,71 @@
+
+package org.jboss.soa.bpel.tests.harness;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlElementDecl;
+import javax.xml.bind.annotation.XmlRegistry;
+import javax.xml.namespace.QName;
+
+
+/**
+ * This object contains factory methods for each
+ * Java content interface and Java element interface
+ * generated in the org.jboss.soa.bpel.tests.harness package.
+ * <p>An ObjectFactory allows you to programatically
+ * construct new instances of the Java representation
+ * for XML content. The Java representation of XML
+ * content can consist of schema derived interfaces
+ * and classes representing the binding of schema
+ * type definitions, element declarations and model
+ * groups. Factory methods for each of these are
+ * provided in this class.
+ *
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+ private final static QName _RunTest_QNAME = new QName("http://harness.tests.bpel.soa.jboss.org/", "runTest");
+ private final static QName _RunTestResponse_QNAME = new QName("http://harness.tests.bpel.soa.jboss.org/", "runTestResponse");
+
+ /**
+ * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.soa.bpel.tests.harness
+ *
+ */
+ public ObjectFactory() {
+ }
+
+ /**
+ * Create an instance of {@link RunTestResponse }
+ *
+ */
+ public RunTestResponse createRunTestResponse() {
+ return new RunTestResponse();
+ }
+
+ /**
+ * Create an instance of {@link RunTest }
+ *
+ */
+ public RunTest createRunTest() {
+ return new RunTest();
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link RunTest }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://harness.tests.bpel.soa.jboss.org/", name = "runTest")
+ public JAXBElement<RunTest> createRunTest(RunTest value) {
+ return new JAXBElement<RunTest>(_RunTest_QNAME, RunTest.class, null, value);
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link RunTestResponse }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "http://harness.tests.bpel.soa.jboss.org/", name = "runTestResponse")
+ public JAXBElement<RunTestResponse> createRunTestResponse(RunTestResponse value) {
+ return new JAXBElement<RunTestResponse>(_RunTestResponse_QNAME, RunTestResponse.class, null, value);
+ }
+
+}
Added: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/RunTest.java
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/RunTest.java (rev 0)
+++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/RunTest.java 2010-06-15 11:12:36 UTC (rev 730)
@@ -0,0 +1,52 @@
+
+package org.jboss.soa.bpel.tests.harness;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for runTest complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="runTest">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="arg0" type="{http://www.w3.org/2001/XMLSchema}int"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "runTest", propOrder = {
+ "arg0"
+})
+public class RunTest {
+
+ protected int arg0;
+
+ /**
+ * Gets the value of the arg0 property.
+ *
+ */
+ public int getArg0() {
+ return arg0;
+ }
+
+ /**
+ * Sets the value of the arg0 property.
+ *
+ */
+ public void setArg0(int value) {
+ this.arg0 = value;
+ }
+
+}
Added: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/RunTestResponse.java
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/RunTestResponse.java (rev 0)
+++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/RunTestResponse.java 2010-06-15 11:12:36 UTC (rev 730)
@@ -0,0 +1,54 @@
+
+package org.jboss.soa.bpel.tests.harness;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for runTestResponse complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="runTestResponse">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="return" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ * </sequence>
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "runTestResponse", propOrder = {
+ "_return"
+})
+public class RunTestResponse {
+
+ @XmlElement(name = "return")
+ protected boolean _return;
+
+ /**
+ * Gets the value of the return property.
+ *
+ */
+ public boolean isReturn() {
+ return _return;
+ }
+
+ /**
+ * Sets the value of the return property.
+ *
+ */
+ public void setReturn(boolean value) {
+ this._return = value;
+ }
+
+}
Added: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarness.java
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarness.java (rev 0)
+++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarness.java 2010-06-15 11:12:36 UTC (rev 730)
@@ -0,0 +1,30 @@
+package org.jboss.soa.bpel.tests.harness;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.ws.RequestWrapper;
+import javax.xml.ws.ResponseWrapper;
+
+/**
+ * This class was generated by Apache CXF 2.2.6
+ * Mon Jun 14 11:12:40 BST 2010
+ * Generated source version: 2.2.6
+ *
+ */
+
+@WebService(targetNamespace = "http://harness.tests.bpel.soa.jboss.org/", name = "SecureServiceTestHarness")
+(a)XmlSeeAlso({ObjectFactory.class})
+public interface SecureServiceTestHarness {
+
+ @WebResult(name = "return", targetNamespace = "")
+ @RequestWrapper(localName = "runTest", targetNamespace = "http://harness.tests.bpel.soa.jboss.org/", className = "org.jboss.soa.bpel.tests.harness.RunTest")
+ @ResponseWrapper(localName = "runTestResponse", targetNamespace = "http://harness.tests.bpel.soa.jboss.org/", className = "org.jboss.soa.bpel.tests.harness.RunTestResponse")
+ @WebMethod
+ public boolean runTest(
+ @WebParam(name = "arg0", targetNamespace = "")
+ int arg0
+ );
+}
Added: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarnessImpl.java
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarnessImpl.java (rev 0)
+++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarnessImpl.java 2010-06-15 11:12:36 UTC (rev 730)
@@ -0,0 +1,98 @@
+
+/**
+ * Please modify this class to meet your needs
+ * This class is not complete
+ */
+
+package org.jboss.soa.bpel.tests.harness;
+
+import java.util.logging.Logger;
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.ws.RequestWrapper;
+import javax.xml.ws.ResponseWrapper;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.Dispatch;
+import javax.xml.ws.Service;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor;
+import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
+
+/**
+ * This class was generated by Apache CXF 2.2.6
+ * Mon Jun 14 11:12:40 BST 2010
+ * Generated source version: 2.2.6
+ *
+ */
+
+(a)javax.jws.WebService(
+ serviceName = "SecureServiceTestHarnessService",
+ portName = "SecureServiceTestHarnessPort",
+ targetNamespace = "http://harness.tests.bpel.soa.jboss.org/",
+ endpointInterface = "org.jboss.soa.bpel.tests.harness.SecureServiceTestHarness")
+
+public class SecureServiceTestHarnessImpl implements SecureServiceTestHarness {
+
+ private static final QName SERVICE_NAME = new QName("http://www.jboss.org/bpel/examples/wsdl", "SecureHelloService");
+
+ private static final Logger LOG = Logger.getLogger(SecureServiceTestHarnessImpl.class.getName());
+
+ /* (non-Javadoc)
+ * @see org.jboss.soa.bpel.tests.harness.SecureServiceTestHarness#runTest(int arg0 )*
+ */
+ public boolean runTest(int arg0) {
+ LOG.info("Executing operation runTest("+arg0+")");
+
+ try {
+ SpringBusFactory bf = new SpringBusFactory();
+ URL busFile = SecureServiceTestHarnessImpl.class.getResource("/wssec.xml");
+
+ Bus bus = bf.createBus(busFile.toString());
+ bf.setThreadDefaultBus(bus);
+
+ QName portName=new QName("http://www.jboss.org/bpel/examples/wsdl", "SecureHelloPort");
+
+ URL wsdlURL = new URL("http://127.0.0.1:8080/Quickstart_bpel_secure_serviceWS?wsdl");
+
+ Service service = Service.create(wsdlURL, SERVICE_NAME);
+ Dispatch<SOAPMessage> dispatcher = service.createDispatch(
+ portName, SOAPMessage.class, Service.Mode.MESSAGE);
+
+ MessageFactory factory = MessageFactory.newInstance();
+
+ String str="<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:wsdl=\"http://www.jboss.org/bpel/examples/wsdl\">"+
+ "<soapenv:Header/><soapenv:Body><wsdl:hello><TestPart>Hello</TestPart></wsdl:hello></soapenv:Body></soapenv:Envelope>";
+
+ java.io.InputStream is=new java.io.ByteArrayInputStream(str.getBytes());
+
+ SOAPMessage soapReq1 = factory.createMessage(null, is);
+
+ System.out.println("Invoking server through Dispatch interface using SOAPMessage");
+ SOAPMessage soapResp = dispatcher.invoke(soapReq1);
+
+ String result=soapResp.getSOAPBody().getTextContent();
+
+ System.out.println("Response from server: " + result);
+
+ return result.contains("Hello World");
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ throw new RuntimeException(ex);
+ }
+ }
+
+}
Added: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarnessService.java
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarnessService.java (rev 0)
+++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarnessService.java 2010-06-15 11:12:36 UTC (rev 730)
@@ -0,0 +1,77 @@
+
+/*
+ *
+ */
+
+package org.jboss.soa.bpel.tests.harness;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import javax.xml.namespace.QName;
+import javax.xml.ws.WebEndpoint;
+import javax.xml.ws.WebServiceClient;
+import javax.xml.ws.WebServiceFeature;
+import javax.xml.ws.Service;
+
+/**
+ * This class was generated by Apache CXF 2.2.6
+ * Mon Jun 14 11:12:40 BST 2010
+ * Generated source version: 2.2.6
+ *
+ */
+
+
+@WebServiceClient(name = "SecureServiceTestHarnessService",
+ wsdlLocation = "file:/home/gbrown/dev/riftsaw/workspace/TestHarness/wsdl/SecureServiceTestHarnessService.wsdl",
+ targetNamespace = "http://harness.tests.bpel.soa.jboss.org/")
+public class SecureServiceTestHarnessService extends Service {
+
+ public final static URL WSDL_LOCATION;
+ public final static QName SERVICE = new QName("http://harness.tests.bpel.soa.jboss.org/", "SecureServiceTestHarnessService");
+ public final static QName SecureServiceTestHarnessPort = new QName("http://harness.tests.bpel.soa.jboss.org/", "SecureServiceTestHarnessPort");
+ static {
+ URL url = null;
+ try {
+ url = new URL("file:/home/gbrown/dev/riftsaw/workspace/TestHarness/wsdl/SecureServiceTestHarnessService.wsdl");
+ } catch (MalformedURLException e) {
+ System.err.println("Can not initialize the default wsdl from file:/home/gbrown/dev/riftsaw/workspace/TestHarness/wsdl/SecureServiceTestHarnessService.wsdl");
+ // e.printStackTrace();
+ }
+ WSDL_LOCATION = url;
+ }
+
+ public SecureServiceTestHarnessService(URL wsdlLocation) {
+ super(wsdlLocation, SERVICE);
+ }
+
+ public SecureServiceTestHarnessService(URL wsdlLocation, QName serviceName) {
+ super(wsdlLocation, serviceName);
+ }
+
+ public SecureServiceTestHarnessService() {
+ super(WSDL_LOCATION, SERVICE);
+ }
+
+ /**
+ *
+ * @return
+ * returns SecureServiceTestHarness
+ */
+ @WebEndpoint(name = "SecureServiceTestHarnessPort")
+ public SecureServiceTestHarness getSecureServiceTestHarnessPort() {
+ return super.getPort(SecureServiceTestHarnessPort, SecureServiceTestHarness.class);
+ }
+
+ /**
+ *
+ * @param features
+ * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the <code>features</code> parameter will have their default values.
+ * @return
+ * returns SecureServiceTestHarness
+ */
+ @WebEndpoint(name = "SecureServiceTestHarnessPort")
+ public SecureServiceTestHarness getSecureServiceTestHarnessPort(WebServiceFeature... features) {
+ return super.getPort(SecureServiceTestHarnessPort, SecureServiceTestHarness.class, features);
+ }
+
+}
Added: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarness_SecureServiceTestHarnessPort_Client.java
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarness_SecureServiceTestHarnessPort_Client.java (rev 0)
+++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarness_SecureServiceTestHarnessPort_Client.java 2010-06-15 11:12:36 UTC (rev 730)
@@ -0,0 +1,65 @@
+
+package org.jboss.soa.bpel.tests.harness;
+
+/**
+ * Please modify this class to meet your needs
+ * This class is not complete
+ */
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import javax.xml.namespace.QName;
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.ws.RequestWrapper;
+import javax.xml.ws.ResponseWrapper;
+
+/**
+ * This class was generated by Apache CXF 2.2.6
+ * Mon Jun 14 11:12:40 BST 2010
+ * Generated source version: 2.2.6
+ *
+ */
+
+public final class SecureServiceTestHarness_SecureServiceTestHarnessPort_Client {
+
+ private static final QName SERVICE_NAME = new QName("http://harness.tests.bpel.soa.jboss.org/", "SecureServiceTestHarnessService");
+
+ private SecureServiceTestHarness_SecureServiceTestHarnessPort_Client() {
+ }
+
+ public static void main(String args[]) throws Exception {
+ URL wsdlURL = SecureServiceTestHarnessService.WSDL_LOCATION;
+ if (args.length > 0) {
+ File wsdlFile = new File(args[0]);
+ try {
+ if (wsdlFile.exists()) {
+ wsdlURL = wsdlFile.toURI().toURL();
+ } else {
+ wsdlURL = new URL(args[0]);
+ }
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ }
+ }
+
+ SecureServiceTestHarnessService ss = new SecureServiceTestHarnessService(wsdlURL, SERVICE_NAME);
+ SecureServiceTestHarness port = ss.getSecureServiceTestHarnessPort();
+
+ {
+ System.out.println("Invoking runTest...");
+ int _runTest_arg0 = 0;
+ boolean _runTest__return = port.runTest(_runTest_arg0);
+ System.out.println("runTest.result=" + _runTest__return);
+
+
+ }
+
+ System.exit(0);
+ }
+
+}
Added: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarness_SecureServiceTestHarnessPort_Server.java
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarness_SecureServiceTestHarnessPort_Server.java (rev 0)
+++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/SecureServiceTestHarness_SecureServiceTestHarnessPort_Server.java 2010-06-15 11:12:36 UTC (rev 730)
@@ -0,0 +1,30 @@
+
+package org.jboss.soa.bpel.tests.harness;
+
+import javax.xml.ws.Endpoint;
+
+/**
+ * This class was generated by Apache CXF 2.2.6
+ * Mon Jun 14 11:12:40 BST 2010
+ * Generated source version: 2.2.6
+ *
+ */
+
+public class SecureServiceTestHarness_SecureServiceTestHarnessPort_Server{
+
+ protected SecureServiceTestHarness_SecureServiceTestHarnessPort_Server() throws Exception {
+ System.out.println("Starting Server");
+ Object implementor = new SecureServiceTestHarnessImpl();
+ String address = "http://localhost:9090/SecureServiceTestHarnessPort";
+ Endpoint.publish(address, implementor);
+ }
+
+ public static void main(String args[]) throws Exception {
+ new SecureServiceTestHarness_SecureServiceTestHarnessPort_Server();
+ System.out.println("Server ready...");
+
+ Thread.sleep(5 * 60 * 1000);
+ System.out.println("Server exiting");
+ System.exit(0);
+ }
+}
Added: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/package-info.java
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/package-info.java (rev 0)
+++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/src/org/jboss/soa/bpel/tests/harness/package-info.java 2010-06-15 11:12:36 UTC (rev 730)
@@ -0,0 +1,2 @@
+(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://harness.tests.bpel.soa.jboss.org/")
+package org.jboss.soa.bpel.tests.harness;
Added: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/view/index.jsp
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/view/index.jsp (rev 0)
+++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/war/view/index.jsp 2010-06-15 11:12:36 UTC (rev 730)
@@ -0,0 +1,9 @@
+<html>
+ <body>
+ This is just a place holder.<br>
+ Verify the that the WS has been deployed by hitting
+ <a href="http://localhost:8080/jbossws">
+ http://localhost:8080/jbossws
+ </a>
+ </body>
+</html>
\ No newline at end of file
Added: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/wsdl/SecureServiceTestHarnessService.wsdl
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/wsdl/SecureServiceTestHarnessService.wsdl (rev 0)
+++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_secure_service_testharness/wsdl/SecureServiceTestHarnessService.wsdl 2010-06-15 11:12:36 UTC (rev 730)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions name="SecureServiceTestHarnessService" targetNamespace="http://harness.tests.bpel.soa.jboss.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://harness.tests.bpel.soa.jboss.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+ <wsdl:types>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://harness.tests.bpel.soa.jboss.org/" elementFormDefault="unqualified" targetNamespace="http://harness.tests.bpel.soa.jboss.org/" version="1.0">
+<xs:element name="runTest" type="tns:runTest"/>
+<xs:element name="runTestResponse" type="tns:runTestResponse"/>
+<xs:complexType name="runTest">
+<xs:sequence>
+<xs:element name="arg0" type="xs:int"/>
+</xs:sequence>
+</xs:complexType>
+<xs:complexType name="runTestResponse">
+<xs:sequence>
+<xs:element name="return" type="xs:boolean"/>
+</xs:sequence>
+</xs:complexType>
+</xs:schema>
+ </wsdl:types>
+ <wsdl:message name="runTest">
+ <wsdl:part name="parameters" element="tns:runTest">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="runTestResponse">
+ <wsdl:part name="parameters" element="tns:runTestResponse">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:portType name="SecureServiceTestHarness">
+ <wsdl:operation name="runTest">
+ <wsdl:input name="runTest" message="tns:runTest">
+ </wsdl:input>
+ <wsdl:output name="runTestResponse" message="tns:runTestResponse">
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="SecureServiceTestHarnessServiceSoapBinding" type="tns:SecureServiceTestHarness">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="runTest">
+ <soap:operation soapAction="" style="document"/>
+ <wsdl:input name="runTest">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="runTestResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="SecureServiceTestHarnessService">
+ <wsdl:port name="SecureServiceTestHarnessPort" binding="tns:SecureServiceTestHarnessServiceSoapBinding">
+ <soap:address location="http://127.0.0.1:8080/Quickstart_bpel_secure_service_testharness/SecureSe..."/>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
Modified: branches/RiftSaw-2.1.x/pom.xml
===================================================================
--- branches/RiftSaw-2.1.x/pom.xml 2010-06-08 02:33:53 UTC (rev 729)
+++ branches/RiftSaw-2.1.x/pom.xml 2010-06-15 11:12:36 UTC (rev 730)
@@ -88,7 +88,7 @@
<commons.codec.version>1.3</commons.codec.version>
<xerces.version>2.9.0</xerces.version>
<commons.httpclient.version>3.1</commons.httpclient.version>
- <cxf.version>2.2.8</cxf.version>
+ <cxf.version>2.2.6</cxf.version>
</properties>
<dependencyManagement>
14 years, 6 months
riftsaw SVN: r729 - in branches/riftsaw-jpa: console and 19 other directories.
by riftsaw-commits@lists.jboss.org
Author: jeff.yuchang
Date: 2010-06-07 22:33:53 -0400 (Mon, 07 Jun 2010)
New Revision: 729
Modified:
branches/riftsaw-jpa/console/identity/pom.xml
branches/riftsaw-jpa/console/integration/pom.xml
branches/riftsaw-jpa/console/pom.xml
branches/riftsaw-jpa/distribution/pom.xml
branches/riftsaw-jpa/docs/docbook/gettingstartedguide/pom.xml
branches/riftsaw-jpa/docs/docbook/gettingstartedguide/src/main/master.xml
branches/riftsaw-jpa/docs/docbook/pom.xml
branches/riftsaw-jpa/docs/docbook/userguide/pom.xml
branches/riftsaw-jpa/docs/docbook/userguide/src/main/master.xml
branches/riftsaw-jpa/integration-tests/pom.xml
branches/riftsaw-jpa/pom.xml
branches/riftsaw-jpa/qa/build.xml
branches/riftsaw-jpa/qa/hudson-riftsaw-db.sh
branches/riftsaw-jpa/qa/hudson-riftsaw-jboss.sh
branches/riftsaw-jpa/qa/hudson-riftsaw-jdk5.sh
branches/riftsaw-jpa/qa/hudson-riftsaw-soa-p.sh
branches/riftsaw-jpa/qa/hudson-riftsaw-ws.sh
branches/riftsaw-jpa/runtime/deployer/pom.xml
branches/riftsaw-jpa/runtime/engine-assembly/pom.xml
branches/riftsaw-jpa/runtime/engine/pom.xml
branches/riftsaw-jpa/runtime/jbossesb-bpel-assembly/pom.xml
branches/riftsaw-jpa/runtime/jbossesb-bpel/pom.xml
branches/riftsaw-jpa/runtime/pom.xml
branches/riftsaw-jpa/runtime/uddi/pom.xml
branches/riftsaw-jpa/runtime/uddi300/pom.xml
branches/riftsaw-jpa/stress-tests/pom.xml
Log:
* update version back to 2.1.0-SNAPSHOT.
Modified: branches/riftsaw-jpa/console/identity/pom.xml
===================================================================
--- branches/riftsaw-jpa/console/identity/pom.xml 2010-06-07 13:25:03 UTC (rev 728)
+++ branches/riftsaw-jpa/console/identity/pom.xml 2010-06-08 02:33:53 UTC (rev 729)
@@ -4,13 +4,13 @@
<groupId>org.jboss.soa.bpel.console</groupId>
<artifactId>identity</artifactId>
<packaging>jar</packaging>
- <version>2.1.0-CR1</version>
+ <version>2.1.0-SNAPSHOT</version>
<name>RiftSaw::Console::Identity</name>
<parent>
<groupId>org.jboss.soa.bpel.console</groupId>
<artifactId>parent</artifactId>
- <version>2.1.0-CR1</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<build>
Modified: branches/riftsaw-jpa/console/integration/pom.xml
===================================================================
--- branches/riftsaw-jpa/console/integration/pom.xml 2010-06-07 13:25:03 UTC (rev 728)
+++ branches/riftsaw-jpa/console/integration/pom.xml 2010-06-08 02:33:53 UTC (rev 729)
@@ -4,13 +4,13 @@
<groupId>org.jboss.soa.bpel.console</groupId>
<artifactId>integration</artifactId>
<packaging>jar</packaging>
- <version>2.1.0-CR1</version>
+ <version>2.1.0-SNAPSHOT</version>
<name>RiftSaw::Console::Integration</name>
<parent>
<groupId>org.jboss.soa.bpel.console</groupId>
<artifactId>parent</artifactId>
- <version>2.1.0-CR1</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<!-- Properties -->
Modified: branches/riftsaw-jpa/console/pom.xml
===================================================================
--- branches/riftsaw-jpa/console/pom.xml 2010-06-07 13:25:03 UTC (rev 728)
+++ branches/riftsaw-jpa/console/pom.xml 2010-06-08 02:33:53 UTC (rev 729)
@@ -5,13 +5,13 @@
<groupId>org.jboss.soa.bpel.console</groupId>
<artifactId>parent</artifactId>
<packaging>pom</packaging>
- <version>2.1.0-CR1</version>
+ <version>2.1.0-SNAPSHOT</version>
<name>RiftSaw::Console</name>
<parent>
<groupId>org.jboss.soa</groupId>
<artifactId>bpel</artifactId>
- <version>2.1.0-CR1</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<modules>
Modified: branches/riftsaw-jpa/distribution/pom.xml
===================================================================
--- branches/riftsaw-jpa/distribution/pom.xml 2010-06-07 13:25:03 UTC (rev 728)
+++ branches/riftsaw-jpa/distribution/pom.xml 2010-06-08 02:33:53 UTC (rev 729)
@@ -23,12 +23,12 @@
<artifactId>distribution</artifactId>
<packaging>pom</packaging>
<name>RiftSaw::Distribution</name>
- <version>2.1.0-CR1</version>
+ <version>2.1.0-SNAPSHOT</version>
<parent>
<groupId>org.jboss.soa</groupId>
<artifactId>bpel</artifactId>
- <version>2.1.0-CR1</version>
+ <version>2.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: branches/riftsaw-jpa/docs/docbook/gettingstartedguide/pom.xml
===================================================================
--- branches/riftsaw-jpa/docs/docbook/gettingstartedguide/pom.xml 2010-06-07 13:25:03 UTC (rev 728)
+++ branches/riftsaw-jpa/docs/docbook/gettingstartedguide/pom.xml 2010-06-08 02:33:53 UTC (rev 729)
@@ -6,14 +6,14 @@
<groupId>org.jboss.soa.bpel.docs</groupId>
<artifactId>gettingstartedguide</artifactId>
- <version>2.1.0-CR1</version>
+ <version>2.1.0-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>RiftSaw::Docs::gettingstartedguide</name>
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>docs</artifactId>
- <version>2.1.0-CR1</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
Modified: branches/riftsaw-jpa/docs/docbook/gettingstartedguide/src/main/master.xml
===================================================================
--- branches/riftsaw-jpa/docs/docbook/gettingstartedguide/src/main/master.xml 2010-06-07 13:25:03 UTC (rev 728)
+++ branches/riftsaw-jpa/docs/docbook/gettingstartedguide/src/main/master.xml 2010-06-08 02:33:53 UTC (rev 729)
@@ -5,7 +5,7 @@
<book lang="en">
<bookinfo>
- <title>RiftSaw 2.1.0-CR1</title>
+ <title>RiftSaw 2.1.0-SNAPSHOT</title>
<subtitle>Getting Started Guide</subtitle>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module/author_group.xml"/>
</bookinfo>
Modified: branches/riftsaw-jpa/docs/docbook/pom.xml
===================================================================
--- branches/riftsaw-jpa/docs/docbook/pom.xml 2010-06-07 13:25:03 UTC (rev 728)
+++ branches/riftsaw-jpa/docs/docbook/pom.xml 2010-06-08 02:33:53 UTC (rev 729)
@@ -6,14 +6,14 @@
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>docs</artifactId>
- <version>2.1.0-CR1</version>
+ <version>2.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>RiftSaw::Docs</name>
<parent>
<groupId>org.jboss.soa</groupId>
<artifactId>bpel</artifactId>
- <version>2.1.0-CR1</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<profiles>
Modified: branches/riftsaw-jpa/docs/docbook/userguide/pom.xml
===================================================================
--- branches/riftsaw-jpa/docs/docbook/userguide/pom.xml 2010-06-07 13:25:03 UTC (rev 728)
+++ branches/riftsaw-jpa/docs/docbook/userguide/pom.xml 2010-06-08 02:33:53 UTC (rev 729)
@@ -6,14 +6,14 @@
<groupId>org.jboss.soa.bpel.docs</groupId>
<artifactId>userguide</artifactId>
- <version>2.1.0-CR1</version>
+ <version>2.1.0-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>RiftSaw::Docs::userguide</name>
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>docs</artifactId>
- <version>2.1.0-CR1</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
Modified: branches/riftsaw-jpa/docs/docbook/userguide/src/main/master.xml
===================================================================
--- branches/riftsaw-jpa/docs/docbook/userguide/src/main/master.xml 2010-06-07 13:25:03 UTC (rev 728)
+++ branches/riftsaw-jpa/docs/docbook/userguide/src/main/master.xml 2010-06-08 02:33:53 UTC (rev 729)
@@ -5,7 +5,7 @@
<book lang="en">
<bookinfo>
- <title>RiftSaw 2.1.0-CR1</title>
+ <title>RiftSaw 2.1.0-SNAPSHOT</title>
<subtitle>User Guide</subtitle>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module/author_group.xml"/>
</bookinfo>
Modified: branches/riftsaw-jpa/integration-tests/pom.xml
===================================================================
--- branches/riftsaw-jpa/integration-tests/pom.xml 2010-06-07 13:25:03 UTC (rev 728)
+++ branches/riftsaw-jpa/integration-tests/pom.xml 2010-06-08 02:33:53 UTC (rev 729)
@@ -4,12 +4,12 @@
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>integration-tests</artifactId>
<packaging>pom</packaging>
- <version>2.1.0-CR1</version>
+ <version>2.1.0-SNAPSHOT</version>
<name>RiftSaw::Integration-Tests</name>
<parent>
<groupId>org.jboss.soa</groupId>
<artifactId>bpel</artifactId>
- <version>2.1.0-CR1</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<properties>
<jboss.jbosssx.version>2.0.2.SP3</jboss.jbosssx.version>
Modified: branches/riftsaw-jpa/pom.xml
===================================================================
--- branches/riftsaw-jpa/pom.xml 2010-06-07 13:25:03 UTC (rev 728)
+++ branches/riftsaw-jpa/pom.xml 2010-06-08 02:33:53 UTC (rev 729)
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.soa</groupId>
<artifactId>bpel</artifactId>
- <version>2.1.0-CR1</version>
+ <version>2.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>RiftSaw</name>
<url>http://www.jboss.org/riftsaw</url>
@@ -73,7 +73,7 @@
<properties>
<riftsaw.ode.version>2.1.0.CR1-SNAPSHOT</riftsaw.ode.version>
- <riftsaw.engine.version>2.1.0-CR1</riftsaw.engine.version>
+ <riftsaw.engine.version>2.1.0-SNAPSHOT</riftsaw.engine.version>
<bpm.console.version>2.1-SNAPSHOT</bpm.console.version>
<commons.logging.version>1.1.1</commons.logging.version>
<junit.version>3.8.1</junit.version>
Modified: branches/riftsaw-jpa/qa/build.xml
===================================================================
--- branches/riftsaw-jpa/qa/build.xml 2010-06-07 13:25:03 UTC (rev 728)
+++ branches/riftsaw-jpa/qa/build.xml 2010-06-08 02:33:53 UTC (rev 729)
@@ -9,7 +9,7 @@
<!-- CONFIGURABLE PROPERTIES -->
<property name="database" value="hsqldb" />
- <property name="riftsaw.version" value="2.1.0-CR1" />
+ <property name="riftsaw.version" value="2.1.0-SNAPSHOT" />
<property name="riftsaw.home" value="${riftsaw.parent.dir}/riftsaw-${riftsaw.version}" /> <!-- riftsaw.home should not be configured. change riftsaw.parent.dir instead -->
<property name="jboss.parent.dir" value="${riftsaw.home}" />
Modified: branches/riftsaw-jpa/qa/hudson-riftsaw-db.sh
===================================================================
--- branches/riftsaw-jpa/qa/hudson-riftsaw-db.sh 2010-06-07 13:25:03 UTC (rev 728)
+++ branches/riftsaw-jpa/qa/hudson-riftsaw-db.sh 2010-06-08 02:33:53 UTC (rev 729)
@@ -7,7 +7,7 @@
RIFTSAW_PARENT_DIR="$WORKSPACE"
JBOSS_VERSION="5.1.0.GA"
-RIFTSAW_VERSION="2.1.0-CR1"
+RIFTSAW_VERSION="2.1.0-SNAPSHOT"
AS_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-$JBOSS_VERSION"
AS_CONFIG="default"
REPLACE_QA_JDBC="true"
Modified: branches/riftsaw-jpa/qa/hudson-riftsaw-jboss.sh
===================================================================
--- branches/riftsaw-jpa/qa/hudson-riftsaw-jboss.sh 2010-06-07 13:25:03 UTC (rev 728)
+++ branches/riftsaw-jpa/qa/hudson-riftsaw-jboss.sh 2010-06-08 02:33:53 UTC (rev 729)
@@ -7,7 +7,7 @@
RIFTSAW_PARENT_DIR="$WORKSPACE"
JBOSS_VERSION="5.1.0.GA"
-RIFTSAW_VERSION="2.1.0-CR1"
+RIFTSAW_VERSION="2.1.0-SNAPSHOT"
AS_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-$JBOSS_VERSION"
AS_CONFIG="default"
REPLACE_QA_JDBC="true"
Modified: branches/riftsaw-jpa/qa/hudson-riftsaw-jdk5.sh
===================================================================
--- branches/riftsaw-jpa/qa/hudson-riftsaw-jdk5.sh 2010-06-07 13:25:03 UTC (rev 728)
+++ branches/riftsaw-jpa/qa/hudson-riftsaw-jdk5.sh 2010-06-08 02:33:53 UTC (rev 729)
@@ -9,7 +9,7 @@
DATABASE="hsql"
JBOSS_FILENAME="jboss-$JBOSS_VERSION.zip"
REPLACE_QA_JDBC="true"
-RIFTSAW_VERSION="2.1.0-CR1"
+RIFTSAW_VERSION="2.1.0-SNAPSHOT"
AS_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-$JBOSS_VERSION"
AS_CONFIG="default"
WS_STACK_DIR="$RIFTSAW_PARENT_DIR/downloads"
Modified: branches/riftsaw-jpa/qa/hudson-riftsaw-soa-p.sh
===================================================================
--- branches/riftsaw-jpa/qa/hudson-riftsaw-soa-p.sh 2010-06-07 13:25:03 UTC (rev 728)
+++ branches/riftsaw-jpa/qa/hudson-riftsaw-soa-p.sh 2010-06-08 02:33:53 UTC (rev 729)
@@ -7,7 +7,7 @@
RIFTSAW_PARENT_DIR="$WORKSPACE"
DATABASE="hsql"
-RIFTSAW_VERSION="2.1.0-CR1"
+RIFTSAW_VERSION="2.1.0-SNAPSHOT"
AS_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-soa-p.5.0.0/jboss-as"
AS_CONFIG="default"
REPLACE_QA_JDBC="true"
Modified: branches/riftsaw-jpa/qa/hudson-riftsaw-ws.sh
===================================================================
--- branches/riftsaw-jpa/qa/hudson-riftsaw-ws.sh 2010-06-07 13:25:03 UTC (rev 728)
+++ branches/riftsaw-jpa/qa/hudson-riftsaw-ws.sh 2010-06-08 02:33:53 UTC (rev 729)
@@ -6,7 +6,7 @@
RIFTSAW_PARENT_DIR="$WORKSPACE"
JBOSS_VERSION="5.1.0.GA"
DATABASE="hsql"
-RIFTSAW_VERSION="2.1.0-CR1"
+RIFTSAW_VERSION="2.1.0-SNAPSHOT"
AS_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-$JBOSS_VERSION"
AS_CONFIG="default"
WS_STACK_DIR="$RIFTSAW_PARENT_DIR/downloads"
Modified: branches/riftsaw-jpa/runtime/deployer/pom.xml
===================================================================
--- branches/riftsaw-jpa/runtime/deployer/pom.xml 2010-06-07 13:25:03 UTC (rev 728)
+++ branches/riftsaw-jpa/runtime/deployer/pom.xml 2010-06-08 02:33:53 UTC (rev 729)
@@ -4,13 +4,13 @@
<groupId>org.jboss.soa.bpel.runtime</groupId>
<artifactId>deployer</artifactId>
<packaging>jar</packaging>
- <version>2.1.0-CR1</version>
+ <version>2.1.0-SNAPSHOT</version>
<name>RiftSaw::Runtime::Deployer</name>
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>runtime</artifactId>
- <version>2.1.0-CR1</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/riftsaw-jpa/runtime/engine/pom.xml
===================================================================
--- branches/riftsaw-jpa/runtime/engine/pom.xml 2010-06-07 13:25:03 UTC (rev 728)
+++ branches/riftsaw-jpa/runtime/engine/pom.xml 2010-06-08 02:33:53 UTC (rev 729)
@@ -4,13 +4,13 @@
<groupId>org.jboss.soa.bpel.runtime</groupId>
<artifactId>riftsaw-engine</artifactId>
<packaging>jar</packaging>
- <version>2.1.0-CR1</version>
+ <version>2.1.0-SNAPSHOT</version>
<name>RiftSaw::Runtime::Engine</name>
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>runtime</artifactId>
- <version>2.1.0-CR1</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/riftsaw-jpa/runtime/engine-assembly/pom.xml
===================================================================
--- branches/riftsaw-jpa/runtime/engine-assembly/pom.xml 2010-06-07 13:25:03 UTC (rev 728)
+++ branches/riftsaw-jpa/runtime/engine-assembly/pom.xml 2010-06-08 02:33:53 UTC (rev 729)
@@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.soa.bpel.runtime</groupId>
<artifactId>riftsaw</artifactId>
- <version>2.1.0-CR1</version>
+ <version>2.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>RiftSaw::Runtime::Engine-Assembly</name>
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>runtime</artifactId>
- <version>2.1.0-CR1</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/riftsaw-jpa/runtime/jbossesb-bpel/pom.xml
===================================================================
--- branches/riftsaw-jpa/runtime/jbossesb-bpel/pom.xml 2010-06-07 13:25:03 UTC (rev 728)
+++ branches/riftsaw-jpa/runtime/jbossesb-bpel/pom.xml 2010-06-08 02:33:53 UTC (rev 729)
@@ -4,13 +4,13 @@
<groupId>org.jboss.soa.bpel.runtime</groupId>
<artifactId>jbossesb-bpel</artifactId>
<packaging>jar</packaging>
- <version>2.1.0-CR1</version>
+ <version>2.1.0-SNAPSHOT</version>
<name>RiftSaw::Runtime::JBossESB-BPEL</name>
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>runtime</artifactId>
- <version>2.1.0-CR1</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/riftsaw-jpa/runtime/jbossesb-bpel-assembly/pom.xml
===================================================================
--- branches/riftsaw-jpa/runtime/jbossesb-bpel-assembly/pom.xml 2010-06-07 13:25:03 UTC (rev 728)
+++ branches/riftsaw-jpa/runtime/jbossesb-bpel-assembly/pom.xml 2010-06-08 02:33:53 UTC (rev 729)
@@ -3,13 +3,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.soa.bpel.runtime</groupId>
<artifactId>bpel.esb</artifactId>
- <version>2.1.0-CR1</version>
+ <version>2.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>RiftSaw::Runtime::JBossESB-BPEL-Assembly</name>
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>runtime</artifactId>
- <version>2.1.0-CR1</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/riftsaw-jpa/runtime/pom.xml
===================================================================
--- branches/riftsaw-jpa/runtime/pom.xml 2010-06-07 13:25:03 UTC (rev 728)
+++ branches/riftsaw-jpa/runtime/pom.xml 2010-06-08 02:33:53 UTC (rev 729)
@@ -5,13 +5,13 @@
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>runtime</artifactId>
<packaging>pom</packaging>
- <version>2.1.0-CR1</version>
+ <version>2.1.0-SNAPSHOT</version>
<name>RiftSaw::Runtime</name>
<parent>
<groupId>org.jboss.soa</groupId>
<artifactId>bpel</artifactId>
- <version>2.1.0-CR1</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<modules>
Modified: branches/riftsaw-jpa/runtime/uddi/pom.xml
===================================================================
--- branches/riftsaw-jpa/runtime/uddi/pom.xml 2010-06-07 13:25:03 UTC (rev 728)
+++ branches/riftsaw-jpa/runtime/uddi/pom.xml 2010-06-08 02:33:53 UTC (rev 729)
@@ -4,13 +4,13 @@
<groupId>org.jboss.soa.bpel.runtime</groupId>
<artifactId>riftsaw-uddi</artifactId>
<packaging>jar</packaging>
- <version>2.1.0-CR1</version>
+ <version>2.1.0-SNAPSHOT</version>
<name>RiftSaw::Runtime::UDDI</name>
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>runtime</artifactId>
- <version>2.1.0-CR1</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/riftsaw-jpa/runtime/uddi300/pom.xml
===================================================================
--- branches/riftsaw-jpa/runtime/uddi300/pom.xml 2010-06-07 13:25:03 UTC (rev 728)
+++ branches/riftsaw-jpa/runtime/uddi300/pom.xml 2010-06-08 02:33:53 UTC (rev 729)
@@ -4,13 +4,13 @@
<groupId>org.jboss.soa.bpel.runtime</groupId>
<artifactId>riftsaw-uddi300</artifactId>
<packaging>jar</packaging>
- <version>2.1.0-CR1</version>
+ <version>2.1.0-SNAPSHOT</version>
<name>RiftSaw::Runtime::UDDI300</name>
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>runtime</artifactId>
- <version>2.1.0-CR1</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: branches/riftsaw-jpa/stress-tests/pom.xml
===================================================================
--- branches/riftsaw-jpa/stress-tests/pom.xml 2010-06-07 13:25:03 UTC (rev 728)
+++ branches/riftsaw-jpa/stress-tests/pom.xml 2010-06-08 02:33:53 UTC (rev 729)
@@ -4,12 +4,12 @@
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>stress-tests</artifactId>
<packaging>pom</packaging>
- <version>2.1.0-CR1</version>
+ <version>2.1.0-SNAPSHOT</version>
<name>RiftSaw::Stress-Tests</name>
<parent>
<groupId>org.jboss.soa</groupId>
<artifactId>bpel</artifactId>
- <version>2.1.0-CR1</version>
+ <version>2.1.0-SNAPSHOT</version>
</parent>
<profiles>
14 years, 6 months
Build failed in Hudson: Riftsaw-soa-p #42
by jboss-qa-internal@redhat.com
See <http://hudson.qa.jboss.com/hudson/job/Riftsaw-soa-p/42/changes>
Changes:
[jeff.yuchang] * update the version for rs-ode
[jeff.yuchang] * update version number for the qa script.
[objectiser] Change version from 2.1.0-CR1 to 2.1.0.CR1 in line with the new version policy.
[objectiser] Update release note URL.
[objectiser] Deploy riftsaw before compiling the tests, so that the relevant libraries (e.g. cxf) are installed prior to test compilation that may need to reference them.
[jeff.yuchang] * updated the drop script for mysql.
[jeff.yuchang] * update the ant drop.riftsaw.schema directory.
[jeff.yuchang] * remove the db schema once its finished the integration tests.
------------------------------------------
[...truncated 2080 lines...]
at java.net.PlainSocketImpl.doConnect(PlainSocketImpl.java:333)
at java.net.PlainSocketImpl.connectToAddress(PlainSocketImpl.java:195)
at java.net.PlainSocketImpl.connect(PlainSocketImpl.java:182)
at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:366)
at java.net.Socket.connect(Socket.java:525)
at java.net.Socket.connect(Socket.java:475)
at java.net.Socket.<init>(Socket.java:372)
at java.net.Socket.<init>(Socket.java:186)
at sun.rmi.transport.proxy.RMIDirectSocketFactory.createSocket(RMIDirectSocketFactory.java:22)
at sun.rmi.transport.proxy.RMIMasterSocketFactory.createSocket(RMIMasterSocketFactory.java:128)
at sun.rmi.transport.tcp.TCPEndpoint.newSocket(TCPEndpoint.java:595)
... 32 more
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.072 sec <<< FAILURE!
Running org.jboss.soa.bpel.tests.tutorials.BluePrint1.BluePrint1TestCase
java.rmi.ConnectException: Connection refused to host: 127.0.0.1; nested exception is:
java.net.ConnectException: Connection refused
at sun.rmi.transport.tcp.TCPEndpoint.newSocket(TCPEndpoint.java:601)
at sun.rmi.transport.tcp.TCPChannel.createConnection(TCPChannel.java:198)
at sun.rmi.transport.tcp.TCPChannel.newConnection(TCPChannel.java:184)
at sun.rmi.server.UnicastRef.invoke(UnicastRef.java:110)
at org.jboss.invocation.jrmp.server.JRMPInvoker_Stub.invoke(Unknown Source)
at org.jboss.invocation.jrmp.interfaces.JRMPInvokerProxy.invoke(JRMPInvokerProxy.java:133)
at org.jboss.invocation.InvokerInterceptor.invokeInvoker(InvokerInterceptor.java:365)
at org.jboss.invocation.InvokerInterceptor.invoke(InvokerInterceptor.java:197)
at org.jboss.jmx.connector.invoker.client.InvokerAdaptorClientInterceptor.invoke(InvokerAdaptorClientInterceptor.java:66)
at org.jboss.proxy.SecurityInterceptor.invoke(SecurityInterceptor.java:68)
at org.jboss.proxy.ClientMethodInterceptor.invoke(ClientMethodInterceptor.java:74)
at org.jboss.proxy.ClientContainer.invoke(ClientContainer.java:101)
at $Proxy1.invoke(Unknown Source)
at org.jboss.soa.bpel.tests.TestDeployerJBoss.invokeMainDeployer(TestDeployerJBoss.java:65)
at org.jboss.soa.bpel.tests.TestDeployerJBoss.deploy(TestDeployerJBoss.java:55)
at org.jboss.soa.bpel.tests.RiftSawTestHelper.deploy(RiftSawTestHelper.java:48)
at org.jboss.soa.bpel.tests.RiftSawTestSetup.setUp(RiftSawTestSetup.java:104)
at junit.extensions.TestSetup$1.protect(TestSetup.java:18)
at junit.framework.TestResult.runProtected(TestResult.java:124)
at junit.extensions.TestSetup.run(TestSetup.java:23)
at sun.reflect.GeneratedMethodAccessor3.invoke(Unknown Source)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:597)
at org.apache.maven.surefire.junit.JUnitTestSet.execute(JUnitTestSet.java:213)
at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.executeTestSet(AbstractDirectoryTestSuite.java:140)
at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.execute(AbstractDirectoryTestSuite.java:127)
at org.apache.maven.surefire.Surefire.run(Surefire.java:177)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:597)
at org.apache.maven.surefire.booter.SurefireBooter.runSuitesInProcess(SurefireBooter.java:345)
at org.apache.maven.surefire.booter.SurefireBooter.main(SurefireBooter.java:1009)
Caused by: java.net.ConnectException: Connection refused
at java.net.PlainSocketImpl.socketConnect(Native Method)
at java.net.PlainSocketImpl.doConnect(PlainSocketImpl.java:333)
at java.net.PlainSocketImpl.connectToAddress(PlainSocketImpl.java:195)
at java.net.PlainSocketImpl.connect(PlainSocketImpl.java:182)
at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:366)
at java.net.Socket.connect(Socket.java:525)
at java.net.Socket.connect(Socket.java:475)
at java.net.Socket.<init>(Socket.java:372)
at java.net.Socket.<init>(Socket.java:186)
at sun.rmi.transport.proxy.RMIDirectSocketFactory.createSocket(RMIDirectSocketFactory.java:22)
at sun.rmi.transport.proxy.RMIMasterSocketFactory.createSocket(RMIMasterSocketFactory.java:128)
at sun.rmi.transport.tcp.TCPEndpoint.newSocket(TCPEndpoint.java:595)
... 32 more
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.069 sec <<< FAILURE!
Running org.jboss.soa.bpel.tests.testcases.RiftSaw118TestCase
java.rmi.ConnectException: Connection refused to host: 127.0.0.1; nested exception is:
java.net.ConnectException: Connection refused
at sun.rmi.transport.tcp.TCPEndpoint.newSocket(TCPEndpoint.java:601)
at sun.rmi.transport.tcp.TCPChannel.createConnection(TCPChannel.java:198)
at sun.rmi.transport.tcp.TCPChannel.newConnection(TCPChannel.java:184)
at sun.rmi.server.UnicastRef.invoke(UnicastRef.java:110)
at org.jboss.invocation.jrmp.server.JRMPInvoker_Stub.invoke(Unknown Source)
at org.jboss.invocation.jrmp.interfaces.JRMPInvokerProxy.invoke(JRMPInvokerProxy.java:133)
at org.jboss.invocation.InvokerInterceptor.invokeInvoker(InvokerInterceptor.java:365)
at org.jboss.invocation.InvokerInterceptor.invoke(InvokerInterceptor.java:197)
at org.jboss.jmx.connector.invoker.client.InvokerAdaptorClientInterceptor.invoke(InvokerAdaptorClientInterceptor.java:66)
at org.jboss.proxy.SecurityInterceptor.invoke(SecurityInterceptor.java:68)
at org.jboss.proxy.ClientMethodInterceptor.invoke(ClientMethodInterceptor.java:74)
at org.jboss.proxy.ClientContainer.invoke(ClientContainer.java:101)
at $Proxy1.invoke(Unknown Source)
at org.jboss.soa.bpel.tests.TestDeployerJBoss.invokeMainDeployer(TestDeployerJBoss.java:65)
at org.jboss.soa.bpel.tests.TestDeployerJBoss.deploy(TestDeployerJBoss.java:55)
at org.jboss.soa.bpel.tests.RiftSawTestHelper.deploy(RiftSawTestHelper.java:48)
at org.jboss.soa.bpel.tests.RiftSawTestSetup.setUp(RiftSawTestSetup.java:104)
at junit.extensions.TestSetup$1.protect(TestSetup.java:18)
at junit.framework.TestResult.runProtected(TestResult.java:124)
at junit.extensions.TestSetup.run(TestSetup.java:23)
at sun.reflect.GeneratedMethodAccessor3.invoke(Unknown Source)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:597)
at org.apache.maven.surefire.junit.JUnitTestSet.execute(JUnitTestSet.java:213)
at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.executeTestSet(AbstractDirectoryTestSuite.java:140)
at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.execute(AbstractDirectoryTestSuite.java:127)
at org.apache.maven.surefire.Surefire.run(Surefire.java:177)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:597)
at org.apache.maven.surefire.booter.SurefireBooter.runSuitesInProcess(SurefireBooter.java:345)
at org.apache.maven.surefire.booter.SurefireBooter.main(SurefireBooter.java:1009)
Caused by: java.net.ConnectException: Connection refused
at java.net.PlainSocketImpl.socketConnect(Native Method)
at java.net.PlainSocketImpl.doConnect(PlainSocketImpl.java:333)
at java.net.PlainSocketImpl.connectToAddress(PlainSocketImpl.java:195)
at java.net.PlainSocketImpl.connect(PlainSocketImpl.java:182)
at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:366)
at java.net.Socket.connect(Socket.java:525)
at java.net.Socket.connect(Socket.java:475)
at java.net.Socket.<init>(Socket.java:372)
at java.net.Socket.<init>(Socket.java:186)
at sun.rmi.transport.proxy.RMIDirectSocketFactory.createSocket(RMIDirectSocketFactory.java:22)
at sun.rmi.transport.proxy.RMIMasterSocketFactory.createSocket(RMIMasterSocketFactory.java:128)
at sun.rmi.transport.tcp.TCPEndpoint.newSocket(TCPEndpoint.java:595)
... 32 more
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.069 sec <<< FAILURE!
Running org.jboss.soa.bpel.tests.samples.QuickstartBPELSecureInvokeTestCase
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.011 sec
Running org.jboss.soa.bpel.tests.samples.QuickstartESBBPELLoanFaultTestCase
java.rmi.ConnectException: Connection refused to host: 127.0.0.1; nested exception is:
java.net.ConnectException: Connection refused
at sun.rmi.transport.tcp.TCPEndpoint.newSocket(TCPEndpoint.java:601)
at sun.rmi.transport.tcp.TCPChannel.createConnection(TCPChannel.java:198)
at sun.rmi.transport.tcp.TCPChannel.newConnection(TCPChannel.java:184)
at sun.rmi.server.UnicastRef.invoke(UnicastRef.java:110)
at org.jboss.invocation.jrmp.server.JRMPInvoker_Stub.invoke(Unknown Source)
at org.jboss.invocation.jrmp.interfaces.JRMPInvokerProxy.invoke(JRMPInvokerProxy.java:133)
at org.jboss.invocation.InvokerInterceptor.invokeInvoker(InvokerInterceptor.java:365)
at org.jboss.invocation.InvokerInterceptor.invoke(InvokerInterceptor.java:197)
at org.jboss.jmx.connector.invoker.client.InvokerAdaptorClientInterceptor.invoke(InvokerAdaptorClientInterceptor.java:66)
at org.jboss.proxy.SecurityInterceptor.invoke(SecurityInterceptor.java:68)
at org.jboss.proxy.ClientMethodInterceptor.invoke(ClientMethodInterceptor.java:74)
at org.jboss.proxy.ClientContainer.invoke(ClientContainer.java:101)
at $Proxy1.invoke(Unknown Source)
at org.jboss.soa.bpel.tests.TestDeployerJBoss.invokeMainDeployer(TestDeployerJBoss.java:65)
at org.jboss.soa.bpel.tests.TestDeployerJBoss.deploy(TestDeployerJBoss.java:55)
at org.jboss.soa.bpel.tests.RiftSawTestHelper.deploy(RiftSawTestHelper.java:48)
at org.jboss.soa.bpel.tests.RiftSawTestSetup.setUp(RiftSawTestSetup.java:104)
at junit.extensions.TestSetup$1.protect(TestSetup.java:18)
at junit.framework.TestResult.runProtected(TestResult.java:124)
at junit.extensions.TestSetup.run(TestSetup.java:23)
at sun.reflect.GeneratedMethodAccessor3.invoke(Unknown Source)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:597)
at org.apache.maven.surefire.junit.JUnitTestSet.execute(JUnitTestSet.java:213)
at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.executeTestSet(AbstractDirectoryTestSuite.java:140)
at org.apache.maven.surefire.suite.AbstractDirectoryTestSuite.execute(AbstractDirectoryTestSuite.java:127)
at org.apache.maven.surefire.Surefire.run(Surefire.java:177)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:597)
at org.apache.maven.surefire.booter.SurefireBooter.runSuitesInProcess(SurefireBooter.java:345)
at org.apache.maven.surefire.booter.SurefireBooter.main(SurefireBooter.java:1009)
Caused by: java.net.ConnectException: Connection refused
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.083 sec <<< FAILURE!
Results :
Tests in error:
testSendHelloGoodbye(org.jboss.soa.bpel.tests.samples.QuickstartBPELSimpleCorrelationTestCase)
org.jboss.soa.bpel.tests.samples.QuickstartBPELSimpleCorrelationTestCase
org.jboss.soa.bpel.tests.samples.QuickstartBPELHelloWorldHeaderODETestCase
org.jboss.soa.bpel.tests.tutorials.BluePrint5.BluePrint5TestCase
org.jboss.soa.bpel.tests.tutorials.BluePrint4.BluePrint4TestCase
org.jboss.soa.bpel.tests.testcases.RiftSaw144TestCase
org.jboss.soa.bpel.tests.samples.QuickstartBPELLoanApprovalTestCase
org.jboss.soa.bpel.tests.testcases.RiftSaw163TestCase
org.jboss.soa.bpel.tests.samples.QuickstartBPELSimpleInvokeTestCase
org.jboss.soa.bpel.tests.samples.QuickstartESBBPELHelloWorldTestCase
org.jboss.soa.bpel.tests.tutorials.BluePrint2.BluePrint2TestCase
org.jboss.soa.bpel.tests.samples.QuickstartBPELSimpleCorrelationWithOneWayTestCase
org.jboss.soa.bpel.tests.samples.QuickstartESBBPELHelloWorldExtendedTimeoutTestCase
org.jboss.soa.bpel.tests.samples.QuickstartBPELHelloWorldHeaderWSDLTestCase
org.jboss.soa.bpel.tests.testcases.RiftSaw154TestCase
org.jboss.soa.bpel.tests.samples.QuickstartBPELSimplePickTestCase
org.jboss.soa.bpel.tests.samples.QuickstartBPELHelloWorldTestCase
org.jboss.soa.bpel.tests.tutorials.BluePrint3.BluePrint3TestCase
org.jboss.soa.bpel.tests.samples.QuickstartESBBPELHelloWorldNoExtendedTimeoutTestCase
org.jboss.soa.bpel.tests.samples.QuickstartBPELHelloWorldExtendedTimeoutTestCase
org.jboss.soa.bpel.tests.testcases.RiftSaw70TestCase
org.jboss.soa.bpel.tests.tutorials.BluePrint1.BluePrint1TestCase
org.jboss.soa.bpel.tests.testcases.RiftSaw118TestCase
org.jboss.soa.bpel.tests.samples.QuickstartESBBPELLoanFaultTestCase
Tests run: 25, Failures: 0, Errors: 24, Skipped: 0
at java.net.PlainSocketImpl.socketConnect(Native Method)
at java.net.PlainSocketImpl.doConnect(PlainSocketImpl.java:333)
at java.net.PlainSocketImpl.connectToAddress(PlainSocketImpl.java:195)
at java.net.PlainSocketImpl.connect(PlainSocketImpl.java:182)
at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:366)
at java.net.Socket.connect(Socket.java:525)
at java.net.Socket.connect(Socket.java:475)
at java.net.Socket.<init>(Socket.java:372)
at java.net.Socket.<init>(Socket.java:186)
at sun.rmi.transport.proxy.RMIDirectSocketFactory.createSocket(RMIDirectSocketFactory.java:22)
at sun.rmi.transport.proxy.RMIMasterSocketFactory.createSocket(RMIMasterSocketFactory.java:128)
at sun.rmi.transport.tcp.TCPEndpoint.newSocket(TCPEndpoint.java:595)
... 32 more
[ERROR] There are test failures.
Please refer to <http://hudson.qa.jboss.com/hudson/job/Riftsaw-soa-p/ws/riftsaw/integratio...> for the individual test results.
[INFO] [antrun:run {execution: undeploy-riftsaw}]
[INFO] Executing tasks
stop-server:
[echo] Stopping the server
[echo] Server is at <http://hudson.qa.jboss.com/hudson/job/Riftsaw-soa-p/ws/riftsaw-2.1.0.CR1/...>
[java] Exception in thread "main" javax.naming.CommunicationException: Could not obtain connection to any of these urls: localhost:1099 [Root exception is javax.naming.CommunicationException: Failed to connect to server localhost/127.0.0.1:1099 [Root exception is javax.naming.ServiceUnavailableException: Failed to connect to server localhost/127.0.0.1:1099 [Root exception is java.net.ConnectException: Connection refused]]]
[java] at org.jnp.interfaces.NamingContext.checkRef(NamingContext.java:1763)
[java] at org.jnp.interfaces.NamingContext.lookup(NamingContext.java:693)
[java] at org.jnp.interfaces.NamingContext.lookup(NamingContext.java:686)
[java] at javax.naming.InitialContext.lookup(InitialContext.java:392)
[java] at org.jboss.Shutdown.main(Shutdown.java:219)
[java] Caused by: javax.naming.CommunicationException: Failed to connect to server localhost/127.0.0.1:1099 [Root exception is javax.naming.ServiceUnavailableException: Failed to connect to server localhost/127.0.0.1:1099 [Root exception is java.net.ConnectException: Connection refused]]
[java] at org.jnp.interfaces.NamingContext.getServer(NamingContext.java:335)
[java] at org.jnp.interfaces.NamingContext.checkRef(NamingContext.java:1734)
[java] ... 4 more
[java] Caused by: javax.naming.ServiceUnavailableException: Failed to connect to server localhost/127.0.0.1:1099 [Root exception is java.net.ConnectException: Connection refused]
[java] at org.jnp.interfaces.NamingContext.getServer(NamingContext.java:305)
[java] ... 5 more
[java] Caused by: java.net.ConnectException: Connection refused
[java] at java.net.PlainSocketImpl.socketConnect(Native Method)
[java] at java.net.PlainSocketImpl.doConnect(PlainSocketImpl.java:333)
[java] at java.net.PlainSocketImpl.connectToAddress(PlainSocketImpl.java:195)
[java] at java.net.PlainSocketImpl.connect(PlainSocketImpl.java:182)
[java] at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:366)
[java] at java.net.Socket.connect(Socket.java:525)
[java] at org.jnp.interfaces.TimedSocketFactory.createSocket(TimedSocketFactory.java:97)
[java] at org.jnp.interfaces.TimedSocketFactory.createSocket(TimedSocketFactory.java:82)
[java] at org.jnp.interfaces.NamingContext.getServer(NamingContext.java:301)
[java] ... 5 more
[java] Java Result: 1
[echo] Shutdown rc = 1
[INFO] ------------------------------------------------------------------------
[ERROR] BUILD ERROR
[INFO] ------------------------------------------------------------------------
[INFO] An Ant BuildException has occured: The following error occurred while executing this line:
<http://hudson.qa.jboss.com/hudson/job/Riftsaw-soa-p/ws/riftsaw/integratio...>:112: Unable to shut down JBoss (maybe it hasn't fully started yet?).
[INFO] ------------------------------------------------------------------------
[INFO] For more information, run Maven with the -e switch
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 9 minutes 55 seconds
[INFO] Finished at: Fri Jun 04 15:53:57 EDT 2010
[INFO] Final Memory: 58M/495M
[INFO] ------------------------------------------------------------------------
Archiving artifacts
Recording test results
14 years, 6 months