[jboss-svn-commits] JBL Code SVN: r15777 - in labs/jbossesb/trunk/product: install/jUDDI-registry/sql/db2 and 15 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Thu Oct 11 15:35:24 EDT 2007


Author: kurt.stam at jboss.com
Date: 2007-10-11 15:35:23 -0400 (Thu, 11 Oct 2007)
New Revision: 15777

Modified:
   labs/jbossesb/trunk/product/install/jUDDI-registry/sql/daffodildb/import.sql
   labs/jbossesb/trunk/product/install/jUDDI-registry/sql/db2/import.sql
   labs/jbossesb/trunk/product/install/jUDDI-registry/sql/derby/import.sql
   labs/jbossesb/trunk/product/install/jUDDI-registry/sql/firebird/import.sql
   labs/jbossesb/trunk/product/install/jUDDI-registry/sql/hsqldb/drop_database.sql
   labs/jbossesb/trunk/product/install/jUDDI-registry/sql/hsqldb/import.sql
   labs/jbossesb/trunk/product/install/jUDDI-registry/sql/informix/import.sql
   labs/jbossesb/trunk/product/install/jUDDI-registry/sql/jdatastore/import.sql
   labs/jbossesb/trunk/product/install/jUDDI-registry/sql/mysql/import.sql
   labs/jbossesb/trunk/product/install/jUDDI-registry/sql/oracle/import.sql
   labs/jbossesb/trunk/product/install/jUDDI-registry/sql/postgresql/import.sql
   labs/jbossesb/trunk/product/install/jUDDI-registry/sql/sybase/import.sql
   labs/jbossesb/trunk/product/install/jUDDI-registry/sql/totalxml/import.sql
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryUnitTest.java
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/ListenerManagerBaseTest.java
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/ServiceInvokerUnitTest.java
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/GatewayListenerControllerBaseTest.java
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/services/registry/RegistryUnitTest.java
   labs/jbossesb/trunk/product/samples/trailblazer/esb/src/org/jboss/soa/esb/samples/trailblazer/util/TbBootStrapper.java
Log:
JBESB-1114, new juddi.war, came with a new juddi.jar which now supports a prefix to the table names.

Modified: labs/jbossesb/trunk/product/install/jUDDI-registry/sql/daffodildb/import.sql
===================================================================
--- labs/jbossesb/trunk/product/install/jUDDI-registry/sql/daffodildb/import.sql	2007-10-11 18:59:09 UTC (rev 15776)
+++ labs/jbossesb/trunk/product/install/jUDDI-registry/sql/daffodildb/import.sql	2007-10-11 19:35:23 UTC (rev 15777)
@@ -1,6 +1,6 @@
-INSERT INTO PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
+INSERT INTO ${prefix}PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
 VALUES ('jbossesb','JBoss ESB User','uddi-admin at example.com','true','true',25,20,10,100);
 
-INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+INSERT INTO ${prefix}TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
 VALUES ('uuid:C7536010-F786-11DB-A010-E6245C4E79A1','JBoss ESB User','jbossesb','jUDDI.org','org.jboss.soa.esb.:category',NULL,CURTIMESTAMP());
 

Modified: labs/jbossesb/trunk/product/install/jUDDI-registry/sql/db2/import.sql
===================================================================
--- labs/jbossesb/trunk/product/install/jUDDI-registry/sql/db2/import.sql	2007-10-11 18:59:09 UTC (rev 15776)
+++ labs/jbossesb/trunk/product/install/jUDDI-registry/sql/db2/import.sql	2007-10-11 19:35:23 UTC (rev 15777)
@@ -1,6 +1,6 @@
-INSERT INTO PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
+INSERT INTO ${prefix}PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
 VALUES ('jbossesb','JBoss ESB User','uddi-admin at example.com','true','true',25,20,10,100);
 
-INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+INSERT INTO ${prefix}TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
 VALUES ('uuid:C7536010-F786-11DB-A010-E6245C4E79A1','JBoss ESB User','jbossesb','jUDDI.org','org.jboss.soa.esb.:category',NULL,CURRENT TIMESTAMP);
 

Modified: labs/jbossesb/trunk/product/install/jUDDI-registry/sql/derby/import.sql
===================================================================
--- labs/jbossesb/trunk/product/install/jUDDI-registry/sql/derby/import.sql	2007-10-11 18:59:09 UTC (rev 15776)
+++ labs/jbossesb/trunk/product/install/jUDDI-registry/sql/derby/import.sql	2007-10-11 19:35:23 UTC (rev 15777)
@@ -1,6 +1,6 @@
-INSERT INTO PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
+INSERT INTO ${prefix}PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
 VALUES ('jbossesb','JBoss ESB User','uddi-admin at example.com','true','true',25,20,10,100);
 
-INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+INSERT INTO ${prefix}TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
 VALUES ('uuid:C7536010-F786-11DB-A010-E6245C4E79A1','JBoss ESB User','jbossesb','jUDDI.org','org.jboss.soa.esb.:category',NULL,CURRENT TIMESTAMP);
 

Modified: labs/jbossesb/trunk/product/install/jUDDI-registry/sql/firebird/import.sql
===================================================================
--- labs/jbossesb/trunk/product/install/jUDDI-registry/sql/firebird/import.sql	2007-10-11 18:59:09 UTC (rev 15776)
+++ labs/jbossesb/trunk/product/install/jUDDI-registry/sql/firebird/import.sql	2007-10-11 19:35:23 UTC (rev 15777)
@@ -1,6 +1,6 @@
-INSERT INTO PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
+INSERT INTO ${prefix}PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
 VALUES ('jbossesb','JBoss ESB User','uddi-admin at example.com','true','true',25,20,10,100);
 
-INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+INSERT INTO ${prefix}TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
 VALUES ('uuid:C7536010-F786-11DB-A010-E6245C4E79A1','JBoss ESB User','jbossesb','jUDDI.org','org.jboss.soa.esb.:category',NULL,CURRENT_DATE);
 

Modified: labs/jbossesb/trunk/product/install/jUDDI-registry/sql/hsqldb/drop_database.sql
===================================================================
--- labs/jbossesb/trunk/product/install/jUDDI-registry/sql/hsqldb/drop_database.sql	2007-10-11 18:59:09 UTC (rev 15776)
+++ labs/jbossesb/trunk/product/install/jUDDI-registry/sql/hsqldb/drop_database.sql	2007-10-11 19:35:23 UTC (rev 15777)
@@ -1,31 +1,31 @@
-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;
\ No newline at end of file
+DROP TABLE ${prefix}${prefix}BUSINESS_DESCR IF EXISTS;
+DROP TABLE ${prefix}BUSINESS_CATEGORY IF EXISTS;
+DROP TABLE ${prefix}BUSINESS_IDENTIFIER IF EXISTS;
+DROP TABLE ${prefix}BUSINESS_NAME IF EXISTS;
+DROP TABLE ${prefix}DISCOVERY_URL IF EXISTS;
+DROP TABLE ${prefix}ADDRESS_LINE IF EXISTS;
+DROP TABLE ${prefix}ADDRESS IF EXISTS;
+DROP TABLE ${prefix}PHONE IF EXISTS;
+DROP TABLE ${prefix}EMAIL IF EXISTS;
+DROP TABLE ${prefix}CONTACT_DESCR IF EXISTS;
+DROP TABLE ${prefix}CONTACT IF EXISTS;
+DROP TABLE ${prefix}SERVICE_DESCR IF EXISTS;
+DROP TABLE ${prefix}SERVICE_CATEGORY IF EXISTS;
+DROP TABLE ${prefix}SERVICE_NAME IF EXISTS;
+DROP TABLE ${prefix}BINDING_DESCR IF EXISTS;
+DROP TABLE ${prefix}BINDING_CATEGORY IF EXISTS;
+DROP TABLE ${prefix}INSTANCE_DETAILS_DESCR IF EXISTS;
+DROP TABLE ${prefix}INSTANCE_DETAILS_DOC_DESCR IF EXISTS;
+DROP TABLE ${prefix}TMODEL_CATEGORY IF EXISTS;
+DROP TABLE ${prefix}TMODEL_DESCR IF EXISTS;
+DROP TABLE ${prefix}TMODEL_DOC_DESCR IF EXISTS;
+DROP TABLE ${prefix}TMODEL_IDENTIFIER IF EXISTS;
+DROP TABLE ${prefix}TMODEL_INSTANCE_INFO_DESCR IF EXISTS;
+DROP TABLE ${prefix}TMODEL_INSTANCE_INFO IF EXISTS;
+DROP TABLE ${prefix}PUBLISHER_ASSERTION IF EXISTS;
+DROP TABLE ${prefix}TMODEL IF EXISTS;
+DROP TABLE ${prefix}BINDING_TEMPLATE IF EXISTS;
+DROP TABLE ${prefix}BUSINESS_SERVICE IF EXISTS;
+DROP TABLE ${prefix}BUSINESS_ENTITY IF EXISTS;
+DROP TABLE ${prefix}PUBLISHER IF EXISTS;
+DROP TABLE ${prefix}AUTH_TOKEN IF EXISTS;
\ No newline at end of file

Modified: labs/jbossesb/trunk/product/install/jUDDI-registry/sql/hsqldb/import.sql
===================================================================
--- labs/jbossesb/trunk/product/install/jUDDI-registry/sql/hsqldb/import.sql	2007-10-11 18:59:09 UTC (rev 15776)
+++ labs/jbossesb/trunk/product/install/jUDDI-registry/sql/hsqldb/import.sql	2007-10-11 19:35:23 UTC (rev 15777)
@@ -1,6 +1,6 @@
-INSERT INTO PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
+INSERT INTO ${prefix}PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
 VALUES ('jbossesb','JBoss ESB User','uddi-admin at example.com','true','true',25,20,10,100);
 
-INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+INSERT INTO ${prefix}TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
 VALUES ('uuid:C7536010-F786-11DB-A010-E6245C4E79A1','JBoss ESB User','jbossesb','jUDDI.org','org.jboss.soa.esb.:category',NULL,CURDATE());
 

Modified: labs/jbossesb/trunk/product/install/jUDDI-registry/sql/informix/import.sql
===================================================================
--- labs/jbossesb/trunk/product/install/jUDDI-registry/sql/informix/import.sql	2007-10-11 18:59:09 UTC (rev 15776)
+++ labs/jbossesb/trunk/product/install/jUDDI-registry/sql/informix/import.sql	2007-10-11 19:35:23 UTC (rev 15777)
@@ -1,7 +1,7 @@
-INSERT INTO PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
+INSERT INTO ${prefix}PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
 VALUES ('jbossesb','JBoss ESB User','uddi-admin at example.com','true','true',25,20,10,100);
 
-INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME)
+INSERT INTO ${prefix}TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME)
 VALUES ('uuid:C7536010-F786-11DB-A010-E6245C4E79A1','JBoss ESB User','jbossesb','jUDDI.org','org.jboss.soa.esb.:category');
 
 

Modified: labs/jbossesb/trunk/product/install/jUDDI-registry/sql/jdatastore/import.sql
===================================================================
--- labs/jbossesb/trunk/product/install/jUDDI-registry/sql/jdatastore/import.sql	2007-10-11 18:59:09 UTC (rev 15776)
+++ labs/jbossesb/trunk/product/install/jUDDI-registry/sql/jdatastore/import.sql	2007-10-11 19:35:23 UTC (rev 15777)
@@ -1,5 +1,5 @@
-INSERT INTO PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
+INSERT INTO ${prefix}PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
 VALUES ('jbossesb','JBoss ESB User','uddi-admin at example.com','true','true',25,20,10,100);
 
-INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+INSERT INTO ${prefix}TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
 VALUES ('uuid:C7536010-F786-11DB-A010-E6245C4E79A1','JBoss ESB User','jbossesb','jUDDI.org','org.jboss.soa.esb.:category',NULL,CURRENT_DATE);

Modified: labs/jbossesb/trunk/product/install/jUDDI-registry/sql/mysql/import.sql
===================================================================
--- labs/jbossesb/trunk/product/install/jUDDI-registry/sql/mysql/import.sql	2007-10-11 18:59:09 UTC (rev 15776)
+++ labs/jbossesb/trunk/product/install/jUDDI-registry/sql/mysql/import.sql	2007-10-11 19:35:23 UTC (rev 15777)
@@ -1,6 +1,6 @@
-INSERT INTO PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
+INSERT INTO ${prefix}PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
 VALUES ('jbossesb','JBoss ESB User','uddi-admin at example.com','true','true',25,20,10,100);
 
-INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+INSERT INTO ${prefix}TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
 VALUES ('uuid:C7536010-F786-11DB-A010-E6245C4E79A1','JBoss ESB User','jbossesb','jUDDI.org','org.jboss.soa.esb.:category',NULL,NULL);
 

Modified: labs/jbossesb/trunk/product/install/jUDDI-registry/sql/oracle/import.sql
===================================================================
--- labs/jbossesb/trunk/product/install/jUDDI-registry/sql/oracle/import.sql	2007-10-11 18:59:09 UTC (rev 15776)
+++ labs/jbossesb/trunk/product/install/jUDDI-registry/sql/oracle/import.sql	2007-10-11 19:35:23 UTC (rev 15777)
@@ -1,6 +1,6 @@
-INSERT INTO PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
+INSERT INTO ${prefix}PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
 VALUES ('jbossesb','JBoss ESB User','uddi-admin at example.com','true','true',25,20,10,100);
 
-INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+INSERT INTO ${prefix}TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
 VALUES ('uuid:C7536010-F786-11DB-A010-E6245C4E79A1','JBoss ESB User','jbossesb','jUDDI.org','org.jboss.soa.esb.:category',NULL,SYSDATE);
 

Modified: labs/jbossesb/trunk/product/install/jUDDI-registry/sql/postgresql/import.sql
===================================================================
--- labs/jbossesb/trunk/product/install/jUDDI-registry/sql/postgresql/import.sql	2007-10-11 18:59:09 UTC (rev 15776)
+++ labs/jbossesb/trunk/product/install/jUDDI-registry/sql/postgresql/import.sql	2007-10-11 19:35:23 UTC (rev 15777)
@@ -1,5 +1,5 @@
-INSERT INTO PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
+INSERT INTO ${prefix}PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
 VALUES ('jbossesb','JBoss ESB User','uddi-admin at example.com','true','true',25,20,10,100);
 
-INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL)
+INSERT INTO ${prefix}TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL)
 VALUES ('uuid:C7536010-F786-11DB-A010-E6245C4E79A1','JBoss ESB User','jbossesb','jUDDI.org','org.jboss.soa.esb.:category',NULL);

Modified: labs/jbossesb/trunk/product/install/jUDDI-registry/sql/sybase/import.sql
===================================================================
--- labs/jbossesb/trunk/product/install/jUDDI-registry/sql/sybase/import.sql	2007-10-11 18:59:09 UTC (rev 15776)
+++ labs/jbossesb/trunk/product/install/jUDDI-registry/sql/sybase/import.sql	2007-10-11 19:35:23 UTC (rev 15777)
@@ -1,7 +1,7 @@
-INSERT INTO PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
+INSERT INTO ${prefix}PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
 VALUES ('jbossesb','JBoss ESB User','uddi-admin at example.com','true','true',25,20,10,100);
 
-INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+INSERT INTO ${prefix}TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
 VALUES ('uuid:C7536010-F786-11DB-A010-E6245C4E79A1','JBoss ESB User','jbossesb','jUDDI.org','org.jboss.soa.esb.:category',NULL,getDate());
 
 

Modified: labs/jbossesb/trunk/product/install/jUDDI-registry/sql/totalxml/import.sql
===================================================================
--- labs/jbossesb/trunk/product/install/jUDDI-registry/sql/totalxml/import.sql	2007-10-11 18:59:09 UTC (rev 15776)
+++ labs/jbossesb/trunk/product/install/jUDDI-registry/sql/totalxml/import.sql	2007-10-11 19:35:23 UTC (rev 15777)
@@ -1,7 +1,7 @@
-INSERT INTO PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
+INSERT INTO ${prefix}PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,EMAIL_ADDRESS,IS_ENABLED,IS_ADMIN,MAX_SERVICES_PER_BUSINESS,MAX_BINDINGS_PER_SERVICE,MAX_BUSINESSES,MAX_TMODELS)
 VALUES ('jbossesb','JBoss ESB User','uddi-admin at example.com','true','true',25,20,10,100);
 
-INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+INSERT INTO ${prefix}TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
 VALUES ('uuid:C7536010-F786-11DB-A010-E6245C4E79A1','JBoss ESB User','jbossesb','jUDDI.org','org.jboss.soa.esb.:category',NULL,CURRENT_TIMESTAMP);
 
 

Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryUnitTest.java	2007-10-11 18:59:09 UTC (rev 15776)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryUnitTest.java	2007-10-11 19:35:23 UTC (rev 15777)
@@ -244,12 +244,11 @@
 			//Get the registry-schema create scripts
 			String sqlDir = TestEnvironmentUtil.getUserDir() + "install/jUDDI-registry/sql/" + database + "/";
 			//Drop what is there now, if exists. We want to start fresh.
-			String sqlDropCmd      = FileUtil.readTextFile(new File(sqlDir + "drop_database.sql"));
-            //ClassLoader loader = Thread.currentThread().getContextClassLoader();
+			String sqlDropCmd      = FileUtil.readTextFile(new File(sqlDir + "drop_database.sql")).replaceAll("\\$\\{prefix}", "");
             String resource = "juddi-sql/" + database + "/create_database.sql";
             InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(resource);
-			String sqlCreateCmd    = FileUtil.readStream(is);
-			String sqlInsertPubCmd = FileUtil.readTextFile(new File(sqlDir + "import.sql"));
+			String sqlCreateCmd    = FileUtil.readStream(is).trim().replaceAll("\\$\\{prefix}", "");
+			String sqlInsertPubCmd = FileUtil.readTextFile(new File(sqlDir + "import.sql")).trim().replaceAll("\\$\\{prefix}", "");
 			
 			try {
 				Class.forName(mDbDriver);

Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/ListenerManagerBaseTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/ListenerManagerBaseTest.java	2007-10-11 18:59:09 UTC (rev 15776)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/ListenerManagerBaseTest.java	2007-10-11 19:35:23 UTC (rev 15777)
@@ -176,12 +176,12 @@
 					+ "/install/jUDDI-registry/sql/" + database + "/";
 			// Drop what is there now, if exists. We want to start fresh.
 			String sqlDropCmd = FileUtil.readTextFile(new File(sqlDir
-					+ "drop_database.sql"));
+					+ "drop_database.sql")).replaceAll("\\$\\{prefix}", "");
             String resource = "juddi-sql/" + database + "/create_database.sql";
             InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(resource);
-            String sqlCreateCmd    = FileUtil.readStream(is);
+            String sqlCreateCmd    = FileUtil.readStream(is).trim().replaceAll("\\$\\{prefix}", "");
 			String sqlInsertPubCmd = FileUtil.readTextFile(new File(sqlDir
-					+ "import.sql"));
+					+ "import.sql")).trim().replaceAll("\\$\\{prefix}", "");
 
 			try
 			{

Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/ServiceInvokerUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/ServiceInvokerUnitTest.java	2007-10-11 18:59:09 UTC (rev 15776)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/ServiceInvokerUnitTest.java	2007-10-11 19:35:23 UTC (rev 15777)
@@ -89,12 +89,12 @@
 					+ "/install/jUDDI-registry/sql/" + database + "/";
 			// Drop what is there now, if exists. We want to start fresh.
 			String sqlDropCmd = FileUtil.readTextFile(new File(sqlDir
-					+ "drop_database.sql"));
+					+ "drop_database.sql")).replaceAll("\\$\\{prefix}", "");
             String resource = "juddi-sql/" + database + "/create_database.sql";
             InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(resource);
-            String sqlCreateCmd    = FileUtil.readStream(is);
+            String sqlCreateCmd    = FileUtil.readStream(is).trim().replaceAll("\\$\\{prefix}", "");
 			String sqlInsertPubCmd = FileUtil.readTextFile(new File(sqlDir
-					+ "import.sql"));
+					+ "import.sql")).trim().replaceAll("\\$\\{prefix}", "");
 
 			try
 			{

Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/GatewayListenerControllerBaseTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/GatewayListenerControllerBaseTest.java	2007-10-11 18:59:09 UTC (rev 15776)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/gateway/GatewayListenerControllerBaseTest.java	2007-10-11 19:35:23 UTC (rev 15777)
@@ -92,12 +92,12 @@
 					+ "/install/jUDDI-registry/sql/" + database + "/";
 			// Drop what is there now, if exists. We want to start fresh.
 			String sqlDropCmd = FileUtil.readTextFile(new File(sqlDir
-					+ "drop_database.sql"));
+					+ "drop_database.sql")).replaceAll("\\$\\{prefix}", "");
             String resource = "juddi-sql/" + database + "/create_database.sql";
             InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(resource);
-            String sqlCreateCmd    = FileUtil.readStream(is);
+            String sqlCreateCmd    = FileUtil.readStream(is).trim().replaceAll("\\$\\{prefix}", "");
 			String sqlInsertPubCmd = FileUtil.readTextFile(new File(sqlDir
-					+ "import.sql"));
+					+ "import.sql")).trim().replaceAll("\\$\\{prefix}", "");
 
 			try
 			{

Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/services/registry/RegistryUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/services/registry/RegistryUnitTest.java	2007-10-11 18:59:09 UTC (rev 15776)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/services/registry/RegistryUnitTest.java	2007-10-11 19:35:23 UTC (rev 15777)
@@ -187,11 +187,11 @@
 			//Get the registry-schema create scripts
 			String sqlDir = TestEnvironmentUtil.getUserDir() + "install/jUDDI-registry/sql/" + database + "/";
 			//Drop what is there now, if exists. We want to start fresh.
-			String sqlDropCmd      = FileUtil.readTextFile(new File(sqlDir + "drop_database.sql"));
+			String sqlDropCmd      = FileUtil.readTextFile(new File(sqlDir + "drop_database.sql")).replaceAll("\\$\\{prefix}", "");
             String resource = "juddi-sql/" + database + "/create_database.sql";
             InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(resource);
-            String sqlCreateCmd    = FileUtil.readStream(is);
-			String sqlInsertPubCmd = FileUtil.readTextFile(new File(sqlDir + "import.sql"));
+            String sqlCreateCmd    = FileUtil.readStream(is).trim().replaceAll("\\$\\{prefix}", "");
+			String sqlInsertPubCmd = FileUtil.readTextFile(new File(sqlDir + "import.sql")).trim().replaceAll("\\$\\{prefix}", "");
 			
 			try {
 				Class.forName(mDbDriver);

Modified: labs/jbossesb/trunk/product/samples/trailblazer/esb/src/org/jboss/soa/esb/samples/trailblazer/util/TbBootStrapper.java
===================================================================
--- labs/jbossesb/trunk/product/samples/trailblazer/esb/src/org/jboss/soa/esb/samples/trailblazer/util/TbBootStrapper.java	2007-10-11 18:59:09 UTC (rev 15776)
+++ labs/jbossesb/trunk/product/samples/trailblazer/esb/src/org/jboss/soa/esb/samples/trailblazer/util/TbBootStrapper.java	2007-10-11 19:35:23 UTC (rev 15777)
@@ -132,15 +132,15 @@
 			//registry DB
 			sqlDir = productDir + "install/jUDDI-registry/sql/" + database + "/";
 			System.out.println("Dropping the registry schema if exists...");
-			sqlDropCmd      = TestEnvironmentUtil.readTextFile(new File(sqlDir + "drop_database.sql"));
+			sqlDropCmd      = TestEnvironmentUtil.readTextFile(new File(sqlDir + "drop_database.sql")).replaceAll("\\$\\{prefix}", "");
 			stmnt.execute(sqlDropCmd);
 			System.out.println("creating the registry schema...");
             String resource = "juddi-sql/" + database + "/create_database.sql";
             InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(resource);
-            sqlCreateCmd    = FileUtil.readStream(is);
+            sqlCreateCmd    = FileUtil.readStream(is).trim().replaceAll("\\$\\{prefix}", "");
 			stmnt.execute(sqlCreateCmd);
 			System.out.println("inserting registry publishers...");
-			String sqlInsertPubCmd = TestEnvironmentUtil.readTextFile(new File(sqlDir + "import.sql"));
+			String sqlInsertPubCmd = TestEnvironmentUtil.readTextFile(new File(sqlDir + "import.sql")).trim().replaceAll("\\$\\{prefix}", "");
 			stmnt.execute(sqlInsertPubCmd);
 			stmnt.close();
 			con.close();




More information about the jboss-svn-commits mailing list