[riftsaw-commits] riftsaw SVN: r193 - in trunk: distribution/src/main/assembly and 8 other directories.

Author: jeff.yuchang Date: 2009-10-20 02:07:02 -0400 (Tue, 20 Oct 2009) New Revision: 193 Added: trunk/distribution/src/main/release/db/ trunk/distribution/src/main/release/db/bpel.properties trunk/distribution/src/main/release/db/datasource/ trunk/distribution/src/main/release/db/datasource/bpel-derby-ds.xml trunk/distribution/src/main/release/db/datasource/bpel-hsql-ds.xml trunk/distribution/src/main/release/db/datasource/bpel-mysql-ds.xml trunk/distribution/src/main/release/db/hibernate/ trunk/distribution/src/main/release/db/hibernate/derby.properties trunk/distribution/src/main/release/db/hibernate/hsql.properties trunk/distribution/src/main/release/db/hibernate/mysql.properties trunk/distribution/src/main/release/db/jboss/ trunk/distribution/src/main/release/db/jboss/jboss-beans.xml trunk/distribution/src/main/release/db/jdbc/ trunk/distribution/src/main/release/db/jdbc/derby.properties trunk/distribution/src/main/release/db/jdbc/hsql.properties trunk/distribution/src/main/release/db/jdbc/mysql.properties Removed: trunk/runtime/engine-assembly/resources/bpel-sql/bpel-ds-derby.xml trunk/runtime/engine-assembly/resources/bpel-sql/bpel-ds-mysql.xml Modified: trunk/distribution/pom.xml trunk/distribution/src/main/assembly/bin.xml trunk/distribution/src/main/release/install/build.xml trunk/distribution/src/main/release/install/deployment.properties Log: * RIFTSAW-81: add ant script for installing datasource, hibernate dialect etc. Modified: trunk/distribution/pom.xml =================================================================== --- trunk/distribution/pom.xml 2009-10-19 16:01:54 UTC (rev 192) +++ trunk/distribution/pom.xml 2009-10-20 06:07:02 UTC (rev 193) @@ -36,6 +36,9 @@ <properties> <maven.test.skip>true</maven.test.skip> <bpel.version>${project.version}</bpel.version> + <mysql.connector.version>5.0.8</mysql.connector.version> + <postgresql.version>8.3-603.jdbc3</postgresql.version> + <jtds.version>1.2.2</jtds.version> </properties> <dependencies> @@ -66,6 +69,25 @@ <version>1.2.14</version> </dependency> + + <!-- database driver --> + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>${mysql.connector.version}</version> + </dependency> + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>${postgresql.version}</version> + </dependency> + <dependency> + <groupId>net.sourceforge.jtds</groupId> + <artifactId>jtds</artifactId> + <version>${jtds.version}</version> + </dependency> + + <!-- BPM Console --> Modified: trunk/distribution/src/main/assembly/bin.xml =================================================================== --- trunk/distribution/src/main/assembly/bin.xml 2009-10-19 16:01:54 UTC (rev 192) +++ trunk/distribution/src/main/assembly/bin.xml 2009-10-20 06:07:02 UTC (rev 193) @@ -44,6 +44,11 @@ </fileSet> <fileSet> + <directory>src/main/release/db</directory> + <outputDirectory>/db</outputDirectory> + </fileSet> + + <fileSet> <directory>src/main/release/modules</directory> <outputDirectory>/modules</outputDirectory> </fileSet> @@ -117,7 +122,17 @@ </files> <dependencySets> + <dependencySet> + <outputDirectory>/db/drivers</outputDirectory> + <includes> + <include>net.sourceforge.jtds:jtds</include> + <include>postgresql:postgresql</include> + <include>mysql:mysql-connector-java</include> + </includes> + </dependencySet> + + <dependencySet> <outputDirectory>/samples/common/lib</outputDirectory> <includes> <include>org.jboss.soa.bpel:riftsaw-tools</include> Added: trunk/distribution/src/main/release/db/bpel.properties =================================================================== --- trunk/distribution/src/main/release/db/bpel.properties (rev 0) +++ trunk/distribution/src/main/release/db/bpel.properties 2009-10-20 06:07:02 UTC (rev 193) @@ -0,0 +1,101 @@ +# +# 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.daohib.bpel.BpelDAOConnectionFactoryImpl + +## 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 +bpel.db.ext.dataSource=java:BPELDB + +hibernate.dialect=@dialect@ +hibernate.hbm2ddl.auto=update +hibernate.current_session_context_class=jta +hibernate.transaction.manager_lookup_class=org.hibernate.transaction.JBossTransactionManagerLookup + +jta.UserTransaction=UserTransaction + +ode.persistence=hibernate + +ode.process.checkguid=false +ode.process.store=org.apache.ode.store.JBossProcessStoreImpl Added: trunk/distribution/src/main/release/db/datasource/bpel-derby-ds.xml =================================================================== --- trunk/distribution/src/main/release/db/datasource/bpel-derby-ds.xml (rev 0) +++ trunk/distribution/src/main/release/db/datasource/bpel-derby-ds.xml 2009-10-20 06:07:02 UTC (rev 193) @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- The Derby embedded database JCA connection factory config +$Id: derby-ds.xml 25345 2004-11-03 13:29:58Z loubyansky $ --> + + +<datasources> + <local-tx-datasource> + + <!-- The jndi name of the DataSource, it is prefixed with java:/ --> + <!-- Datasources are not available outside the virtual machine --> + <jndi-name>BPELDB</jndi-name> + + <!-- for in-process persistent db, saved when jboss stops. The + org.jboss.jdbc.DerbyDatabase mbean is necessary for properly db shutdown --> + <connection-url&gt;@connection.url(a)&lt;/connection-url&gt; + + <!-- The driver class --> + <driver-class>@driver@</driver-class> + + <!-- The login and password --> + <user-name>@usernmae@</user-name> + <password>@password@</password> + + <!-- The minimum connections in a pool/sub-pool. Pools are lazily constructed on first use --> + <min-pool-size>5</min-pool-size> + + <!-- The maximum connections in a pool/sub-pool --> + <max-pool-size>20</max-pool-size> + + <!-- The time before an unused connection is destroyed --> + <idle-timeout-minutes>5</idle-timeout-minutes> + + <!-- Whether to check all statements are closed when the connection is returned to the pool, + this is a debugging feature that should be turned off in production --> + <track-statements/> + + <!-- This mbean can be used when using in process persistent derby + <depends>jboss:service=Derby</depends> + --> + </local-tx-datasource> + + <!-- mbean code="org.jboss.jdbc.DerbyDatabase" name="jboss:service=Derby"/ --> +</datasources> Added: trunk/distribution/src/main/release/db/datasource/bpel-hsql-ds.xml =================================================================== --- trunk/distribution/src/main/release/db/datasource/bpel-hsql-ds.xml (rev 0) +++ trunk/distribution/src/main/release/db/datasource/bpel-hsql-ds.xml 2009-10-20 06:07:02 UTC (rev 193) @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<datasources> + <local-tx-datasource> + <jndi-name>BPELDB</jndi-name> + <connection-url&gt;@connection.url(a)&lt;/connection-url&gt; + <driver-class>@driver@</driver-class> + <user-name>@username@</user-name> + <password>@password@</password> + <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation> + <min-pool-size>5</min-pool-size> + <max-pool-size>20</max-pool-size> + <idle-timeout-minutes>0</idle-timeout-minutes> + <prepared-statement-cache-size>32</prepared-statement-cache-size> + <depends>jboss:service=h2,database=BPELDB</depends> + </local-tx-datasource> + <mbean code="org.jboss.internal.soa.esb.dependencies.H2Database" + name="jboss:service=h2,database=BPELDB"> + <attribute name="Database">BPELDB</attribute> + <attribute name="DataDir">${jboss.server.data.dir}</attribute> + </mbean> + +</datasources> \ No newline at end of file Added: trunk/distribution/src/main/release/db/datasource/bpel-mysql-ds.xml =================================================================== --- trunk/distribution/src/main/release/db/datasource/bpel-mysql-ds.xml (rev 0) +++ trunk/distribution/src/main/release/db/datasource/bpel-mysql-ds.xml 2009-10-20 06:07:02 UTC (rev 193) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ===================================================================== --> +<!-- --> +<!-- JBoss Server Configuration --> +<!-- --> +<!-- ===================================================================== --> + +<!-- $Id: abc-ds.xml,v 1.1 2007-10-24 02:24:11 kstam Exp $ --> +<!-- ==================================================================== --> +<!-- Datasource config for MySQL using 2.0.11 driver --> +<!-- ==================================================================== --> + +<datasources> + <local-tx-datasource> + <jndi-name>BPELDB</jndi-name> + <connection-url&gt;@connection.url(a)&lt;/connection-url&gt; + <driver-class>com.mysql.jdbc.Driver</driver-class> + <user-name>@username@</user-name> + <password>@password@</password> +<!-- + <check-valid-connection-sql>select id from ping</check-valid-connection-sql> +--> + <max-pool-size>30</max-pool-size> + <min-pool-size>5</min-pool-size> + + </local-tx-datasource> +</datasources> Added: trunk/distribution/src/main/release/db/hibernate/derby.properties =================================================================== --- trunk/distribution/src/main/release/db/hibernate/derby.properties (rev 0) +++ trunk/distribution/src/main/release/db/hibernate/derby.properties 2009-10-20 06:07:02 UTC (rev 193) @@ -0,0 +1 @@ +dialect=org.hibernate.dialect.DerbyDialect \ No newline at end of file Added: trunk/distribution/src/main/release/db/hibernate/hsql.properties =================================================================== --- trunk/distribution/src/main/release/db/hibernate/hsql.properties (rev 0) +++ trunk/distribution/src/main/release/db/hibernate/hsql.properties 2009-10-20 06:07:02 UTC (rev 193) @@ -0,0 +1 @@ +dialect=org.hibernate.dialect.H2Dialect \ No newline at end of file Added: trunk/distribution/src/main/release/db/hibernate/mysql.properties =================================================================== --- trunk/distribution/src/main/release/db/hibernate/mysql.properties (rev 0) +++ trunk/distribution/src/main/release/db/hibernate/mysql.properties 2009-10-20 06:07:02 UTC (rev 193) @@ -0,0 +1 @@ +dialect=org.hibernate.dialect.MySQLInnoDBDialect \ No newline at end of file Added: trunk/distribution/src/main/release/db/jboss/jboss-beans.xml =================================================================== --- trunk/distribution/src/main/release/db/jboss/jboss-beans.xml (rev 0) +++ trunk/distribution/src/main/release/db/jboss/jboss-beans.xml 2009-10-20 06:07:02 UTC (rev 193) @@ -0,0 +1,42 @@ +<?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> + <depends>jboss:service=Naming</depends> + <depends>BPELDatabaseInitializer</depends> + <depends>BPELDeployer</depends> + </bean> + + <!-- + Locate the single instance of the kernel + --> + <bean name="org.jboss.soa.bpel.runtime.util:service=KernelLocator" + class="org.jboss.soa.bpel.runtime.integration.KernelLocator"> + <property name="kernel"> + <inject bean="jboss.kernel:service=Kernel" /> + </property> + </bean> + + <!-- + ServerConfig + --> + <bean name="org.jboss.soa.bpel.runtime.util:service=ServerConfig" + class="org.jboss.soa.bpel.runtime.integration.ServerConfigImpl"> + <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> + <property name="webServiceHost">${jboss.bind.address}</property> + </bean> + + +</deployment> Added: trunk/distribution/src/main/release/db/jdbc/derby.properties =================================================================== --- trunk/distribution/src/main/release/db/jdbc/derby.properties (rev 0) +++ trunk/distribution/src/main/release/db/jdbc/derby.properties 2009-10-20 06:07:02 UTC (rev 193) @@ -0,0 +1,4 @@ +connection.url=jdbc:derby:${jboss.server.data.dir}${/}derby${/}BPELDB;create=true +driver=org.apache.derby.jdbc.EmbeddedDriver +username=sa +password= \ No newline at end of file Added: trunk/distribution/src/main/release/db/jdbc/hsql.properties =================================================================== --- trunk/distribution/src/main/release/db/jdbc/hsql.properties (rev 0) +++ trunk/distribution/src/main/release/db/jdbc/hsql.properties 2009-10-20 06:07:02 UTC (rev 193) @@ -0,0 +1,4 @@ +connection.url=jdbc:h2:${jboss.server.data.dir}${/}h2${/}BPELDB +driver=org.h2.Driver +username=sa +password= Added: trunk/distribution/src/main/release/db/jdbc/mysql.properties =================================================================== --- trunk/distribution/src/main/release/db/jdbc/mysql.properties (rev 0) +++ trunk/distribution/src/main/release/db/jdbc/mysql.properties 2009-10-20 06:07:02 UTC (rev 193) @@ -0,0 +1,4 @@ +connection.url=jdbc:mysql://localhost/riftsawdb?autoReconnect=true +driver=com.mysql.jdbc.Driver +username=riftsaw +password=riftsaw \ No newline at end of file Modified: trunk/distribution/src/main/release/install/build.xml =================================================================== --- trunk/distribution/src/main/release/install/build.xml 2009-10-19 16:01:54 UTC (rev 192) +++ trunk/distribution/src/main/release/install/build.xml 2009-10-20 06:07:02 UTC (rev 193) @@ -42,7 +42,31 @@ <fileset dir="${modules}/${bpel-runtime}" /> </copy> <copy todir="${deploy.dir}" file="${modules}/${jbossesb-bpel}"/> - + + <!-- copy appropriate jboss-beans.xml, bpel.properties, datasource etc into server --> + <copy file="../db/jboss/jboss-beans.xml" + toFile="${deploy.dir}/${bpel-runtime}/META-INF/jboss-beans.xml" + overwrite="true"> + <filterset> + <filter token="database" value="${database}"/> + </filterset> + </copy> + + <copy file="../db/bpel.properties" + toFile="${deploy.dir}/${bpel-runtime}/bpel.properties" + overwrite="true"> + <filterset filtersfile="../db/hibernate/${database}.properties" /> + </copy> + + <copy file="../db/datasource/bpel-${database}-ds.xml" + toFile="${deploy.dir}/${bpel-runtime}/META-INF/bpel-ds.xml" + overwrite="true"> + <filterset filtersfile="../db/jdbc/${database}.properties" /> + </copy> + + <!--install appropriate db driver--> + <antcall target="internal.install.riftsaw.into.jboss.db.${database}" /> + <!-- BPM Console --> <mkdir dir="${deploy.dir}/bpel-console"/> @@ -94,4 +118,16 @@ <delete dir="${esb.examples.dir}/webservice_esb_bpel" /> </target> + + <!-- install database specific driver --> + <target name="internal.install.riftsaw.into.jboss.db.hsql" /> + + <target name="internal.install.riftsaw.into.jboss.db.mysql"> + <copy todir="${deploy.dir}/${bpel-runtime}/lib" overwrite="true"> + <fileset dir="../db/drivers"> + <include name="mysql-connector-java*.jar"/> + </fileset> + </copy> + </target> + </project> Modified: trunk/distribution/src/main/release/install/deployment.properties =================================================================== --- trunk/distribution/src/main/release/install/deployment.properties 2009-10-19 16:01:54 UTC (rev 192) +++ trunk/distribution/src/main/release/install/deployment.properties 2009-10-20 06:07:02 UTC (rev 193) @@ -8,7 +8,7 @@ # Use of relative paths or paths with spaces will cause runtime errors # when deploying and executing the samples. # (e.g. /var/local/jboss-5.1.0.GA) -org.jboss.esb.server.home=/var/local/jboss-5.1.0.GA +org.jboss.esb.server.home=/local/deploy/jboss-5.1.0.GA # The Configuration of JBoss AS to Use # (e.g. default) @@ -17,3 +17,7 @@ # The directory for JBossESB home # (e.g. /var/local/jbossesb-4.6.GA) org.jboss.esb.home=/var/local/jbossesb-4.6.GA + +# database +# (e.g. hsql derby mysql) +database=hsql Deleted: trunk/runtime/engine-assembly/resources/bpel-sql/bpel-ds-derby.xml =================================================================== --- trunk/runtime/engine-assembly/resources/bpel-sql/bpel-ds-derby.xml 2009-10-19 16:01:54 UTC (rev 192) +++ trunk/runtime/engine-assembly/resources/bpel-sql/bpel-ds-derby.xml 2009-10-20 06:07:02 UTC (rev 193) @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- The Derby embedded database JCA connection factory config -$Id: derby-ds.xml 25345 2004-11-03 13:29:58Z loubyansky $ --> - - -<datasources> - <local-tx-datasource> - - <!-- The jndi name of the DataSource, it is prefixed with java:/ --> - <!-- Datasources are not available outside the virtual machine --> - <jndi-name>BPELDB</jndi-name> - - <!-- for in-process persistent db, saved when jboss stops. The - org.jboss.jdbc.DerbyDatabase mbean is necessary for properly db shutdown --> - <connection-url>jdbc:derby:${jboss.server.data.dir}${/}derby${/}BPELDB;create=true</connection-url> - - <!-- The driver class --> - <driver-class>org.apache.derby.jdbc.EmbeddedDriver</driver-class> - - <!-- The login and password --> - <user-name>sa</user-name> - <password></password> - - <!-- The minimum connections in a pool/sub-pool. Pools are lazily constructed on first use --> - <min-pool-size>5</min-pool-size> - - <!-- The maximum connections in a pool/sub-pool --> - <max-pool-size>20</max-pool-size> - - <!-- The time before an unused connection is destroyed --> - <idle-timeout-minutes>5</idle-timeout-minutes> - - <!-- Whether to check all statements are closed when the connection is returned to the pool, - this is a debugging feature that should be turned off in production --> - <track-statements/> - - <!-- This mbean can be used when using in process persistent derby - <depends>jboss:service=Derby</depends> - --> - </local-tx-datasource> - - <!-- mbean code="org.jboss.jdbc.DerbyDatabase" name="jboss:service=Derby"/ --> -</datasources> Deleted: trunk/runtime/engine-assembly/resources/bpel-sql/bpel-ds-mysql.xml =================================================================== --- trunk/runtime/engine-assembly/resources/bpel-sql/bpel-ds-mysql.xml 2009-10-19 16:01:54 UTC (rev 192) +++ trunk/runtime/engine-assembly/resources/bpel-sql/bpel-ds-mysql.xml 2009-10-20 06:07:02 UTC (rev 193) @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ===================================================================== --> -<!-- --> -<!-- JBoss Server Configuration --> -<!-- --> -<!-- ===================================================================== --> - -<!-- $Id: abc-ds.xml,v 1.1 2007-10-24 02:24:11 kstam Exp $ --> -<!-- ==================================================================== --> -<!-- Datasource config for MySQL using 2.0.11 driver --> -<!-- ==================================================================== --> - -<datasources> - <local-tx-datasource> - <jndi-name>BPELDB</jndi-name> - <connection-url>jdbc:mysql://localhost/riftsawdb?autoReconnect=true</connection-url> - <driver-class>com.mysql.jdbc.Driver</driver-class> - <user-name>riftsaw</user-name> - <password>riftsaw</password> -<!-- - <check-valid-connection-sql>select id from ping</check-valid-connection-sql> ---> - <max-pool-size>30</max-pool-size> - <min-pool-size>5</min-pool-size> - </local-tx-datasource> -</datasources>