Author: objectiser Date: 2010-11-20 06:36:17 -0500 (Sat, 20 Nov 2010) New Revision: 1123 Modified: trunk/integration-tests/pom.xml trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ODEServiceEndpointReference.java trunk/runtime/si/src/main/java/org/jboss/soa/si/ServiceEndpointReference.java trunk/runtime/si/src/main/java/org/jboss/soa/si/deployer/jboss/JBossServiceDeployer.java Log: Fix test failures. Modified: trunk/integration-tests/pom.xml =================================================================== --- trunk/integration-tests/pom.xml 2010-11-17 14:41:08 UTC (rev 1122) +++ trunk/integration-tests/pom.xml 2010-11-20 11:36:17 UTC (rev 1123) @@ -585,9 +585,6 @@ <includes> <include>**/*TestCase.java</include> <include>**/*Test.java</include> - <!-- - <include>org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldTestCase.java</include> - --> </includes> <!-- https://jira.jboss.org/jira/browse/RIFTSAW-34 --> <excludes> Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ODEServiceEndpointReference.java =================================================================== --- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ODEServiceEndpointReference.java 2010-11-17 14:41:08 UTC (rev 1122) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ODEServiceEndpointReference.java 2010-11-20 11:36:17 UTC (rev 1123) @@ -32,9 +32,10 @@ */ public final class ODEServiceEndpointReference extends ServiceEndpointReference implements EndpointReference { - public ODEServiceEndpointReference(String endpointId, java.net.URL location, String deploymentName) + public ODEServiceEndpointReference(String endpointId, java.net.URL location, String deploymentName, + String archiveLocation) { - super(endpointId, location, deploymentName); + super(endpointId, location, deploymentName, archiveLocation); } public Document toXML() { @@ -63,7 +64,7 @@ return((ODEServiceEndpointReference)ref); } else { return(new ODEServiceEndpointReference(ref.getEndpointId(), - ref.getServiceUrl(), ref.getDeploymentName())); + ref.getServiceUrl(), ref.getDeploymentName(), ref.getArchiveLocation())); } } } Modified: trunk/runtime/si/src/main/java/org/jboss/soa/si/ServiceEndpointReference.java =================================================================== --- trunk/runtime/si/src/main/java/org/jboss/soa/si/ServiceEndpointReference.java 2010-11-17 14:41:08 UTC (rev 1122) +++ trunk/runtime/si/src/main/java/org/jboss/soa/si/ServiceEndpointReference.java 2010-11-20 11:36:17 UTC (rev 1123) @@ -33,11 +33,14 @@ private String deploymentName; private String archiveLocation; - public ServiceEndpointReference(String endpointId, java.net.URL location, String deploymentName) + public ServiceEndpointReference(String endpointId, java.net.URL location, String deploymentName, + String archiveLocation) { this.endpointId = endpointId; this.serviceUrl = location; this.deploymentName = deploymentName; + this.archiveLocation = archiveLocation; +System.out.println("GPB: SER endpointId="+endpointId+" location="+location+" deploymentName="+deploymentName+" arch="+archiveLocation); } public String getArchiveLocation() @@ -45,10 +48,12 @@ return archiveLocation; } + /* public void setArchiveLocation(String archiveLocation) { this.archiveLocation = archiveLocation; } + */ public String getEndpointId() { Modified: trunk/runtime/si/src/main/java/org/jboss/soa/si/deployer/jboss/JBossServiceDeployer.java =================================================================== --- trunk/runtime/si/src/main/java/org/jboss/soa/si/deployer/jboss/JBossServiceDeployer.java 2010-11-17 14:41:08 UTC (rev 1122) +++ trunk/runtime/si/src/main/java/org/jboss/soa/si/deployer/jboss/JBossServiceDeployer.java 2010-11-20 11:36:17 UTC (rev 1123) @@ -66,10 +66,10 @@ getMainDeployer().deploy(deployment); ServiceEndpointReference ref = new ServiceEndpointReference( - metaData.getEndpointId(), serviceUrl, deployment.getName() + metaData.getEndpointId(), serviceUrl, deployment.getName(), warArchive.getAbsolutePath() ); - ref.setArchiveLocation(warArchive.getAbsolutePath()); + //ref.setArchiveLocation(warArchive.getAbsolutePath()); return(ref); }