riftsaw SVN: r376 - in trunk: qa and 1 other directory.
by riftsaw-commits＠lists.jboss.org
Author: jeff.yuchang
Date: 2009-12-10 03:19:37 -0500 (Thu, 10 Dec 2009)
New Revision: 376
Modified:
trunk/integration-tests/pom.xml
trunk/qa/build.xml
Log:
* update esb version for hudson job.
Modified: trunk/integration-tests/pom.xml
===================================================================
--- trunk/integration-tests/pom.xml 2009-12-10 06:27:32 UTC (rev 375)
+++ trunk/integration-tests/pom.xml 2009-12-10 08:19:37 UTC (rev 376)
@@ -15,7 +15,6 @@
<jboss.jbosssx.version>2.0.2.SP3</jboss.jbosssx.version>
<jboss.common.version>1.2.1.GA</jboss.common.version>
<jboss.version>5.1.0.GA</jboss.version>
- <org.jboss.as.home>/Users/kstam/apps/jboss-5.1.0.GA/riftesb-4.7</org.jboss.as.home>
</properties>
<dependencies>
<dependency>
@@ -301,4 +300,4 @@
</plugin>
</plugins>
</reporting>
-</project>
\ No newline at end of file
+</project>
Modified: trunk/qa/build.xml
===================================================================
--- trunk/qa/build.xml 2009-12-10 06:27:32 UTC (rev 375)
+++ trunk/qa/build.xml 2009-12-10 08:19:37 UTC (rev 376)
@@ -22,7 +22,7 @@
<property name="jboss.distro.url" value="http://downloads.sourceforge.net/jboss/${jboss.filename}" />
<property name="jboss.distro.path" value="${download.dir}/${jboss.filename}" />
- <property name="jbossesb.version" value="4.6" />
+ <property name="jbossesb.version" value="4.7" />
<property name="jbossesb.distro.dir" value="${riftsaw.home}/downloads" />
<property name="jbossesb.filename" value="jbossesb-${jbossesb.version}.zip" />
<property name="jbossesb.distro.url" value="http://jboss.org/downloading/?projectId=jbossesb&url=/jbossesb/downlo..." />
15 years, 10 months
riftsaw SVN: r375 - in trunk: integration-tests and 8 other directories.
by riftsaw-commits＠lists.jboss.org
Author: kurtstam
Date: 2009-12-10 01:27:32 -0500 (Thu, 10 Dec 2009)
New Revision: 375
Added:
trunk/integration-tests/src/test/resources/conf/META-INF/
trunk/integration-tests/src/test/resources/conf/META-INF/uddi.xml
trunk/samples/esb/webservice_esb_bpel/jbossesb-properties.xml
Removed:
trunk/integration-tests/src/test/resources/conf/juddi.properties
Modified:
trunk/integration-tests/build.xml
trunk/integration-tests/pom.xml
trunk/integration-tests/src/test/resources/conf/jbossesb-properties.xml
trunk/pom.xml
trunk/runtime/engine-assembly/pom.xml
trunk/runtime/engine/pom.xml
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/db/H2Database.java
trunk/samples/esb/bpel_helloworld/jbossesb-properties.xml
trunk/samples/esb/bpel_loan_fault/jbossesb-properties.xml
Log:
RIFTSAW-131 upgrading to jb5.1 + jbesb4.7
Modified: trunk/integration-tests/build.xml
===================================================================
--- trunk/integration-tests/build.xml 2009-12-09 23:25:04 UTC (rev 374)
+++ trunk/integration-tests/build.xml 2009-12-10 06:27:32 UTC (rev 375)
@@ -17,6 +17,11 @@
<copy file="${basedir}/../distribution/target/libs/ojdbc14.jar"
todir="${basedir}/../distribution/target/dist/riftsaw-${riftsaw.engine.version}/db/drivers"/>
</target>
+
+ <target name="copy.rosetta.aop">
+ <copy file="${dependency.rosetta.aop}"
+ tofile="${basedir}/target/rosetta.aop" />
+ </target>
<target name="replace.jdbc.files" if="is.replace.qa.jdbc">
<echo>Replacing the QA's Lab jdbc files</echo>
@@ -114,7 +119,7 @@
<target name="package-tests" >
<echo>Package tests...</echo>
-
+ <antcall target="copy.rosetta.aop" />
<mkdir dir="target/tests"/>
<ant antfile="src/test/resources/samples/Quickstart_bpel_hello_world/build.xml" />
Modified: trunk/integration-tests/pom.xml
===================================================================
--- trunk/integration-tests/pom.xml 2009-12-09 23:25:04 UTC (rev 374)
+++ trunk/integration-tests/pom.xml 2009-12-10 06:27:32 UTC (rev 375)
@@ -6,21 +6,25 @@
<packaging>pom</packaging>
<version>2.0-SNAPSHOT</version>
<name>RiftSaw::Integration-Tests</name>
-
<parent>
<groupId>org.jboss.soa</groupId>
<artifactId>bpel</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
-
<properties>
<jboss.jbosssx.version>2.0.2.SP3</jboss.jbosssx.version>
<jboss.common.version>1.2.1.GA</jboss.common.version>
<jboss.version>5.1.0.GA</jboss.version>
+ <org.jboss.as.home>/Users/kstam/apps/jboss-5.1.0.GA/riftesb-4.7</org.jboss.as.home>
</properties>
-
<dependencies>
<dependency>
+ <groupId>woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <version>3.2.6</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -31,7 +35,6 @@
<version>3.1</version>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.jboss.soa.bpel.dependencies.esb</groupId>
<artifactId>jbossesb-rosetta</artifactId>
@@ -41,7 +44,7 @@
<dependency>
<groupId>org.jboss.soa.bpel.dependencies.esb</groupId>
<artifactId>jbossesb-config-model</artifactId>
- <version>1.1.0</version>
+ <version>1.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -51,104 +54,104 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-client</artifactId>
+ <version>${jboss.version}</version>
+ <type>pom</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>stax</groupId>
- <artifactId>stax</artifactId>
- <version>1.2.0</version>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-aspects</artifactId>
+ <version>${jboss.version}</version>
+ <classifier>jboss-aop-jboss5</classifier>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0.1</version>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-aspects</artifactId>
+ <version>${jboss.version}</version>
+ <classifier>jboss-aspect-library</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-client</artifactId>
+ <artifactId>jboss-as-aspects</artifactId>
<version>${jboss.version}</version>
- <type>pom</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.ws.scout</groupId>
- <artifactId>scout</artifactId>
- <version>1.1</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
+ <version>${xmlbeans.version}</version>
<scope>test</scope>
</dependency>
+ <!--
+ we use the aop fixes for now <dependency>
+ <groupId>org.apache.ws.scout</groupId> <artifactId>scout</artifactId>
+ <version>1.2</version> <scope>test</scope> <exclusions> <exclusion>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId> </exclusion> </exclusions>
+ </dependency>
+ -->
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>test</scope>
+ <groupId>org.jboss.soa.bpel.dependencies.esb</groupId>
+ <artifactId>scout</artifactId>
+ <version>1.2</version>
+ <classifier>aop</classifier>
+ <type>jar</type>
</dependency>
+ <!--
+ we use the aop fixes for now <dependency>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>juddi-client</artifactId> <version>3.0.0</version>
+ <scope>test</scope> </dependency>
+ -->
<dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>trove</groupId>
- <artifactId>trove</artifactId>
- <version>2.1.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.juddi</groupId>
+ <groupId>org.jboss.soa.bpel.dependencies.esb</groupId>
<artifactId>juddi-client</artifactId>
- <version>2.0.1</version>
- <scope>test</scope>
- </dependency>
+ <version>3.0.0</version>
+ <classifier>aop</classifier>
+ <type>jar</type>
+ </dependency>
<dependency>
- <groupId>jboss.messaging</groupId>
- <artifactId>jboss-messaging-client</artifactId>
- <version>1.4.3.GA</version>
- <scope>test</scope>
+ <groupId>org.jboss.soa.bpel.dependencies.esb</groupId>
+ <artifactId>juddi-core</artifactId>
+ <version>3.0.0</version>
+ <classifier>aop</classifier>
+ <type>jar</type>
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-remoting</artifactId>
- <version>2.2.1.GA</version>
- <scope>test</scope>
+ <groupId>org.jboss.soa.bpel.dependencies.esb.aop</groupId>
+ <artifactId>rosetta</artifactId>
+ <version>4.7</version>
+ <type>aop</type>
</dependency>
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
+ <groupId>org.apache.juddi</groupId>
+ <artifactId>uddi-ws</artifactId>
+ <version>3.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <version>3.2.0</version>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>1.5</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.1</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- <version>2.1.0.GA</version>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.13</version>
<scope>test</scope>
</dependency>
</dependencies>
-
<build>
<plugins>
<plugin>
@@ -173,13 +176,14 @@
value="${maven.dependency.org.jboss.soa.bpel.runtime.engine.jar.path}" />
<property name="dependency.bpel.jb-bpel-store"
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>
<ant antfile="${basedir}/build.xml">
<target name="package-tests" />
</ant>
-
<ant antfile="${basedir}/build.xml">
<target name="deploy-riftsaw" />
</ant>
@@ -241,6 +245,7 @@
<configuration>
<additionalClasspathElements>
<additionalClasspathElement>${basedir}/src/test/resources/conf</additionalClasspathElement>
+ <additionalClasspathElement>${basedir}/target/rosetta.aop</additionalClasspathElement>
</additionalClasspathElements>
<systemProperties>
<property>
@@ -288,7 +293,6 @@
</plugin>
</plugins>
</build>
-
<reporting>
<plugins>
<plugin>
@@ -297,5 +301,4 @@
</plugin>
</plugins>
</reporting>
-</project>
-
+</project>
\ No newline at end of file
Added: trunk/integration-tests/src/test/resources/conf/META-INF/uddi.xml
===================================================================
--- trunk/integration-tests/src/test/resources/conf/META-INF/uddi.xml (rev 0)
+++ trunk/integration-tests/src/test/resources/conf/META-INF/uddi.xml 2009-12-10 06:27:32 UTC (rev 375)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+
+<uddi>
+ <reloadDelay>5000</reloadDelay>
+ <manager name="test-manager">
+ <nodes>
+ <node>
+ <!-- required 'default' node -->
+ <name>default</name>
+ <description>Main jUDDI node</description>
+ <properties>
+ <property name="serverName" value="localhost" />
+ <property name="serverPort" value="8880" />
+ </properties>
+ <!-- JAX-WS Transport
+ <proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
+ <custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/custody-transfer?wsdl</custodyTransferUrl>
+ <inquiryUrl>http://${serverName}:${serverPort}/juddiv3/services/inquiry?wsdl</inquiryUrl>
+ <publishUrl>http://${serverName}:${serverPort}/juddiv3/services/publish?wsdl</publishUrl>
+ <securityUrl>http://${serverName}:${serverPort}/juddiv3/services/security?wsdl</securityUrl>
+ <subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription?wsdl</subscriptionUrl>
+ <subscriptionListenerUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription-listener?wsdl</subscriptionListenerUrl>
+ <juddiApiUrl>http://${serverName}:${serverPort}/juddiv3/services/juddi-api?wsdl</juddiApiUrl>
+ -->
+ <!-- In VM Transport Settings
+ <proxyTransport>org.apache.juddi.v3.client.transport.InVMTransport</proxyTransport>
+ <custodyTransferUrl>org.apache.juddi.api.impl.UDDICustodyTransferImpl</custodyTransferUrl>
+ <inquiryUrl>org.apache.juddi.api.impl.UDDIInquiryImpl</inquiryUrl>
+ <publishUrl>org.apache.juddi.api.impl.UDDIPublicationImpl</publishUrl>
+ <securityUrl>org.apache.juddi.api.impl.UDDISecurityImpl</securityUrl>
+ <subscriptionUrl>org.apache.juddi.api.impl.UDDISubscriptionImpl</subscriptionUrl>
+ <subscriptionListenerUrl>org.apache.juddi.api.impl.UDDISubscriptionListenerImpl</subscriptionListenerUrl>
+ <juddiApiUrl>org.apache.juddi.api.impl.JUDDIApiImpl</juddiApiUrl>
+ -->
+ <!-- RMI Transport Settings -->
+ <proxyTransport>org.apache.juddi.v3.client.transport.RMITransport</proxyTransport>
+ <custodyTransferUrl>/juddiv3/UDDICustodyTransferService</custodyTransferUrl>
+ <inquiryUrl>/juddiv3/UDDIInquiryService</inquiryUrl>
+ <publishUrl>/juddiv3/UDDIPublicationService</publishUrl>
+ <securityUrl>/juddiv3/UDDISecurityService</securityUrl>
+ <subscriptionUrl>/juddiv3/UDDISubscriptionService</subscriptionUrl>
+ <subscriptionListenerUrl>/juddiv3/UDDISubscriptionListenerService</subscriptionListenerUrl>
+ <juddiApiUrl>/juddiv3/JUDDIApiService</juddiApiUrl>
+ <javaNamingFactoryInitial>org.jnp.interfaces.NamingContextFactory</javaNamingFactoryInitial>
+ <javaNamingFactoryUrlPkgs>org.jboss.naming</javaNamingFactoryUrlPkgs>
+ <javaNamingProviderUrl>jnp://localhost:1099</javaNamingProviderUrl>
+ </node>
+ </nodes>
+ </manager>
+</uddi>
Modified: trunk/integration-tests/src/test/resources/conf/jbossesb-properties.xml
===================================================================
--- trunk/integration-tests/src/test/resources/conf/jbossesb-properties.xml 2009-12-09 23:25:04 UTC (rev 374)
+++ trunk/integration-tests/src/test/resources/conf/jbossesb-properties.xml 2009-12-10 06:27:32 UTC (rev 375)
@@ -37,21 +37,19 @@
<property name="jboss.esb.invm.scope.default" value="NONE"/>
</properties>
<properties name="registry">
- <property name="org.jboss.soa.esb.registry.queryManagerURI"
- value="jnp://localhost:1099/InquiryService?org.apache.juddi.registry.rmi.Inquiry#inquire"/>
- <property name="org.jboss.soa.esb.registry.lifeCycleManagerURI"
- value="jnp://localhost:1099/PublishService?org.apache.juddi.registry.rmi.Publish#publish" />
- <property name="org.jboss.soa.esb.registry.implementationClass"
- value="org.jboss.internal.soa.esb.services.registry.JAXRRegistryImpl"/>
- <property name="org.jboss.soa.esb.registry.factoryClass"
- value="org.apache.ws.scout.registry.ConnectionFactoryImpl"/>
- <property name="org.jboss.soa.esb.registry.user"
- value="jbossesb"/>
- <property name="org.jboss.soa.esb.registry.password"
- value="password"/>
+ <property name="org.jboss.soa.esb.registry.queryManagerURI" value="org.apache.juddi.v3.client.transport.wrapper.UDDIInquiryService#inquire"/>
+ <property name="org.jboss.soa.esb.registry.lifeCycleManagerURI" value="org.apache.juddi.v3.client.transport.wrapper.UDDIPublicationService#publish"/>
+ <property name="org.jboss.soa.esb.registry.securityManagerURI" value="org.apache.juddi.v3.client.transport.wrapper.UDDISecurityService#secure"/>
+ <property name="org.jboss.soa.esb.registry.implementationClass" value="org.jboss.internal.soa.esb.services.registry.JAXRRegistryImpl"/>
+ <property name="org.jboss.soa.esb.registry.factoryClass" value="org.apache.ws.scout.registry.ConnectionFactoryImpl"/>
+ <property name="org.jboss.soa.esb.registry.user" value="root"/>
+ <property name="org.jboss.soa.esb.registry.password" value="root"/>
<!-- the following parameter is scout specific to set the type of communication between scout and the UDDI (embedded, rmi, soap) -->
- <property name="org.jboss.soa.esb.scout.proxy.transportClass"
- value="org.apache.ws.scout.transport.RMITransport"/>
+ <property name="org.jboss.soa.esb.scout.proxy.transportClass" value="org.apache.ws.scout.transport.LocalTransport"/>
+ <property name="org.jboss.soa.esb.scout.proxy.uddiVersion" value="3.0"/>
+ <property name="org.jboss.soa.esb.scout.proxy.uddiNameSpace" value="urn:uddi-org:api_v3"/>
+ <!-- Organization Category to be used by this deployment. -->
+ <property name="org.jboss.soa.esb.registry.orgCategory" value="org.jboss.soa.esb.:category"/>
</properties>
<properties name="transports" depends="core">
<property name="org.jboss.soa.esb.mail.smtp.host" value="localhost"/>
@@ -61,7 +59,7 @@
</properties>
<properties name="connection">
<property name="min-pool-size" value="5"/>
- <property name="max-pool=size" value="10"/>
+ <property name="max-pool-size" value="10"/>
<property name="blocking-timeout-millis" value="5000"/>
<property name="abandoned-connection-timeout" value="10000"/>
<property name="abandoned-connection-time-interval" value="30000"/>
Deleted: trunk/integration-tests/src/test/resources/conf/juddi.properties
===================================================================
--- trunk/integration-tests/src/test/resources/conf/juddi.properties 2009-12-09 23:25:04 UTC (rev 374)
+++ trunk/integration-tests/src/test/resources/conf/juddi.properties 2009-12-10 06:27:32 UTC (rev 375)
@@ -1,69 +0,0 @@
-# jUDDI Registry Properties (used by RegistryServer)
-# see http://www.juddi.org for more information
-
-# The UDDI Operator Name
-juddi.operatorName = jUDDI.org
-
-# The i18n locale default codes
-juddi.i18n.languageCode = en
-juddi.i18n.countryCode = US
-
-# The UDDI DiscoveryURL Prefix
-juddi.discoveryURL = http://localhost:8080/juddi/uddiget.jsp?
-
-# The UDDI Operator Contact Email Address
-juddi.operatorEmailAddress = admin(a)juddi.org
-
-# The maximum name size and maximum number
-# of name elements allows in several of the
-# FindXxxx and SaveXxxx UDDI functions.
-juddi.maxNameLength=255
-juddi.maxNameElementsAllowed=5
-
-# The maximum number of UDDI artifacts allowed
-# per publisher. A value of '-1' indicates any
-# number of artifacts is valid (These values can be
-# overridden at the individual publisher level).
-juddi.maxBusinessesPerPublisher=25
-juddi.maxServicesPerBusiness=20
-juddi.maxBindingsPerService=10
-juddi.maxTModelsPerPublisher=100
-
-# jUDDI Authentication module to use
-juddi.auth = org.apache.juddi.auth.DefaultAuthenticator
-
-# jUDDI DataStore module currently to use
-juddi.dataStore = org.apache.juddi.datastore.jdbc.JDBCDataStore
-
-# use a dataSource (if set to false a direct
-# jdbc connection will be used.
-juddi.isUseDataSource=false
-juddi.jdbcDriver=com.mysql.jdbc.Driver
-juddi.jdbcUrl=jdbc:mysql://localhost:3306/juddi
-juddi.jdbcUsername=root
-juddi.jdbcPassword=admin
-# jUDDI DataSource to use
-# juddi.dataSource=java:comp/env/jdbc/MySqlDS
-
-# jUDDI UUIDGen implementation to use
-juddi.uuidgen = org.apache.juddi.uuidgen.DefaultUUIDGen
-
-# jUDDI Cryptor implementation to use
-juddi.cryptor = org.apache.juddi.cryptor.DefaultCryptor
-
-# jUDDI Validator to use
-juddi.validator=org.apache.juddi.validator.DefaultValidator
-
-# jUDDI Proxy Properties (used by RegistryProxy)
-juddi.proxy.adminURL = http://localhost:8080/juddi/admin
-juddi.proxy.inquiryURL = http://localhost:8080/juddi/inquiry
-juddi.proxy.publishURL = http://localhost:8080/juddi/publish
-juddi.proxy.transportClass = org.apache.juddi.proxy.AxisTransport
-juddi.proxy.securityProvider = com.sun.net.ssl.internal.ssl.Provider
-juddi.proxy.protocolHandler = com.sun.net.ssl.internal.www.protocol
-
-# JNDI settings (used by RMITransport)
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.provider.url=jnp://localhost:1099
-java.naming.factory.url.pkgs=org.jboss.naming
-
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-12-09 23:25:04 UTC (rev 374)
+++ trunk/pom.xml 2009-12-10 06:27:32 UTC (rev 375)
@@ -71,10 +71,9 @@
<bpm.console.version>1.3.0-SNAPSHOT</bpm.console.version>
<commons.logging.version>1.1.1</commons.logging.version>
<junit.version>3.8.1</junit.version>
- <jboss.version>5.0.0.GA</jboss.version>
+ <jboss.version>5.1.0.GA</jboss.version>
<log4j.version>1.2.14</log4j.version>
- <rosetta.version>4.6</rosetta.version>
- <jbossesb.version>4.6</jbossesb.version>
+ <jbossesb.version>4.7</jbossesb.version>
<wsdl4j.version>1.6.2</wsdl4j.version>
<h2.version>1.2.124</h2.version>
<javassist.version>3.11.0.GA</javassist.version>
Modified: trunk/runtime/engine/pom.xml
===================================================================
--- trunk/runtime/engine/pom.xml 2009-12-09 23:25:04 UTC (rev 374)
+++ trunk/runtime/engine/pom.xml 2009-12-10 06:27:32 UTC (rev 375)
@@ -109,6 +109,13 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-client</artifactId>
+ <version>${jboss.version}</version>
+ <type>pom</type>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>riftsaw-bpel-compiler</artifactId>
<scope>provided</scope>
@@ -121,12 +128,7 @@
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.client</groupId>
- <artifactId>jbossall-client</artifactId>
- <version>4.2.3.GA</version>
- <scope>provided</scope>
- </dependency>
+
</dependencies>
@@ -156,7 +158,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jboss-packaging-maven-plugin</artifactId>
- <version>2.0-beta-1</version>
+ <version>2.1.1</version>
<extensions>true</extensions>
<configuration>
<excludes>
Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/db/H2Database.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/db/H2Database.java 2009-12-09 23:25:04 UTC (rev 374)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/db/H2Database.java 2009-12-10 06:27:32 UTC (rev 375)
@@ -31,7 +31,7 @@
import org.h2.tools.Server;
import org.jboss.mx.util.MBeanProxyExt;
import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.system.server.ServerConfig;
+import org.jboss.system.server.ServerConfigImpl;
import org.jboss.system.server.ServerConfigImplMBean;
/**
@@ -579,7 +579,7 @@
{
if (datadir == null)
{
- final ServerConfig serverConfig = (ServerConfig) MBeanProxyExt.create(ServerConfig.class, ServerConfigImplMBean.OBJECT_NAME);
+ final ServerConfigImpl serverConfig = (ServerConfigImpl) MBeanProxyExt.create(ServerConfigImplMBean.class,ServerConfigImplMBean.OBJECT_NAME);
return serverConfig.getServerDataDir();
}
return new File(datadir);
Modified: trunk/runtime/engine-assembly/pom.xml
===================================================================
--- trunk/runtime/engine-assembly/pom.xml 2009-12-09 23:25:04 UTC (rev 374)
+++ trunk/runtime/engine-assembly/pom.xml 2009-12-10 06:27:32 UTC (rev 375)
@@ -104,6 +104,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jboss-packaging-maven-plugin</artifactId>
+ <version>2.1.1</version>
<!-- Enable 'jboss-sar', etc., as a recognized maven packaging type -->
<extensions>true</extensions>
</plugin>
Modified: trunk/samples/esb/bpel_helloworld/jbossesb-properties.xml
===================================================================
--- trunk/samples/esb/bpel_helloworld/jbossesb-properties.xml 2009-12-09 23:25:04 UTC (rev 374)
+++ trunk/samples/esb/bpel_helloworld/jbossesb-properties.xml 2009-12-10 06:27:32 UTC (rev 375)
@@ -37,21 +37,19 @@
<property name="jboss.esb.invm.scope.default" value="NONE"/>
</properties>
<properties name="registry">
- <property name="org.jboss.soa.esb.registry.queryManagerURI"
- value="jnp://localhost:1099/InquiryService?org.apache.juddi.registry.rmi.Inquiry#inquire"/>
- <property name="org.jboss.soa.esb.registry.lifeCycleManagerURI"
- value="jnp://localhost:1099/PublishService?org.apache.juddi.registry.rmi.Publish#publish" />
- <property name="org.jboss.soa.esb.registry.implementationClass"
- value="org.jboss.internal.soa.esb.services.registry.JAXRRegistryImpl"/>
- <property name="org.jboss.soa.esb.registry.factoryClass"
- value="org.apache.ws.scout.registry.ConnectionFactoryImpl"/>
- <property name="org.jboss.soa.esb.registry.user"
- value="jbossesb"/>
- <property name="org.jboss.soa.esb.registry.password"
- value="password"/>
+ <property name="org.jboss.soa.esb.registry.queryManagerURI" value="org.apache.juddi.v3.client.transport.wrapper.UDDIInquiryService#inquire"/>
+ <property name="org.jboss.soa.esb.registry.lifeCycleManagerURI" value="org.apache.juddi.v3.client.transport.wrapper.UDDIPublicationService#publish"/>
+ <property name="org.jboss.soa.esb.registry.securityManagerURI" value="org.apache.juddi.v3.client.transport.wrapper.UDDISecurityService#secure"/>
+ <property name="org.jboss.soa.esb.registry.implementationClass" value="org.jboss.internal.soa.esb.services.registry.JAXRRegistryImpl"/>
+ <property name="org.jboss.soa.esb.registry.factoryClass" value="org.apache.ws.scout.registry.ConnectionFactoryImpl"/>
+ <property name="org.jboss.soa.esb.registry.user" value="root"/>
+ <property name="org.jboss.soa.esb.registry.password" value="root"/>
<!-- the following parameter is scout specific to set the type of communication between scout and the UDDI (embedded, rmi, soap) -->
- <property name="org.jboss.soa.esb.scout.proxy.transportClass"
- value="org.apache.ws.scout.transport.RMITransport"/>
+ <property name="org.jboss.soa.esb.scout.proxy.transportClass" value="org.apache.ws.scout.transport.LocalTransport"/>
+ <property name="org.jboss.soa.esb.scout.proxy.uddiVersion" value="3.0"/>
+ <property name="org.jboss.soa.esb.scout.proxy.uddiNameSpace" value="urn:uddi-org:api_v3"/>
+ <!-- Organization Category to be used by this deployment. -->
+ <property name="org.jboss.soa.esb.registry.orgCategory" value="org.jboss.soa.esb.:category"/>
</properties>
<properties name="transports" depends="core">
<property name="org.jboss.soa.esb.mail.smtp.host" value="localhost"/>
@@ -61,7 +59,7 @@
</properties>
<properties name="connection">
<property name="min-pool-size" value="5"/>
- <property name="max-pool=size" value="10"/>
+ <property name="max-pool-size" value="10"/>
<property name="blocking-timeout-millis" value="5000"/>
<property name="abandoned-connection-timeout" value="10000"/>
<property name="abandoned-connection-time-interval" value="30000"/>
Modified: trunk/samples/esb/bpel_loan_fault/jbossesb-properties.xml
===================================================================
--- trunk/samples/esb/bpel_loan_fault/jbossesb-properties.xml 2009-12-09 23:25:04 UTC (rev 374)
+++ trunk/samples/esb/bpel_loan_fault/jbossesb-properties.xml 2009-12-10 06:27:32 UTC (rev 375)
@@ -37,21 +37,19 @@
<property name="jboss.esb.invm.scope.default" value="NONE"/>
</properties>
<properties name="registry">
- <property name="org.jboss.soa.esb.registry.queryManagerURI"
- value="jnp://localhost:1099/InquiryService?org.apache.juddi.registry.rmi.Inquiry#inquire"/>
- <property name="org.jboss.soa.esb.registry.lifeCycleManagerURI"
- value="jnp://localhost:1099/PublishService?org.apache.juddi.registry.rmi.Publish#publish" />
- <property name="org.jboss.soa.esb.registry.implementationClass"
- value="org.jboss.internal.soa.esb.services.registry.JAXRRegistryImpl"/>
- <property name="org.jboss.soa.esb.registry.factoryClass"
- value="org.apache.ws.scout.registry.ConnectionFactoryImpl"/>
- <property name="org.jboss.soa.esb.registry.user"
- value="jbossesb"/>
- <property name="org.jboss.soa.esb.registry.password"
- value="password"/>
+ <property name="org.jboss.soa.esb.registry.queryManagerURI" value="org.apache.juddi.v3.client.transport.wrapper.UDDIInquiryService#inquire"/>
+ <property name="org.jboss.soa.esb.registry.lifeCycleManagerURI" value="org.apache.juddi.v3.client.transport.wrapper.UDDIPublicationService#publish"/>
+ <property name="org.jboss.soa.esb.registry.securityManagerURI" value="org.apache.juddi.v3.client.transport.wrapper.UDDISecurityService#secure"/>
+ <property name="org.jboss.soa.esb.registry.implementationClass" value="org.jboss.internal.soa.esb.services.registry.JAXRRegistryImpl"/>
+ <property name="org.jboss.soa.esb.registry.factoryClass" value="org.apache.ws.scout.registry.ConnectionFactoryImpl"/>
+ <property name="org.jboss.soa.esb.registry.user" value="root"/>
+ <property name="org.jboss.soa.esb.registry.password" value="root"/>
<!-- the following parameter is scout specific to set the type of communication between scout and the UDDI (embedded, rmi, soap) -->
- <property name="org.jboss.soa.esb.scout.proxy.transportClass"
- value="org.apache.ws.scout.transport.RMITransport"/>
+ <property name="org.jboss.soa.esb.scout.proxy.transportClass" value="org.apache.ws.scout.transport.LocalTransport"/>
+ <property name="org.jboss.soa.esb.scout.proxy.uddiVersion" value="3.0"/>
+ <property name="org.jboss.soa.esb.scout.proxy.uddiNameSpace" value="urn:uddi-org:api_v3"/>
+ <!-- Organization Category to be used by this deployment. -->
+ <property name="org.jboss.soa.esb.registry.orgCategory" value="org.jboss.soa.esb.:category"/>
</properties>
<properties name="transports" depends="core">
<property name="org.jboss.soa.esb.mail.smtp.host" value="localhost"/>
@@ -61,7 +59,7 @@
</properties>
<properties name="connection">
<property name="min-pool-size" value="5"/>
- <property name="max-pool=size" value="10"/>
+ <property name="max-pool-size" value="10"/>
<property name="blocking-timeout-millis" value="5000"/>
<property name="abandoned-connection-timeout" value="10000"/>
<property name="abandoned-connection-time-interval" value="30000"/>
Added: trunk/samples/esb/webservice_esb_bpel/jbossesb-properties.xml
===================================================================
--- trunk/samples/esb/webservice_esb_bpel/jbossesb-properties.xml (rev 0)
+++ trunk/samples/esb/webservice_esb_bpel/jbossesb-properties.xml 2009-12-10 06:27:32 UTC (rev 375)
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ JBoss, Home of Professional Open Source
+ Copyright 2006, JBoss Inc., and others contributors as indicated
+ by the @authors tag. All rights reserved.
+ See the copyright.txt in the distribution for a
+ full listing of individual contributors.
+ This copyrighted material is made available to anyone wishing to use,
+ modify, copy, or redistribute it subject to the terms and conditions
+ of the GNU Lesser General Public License, v. 2.1.
+ This program is distributed in the hope that it will be useful, but WITHOUT A
+ 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,
+ v.2.1 along with this distribution; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02110-1301, USA.
+
+ (C) 2005-2006,
+ @author JBoss Inc.
+-->
+<!-- $Id: jbossesb-unittest-properties.xml $ -->
+<!--
+ These options are described in the JBossESB manual.
+ Defaults are provided here for convenience only.
+
+ Please read through this file prior to using the system, and consider
+ updating the specified entries.
+-->
+<esb
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="jbossesb-1_0.xsd">
+ <properties name="core">
+ <property name="org.jboss.soa.esb.jndi.server.type" value="jboss"/>
+ <property name="org.jboss.soa.esb.jndi.server.url" value="localhost"/>
+ <property name="org.jboss.soa.esb.persistence.connection.factory" value="org.jboss.internal.soa.esb.persistence.format.MessageStoreFactoryImpl"/>
+ <property name="jboss.esb.invm.scope.default" value="NONE"/>
+ </properties>
+ <properties name="registry">
+ <property name="org.jboss.soa.esb.registry.queryManagerURI" value="org.apache.juddi.v3.client.transport.wrapper.UDDIInquiryService#inquire"/>
+ <property name="org.jboss.soa.esb.registry.lifeCycleManagerURI" value="org.apache.juddi.v3.client.transport.wrapper.UDDIPublicationService#publish"/>
+ <property name="org.jboss.soa.esb.registry.securityManagerURI" value="org.apache.juddi.v3.client.transport.wrapper.UDDISecurityService#secure"/>
+ <property name="org.jboss.soa.esb.registry.implementationClass" value="org.jboss.internal.soa.esb.services.registry.JAXRRegistryImpl"/>
+ <property name="org.jboss.soa.esb.registry.factoryClass" value="org.apache.ws.scout.registry.ConnectionFactoryImpl"/>
+ <property name="org.jboss.soa.esb.registry.user" value="root"/>
+ <property name="org.jboss.soa.esb.registry.password" value="root"/>
+ <!-- the following parameter is scout specific to set the type of communication between scout and the UDDI (embedded, rmi, soap) -->
+ <property name="org.jboss.soa.esb.scout.proxy.transportClass" value="org.apache.ws.scout.transport.LocalTransport"/>
+ <property name="org.jboss.soa.esb.scout.proxy.uddiVersion" value="3.0"/>
+ <property name="org.jboss.soa.esb.scout.proxy.uddiNameSpace" value="urn:uddi-org:api_v3"/>
+ <!-- Organization Category to be used by this deployment. -->
+ <property name="org.jboss.soa.esb.registry.orgCategory" value="org.jboss.soa.esb.:category"/>
+ </properties>
+ <properties name="transports" depends="core">
+ <property name="org.jboss.soa.esb.mail.smtp.host" value="localhost"/>
+ <property name="org.jboss.soa.esb.mail.smtp.user" value="jbossesb"/>
+ <property name="org.jboss.soa.esb.mail.smtp.password" value=""/>
+ <property name="org.jboss.soa.esb.mail.smtp.port" value="25"/>
+ </properties>
+ <properties name="connection">
+ <property name="min-pool-size" value="5"/>
+ <property name="max-pool-size" value="10"/>
+ <property name="blocking-timeout-millis" value="5000"/>
+ <property name="abandoned-connection-timeout" value="10000"/>
+ <property name="abandoned-connection-time-interval" value="30000"/>
+ </properties>
+ <properties name="dbstore">
+ <property name="org.jboss.soa.esb.persistence.db.connection.url" value="jdbc:hsqldb:hsql://localhost:9001/"/>
+ <property name="org.jboss.soa.esb.persistence.db.jdbc.driver" value="org.hsqldb.jdbcDriver"/>
+ <property name="org.jboss.soa.esb.persistence.db.user" value="sa"/>
+ <property name="org.jboss.soa.esb.persistence.db.pwd" value=""/>
+ <property name="org.jboss.soa.esb.persistence.db.pool.initial.size" value="2"/>
+ <property name="org.jboss.soa.esb.persistence.db.pool.min.size" value="2"/>
+ <property name="org.jboss.soa.esb.persistence.db.pool.max.size" value="5"/>
+ <!--table managed by pool to test for valid connections - created by pool automatically -->
+ <property name="org.jboss.soa.esb.persistence.db.pool.test.table" value="pooltest"/>
+ <!-- # of milliseconds to timeout waiting for a connection from pool -->
+ <property name="org.jboss.soa.esb.persistence.db.pool.timeout.millis" value="5000"/>
+ <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.internal.soa.esb.persistence.manager.StandaloneConnectionManager"/>
+ </properties>
+ <properties name="messagerouting">
+ <property name="org.jboss.soa.esb.routing.cbrClass" value="org.jboss.internal.soa.esb.services.routing.cbr.JBossRulesRouter"/>
+ </properties>
+</esb>
15 years, 10 months
riftsaw SVN: r374 - trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/bpel.
by riftsaw-commits＠lists.jboss.org
Author: alex.guizar(a)jboss.com
Date: 2009-12-09 18:25:04 -0500 (Wed, 09 Dec 2009)
New Revision: 374
Modified:
trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/bpel/bpel-deploy.xml
trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/bpel/purchase.bpel
trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/bpel/purchase.bpelex
Log:
RIFTSAW-128: Qualify fault name as prescribed in the spec
fix process namespace in deployment descriptor
Modified: trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/bpel/bpel-deploy.xml
===================================================================
--- trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/bpel/bpel-deploy.xml 2009-12-09 16:26:04 UTC (rev 373)
+++ trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/bpel/bpel-deploy.xml 2009-12-09 23:25:04 UTC (rev 374)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03" xmlns:def="http://manufacturing.org/wsdl/purchase"
- xmlns:pro="http://manufacturing.org/ws-bp/purchase">
- <process name="pro:PurchaseOrder" xmlns:pur="http://acme.com/ws-bp/purchase">
+ xmlns:pro="http://acme.com/ws-bp/purchase">
+ <process name="pro:PurchaseOrder">
<active>true</active>
<provide partnerLink="purchasing">
<service name="def:purchaseSVC" port="purchaseOrderSP" />
Modified: trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/bpel/purchase.bpel
===================================================================
--- trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/bpel/purchase.bpel 2009-12-09 16:26:04 UTC (rev 373)
+++ trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/bpel/purchase.bpel 2009-12-09 23:25:04 UTC (rev 374)
@@ -31,7 +31,7 @@
<bpws:faultHandlers>
<bpws:catch faultMessageType="lns:orderFaultType" faultName="lns:cannotCompleteOrder"
faultVariable="POFault">
- <bpws:reply faultName="cannotCompleteOrder" name="NotifyPurchaseFault"
+ <bpws:reply faultName="lns:cannotCompleteOrder" name="NotifyPurchaseFault"
operation="sendPurchaseOrder" partnerLink="purchasing" portType="lns:purchaseOrderPT"
variable="POFault" />
</bpws:catch>
Modified: trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/bpel/purchase.bpelex
===================================================================
--- trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/bpel/purchase.bpelex 2009-12-09 16:26:04 UTC (rev 373)
+++ trunk/integration-tests/src/test/resources/samples/Tutorial_bpel_purchase/bpel/purchase.bpelex 2009-12-09 23:25:04 UTC (rev 374)
@@ -106,6 +106,6 @@
</extensions>
<extensions>
<extendedObject href="purchase.bpel#/"/>
- <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ProcessExtension" modificationStamp="1258410536000"/>
+ <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ProcessExtension" modificationStamp="1260391390000"/>
</extensions>
</extensionmodel:ExtensionMap>
15 years, 10 months
riftsaw SVN: r373 - in trunk: integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/war/resources/WEB-INF/wsdl and 3 other directories.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2009-12-09 11:26:04 -0500 (Wed, 09 Dec 2009)
New Revision: 373
Modified:
trunk/docs/docbook/gettingstartedguide/src/main/module/examples.xml
trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/war/resources/WEB-INF/wsdl/loanServicePT.wsdl
trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/OrderManager.wsdl
trunk/samples/esb/webservice_esb_bpel/jboss-esb.xml
trunk/samples/quickstart/loan_approval/war/resources/WEB-INF/wsdl/loanServicePT.wsdl
Log:
Minor updates to documentation and a WSDL - plus fixed unexpected char issue in webservice_esb_bpel for RIFTSAW-56 - but still seems to be a failure.
Modified: trunk/docs/docbook/gettingstartedguide/src/main/module/examples.xml
===================================================================
--- trunk/docs/docbook/gettingstartedguide/src/main/module/examples.xml 2009-12-08 16:42:31 UTC (rev 372)
+++ trunk/docs/docbook/gettingstartedguide/src/main/module/examples.xml 2009-12-09 16:26:04 UTC (rev 373)
@@ -74,7 +74,7 @@
The WSDL definition is located in the <filename>bpel</filename>
folder, and can be used to initialise the SOAPUI client. The
service location is:
- <ulink url="http://localhost:8080/bpel/processes/helloWorld">http://localhost:8080/bpel/processes/helloWorld</ulink>.
+ <ulink url="http://localhost:8080/Quickstart_hello_worldWS">http://localhost:8080/Quickstart_hello_worldWS</ulink>.
</para>
<para>
@@ -216,7 +216,7 @@
The WSDL definition is located in the <filename>bpel</filename>
folder, and can be used to initialise the SOAPUI client. The
service location is:
- <ulink url="http://localhost:8080/bpel/processes/Retailer">http://localhost:8080/bpel/processes/Retailer</ulink>.
+ <ulink url="http://localhost:8080/Webservice_esb_bpel_Retailer">http://localhost:8080/Webservice_esb_bpel_Retailer</ulink>.
</para>
<para>
Modified: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/war/resources/WEB-INF/wsdl/loanServicePT.wsdl
===================================================================
--- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/war/resources/WEB-INF/wsdl/loanServicePT.wsdl 2009-12-08 16:42:31 UTC (rev 372)
+++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_loan_approval/war/resources/WEB-INF/wsdl/loanServicePT.wsdl 2009-12-09 16:26:04 UTC (rev 373)
@@ -118,7 +118,7 @@
</wsdl:binding>
<wsdl:service name="loanService">
<wsdl:port name="loanService_Port" binding="tns:loanService_Binding">
- <soap:address location="http://localhost:8080/bpel/processes/loanService" />
+ <soap:address location="http://localhost:8080/Quickstart_bpel_loan_approvalWS" />
</wsdl:port></wsdl:service>
<wsdl:service name="loanApprover">
<wsdl:port name="loanApprover_Port" binding="tns:loanApprover_Binding">
Modified: trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/OrderManager.wsdl
===================================================================
--- trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/OrderManager.wsdl 2009-12-08 16:42:31 UTC (rev 372)
+++ trunk/samples/esb/webservice_esb_bpel/bpel/wsdl/OrderManager.wsdl 2009-12-09 16:26:04 UTC (rev 373)
@@ -239,7 +239,7 @@
<port name="RetailerCallbackSoap"
binding="tns:RetailerCallbackSoap">
<soap:address
- location="http://localhost:8080/bpel/processes/RetailerCallback"
+ location="http://localhost:8080/Webservice_esb_bpel_RetailerCallback"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" />
</port>
</service>
Modified: trunk/samples/esb/webservice_esb_bpel/jboss-esb.xml
===================================================================
--- trunk/samples/esb/webservice_esb_bpel/jboss-esb.xml 2009-12-08 16:42:31 UTC (rev 372)
+++ trunk/samples/esb/webservice_esb_bpel/jboss-esb.xml 2009-12-09 16:26:04 UTC (rev 373)
@@ -133,7 +133,7 @@
template and will then use OGNL to populate the values (from the Smooks
EXTRACTED_BEANS_HASH) into the soap message. -->
<action name="SendSalesOrderNotification" class="org.jboss.soa.esb.actions.soap.SOAPClient">
- <property name="wsdl" value="http://localhost:8080/bpel/processes/RetailerCallback?wsdl"/>
+ <property name="wsdl" value="http://localhost:8080/Webservice_esb_bpel_RetailerCallback?wsdl&resou..." />
<property name="SOAPAction" value="http://org.jboss.esb/quickstarts/bpel/ABI_OrderManager/SendSalesOrderNoti..."/>
<property name="responseXStreamConfig">
<alias name="salesOrderNotificationAck" class="java.lang.Boolean" namespace="http://org.jboss.esb/quickstarts/bpel/ABI_OrderManager" />
Modified: trunk/samples/quickstart/loan_approval/war/resources/WEB-INF/wsdl/loanServicePT.wsdl
===================================================================
--- trunk/samples/quickstart/loan_approval/war/resources/WEB-INF/wsdl/loanServicePT.wsdl 2009-12-08 16:42:31 UTC (rev 372)
+++ trunk/samples/quickstart/loan_approval/war/resources/WEB-INF/wsdl/loanServicePT.wsdl 2009-12-09 16:26:04 UTC (rev 373)
@@ -118,7 +118,7 @@
</wsdl:binding>
<wsdl:service name="loanService">
<wsdl:port name="loanService_Port" binding="tns:loanService_Binding">
- <soap:address location="http://localhost:8080/bpel/processes/loanService" />
+ <soap:address location="http://localhost:8080/Quickstart_bpel_loan_approvalWS" />
</wsdl:port></wsdl:service>
<wsdl:service name="loanApprover">
<wsdl:port name="loanApprover_Port" binding="tns:loanApprover_Binding">
15 years, 10 months
riftsaw SVN: r372 - trunk/samples/esb/webservice_esb_bpel.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2009-12-08 11:42:31 -0500 (Tue, 08 Dec 2009)
New Revision: 372
Modified:
trunk/samples/esb/webservice_esb_bpel/jboss-structure.xml
Log:
Fixes RIFTSAW-133
Modified: trunk/samples/esb/webservice_esb_bpel/jboss-structure.xml
===================================================================
--- trunk/samples/esb/webservice_esb_bpel/jboss-structure.xml 2009-12-07 14:14:35 UTC (rev 371)
+++ trunk/samples/esb/webservice_esb_bpel/jboss-structure.xml 2009-12-08 16:42:31 UTC (rev 372)
@@ -12,6 +12,7 @@
<context>
<path name="Quickstart_webservice_bpel.war"/>
<metaDataPath>
+ <path name="WEB-INF"/>
<path name="META-INF"/>
</metaDataPath>
</context>
15 years, 10 months
riftsaw SVN: r371 - trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws.
by riftsaw-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-12-07 09:14:35 -0500 (Mon, 07 Dec 2009)
New Revision: 371
Modified:
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ServiceEndpointReference.java
Log:
Fix RIFTSAW-44: WS undeployment doesn't properly cleanup
Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java 2009-12-07 11:02:02 UTC (rev 370)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/EndpointManager.java 2009-12-07 14:14:35 UTC (rev 371)
@@ -27,7 +27,6 @@
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.deployers.client.spi.DeployerClient;
import org.jboss.deployers.client.spi.Deployment;
-import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.attachments.MutableAttachments;
import org.jboss.deployers.structure.spi.ClassLoaderFactory;
import org.jboss.deployers.structure.spi.DeploymentUnit;
@@ -44,8 +43,12 @@
import javax.xml.namespace.QName;
import java.io.File;
+import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.RandomAccessFile;
import java.net.URL;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileLock;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -57,21 +60,21 @@
* @see org.jboss.soa.bpel.runtime.ws.AbstractWebServiceEndpoint
* @see org.jboss.soa.bpel.runtime.ws.WebServiceClient
* @see org.jboss.soa.bpel.runtime.engine.ode.JAXWSBindingContext
- *
+ *
* @author Heiko.Braun <heiko.braun(a)jboss.com>
*/
public class EndpointManager
{
protected final Log log = LogFactory.getLog(getClass());
- private Map<String, ServiceEndpointReference> endpointMapping = new ConcurrentHashMap<String, ServiceEndpointReference>();
+ private Map<String, ServiceEndpointReference> endpointMapping = new ConcurrentHashMap<String, ServiceEndpointReference>();
private ServerConfig serverConfig;
private ExecutionEnvironment executionEnvironment;
public EndpointManager(ExecutionEnvironment executionEnvironment)
{
- this.executionEnvironment = executionEnvironment;
+ this.executionEnvironment = executionEnvironment;
this.serverConfig = ServerConfigFactory.getServerConfig();
}
@@ -131,7 +134,7 @@
);
ref.setArchiveLocation(warArchive.getAbsolutePath());
-
+
endpointMapping.put(
createEndpointKey(metaData.getServiceName(), metaData.getPortName()),
ref
@@ -183,7 +186,7 @@
throws IOException
{
VirtualFile webAppVFS = VFS.getRoot(war.toURL());
- return VFSDeploymentFactory.getInstance().createVFSDeployment(webAppVFS);
+ return VFSDeploymentFactory.getInstance().createVFSDeployment(webAppVFS);
}
public void removeEndpoint(QName service, String port) throws EndpointManagementException
@@ -196,10 +199,24 @@
{
try
{
+ // undeploy call
getMainDeployer().undeploy(deploymentId);
+
+ // unregister
endpointMapping.remove(key);
+
+ // remove physical artifacts
+ File warArchive = new File(ref.getArchiveLocation());
+ if(warArchive.exists())
+ {
+ if(!deleteDirectory(warArchive)) log.warn(warArchive + " could no be deleted");
+ }
+ else
+ {
+ log.warn(ref.getArchiveLocation() + " cannot be removed (doesn't exist).");
+ }
}
- catch (DeploymentException e)
+ catch (Exception e)
{
throw new EndpointManagementException("Failed to undeploy "+deploymentId, e);
}
@@ -263,11 +280,27 @@
new WebServiceClient(metaData, wsdlRef, executionEnvironment);
return client;
-
+
}
catch (Exception e)
{
throw new EndpointManagementException("Failed to create endpoint", e);
}
}
+
+ static public boolean deleteDirectory(File path)
+ {
+ if( path.exists() ) {
+ File[] files = path.listFiles();
+ for(int i=0; i<files.length; i++) {
+ if(files[i].isDirectory()) {
+ deleteDirectory(files[i]);
+ }
+ else {
+ files[i].delete();
+ }
+ }
+ }
+ return( path.delete() );
+ }
}
Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ServiceEndpointReference.java
===================================================================
--- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ServiceEndpointReference.java 2009-12-07 11:02:02 UTC (rev 370)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/ServiceEndpointReference.java 2009-12-07 14:14:35 UTC (rev 371)
@@ -25,19 +25,21 @@
import org.w3c.dom.Document;
/**
+ * References webservice endpoint deployment properties.
+ *
* @author Heiko.Braun <heiko.braun(a)jboss.com>
*/
public final class ServiceEndpointReference implements EndpointReference
{
private String endpointId;
- private String location;
+ private String serviceUrl;
private String deploymentName;
private String archiveLocation;
-
+
public ServiceEndpointReference(String endpointId, String location, String deploymentName)
{
this.endpointId = endpointId;
- this.location = location;
+ this.serviceUrl = location;
this.deploymentName = deploymentName;
}
@@ -58,7 +60,7 @@
ret = javax.xml.parsers.DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
org.w3c.dom.Element elem=ret.createElement("attr");
- elem.setAttribute("location", location);
+ elem.setAttribute("location", serviceUrl);
elem.setAttribute("endpointId", endpointId);
elem.setAttribute("deploymentName", deploymentName);
@@ -75,9 +77,9 @@
return endpointId;
}
- public String getLocation()
+ public String getServiceUrl()
{
- return location;
+ return serviceUrl;
}
public String getDeploymentName()
15 years, 10 months
riftsaw SVN: r370 - in trunk: runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws and 1 other directory.
by riftsaw-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-12-07 06:02:02 -0500 (Mon, 07 Dec 2009)
New Revision: 370
Modified:
trunk/pom.xml
trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java
Log:
Update to console 1.3-SNAPSHOT
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-12-04 14:34:44 UTC (rev 369)
+++ trunk/pom.xml 2009-12-07 11:02:02 UTC (rev 370)
@@ -68,7 +68,7 @@
<properties>
<riftsaw.ode.version>2.0-SNAPSHOT</riftsaw.ode.version>
<riftsaw.engine.version>2.0-SNAPSHOT</riftsaw.engine.version>
- <bpm.console.version>1.2.0</bpm.console.version>
+ <bpm.console.version>1.3.0-SNAPSHOT</bpm.console.version>
<commons.logging.version>1.1.1</commons.logging.version>
<junit.version>3.8.1</junit.version>
<jboss.version>5.0.0.GA</jboss.version>
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 2009-12-04 14:34:44 UTC (rev 369)
+++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/ws/WebServiceClient.java 2009-12-07 11:02:02 UTC (rev 370)
@@ -260,7 +260,7 @@
{
if(null==dispatcher)
{
- log.debug("Creating Dispatcher ("+this.id+") for on " + wsdlUrl + ": "+serviceName);
+ log.debug("Creating Dispatcher ("+this.id+") on " + wsdlUrl + ": "+serviceName);
Service service = Service.create(this.wsdlUrl, serviceName);
dispatcher = service.createDispatch(
15 years, 10 months
riftsaw SVN: r369 - trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2009-12-04 09:34:44 -0500 (Fri, 04 Dec 2009)
New Revision: 369
Added:
trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderWSDLTestCasePending.java
Removed:
trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderWSDLTestCase.java
Log:
Avoid testcase being run at the moment, as takes two minutes to timeout.
Deleted: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderWSDLTestCase.java
===================================================================
--- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderWSDLTestCase.java 2009-12-03 13:42:51 UTC (rev 368)
+++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderWSDLTestCase.java 2009-12-04 14:34:44 UTC (rev 369)
@@ -1,52 +0,0 @@
-/*
- * 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 junit.framework.Test;
-
-/**
- * Test case for running the Quickstart_bpel_hello_world_header_wsdl sample.
- */
-public class QuickstartBPELHelloWorldHeaderWSDLTestCase extends RiftSawTest {
-
- private static final String TEST_NAME = "Quickstart_bpel_hello_world_header_wsdl";
-
- public QuickstartBPELHelloWorldHeaderWSDLTestCase() {
- super(TEST_NAME);
- }
-
- public static Test suite() {
- return(new RiftSawTestSetup(QuickstartBPELHelloWorldHeaderWSDLTestCase.class,
- TEST_NAME, "Quickstart_bpel_hello_world_header_wsdl-1.jar"));
- }
-
- public void testSendHello() throws Exception {
- String result=sendSOAPMessage("hello_request1.xml",
- "http://localhost:8080/Quickstart_bpel_hello_world_header_wsdlWS");
-
- // TODO: Commented out until fixed (RIFTSAW-127)
- //assertMessageFromFile(result, "hello_response1.xml");
- }
-}
Copied: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderWSDLTestCasePending.java (from rev 367, trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderWSDLTestCase.java)
===================================================================
--- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderWSDLTestCasePending.java (rev 0)
+++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderWSDLTestCasePending.java 2009-12-04 14:34:44 UTC (rev 369)
@@ -0,0 +1,52 @@
+/*
+ * 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 junit.framework.Test;
+
+/**
+ * Test case for running the Quickstart_bpel_hello_world_header_wsdl sample.
+ */
+// TODO: Remove pending suffix when fixed (RIFTSAW-127)
+public class QuickstartBPELHelloWorldHeaderWSDLTestCasePending extends RiftSawTest {
+
+ private static final String TEST_NAME = "Quickstart_bpel_hello_world_header_wsdl";
+
+ public QuickstartBPELHelloWorldHeaderWSDLTestCasePending() {
+ super(TEST_NAME);
+ }
+
+ public static Test suite() {
+ return(new RiftSawTestSetup(QuickstartBPELHelloWorldHeaderWSDLTestCasePending.class,
+ TEST_NAME, "Quickstart_bpel_hello_world_header_wsdl-1.jar"));
+ }
+
+ public void testSendHello() throws Exception {
+ String result=sendSOAPMessage("hello_request1.xml",
+ "http://localhost:8080/Quickstart_bpel_hello_world_header_wsdlWS");
+
+ assertMessageFromFile(result, "hello_response1.xml");
+ }
+}
15 years, 10 months
riftsaw SVN: r368 - trunk/samples/quickstart.
by riftsaw-commits＠lists.jboss.org
Author: objectiser
Date: 2009-12-03 08:42:51 -0500 (Thu, 03 Dec 2009)
New Revision: 368
Modified:
trunk/samples/quickstart/readme.txt
Log:
Updated quickstart samples readme.txt to describe import into Eclipse.
Modified: trunk/samples/quickstart/readme.txt
===================================================================
--- trunk/samples/quickstart/readme.txt 2009-12-03 12:43:59 UTC (rev 367)
+++ trunk/samples/quickstart/readme.txt 2009-12-03 13:42:51 UTC (rev 368)
@@ -11,3 +11,9 @@
Each example has a selection of messages that can be sent using your
preferred SOAP client (e.g. soapui), or an ant target specific for
each project.
+
+These quickstart examples can also be imported into an Eclipse environment
+that has been configured with the BPEL plugins distributed with JBoss Tools
+(http://www.jboss.org/tools). Please see the RiftSaw User Guide for more
+information on importing these quickstart samples, and how to deploy them
+from within Eclipse to RiftSaw running in a JBoss AS server.
15 years, 10 months