[riftsaw-commits] riftsaw SVN: r1292 - in trunk: distribution/src/main/release and 6 other directories.

Author: objectiser Date: 2011-02-02 09:43:42 -0500 (Wed, 02 Feb 2011) New Revision: 1292 Added: trunk/distribution/src/main/release/conf/ trunk/distribution/src/main/release/conf/bpel.properties trunk/distribution/src/main/release/conf/jboss/as5.properties trunk/distribution/src/main/release/conf/jboss/as6.properties trunk/distribution/src/main/release/conf/jboss/jboss-beans.xml trunk/distribution/src/main/release/conf/jdbc/sybase.properties Removed: trunk/distribution/src/main/release/conf/bpel.properties trunk/distribution/src/main/release/conf/jboss/jboss-beans.xml trunk/distribution/src/main/release/conf/jdbc/sybase.properties trunk/distribution/src/main/release/db/ Modified: trunk/distribution/src/main/assembly/bin.xml trunk/distribution/src/main/release/install/build.xml trunk/docs/docbook/gettingstartedguide/src/main/en-US/module/installation.xml trunk/integration-tests/build.xml Log: RIFTSAW-339 - renamed top level 'db' folder to 'conf' as contents is now wider than just configuration info for db/drivers/sql etc. Modified: trunk/distribution/src/main/assembly/bin.xml =================================================================== --- trunk/distribution/src/main/assembly/bin.xml 2011-02-01 00:29:05 UTC (rev 1291) +++ trunk/distribution/src/main/assembly/bin.xml 2011-02-02 14:43:42 UTC (rev 1292) @@ -43,8 +43,8 @@ </fileSet> <fileSet> - <directory>src/main/release/db</directory> - <outputDirectory>/db</outputDirectory> + <directory>src/main/release/conf</directory> + <outputDirectory>/conf</outputDirectory> </fileSet> <fileSet> @@ -172,7 +172,7 @@ </dependencySet> <dependencySet> - <outputDirectory>/db/drivers</outputDirectory> + <outputDirectory>/conf/drivers</outputDirectory> <includes> <include>net.sourceforge.jtds:jtds</include> <include>postgresql:postgresql</include> @@ -243,7 +243,7 @@ <!-- juddi-client, should be removed once esb catches up to 3.0.4--> <dependencySet> - <outputDirectory>/db/juddi</outputDirectory> + <outputDirectory>/conf/juddi</outputDirectory> <includes> <include>org.apache.juddi:juddi-client</include> </includes> Copied: trunk/distribution/src/main/release/conf (from rev 1272, trunk/distribution/src/main/release/db) Deleted: trunk/distribution/src/main/release/conf/bpel.properties =================================================================== --- trunk/distribution/src/main/release/db/bpel.properties 2011-01-25 14:01:32 UTC (rev 1272) +++ trunk/distribution/src/main/release/conf/bpel.properties 2011-02-02 14:43:42 UTC (rev 1292) @@ -1,142 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - -## bpel Configuraiton Properties - -## Database Mode ("INTERNAL", "EXTERNAL", "EMBEDDED") -## What kind of database should ODE use? -## * "EMBEDDED" - ODE will create its own embbeded database (Derby) -## and connection pool (Minerva). -## * "EXTERNAL" - ODE will use an app-server provided database and pool. -## The "ode-jbi.db.ext.dataSource" property will need to -## be set. -## * "INTERNAL" - ODE will create its own connection pool for a user- -## specified JDBC URL and driver. -#bpel.db.mode=EMBEDDED - -## External Database [JNDI Name] -## JNDI Name of the DataSource for the ODE database. This is only -## used if the "ode-jbi.db.mode" property is set to "EXTERNAL" -#bpel.db.ext.dataSource=java:comp/env/jdbc/ode - -## Embedded Database Name [String] -## Name of the embedded Derby database. This is only used if the -## "ode-jbi.db.mode" property is set to "EMBEDDED". -#ode-jbi.db.emb.name=hibdb -#ode-jbi.db.emb.name=jpadb - -## Internal Database Configuration -#ode-jbi.db.int.jdbcurl=jdbc:mysql://localhost/ode?user=sa -#ode-jbi.db.int.driver=com.mysql.jdbc.Driver -#bpel.db.int.password = -#bpel.db.int.username = - -## DB Pool Configuration for internal DB -#bpel.db.pool.max = 10 -#bpel.db.pool.min = 1 - -## DAO Connection Factory class. -## uncomment the following for hibernate. - -bpel.dao.factory=org.apache.ode.dao.jpa.hibernate.BpelDAOConnectionFactoryImpl -bpel.dao.factory.store=org.apache.ode.dao.jpa.hibernate.ConfStoreDAOConnectionFactoryImpl -bpel.dao.factory.scheduler=org.apache.ode.dao.jpa.hibernate.SchedulerDAOConnectionFactoryImpl -bpel.cache.provider=(a)cache.provider@ - -## Transaction Factory -## default is org.apache.ode.il.EmbeddedGeronimoFactory -## available alternatives are: -## org.apache.ode.axis2.util.GeronimoFactory -## org.apache.ode.axis2.util.JBossFactory -## org.apache.ode.axis2.util.TomcatFactory - -## org.apache.ode.axis2.util.WLSFactory -bpel.tx.factory.class = org.jboss.soa.bpel.runtime.engine.ode.JBossTransactionFactory - -## JCA connector port (default 2099), set to 0 to disable JCA connector -#bpel.jca.port = - -## JCA conncetor name (default 'ode') -#bpel.jca.name = - -## Working dir -#bpel.working.dir = - -## MEX Interceptors -#bpel.mex.interceptors = - -## Process dehydration -#bpel.process.dehydration = - -## Extension Bundles -## FQCNs, comma separated. -#bpel.extension.bundles.runtime = -#bpel.extension.bundles.validation = - -bpel.db.mode=EXTERNAL -db.emb.create=false -bpel.db.ext.dataSource=java:BPELDB - -# if set to true will self-register BPEL endpoints upon deployment to a UDDI. -# this uses the juddi-client-3.0.x and the uddi client config can be set in the uddi.xml -# file -bpel.uddi.registration=false -# if set to true will lookup BPEL endpoints in a UDDI Registry. -# this uses the juddi-client-3.0.x and the uddi client config can be set in the uddi.xml -# file -bpel.uddi.lookup=false -# implementation of the client integration class -bpel.uddi.client.impl=org.jboss.soa.bpel.uddi.UDDIRegistrationImpl -# the uddi client config in case you want to use your own client config rather then -# jbossesb.saw/esb.uddi.client.xml. Commented out by default. -#bpel.uddi.config=META-INF/bpel.uddi.client.xml -# only if you don't specify the bpel.uddi.config you need to specify the name of the clerk manager -bpel.uddi.clerk.manager=esb-registry -# name of the clerk -bpel.uddi.clerk=BPELClerk - -bpel.jaxws.client.initializer.impl=(a)jaxws.client.initializer.impl@ - -# This property defines whether the Web Service interface should be updated when a new version -# of the BPEL process is deployed. If the property is false, then the web service interface -# will be updated when a new version is deployed, however this means that the service will -# briefly be unavailable during the transition. If the property is true, then the web service -# interface associated with the first deployed version will be maintained during the deployment -# of subsequent versions. -bpel.ws.stableInterface = false - -# all hibernate specific properties - -hibernate.dialect=@dialect@ -hibernate.hbm2ddl.auto=none -hibernate.current_session_context_class=jta -hibernate.transaction.manager_lookup_class=org.hibernate.transaction.JBossTransactionManagerLookup -hibernate.show_sql=false -hibernate.connection.isolation=2 -hibernate.jdbc.batch_size=20 - - -jta.UserTransaction=UserTransaction - -ode.persistence=hibernate - -# -# BPAF History -# -bpel.event.listeners=org.jboss.soa.bpel.console.bpaf.BPAFLogAdapter Copied: trunk/distribution/src/main/release/conf/bpel.properties (from rev 1274, trunk/distribution/src/main/release/db/bpel.properties) =================================================================== --- trunk/distribution/src/main/release/conf/bpel.properties (rev 0) +++ trunk/distribution/src/main/release/conf/bpel.properties 2011-02-02 14:43:42 UTC (rev 1292) @@ -0,0 +1,148 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +## bpel Configuraiton Properties + +## Database Mode ("INTERNAL", "EXTERNAL", "EMBEDDED") +## What kind of database should ODE use? +## * "EMBEDDED" - ODE will create its own embbeded database (Derby) +## and connection pool (Minerva). +## * "EXTERNAL" - ODE will use an app-server provided database and pool. +## The "ode-jbi.db.ext.dataSource" property will need to +## be set. +## * "INTERNAL" - ODE will create its own connection pool for a user- +## specified JDBC URL and driver. +#bpel.db.mode=EMBEDDED + +## External Database [JNDI Name] +## JNDI Name of the DataSource for the ODE database. This is only +## used if the "ode-jbi.db.mode" property is set to "EXTERNAL" +#bpel.db.ext.dataSource=java:comp/env/jdbc/ode + +## Embedded Database Name [String] +## Name of the embedded Derby database. This is only used if the +## "ode-jbi.db.mode" property is set to "EMBEDDED". +#ode-jbi.db.emb.name=hibdb +#ode-jbi.db.emb.name=jpadb + +## Internal Database Configuration +#ode-jbi.db.int.jdbcurl=jdbc:mysql://localhost/ode?user=sa +#ode-jbi.db.int.driver=com.mysql.jdbc.Driver +#bpel.db.int.password = +#bpel.db.int.username = + +## DB Pool Configuration for internal DB +#bpel.db.pool.max = 10 +#bpel.db.pool.min = 1 + +## DAO Connection Factory class. +## uncomment the following for hibernate. + +bpel.dao.factory=org.apache.ode.dao.jpa.hibernate.BpelDAOConnectionFactoryImpl +bpel.dao.factory.store=org.apache.ode.dao.jpa.hibernate.ConfStoreDAOConnectionFactoryImpl +bpel.dao.factory.scheduler=org.apache.ode.dao.jpa.hibernate.SchedulerDAOConnectionFactoryImpl +bpel.cache.provider=(a)cache.provider@ + +## Transaction Factory +## default is org.apache.ode.il.EmbeddedGeronimoFactory +## available alternatives are: +## org.apache.ode.axis2.util.GeronimoFactory +## org.apache.ode.axis2.util.JBossFactory +## org.apache.ode.axis2.util.TomcatFactory + +## org.apache.ode.axis2.util.WLSFactory +bpel.tx.factory.class = org.jboss.soa.bpel.runtime.engine.ode.JBossTransactionFactory + +## JCA connector port (default 2099), set to 0 to disable JCA connector +#bpel.jca.port = + +## JCA conncetor name (default 'ode') +#bpel.jca.name = + +## Working dir +#bpel.working.dir = + +## MEX Interceptors +#bpel.mex.interceptors = + +## Process dehydration +#bpel.process.dehydration = + +## Extension Bundles +## FQCNs, comma separated. +#bpel.extension.bundles.runtime = +#bpel.extension.bundles.validation = + +bpel.db.mode=EXTERNAL +db.emb.create=false +bpel.db.ext.dataSource=java:BPELDB + +# if set to true will self-register BPEL endpoints upon deployment to a UDDI. +# this uses the juddi-client-3.0.x and the uddi client config can be set in the uddi.xml +# file +bpel.uddi.registration=false +# if set to true will lookup BPEL endpoints in a UDDI Registry. +# this uses the juddi-client-3.0.x and the uddi client config can be set in the uddi.xml +# file +bpel.uddi.lookup=false +# implementation of the client integration class +bpel.uddi.client.impl=org.jboss.soa.bpel.uddi.UDDIRegistrationImpl +# the uddi client config in case you want to use your own client config rather then +# jbossesb.saw/esb.uddi.client.xml. Commented out by default. +#bpel.uddi.config=META-INF/bpel.uddi.client.xml +# only if you don't specify the bpel.uddi.config you need to specify the name of the clerk manager +bpel.uddi.clerk.manager=esb-registry +# name of the clerk +bpel.uddi.clerk=BPELClerk + +bpel.jaxws.client.initializer.impl=(a)jaxws.client.initializer.impl@ + +# +# Properties used to configure the Dynamic Service Provider deployer and service config factory +# +bpel.dsp.service.deployer=(a)dsp.service.deployer@ +bpel.dsp.server.config.factory=(a)dsp.server.config.factory@ + +# This property defines whether the Web Service interface should be updated when a new version +# of the BPEL process is deployed. If the property is false, then the web service interface +# will be updated when a new version is deployed, however this means that the service will +# briefly be unavailable during the transition. If the property is true, then the web service +# interface associated with the first deployed version will be maintained during the deployment +# of subsequent versions. +bpel.ws.stableInterface = false + +# all hibernate specific properties + +hibernate.dialect=@dialect@ +hibernate.hbm2ddl.auto=none +hibernate.current_session_context_class=jta +hibernate.transaction.manager_lookup_class=org.hibernate.transaction.JBossTransactionManagerLookup +hibernate.show_sql=false +hibernate.connection.isolation=2 +hibernate.jdbc.batch_size=20 + + +jta.UserTransaction=UserTransaction + +ode.persistence=hibernate + +# +# BPAF History +# +bpel.event.listeners=org.jboss.soa.bpel.console.bpaf.BPAFLogAdapter Copied: trunk/distribution/src/main/release/conf/jboss/as5.properties (from rev 1281, trunk/distribution/src/main/release/db/jboss/as5.properties) =================================================================== --- trunk/distribution/src/main/release/conf/jboss/as5.properties (rev 0) +++ trunk/distribution/src/main/release/conf/jboss/as5.properties 2011-02-02 14:43:42 UTC (rev 1292) @@ -0,0 +1,4 @@ +dsp.service.deployer=org.jboss.soa.dsp.deployer.jbossas5.JBossServiceDeployer +dsp.server.config.factory=org.jboss.soa.dsp.server.jbossas5.JBossServerConfigFactory +kernel.locator=org.jboss.soa.dsp.server.jbossas5.KernelLocator +dsp.server.config.impl=org.jboss.soa.dsp.server.jbossas5.JBossServerConfigImpl Copied: trunk/distribution/src/main/release/conf/jboss/as6.properties (from rev 1281, trunk/distribution/src/main/release/db/jboss/as6.properties) =================================================================== --- trunk/distribution/src/main/release/conf/jboss/as6.properties (rev 0) +++ trunk/distribution/src/main/release/conf/jboss/as6.properties 2011-02-02 14:43:42 UTC (rev 1292) @@ -0,0 +1,4 @@ +dsp.service.deployer=org.jboss.soa.dsp.deployer.jbossas6.JBossServiceDeployer +dsp.server.config.factory=org.jboss.soa.dsp.server.jbossas6.JBossServerConfigFactory +kernel.locator=org.jboss.soa.dsp.server.jbossas6.KernelLocator +dsp.server.config.impl=org.jboss.soa.dsp.server.jbossas6.JBossServerConfigImpl Deleted: trunk/distribution/src/main/release/conf/jboss/jboss-beans.xml =================================================================== --- trunk/distribution/src/main/release/db/jboss/jboss-beans.xml 2011-01-25 14:01:32 UTC (rev 1272) +++ trunk/distribution/src/main/release/conf/jboss/jboss-beans.xml 2011-02-02 14:43:42 UTC (rev 1292) @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<deployment xmlns="urn:jboss:bean-deployer:2.0"> - - <bean class="org.jboss.soa.bpel.runtime.db.DatabaseInitializer" - name="BPELDatabaseInitializer"> - <property name="datasource"><value>java:/BPELDB</value></property> - <property name="existsSql"><value>select * from ODE_JOB</value></property> - <property name="sqlFiles"><value>bpel-sql/@database@.sql</value></property> - <property name="useEOL"><value>false</value></property> - <depends>jboss.jca:service=DataSourceBinding,name=BPELDB</depends> - </bean> - - <bean class="org.jboss.soa.bpel.runtime.engine.service.BPELEngineService" - name="BPELEngine"> - <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.bpel:service=BPELEngine", exposedInterface=org.jboss.soa.bpel.runtime.engine.service.BPELEngineServiceMBean.class,registerDirectly=true)</annotation> - <property name="jndiName"><value>bpel/Engine</value></property> - <property name="pmapiJndiName"><value>bpel/PMAPI</value></property> - <depends>jboss:service=Naming</depends> - <depends>BPELDatabaseInitializer</depends> - <depends>BPELDeployer</depends> - </bean> - - <!-- - Locate the single instance of the kernel - --> - <bean name="org.jboss.soa.dsp:service=KernelLocator" - class="org.jboss.soa.dsp.server.jboss.KernelLocator"> - <property name="kernel"> - <inject bean="jboss.kernel:service=Kernel" /> - </property> - </bean> - - <!-- - ServerConfig - --> - <bean name="org.jboss.soa.dsp:service=ServerConfig" - class="org.jboss.soa.dsp.server.jboss.JBossServerConfigImpl"> - <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> - <property name="webServiceHost">${jboss.bind.address}</property> - </bean> - - -</deployment> Copied: trunk/distribution/src/main/release/conf/jboss/jboss-beans.xml (from rev 1281, trunk/distribution/src/main/release/db/jboss/jboss-beans.xml) =================================================================== --- trunk/distribution/src/main/release/conf/jboss/jboss-beans.xml (rev 0) +++ trunk/distribution/src/main/release/conf/jboss/jboss-beans.xml 2011-02-02 14:43:42 UTC (rev 1292) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + + <bean class="org.jboss.soa.bpel.runtime.db.DatabaseInitializer" + name="BPELDatabaseInitializer"> + <property name="datasource"><value>java:/BPELDB</value></property> + <property name="existsSql"><value>select * from ODE_JOB</value></property> + <property name="sqlFiles"><value>bpel-sql/@database@.sql</value></property> + <property name="useEOL"><value>false</value></property> + <depends>jboss.jca:service=DataSourceBinding,name=BPELDB</depends> + </bean> + + <bean class="org.jboss.soa.bpel.runtime.engine.service.BPELEngineService" + name="BPELEngine"> + <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.bpel:service=BPELEngine", exposedInterface=org.jboss.soa.bpel.runtime.engine.service.BPELEngineServiceMBean.class,registerDirectly=true)</annotation> + <property name="jndiName"><value>bpel/Engine</value></property> + <property name="pmapiJndiName"><value>bpel/PMAPI</value></property> + <depends>jboss:service=Naming</depends> + <depends>BPELDatabaseInitializer</depends> + <depends>BPELDeployer</depends> + </bean> + + <!-- + Locate the single instance of the kernel + --> + <bean name="org.jboss.soa.dsp:service=KernelLocator" + class=&quot;@kernel.locator(a)&quot;&gt; + <property name="kernel"> + <inject bean="jboss.kernel:service=Kernel" /> + </property> + </bean> + + <!-- + ServerConfig + --> + <bean name="org.jboss.soa.dsp:service=ServerConfig" + class=&quot;@dsp.server.config.impl(a)&quot;&gt; + <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> + <property name="webServiceHost">${jboss.bind.address}</property> + </bean> + + +</deployment> Deleted: trunk/distribution/src/main/release/conf/jdbc/sybase.properties =================================================================== --- trunk/distribution/src/main/release/db/jdbc/sybase.properties 2011-01-25 14:01:32 UTC (rev 1272) +++ trunk/distribution/src/main/release/conf/jdbc/sybase.properties 2011-02-02 14:43:42 UTC (rev 1292) @@ -1,5 +0,0 @@ -connection.url=jdbc:sybase:Tds:localhost:5000/riftsaw -driver=com.sybase.jdbc2.jdbc.SybDataSource -username=riftsaw -password=riftsaw -dialect=org.hibernate.dialect.SybaseDialect \ No newline at end of file Copied: trunk/distribution/src/main/release/conf/jdbc/sybase.properties (from rev 1290, trunk/distribution/src/main/release/db/jdbc/sybase.properties) =================================================================== --- trunk/distribution/src/main/release/conf/jdbc/sybase.properties (rev 0) +++ trunk/distribution/src/main/release/conf/jdbc/sybase.properties 2011-02-02 14:43:42 UTC (rev 1292) @@ -0,0 +1,5 @@ +connection.url=jdbc:sybase:Tds:localhost:5000/riftsaw +driver=com.sybase.jdbc3.jdbc.SybDataSource +username=riftsaw +password=riftsaw +dialect=org.hibernate.dialect.SybaseDialect Modified: trunk/distribution/src/main/release/install/build.xml =================================================================== --- trunk/distribution/src/main/release/install/build.xml 2011-02-01 00:29:05 UTC (rev 1291) +++ trunk/distribution/src/main/release/install/build.xml 2011-02-02 14:43:42 UTC (rev 1292) @@ -82,28 +82,28 @@ </copy> <!-- copy appropriate jboss-beans.xml, bpel.properties, datasource etc into server --> - <copy file="../db/jboss/jboss-beans.xml" + <copy file="../conf/jboss/jboss-beans.xml" toFile="${deploy.dir}/${bpel-runtime}/META-INF/jboss-beans.xml" overwrite="true"> <filterset> <filter token="database" value="${database}"/> - <filterset filtersfile="../db/jboss/as${as.version}.properties" /> + <filterset filtersfile="../conf/jboss/as${as.version}.properties" /> </filterset> </copy> - <copy file="../db/bpel.properties" + <copy file="../conf/bpel.properties" toFile="${deploy.dir}/${bpel-runtime}/bpel.properties" overwrite="true"> - <filterset filtersfile="../db/jdbc/${database}.properties" /> - <filterset filtersfile="../db/wsstack/${ws.stack}.properties" /> - <filterset filtersfile="../db/cache/${cache.provider}.properties" /> - <filterset filtersfile="../db/jboss/as${as.version}.properties" /> + <filterset filtersfile="../conf/jdbc/${database}.properties" /> + <filterset filtersfile="../conf/wsstack/${ws.stack}.properties" /> + <filterset filtersfile="../conf/cache/${cache.provider}.properties" /> + <filterset filtersfile="../conf/jboss/as${as.version}.properties" /> </copy> - <copy file="../db/datasource/bpel-${database}-ds.xml" + <copy file="../conf/datasource/bpel-${database}-ds.xml" toFile="${deploy.dir}/${bpel-runtime}/META-INF/bpel-ds.xml" overwrite="true"> - <filterset filtersfile="../db/jdbc/${database}.properties" /> + <filterset filtersfile="../conf/jdbc/${database}.properties" /> </copy> <!--install appropriate db driver--> @@ -158,7 +158,7 @@ <!-- install database specific driver --> <target name="internal.install.riftsaw.into.jboss.db.hsql"> <copy todir="${server.lib.dir}" overwrite="true"> - <fileset dir="../db/drivers"> + <fileset dir="../conf/drivers"> <include name="h2*.jar" /> </fileset> </copy> @@ -166,7 +166,7 @@ <target name="internal.install.riftsaw.into.jboss.db.mysql"> <copy todir="${deploy.dir}/${bpel-runtime}/lib" overwrite="true"> - <fileset dir="../db/drivers"> + <fileset dir="../conf/drivers"> <include name="mysql-connector-java*.jar"/> </fileset> </copy> @@ -174,7 +174,7 @@ <target name="internal.install.riftsaw.into.jboss.db.sqlserver"> <copy todir="${deploy.dir}/${bpel-runtime}/lib" overwrite="true"> - <fileset dir="../db/drivers"> + <fileset dir="../conf/drivers"> <include name="jtds-*.jar"/> </fileset> </copy> @@ -182,23 +182,23 @@ <target name="internal.install.riftsaw.into.jboss.db.postgres"> <copy todir="${deploy.dir}/${bpel-runtime}/lib" overwrite="true"> - <fileset dir="../db/drivers"> + <fileset dir="../conf/drivers"> <include name="postgresql-*.jar"/> </fileset> </copy> </target> <target name="internal.install.riftsaw.into.jboss.db.oracle"> - <available file="../db/drivers/ojdbc14.jar" property="oracle.driver.jar.available" /> - <fail message="please download the oracle driver jar ojdbc14.jar from oracle and put it in the db/drivers directory" unless="oracle.driver.jar.available" /> - <copy file="../db/drivers/ojdbc14.jar" + <available file="../conf/drivers/ojdbc14.jar" property="oracle.driver.jar.available" /> + <fail message="please download the oracle driver jar ojdbc14.jar from oracle and put it in the conf/drivers directory" unless="oracle.driver.jar.available" /> + <copy file="../conf/drivers/ojdbc14.jar" todir="${deploy.dir}/${bpel-runtime}/lib" /> </target> <target name="internal.install.riftsaw.into.jboss.db.db2"> - <available file="../db/drivers/db2jcc.jar" property="db2.driver.jar.available" /> - <fail message="please download the db2 driver jar, rename it to db2jcc.jar and put it in the db/drivers directory" unless="db2.driver.jar.available" /> - <copy file="../db/drivers/db2jcc.jar" + <available file="../conf/drivers/db2jcc.jar" property="db2.driver.jar.available" /> + <fail message="please download the db2 driver jar, rename it to db2jcc.jar and put it in the conf/drivers directory" unless="db2.driver.jar.available" /> + <copy file="../conf/drivers/db2jcc.jar" todir="${deploy.dir}/${bpel-runtime}/lib" /> </target> @@ -242,7 +242,7 @@ overwrite="true"> <filterset> <filter token="database" value="${database}"/> - <filterset filtersfile="../db/jboss/as${as.version}.properties" /> + <filterset filtersfile="../conf/jboss/as${as.version}.properties" /> </filterset> </copy> <copy todir="${deploy.dir}/${bpel-runtime}/lib" overwrite="true"> @@ -307,9 +307,9 @@ <move file="${deploy.dir}/jbossesb-registry.sar/juddi_custom_install_data/jbossesb_tModels.xml" tofile="${deploy.dir}/jbossesb-registry.sar/juddi_custom_install_data/jbossesb_tModels.xml.old"/> - <copy file="../db/juddi/jbossesb_tModels.xml" + <copy file="../conf/juddi/jbossesb_tModels.xml" todir="${deploy.dir}/jbossesb-registry.sar/juddi_custom_install_data/" /> - <copy file="../db/juddi/jbossesb_BusinessEntity.xml" + <copy file="../conf/juddi/jbossesb_BusinessEntity.xml" todir="${deploy.dir}/jbossesb-registry.sar/juddi_custom_install_data/" /> <replace file="${deploy.dir}/riftsaw.sar/bpel.properties" token="bpel.uddi.registration=false" @@ -328,7 +328,7 @@ <!-- now deletes the 3.0.3 version, and then copy the 3.0.4 into the esb.deployer/lib--> <delete file="${deployers.dir}/esb.deployer/lib/juddi-client-3.0.3.jar" /> <copy todir="${deployers.dir}/esb.deployer/lib" overwrite="true"> - <fileset dir="../db/juddi"> + <fileset dir="../conf/juddi"> <include name="juddi-client-*.jar"/> </fileset> </copy> @@ -338,7 +338,7 @@ <target name="renameEsbJUDDIClientXML" if="isNot.renamedToOld" depends="check.esb.juddi.client.xml.old"> <move file="${deploy.dir}/jbossesb.sar/esb.juddi.client.xml" tofile="${deploy.dir}/jbossesb.sar/esb.juddi.client.xml.old" /> - <copy file="../db/juddi/esb.juddi.client.xml" + <copy file="../conf/juddi/esb.juddi.client.xml" tofile="${deploy.dir}/jbossesb.sar/esb.juddi.client.xml" /> </target> Modified: trunk/docs/docbook/gettingstartedguide/src/main/en-US/module/installation.xml =================================================================== --- trunk/docs/docbook/gettingstartedguide/src/main/en-US/module/installation.xml 2011-02-01 00:29:05 UTC (rev 1291) +++ trunk/docs/docbook/gettingstartedguide/src/main/en-US/module/installation.xml 2011-02-02 14:43:42 UTC (rev 1292) @@ -42,13 +42,13 @@ <para> If you have previously installed RiftSaw-2.0.0.Final, then you will need to drop the database schema due to changes in the ODE db schema for version 1.3.4. This can be achieved using the scripts in the - <filename>${riftsaw}/db/sql</filename> folder, or configure the jdbc properties file in <filename>${riftsaw}/db/jdbc</filename> and running: + <filename>${riftsaw}/conf/sql</filename> folder, or configure the jdbc properties file in <filename>${riftsaw}/conf/jdbc</filename> and running: </para> <para> ant -D{database} drop.riftsaw.schema </para> <para> - from the <filename>${riftsaw}/db</filename> folder. + from the <filename>${riftsaw}/conf</filename> folder. </para> </note> @@ -190,7 +190,7 @@ <para> The configuration properties for these database options can be found in the - <filename>${RiftSaw}/db/jdbc</filename> folder. These properties need to be + <filename>${RiftSaw}/conf/jdbc</filename> folder. These properties need to be specified before executing the <command>ant deploy -Ddatabase=...</command> command. </para> Modified: trunk/integration-tests/build.xml =================================================================== --- trunk/integration-tests/build.xml 2011-02-01 00:29:05 UTC (rev 1291) +++ trunk/integration-tests/build.xml 2011-02-02 14:43:42 UTC (rev 1292) @@ -67,7 +67,7 @@ <target name="replace.jdbc.files" if="is.replace.qa.jdbc"> <echo>Replacing the QA's Lab jdbc files</echo> - <copy todir="${basedir}/../distribution/target/dist/riftsaw-${riftsaw.engine.version}/db/jdbc" overwrite="true"> + <copy todir="${basedir}/../distribution/target/dist/riftsaw-${riftsaw.engine.version}/conf/jdbc" overwrite="true"> <fileset dir="${basedir}/../qa/jdbc"> <include name="*.properties" /> </fileset> @@ -76,7 +76,7 @@ <target name="copy.db.drivers"> <echo>Copying oracle and db2 jdbc drivers</echo> - <copy todir="${basedir}/../distribution/target/dist/riftsaw-${riftsaw.engine.version}/db/drivers"> + <copy todir="${basedir}/../distribution/target/dist/riftsaw-${riftsaw.engine.version}/conf/drivers"> <fileset dir="${download.dir}"> <include name="*.jar" /> </fileset>