Author: objectiser Date: 2009-12-06 08:47:06 -0500 (Sun, 06 Dec 2009) New Revision: 113 Added: validator/trunk/jbossesb/src/main/configs/META-INF/jbm-queue-service.xml validator/trunk/jbossesb/src/main/configs/META-INF/jboss-scanning.xml validator/trunk/jbossesb/src/main/configs/META-INF/jboss-structure.xml Modified: validator/trunk/distribution/src/files/jbossesb/conf/jbossesb-properties-validator.xml validator/trunk/distribution/src/files/jbossesb/conf/jbossesb-properties.xml validator/trunk/distribution/src/main/assembly/bin.xml validator/trunk/distribution/src/main/release/install/build.xml validator/trunk/jbossesb/pom.xml validator/trunk/jbossesb/src/main/configs/META-INF/deployment.xml validator/trunk/jbossesb/src/main/configs/esb-assembly.xml Log: Updated validator build and installation, so that pi4soa and EMF jars are directly included in the validator.esb, rather than separate pi4soa.sar. Also updated the ESB config file that incorporates the filter to be ESB4.7 based. Modified: validator/trunk/distribution/src/files/jbossesb/conf/jbossesb-properties-validator.xml =================================================================== --- validator/trunk/distribution/src/files/jbossesb/conf/jbossesb-properties-validator.xml 2009-12-06 12:09:04 UTC (rev 112) +++ validator/trunk/distribution/src/files/jbossesb/conf/jbossesb-properties-validator.xml 2009-12-06 13:47:06 UTC (rev 113) @@ -1,95 +1,153 @@ -<?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.context.factory" value="org.jnp.interfaces.NamingContextFactory"/> - <property name="org.jboss.soa.esb.jndi.server.url" value="${jboss.bind.address}:1099"/> - <property name="org.jboss.soa.esb.persistence.connection.factory" value="org.jboss.internal.soa.esb.persistence.format.MessageStoreFactoryImpl"/> - <property name="org.jboss.soa.esb.loadbalancer.policy" value="org.jboss.soa.esb.listeners.ha.RoundRobin"/> - <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.registry.local.InquiryService#inquire"/> - <property name="org.jboss.soa.esb.registry.lifeCycleManagerURI" value="org.apache.juddi.registry.local.PublishService#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"/> - <!-- 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"/> - </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"/> - <property name="org.jboss.soa.esb.mail.smtp.auth" value="true"/> - <property name="org.jboss.soa.esb.ftp.localdir" value="/tmp"/> - <property name="org.jboss.soa.esb.ftp.remotedir" value="/tmp"/> - <property name="org.jboss.soa.esb.jms.connectionPool" value="20"/> - <property name="org.jboss.soa.esb.jms.sessionSleep" value="30"/> - </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"> - - <!-- connection manager type --> - <!-- <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.internal.soa.esb.persistence.manager.StandaloneConnectionManager"/> --> - <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.internal.soa.esb.persistence.manager.J2eeConnectionManager"/> - - <!-- this property is only used if using the j2ee connection manager --> - <property name="org.jboss.soa.esb.persistence.db.datasource.name" value="java:/JBossESBDS"/> - - <!-- standalone connection pooling settings --> - <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"/> - <property name="org.jboss.soa.esb.persistence.db.pool.timeout.millis" value="5000"/> - - </properties> - <properties name="filters"> - <property name="org.jboss.soa.esb.filter.1" value="org.jboss.internal.soa.esb.message.filter.MetaDataFilter"/> - <property name="org.jboss.soa.esb.filter.2" value="org.jboss.internal.soa.esb.message.filter.GatewayFilter"/> - <property name="org.jboss.soa.esb.filter.10" value="org.jboss.soa.overlord.validator.jbossesb.ValidatorFilter" /> - </properties> -</esb> +<?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.context.factory" value="org.jnp.interfaces.NamingContextFactory"/> + <property name="org.jboss.soa.esb.jndi.server.url" value="${jboss.esb.bind.address}:1099"/> + <property name="org.jboss.soa.esb.persistence.connection.factory" value="org.jboss.internal.soa.esb.persistence.format.MessageStoreFactoryImpl"/> + <property name="org.jboss.soa.esb.loadbalancer.policy" value="org.jboss.soa.esb.listeners.ha.RoundRobin"/> + <property name="org.jboss.soa.esb.mime.text.types" value="text/*;application/xml;application/*-xml"/> + <property name="jboss.esb.invm.scope.default" value="NONE"/> + </properties> + <properties name="security"> + <property name="org.jboss.soa.esb.services.security.implementationClass" value="org.jboss.internal.soa.esb.services.security.JaasSecurityService"/> + <property name="org.jboss.soa.esb.services.security.callbackHandler" value="org.jboss.internal.soa.esb.services.security.UserPassCallbackHandler"/> + + <!-- Algorithm and key size for internal sealing of objects --> + <property name="org.jboss.soa.esb.services.security.sealAlgorithm" value="TripleDES"/> + <property name="org.jboss.soa.esb.services.security.sealKeySize" value="168"/> + + <!-- Timeout in milliseconds. After which the context is considered invalid --> + <property name="org.jboss.soa.esb.services.security.contextTimeout" value="30000"/> + <property name="org.jboss.soa.esb.services.security.contextPropagatorImplementationClass" value="org.jboss.internal.soa.esb.services.security.JBossASContextPropagator"/> + + <!-- Public keystore configuration used to hold keys for encryption/decryption --> + <property name="org.jboss.soa.esb.services.security.publicKeystore" value="/publicKeyStore"/> + <property name="org.jboss.soa.esb.services.security.publicKeystorePassword" value="testKeystorePassword"/> + <property name="org.jboss.soa.esb.services.security.publicKeyAlias" value="testAlias"/> + <property name="org.jboss.soa.esb.services.security.publicKeyPassword" value="testPassword"/> + <property name="org.jboss.soa.esb.services.security.publicKeyTransformation" value="RSA/ECB/PKCS1Padding"/> + + </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"/> + + <!-- specify the interceptors, in order --> + <property name="org.jboss.soa.esb.registry.interceptors" value="org.jboss.internal.soa.esb.services.registry.InVMRegistryInterceptor"/> + <!-- Example of specifying multiple registry interceptors + <property name="org.jboss.soa.esb.registry.interceptors" + value="org.jboss.internal.soa.esb.services.registry.InVMRegistryInterceptor, org.jboss.internal.soa.esb.services.registry.CachingRegistryInterceptor"/> + --> + + <!-- The following properties modify the cache interceptor behaviour --> + <property name="org.jboss.soa.esb.registry.cache.maxSize" value="100"/> + <property name="org.jboss.soa.esb.registry.cache.validityPeriod" value="600000"/> + + <!-- 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"/> + <property name="org.jboss.soa.esb.mail.smtp.auth" value="true"/> + <property name="org.jboss.soa.esb.ftp.localdir" value="/tmp"/> + <property name="org.jboss.soa.esb.ftp.remotedir" value="/tmp"/> + <property name="org.jboss.soa.esb.jms.connectionPool" value="20"/> + <property name="org.jboss.soa.esb.jms.sessionSleep" value="30"/> + <!-- expiry of messages to temporary invm destinations (default replies) + expire after the following timeout, specified in milliseconds (5 mins) --> + <property name="org.jboss.soa.esb.invm.expiryTime" value="300000"/> + + <!-- Uncomment this to return stack traces when exposing an ESB service through WS + <property name="org.jboss.soa.esb.ws.returnStackTrace" value="true"/> + --> + <!-- Uncomment this to specify the WS response timeout when exposing an ESB service through WS + <property name="org.jboss.soa.esb.ws.timeout" value="30000"/> + --> + </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="jca"> + <property name="org.jboss.soa.esb.jca.activation.mapper.jms-ra.rar" value="org.jboss.soa.esb.listeners.jca.JBossActivationMapper"/> + <property name="org.jboss.soa.esb.jca.activation.mapper.wmq.jmsra.rar" value="org.jboss.soa.esb.listeners.jca.WMQActivationMapper"/> + </properties> + + <properties name="dbstore"> + + <!-- connection manager type --> + <!-- <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.internal.soa.esb.persistence.manager.StandaloneConnectionManager"/> --> + <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.internal.soa.esb.persistence.manager.J2eeConnectionManager"/> + + <!-- this property is only used if using the j2ee connection manager --> + <property name="org.jboss.soa.esb.persistence.db.datasource.name" value="java:/JBossESBDS"/> + + <!-- standalone connection pooling settings --> + <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"/> + <property name="org.jboss.soa.esb.persistence.db.pool.timeout.millis" value="5000"/> + + </properties> + <properties name="filters"> + <property name="org.jboss.soa.esb.filter.1" value="org.jboss.internal.soa.esb.message.filter.MetaDataFilter"/> + <property name="org.jboss.soa.esb.filter.2" value="org.jboss.internal.soa.esb.message.filter.GatewayFilter"/> + <property name="org.jboss.soa.esb.filter.10" value="org.jboss.savara.validator.jbossesb.ValidatorFilter" /> + </properties> + + <properties name="rules"> + <!-- change this to true if you wish to have the same behaviour as ESB4.6 and prior (including SOA 4.3) --> + <property name="org.jboss.soa.esb.services.rules.continueState" value="false"/> + </properties> +</esb> Modified: validator/trunk/distribution/src/files/jbossesb/conf/jbossesb-properties.xml =================================================================== --- validator/trunk/distribution/src/files/jbossesb/conf/jbossesb-properties.xml 2009-12-06 12:09:04 UTC (rev 112) +++ validator/trunk/distribution/src/files/jbossesb/conf/jbossesb-properties.xml 2009-12-06 13:47:06 UTC (rev 113) @@ -32,20 +32,58 @@ xsi:noNamespaceSchemaLocation="jbossesb-1_0.xsd"> <properties name="core"> <property name="org.jboss.soa.esb.jndi.server.context.factory" value="org.jnp.interfaces.NamingContextFactory"/> - <property name="org.jboss.soa.esb.jndi.server.url" value="${jboss.bind.address}:1099"/> + <property name="org.jboss.soa.esb.jndi.server.url" value="${jboss.esb.bind.address}:1099"/> <property name="org.jboss.soa.esb.persistence.connection.factory" value="org.jboss.internal.soa.esb.persistence.format.MessageStoreFactoryImpl"/> <property name="org.jboss.soa.esb.loadbalancer.policy" value="org.jboss.soa.esb.listeners.ha.RoundRobin"/> + <property name="org.jboss.soa.esb.mime.text.types" value="text/*;application/xml;application/*-xml"/> <property name="jboss.esb.invm.scope.default" value="NONE"/> </properties> + <properties name="security"> + <property name="org.jboss.soa.esb.services.security.implementationClass" value="org.jboss.internal.soa.esb.services.security.JaasSecurityService"/> + <property name="org.jboss.soa.esb.services.security.callbackHandler" value="org.jboss.internal.soa.esb.services.security.UserPassCallbackHandler"/> + + <!-- Algorithm and key size for internal sealing of objects --> + <property name="org.jboss.soa.esb.services.security.sealAlgorithm" value="TripleDES"/> + <property name="org.jboss.soa.esb.services.security.sealKeySize" value="168"/> + + <!-- Timeout in milliseconds. After which the context is considered invalid --> + <property name="org.jboss.soa.esb.services.security.contextTimeout" value="30000"/> + <property name="org.jboss.soa.esb.services.security.contextPropagatorImplementationClass" value="org.jboss.internal.soa.esb.services.security.JBossASContextPropagator"/> + + <!-- Public keystore configuration used to hold keys for encryption/decryption --> + <property name="org.jboss.soa.esb.services.security.publicKeystore" value="/publicKeyStore"/> + <property name="org.jboss.soa.esb.services.security.publicKeystorePassword" value="testKeystorePassword"/> + <property name="org.jboss.soa.esb.services.security.publicKeyAlias" value="testAlias"/> + <property name="org.jboss.soa.esb.services.security.publicKeyPassword" value="testPassword"/> + <property name="org.jboss.soa.esb.services.security.publicKeyTransformation" value="RSA/ECB/PKCS1Padding"/> + + </properties> <properties name="registry"> - <property name="org.jboss.soa.esb.registry.queryManagerURI" value="org.apache.juddi.registry.local.InquiryService#inquire"/> - <property name="org.jboss.soa.esb.registry.lifeCycleManagerURI" value="org.apache.juddi.registry.local.PublishService#publish"/> + <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="jbossesb"/> - <property name="org.jboss.soa.esb.registry.password" value="password"/> + <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"/> + + <!-- specify the interceptors, in order --> + <property name="org.jboss.soa.esb.registry.interceptors" value="org.jboss.internal.soa.esb.services.registry.InVMRegistryInterceptor"/> + <!-- Example of specifying multiple registry interceptors + <property name="org.jboss.soa.esb.registry.interceptors" + value="org.jboss.internal.soa.esb.services.registry.InVMRegistryInterceptor, org.jboss.internal.soa.esb.services.registry.CachingRegistryInterceptor"/> + --> + + <!-- The following properties modify the cache interceptor behaviour --> + <property name="org.jboss.soa.esb.registry.cache.maxSize" value="100"/> + <property name="org.jboss.soa.esb.registry.cache.validityPeriod" value="600000"/> + + <!-- 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"/> @@ -57,14 +95,29 @@ <property name="org.jboss.soa.esb.ftp.remotedir" value="/tmp"/> <property name="org.jboss.soa.esb.jms.connectionPool" value="20"/> <property name="org.jboss.soa.esb.jms.sessionSleep" value="30"/> + <!-- expiry of messages to temporary invm destinations (default replies) + expire after the following timeout, specified in milliseconds (5 mins) --> + <property name="org.jboss.soa.esb.invm.expiryTime" value="300000"/> + + <!-- Uncomment this to return stack traces when exposing an ESB service through WS + <property name="org.jboss.soa.esb.ws.returnStackTrace" value="true"/> + --> + <!-- Uncomment this to specify the WS response timeout when exposing an ESB service through WS + <property name="org.jboss.soa.esb.ws.timeout" value="30000"/> + --> </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"/> </properties> + <properties name="jca"> + <property name="org.jboss.soa.esb.jca.activation.mapper.jms-ra.rar" value="org.jboss.soa.esb.listeners.jca.JBossActivationMapper"/> + <property name="org.jboss.soa.esb.jca.activation.mapper.wmq.jmsra.rar" value="org.jboss.soa.esb.listeners.jca.WMQActivationMapper"/> + </properties> + <properties name="dbstore"> <!-- connection manager type --> @@ -91,4 +144,9 @@ <property name="org.jboss.soa.esb.filter.1" value="org.jboss.internal.soa.esb.message.filter.MetaDataFilter"/> <property name="org.jboss.soa.esb.filter.2" value="org.jboss.internal.soa.esb.message.filter.GatewayFilter"/> </properties> + + <properties name="rules"> + <!-- change this to true if you wish to have the same behaviour as ESB4.6 and prior (including SOA 4.3) --> + <property name="org.jboss.soa.esb.services.rules.continueState" value="false"/> + </properties> </esb> Modified: validator/trunk/distribution/src/main/assembly/bin.xml =================================================================== --- validator/trunk/distribution/src/main/assembly/bin.xml 2009-12-06 12:09:04 UTC (rev 112) +++ validator/trunk/distribution/src/main/assembly/bin.xml 2009-12-06 13:47:06 UTC (rev 113) @@ -43,6 +43,11 @@ <outputDirectory>/install</outputDirectory> </fileSet> + <fileSet> + <directory>src/files/jbossesb/conf</directory> + <outputDirectory>/modules</outputDirectory> + </fileSet> + <!-- copy documents --> <fileSet> <directory>../docs/samplesguide/target/docbook/publish/en-US</directory> Modified: validator/trunk/distribution/src/main/release/install/build.xml =================================================================== --- validator/trunk/distribution/src/main/release/install/build.xml 2009-12-06 12:09:04 UTC (rev 112) +++ validator/trunk/distribution/src/main/release/install/build.xml 2009-12-06 13:47:06 UTC (rev 113) @@ -9,6 +9,7 @@ <property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/> <property name="conf.dir" value="${server.dir}/conf"/> <property name="deploy.dir" value="${server.dir}/deploy"/> + <property name="deployers.dir" value="${server.dir}/deployers"/> <property name="server.lib.dir" value="${server.dir}/lib"/> <property name="modules" value="../modules" /> @@ -24,16 +25,30 @@ <fail unless="as.configured" message="Cannot determine target deployment, please check deployment.properties"/> </target> - <target name="deploy" description="Deploys SAVARA Validator to the server"> - <echo message="Deploy SAVARA Validator to JBoss AS/ESB server" /> - <copy todir="${deploy.dir}/savara-validator-jbossesb.esb"> + <target name="deploy" depends="check.deploy.props,register-validator-filter" + description="Deploys SAVARA Validator to the server"> + <echo message="Deploy SAVARA Validator to JBoss AS/ESB server" /> + <copy todir="${deploy.dir}/savara-validator-jbossesb.esb"> <fileset dir="${modules}/savara-validator-jbossesb.esb"/> - </copy> + </copy> </target> - <target name="undeploy" description="Undeploys SAVARA Validator"> - <echo message="Undeploy the SAVARA Validator from JBoss AS/ESB server" /> - <delete dir="${deploy.dir}/savara-validator-jbossesb.esb" /> + <target name="undeploy" depends="unregister-validator-filter" description="Undeploys SAVARA Validator"> + <echo message="Undeploy the SAVARA Validator from JBoss AS/ESB server" /> + <delete dir="${deploy.dir}/savara-validator-jbossesb.esb" /> </target> + + <target name="register-validator-filter"> + <echo message="register the validator filter in the jbossesb-properties file" /> + <delete file="${deployers.dir}/esb.deployer/jbossesb-properties.xml" /> + <copy file="${modules}/conf/jbossesb-properties-validator.xml" tofile="${deployers.dir}/esb.deployer/jbossesb-properties.xml" /> + </target> + + <target name="unregister-validator-filter"> + <echo message="unregister the validator filter from the jbossesb-properties file" /> + <delete file="${deployers.dir}/esb.deployer/jbossesb-properties.xml" /> + <copy file="${modules}/conf/jbossesb-properties.xml" tofile="${deployers.dir}/esb.deployer/jbossesb-properties.xml" /> + </target> + </project> Modified: validator/trunk/jbossesb/pom.xml =================================================================== --- validator/trunk/jbossesb/pom.xml 2009-12-06 12:09:04 UTC (rev 112) +++ validator/trunk/jbossesb/pom.xml 2009-12-06 13:47:06 UTC (rev 113) @@ -34,31 +34,31 @@ <groupId>org.jboss.overlord.dependencies.org.pi4soa</groupId> <artifactId>pi4soa-common</artifactId> <version>2.0</version> - <scope>provided</scope> + <!-- >scope>provided</scope --> </dependency> <dependency> <groupId>org.jboss.overlord.dependencies.org.pi4soa</groupId> <artifactId>pi4soa-cdl</artifactId> <version>2.0</version> - <scope>provided</scope> + <!-- >scope>provided</scope --> </dependency> <dependency> <groupId>org.jboss.overlord.dependencies.org.pi4soa</groupId> <artifactId>pi4soa-service</artifactId> <version>2.0</version> - <scope>provided</scope> + <!-- >scope>provided</scope --> </dependency> <dependency> <groupId>org.jboss.overlord.dependencies.org.eclipse.emf</groupId> <artifactId>emf-common</artifactId> <version>2.3.0</version> - <scope>provided</scope> + <!-- >scope>provided</scope --> </dependency> <dependency> <groupId>org.jboss.overlord.dependencies.org.eclipse.emf</groupId> <artifactId>emf-ecore</artifactId> <version>2.3.1</version> - <scope>provided</scope> + <!-- >scope>provided</scope --> </dependency> </dependencies> Modified: validator/trunk/jbossesb/src/main/configs/META-INF/deployment.xml =================================================================== --- validator/trunk/jbossesb/src/main/configs/META-INF/deployment.xml 2009-12-06 12:09:04 UTC (rev 112) +++ validator/trunk/jbossesb/src/main/configs/META-INF/deployment.xml 2009-12-06 13:47:06 UTC (rev 113) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <jbossesb-deployment> <depends>jboss.esb:deployment=jbossesb.esb</depends> - <depends>pi4soa:service=pi4soa</depends> + <depends>jboss.messaging.destination:service=Topic,name=tracker</depends> </jbossesb-deployment> Added: validator/trunk/jbossesb/src/main/configs/META-INF/jbm-queue-service.xml =================================================================== --- validator/trunk/jbossesb/src/main/configs/META-INF/jbm-queue-service.xml (rev 0) +++ validator/trunk/jbossesb/src/main/configs/META-INF/jbm-queue-service.xml 2009-12-06 13:47:06 UTC (rev 113) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<server> + + <mbean code="org.jboss.jms.server.destination.TopicService" + name="jboss.messaging.destination:service=Topic,name=tracker" + xmbean-dd="xmdesc/Topic-xmbean.xml"> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + </mbean> + +</server> Added: validator/trunk/jbossesb/src/main/configs/META-INF/jboss-scanning.xml =================================================================== --- validator/trunk/jbossesb/src/main/configs/META-INF/jboss-scanning.xml (rev 0) +++ validator/trunk/jbossesb/src/main/configs/META-INF/jboss-scanning.xml 2009-12-06 13:47:06 UTC (rev 113) @@ -0,0 +1,3 @@ +<scanning xmlns="urn:jboss:scanning:1.0"> + <!-- prevent scanning for annotations --> +</scanning> Added: validator/trunk/jbossesb/src/main/configs/META-INF/jboss-structure.xml =================================================================== --- validator/trunk/jbossesb/src/main/configs/META-INF/jboss-structure.xml (rev 0) +++ validator/trunk/jbossesb/src/main/configs/META-INF/jboss-structure.xml 2009-12-06 13:47:06 UTC (rev 113) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<structure> + <context> + <path name=""/> + <metaDataPath> + <path name="META-INF"/> + </metaDataPath> + <classpath> + <path name=""/> + <path name="" suffixes=".jar" /> + <path name="lib" suffixes=".jar" /> + </classpath> + </context> +</structure> Modified: validator/trunk/jbossesb/src/main/configs/esb-assembly.xml =================================================================== --- validator/trunk/jbossesb/src/main/configs/esb-assembly.xml 2009-12-06 12:09:04 UTC (rev 112) +++ validator/trunk/jbossesb/src/main/configs/esb-assembly.xml 2009-12-06 13:47:06 UTC (rev 113) @@ -17,9 +17,14 @@ <dependencySets> <dependencySet> - <outputDirectory>/</outputDirectory> + <outputDirectory>/lib</outputDirectory> <includes> <include>org.jboss.savara.validator:savara-validator-jbossesb</include> + <include>org.jboss.overlord.dependencies.org.pi4soa:pi4soa-common</include> + <include>org.jboss.overlord.dependencies.org.pi4soa:pi4soa-cdl</include> + <include>org.jboss.overlord.dependencies.org.pi4soa:pi4soa-service</include> + <include>org.jboss.overlord.dependencies.org.eclipse.emf:emf-common</include> + <include>org.jboss.overlord.dependencies.org.eclipse.emf:emf-ecore</include> </includes> </dependencySet> </dependencySets>