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>