[jboss-svn-commits] JBL Code SVN: r10210 - in labs/jbossesb/trunk: product/core/listeners/src/org/jboss/internal/soa/esb/dependencies and 13 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Mar 14 21:21:21 EDT 2007
Author: bill.burke at jboss.com
Date: 2007-03-14 21:21:20 -0400 (Wed, 14 Mar 2007)
New Revision: 10210
Added:
labs/jbossesb/trunk/product/build-distr.xml
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/DatabaseInitializer.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/DatabaseInitializerMBean.java
labs/jbossesb/trunk/product/install/message-store/message-store-ds.xml
labs/jbossesb/trunk/product/install/standalone/jbossesb-server-base.zip
labs/jbossesb/trunk/qa/junit/resources/server/jndi.properties
labs/jbossesb/trunk/qa/junit/resources/server/simple/esb-jbm-service.xml
labs/jbossesb/trunk/qa/lib/ext/jboss-messaging-client.jar
Removed:
labs/jbossesb/trunk/product/install/jboss-service-dependencies.xml
labs/jbossesb/trunk/product/install/standalone/jboss-4.0.5.GA.zip
labs/jbossesb/trunk/qa/lib/ext/jboss-remoting.jar
Modified:
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIService.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIServiceMBean.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java
labs/jbossesb/trunk/product/install/deploy/hsqldb-ds.xml
labs/jbossesb/trunk/product/install/jUDDI-registry/juddi-ds.xml
labs/jbossesb/trunk/product/install/jUDDI-registry/sql/hsqldb/create_database.sql
labs/jbossesb/trunk/product/install/jUDDI-registry/sql/hsqldb/insert_publishers.sql
labs/jbossesb/trunk/product/install/jboss-service.xml
labs/jbossesb/trunk/product/install/message-store/sql/hsqldb/create_database.sql
labs/jbossesb/trunk/product/tools/configeditor/editor/dist/configapp.war
labs/jbossesb/trunk/qa/junit/build.xml
labs/jbossesb/trunk/qa/junit/resources/server/simple/esb-queues-service.xml
Log:
Consolidate .sar files
Don't overwrite hsqlds.xml
Autocreate juddi and message store
Added: labs/jbossesb/trunk/product/build-distr.xml
===================================================================
--- labs/jbossesb/trunk/product/build-distr.xml (rev 0)
+++ labs/jbossesb/trunk/product/build-distr.xml 2007-03-15 01:21:20 UTC (rev 10210)
@@ -0,0 +1,132 @@
+<project name="JBESB Distribution Build" default="dist" basedir=".">
+ <property name="build.dir" value="build"/>
+ <property name="lib.ext.dir" value="lib/ext"/>
+ <property name="build.lib.dir" value="${build.dir}/jbossesb/lib"/>
+ <property name="version" value="4.0.1"/>
+ <property name="esbserver.dist.dir" value="${build.dir}/jbossesb-server-${version}"/>
+ <property name="installation.files.dir" value="install"/>
+
+
+ <target name="dist" depends="server.dist">
+ <copy todir="${esbserver.dist.dir}/docs">
+ <fileset dir="${build.dir}/jbossesb/docs">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ <copy todir="${esbserver.dist.dir}">
+ <fileset dir="${build.dir}/jbossesb">
+ <include name="javadocs/**/*"/>
+ </fileset>
+ </copy>
+ <copy todir="${esbserver.dist.dir}">
+ <fileset dir="${build.dir}/jbossesb">
+ <include name="samples/**/*"/>
+ </fileset>
+ </copy>
+ <copy todir="${esbserver.dist.dir}">
+ <fileset dir="${build.dir}/jbossesb">
+ <include name="tools/**/*"/>
+ </fileset>
+ </copy>
+ <copy todir="${esbserver.dist.dir}/docs/schema">
+ <fileset dir="${build.dir}/jbossesb/xml">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ <copy todir="${esbserver.dist.dir}">
+ <fileset dir="${build.dir}/jbossesb">
+ <include name="*.txt"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="server.dist" depends="build.sar, unpack.server.zip">
+ <copy todir="${esbserver.dist.dir}/server/default/deploy/jbossesb.sar">
+ <fileset dir="${build.dir}/jbossesb.sar">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ <copy todir="${esbserver.dist.dir}/server/default/deploy/jbossesb-registry.sar">
+ <fileset dir="${build.dir}/jbossesb-registry.sar">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="unpack.server.zip">
+ <delete dir="${esbserver.dist.dir}"/>
+ <unzip src="${installation.files.dir}/standalone/jbossesb-server-base.zip" dest="${build.dir}"/>
+ <move file="${build.dir}/jbossesb-server" tofile="${esbserver.dist.dir}"/>
+ </target>
+
+ <target name="build.sar">
+ <echo message="Building JBoss ESB sar files"/>
+ <delete dir="${build.dir}/jbossesb.sar" />
+ <mkdir dir="${build.dir}/jbossesb.sar" />
+ <mkdir dir="${build.dir}/jbossesb.sar/META-INF" />
+ <copy file="${installation.files.dir}/jboss-service.xml"
+ todir="${build.dir}/jbossesb.sar/META-INF"/>
+ <copy todir="${build.dir}/jbossesb.sar">
+ <fileset dir="${installation.files.dir}/conf">
+ <include name="jbossesb-properties.xml"/>
+ <include name="esb.juddi.properties"/>
+ <include name="smooks-cdr.lst"/>
+ </fileset>
+ <fileset dir="${installation.files.dir}/jUDDI-registry">
+ <include name="juddi-ds.xml"/>
+ </fileset>
+ <fileset dir="${installation.files.dir}/message-store">
+ <include name="message-store-ds.xml"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="${build.dir}/jbossesb.sar/juddi-sql"/>
+ <copy todir="${build.dir}/jbossesb.sar/juddi-sql">
+ <fileset dir="${installation.files.dir}/jUDDI-registry/sql">
+ <include name="**/*.sql"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="${build.dir}/jbossesb.sar/message-store-sql"/>
+ <copy todir="${build.dir}/jbossesb.sar/message-store-sql">
+ <fileset dir="${installation.files.dir}/message-store/sql">
+ <include name="**/*.sql"/>
+ </fileset>
+ </copy>
+
+
+
+ <mkdir dir="${build.dir}/jbossesb.sar/lib" />
+ <copy todir="${build.dir}/jbossesb.sar/lib">
+ <fileset dir="${lib.ext.dir}" includes="jbossts-common.jar"/>
+ <fileset dir="${build.lib.dir}" includes="jbossesb*.jar"
+ excludes="jbossesb-registry.jar" />
+ <!-- xbean for reading/marchalling xml for configuration, and scout -->
+ <fileset dir="${lib.ext.dir}" includes="xbean.jar,stax-api-1.0.1.jar,xmlpublic.jar"/>
+ <!-- jUDDI Registry -->
+ <fileset dir="${lib.ext.dir}" includes="juddi-1.0-SNAPSHOT.jar,juddi-client-1.0-SNAPSHOT.jar"/>
+ <!-- jboss rules for CBR -->
+ <fileset dir="${lib.ext.dir}" includes="antlr-3.0ea8.jar,antlr-2.7.6.jar,
+ drools-compiler-3.0.4.jar,drools-core-3.0.4.jar,stringtemplate-2.3b6.jar,
+ commons-jci-core-1.0-406301.jar, commons-jci-janino-2.4.3.jar, janino-2.4.3.jar"/>
+ <!-- smooks for transformation -->
+ <fileset dir="${lib.ext.dir}" includes="milyn-*.jar,opencsv-*.jar,ognl-*.jar,groovy-*.jar,commons-lang-2.1.jar"/>
+ <!-- ftp -->
+ <fileset dir="${lib.ext.dir}" includes="edtftpj.jar"/>
+ </copy>
+
+ <delete dir="${build.dir}/jbossesb-registry.sar" />
+ <mkdir dir="${build.dir}/jbossesb-registry.sar" />
+ <mkdir dir="${build.dir}/jbossesb-registry.sar/META-INF" />
+ <copy todir="${build.dir}/jbossesb-registry.sar">
+ <!-- jaxr and scout -->
+ <fileset dir="${lib.ext.dir}" includes="jaxr-api-1.0-SNAPSHOT.jar,
+ scout-1.0-SNAPSHOT.jar"/>
+ <fileset dir="${build.lib.dir}" includes="jbossesb-registry.jar"/>
+ </copy>
+ <copy file="${installation.files.dir}/jboss-service-registry.xml"
+ tofile="${build.dir}/jbossesb-registry.sar/META-INF/jboss-service.xml"/>
+
+ </target>
+
+</project>
\ No newline at end of file
Added: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/DatabaseInitializer.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/DatabaseInitializer.java (rev 0)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/DatabaseInitializer.java 2007-03-15 01:21:20 UTC (rev 10210)
@@ -0,0 +1,142 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.internal.soa.esb.dependencies;
+
+import org.apache.log4j.Logger;
+import org.jboss.soa.esb.listeners.config.Configuration;
+import org.jboss.system.ServiceMBeanSupport;
+
+import javax.sql.DataSource;
+import javax.naming.InitialContext;
+import java.sql.Connection;
+import java.sql.Statement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.net.URL;
+
+/**
+ * Initialize a given datasource
+ *
+ * Takes a list resources that are .sql files and checks to see if they have alrady been executed
+ * on a given datasource by executing a sql query. If the sql query fails, then the .sql files are executed.
+ *
+ * @author <a href="bill at jboss.com">Bill Burke</a>
+ * @version $Revision: 1.1 $
+ */
+public class DatabaseInitializer extends ServiceMBeanSupport implements DatabaseInitializerMBean
+{
+ private String datasource;
+ private String sqlFiles;
+ private String existsSql;
+
+
+ public String getExistsSql()
+ {
+ return existsSql;
+ }
+
+ public void setExistsSql(String existsSql)
+ {
+ this.existsSql = existsSql;
+ }
+
+ public String getSqlFiles()
+ {
+ return sqlFiles;
+ }
+
+ public void setSqlFiles(String sqlFiles)
+ {
+ this.sqlFiles = sqlFiles;
+ }
+
+ public String getDatasource()
+ {
+ return datasource;
+ }
+
+ public void setDatasource(String datasource)
+ {
+ this.datasource = datasource;
+ }
+
+ protected void initDatabase() throws Exception
+ {
+ DataSource ds = (DataSource)new InitialContext().lookup(datasource);
+ Connection conn = ds.getConnection();
+ boolean load = false;
+
+ Statement st = conn.createStatement();
+ ResultSet rs = null;
+ try
+ {
+ rs = st.executeQuery(existsSql.trim());
+ rs.close();
+ }
+ catch (SQLException e)
+ {
+ load = true;
+ }
+ st.close();
+ if (!load)
+ {
+ log.info(datasource + " datasource is already initialized");
+ return;
+ }
+
+ log.info("Initializing " + datasource + " from listed sql files");
+
+ String[] list = sqlFiles.split(",");
+ for (String sql : list)
+ {
+ executeSql(sql.trim(), conn);
+ }
+ }
+
+ public void executeSql(String resource, Connection conn)
+ throws Exception
+ {
+ URL url = Thread.currentThread().getContextClassLoader().getResource(resource);
+ String sql = Configuration.getStringFromStream(url.openStream());
+ String[] statements = sql.split(";");
+ for (String statement : statements)
+ {
+ Statement sqlStatement = conn.createStatement();
+ try
+ {
+ sqlStatement.executeUpdate(statement);
+ }
+ finally
+ {
+ sqlStatement.close();
+ }
+ }
+ }
+
+
+ @Override
+ protected void startService() throws Exception
+ {
+ initDatabase();
+ super.startService();
+ }
+}
Added: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/DatabaseInitializerMBean.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/DatabaseInitializerMBean.java (rev 0)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/DatabaseInitializerMBean.java 2007-03-15 01:21:20 UTC (rev 10210)
@@ -0,0 +1,51 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.internal.soa.esb.dependencies;
+
+import org.jboss.system.ServiceMBean;
+
+/**
+ * comment
+ *
+ * @author <a href="bill at jboss.com">Bill Burke</a>
+ * @version $Revision: 1.1 $
+ */
+public interface DatabaseInitializerMBean extends ServiceMBean
+{
+ String getExistsSql()
+ ;
+
+ void setExistsSql(String existsSql)
+ ;
+
+ String getSqlFiles()
+ ;
+
+ void setSqlFiles(String sqlFiles)
+ ;
+
+ String getDatasource()
+ ;
+
+ void setDatasource(String datasource)
+ ;
+}
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIService.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIService.java 2007-03-15 01:11:58 UTC (rev 10209)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIService.java 2007-03-15 01:21:20 UTC (rev 10210)
@@ -2,28 +2,117 @@
import java.io.File;
import java.net.URI;
+import java.net.URL;
+import java.sql.Connection;
+import java.sql.Statement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
import javax.naming.InitialContext;
+import javax.sql.DataSource;
import org.apache.juddi.registry.rmi.JNDIRegistration;
import org.apache.log4j.Logger;
import org.jboss.system.ServiceMBeanSupport;
+import org.jboss.soa.esb.listeners.config.Configuration;
public class JuddiRMIService extends ServiceMBeanSupport implements JuddiRMIServiceMBean
{
private Logger logger = Logger.getLogger(this.getClass());
-
- protected void startService() throws Exception
+
+ private String propertiesResourcePath = "esb.juddi.properties";
+ private String juddiDatasource = "juddiDB";
+ private String database = "hsqldb";
+
+
+ public String getDatabase()
+ {
+ return database;
+ }
+
+ public void setDatabase(String database)
+ {
+ this.database = database;
+ }
+
+ public String getJuddiDatasource()
+ {
+ return juddiDatasource;
+ }
+
+ public void setJuddiDatasource(String juddiDatasource)
+ {
+ this.juddiDatasource = juddiDatasource;
+ }
+
+ public String getPropertiesResourcePath()
+ {
+ return propertiesResourcePath;
+ }
+
+ public void setPropertiesResourcePath(String propertiesResourcePath)
+ {
+ this.propertiesResourcePath = propertiesResourcePath;
+ }
+
+ protected void initDatabase() throws Exception
+ {
+ DataSource ds = (DataSource)new InitialContext().lookup(juddiDatasource);
+ Connection conn = ds.getConnection();
+ boolean load = false;
+
+ Statement st = conn.createStatement();
+ ResultSet rs = null;
+ try
+ {
+ rs = st.executeQuery("select * from BUSINESS_ENTITY");
+ rs.close();
+ }
+ catch (SQLException e)
+ {
+ load = true;
+ }
+ st.close();
+ if (!load) return;
+
+ URL url = Thread.currentThread().getContextClassLoader().getResource(propertiesResourcePath);
+ URL createDatabaseSql = new URL(url, database + "/create_database.sql");
+ executeSql(createDatabaseSql, conn, st);
+ URL insert = new URL(url, database + "/insert_publishers.sql");
+ executeSql(insert, conn, st);
+ }
+
+ public static void executeSql(URL createDatabaseSql, Connection conn, Statement st)
+ throws Exception
+ {
+ String sql = Configuration.getStringFromStream(createDatabaseSql.openStream());
+ String[] statements = sql.split(";");
+ for (String statement : statements)
+ {
+ Statement sqlStatement = conn.createStatement();
+ try
+ {
+ st.executeUpdate(statement);
+ }
+ finally
+ {
+ sqlStatement.close();
+ }
+ }
+ }
+
+ protected void startService() throws Exception
{
logger.info("starting juddi RMI service");
- final String confURL = System.getProperty("jboss.server.config.url") ;
- final URI confDirURI = new URI(confURL) ;
- final File confDir = new File(confDirURI) ;
- System.setProperty("juddi.propertiesFile", confDir + "/juddi.properties");
+ URL url = Thread.currentThread().getContextClassLoader().getResource(propertiesResourcePath);
+ URI uri = new URI(url.toString());
+ File confFile = new File(uri);
+ System.setProperty("juddi.propertiesFile", confFile.toString());
JNDIRegistration.register();
}
- protected void stopService() throws Exception
+
+ protected void stopService() throws Exception
{
logger.info("Unbinding juddi services");
final InitialContext ic = new InitialContext() ;
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIServiceMBean.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIServiceMBean.java 2007-03-15 01:11:58 UTC (rev 10209)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/internal/soa/esb/dependencies/JuddiRMIServiceMBean.java 2007-03-15 01:21:20 UTC (rev 10210)
@@ -4,5 +4,10 @@
public interface JuddiRMIServiceMBean extends ServiceMBean
{
-
+
+ String getPropertiesResourcePath()
+ ;
+
+ void setPropertiesResourcePath(String propertiesResourcePath)
+ ;
}
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java 2007-03-15 01:11:58 UTC (rev 10209)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java 2007-03-15 01:21:20 UTC (rev 10210)
@@ -194,9 +194,15 @@
public synchronized void create(DeploymentInfo di) throws DeploymentException
{
log.debug("create, " + di.shortName);
+ URL document = getDocumentUrl(di);
+ if (document == null)
+ {
+ throw new DeploymentException("Unable to find document url of META-INF/jboss-esb.xml in: "
+ + di.url);
+ }
try
{
- String jbossEsbXml = Configuration.getStringFromStream(getDocumentUrl(di).openStream());
+ String jbossEsbXml = Configuration.getStringFromStream(document.openStream());
JBoss4ESBDeployment deployment = new JBoss4ESBDeployment(jbossEsbXml);
String name = "jboss.esb:deployment=" + di.shortName;
ObjectName on = ObjectNameConverter.convert(name);
Modified: labs/jbossesb/trunk/product/install/deploy/hsqldb-ds.xml
===================================================================
--- labs/jbossesb/trunk/product/install/deploy/hsqldb-ds.xml 2007-03-15 01:11:58 UTC (rev 10209)
+++ labs/jbossesb/trunk/product/install/deploy/hsqldb-ds.xml 2007-03-15 01:21:20 UTC (rev 10210)
@@ -16,9 +16,6 @@
<idle-timeout-minutes>0</idle-timeout-minutes>
<security-domain>HsqlDbRealm</security-domain>
<prepared-statement-cache-size>32</prepared-statement-cache-size>
- <metadata>
- <type-mapping>Hypersonic SQL</type-mapping>
- </metadata>
<depends>jboss:service=Hypersonic,database=default</depends>
</local-tx-datasource>
@@ -33,9 +30,6 @@
<idle-timeout-minutes>0</idle-timeout-minutes>
<security-domain>HsqlDbRealm</security-domain>
<prepared-statement-cache-size>32</prepared-statement-cache-size>
- <metadata>
- <type-mapping>Hypersonic SQL</type-mapping>
- </metadata>
<depends>jboss:service=Hypersonic,database=default</depends>
</local-tx-datasource>
@@ -50,9 +44,6 @@
<idle-timeout-minutes>0</idle-timeout-minutes>
<security-domain>HsqlDbRealm</security-domain>
<prepared-statement-cache-size>32</prepared-statement-cache-size>
- <metadata>
- <type-mapping>Hypersonic SQL</type-mapping>
- </metadata>
<depends>jboss:service=Hypersonic,database=default</depends>
</local-tx-datasource>
Modified: labs/jbossesb/trunk/product/install/jUDDI-registry/juddi-ds.xml
===================================================================
--- labs/jbossesb/trunk/product/install/jUDDI-registry/juddi-ds.xml 2007-03-15 01:11:58 UTC (rev 10209)
+++ labs/jbossesb/trunk/product/install/jUDDI-registry/juddi-ds.xml 2007-03-15 01:21:20 UTC (rev 10210)
@@ -1,25 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- ===================================================================== -->
-<!-- -->
-<!-- JBoss Server Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
-
-<!-- $Id$ -->
-<!-- ==================================================================== -->
-<!-- Datasource config for MySQL using 2.0.11 driver -->
-<!-- ==================================================================== -->
-
<datasources>
- <local-tx-datasource>
- <jndi-name>juddiDB</jndi-name>
- <connection-url>jdbc:mysql://localhost/juddi</connection-url>
- <driver-class>com.mysql.jdbc.Driver</driver-class>
- <user-name>root</user-name>
- <password></password>
- <check-valid-connection-sql>select count(*) from PUBLISHER</check-valid-connection-sql>
- <max-pool-size>30</max-pool-size>
- <min-pool-size>5</min-pool-size>
- </local-tx-datasource>
+ <local-tx-datasource>
+ <jndi-name>juddiDB</jndi-name>
+ <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}juddiDB</connection-url>
+ <driver-class>org.hsqldb.jdbcDriver</driver-class>
+ <user-name>sa</user-name>
+ <password></password>
+ <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=Hypersonic,database=juddiDB</depends>
+ </local-tx-datasource>
+ <mbean code="org.jboss.jdbc.HypersonicDatabase"
+ name="jboss:service=Hypersonic,database=juddiDB">
+ <attribute name="Database">juddiDB</attribute>
+ <attribute name="InProcessMode">true</attribute>
+ </mbean>
+
</datasources>
Modified: labs/jbossesb/trunk/product/install/jUDDI-registry/sql/hsqldb/create_database.sql
===================================================================
--- labs/jbossesb/trunk/product/install/jUDDI-registry/sql/hsqldb/create_database.sql 2007-03-15 01:11:58 UTC (rev 10209)
+++ labs/jbossesb/trunk/product/install/jUDDI-registry/sql/hsqldb/create_database.sql 2007-03-15 01:21:20 UTC (rev 10210)
@@ -1,34 +1,3 @@
--- DROP TABLE BUSINESS_DESCR IF EXISTS;
--- DROP TABLE BUSINESS_CATEGORY IF EXISTS;
--- DROP TABLE BUSINESS_IDENTIFIER IF EXISTS;
--- DROP TABLE BUSINESS_NAME IF EXISTS;
--- DROP TABLE DISCOVERY_URL IF EXISTS;
--- DROP TABLE ADDRESS_LINE IF EXISTS;
--- DROP TABLE ADDRESS IF EXISTS;
--- DROP TABLE PHONE IF EXISTS;
--- DROP TABLE EMAIL IF EXISTS;
--- DROP TABLE CONTACT_DESCR IF EXISTS;
--- DROP TABLE CONTACT IF EXISTS;
--- DROP TABLE SERVICE_DESCR IF EXISTS;
--- DROP TABLE SERVICE_CATEGORY IF EXISTS;
--- DROP TABLE SERVICE_NAME IF EXISTS;
--- DROP TABLE BINDING_DESCR IF EXISTS;
--- DROP TABLE BINDING_CATEGORY IF EXISTS;
--- DROP TABLE INSTANCE_DETAILS_DESCR IF EXISTS;
--- DROP TABLE INSTANCE_DETAILS_DOC_DESCR IF EXISTS;
--- DROP TABLE TMODEL_CATEGORY IF EXISTS;
--- DROP TABLE TMODEL_DESCR IF EXISTS;
--- DROP TABLE TMODEL_DOC_DESCR IF EXISTS;
--- DROP TABLE TMODEL_IDENTIFIER IF EXISTS;
--- DROP TABLE TMODEL_INSTANCE_INFO_DESCR IF EXISTS;
--- DROP TABLE TMODEL_INSTANCE_INFO IF EXISTS;
--- DROP TABLE PUBLISHER_ASSERTION IF EXISTS;
--- DROP TABLE TMODEL IF EXISTS;
--- DROP TABLE BINDING_TEMPLATE IF EXISTS;
--- DROP TABLE BUSINESS_SERVICE IF EXISTS;
--- DROP TABLE BUSINESS_ENTITY IF EXISTS;
--- DROP TABLE PUBLISHER IF EXISTS;
--- DROP TABLE AUTH_TOKEN IF EXISTS;
CREATE TABLE BUSINESS_ENTITY
(
Modified: labs/jbossesb/trunk/product/install/jUDDI-registry/sql/hsqldb/insert_publishers.sql
===================================================================
--- labs/jbossesb/trunk/product/install/jUDDI-registry/sql/hsqldb/insert_publishers.sql 2007-03-15 01:11:58 UTC (rev 10209)
+++ labs/jbossesb/trunk/product/install/jUDDI-registry/sql/hsqldb/insert_publishers.sql 2007-03-15 01:21:20 UTC (rev 10210)
@@ -1,3 +1,2 @@
--- *** SAMPLE PUBLISHER ***
INSERT INTO PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_BUSINESSES,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_TMODELS)
VALUES ('jbossesb','JBoss ESB User','kurt.stam at jboss.org','true','true',25,20,10,100);
Deleted: labs/jbossesb/trunk/product/install/jboss-service-dependencies.xml
===================================================================
--- labs/jbossesb/trunk/product/install/jboss-service-dependencies.xml 2007-03-15 01:11:58 UTC (rev 10209)
+++ labs/jbossesb/trunk/product/install/jboss-service-dependencies.xml 2007-03-15 01:21:20 UTC (rev 10210)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<server>
- <mbean code="org.jboss.internal.soa.esb.dependencies.JBossESBDependenciesService"
- name="jboss.esb:service=JBossESBDependencies"
- description="Container for the JBossESB Dependencies">
- </mbean>
-</server>
\ No newline at end of file
Modified: labs/jbossesb/trunk/product/install/jboss-service.xml
===================================================================
--- labs/jbossesb/trunk/product/install/jboss-service.xml 2007-03-15 01:11:58 UTC (rev 10209)
+++ labs/jbossesb/trunk/product/install/jboss-service.xml 2007-03-15 01:21:20 UTC (rev 10210)
@@ -1,8 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
- <!-- Starts the listener controler -->
- <!-- Registers the Juddi RMI Service to JNDI -->
+ <mbean code="org.jboss.internal.soa.esb.dependencies.DatabaseInitializer"
+ name="jboss.esb:service=JuddiDatabaseInitialization">
+ <attribute name="Datasource">java:/juddiDB</attribute>
+ <attribute name="ExistsSql">select * from BUSINESS_ENTITY</attribute>
+ <attribute name="SqlFiles">
+ juddi-sql/hsqldb/create_database.sql,
+ juddi-sql/hsqldb/insert_publishers.sql
+ </attribute>
+ <depends>jboss.jca:service=DataSourceBinding,name=juddiDB</depends>
+ </mbean>
+ <mbean code="org.jboss.internal.soa.esb.dependencies.DatabaseInitializer"
+ name="jboss.esb:service=MessageStoreDatabaseInitializer">
+ <attribute name="Datasource">java:/JBossESBDS</attribute>
+ <attribute name="ExistsSql">select * from message</attribute>
+ <attribute name="SqlFiles">
+ message-store-sql/hsqldb/create_database.sql
+ </attribute>
+ <depends>jboss.jca:service=DataSourceBinding,name=JBossESBDS</depends>
+ </mbean>
+ <mbean code="org.jboss.internal.soa.esb.dependencies.JBossESBDependenciesService"
+ name="jboss.esb:service=JBossESBDependencies"
+ description="Container for the JBossESB Dependencies">
+ </mbean>
<mbean code="org.jboss.internal.soa.esb.dependencies.JuddiRMIService"
name="jboss.esb:service=JuddiRMI"
description="Juddi RMI Service">
Added: labs/jbossesb/trunk/product/install/message-store/message-store-ds.xml
===================================================================
--- labs/jbossesb/trunk/product/install/message-store/message-store-ds.xml (rev 0)
+++ labs/jbossesb/trunk/product/install/message-store/message-store-ds.xml 2007-03-15 01:21:20 UTC (rev 10210)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<datasources>
+ <local-tx-datasource>
+ <jndi-name>JBossESBDS</jndi-name>
+ <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}JBossESBDS</connection-url>
+ <driver-class>org.hsqldb.jdbcDriver</driver-class>
+ <user-name>sa</user-name>
+ <password></password>
+ <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=Hypersonic,database=JBossESBDS</depends>
+ </local-tx-datasource>
+ <mbean code="org.jboss.jdbc.HypersonicDatabase"
+ name="jboss:service=Hypersonic,database=JBossESBDS">
+ <attribute name="Database">JBossESBDS</attribute>
+ <attribute name="InProcessMode">true</attribute>
+ </mbean>
+
+</datasources>
Modified: labs/jbossesb/trunk/product/install/message-store/sql/hsqldb/create_database.sql
===================================================================
--- labs/jbossesb/trunk/product/install/message-store/sql/hsqldb/create_database.sql 2007-03-15 01:11:58 UTC (rev 10209)
+++ labs/jbossesb/trunk/product/install/message-store/sql/hsqldb/create_database.sql 2007-03-15 01:21:20 UTC (rev 10210)
@@ -1,8 +1,4 @@
--- Database: jbossesb
--- DROP DATABASE jbossesb;
-
-
CREATE TABLE message
(
uuid VARCHAR NOT NULL,
Deleted: labs/jbossesb/trunk/product/install/standalone/jboss-4.0.5.GA.zip
===================================================================
(Binary files differ)
Copied: labs/jbossesb/trunk/product/install/standalone/jbossesb-server-base.zip (from rev 10170, labs/jbossesb/trunk/product/install/standalone/jboss-4.0.5.GA.zip)
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/product/install/standalone/jbossesb-server-base.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: labs/jbossesb/trunk/product/tools/configeditor/editor/dist/configapp.war
===================================================================
(Binary files differ)
Modified: labs/jbossesb/trunk/qa/junit/build.xml
===================================================================
--- labs/jbossesb/trunk/qa/junit/build.xml 2007-03-15 01:11:58 UTC (rev 10209)
+++ labs/jbossesb/trunk/qa/junit/build.xml 2007-03-15 01:21:20 UTC (rev 10210)
@@ -60,7 +60,8 @@
<include name="org/jboss/soa/esb/server/*.class"/>
</fileset>
<fileset dir="${qa.junit.resources}/server/simple">
- <include name="*.xml"/>
+ <include name="test-service.xml"/>
+ <include name="esb-jbm-service.xml"/>
<include name="META-INF/*.xml"/>
</fileset>
</jar>
Added: labs/jbossesb/trunk/qa/junit/resources/server/jndi.properties
===================================================================
--- labs/jbossesb/trunk/qa/junit/resources/server/jndi.properties (rev 0)
+++ labs/jbossesb/trunk/qa/junit/resources/server/jndi.properties 2007-03-15 01:21:20 UTC (rev 10210)
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.provider.url=jnp://localhost:1099
\ No newline at end of file
Added: labs/jbossesb/trunk/qa/junit/resources/server/simple/esb-jbm-service.xml
===================================================================
--- labs/jbossesb/trunk/qa/junit/resources/server/simple/esb-jbm-service.xml (rev 0)
+++ labs/jbossesb/trunk/qa/junit/resources/server/simple/esb-jbm-service.xml 2007-03-15 01:21:20 UTC (rev 10210)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=esb_gateway_channel"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.messaging.destination:service=Queue,name=esb_channel"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+</server>
Modified: labs/jbossesb/trunk/qa/junit/resources/server/simple/esb-queues-service.xml
===================================================================
--- labs/jbossesb/trunk/qa/junit/resources/server/simple/esb-queues-service.xml 2007-03-15 01:11:58 UTC (rev 10209)
+++ labs/jbossesb/trunk/qa/junit/resources/server/simple/esb-queues-service.xml 2007-03-15 01:21:20 UTC (rev 10210)
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- jboss mq version -->
<server>
<mbean code="org.jboss.mq.server.jmx.Queue"
name="jboss.mq.destination:service=Queue,name=esb_gateway_channel">
Added: labs/jbossesb/trunk/qa/lib/ext/jboss-messaging-client.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbossesb/trunk/qa/lib/ext/jboss-messaging-client.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: labs/jbossesb/trunk/qa/lib/ext/jboss-remoting.jar
===================================================================
(Binary files differ)
More information about the jboss-svn-commits
mailing list