March 2011 - riftsaw-commits - Jboss List Archives

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

by riftsaw-commits＠lists.jboss.org

Author: objectiser Date: 2011-03-31 10:35:11 -0400 (Thu, 31 Mar 2011) New Revision: 1345 Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/EndpointReferenceContextImpl.java trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ClientEndpointReference.java Log: RIFTSAW-325 - update to avoid calling the ODE EndpointFactory unnecessarily. Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/EndpointReferenceContextImpl.java =================================================================== --- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/EndpointReferenceContextImpl.java 2011-03-31 14:23:03 UTC (rev 1344) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/EndpointReferenceContextImpl.java 2011-03-31 14:35:11 UTC (rev 1345) @@ -26,6 +26,7 @@ import org.apache.ode.bpel.iapi.EndpointReference; import org.apache.ode.bpel.iapi.EndpointReferenceContext; import org.apache.ode.utils.DOMUtils; +import org.jboss.soa.bpel.runtime.ws.ClientEndpointReference; import org.w3c.dom.Element; import java.util.Map; @@ -41,6 +42,13 @@ public EndpointReference resolveEndpointReference(Element element) { if (log.isDebugEnabled()) log.debug("Resolving endpoint reference " + DOMUtils.domToString(element)); + + if (element != null && element.getNodeName().equals(ClientEndpointReference.CLIENT_EPR_ELEMENT)) { + // Returning null as ODE endpoint factory does not have an EndpointReference type for + // this internal riftsaw EPR representation - so null indicates use the default EPR associated + // with the WSDL + return(null); + } return EndpointFactory.createEndpoint(element); } Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ClientEndpointReference.java =================================================================== --- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ClientEndpointReference.java 2011-03-31 14:23:03 UTC (rev 1344) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ClientEndpointReference.java 2011-03-31 14:35:11 UTC (rev 1345) @@ -29,6 +29,8 @@ */ public final class ClientEndpointReference implements EndpointReference { + public static final String CLIENT_EPR_ELEMENT = "attr"; + private String endpointId; public ClientEndpointReference(String endpointId) @@ -42,7 +44,7 @@ try { ret = javax.xml.parsers.DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument(); - org.w3c.dom.Element elem=ret.createElement("attr"); + org.w3c.dom.Element elem=ret.createElement(CLIENT_EPR_ELEMENT); elem.setAttribute("endpointId", endpointId); ret.appendChild(elem);

13 years, 8 months

1
0
0 / 0

riftsaw SVN: r1344 - branches/ODE/RiftSaw-ODE-trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr.

by riftsaw-commits＠lists.jboss.org

Author: objectiser Date: 2011-03-31 10:23:03 -0400 (Thu, 31 Mar 2011) New Revision: 1344 Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/EndpointFactory.java Log: Back out change made for RIFTSAW-325 - merged with apache ode trunk version. Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/EndpointFactory.java =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/EndpointFactory.java 2011-03-31 03:39:41 UTC (rev 1343) +++ branches/ODE/RiftSaw-ODE-trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/EndpointFactory.java 2011-03-31 14:23:03 UTC (rev 1344) @@ -52,7 +52,7 @@ /** * Creates a ServiceEndpoint using the provided Node. The actual endpoint * type is detected using the endpoint node (text or element qname). - * + * * @param endpointElmt * @return the new ServiceEndpoint */ @@ -72,11 +72,7 @@ return se; } } - if (__log.isDebugEnabled()) { - // Only appears relevant if EPR explicitly set for partner link, so - // returns null if using default EPR from WSDL. - __log.debug("Couldnt create any endpoint for element " + DOMUtils.domToString(endpointElmt)); - } + __log.warn("Couldnt create any endpoint for element " + DOMUtils.domToString(endpointElmt)); return null; } @@ -85,7 +81,7 @@ * The target type is actually the qualified name of the root element for * the target EPR (i.e wsa:MutableEndpoint, wsdl:service) or null to convert * to a simple URL. - * + * * @param targetElmtType * QName to convert to * @param sourceEndpoint @@ -122,10 +118,10 @@ public static WSAEndpoint convertToWSA(MutableEndpoint source) { if (source == null) return null; - - if (source instanceof WSAEndpoint) + + if (source instanceof WSAEndpoint) return (WSAEndpoint) source; - + return new WSAEndpoint(source.toMap()); } }

13 years, 8 months

1
0
0 / 0

riftsaw SVN: r1343 - in branches/ODE/RiftSaw-ODE-trunk: agents and 33 other directories.

by riftsaw-commits＠lists.jboss.org

Author: jeff.yuchang Date: 2011-03-30 23:39:41 -0400 (Wed, 30 Mar 2011) New Revision: 1343 Modified: branches/ODE/RiftSaw-ODE-trunk/agents/pom.xml branches/ODE/RiftSaw-ODE-trunk/axis2-war/pom.xml branches/ODE/RiftSaw-ODE-trunk/axis2/pom.xml branches/ODE/RiftSaw-ODE-trunk/bpel-api-jca/pom.xml branches/ODE/RiftSaw-ODE-trunk/bpel-api/pom.xml branches/ODE/RiftSaw-ODE-trunk/bpel-compiler/pom.xml branches/ODE/RiftSaw-ODE-trunk/bpel-connector/pom.xml branches/ODE/RiftSaw-ODE-trunk/bpel-dao/pom.xml branches/ODE/RiftSaw-ODE-trunk/bpel-epr/pom.xml branches/ODE/RiftSaw-ODE-trunk/bpel-obj/pom.xml branches/ODE/RiftSaw-ODE-trunk/bpel-ql/pom.xml branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/pom.xml branches/ODE/RiftSaw-ODE-trunk/bpel-schemas/pom.xml branches/ODE/RiftSaw-ODE-trunk/bpel-scripts/pom.xml branches/ODE/RiftSaw-ODE-trunk/bpel-store/pom.xml branches/ODE/RiftSaw-ODE-trunk/bpel-test/pom.xml branches/ODE/RiftSaw-ODE-trunk/dao-hibernate-db/pom.xml branches/ODE/RiftSaw-ODE-trunk/dao-hibernate/pom.xml branches/ODE/RiftSaw-ODE-trunk/dao-jpa-db/pom.xml branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/pom.xml branches/ODE/RiftSaw-ODE-trunk/dao-jpa-ojpa-derby/pom.xml branches/ODE/RiftSaw-ODE-trunk/dao-jpa-ojpa/pom.xml branches/ODE/RiftSaw-ODE-trunk/dao-jpa/pom.xml branches/ODE/RiftSaw-ODE-trunk/distro/pom.xml branches/ODE/RiftSaw-ODE-trunk/distro/src/examples-jbi/maven2/ping-pong-osgi/pom.xml branches/ODE/RiftSaw-ODE-trunk/jacob/pom.xml branches/ODE/RiftSaw-ODE-trunk/jbi-bundle/pom.xml branches/ODE/RiftSaw-ODE-trunk/jbi-karaf/pom.xml branches/ODE/RiftSaw-ODE-trunk/jbi/pom.xml branches/ODE/RiftSaw-ODE-trunk/jca-ra/pom.xml branches/ODE/RiftSaw-ODE-trunk/jca-server/pom.xml branches/ODE/RiftSaw-ODE-trunk/pom.xml branches/ODE/RiftSaw-ODE-trunk/scheduler-simple/pom.xml branches/ODE/RiftSaw-ODE-trunk/tools/pom.xml branches/ODE/RiftSaw-ODE-trunk/utils/pom.xml Log: * bump version back to 2.3.0-SNAPSHOT. Modified: branches/ODE/RiftSaw-ODE-trunk/agents/pom.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/agents/pom.xml 2011-03-30 14:19:38 UTC (rev 1342) +++ branches/ODE/RiftSaw-ODE-trunk/agents/pom.xml 2011-03-31 03:39:41 UTC (rev 1343) @@ -28,6 +28,6 @@ <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>ode</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> </project> Modified: branches/ODE/RiftSaw-ODE-trunk/axis2/pom.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/axis2/pom.xml 2011-03-30 14:19:38 UTC (rev 1342) +++ branches/ODE/RiftSaw-ODE-trunk/axis2/pom.xml 2011-03-31 03:39:41 UTC (rev 1343) @@ -26,7 +26,7 @@ <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>ode</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <properties> Modified: branches/ODE/RiftSaw-ODE-trunk/axis2-war/pom.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/axis2-war/pom.xml 2011-03-30 14:19:38 UTC (rev 1342) +++ branches/ODE/RiftSaw-ODE-trunk/axis2-war/pom.xml 2011-03-31 03:39:41 UTC (rev 1343) @@ -28,7 +28,7 @@ <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>ode</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <properties> Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-api/pom.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/bpel-api/pom.xml 2011-03-30 14:19:38 UTC (rev 1342) +++ branches/ODE/RiftSaw-ODE-trunk/bpel-api/pom.xml 2011-03-31 03:39:41 UTC (rev 1343) @@ -28,7 +28,7 @@ <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>ode</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <dependencies> Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-api-jca/pom.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/bpel-api-jca/pom.xml 2011-03-30 14:19:38 UTC (rev 1342) +++ branches/ODE/RiftSaw-ODE-trunk/bpel-api-jca/pom.xml 2011-03-31 03:39:41 UTC (rev 1343) @@ -28,7 +28,7 @@ <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>ode</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <dependencies> Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-compiler/pom.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/bpel-compiler/pom.xml 2011-03-30 14:19:38 UTC (rev 1342) +++ branches/ODE/RiftSaw-ODE-trunk/bpel-compiler/pom.xml 2011-03-31 03:39:41 UTC (rev 1343) @@ -26,7 +26,7 @@ <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>ode</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <dependencies> Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-connector/pom.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/bpel-connector/pom.xml 2011-03-30 14:19:38 UTC (rev 1342) +++ branches/ODE/RiftSaw-ODE-trunk/bpel-connector/pom.xml 2011-03-31 03:39:41 UTC (rev 1343) @@ -26,7 +26,7 @@ <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>ode</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <dependencies> Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-dao/pom.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/bpel-dao/pom.xml 2011-03-30 14:19:38 UTC (rev 1342) +++ branches/ODE/RiftSaw-ODE-trunk/bpel-dao/pom.xml 2011-03-31 03:39:41 UTC (rev 1343) @@ -28,7 +28,7 @@ <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>ode</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <dependencies> Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-epr/pom.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/bpel-epr/pom.xml 2011-03-30 14:19:38 UTC (rev 1342) +++ branches/ODE/RiftSaw-ODE-trunk/bpel-epr/pom.xml 2011-03-31 03:39:41 UTC (rev 1343) @@ -28,7 +28,7 @@ <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>ode</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <dependencies> Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-obj/pom.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/bpel-obj/pom.xml 2011-03-30 14:19:38 UTC (rev 1342) +++ branches/ODE/RiftSaw-ODE-trunk/bpel-obj/pom.xml 2011-03-31 03:39:41 UTC (rev 1343) @@ -27,7 +27,7 @@ <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>ode</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <dependencies> Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-ql/pom.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/bpel-ql/pom.xml 2011-03-30 14:19:38 UTC (rev 1342) +++ branches/ODE/RiftSaw-ODE-trunk/bpel-ql/pom.xml 2011-03-31 03:39:41 UTC (rev 1343) @@ -27,7 +27,7 @@ <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>ode</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <dependencies> Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/pom.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/pom.xml 2011-03-30 14:19:38 UTC (rev 1342) +++ branches/ODE/RiftSaw-ODE-trunk/bpel-runtime/pom.xml 2011-03-31 03:39:41 UTC (rev 1343) @@ -27,7 +27,7 @@ <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>ode</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <dependencies> Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-schemas/pom.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/bpel-schemas/pom.xml 2011-03-30 14:19:38 UTC (rev 1342) +++ branches/ODE/RiftSaw-ODE-trunk/bpel-schemas/pom.xml 2011-03-31 03:39:41 UTC (rev 1343) @@ -27,7 +27,7 @@ <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>ode</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <dependencies> Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-scripts/pom.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/bpel-scripts/pom.xml 2011-03-30 14:19:38 UTC (rev 1342) +++ branches/ODE/RiftSaw-ODE-trunk/bpel-scripts/pom.xml 2011-03-31 03:39:41 UTC (rev 1343) @@ -27,6 +27,6 @@ <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>ode</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> </project> Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-store/pom.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/bpel-store/pom.xml 2011-03-30 14:19:38 UTC (rev 1342) +++ branches/ODE/RiftSaw-ODE-trunk/bpel-store/pom.xml 2011-03-31 03:39:41 UTC (rev 1343) @@ -27,7 +27,7 @@ <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>ode</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <dependencies> Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-test/pom.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/bpel-test/pom.xml 2011-03-30 14:19:38 UTC (rev 1342) +++ branches/ODE/RiftSaw-ODE-trunk/bpel-test/pom.xml 2011-03-31 03:39:41 UTC (rev 1343) @@ -26,7 +26,7 @@ <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>ode</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <dependencies> Modified: branches/ODE/RiftSaw-ODE-trunk/dao-hibernate/pom.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/dao-hibernate/pom.xml 2011-03-30 14:19:38 UTC (rev 1342) +++ branches/ODE/RiftSaw-ODE-trunk/dao-hibernate/pom.xml 2011-03-31 03:39:41 UTC (rev 1343) @@ -27,7 +27,7 @@ <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>ode</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <dependencies> Modified: branches/ODE/RiftSaw-ODE-trunk/dao-hibernate-db/pom.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/dao-hibernate-db/pom.xml 2011-03-30 14:19:38 UTC (rev 1342) +++ branches/ODE/RiftSaw-ODE-trunk/dao-hibernate-db/pom.xml 2011-03-31 03:39:41 UTC (rev 1343) @@ -27,7 +27,7 @@ <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>ode</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <dependencies> Modified: branches/ODE/RiftSaw-ODE-trunk/dao-jpa/pom.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/dao-jpa/pom.xml 2011-03-30 14:19:38 UTC (rev 1342) +++ branches/ODE/RiftSaw-ODE-trunk/dao-jpa/pom.xml 2011-03-31 03:39:41 UTC (rev 1343) @@ -26,7 +26,7 @@ <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>ode</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <dependencies> Modified: branches/ODE/RiftSaw-ODE-trunk/dao-jpa-db/pom.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/dao-jpa-db/pom.xml 2011-03-30 14:19:38 UTC (rev 1342) +++ branches/ODE/RiftSaw-ODE-trunk/dao-jpa-db/pom.xml 2011-03-31 03:39:41 UTC (rev 1343) @@ -26,7 +26,7 @@ <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>ode</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <dependencies> Modified: branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/pom.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/pom.xml 2011-03-30 14:19:38 UTC (rev 1342) +++ branches/ODE/RiftSaw-ODE-trunk/dao-jpa-hibernate/pom.xml 2011-03-31 03:39:41 UTC (rev 1343) @@ -26,7 +26,7 @@ <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>ode</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <dependencies> Modified: branches/ODE/RiftSaw-ODE-trunk/dao-jpa-ojpa/pom.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/dao-jpa-ojpa/pom.xml 2011-03-30 14:19:38 UTC (rev 1342) +++ branches/ODE/RiftSaw-ODE-trunk/dao-jpa-ojpa/pom.xml 2011-03-31 03:39:41 UTC (rev 1343) @@ -26,7 +26,7 @@ <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>ode</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <dependencies> Modified: branches/ODE/RiftSaw-ODE-trunk/dao-jpa-ojpa-derby/pom.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/dao-jpa-ojpa-derby/pom.xml 2011-03-30 14:19:38 UTC (rev 1342) +++ branches/ODE/RiftSaw-ODE-trunk/dao-jpa-ojpa-derby/pom.xml 2011-03-31 03:39:41 UTC (rev 1343) @@ -25,7 +25,7 @@ <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>ode</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <dependencies> Modified: branches/ODE/RiftSaw-ODE-trunk/distro/pom.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/distro/pom.xml 2011-03-30 14:19:38 UTC (rev 1342) +++ branches/ODE/RiftSaw-ODE-trunk/distro/pom.xml 2011-03-31 03:39:41 UTC (rev 1343) @@ -28,7 +28,7 @@ <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>ode</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <properties> Modified: branches/ODE/RiftSaw-ODE-trunk/distro/src/examples-jbi/maven2/ping-pong-osgi/pom.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/distro/src/examples-jbi/maven2/ping-pong-osgi/pom.xml 2011-03-30 14:19:38 UTC (rev 1342) +++ branches/ODE/RiftSaw-ODE-trunk/distro/src/examples-jbi/maven2/ping-pong-osgi/pom.xml 2011-03-31 03:39:41 UTC (rev 1343) @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.soa.bpel.examples</groupId> <artifactId>ping-pong-bundle</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> <name>ODE :: examples :: Ping Pong OSGi </name> <packaging>bundle</packaging> Modified: branches/ODE/RiftSaw-ODE-trunk/jacob/pom.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/jacob/pom.xml 2011-03-30 14:19:38 UTC (rev 1342) +++ branches/ODE/RiftSaw-ODE-trunk/jacob/pom.xml 2011-03-31 03:39:41 UTC (rev 1343) @@ -27,7 +27,7 @@ <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>ode</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <dependencies> Modified: branches/ODE/RiftSaw-ODE-trunk/jbi/pom.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/jbi/pom.xml 2011-03-30 14:19:38 UTC (rev 1342) +++ branches/ODE/RiftSaw-ODE-trunk/jbi/pom.xml 2011-03-31 03:39:41 UTC (rev 1343) @@ -26,7 +26,7 @@ <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>ode</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <properties> Modified: branches/ODE/RiftSaw-ODE-trunk/jbi-bundle/pom.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/jbi-bundle/pom.xml 2011-03-30 14:19:38 UTC (rev 1342) +++ branches/ODE/RiftSaw-ODE-trunk/jbi-bundle/pom.xml 2011-03-31 03:39:41 UTC (rev 1343) @@ -32,7 +32,7 @@ <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>ode</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <build> Modified: branches/ODE/RiftSaw-ODE-trunk/jbi-karaf/pom.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/jbi-karaf/pom.xml 2011-03-30 14:19:38 UTC (rev 1342) +++ branches/ODE/RiftSaw-ODE-trunk/jbi-karaf/pom.xml 2011-03-31 03:39:41 UTC (rev 1343) @@ -22,7 +22,7 @@ <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>ode</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <artifactId>riftsaw-jbi-karaf</artifactId> Modified: branches/ODE/RiftSaw-ODE-trunk/jca-ra/pom.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/jca-ra/pom.xml 2011-03-30 14:19:38 UTC (rev 1342) +++ branches/ODE/RiftSaw-ODE-trunk/jca-ra/pom.xml 2011-03-31 03:39:41 UTC (rev 1343) @@ -27,7 +27,7 @@ <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>ode</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <dependencies> Modified: branches/ODE/RiftSaw-ODE-trunk/jca-server/pom.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/jca-server/pom.xml 2011-03-30 14:19:38 UTC (rev 1342) +++ branches/ODE/RiftSaw-ODE-trunk/jca-server/pom.xml 2011-03-31 03:39:41 UTC (rev 1343) @@ -27,7 +27,7 @@ <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>ode</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <dependencies> Modified: branches/ODE/RiftSaw-ODE-trunk/pom.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/pom.xml 2011-03-30 14:19:38 UTC (rev 1342) +++ branches/ODE/RiftSaw-ODE-trunk/pom.xml 2011-03-31 03:39:41 UTC (rev 1343) @@ -8,7 +8,7 @@ </description> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> <url>http://ode.apache.org</url> <issueManagement> <system>jira</system> @@ -82,7 +82,7 @@ </prerequisites> --> <properties> - <ode.version>2.3.0.CR1</ode.version> + <ode.version>2.3.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/RiftSaw-ODE-trunk/scheduler-simple/pom.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/scheduler-simple/pom.xml 2011-03-30 14:19:38 UTC (rev 1342) +++ branches/ODE/RiftSaw-ODE-trunk/scheduler-simple/pom.xml 2011-03-31 03:39:41 UTC (rev 1343) @@ -26,7 +26,7 @@ <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>ode</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <dependencies> Modified: branches/ODE/RiftSaw-ODE-trunk/tools/pom.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/tools/pom.xml 2011-03-30 14:19:38 UTC (rev 1342) +++ branches/ODE/RiftSaw-ODE-trunk/tools/pom.xml 2011-03-31 03:39:41 UTC (rev 1343) @@ -27,7 +27,7 @@ <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>ode</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <dependencies> Modified: branches/ODE/RiftSaw-ODE-trunk/utils/pom.xml =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/utils/pom.xml 2011-03-30 14:19:38 UTC (rev 1342) +++ branches/ODE/RiftSaw-ODE-trunk/utils/pom.xml 2011-03-31 03:39:41 UTC (rev 1343) @@ -28,7 +28,7 @@ <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>ode</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <dependencies>

13 years, 8 months

1
0
0 / 0

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

by riftsaw-commits＠lists.jboss.org

Author: objectiser Date: 2011-03-30 10:19:38 -0400 (Wed, 30 Mar 2011) New Revision: 1342 Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java Log: RIFTSAW-325 - support dynamic assignment of EPR to partnerlink. Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java =================================================================== --- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java 2011-03-30 13:53:09 UTC (rev 1341) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java 2011-03-30 14:19:38 UTC (rev 1342) @@ -247,8 +247,32 @@ log.debug("Riftsaw soap request message: \n" + JavaUtils.getSoapMessageASString(soapRequestMessage)); } + org.apache.ode.bpel.iapi.EndpointReference odeepr=mex.getEndpointReference(); + javax.xml.ws.EndpointReference epr=null; + + if (odeepr != null) { + if (odeepr instanceof org.apache.ode.bpel.epr.URLEndpoint) { + org.apache.ode.bpel.epr.URLEndpoint url=(org.apache.ode.bpel.epr.URLEndpoint)odeepr; + + javax.xml.ws.wsaddressing.W3CEndpointReferenceBuilder builder= + new javax.xml.ws.wsaddressing.W3CEndpointReferenceBuilder(); + + epr = builder.address(url.getUrl()) + .serviceName(serviceName) + .endpointName(port) + .build(); + + if (log.isDebugEnabled()) { + log.debug("EPR = " + epr); + } + } + + } else if (log.isDebugEnabled()) { + log.debug("ODE has no EPR for this message exchange"); + } + // The actual WS invocation - Dispatch<SOAPMessage> proxy = getDispatcher(port); + Dispatch<SOAPMessage> proxy = getDispatcher(epr, port); try { // Set SOAPAction @@ -349,8 +373,32 @@ log.debug("Riftsaw soap request message: \n" + JavaUtils.getSoapMessageASString(soapRequestMessage)); } + org.apache.ode.bpel.iapi.EndpointReference odeepr=mex.getEndpointReference(); + javax.xml.ws.EndpointReference epr=null; + + if (odeepr != null) { + if (odeepr instanceof org.apache.ode.bpel.epr.URLEndpoint) { + org.apache.ode.bpel.epr.URLEndpoint url=(org.apache.ode.bpel.epr.URLEndpoint)odeepr; + + javax.xml.ws.wsaddressing.W3CEndpointReferenceBuilder builder= + new javax.xml.ws.wsaddressing.W3CEndpointReferenceBuilder(); + + epr = builder.address(url.getUrl()) + .serviceName(serviceName) + .endpointName(port) + .build(); + + if (log.isDebugEnabled()) { + log.debug("EPR = " + epr); + } + } + + } else if (log.isDebugEnabled()) { + log.debug("ODE has no EPR for this message exchange"); + } + // The actual WS invocation - Dispatch proxy = getDispatcher(port); + Dispatch proxy = getDispatcher(epr, port); proxy.invokeOneWay(soapRequestMessage); } @@ -407,7 +455,7 @@ throw new RuntimeException("Not implemented. Should be removed form interface"); } - private synchronized Dispatch<SOAPMessage> getDispatcher(QName portName) + private synchronized Dispatch<SOAPMessage> getDispatcher(javax.xml.ws.EndpointReference epr, QName portName) { if(null==dispatcher) { @@ -416,12 +464,22 @@ JAXWSInitializer initializer=initializeStack(portName); Service service = Service.create(this.wsdlUrl, serviceName); - dispatcher = service.createDispatch( - portName, - SOAPMessage.class, - Service.Mode.MESSAGE - ); + if (epr != null) { + dispatcher = service.createDispatch( + epr, + SOAPMessage.class, + Service.Mode.MESSAGE, + new javax.xml.ws.soap.AddressingFeature() + ); + } else { + dispatcher = service.createDispatch( + portName, + SOAPMessage.class, + Service.Mode.MESSAGE + ); + } + if (initializer != null) { initializer.serviceCreated(); }

13 years, 9 months

1
0
0 / 0

riftsaw SVN: r1341 - branches/ODE/RiftSaw-ODE-trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr.

by riftsaw-commits＠lists.jboss.org

Author: objectiser Date: 2011-03-30 09:53:09 -0400 (Wed, 30 Mar 2011) New Revision: 1341 Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/EndpointFactory.java Log: Minor change in support of RIFTSAW-325, to prevent many unnecessary warning messages being placed in the log. Modified: branches/ODE/RiftSaw-ODE-trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/EndpointFactory.java =================================================================== --- branches/ODE/RiftSaw-ODE-trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/EndpointFactory.java 2011-03-30 01:31:55 UTC (rev 1340) +++ branches/ODE/RiftSaw-ODE-trunk/bpel-epr/src/main/java/org/apache/ode/bpel/epr/EndpointFactory.java 2011-03-30 13:53:09 UTC (rev 1341) @@ -72,7 +72,11 @@ return se; } } - __log.warn("Couldnt create any endpoint for element " + DOMUtils.domToString(endpointElmt)); + if (__log.isDebugEnabled()) { + // Only appears relevant if EPR explicitly set for partner link, so + // returns null if using default EPR from WSDL. + __log.debug("Couldnt create any endpoint for element " + DOMUtils.domToString(endpointElmt)); + } return null; }

13 years, 9 months

1
0
0 / 0

riftsaw SVN: r1340 - in trunk: console and 24 other directories.

by riftsaw-commits＠lists.jboss.org

Author: jeff.yuchang Date: 2011-03-29 21:31:55 -0400 (Tue, 29 Mar 2011) New Revision: 1340 Modified: trunk/console/bpaf/pom.xml trunk/console/bpel2svg/pom.xml trunk/console/identity/pom.xml trunk/console/integration/pom.xml trunk/console/pom.xml trunk/distribution/pom.xml trunk/docs/docbook/gettingstartedguide/pom.xml trunk/docs/docbook/gettingstartedguide/src/main/en-US/master.xml trunk/docs/docbook/pom.xml trunk/docs/docbook/userguide/pom.xml trunk/docs/docbook/userguide/src/main/en-US/master.xml trunk/integration-tests/pom.xml trunk/pom.xml trunk/qa/build.xml trunk/qa/hudson-riftsaw-db.sh trunk/qa/hudson-riftsaw-jboss-as6.sh trunk/qa/hudson-riftsaw-jboss-no-esb.sh trunk/qa/hudson-riftsaw-jboss.sh trunk/qa/hudson-riftsaw-local-as6.sh trunk/qa/hudson-riftsaw-local.sh trunk/qa/hudson-riftsaw-soa-p.sh trunk/qa/hudson-riftsaw-ws.sh trunk/runtime/clustering/pom.xml trunk/runtime/deployer-as5/pom.xml trunk/runtime/deployer-as6/pom.xml trunk/runtime/deployer/pom.xml trunk/runtime/engine-assembly/pom.xml trunk/runtime/engine/pom.xml trunk/runtime/jbossesb-bpel-assembly/pom.xml trunk/runtime/jbossesb-bpel/pom.xml trunk/runtime/pom.xml trunk/runtime/uddi/pom.xml trunk/samples/esb/bpel_helloworld_saml/esbcontent/login-config.xml trunk/stress-tests/pom.xml Log: * update the version back to 2.3.0-SNAPSHOT. Modified: trunk/console/bpaf/pom.xml =================================================================== --- trunk/console/bpaf/pom.xml 2011-03-29 14:23:21 UTC (rev 1339) +++ trunk/console/bpaf/pom.xml 2011-03-30 01:31:55 UTC (rev 1340) @@ -5,13 +5,13 @@ <groupId>org.jboss.soa.bpel.console</groupId> <artifactId>bpaf</artifactId> <packaging>jar</packaging> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> <name>RiftSaw::Console::BPAF</name> <parent> <groupId>org.jboss.soa.bpel.console</groupId> <artifactId>parent</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent>  Modified: trunk/console/bpel2svg/pom.xml =================================================================== --- trunk/console/bpel2svg/pom.xml 2011-03-29 14:23:21 UTC (rev 1339) +++ trunk/console/bpel2svg/pom.xml 2011-03-30 01:31:55 UTC (rev 1340) @@ -4,13 +4,13 @@ <groupId>org.jboss.soa.bpel.console</groupId> <artifactId>bpel2svg</artifactId> <packaging>jar</packaging> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> <name>RiftSaw::Console::BPEL2SVG</name> <parent> <groupId>org.jboss.soa.bpel.console</groupId> <artifactId>parent</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <dependencies> Modified: trunk/console/identity/pom.xml =================================================================== --- trunk/console/identity/pom.xml 2011-03-29 14:23:21 UTC (rev 1339) +++ trunk/console/identity/pom.xml 2011-03-30 01:31:55 UTC (rev 1340) @@ -5,13 +5,13 @@ <groupId>org.jboss.soa.bpel.console</groupId> <artifactId>identity</artifactId> <packaging>jar</packaging> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> <name>RiftSaw::Console::Identity</name> <parent> <groupId>org.jboss.soa.bpel.console</groupId> <artifactId>parent</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <build> Modified: trunk/console/integration/pom.xml =================================================================== --- trunk/console/integration/pom.xml 2011-03-29 14:23:21 UTC (rev 1339) +++ trunk/console/integration/pom.xml 2011-03-30 01:31:55 UTC (rev 1340) @@ -5,13 +5,13 @@ <groupId>org.jboss.soa.bpel.console</groupId> <artifactId>integration</artifactId> <packaging>jar</packaging> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> <name>RiftSaw::Console::Integration</name> <parent> <groupId>org.jboss.soa.bpel.console</groupId> <artifactId>parent</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent>  Modified: trunk/console/pom.xml =================================================================== --- trunk/console/pom.xml 2011-03-29 14:23:21 UTC (rev 1339) +++ trunk/console/pom.xml 2011-03-30 01:31:55 UTC (rev 1340) @@ -6,13 +6,13 @@ <groupId>org.jboss.soa.bpel.console</groupId> <artifactId>parent</artifactId> <packaging>pom</packaging> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> <name>RiftSaw::Console</name> <parent> <groupId>org.jboss.soa</groupId> <artifactId>bpel</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <modules> Modified: trunk/distribution/pom.xml =================================================================== --- trunk/distribution/pom.xml 2011-03-29 14:23:21 UTC (rev 1339) +++ trunk/distribution/pom.xml 2011-03-30 01:31:55 UTC (rev 1340) @@ -24,12 +24,12 @@ <artifactId>distribution</artifactId> <packaging>pom</packaging> <name>RiftSaw::Distribution</name> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> <parent> <groupId>org.jboss.soa</groupId> <artifactId>bpel</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: trunk/docs/docbook/gettingstartedguide/pom.xml =================================================================== --- trunk/docs/docbook/gettingstartedguide/pom.xml 2011-03-29 14:23:21 UTC (rev 1339) +++ trunk/docs/docbook/gettingstartedguide/pom.xml 2011-03-30 01:31:55 UTC (rev 1340) @@ -7,14 +7,14 @@ <groupId>org.jboss.soa.bpel.docs</groupId> <artifactId>gettingstartedguide</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> <packaging>jdocbook</packaging> <name>RiftSaw::Docs::gettingstartedguide</name> <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>docs</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> Modified: trunk/docs/docbook/gettingstartedguide/src/main/en-US/master.xml =================================================================== --- trunk/docs/docbook/gettingstartedguide/src/main/en-US/master.xml 2011-03-29 14:23:21 UTC (rev 1339) +++ trunk/docs/docbook/gettingstartedguide/src/main/en-US/master.xml 2011-03-30 01:31:55 UTC (rev 1340) @@ -5,7 +5,7 @@ <book lang="en"> <bookinfo> - <title>RiftSaw 2.3.0.CR1</title> + <title>RiftSaw 2.3.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: trunk/docs/docbook/pom.xml =================================================================== --- trunk/docs/docbook/pom.xml 2011-03-29 14:23:21 UTC (rev 1339) +++ trunk/docs/docbook/pom.xml 2011-03-30 01:31:55 UTC (rev 1340) @@ -7,14 +7,14 @@ <groupId>org.jboss.soa.bpel</groupId> <artifactId>docs</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> <packaging>pom</packaging> <name>RiftSaw::Docs</name> <parent> <groupId>org.jboss.soa</groupId> <artifactId>bpel</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: trunk/docs/docbook/userguide/pom.xml =================================================================== --- trunk/docs/docbook/userguide/pom.xml 2011-03-29 14:23:21 UTC (rev 1339) +++ trunk/docs/docbook/userguide/pom.xml 2011-03-30 01:31:55 UTC (rev 1340) @@ -7,14 +7,14 @@ <groupId>org.jboss.soa.bpel.docs</groupId> <artifactId>userguide</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> <packaging>jdocbook</packaging> <name>RiftSaw::Docs::userguide</name> <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>docs</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> Modified: trunk/docs/docbook/userguide/src/main/en-US/master.xml =================================================================== --- trunk/docs/docbook/userguide/src/main/en-US/master.xml 2011-03-29 14:23:21 UTC (rev 1339) +++ trunk/docs/docbook/userguide/src/main/en-US/master.xml 2011-03-30 01:31:55 UTC (rev 1340) @@ -5,7 +5,7 @@ <book lang="en"> <bookinfo> - <title>RiftSaw 2.3.0.CR1</title> + <title>RiftSaw 2.3.0-SNAPSHOT</title> <subtitle>User Guide</subtitle> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module/author_group.xml"/> </bookinfo> Modified: trunk/integration-tests/pom.xml =================================================================== --- trunk/integration-tests/pom.xml 2011-03-29 14:23:21 UTC (rev 1339) +++ trunk/integration-tests/pom.xml 2011-03-30 01:31:55 UTC (rev 1340) @@ -5,12 +5,12 @@ <groupId>org.jboss.soa.bpel</groupId> <artifactId>integration-tests</artifactId> <packaging>pom</packaging> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> <name>RiftSaw::Integration-Tests</name> <parent> <groupId>org.jboss.soa</groupId> <artifactId>bpel</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <properties> <jboss.jbosssx.version>2.0.2.SP3</jboss.jbosssx.version> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-03-29 14:23:21 UTC (rev 1339) +++ trunk/pom.xml 2011-03-30 01:31:55 UTC (rev 1340) @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.soa</groupId> <artifactId>bpel</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> <packaging>pom</packaging> <name>RiftSaw</name> <url>http://www.jboss.org/riftsaw</url> @@ -86,8 +86,8 @@ <properties> <riftsaw.ode.version>2.3.0.CR1</riftsaw.ode.version> - <riftsaw.engine.version>2.3.0.CR1</riftsaw.engine.version> - <bpel.console.version>2.2.4.Final</bpel.console.version> + <riftsaw.engine.version>2.3.0-SNAPSHOT</riftsaw.engine.version> + <bpel.console.version>2.2.5-SNAPSHOT</bpel.console.version> <activity.monitor.model.version>1.0.0.CR1</activity.monitor.model.version> <dsp.version>1.0.0.Final</dsp.version> <commons.logging.version>1.1.1</commons.logging.version> @@ -502,8 +502,8 @@ </repository> <repository> - <id>riftsaw-ode-2.3.0.CR1</id> - <name>JBoss RiftSaw 2.3.0.CR1</name> + <id>riftsaw-ode-2.3.0-SNAPSHOT</id> + <name>JBoss RiftSaw 2.3.0-SNAPSHOT</name> <url>https://repository.jboss.org/nexus/content/repositories/jboss_release_sta...</url> </repository> Modified: trunk/qa/build.xml =================================================================== --- trunk/qa/build.xml 2011-03-29 14:23:21 UTC (rev 1339) +++ trunk/qa/build.xml 2011-03-30 01:31:55 UTC (rev 1340) @@ -9,7 +9,7 @@  <property name="database" value="hsql" /> - <property name="riftsaw.version" value="2.3.0.CR1" /> + <property name="riftsaw.version" value="2.3.0-SNAPSHOT" /> <property name="riftsaw.home" value="${riftsaw.parent.dir}/riftsaw-${riftsaw.version}" />  <property name="jboss.parent.dir" value="${riftsaw.home}" /> Modified: trunk/qa/hudson-riftsaw-db.sh =================================================================== --- trunk/qa/hudson-riftsaw-db.sh 2011-03-29 14:23:21 UTC (rev 1339) +++ trunk/qa/hudson-riftsaw-db.sh 2011-03-30 01:31:55 UTC (rev 1340) @@ -8,7 +8,7 @@ DOWNLOAD_DIR="$RIFTSAW_PARENT_DIR/downloads" JBOSS_VERSION="5.1.0.GA" -RIFTSAW_VERSION="2.3.0.CR1" +RIFTSAW_VERSION="2.3.0-SNAPSHOT" AS_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-$JBOSS_VERSION" AS_CONFIG="default" REPLACE_QA_JDBC="true" Modified: trunk/qa/hudson-riftsaw-jboss-as6.sh =================================================================== --- trunk/qa/hudson-riftsaw-jboss-as6.sh 2011-03-29 14:23:21 UTC (rev 1339) +++ trunk/qa/hudson-riftsaw-jboss-as6.sh 2011-03-30 01:31:55 UTC (rev 1340) @@ -8,7 +8,7 @@ DOWNLOAD_DIR="$RIFTSAW_PARENT_DIR/downloads" JBOSS_VERSION="6.0.0.Final" -RIFTSAW_VERSION="2.3.0.CR1" +RIFTSAW_VERSION="2.3.0-SNAPSHOT" AS_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-$JBOSS_VERSION" AS_CONFIG="default" REPLACE_QA_JDBC="true" Modified: trunk/qa/hudson-riftsaw-jboss-no-esb.sh =================================================================== --- trunk/qa/hudson-riftsaw-jboss-no-esb.sh 2011-03-29 14:23:21 UTC (rev 1339) +++ trunk/qa/hudson-riftsaw-jboss-no-esb.sh 2011-03-30 01:31:55 UTC (rev 1340) @@ -8,7 +8,7 @@ DOWNLOAD_DIR="$RIFTSAW_PARENT_DIR/downloads" JBOSS_VERSION="5.1.0.GA" -RIFTSAW_VERSION="2.3.0.CR1" +RIFTSAW_VERSION="2.3.0-SNAPSHOT" AS_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-$JBOSS_VERSION" AS_CONFIG="default" REPLACE_QA_JDBC="true" Modified: trunk/qa/hudson-riftsaw-jboss.sh =================================================================== --- trunk/qa/hudson-riftsaw-jboss.sh 2011-03-29 14:23:21 UTC (rev 1339) +++ trunk/qa/hudson-riftsaw-jboss.sh 2011-03-30 01:31:55 UTC (rev 1340) @@ -8,7 +8,7 @@ DOWNLOAD_DIR="$RIFTSAW_PARENT_DIR/downloads" JBOSS_VERSION="5.1.0.GA" -RIFTSAW_VERSION="2.3.0.CR1" +RIFTSAW_VERSION="2.3.0-SNAPSHOT" AS_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-$JBOSS_VERSION" REPLACE_QA_JDBC="true" JBOSS_ESB_VERSION="4.9" Modified: trunk/qa/hudson-riftsaw-local-as6.sh =================================================================== --- trunk/qa/hudson-riftsaw-local-as6.sh 2011-03-29 14:23:21 UTC (rev 1339) +++ trunk/qa/hudson-riftsaw-local-as6.sh 2011-03-30 01:31:55 UTC (rev 1340) @@ -8,7 +8,7 @@ DOWNLOAD_DIR="$RIFTSAW_PARENT_DIR/downloads" JBOSS_VERSION="6.0.0.Final" -RIFTSAW_VERSION="2.3.0.CR1" +RIFTSAW_VERSION="2.3.0-SNAPSHOT" AS_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-$JBOSS_VERSION" AS_CONFIG="default" REPLACE_QA_JDBC="true" Modified: trunk/qa/hudson-riftsaw-local.sh =================================================================== --- trunk/qa/hudson-riftsaw-local.sh 2011-03-29 14:23:21 UTC (rev 1339) +++ trunk/qa/hudson-riftsaw-local.sh 2011-03-30 01:31:55 UTC (rev 1340) @@ -8,7 +8,7 @@ DOWNLOAD_DIR="$RIFTSAW_PARENT_DIR/downloads" JBOSS_VERSION="5.1.0.GA" -RIFTSAW_VERSION="2.3.0.CR1" +RIFTSAW_VERSION="2.3.0-SNAPSHOT" AS_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-$JBOSS_VERSION" AS_CONFIG="default" REPLACE_QA_JDBC="true" Modified: trunk/qa/hudson-riftsaw-soa-p.sh =================================================================== --- trunk/qa/hudson-riftsaw-soa-p.sh 2011-03-29 14:23:21 UTC (rev 1339) +++ trunk/qa/hudson-riftsaw-soa-p.sh 2011-03-30 01:31:55 UTC (rev 1340) @@ -10,7 +10,7 @@ DATABASE="hsql" -RIFTSAW_VERSION="2.3.0.CR1" +RIFTSAW_VERSION="2.3.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: trunk/qa/hudson-riftsaw-ws.sh =================================================================== --- trunk/qa/hudson-riftsaw-ws.sh 2011-03-29 14:23:21 UTC (rev 1339) +++ trunk/qa/hudson-riftsaw-ws.sh 2011-03-30 01:31:55 UTC (rev 1340) @@ -9,7 +9,7 @@ JBOSS_VERSION="5.1.0.GA" DATABASE="hsql" -RIFTSAW_VERSION="2.3.0.CR1" +RIFTSAW_VERSION="2.3.0-SNAPSHOT" AS_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-$JBOSS_VERSION" AS_CONFIG="default" WS_STACK_DIR="$RIFTSAW_PARENT_DIR/downloads" Modified: trunk/runtime/clustering/pom.xml =================================================================== --- trunk/runtime/clustering/pom.xml 2011-03-29 14:23:21 UTC (rev 1339) +++ trunk/runtime/clustering/pom.xml 2011-03-30 01:31:55 UTC (rev 1340) @@ -5,13 +5,13 @@ <groupId>org.jboss.soa.bpel.runtime</groupId> <artifactId>riftsaw-clustering</artifactId> <packaging>jar</packaging> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> <name>RiftSaw::Runtime::Clustering</name> <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>runtime</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <properties> Modified: trunk/runtime/deployer/pom.xml =================================================================== --- trunk/runtime/deployer/pom.xml 2011-03-29 14:23:21 UTC (rev 1339) +++ trunk/runtime/deployer/pom.xml 2011-03-30 01:31:55 UTC (rev 1340) @@ -5,13 +5,13 @@ <groupId>org.jboss.soa.bpel.runtime</groupId> <artifactId>deployer</artifactId> <packaging>jar</packaging> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> <name>RiftSaw::Runtime::Deployer</name> <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>runtime</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <dependencies> Modified: trunk/runtime/deployer-as5/pom.xml =================================================================== --- trunk/runtime/deployer-as5/pom.xml 2011-03-29 14:23:21 UTC (rev 1339) +++ trunk/runtime/deployer-as5/pom.xml 2011-03-30 01:31:55 UTC (rev 1340) @@ -5,13 +5,13 @@ <groupId>org.jboss.soa.bpel.runtime</groupId> <artifactId>deployer-as5</artifactId> <packaging>jar</packaging> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> <name>RiftSaw::Runtime::Deployer-AS5</name> <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>runtime</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <dependencies> Modified: trunk/runtime/deployer-as6/pom.xml =================================================================== --- trunk/runtime/deployer-as6/pom.xml 2011-03-29 14:23:21 UTC (rev 1339) +++ trunk/runtime/deployer-as6/pom.xml 2011-03-30 01:31:55 UTC (rev 1340) @@ -5,13 +5,13 @@ <groupId>org.jboss.soa.bpel.runtime</groupId> <artifactId>deployer-as6</artifactId> <packaging>jar</packaging> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> <name>RiftSaw::Runtime::Deployer-AS6</name> <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>runtime</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <dependencies> Modified: trunk/runtime/engine/pom.xml =================================================================== --- trunk/runtime/engine/pom.xml 2011-03-29 14:23:21 UTC (rev 1339) +++ trunk/runtime/engine/pom.xml 2011-03-30 01:31:55 UTC (rev 1340) @@ -5,13 +5,13 @@ <groupId>org.jboss.soa.bpel.runtime</groupId> <artifactId>riftsaw-engine</artifactId> <packaging>jar</packaging> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> <name>RiftSaw::Runtime::Engine</name> <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>runtime</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <dependencies> Modified: trunk/runtime/engine-assembly/pom.xml =================================================================== --- trunk/runtime/engine-assembly/pom.xml 2011-03-29 14:23:21 UTC (rev 1339) +++ trunk/runtime/engine-assembly/pom.xml 2011-03-30 01:31:55 UTC (rev 1340) @@ -4,14 +4,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.soa.bpel.runtime</groupId> <artifactId>riftsaw</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> <packaging>pom</packaging> <name>RiftSaw::Runtime::Engine-Assembly</name> <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>runtime</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <dependencies> Modified: trunk/runtime/jbossesb-bpel/pom.xml =================================================================== --- trunk/runtime/jbossesb-bpel/pom.xml 2011-03-29 14:23:21 UTC (rev 1339) +++ trunk/runtime/jbossesb-bpel/pom.xml 2011-03-30 01:31:55 UTC (rev 1340) @@ -5,13 +5,13 @@ <groupId>org.jboss.soa.bpel.runtime</groupId> <artifactId>jbossesb-bpel</artifactId> <packaging>jar</packaging> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> <name>RiftSaw::Runtime::JBossESB-BPEL</name> <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>runtime</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <dependencies> Modified: trunk/runtime/jbossesb-bpel-assembly/pom.xml =================================================================== --- trunk/runtime/jbossesb-bpel-assembly/pom.xml 2011-03-29 14:23:21 UTC (rev 1339) +++ trunk/runtime/jbossesb-bpel-assembly/pom.xml 2011-03-30 01:31:55 UTC (rev 1340) @@ -4,13 +4,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.soa.bpel.runtime</groupId> <artifactId>bpel.esb</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.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.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <dependencies> Modified: trunk/runtime/pom.xml =================================================================== --- trunk/runtime/pom.xml 2011-03-29 14:23:21 UTC (rev 1339) +++ trunk/runtime/pom.xml 2011-03-30 01:31:55 UTC (rev 1340) @@ -6,13 +6,13 @@ <groupId>org.jboss.soa.bpel</groupId> <artifactId>runtime</artifactId> <packaging>pom</packaging> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> <name>RiftSaw::Runtime</name> <parent> <groupId>org.jboss.soa</groupId> <artifactId>bpel</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <modules> Modified: trunk/runtime/uddi/pom.xml =================================================================== --- trunk/runtime/uddi/pom.xml 2011-03-29 14:23:21 UTC (rev 1339) +++ trunk/runtime/uddi/pom.xml 2011-03-30 01:31:55 UTC (rev 1340) @@ -5,13 +5,13 @@ <groupId>org.jboss.soa.bpel.runtime</groupId> <artifactId>riftsaw-uddi</artifactId> <packaging>jar</packaging> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> <name>RiftSaw::Runtime::UDDI</name> <parent> <groupId>org.jboss.soa.bpel</groupId> <artifactId>runtime</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <dependencies> Modified: trunk/samples/esb/bpel_helloworld_saml/esbcontent/login-config.xml =================================================================== --- trunk/samples/esb/bpel_helloworld_saml/esbcontent/login-config.xml 2011-03-29 14:23:21 UTC (rev 1339) +++ trunk/samples/esb/bpel_helloworld_saml/esbcontent/login-config.xml 2011-03-30 01:31:55 UTC (rev 1340) @@ -2,12 +2,12 @@ <application-policy name="saml-issue-token"> <authentication> <login-module code="org.picketlink.identity.federation.core.wstrust.auth.STSIssuingLoginModule" flag="required"> - <module-option name="configFile">/Users/jdelong/Riftsaw22/riftsaw-2.3.0.CR1/samples/esb/bpel_helloworld_saml/esbcontent/sts-client.properties</module-option> + <module-option name="configFile">/Users/jdelong/Riftsaw22/riftsaw-2.3.0-SNAPSHOT/samples/esb/bpel_helloworld_saml/esbcontent/sts-client.properties</module-option> <module-option name="endpointURI">http://security_saml/goodbyeworld</module-option> <module-option name="password-stacking">true</module-option> </login-module> <login-module code="org.picketlink.identity.federation.core.wstrust.auth.STSValidatingLoginModule" flag="required"> - <module-option name="configFile">/Users/jdelong/Riftsaw22/riftsaw-2.3.0.CR1/samples/esb/bpel_helloworld_saml/esbcontent/sts-client.properties</module-option> + <module-option name="configFile">/Users/jdelong/Riftsaw22/riftsaw-2.3.0-SNAPSHOT/samples/esb/bpel_helloworld_saml/esbcontent/sts-client.properties</module-option> <module-option name="password-stacking">useFirstPass</module-option> </login-module> </authentication> @@ -16,7 +16,7 @@ <application-policy name="saml-validate-token"> <authentication> <login-module code="org.picketlink.identity.federation.core.wstrust.auth.STSValidatingLoginModule" flag="required"> - <module-option name="configFile">/Users/jdelong/Riftsaw22/riftsaw-2.3.0.CR1/samples/esb/bpel_helloworld_saml/esbcontent/sts-client.properties</module-option> + <module-option name="configFile">/Users/jdelong/Riftsaw22/riftsaw-2.3.0-SNAPSHOT/samples/esb/bpel_helloworld_saml/esbcontent/sts-client.properties</module-option> <module-option name="useOptionsCredentials">true</module-option> </login-module> </authentication> Modified: trunk/stress-tests/pom.xml =================================================================== --- trunk/stress-tests/pom.xml 2011-03-29 14:23:21 UTC (rev 1339) +++ trunk/stress-tests/pom.xml 2011-03-30 01:31:55 UTC (rev 1340) @@ -5,12 +5,12 @@ <groupId>org.jboss.soa.bpel</groupId> <artifactId>stress-tests</artifactId> <packaging>jar</packaging> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> <name>RiftSaw::Stress-Tests</name> <parent> <groupId>org.jboss.soa</groupId> <artifactId>bpel</artifactId> - <version>2.3.0.CR1</version> + <version>2.3.0-SNAPSHOT</version> </parent> <profiles>

13 years, 9 months

1
0
0 / 0

riftsaw SVN: r1339 - trunk.

by riftsaw-commits＠lists.jboss.org

Author: objectiser Date: 2011-03-29 10:23:21 -0400 (Tue, 29 Mar 2011) New Revision: 1339 Modified: trunk/pom.xml Log: RIFTSAW-366 Set DSP version to 1.0.0.Final Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-03-29 13:57:53 UTC (rev 1338) +++ trunk/pom.xml 2011-03-29 14:23:21 UTC (rev 1339) @@ -89,7 +89,7 @@ <riftsaw.engine.version>2.3.0.CR1</riftsaw.engine.version> <bpel.console.version>2.2.4.Final</bpel.console.version> <activity.monitor.model.version>1.0.0.CR1</activity.monitor.model.version> - <dsp.version>1.0.0.CR2</dsp.version> + <dsp.version>1.0.0.Final</dsp.version> <commons.logging.version>1.1.1</commons.logging.version> <commons.lang.version>2.4</commons.lang.version> <junit.version>4.8.1</junit.version>

13 years, 9 months

1
0
0 / 0

riftsaw SVN: r1338 - trunk/distribution/src/main/release/bin.

by riftsaw-commits＠lists.jboss.org

Author: objectiser Date: 2011-03-29 09:57:53 -0400 (Tue, 29 Mar 2011) New Revision: 1338 Modified: trunk/distribution/src/main/release/bin/bpelc.bat trunk/distribution/src/main/release/bin/sendsoap.bat Log: RIFTSAW-362 - update classpath in the windows scripts to reference the jbossas installation. Modified: trunk/distribution/src/main/release/bin/bpelc.bat =================================================================== --- trunk/distribution/src/main/release/bin/bpelc.bat 2011-03-29 13:06:48 UTC (rev 1337) +++ trunk/distribution/src/main/release/bin/bpelc.bat 2011-03-29 13:57:53 UTC (rev 1338) @@ -1,81 +1,90 @@ -@echo off -rem -rem Licensed to the Apache Software Foundation (ASF) under one or more -rem contributor license agreements. See the NOTICE file distributed with -rem this work for additional information regarding copyright ownership. -rem The ASF licenses this file to You under the Apache License, Version 2.0 -rem (the "License"); you may not use this file except in compliance with -rem the License. You may obtain a copy of the License at -rem -rem http://www.apache.org/licenses/LICENSE-2.0 -rem -rem Unless required by applicable law or agreed to in writing, software -rem distributed under the License is distributed on an "AS IS" BASIS, -rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -rem See the License for the specific language governing permissions and -rem limitations under the License. -rem - -if not "%OS%"=="Windows_NT" goto wrongOS - -@setlocal - -set command=%0 -set progname=%~n0 - -set ODE_HOME=%~dp0.. -set ODE_BIN=%~dp0..\bin -set ODE_LIB=%~dp0..\lib -set ODE_ETC=%~dp0..\etc - -if "%JBOSS_HOME%"=="" goto noJBossHome - -set LIB1=%ODE_HOME%/modules/riftsaw.sar/lib -set LIB2=%ODE_HOME%/lib -set LIB3=%JBOSS_HOME%/client - -if "%JAVA_HOME%"=="" goto noJavaHome -if not exist "%JAVA_HOME%"\bin\java.exe goto noJava - -set JAVACMD="%JAVA_HOME%\bin\java.exe" - -set LOCALCLASSPATH=%ODE_CLASSPATH%;%ODE_LIB% -FOR %%c in (%LIB1%\*.jar) DO (call :append_cp %%c) -FOR %%c in (%LIB2%\*.jar) DO (call :append_cp %%c) -rem FOR %%c in (%LIB3%\*.jar) DO (call :append_cp %%c) -call :append_cp %LIB3%\log4j.jar -call :append_cp %LIB3%\commons-logging.jar - -%JAVACMD% %ODE_JAVAOPTS% -cp "%LOCALCLASSPATH%" org.apache.ode.tools.bpelc.cline.BpelC %* -goto end - -:append_cp -set LOCALCLASSPATH=%LOCALCLASSPATH%;%1 -goto end - -===================================================================== - ERRORS -===================================================================== - - -:wrongOS -echo ERROR: ODE requires WindowsNT/XP. Aborting. -goto end - -:noJavaHome -echo ERROR: JAVA_HOME not set! Aborting. -goto end - -:noJBossHome -echo ERROR: JBOSS_HOME not set! Please set this to the location of the JBossAS installation. -goto end - -:noJava -echo ERROR: The Java VM (java.exe) was not found in %JAVA_HOME%\bin! Aborting -goto end - -REM ================================================================ -REM END -REM ================================================================ -:end -@endlocal +@echo off +rem +rem Licensed to the Apache Software Foundation (ASF) under one or more +rem contributor license agreements. See the NOTICE file distributed with +rem this work for additional information regarding copyright ownership. +rem The ASF licenses this file to You under the Apache License, Version 2.0 +rem (the "License"); you may not use this file except in compliance with +rem the License. You may obtain a copy of the License at +rem +rem http://www.apache.org/licenses/LICENSE-2.0 +rem +rem Unless required by applicable law or agreed to in writing, software +rem distributed under the License is distributed on an "AS IS" BASIS, +rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +rem See the License for the specific language governing permissions and +rem limitations under the License. +rem + +if not "%OS%"=="Windows_NT" goto wrongOS + +@setlocal + +set command=%0 +set progname=%~n0 + +set ODE_HOME=%~dp0.. +set ODE_BIN=%~dp0..\bin +set ODE_LIB=%~dp0..\lib +set ODE_ETC=%~dp0..\etc + +if "%JBOSS_HOME%"=="" goto noJBossHome + +set LIB1=%ODE_HOME%/modules/riftsaw.sar/lib +set LIB2=%ODE_HOME%/lib +set LIB3=%JBOSS_HOME%/client +set LIB4=%JBOSS_HOME%/lib/endorsed +set LIB5=%JBOSS_HOME%/common/lib + +if "%JAVA_HOME%"=="" goto noJavaHome +if not exist "%JAVA_HOME%"\bin\java.exe goto noJava + +set JAVACMD="%JAVA_HOME%\bin\java.exe" + +set LOCALCLASSPATH=%ODE_CLASSPATH%;%ODE_LIB% +FOR %%c in (%LIB1%\*.jar) DO (call :append_cp %%c) +FOR %%c in (%LIB2%\*.jar) DO (call :append_cp %%c) +rem FOR %%c in (%LIB3%\*.jar) DO (call :append_cp %%c) +call :append_cp %LIB3%\log4j.jar +call :append_cp %LIB3%\commons-logging.jar +call :append_cp %LIB3%\wsdl4j.jar +rem FOR %%c in (%LIB4%\*.jar) DO (call :append_cp %%c) +call :append_cp %LIB4%\xercesImpl.jar +call :append_cp %LIB4%\xalan.jar +rem FOR %%c in (%LIB5%\*.jar) DO (call :append_cp %%c) +call :append_cp %LIB5%\commons-collections.jar +call :append_cp %LIB5%\jaxen.jar + +%JAVACMD% %ODE_JAVAOPTS% -cp "%LOCALCLASSPATH%" org.apache.ode.tools.bpelc.cline.BpelC %* +goto end + +:append_cp +set LOCALCLASSPATH=%LOCALCLASSPATH%;%1 +goto end + +===================================================================== + ERRORS +===================================================================== + + +:wrongOS +echo ERROR: ODE requires WindowsNT/XP. Aborting. +goto end + +:noJavaHome +echo ERROR: JAVA_HOME not set! Aborting. +goto end + +:noJBossHome +echo ERROR: JBOSS_HOME not set! Please set this to the location of the JBossAS installation. +goto end + +:noJava +echo ERROR: The Java VM (java.exe) was not found in %JAVA_HOME%\bin! Aborting +goto end + +REM ================================================================ +REM END +REM ================================================================ +:end +@endlocal Modified: trunk/distribution/src/main/release/bin/sendsoap.bat =================================================================== --- trunk/distribution/src/main/release/bin/sendsoap.bat 2011-03-29 13:06:48 UTC (rev 1337) +++ trunk/distribution/src/main/release/bin/sendsoap.bat 2011-03-29 13:57:53 UTC (rev 1338) @@ -1,80 +1,81 @@ -@echo off -rem -rem Licensed to the Apache Software Foundation (ASF) under one or more -rem contributor license agreements. See the NOTICE file distributed with -rem this work for additional information regarding copyright ownership. -rem The ASF licenses this file to You under the Apache License, Version 2.0 -rem (the "License"); you may not use this file except in compliance with -rem the License. You may obtain a copy of the License at -rem -rem http://www.apache.org/licenses/LICENSE-2.0 -rem -rem Unless required by applicable law or agreed to in writing, software -rem distributed under the License is distributed on an "AS IS" BASIS, -rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -rem See the License for the specific language governing permissions and -rem limitations under the License. -rem - -if not "%OS%"=="Windows_NT" goto wrongOS - -@setlocal - -set command=%0 -set progname=%~n0 - -set ODE_HOME=%~dp0.. -set ODE_BIN=%~dp0..\bin -set ODE_LIB=%~dp0..\lib -set ODE_ETC=%~dp0..\etc - -if "%JBOSS_HOME%"=="" goto noJBossHome - -set LIB1=%ODE_HOME%/modules/riftsaw.sar/lib -set LIB2=%ODE_HOME%/lib -set LIB3=%JBOSS_HOME%/client - -if "%JAVA_HOME%"=="" goto noJavaHome -if not exist "%JAVA_HOME%"\bin\java.exe goto noJava - -set JAVACMD="%JAVA_HOME%\bin\java.exe" - -set LOCALCLASSPATH=%ODE_CLASSPATH%;%ODE_LIB% -FOR %%c in (%LIB1%\*.jar) DO (call :append_cp %%c) -FOR %%c in (%LIB2%\*.jar) DO (call :append_cp %%c) -rem FOR %%c in (%LIB3%\*.jar) DO (call :append_cp %%c) -call :append_cp %LIB3%\log4j.jar - -%JAVACMD% %ODE_JAVAOPTS% -cp "%LOCALCLASSPATH%" org.apache.ode.tools.sendsoap.cline.HttpSoapSender %* -goto end - -:append_cp -set LOCALCLASSPATH=%LOCALCLASSPATH%;%1 -goto end - -===================================================================== - ERRORS -===================================================================== - - -:wrongOS -echo ERROR: ODE requires WindowsNT/XP. Aborting. -goto end - -:noJavaHome -echo ERROR: JAVA_HOME not set! Aborting. -goto end - -:noJBossHome -echo ERROR: JBOSS_HOME not set! Please set this to the location of the JBossAS installation. -goto end - -:noJava -echo ERROR: The Java VM (java.exe) was not found in %JAVA_HOME%\bin! Aborting -goto end - -REM ================================================================ -REM END -REM ================================================================ -:end -@endlocal +@echo off +rem +rem Licensed to the Apache Software Foundation (ASF) under one or more +rem contributor license agreements. See the NOTICE file distributed with +rem this work for additional information regarding copyright ownership. +rem The ASF licenses this file to You under the Apache License, Version 2.0 +rem (the "License"); you may not use this file except in compliance with +rem the License. You may obtain a copy of the License at +rem +rem http://www.apache.org/licenses/LICENSE-2.0 +rem +rem Unless required by applicable law or agreed to in writing, software +rem distributed under the License is distributed on an "AS IS" BASIS, +rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +rem See the License for the specific language governing permissions and +rem limitations under the License. +rem + +if not "%OS%"=="Windows_NT" goto wrongOS + +@setlocal + +set command=%0 +set progname=%~n0 + +set ODE_HOME=%~dp0.. +set ODE_BIN=%~dp0..\bin +set ODE_LIB=%~dp0..\lib +set ODE_ETC=%~dp0..\etc + +if "%JBOSS_HOME%"=="" goto noJBossHome + +set LIB1=%ODE_HOME%/modules/riftsaw.sar/lib +set LIB2=%ODE_HOME%/lib +set LIB3=%JBOSS_HOME%/client + +if "%JAVA_HOME%"=="" goto noJavaHome +if not exist "%JAVA_HOME%"\bin\java.exe goto noJava + +set JAVACMD="%JAVA_HOME%\bin\java.exe" + +set LOCALCLASSPATH=%ODE_CLASSPATH%;%ODE_LIB% +FOR %%c in (%LIB1%\*.jar) DO (call :append_cp %%c) +FOR %%c in (%LIB2%\*.jar) DO (call :append_cp %%c) +rem FOR %%c in (%LIB3%\*.jar) DO (call :append_cp %%c) +call :append_cp %LIB3%\log4j.jar +call :append_cp %LIB3%\commons-logging.jar + +%JAVACMD% %ODE_JAVAOPTS% -cp "%LOCALCLASSPATH%" org.apache.ode.tools.sendsoap.cline.HttpSoapSender %* +goto end + +:append_cp +set LOCALCLASSPATH=%LOCALCLASSPATH%;%1 +goto end + +===================================================================== + ERRORS +===================================================================== + + +:wrongOS +echo ERROR: ODE requires WindowsNT/XP. Aborting. +goto end + +:noJavaHome +echo ERROR: JAVA_HOME not set! Aborting. +goto end + +:noJBossHome +echo ERROR: JBOSS_HOME not set! Please set this to the location of the JBossAS installation. +goto end + +:noJava +echo ERROR: The Java VM (java.exe) was not found in %JAVA_HOME%\bin! Aborting +goto end + +REM ================================================================ +REM END +REM ================================================================ +:end +@endlocal

13 years, 9 months

1
0
0 / 0

riftsaw SVN: r1337 - in dsp/trunk: api and 5 other directories.

by riftsaw-commits＠lists.jboss.org

Author: objectiser Date: 2011-03-29 09:06:48 -0400 (Tue, 29 Mar 2011) New Revision: 1337 Modified: dsp/trunk/api/pom.xml dsp/trunk/distribution/pom.xml dsp/trunk/integration/jbossas5/pom.xml dsp/trunk/integration/jbossas6/pom.xml dsp/trunk/integration/pom.xml dsp/trunk/integration/tomcat/pom.xml dsp/trunk/pom.xml Log: Set version to 1.1.0-SNAPSHOT Modified: dsp/trunk/api/pom.xml =================================================================== --- dsp/trunk/api/pom.xml 2011-03-29 13:03:19 UTC (rev 1336) +++ dsp/trunk/api/pom.xml 2011-03-29 13:06:48 UTC (rev 1337) @@ -5,13 +5,13 @@ <groupId>org.jboss.soa.dsp</groupId> <artifactId>dsp-api</artifactId> <packaging>jar</packaging> - <version>1.0.0.Final</version> + <version>1.1.0-SNAPSHOT</version> <name>SOA::DSP::API</name> <parent> <groupId>org.jboss.soa.dsp</groupId> <artifactId>dsp</artifactId> - <version>1.0.0.Final</version> + <version>1.1.0-SNAPSHOT</version> </parent> <dependencies> Modified: dsp/trunk/distribution/pom.xml =================================================================== --- dsp/trunk/distribution/pom.xml 2011-03-29 13:03:19 UTC (rev 1336) +++ dsp/trunk/distribution/pom.xml 2011-03-29 13:06:48 UTC (rev 1337) @@ -4,13 +4,13 @@ <groupId>org.jboss.soa.dsp</groupId> <artifactId>distribution</artifactId> <packaging>pom</packaging> - <version>1.0.0.Final</version> + <version>1.1.0-SNAPSHOT</version> <name>SOA::DSP::Distribution</name> <parent> <groupId>org.jboss.soa.dsp</groupId> <artifactId>dsp</artifactId> - <version>1.0.0.Final</version> + <version>1.1.0-SNAPSHOT</version> </parent> <properties> Modified: dsp/trunk/integration/jbossas5/pom.xml =================================================================== --- dsp/trunk/integration/jbossas5/pom.xml 2011-03-29 13:03:19 UTC (rev 1336) +++ dsp/trunk/integration/jbossas5/pom.xml 2011-03-29 13:06:48 UTC (rev 1337) @@ -5,13 +5,13 @@ <groupId>org.jboss.soa.dsp</groupId> <artifactId>dsp-jbossas5</artifactId> <packaging>jar</packaging> - <version>1.0.0.Final</version> + <version>1.1.0-SNAPSHOT</version> <name>SOA::DSP::Integration::JBossAS5</name> <parent> <groupId>org.jboss.soa.dsp</groupId> <artifactId>integration</artifactId> - <version>1.0.0.Final</version> + <version>1.1.0-SNAPSHOT</version> </parent> <properties> Modified: dsp/trunk/integration/jbossas6/pom.xml =================================================================== --- dsp/trunk/integration/jbossas6/pom.xml 2011-03-29 13:03:19 UTC (rev 1336) +++ dsp/trunk/integration/jbossas6/pom.xml 2011-03-29 13:06:48 UTC (rev 1337) @@ -5,13 +5,13 @@ <groupId>org.jboss.soa.dsp</groupId> <artifactId>dsp-jbossas6</artifactId> <packaging>jar</packaging> - <version>1.0.0.Final</version> + <version>1.1.0-SNAPSHOT</version> <name>SOA::DSP::Integration::JBossAS6</name> <parent> <groupId>org.jboss.soa.dsp</groupId> <artifactId>integration</artifactId> - <version>1.0.0.Final</version> + <version>1.1.0-SNAPSHOT</version> </parent> <properties> Modified: dsp/trunk/integration/pom.xml =================================================================== --- dsp/trunk/integration/pom.xml 2011-03-29 13:03:19 UTC (rev 1336) +++ dsp/trunk/integration/pom.xml 2011-03-29 13:06:48 UTC (rev 1337) @@ -5,13 +5,13 @@ <groupId>org.jboss.soa.dsp</groupId> <artifactId>integration</artifactId> <packaging>pom</packaging> - <version>1.0.0.Final</version> + <version>1.1.0-SNAPSHOT</version> <name>SOA::DSP::Integration</name> <parent> <groupId>org.jboss.soa.dsp</groupId> <artifactId>dsp</artifactId> - <version>1.0.0.Final</version> + <version>1.1.0-SNAPSHOT</version> </parent> <modules> Modified: dsp/trunk/integration/tomcat/pom.xml =================================================================== --- dsp/trunk/integration/tomcat/pom.xml 2011-03-29 13:03:19 UTC (rev 1336) +++ dsp/trunk/integration/tomcat/pom.xml 2011-03-29 13:06:48 UTC (rev 1337) @@ -5,13 +5,13 @@ <groupId>org.jboss.soa.dsp</groupId> <artifactId>dsp-tomcat</artifactId> <packaging>jar</packaging> - <version>1.0.0.Final</version> + <version>1.1.0-SNAPSHOT</version> <name>SOA::DSP::Integration::Tomcat</name> <parent> <groupId>org.jboss.soa.dsp</groupId> <artifactId>integration</artifactId> - <version>1.0.0.Final</version> + <version>1.1.0-SNAPSHOT</version> </parent> <dependencies> Modified: dsp/trunk/pom.xml =================================================================== --- dsp/trunk/pom.xml 2011-03-29 13:03:19 UTC (rev 1336) +++ dsp/trunk/pom.xml 2011-03-29 13:06:48 UTC (rev 1337) @@ -5,11 +5,11 @@ <groupId>org.jboss.soa.dsp</groupId> <artifactId>dsp</artifactId> <packaging>pom</packaging> - <version>1.0.0.Final</version> + <version>1.1.0-SNAPSHOT</version> <name>SOA::DSP</name> <properties> - <dsp.version>1.0.0.Final</dsp.version> + <dsp.version>1.1.0-SNAPSHOT</dsp.version> <junit.version>4.8.1</junit.version> <jaxws.version>2.1</jaxws.version> <wsdl4j.version>1.6.2</wsdl4j.version>

13 years, 9 months

1
0
0 / 0

riftsaw SVN: r1336 - dsp/tags.

by riftsaw-commits＠lists.jboss.org

Author: objectiser Date: 2011-03-29 09:03:19 -0400 (Tue, 29 Mar 2011) New Revision: 1336 Added: dsp/tags/DSP-1.0.0.Final/ Log: Version 1.0.0.Final tagged.

13 years, 9 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

riftsaw-commits March 2011