[jboss-svn-commits] JBL Code SVN: r33050 - in labs/jbossesb/trunk: product/install and 41 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Mon May 24 12:38:14 EDT 2010


Author: kevin.conner at jboss.com
Date: 2010-05-24 12:38:08 -0400 (Mon, 24 May 2010)
New Revision: 33050

Added:
   labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/
   labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/db2/
   labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/db2/import.sql
   labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/derby/
   labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/derby/import.sql
   labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/hsqldb/
   labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/hsqldb/import.sql
   labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/mysql/
   labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/mysql/import.sql
   labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/oracle9/
   labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/oracle9/import.sql
   labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/postgres/
   labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/postgres/import.sql
   labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/sqlserver/
   labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/sqlserver/import.sql
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/requestType.xsd
   labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration1/composer/
   labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration1/composer/GatewayMessageComposer.java
   labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/integration/AbstractJmsServiceFactory.java
   labs/jbossesb/trunk/product/tools/systinet/src/main/java/org/jboss/soa/esb/registry/rmi/Utils.java
   labs/jbossesb/trunk/qa/junit/resources/server/ebws/META-INF/deployment.xml
Removed:
   labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/db2/
   labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/db2/import.sql
   labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/derby/
   labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/derby/import.sql
   labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/hsqldb/
   labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/hsqldb/import.sql
   labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/mysql/
   labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/mysql/import.sql
   labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/oracle9/
   labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/oracle9/import.sql
   labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/postgres/
   labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/postgres/import.sql
   labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/sqlserver/
   labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/sqlserver/import.sql
   labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration1/composer/GatewayMessageComposer.java
   labs/jbossesb/trunk/product/tools/systinet/systinet.properties
Modified:
   labs/jbossesb/trunk/product/build-distr.xml
   labs/jbossesb/trunk/product/build.xml
   labs/jbossesb/trunk/product/install/build.xml
   labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-ds.xml
   labs/jbossesb/trunk/product/install/jUDDI-registryV3/persistence.xml
   labs/jbossesb/trunk/product/install/registry-jboss-service-jbossas5.xml
   labs/jbossesb/trunk/product/install/registry-jboss-service.xml
   labs/jbossesb/trunk/product/ivy.xml
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/listeners/war/HttpGatewayDeploymentFactory.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/listeners/war/Servlet.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBContractGenerator.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/routing/JMSRouter.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/validation/SchemaValidationAction.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/helpers/persist/JdbcCleanConn.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbDeployment.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbDeploymentMBean.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbWsdlDeployer.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/util/VfsUtil.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/SqlTableGatewayListener.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/http/HttpGatewayServlet.java
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/ESBContractGeneratorUnitTest.java
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/request.xsd
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/routing/JMSRouterUnitTest.java
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/util/VfsUtilUnitTest.java
   labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/jboss-esb-unfiltered.xml
   labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml
   labs/jbossesb/trunk/product/samples/quickstarts/http_gateway/jboss-esb.xml
   labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/AsyncProcessSignal.java
   labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/integration/msg/JmsMessageServiceFactory.java
   labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/integration/timer/JmsSchedulerServiceFactory.java
   labs/jbossesb/trunk/product/services/jbpm/src/main/resources/config/jmsscheduler/jbpm.cfg.xml.config
   labs/jbossesb/trunk/product/services/jbpm/src/main/resources/config/quartzscheduler/jbpm.cfg.xml.config
   labs/jbossesb/trunk/product/services/jbpm/src/main/resources/jbpm.cfg.xml
   labs/jbossesb/trunk/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ESBMessageEventPoller.java
   labs/jbossesb/trunk/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ServiceComponent.java
   labs/jbossesb/trunk/product/tools/systinet/build.xml
   labs/jbossesb/trunk/product/tools/systinet/src/main/java/org/jboss/soa/esb/registry/rmi/InquiryService.java
   labs/jbossesb/trunk/product/tools/systinet/src/main/java/org/jboss/soa/esb/registry/rmi/PublishService.java
   labs/jbossesb/trunk/qa/base-cp.xml
   labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HttpGatewayTest.java
Log:
code merge of 4.7CP2 ER2: JBESB-3328

Modified: labs/jbossesb/trunk/product/build-distr.xml
===================================================================
--- labs/jbossesb/trunk/product/build-distr.xml	2010-05-24 16:26:15 UTC (rev 33049)
+++ labs/jbossesb/trunk/product/build-distr.xml	2010-05-24 16:38:08 UTC (rev 33050)
@@ -88,8 +88,7 @@
 
         <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"/>
+            <fileset dir="${build.lib.dir}" includes="jbossesb*.jar" excludes="jbossesb-registry.jar jbossesb-transport*.jar"/>
             <!-- xbean for reading/marchalling xml for configuration, and scout -->
             <fileset dir="${lib.dir}" includes="xbean*.jar"/>
             <fileset dir="${lib.dir}" includes="stax-api-*.jar"/>
@@ -128,6 +127,7 @@
             <fileset dir="${installation.files.dir}/jUDDI-registryV3">
                 <include name="juddi-ds.xml"/>
                 <include name="esb.juddi.xml"/>
+                <include name="juddi-sql/**"/>
             </fileset>
             <!-- temporary until 3.0.1 release pushed out through maven -->
 	    <fileset dir="${lib.ext.dir}" includes="juddi-core-*.jar"/>

Modified: labs/jbossesb/trunk/product/build.xml
===================================================================
--- labs/jbossesb/trunk/product/build.xml	2010-05-24 16:26:15 UTC (rev 33049)
+++ labs/jbossesb/trunk/product/build.xml	2010-05-24 16:38:08 UTC (rev 33050)
@@ -153,6 +153,11 @@
                 <ant dir="tools/jonplugin"/>
     </target>
 
+    <target name="org.jboss.soa.esb.systinet.build" depends="org.jboss.esb.rosetta.compile">
+                <echo message="Build Systinet jars"/>
+                <ant dir="tools/systinet"/>
+    </target>
+
     <target name="dependencies.get">
         <ant antfile="ivy-build.xml" />
     </target>
@@ -295,7 +300,7 @@
 	
 	<!-- produce a basic installation (minus docs and samples) -->
 	
-	<target name="org.jboss.esb.install" depends="org.jboss.esb.contract-web, org.jboss.esb.jar, org.jboss.soa.esb.plugin.build">
+	<target name="org.jboss.esb.install" depends="org.jboss.esb.contract-web, org.jboss.esb.jar, org.jboss.soa.esb.plugin.build, org.jboss.soa.esb.systinet.build">
 
 		<echo message="Installation directory : ${org.jboss.esb.installationdirectory}"/>
 
@@ -435,6 +440,7 @@
 		<ant dir="contract-web" target="clean"/>
         <ant dir="services" target="clean"/>
 		<ant dir="tools/jonplugin" target="clean"/>
+		<ant dir="tools/systinet" target="clean"/>
 
 		<delete dir="${org.jboss.esb.internal.dest}"/>
 		<delete dir="${org.jboss.esb.internal.dest.root}"/>

Modified: labs/jbossesb/trunk/product/install/build.xml
===================================================================
--- labs/jbossesb/trunk/product/install/build.xml	2010-05-24 16:26:15 UTC (rev 33049)
+++ labs/jbossesb/trunk/product/install/build.xml	2010-05-24 16:38:08 UTC (rev 33050)
@@ -259,7 +259,6 @@
                 <include name="commons-ssl-*.jar"/>
                 <include name="commons-io-*.jar"/>
                 <include name="groovy-all-*.jar"/>
-                <include name="jbossts-common.jar"/>
                 <include name="jsch-*.jar"/>
                 <include name="mina-core-*.jar"/>
                 <include name="mina-filter-ssl-*.jar"/>
@@ -322,7 +321,6 @@
             	<exclude name="lib/commons-ssl-*.jar"/>
                 <exclude name="lib/commons-io-*.jar"/>
             	<exclude name="lib/groovy-all-*.jar"/>
-            	<exclude name="lib/jbossts-common.jar"/>
             	<exclude name="lib/jsch-*.jar"/>
             	<exclude name="lib/mina-core-*.jar"/>
             	<exclude name="lib/mina-filter-ssl-*.jar"/>

Modified: labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-ds.xml
===================================================================
--- labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-ds.xml	2010-05-24 16:26:15 UTC (rev 33049)
+++ labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-ds.xml	2010-05-24 16:38:08 UTC (rev 33050)
@@ -18,5 +18,13 @@
         <attribute name="Database">juddiDB</attribute>
         <attribute name="InProcessMode">true</attribute>
    </mbean>
-   
+   <mbean code="org.jboss.internal.soa.esb.dependencies.DatabaseInitializer"
+      name="jboss.esb:service=JUDDIDatabaseInitializer">
+      <attribute name="Datasource">java:/juddiDB</attribute>
+      <attribute name="ExistsSql">select count(*) from  j3_publisher</attribute>
+      <attribute name="SqlFiles">
+         juddi-sql/hsqldb/import.sql
+      </attribute>
+      <depends>jboss.jca:service=DataSourceBinding,name=juddiDB</depends>
+   </mbean>
 </datasources>

Copied: labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql (from rev 33044, labs/jbossesb/tags/JBESB_4_7_CP2_ER2/product/install/jUDDI-registryV3/juddi-sql)

Copied: labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/db2 (from rev 33044, labs/jbossesb/tags/JBESB_4_7_CP2_ER2/product/install/jUDDI-registryV3/juddi-sql/db2)

Deleted: labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/db2/import.sql
===================================================================
--- labs/jbossesb/tags/JBESB_4_7_CP2_ER2/product/install/jUDDI-registryV3/juddi-sql/db2/import.sql	2010-05-24 14:43:21 UTC (rev 33044)
+++ labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/db2/import.sql	2010-05-24 16:38:08 UTC (rev 33050)
@@ -1,629 +0,0 @@
-
-    create table j3_address (
-        id bigint generated by default as identity,
-        sort_code varchar(10),
-        tmodel_key varchar(255),
-        use_type varchar(255),
-        address_id bigint not null,
-        primary key (id)
-    );
-
-    create table j3_address_line (
-        id bigint generated by default as identity,
-        key_name varchar(255),
-        key_value varchar(255),
-        line varchar(80) not null,
-        address_id bigint not null,
-        primary key (id)
-    );
-
-    create table j3_auth_token (
-        auth_token varchar(51) not null,
-        authorized_name varchar(255) not null,
-        created timestamp not null,
-        last_used timestamp not null,
-        number_of_uses integer not null,
-        token_state integer not null,
-        primary key (auth_token)
-    );
-
-    create table j3_binding_category_bag (
-        id bigint not null,
-        entity_key varchar(255) not null,
-        primary key (id),
-        unique (entity_key)
-    );
-
-    create table j3_binding_descr (
-        id bigint generated by default as identity,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_binding_template (
-        access_point_type varchar(255),
-        access_point_url varchar(4000),
-        hosting_redirector varchar(255),
-        entity_key varchar(255) not null,
-        service_key varchar(255) not null,
-        primary key (entity_key)
-    );
-
-    create table j3_business_category_bag (
-        id bigint not null,
-        entity_key varchar(255) not null,
-        primary key (id),
-        unique (entity_key)
-    );
-
-    create table j3_business_descr (
-        id bigint generated by default as identity,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_business_entity (
-        entity_key varchar(255) not null,
-        primary key (entity_key)
-    );
-
-    create table j3_business_identifier (
-        id bigint generated by default as identity,
-        key_name varchar(255),
-        key_value varchar(255) not null,
-        tmodel_key_ref varchar(255),
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_business_name (
-        id bigint generated by default as identity,
-        lang_code varchar(5),
-        name varchar(255) not null,
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_business_service (
-        entity_key varchar(255) not null,
-        business_key varchar(255) not null,
-        primary key (entity_key)
-    );
-
-    create table j3_category_bag (
-        id bigint generated by default as identity,
-        primary key (id)
-    );
-
-    create table j3_clerk (
-        clerk_name varchar(255) not null,
-        cred varchar(255),
-        publisher_id varchar(255) not null,
-        node_name varchar(255),
-        primary key (clerk_name)
-    );
-
-    create table j3_client_subscriptioninfo (
-        subscription_key varchar(255) not null,
-        last_notified timestamp,
-        fromClerk_clerk_name varchar(255),
-        toClerk_clerk_name varchar(255),
-        primary key (subscription_key)
-    );
-
-    create table j3_contact (
-        id bigint generated by default as identity,
-        use_type varchar(255),
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_contact_descr (
-        id bigint generated by default as identity,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
-        contact_id bigint not null,
-        primary key (id)
-    );
-
-    create table j3_discovery_url (
-        id bigint generated by default as identity,
-        url varchar(255) not null,
-        use_type varchar(255) not null,
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_email (
-        id bigint generated by default as identity,
-        email_address varchar(255) not null,
-        use_type varchar(255),
-        contact_id bigint not null,
-        primary key (id)
-    );
-
-    create table j3_instance_details_descr (
-        id bigint generated by default as identity,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
-        tmodel_instance_info_id bigint not null,
-        primary key (id)
-    );
-
-    create table j3_instance_details_doc_descr (
-        id bigint generated by default as identity,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
-        tmodel_instance_info_id bigint not null,
-        primary key (id)
-    );
-
-    create table j3_keyed_reference (
-        id bigint generated by default as identity,
-        key_name varchar(255),
-        key_value varchar(255) not null,
-        tmodel_key_ref varchar(255),
-        category_bag_id bigint,
-        keyed_reference_group_id bigint,
-        primary key (id)
-    );
-
-    create table j3_keyed_reference_group (
-        id bigint generated by default as identity,
-        tmodel_key varchar(255),
-        category_bag_id bigint not null,
-        primary key (id)
-    );
-
-    create table j3_node (
-        name varchar(255) not null,
-        custody_transfer_url varchar(255) not null,
-        factory_initial varchar(255),
-        factory_naming_provider varchar(255),
-        factory_url_pkgs varchar(255),
-        inquiry_url varchar(255) not null,
-        juddi_api_url varchar(255),
-        manager_name varchar(255) not null,
-        proxy_transport varchar(255) not null,
-        publish_url varchar(255) not null,
-        security_url varchar(255) not null,
-        subscription_url varchar(255) not null,
-        primary key (name)
-    );
-
-    create table j3_overview_doc (
-        id bigint generated by default as identity,
-        overview_url varchar(255) not null,
-        overview_url_use_type varchar(255),
-        entity_key varchar(255),
-        tomodel_instance_info_id bigint,
-        primary key (id)
-    );
-
-    create table j3_overview_doc_descr (
-        id bigint generated by default as identity,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
-        overview_doc_id bigint,
-        primary key (id)
-    );
-
-    create table j3_person_name (
-        id bigint generated by default as identity,
-        lang_code varchar(5),
-        name varchar(255) not null,
-        contact_id bigint not null,
-        primary key (id)
-    );
-
-    create table j3_phone (
-        id bigint generated by default as identity,
-        phone_number varchar(50) not null,
-        use_type varchar(255),
-        contact_id bigint not null,
-        primary key (id)
-    );
-
-    create table j3_publisher (
-        authorized_name varchar(255) not null,
-        email_address varchar(255),
-        is_admin varchar(5),
-        is_enabled varchar(5),
-        max_bindings_per_service integer,
-        max_businesses integer,
-        max_services_per_business integer,
-        max_tmodels integer,
-        publisher_name varchar(255) not null,
-        primary key (authorized_name)
-    );
-
-    create table j3_publisher_assertion (
-        from_key varchar(255) not null,
-        to_key varchar(255) not null,
-        from_check varchar(5) not null,
-        key_name varchar(255) not null,
-        key_value varchar(255) not null,
-        tmodel_key varchar(255) not null,
-        to_check varchar(5) not null,
-        primary key (from_key, to_key)
-    );
-
-    create table j3_service_category_bag (
-        id bigint not null,
-        entity_key varchar(255) not null,
-        primary key (id),
-        unique (entity_key)
-    );
-
-    create table j3_service_descr (
-        id bigint generated by default as identity,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_service_name (
-        id bigint generated by default as identity,
-        lang_code varchar(5),
-        name varchar(255) not null,
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_service_projection (
-        business_key varchar(255) not null,
-        service_key varchar(255) not null,
-        primary key (business_key, service_key)
-    );
-
-    create table j3_subscription (
-        subscription_key varchar(255) not null,
-        authorized_name varchar(255) not null,
-        binding_key varchar(255),
-        brief smallint,
-        create_date timestamp not null,
-        expires_after timestamp,
-        last_notified timestamp,
-        max_entities integer,
-        notification_interval varchar(255),
-        subscription_filter clob(65636) not null,
-        primary key (subscription_key)
-    );
-
-    create table j3_subscription_chunk_token (
-        chunk_token varchar(255) not null,
-        data integer not null,
-        end_point timestamp,
-        expires_after timestamp not null,
-        start_point timestamp,
-        subscription_key varchar(255) not null,
-        primary key (chunk_token)
-    );
-
-    create table j3_subscription_match (
-        id bigint generated by default as identity,
-        entity_key varchar(255) not null,
-        subscription_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_tmodel (
-        deleted smallint,
-        lang_code varchar(5),
-        name varchar(255) not null,
-        entity_key varchar(255) not null,
-        primary key (entity_key)
-    );
-
-    create table j3_tmodel_category_bag (
-        id bigint not null,
-        entity_key varchar(255) not null,
-        primary key (id),
-        unique (entity_key)
-    );
-
-    create table j3_tmodel_descr (
-        id bigint generated by default as identity,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_tmodel_identifier (
-        id bigint generated by default as identity,
-        key_name varchar(255),
-        key_value varchar(255) not null,
-        tmodel_key_ref varchar(255),
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_tmodel_instance_info (
-        id bigint generated by default as identity,
-        instance_parms varchar(512),
-        tmodel_key varchar(255) not null,
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_tmodel_instance_info_descr (
-        id bigint generated by default as identity,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
-        tmodel_instance_info_id bigint not null,
-        primary key (id)
-    );
-
-    create table j3_transfer_token (
-        transfer_token varchar(51) not null,
-        expiration_date timestamp not null,
-        primary key (transfer_token)
-    );
-
-    create table j3_transfer_token_keys (
-        id bigint generated by default as identity,
-        entity_key varchar(255),
-        transfer_token varchar(51) not null,
-        primary key (id)
-    );
-
-    create table j3_uddi_entity (
-        entity_key varchar(255) not null,
-        authorized_name varchar(255) not null,
-        created timestamp,
-        modified timestamp not null,
-        modified_including_children timestamp,
-        node_id varchar(255),
-        primary key (entity_key)
-    );
-
-    alter table j3_address 
-        add constraint FKF83236BE75D860FB 
-        foreign key (address_id) 
-        references j3_contact;
-
-    alter table j3_address_line 
-        add constraint FKC665B8D5F8B8D8CF 
-        foreign key (address_id) 
-        references j3_address;
-
-    alter table j3_binding_category_bag 
-        add constraint FKCF34B2376A68D45A 
-        foreign key (id) 
-        references j3_category_bag;
-
-    alter table j3_binding_category_bag 
-        add constraint FKCF34B237CFBD88B7 
-        foreign key (entity_key) 
-        references j3_binding_template;
-
-    alter table j3_binding_descr 
-        add constraint FK5EA60911CFBD88B7 
-        foreign key (entity_key) 
-        references j3_binding_template;
-
-    alter table j3_binding_template 
-        add constraint FKD044BD6A2E448F3F 
-        foreign key (service_key) 
-        references j3_business_service;
-
-    alter table j3_binding_template 
-        add constraint FKD044BD6AD1823CA5 
-        foreign key (entity_key) 
-        references j3_uddi_entity;
-
-    alter table j3_business_category_bag 
-        add constraint FKD6D3ECB06A68D45A 
-        foreign key (id) 
-        references j3_category_bag;
-
-    alter table j3_business_category_bag 
-        add constraint FKD6D3ECB0BEB92A91 
-        foreign key (entity_key) 
-        references j3_business_entity;
-
-    alter table j3_business_descr 
-        add constraint FK3A24B4B8BEB92A91 
-        foreign key (entity_key) 
-        references j3_business_entity;
-
-    alter table j3_business_entity 
-        add constraint FKCA61A0CD1823CA5 
-        foreign key (entity_key) 
-        references j3_uddi_entity;
-
-    alter table j3_business_identifier 
-        add constraint FKB0C7A652BEB92A91 
-        foreign key (entity_key) 
-        references j3_business_entity;
-
-    alter table j3_business_name 
-        add constraint FK43F526F4BEB92A91 
-        foreign key (entity_key) 
-        references j3_business_entity;
-
-    alter table j3_business_service 
-        add constraint FK5D4255ACD1823CA5 
-        foreign key (entity_key) 
-        references j3_uddi_entity;
-
-    alter table j3_business_service 
-        add constraint FK5D4255ACEF04CFEE 
-        foreign key (business_key) 
-        references j3_business_entity;
-
-    alter table j3_clerk 
-        add constraint FK34DC7D9F6BB0F935 
-        foreign key (node_name) 
-        references j3_node;
-
-    alter table j3_client_subscriptioninfo 
-        add constraint FKDF04CC095BFC6733 
-        foreign key (fromClerk_clerk_name) 
-        references j3_clerk;
-
-    alter table j3_client_subscriptioninfo 
-        add constraint FKDF04CC09F3CE9C04 
-        foreign key (toClerk_clerk_name) 
-        references j3_clerk;
-
-    alter table j3_contact 
-        add constraint FK7551BEEABEB92A91 
-        foreign key (entity_key) 
-        references j3_business_entity;
-
-    alter table j3_contact_descr 
-        add constraint FK56CA9E6C2E3FD94F 
-        foreign key (contact_id) 
-        references j3_contact;
-
-    alter table j3_discovery_url 
-        add constraint FKA042FDAABEB92A91 
-        foreign key (entity_key) 
-        references j3_business_entity;
-
-    alter table j3_email 
-        add constraint FK34F910E62E3FD94F 
-        foreign key (contact_id) 
-        references j3_contact;
-
-    alter table j3_instance_details_descr 
-        add constraint FK3CC165902B115C6F 
-        foreign key (tmodel_instance_info_id) 
-        references j3_tmodel_instance_info;
-
-    alter table j3_instance_details_doc_descr 
-        add constraint FK447324492B115C6F 
-        foreign key (tmodel_instance_info_id) 
-        references j3_tmodel_instance_info;
-
-    alter table j3_keyed_reference 
-        add constraint FK350C8454E075C8D7 
-        foreign key (keyed_reference_group_id) 
-        references j3_keyed_reference_group;
-
-    alter table j3_keyed_reference 
-        add constraint FK350C84541DB72652 
-        foreign key (category_bag_id) 
-        references j3_category_bag;
-
-    alter table j3_keyed_reference_group 
-        add constraint FKF6224ED41DB72652 
-        foreign key (category_bag_id) 
-        references j3_category_bag;
-
-    alter table j3_overview_doc 
-        add constraint FK5CD8D0E8C5BF8903 
-        foreign key (entity_key) 
-        references j3_tmodel;
-
-    alter table j3_overview_doc 
-        add constraint FK5CD8D0E8E8CE1B36 
-        foreign key (tomodel_instance_info_id) 
-        references j3_tmodel_instance_info;
-
-    alter table j3_overview_doc_descr 
-        add constraint FK36FB9EA9BDC711C 
-        foreign key (overview_doc_id) 
-        references j3_overview_doc;
-
-    alter table j3_person_name 
-        add constraint FKCB7B8AFF2E3FD94F 
-        foreign key (contact_id) 
-        references j3_contact;
-
-    alter table j3_phone 
-        add constraint FK359202B82E3FD94F 
-        foreign key (contact_id) 
-        references j3_contact;
-
-    alter table j3_publisher_assertion 
-        add constraint FK8A102449E3544929 
-        foreign key (to_key) 
-        references j3_business_entity;
-
-    alter table j3_publisher_assertion 
-        add constraint FK8A102449CCEE22D8 
-        foreign key (from_key) 
-        references j3_business_entity;
-
-    alter table j3_service_category_bag 
-        add constraint FK185A68076A68D45A 
-        foreign key (id) 
-        references j3_category_bag;
-
-    alter table j3_service_category_bag 
-        add constraint FK185A680748D0656D 
-        foreign key (entity_key) 
-        references j3_business_service;
-
-    alter table j3_service_descr 
-        add constraint FKB6D63D4148D0656D 
-        foreign key (entity_key) 
-        references j3_business_service;
-
-    alter table j3_service_name 
-        add constraint FKCC1BE94B48D0656D 
-        foreign key (entity_key) 
-        references j3_business_service;
-
-    alter table j3_service_projection 
-        add constraint FK629F290F2E448F3F 
-        foreign key (service_key) 
-        references j3_business_service;
-
-    alter table j3_service_projection 
-        add constraint FK629F290FEF04CFEE 
-        foreign key (business_key) 
-        references j3_business_entity;
-
-    alter table j3_subscription_match 
-        add constraint FK5B9C2F19BEEE42E5 
-        foreign key (subscription_key) 
-        references j3_subscription;
-
-    alter table j3_tmodel 
-        add constraint FK83C8072BD1823CA5 
-        foreign key (entity_key) 
-        references j3_uddi_entity;
-
-    alter table j3_tmodel_category_bag 
-        add constraint FK7E0859DB6A68D45A 
-        foreign key (id) 
-        references j3_category_bag;
-
-    alter table j3_tmodel_category_bag 
-        add constraint FK7E0859DBC5BF8903 
-        foreign key (entity_key) 
-        references j3_tmodel;
-
-    alter table j3_tmodel_descr 
-        add constraint FK63DFF1EDC5BF8903 
-        foreign key (entity_key) 
-        references j3_tmodel;
-
-    alter table j3_tmodel_identifier 
-        add constraint FKD5FB623DC5BF8903 
-        foreign key (entity_key) 
-        references j3_tmodel;
-
-    alter table j3_tmodel_instance_info 
-        add constraint FKDC6C9004CFBD88B7 
-        foreign key (entity_key) 
-        references j3_binding_template;
-
-    alter table j3_tmodel_instance_info_descr 
-        add constraint FKD826B4062B115C6F 
-        foreign key (tmodel_instance_info_id) 
-        references j3_tmodel_instance_info;
-
-    alter table j3_transfer_token_keys 
-        add constraint FK8BBF49185ED9DD48 
-        foreign key (transfer_token) 
-        references j3_transfer_token;

Copied: labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/db2/import.sql (from rev 33044, labs/jbossesb/tags/JBESB_4_7_CP2_ER2/product/install/jUDDI-registryV3/juddi-sql/db2/import.sql)
===================================================================
--- labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/db2/import.sql	                        (rev 0)
+++ labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/db2/import.sql	2010-05-24 16:38:08 UTC (rev 33050)
@@ -0,0 +1,629 @@
+
+    create table j3_address (
+        id bigint generated by default as identity,
+        sort_code varchar(10),
+        tmodel_key varchar(255),
+        use_type varchar(255),
+        address_id bigint not null,
+        primary key (id)
+    );
+
+    create table j3_address_line (
+        id bigint generated by default as identity,
+        key_name varchar(255),
+        key_value varchar(255),
+        line varchar(80) not null,
+        address_id bigint not null,
+        primary key (id)
+    );
+
+    create table j3_auth_token (
+        auth_token varchar(51) not null,
+        authorized_name varchar(255) not null,
+        created timestamp not null,
+        last_used timestamp not null,
+        number_of_uses integer not null,
+        token_state integer not null,
+        primary key (auth_token)
+    );
+
+    create table j3_binding_category_bag (
+        id bigint not null,
+        entity_key varchar(255) not null,
+        primary key (id),
+        unique (entity_key)
+    );
+
+    create table j3_binding_descr (
+        id bigint generated by default as identity,
+        descr varchar(1024) not null,
+        lang_code varchar(5),
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_binding_template (
+        access_point_type varchar(255),
+        access_point_url varchar(4000),
+        hosting_redirector varchar(255),
+        entity_key varchar(255) not null,
+        service_key varchar(255) not null,
+        primary key (entity_key)
+    );
+
+    create table j3_business_category_bag (
+        id bigint not null,
+        entity_key varchar(255) not null,
+        primary key (id),
+        unique (entity_key)
+    );
+
+    create table j3_business_descr (
+        id bigint generated by default as identity,
+        descr varchar(1024) not null,
+        lang_code varchar(5),
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_business_entity (
+        entity_key varchar(255) not null,
+        primary key (entity_key)
+    );
+
+    create table j3_business_identifier (
+        id bigint generated by default as identity,
+        key_name varchar(255),
+        key_value varchar(255) not null,
+        tmodel_key_ref varchar(255),
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_business_name (
+        id bigint generated by default as identity,
+        lang_code varchar(5),
+        name varchar(255) not null,
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_business_service (
+        entity_key varchar(255) not null,
+        business_key varchar(255) not null,
+        primary key (entity_key)
+    );
+
+    create table j3_category_bag (
+        id bigint generated by default as identity,
+        primary key (id)
+    );
+
+    create table j3_clerk (
+        clerk_name varchar(255) not null,
+        cred varchar(255),
+        publisher_id varchar(255) not null,
+        node_name varchar(255),
+        primary key (clerk_name)
+    );
+
+    create table j3_client_subscriptioninfo (
+        subscription_key varchar(255) not null,
+        last_notified timestamp,
+        fromClerk_clerk_name varchar(255),
+        toClerk_clerk_name varchar(255),
+        primary key (subscription_key)
+    );
+
+    create table j3_contact (
+        id bigint generated by default as identity,
+        use_type varchar(255),
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_contact_descr (
+        id bigint generated by default as identity,
+        descr varchar(1024) not null,
+        lang_code varchar(5),
+        contact_id bigint not null,
+        primary key (id)
+    );
+
+    create table j3_discovery_url (
+        id bigint generated by default as identity,
+        url varchar(255) not null,
+        use_type varchar(255) not null,
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_email (
+        id bigint generated by default as identity,
+        email_address varchar(255) not null,
+        use_type varchar(255),
+        contact_id bigint not null,
+        primary key (id)
+    );
+
+    create table j3_instance_details_descr (
+        id bigint generated by default as identity,
+        descr varchar(1024) not null,
+        lang_code varchar(5),
+        tmodel_instance_info_id bigint not null,
+        primary key (id)
+    );
+
+    create table j3_instance_details_doc_descr (
+        id bigint generated by default as identity,
+        descr varchar(1024) not null,
+        lang_code varchar(5),
+        tmodel_instance_info_id bigint not null,
+        primary key (id)
+    );
+
+    create table j3_keyed_reference (
+        id bigint generated by default as identity,
+        key_name varchar(255),
+        key_value varchar(255) not null,
+        tmodel_key_ref varchar(255),
+        category_bag_id bigint,
+        keyed_reference_group_id bigint,
+        primary key (id)
+    );
+
+    create table j3_keyed_reference_group (
+        id bigint generated by default as identity,
+        tmodel_key varchar(255),
+        category_bag_id bigint not null,
+        primary key (id)
+    );
+
+    create table j3_node (
+        name varchar(255) not null,
+        custody_transfer_url varchar(255) not null,
+        factory_initial varchar(255),
+        factory_naming_provider varchar(255),
+        factory_url_pkgs varchar(255),
+        inquiry_url varchar(255) not null,
+        juddi_api_url varchar(255),
+        manager_name varchar(255) not null,
+        proxy_transport varchar(255) not null,
+        publish_url varchar(255) not null,
+        security_url varchar(255) not null,
+        subscription_url varchar(255) not null,
+        primary key (name)
+    );
+
+    create table j3_overview_doc (
+        id bigint generated by default as identity,
+        overview_url varchar(255) not null,
+        overview_url_use_type varchar(255),
+        entity_key varchar(255),
+        tomodel_instance_info_id bigint,
+        primary key (id)
+    );
+
+    create table j3_overview_doc_descr (
+        id bigint generated by default as identity,
+        descr varchar(1024) not null,
+        lang_code varchar(5),
+        overview_doc_id bigint,
+        primary key (id)
+    );
+
+    create table j3_person_name (
+        id bigint generated by default as identity,
+        lang_code varchar(5),
+        name varchar(255) not null,
+        contact_id bigint not null,
+        primary key (id)
+    );
+
+    create table j3_phone (
+        id bigint generated by default as identity,
+        phone_number varchar(50) not null,
+        use_type varchar(255),
+        contact_id bigint not null,
+        primary key (id)
+    );
+
+    create table j3_publisher (
+        authorized_name varchar(255) not null,
+        email_address varchar(255),
+        is_admin varchar(5),
+        is_enabled varchar(5),
+        max_bindings_per_service integer,
+        max_businesses integer,
+        max_services_per_business integer,
+        max_tmodels integer,
+        publisher_name varchar(255) not null,
+        primary key (authorized_name)
+    );
+
+    create table j3_publisher_assertion (
+        from_key varchar(255) not null,
+        to_key varchar(255) not null,
+        from_check varchar(5) not null,
+        key_name varchar(255) not null,
+        key_value varchar(255) not null,
+        tmodel_key varchar(255) not null,
+        to_check varchar(5) not null,
+        primary key (from_key, to_key)
+    );
+
+    create table j3_service_category_bag (
+        id bigint not null,
+        entity_key varchar(255) not null,
+        primary key (id),
+        unique (entity_key)
+    );
+
+    create table j3_service_descr (
+        id bigint generated by default as identity,
+        descr varchar(1024) not null,
+        lang_code varchar(5),
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_service_name (
+        id bigint generated by default as identity,
+        lang_code varchar(5),
+        name varchar(255) not null,
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_service_projection (
+        business_key varchar(255) not null,
+        service_key varchar(255) not null,
+        primary key (business_key, service_key)
+    );
+
+    create table j3_subscription (
+        subscription_key varchar(255) not null,
+        authorized_name varchar(255) not null,
+        binding_key varchar(255),
+        brief smallint,
+        create_date timestamp not null,
+        expires_after timestamp,
+        last_notified timestamp,
+        max_entities integer,
+        notification_interval varchar(255),
+        subscription_filter clob(65636) not null,
+        primary key (subscription_key)
+    );
+
+    create table j3_subscription_chunk_token (
+        chunk_token varchar(255) not null,
+        data integer not null,
+        end_point timestamp,
+        expires_after timestamp not null,
+        start_point timestamp,
+        subscription_key varchar(255) not null,
+        primary key (chunk_token)
+    );
+
+    create table j3_subscription_match (
+        id bigint generated by default as identity,
+        entity_key varchar(255) not null,
+        subscription_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_tmodel (
+        deleted smallint,
+        lang_code varchar(5),
+        name varchar(255) not null,
+        entity_key varchar(255) not null,
+        primary key (entity_key)
+    );
+
+    create table j3_tmodel_category_bag (
+        id bigint not null,
+        entity_key varchar(255) not null,
+        primary key (id),
+        unique (entity_key)
+    );
+
+    create table j3_tmodel_descr (
+        id bigint generated by default as identity,
+        descr varchar(1024) not null,
+        lang_code varchar(5),
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_tmodel_identifier (
+        id bigint generated by default as identity,
+        key_name varchar(255),
+        key_value varchar(255) not null,
+        tmodel_key_ref varchar(255),
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_tmodel_instance_info (
+        id bigint generated by default as identity,
+        instance_parms varchar(512),
+        tmodel_key varchar(255) not null,
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_tmodel_instance_info_descr (
+        id bigint generated by default as identity,
+        descr varchar(1024) not null,
+        lang_code varchar(5),
+        tmodel_instance_info_id bigint not null,
+        primary key (id)
+    );
+
+    create table j3_transfer_token (
+        transfer_token varchar(51) not null,
+        expiration_date timestamp not null,
+        primary key (transfer_token)
+    );
+
+    create table j3_transfer_token_keys (
+        id bigint generated by default as identity,
+        entity_key varchar(255),
+        transfer_token varchar(51) not null,
+        primary key (id)
+    );
+
+    create table j3_uddi_entity (
+        entity_key varchar(255) not null,
+        authorized_name varchar(255) not null,
+        created timestamp,
+        modified timestamp not null,
+        modified_including_children timestamp,
+        node_id varchar(255),
+        primary key (entity_key)
+    );
+
+    alter table j3_address 
+        add constraint FKF83236BE75D860FB 
+        foreign key (address_id) 
+        references j3_contact;
+
+    alter table j3_address_line 
+        add constraint FKC665B8D5F8B8D8CF 
+        foreign key (address_id) 
+        references j3_address;
+
+    alter table j3_binding_category_bag 
+        add constraint FKCF34B2376A68D45A 
+        foreign key (id) 
+        references j3_category_bag;
+
+    alter table j3_binding_category_bag 
+        add constraint FKCF34B237CFBD88B7 
+        foreign key (entity_key) 
+        references j3_binding_template;
+
+    alter table j3_binding_descr 
+        add constraint FK5EA60911CFBD88B7 
+        foreign key (entity_key) 
+        references j3_binding_template;
+
+    alter table j3_binding_template 
+        add constraint FKD044BD6A2E448F3F 
+        foreign key (service_key) 
+        references j3_business_service;
+
+    alter table j3_binding_template 
+        add constraint FKD044BD6AD1823CA5 
+        foreign key (entity_key) 
+        references j3_uddi_entity;
+
+    alter table j3_business_category_bag 
+        add constraint FKD6D3ECB06A68D45A 
+        foreign key (id) 
+        references j3_category_bag;
+
+    alter table j3_business_category_bag 
+        add constraint FKD6D3ECB0BEB92A91 
+        foreign key (entity_key) 
+        references j3_business_entity;
+
+    alter table j3_business_descr 
+        add constraint FK3A24B4B8BEB92A91 
+        foreign key (entity_key) 
+        references j3_business_entity;
+
+    alter table j3_business_entity 
+        add constraint FKCA61A0CD1823CA5 
+        foreign key (entity_key) 
+        references j3_uddi_entity;
+
+    alter table j3_business_identifier 
+        add constraint FKB0C7A652BEB92A91 
+        foreign key (entity_key) 
+        references j3_business_entity;
+
+    alter table j3_business_name 
+        add constraint FK43F526F4BEB92A91 
+        foreign key (entity_key) 
+        references j3_business_entity;
+
+    alter table j3_business_service 
+        add constraint FK5D4255ACD1823CA5 
+        foreign key (entity_key) 
+        references j3_uddi_entity;
+
+    alter table j3_business_service 
+        add constraint FK5D4255ACEF04CFEE 
+        foreign key (business_key) 
+        references j3_business_entity;
+
+    alter table j3_clerk 
+        add constraint FK34DC7D9F6BB0F935 
+        foreign key (node_name) 
+        references j3_node;
+
+    alter table j3_client_subscriptioninfo 
+        add constraint FKDF04CC095BFC6733 
+        foreign key (fromClerk_clerk_name) 
+        references j3_clerk;
+
+    alter table j3_client_subscriptioninfo 
+        add constraint FKDF04CC09F3CE9C04 
+        foreign key (toClerk_clerk_name) 
+        references j3_clerk;
+
+    alter table j3_contact 
+        add constraint FK7551BEEABEB92A91 
+        foreign key (entity_key) 
+        references j3_business_entity;
+
+    alter table j3_contact_descr 
+        add constraint FK56CA9E6C2E3FD94F 
+        foreign key (contact_id) 
+        references j3_contact;
+
+    alter table j3_discovery_url 
+        add constraint FKA042FDAABEB92A91 
+        foreign key (entity_key) 
+        references j3_business_entity;
+
+    alter table j3_email 
+        add constraint FK34F910E62E3FD94F 
+        foreign key (contact_id) 
+        references j3_contact;
+
+    alter table j3_instance_details_descr 
+        add constraint FK3CC165902B115C6F 
+        foreign key (tmodel_instance_info_id) 
+        references j3_tmodel_instance_info;
+
+    alter table j3_instance_details_doc_descr 
+        add constraint FK447324492B115C6F 
+        foreign key (tmodel_instance_info_id) 
+        references j3_tmodel_instance_info;
+
+    alter table j3_keyed_reference 
+        add constraint FK350C8454E075C8D7 
+        foreign key (keyed_reference_group_id) 
+        references j3_keyed_reference_group;
+
+    alter table j3_keyed_reference 
+        add constraint FK350C84541DB72652 
+        foreign key (category_bag_id) 
+        references j3_category_bag;
+
+    alter table j3_keyed_reference_group 
+        add constraint FKF6224ED41DB72652 
+        foreign key (category_bag_id) 
+        references j3_category_bag;
+
+    alter table j3_overview_doc 
+        add constraint FK5CD8D0E8C5BF8903 
+        foreign key (entity_key) 
+        references j3_tmodel;
+
+    alter table j3_overview_doc 
+        add constraint FK5CD8D0E8E8CE1B36 
+        foreign key (tomodel_instance_info_id) 
+        references j3_tmodel_instance_info;
+
+    alter table j3_overview_doc_descr 
+        add constraint FK36FB9EA9BDC711C 
+        foreign key (overview_doc_id) 
+        references j3_overview_doc;
+
+    alter table j3_person_name 
+        add constraint FKCB7B8AFF2E3FD94F 
+        foreign key (contact_id) 
+        references j3_contact;
+
+    alter table j3_phone 
+        add constraint FK359202B82E3FD94F 
+        foreign key (contact_id) 
+        references j3_contact;
+
+    alter table j3_publisher_assertion 
+        add constraint FK8A102449E3544929 
+        foreign key (to_key) 
+        references j3_business_entity;
+
+    alter table j3_publisher_assertion 
+        add constraint FK8A102449CCEE22D8 
+        foreign key (from_key) 
+        references j3_business_entity;
+
+    alter table j3_service_category_bag 
+        add constraint FK185A68076A68D45A 
+        foreign key (id) 
+        references j3_category_bag;
+
+    alter table j3_service_category_bag 
+        add constraint FK185A680748D0656D 
+        foreign key (entity_key) 
+        references j3_business_service;
+
+    alter table j3_service_descr 
+        add constraint FKB6D63D4148D0656D 
+        foreign key (entity_key) 
+        references j3_business_service;
+
+    alter table j3_service_name 
+        add constraint FKCC1BE94B48D0656D 
+        foreign key (entity_key) 
+        references j3_business_service;
+
+    alter table j3_service_projection 
+        add constraint FK629F290F2E448F3F 
+        foreign key (service_key) 
+        references j3_business_service;
+
+    alter table j3_service_projection 
+        add constraint FK629F290FEF04CFEE 
+        foreign key (business_key) 
+        references j3_business_entity;
+
+    alter table j3_subscription_match 
+        add constraint FK5B9C2F19BEEE42E5 
+        foreign key (subscription_key) 
+        references j3_subscription;
+
+    alter table j3_tmodel 
+        add constraint FK83C8072BD1823CA5 
+        foreign key (entity_key) 
+        references j3_uddi_entity;
+
+    alter table j3_tmodel_category_bag 
+        add constraint FK7E0859DB6A68D45A 
+        foreign key (id) 
+        references j3_category_bag;
+
+    alter table j3_tmodel_category_bag 
+        add constraint FK7E0859DBC5BF8903 
+        foreign key (entity_key) 
+        references j3_tmodel;
+
+    alter table j3_tmodel_descr 
+        add constraint FK63DFF1EDC5BF8903 
+        foreign key (entity_key) 
+        references j3_tmodel;
+
+    alter table j3_tmodel_identifier 
+        add constraint FKD5FB623DC5BF8903 
+        foreign key (entity_key) 
+        references j3_tmodel;
+
+    alter table j3_tmodel_instance_info 
+        add constraint FKDC6C9004CFBD88B7 
+        foreign key (entity_key) 
+        references j3_binding_template;
+
+    alter table j3_tmodel_instance_info_descr 
+        add constraint FKD826B4062B115C6F 
+        foreign key (tmodel_instance_info_id) 
+        references j3_tmodel_instance_info;
+
+    alter table j3_transfer_token_keys 
+        add constraint FK8BBF49185ED9DD48 
+        foreign key (transfer_token) 
+        references j3_transfer_token;

Copied: labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/derby (from rev 33044, labs/jbossesb/tags/JBESB_4_7_CP2_ER2/product/install/jUDDI-registryV3/juddi-sql/derby)

Deleted: labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/derby/import.sql
===================================================================
--- labs/jbossesb/tags/JBESB_4_7_CP2_ER2/product/install/jUDDI-registryV3/juddi-sql/derby/import.sql	2010-05-24 14:43:21 UTC (rev 33044)
+++ labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/derby/import.sql	2010-05-24 16:38:08 UTC (rev 33050)
@@ -1,635 +0,0 @@
-
-    create table j3_address (
-        id bigint not null,
-        sort_code varchar(10),
-        tmodel_key varchar(255),
-        use_type varchar(255),
-        address_id bigint not null,
-        primary key (id)
-    );
-
-    create table j3_address_line (
-        id bigint not null,
-        key_name varchar(255),
-        key_value varchar(255),
-        line varchar(80) not null,
-        address_id bigint not null,
-        primary key (id)
-    );
-
-    create table j3_auth_token (
-        auth_token varchar(51) not null,
-        authorized_name varchar(255) not null,
-        created timestamp not null,
-        last_used timestamp not null,
-        number_of_uses integer not null,
-        token_state integer not null,
-        primary key (auth_token)
-    );
-
-    create table j3_binding_category_bag (
-        id bigint not null,
-        entity_key varchar(255) not null,
-        primary key (id),
-        unique (entity_key)
-    );
-
-    create table j3_binding_descr (
-        id bigint not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_binding_template (
-        access_point_type varchar(255),
-        access_point_url varchar(4000),
-        hosting_redirector varchar(255),
-        entity_key varchar(255) not null,
-        service_key varchar(255) not null,
-        primary key (entity_key)
-    );
-
-    create table j3_business_category_bag (
-        id bigint not null,
-        entity_key varchar(255) not null,
-        primary key (id),
-        unique (entity_key)
-    );
-
-    create table j3_business_descr (
-        id bigint not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_business_entity (
-        entity_key varchar(255) not null,
-        primary key (entity_key)
-    );
-
-    create table j3_business_identifier (
-        id bigint not null,
-        key_name varchar(255),
-        key_value varchar(255) not null,
-        tmodel_key_ref varchar(255),
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_business_name (
-        id bigint not null,
-        lang_code varchar(5),
-        name varchar(255) not null,
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_business_service (
-        entity_key varchar(255) not null,
-        business_key varchar(255) not null,
-        primary key (entity_key)
-    );
-
-    create table j3_category_bag (
-        id bigint not null,
-        primary key (id)
-    );
-
-    create table j3_clerk (
-        clerk_name varchar(255) not null,
-        cred varchar(255),
-        publisher_id varchar(255) not null,
-        node_name varchar(255),
-        primary key (clerk_name)
-    );
-
-    create table j3_client_subscriptioninfo (
-        subscription_key varchar(255) not null,
-        last_notified timestamp,
-        fromClerk_clerk_name varchar(255),
-        toClerk_clerk_name varchar(255),
-        primary key (subscription_key)
-    );
-
-    create table j3_contact (
-        id bigint not null,
-        use_type varchar(255),
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_contact_descr (
-        id bigint not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
-        contact_id bigint not null,
-        primary key (id)
-    );
-
-    create table j3_discovery_url (
-        id bigint not null,
-        url varchar(255) not null,
-        use_type varchar(255) not null,
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_email (
-        id bigint not null,
-        email_address varchar(255) not null,
-        use_type varchar(255),
-        contact_id bigint not null,
-        primary key (id)
-    );
-
-    create table j3_instance_details_descr (
-        id bigint not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
-        tmodel_instance_info_id bigint not null,
-        primary key (id)
-    );
-
-    create table j3_instance_details_doc_descr (
-        id bigint not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
-        tmodel_instance_info_id bigint not null,
-        primary key (id)
-    );
-
-    create table j3_keyed_reference (
-        id bigint not null,
-        key_name varchar(255),
-        key_value varchar(255) not null,
-        tmodel_key_ref varchar(255),
-        category_bag_id bigint,
-        keyed_reference_group_id bigint,
-        primary key (id)
-    );
-
-    create table j3_keyed_reference_group (
-        id bigint not null,
-        tmodel_key varchar(255),
-        category_bag_id bigint not null,
-        primary key (id)
-    );
-
-    create table j3_node (
-        name varchar(255) not null,
-        custody_transfer_url varchar(255) not null,
-        factory_initial varchar(255),
-        factory_naming_provider varchar(255),
-        factory_url_pkgs varchar(255),
-        inquiry_url varchar(255) not null,
-        juddi_api_url varchar(255),
-        manager_name varchar(255) not null,
-        proxy_transport varchar(255) not null,
-        publish_url varchar(255) not null,
-        security_url varchar(255) not null,
-        subscription_url varchar(255) not null,
-        primary key (name)
-    );
-
-    create table j3_overview_doc (
-        id bigint not null,
-        overview_url varchar(255) not null,
-        overview_url_use_type varchar(255),
-        entity_key varchar(255),
-        tomodel_instance_info_id bigint,
-        primary key (id)
-    );
-
-    create table j3_overview_doc_descr (
-        id bigint not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
-        overview_doc_id bigint,
-        primary key (id)
-    );
-
-    create table j3_person_name (
-        id bigint not null,
-        lang_code varchar(5),
-        name varchar(255) not null,
-        contact_id bigint not null,
-        primary key (id)
-    );
-
-    create table j3_phone (
-        id bigint not null,
-        phone_number varchar(50) not null,
-        use_type varchar(255),
-        contact_id bigint not null,
-        primary key (id)
-    );
-
-    create table j3_publisher (
-        authorized_name varchar(255) not null,
-        email_address varchar(255),
-        is_admin varchar(5),
-        is_enabled varchar(5),
-        max_bindings_per_service integer,
-        max_businesses integer,
-        max_services_per_business integer,
-        max_tmodels integer,
-        publisher_name varchar(255) not null,
-        primary key (authorized_name)
-    );
-
-    create table j3_publisher_assertion (
-        from_key varchar(255) not null,
-        to_key varchar(255) not null,
-        from_check varchar(5) not null,
-        key_name varchar(255) not null,
-        key_value varchar(255) not null,
-        tmodel_key varchar(255) not null,
-        to_check varchar(5) not null,
-        primary key (from_key, to_key)
-    );
-
-    create table j3_service_category_bag (
-        id bigint not null,
-        entity_key varchar(255) not null,
-        primary key (id),
-        unique (entity_key)
-    );
-
-    create table j3_service_descr (
-        id bigint not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_service_name (
-        id bigint not null,
-        lang_code varchar(5),
-        name varchar(255) not null,
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_service_projection (
-        business_key varchar(255) not null,
-        service_key varchar(255) not null,
-        primary key (business_key, service_key)
-    );
-
-    create table j3_subscription (
-        subscription_key varchar(255) not null,
-        authorized_name varchar(255) not null,
-        binding_key varchar(255),
-        brief smallint,
-        create_date timestamp not null,
-        expires_after timestamp,
-        last_notified timestamp,
-        max_entities integer,
-        notification_interval varchar(255),
-        subscription_filter clob(65636) not null,
-        primary key (subscription_key)
-    );
-
-    create table j3_subscription_chunk_token (
-        chunk_token varchar(255) not null,
-        data integer not null,
-        end_point timestamp,
-        expires_after timestamp not null,
-        start_point timestamp,
-        subscription_key varchar(255) not null,
-        primary key (chunk_token)
-    );
-
-    create table j3_subscription_match (
-        id bigint not null,
-        entity_key varchar(255) not null,
-        subscription_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_tmodel (
-        deleted smallint,
-        lang_code varchar(5),
-        name varchar(255) not null,
-        entity_key varchar(255) not null,
-        primary key (entity_key)
-    );
-
-    create table j3_tmodel_category_bag (
-        id bigint not null,
-        entity_key varchar(255) not null,
-        primary key (id),
-        unique (entity_key)
-    );
-
-    create table j3_tmodel_descr (
-        id bigint not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_tmodel_identifier (
-        id bigint not null,
-        key_name varchar(255),
-        key_value varchar(255) not null,
-        tmodel_key_ref varchar(255),
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_tmodel_instance_info (
-        id bigint not null,
-        instance_parms varchar(512),
-        tmodel_key varchar(255) not null,
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_tmodel_instance_info_descr (
-        id bigint not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
-        tmodel_instance_info_id bigint not null,
-        primary key (id)
-    );
-
-    create table j3_transfer_token (
-        transfer_token varchar(51) not null,
-        expiration_date timestamp not null,
-        primary key (transfer_token)
-    );
-
-    create table j3_transfer_token_keys (
-        id bigint not null,
-        entity_key varchar(255),
-        transfer_token varchar(51) not null,
-        primary key (id)
-    );
-
-    create table j3_uddi_entity (
-        entity_key varchar(255) not null,
-        authorized_name varchar(255) not null,
-        created timestamp,
-        modified timestamp not null,
-        modified_including_children timestamp,
-        node_id varchar(255),
-        primary key (entity_key)
-    );
-
-    alter table j3_address 
-        add constraint FKF83236BE75D860FB 
-        foreign key (address_id) 
-        references j3_contact;
-
-    alter table j3_address_line 
-        add constraint FKC665B8D5F8B8D8CF 
-        foreign key (address_id) 
-        references j3_address;
-
-    alter table j3_binding_category_bag 
-        add constraint FKCF34B2376A68D45A 
-        foreign key (id) 
-        references j3_category_bag;
-
-    alter table j3_binding_category_bag 
-        add constraint FKCF34B237CFBD88B7 
-        foreign key (entity_key) 
-        references j3_binding_template;
-
-    alter table j3_binding_descr 
-        add constraint FK5EA60911CFBD88B7 
-        foreign key (entity_key) 
-        references j3_binding_template;
-
-    alter table j3_binding_template 
-        add constraint FKD044BD6A2E448F3F 
-        foreign key (service_key) 
-        references j3_business_service;
-
-    alter table j3_binding_template 
-        add constraint FKD044BD6AD1823CA5 
-        foreign key (entity_key) 
-        references j3_uddi_entity;
-
-    alter table j3_business_category_bag 
-        add constraint FKD6D3ECB06A68D45A 
-        foreign key (id) 
-        references j3_category_bag;
-
-    alter table j3_business_category_bag 
-        add constraint FKD6D3ECB0BEB92A91 
-        foreign key (entity_key) 
-        references j3_business_entity;
-
-    alter table j3_business_descr 
-        add constraint FK3A24B4B8BEB92A91 
-        foreign key (entity_key) 
-        references j3_business_entity;
-
-    alter table j3_business_entity 
-        add constraint FKCA61A0CD1823CA5 
-        foreign key (entity_key) 
-        references j3_uddi_entity;
-
-    alter table j3_business_identifier 
-        add constraint FKB0C7A652BEB92A91 
-        foreign key (entity_key) 
-        references j3_business_entity;
-
-    alter table j3_business_name 
-        add constraint FK43F526F4BEB92A91 
-        foreign key (entity_key) 
-        references j3_business_entity;
-
-    alter table j3_business_service 
-        add constraint FK5D4255ACD1823CA5 
-        foreign key (entity_key) 
-        references j3_uddi_entity;
-
-    alter table j3_business_service 
-        add constraint FK5D4255ACEF04CFEE 
-        foreign key (business_key) 
-        references j3_business_entity;
-
-    alter table j3_clerk 
-        add constraint FK34DC7D9F6BB0F935 
-        foreign key (node_name) 
-        references j3_node;
-
-    alter table j3_client_subscriptioninfo 
-        add constraint FKDF04CC095BFC6733 
-        foreign key (fromClerk_clerk_name) 
-        references j3_clerk;
-
-    alter table j3_client_subscriptioninfo 
-        add constraint FKDF04CC09F3CE9C04 
-        foreign key (toClerk_clerk_name) 
-        references j3_clerk;
-
-    alter table j3_contact 
-        add constraint FK7551BEEABEB92A91 
-        foreign key (entity_key) 
-        references j3_business_entity;
-
-    alter table j3_contact_descr 
-        add constraint FK56CA9E6C2E3FD94F 
-        foreign key (contact_id) 
-        references j3_contact;
-
-    alter table j3_discovery_url 
-        add constraint FKA042FDAABEB92A91 
-        foreign key (entity_key) 
-        references j3_business_entity;
-
-    alter table j3_email 
-        add constraint FK34F910E62E3FD94F 
-        foreign key (contact_id) 
-        references j3_contact;
-
-    alter table j3_instance_details_descr 
-        add constraint FK3CC165902B115C6F 
-        foreign key (tmodel_instance_info_id) 
-        references j3_tmodel_instance_info;
-
-    alter table j3_instance_details_doc_descr 
-        add constraint FK447324492B115C6F 
-        foreign key (tmodel_instance_info_id) 
-        references j3_tmodel_instance_info;
-
-    alter table j3_keyed_reference 
-        add constraint FK350C8454E075C8D7 
-        foreign key (keyed_reference_group_id) 
-        references j3_keyed_reference_group;
-
-    alter table j3_keyed_reference 
-        add constraint FK350C84541DB72652 
-        foreign key (category_bag_id) 
-        references j3_category_bag;
-
-    alter table j3_keyed_reference_group 
-        add constraint FKF6224ED41DB72652 
-        foreign key (category_bag_id) 
-        references j3_category_bag;
-
-    alter table j3_overview_doc 
-        add constraint FK5CD8D0E8C5BF8903 
-        foreign key (entity_key) 
-        references j3_tmodel;
-
-    alter table j3_overview_doc 
-        add constraint FK5CD8D0E8E8CE1B36 
-        foreign key (tomodel_instance_info_id) 
-        references j3_tmodel_instance_info;
-
-    alter table j3_overview_doc_descr 
-        add constraint FK36FB9EA9BDC711C 
-        foreign key (overview_doc_id) 
-        references j3_overview_doc;
-
-    alter table j3_person_name 
-        add constraint FKCB7B8AFF2E3FD94F 
-        foreign key (contact_id) 
-        references j3_contact;
-
-    alter table j3_phone 
-        add constraint FK359202B82E3FD94F 
-        foreign key (contact_id) 
-        references j3_contact;
-
-    alter table j3_publisher_assertion 
-        add constraint FK8A102449E3544929 
-        foreign key (to_key) 
-        references j3_business_entity;
-
-    alter table j3_publisher_assertion 
-        add constraint FK8A102449CCEE22D8 
-        foreign key (from_key) 
-        references j3_business_entity;
-
-    alter table j3_service_category_bag 
-        add constraint FK185A68076A68D45A 
-        foreign key (id) 
-        references j3_category_bag;
-
-    alter table j3_service_category_bag 
-        add constraint FK185A680748D0656D 
-        foreign key (entity_key) 
-        references j3_business_service;
-
-    alter table j3_service_descr 
-        add constraint FKB6D63D4148D0656D 
-        foreign key (entity_key) 
-        references j3_business_service;
-
-    alter table j3_service_name 
-        add constraint FKCC1BE94B48D0656D 
-        foreign key (entity_key) 
-        references j3_business_service;
-
-    alter table j3_service_projection 
-        add constraint FK629F290F2E448F3F 
-        foreign key (service_key) 
-        references j3_business_service;
-
-    alter table j3_service_projection 
-        add constraint FK629F290FEF04CFEE 
-        foreign key (business_key) 
-        references j3_business_entity;
-
-    alter table j3_subscription_match 
-        add constraint FK5B9C2F19BEEE42E5 
-        foreign key (subscription_key) 
-        references j3_subscription;
-
-    alter table j3_tmodel 
-        add constraint FK83C8072BD1823CA5 
-        foreign key (entity_key) 
-        references j3_uddi_entity;
-
-    alter table j3_tmodel_category_bag 
-        add constraint FK7E0859DB6A68D45A 
-        foreign key (id) 
-        references j3_category_bag;
-
-    alter table j3_tmodel_category_bag 
-        add constraint FK7E0859DBC5BF8903 
-        foreign key (entity_key) 
-        references j3_tmodel;
-
-    alter table j3_tmodel_descr 
-        add constraint FK63DFF1EDC5BF8903 
-        foreign key (entity_key) 
-        references j3_tmodel;
-
-    alter table j3_tmodel_identifier 
-        add constraint FKD5FB623DC5BF8903 
-        foreign key (entity_key) 
-        references j3_tmodel;
-
-    alter table j3_tmodel_instance_info 
-        add constraint FKDC6C9004CFBD88B7 
-        foreign key (entity_key) 
-        references j3_binding_template;
-
-    alter table j3_tmodel_instance_info_descr 
-        add constraint FKD826B4062B115C6F 
-        foreign key (tmodel_instance_info_id) 
-        references j3_tmodel_instance_info;
-
-    alter table j3_transfer_token_keys 
-        add constraint FK8BBF49185ED9DD48 
-        foreign key (transfer_token) 
-        references j3_transfer_token;
-
-    create table hibernate_unique_key (
-         next_hi integer 
-    );
-
-    insert into hibernate_unique_key values ( 0 );

Copied: labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/derby/import.sql (from rev 33044, labs/jbossesb/tags/JBESB_4_7_CP2_ER2/product/install/jUDDI-registryV3/juddi-sql/derby/import.sql)
===================================================================
--- labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/derby/import.sql	                        (rev 0)
+++ labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/derby/import.sql	2010-05-24 16:38:08 UTC (rev 33050)
@@ -0,0 +1,635 @@
+
+    create table j3_address (
+        id bigint not null,
+        sort_code varchar(10),
+        tmodel_key varchar(255),
+        use_type varchar(255),
+        address_id bigint not null,
+        primary key (id)
+    );
+
+    create table j3_address_line (
+        id bigint not null,
+        key_name varchar(255),
+        key_value varchar(255),
+        line varchar(80) not null,
+        address_id bigint not null,
+        primary key (id)
+    );
+
+    create table j3_auth_token (
+        auth_token varchar(51) not null,
+        authorized_name varchar(255) not null,
+        created timestamp not null,
+        last_used timestamp not null,
+        number_of_uses integer not null,
+        token_state integer not null,
+        primary key (auth_token)
+    );
+
+    create table j3_binding_category_bag (
+        id bigint not null,
+        entity_key varchar(255) not null,
+        primary key (id),
+        unique (entity_key)
+    );
+
+    create table j3_binding_descr (
+        id bigint not null,
+        descr varchar(1024) not null,
+        lang_code varchar(5),
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_binding_template (
+        access_point_type varchar(255),
+        access_point_url varchar(4000),
+        hosting_redirector varchar(255),
+        entity_key varchar(255) not null,
+        service_key varchar(255) not null,
+        primary key (entity_key)
+    );
+
+    create table j3_business_category_bag (
+        id bigint not null,
+        entity_key varchar(255) not null,
+        primary key (id),
+        unique (entity_key)
+    );
+
+    create table j3_business_descr (
+        id bigint not null,
+        descr varchar(1024) not null,
+        lang_code varchar(5),
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_business_entity (
+        entity_key varchar(255) not null,
+        primary key (entity_key)
+    );
+
+    create table j3_business_identifier (
+        id bigint not null,
+        key_name varchar(255),
+        key_value varchar(255) not null,
+        tmodel_key_ref varchar(255),
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_business_name (
+        id bigint not null,
+        lang_code varchar(5),
+        name varchar(255) not null,
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_business_service (
+        entity_key varchar(255) not null,
+        business_key varchar(255) not null,
+        primary key (entity_key)
+    );
+
+    create table j3_category_bag (
+        id bigint not null,
+        primary key (id)
+    );
+
+    create table j3_clerk (
+        clerk_name varchar(255) not null,
+        cred varchar(255),
+        publisher_id varchar(255) not null,
+        node_name varchar(255),
+        primary key (clerk_name)
+    );
+
+    create table j3_client_subscriptioninfo (
+        subscription_key varchar(255) not null,
+        last_notified timestamp,
+        fromClerk_clerk_name varchar(255),
+        toClerk_clerk_name varchar(255),
+        primary key (subscription_key)
+    );
+
+    create table j3_contact (
+        id bigint not null,
+        use_type varchar(255),
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_contact_descr (
+        id bigint not null,
+        descr varchar(1024) not null,
+        lang_code varchar(5),
+        contact_id bigint not null,
+        primary key (id)
+    );
+
+    create table j3_discovery_url (
+        id bigint not null,
+        url varchar(255) not null,
+        use_type varchar(255) not null,
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_email (
+        id bigint not null,
+        email_address varchar(255) not null,
+        use_type varchar(255),
+        contact_id bigint not null,
+        primary key (id)
+    );
+
+    create table j3_instance_details_descr (
+        id bigint not null,
+        descr varchar(1024) not null,
+        lang_code varchar(5),
+        tmodel_instance_info_id bigint not null,
+        primary key (id)
+    );
+
+    create table j3_instance_details_doc_descr (
+        id bigint not null,
+        descr varchar(1024) not null,
+        lang_code varchar(5),
+        tmodel_instance_info_id bigint not null,
+        primary key (id)
+    );
+
+    create table j3_keyed_reference (
+        id bigint not null,
+        key_name varchar(255),
+        key_value varchar(255) not null,
+        tmodel_key_ref varchar(255),
+        category_bag_id bigint,
+        keyed_reference_group_id bigint,
+        primary key (id)
+    );
+
+    create table j3_keyed_reference_group (
+        id bigint not null,
+        tmodel_key varchar(255),
+        category_bag_id bigint not null,
+        primary key (id)
+    );
+
+    create table j3_node (
+        name varchar(255) not null,
+        custody_transfer_url varchar(255) not null,
+        factory_initial varchar(255),
+        factory_naming_provider varchar(255),
+        factory_url_pkgs varchar(255),
+        inquiry_url varchar(255) not null,
+        juddi_api_url varchar(255),
+        manager_name varchar(255) not null,
+        proxy_transport varchar(255) not null,
+        publish_url varchar(255) not null,
+        security_url varchar(255) not null,
+        subscription_url varchar(255) not null,
+        primary key (name)
+    );
+
+    create table j3_overview_doc (
+        id bigint not null,
+        overview_url varchar(255) not null,
+        overview_url_use_type varchar(255),
+        entity_key varchar(255),
+        tomodel_instance_info_id bigint,
+        primary key (id)
+    );
+
+    create table j3_overview_doc_descr (
+        id bigint not null,
+        descr varchar(1024) not null,
+        lang_code varchar(5),
+        overview_doc_id bigint,
+        primary key (id)
+    );
+
+    create table j3_person_name (
+        id bigint not null,
+        lang_code varchar(5),
+        name varchar(255) not null,
+        contact_id bigint not null,
+        primary key (id)
+    );
+
+    create table j3_phone (
+        id bigint not null,
+        phone_number varchar(50) not null,
+        use_type varchar(255),
+        contact_id bigint not null,
+        primary key (id)
+    );
+
+    create table j3_publisher (
+        authorized_name varchar(255) not null,
+        email_address varchar(255),
+        is_admin varchar(5),
+        is_enabled varchar(5),
+        max_bindings_per_service integer,
+        max_businesses integer,
+        max_services_per_business integer,
+        max_tmodels integer,
+        publisher_name varchar(255) not null,
+        primary key (authorized_name)
+    );
+
+    create table j3_publisher_assertion (
+        from_key varchar(255) not null,
+        to_key varchar(255) not null,
+        from_check varchar(5) not null,
+        key_name varchar(255) not null,
+        key_value varchar(255) not null,
+        tmodel_key varchar(255) not null,
+        to_check varchar(5) not null,
+        primary key (from_key, to_key)
+    );
+
+    create table j3_service_category_bag (
+        id bigint not null,
+        entity_key varchar(255) not null,
+        primary key (id),
+        unique (entity_key)
+    );
+
+    create table j3_service_descr (
+        id bigint not null,
+        descr varchar(1024) not null,
+        lang_code varchar(5),
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_service_name (
+        id bigint not null,
+        lang_code varchar(5),
+        name varchar(255) not null,
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_service_projection (
+        business_key varchar(255) not null,
+        service_key varchar(255) not null,
+        primary key (business_key, service_key)
+    );
+
+    create table j3_subscription (
+        subscription_key varchar(255) not null,
+        authorized_name varchar(255) not null,
+        binding_key varchar(255),
+        brief smallint,
+        create_date timestamp not null,
+        expires_after timestamp,
+        last_notified timestamp,
+        max_entities integer,
+        notification_interval varchar(255),
+        subscription_filter clob(65636) not null,
+        primary key (subscription_key)
+    );
+
+    create table j3_subscription_chunk_token (
+        chunk_token varchar(255) not null,
+        data integer not null,
+        end_point timestamp,
+        expires_after timestamp not null,
+        start_point timestamp,
+        subscription_key varchar(255) not null,
+        primary key (chunk_token)
+    );
+
+    create table j3_subscription_match (
+        id bigint not null,
+        entity_key varchar(255) not null,
+        subscription_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_tmodel (
+        deleted smallint,
+        lang_code varchar(5),
+        name varchar(255) not null,
+        entity_key varchar(255) not null,
+        primary key (entity_key)
+    );
+
+    create table j3_tmodel_category_bag (
+        id bigint not null,
+        entity_key varchar(255) not null,
+        primary key (id),
+        unique (entity_key)
+    );
+
+    create table j3_tmodel_descr (
+        id bigint not null,
+        descr varchar(1024) not null,
+        lang_code varchar(5),
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_tmodel_identifier (
+        id bigint not null,
+        key_name varchar(255),
+        key_value varchar(255) not null,
+        tmodel_key_ref varchar(255),
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_tmodel_instance_info (
+        id bigint not null,
+        instance_parms varchar(512),
+        tmodel_key varchar(255) not null,
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_tmodel_instance_info_descr (
+        id bigint not null,
+        descr varchar(1024) not null,
+        lang_code varchar(5),
+        tmodel_instance_info_id bigint not null,
+        primary key (id)
+    );
+
+    create table j3_transfer_token (
+        transfer_token varchar(51) not null,
+        expiration_date timestamp not null,
+        primary key (transfer_token)
+    );
+
+    create table j3_transfer_token_keys (
+        id bigint not null,
+        entity_key varchar(255),
+        transfer_token varchar(51) not null,
+        primary key (id)
+    );
+
+    create table j3_uddi_entity (
+        entity_key varchar(255) not null,
+        authorized_name varchar(255) not null,
+        created timestamp,
+        modified timestamp not null,
+        modified_including_children timestamp,
+        node_id varchar(255),
+        primary key (entity_key)
+    );
+
+    alter table j3_address 
+        add constraint FKF83236BE75D860FB 
+        foreign key (address_id) 
+        references j3_contact;
+
+    alter table j3_address_line 
+        add constraint FKC665B8D5F8B8D8CF 
+        foreign key (address_id) 
+        references j3_address;
+
+    alter table j3_binding_category_bag 
+        add constraint FKCF34B2376A68D45A 
+        foreign key (id) 
+        references j3_category_bag;
+
+    alter table j3_binding_category_bag 
+        add constraint FKCF34B237CFBD88B7 
+        foreign key (entity_key) 
+        references j3_binding_template;
+
+    alter table j3_binding_descr 
+        add constraint FK5EA60911CFBD88B7 
+        foreign key (entity_key) 
+        references j3_binding_template;
+
+    alter table j3_binding_template 
+        add constraint FKD044BD6A2E448F3F 
+        foreign key (service_key) 
+        references j3_business_service;
+
+    alter table j3_binding_template 
+        add constraint FKD044BD6AD1823CA5 
+        foreign key (entity_key) 
+        references j3_uddi_entity;
+
+    alter table j3_business_category_bag 
+        add constraint FKD6D3ECB06A68D45A 
+        foreign key (id) 
+        references j3_category_bag;
+
+    alter table j3_business_category_bag 
+        add constraint FKD6D3ECB0BEB92A91 
+        foreign key (entity_key) 
+        references j3_business_entity;
+
+    alter table j3_business_descr 
+        add constraint FK3A24B4B8BEB92A91 
+        foreign key (entity_key) 
+        references j3_business_entity;
+
+    alter table j3_business_entity 
+        add constraint FKCA61A0CD1823CA5 
+        foreign key (entity_key) 
+        references j3_uddi_entity;
+
+    alter table j3_business_identifier 
+        add constraint FKB0C7A652BEB92A91 
+        foreign key (entity_key) 
+        references j3_business_entity;
+
+    alter table j3_business_name 
+        add constraint FK43F526F4BEB92A91 
+        foreign key (entity_key) 
+        references j3_business_entity;
+
+    alter table j3_business_service 
+        add constraint FK5D4255ACD1823CA5 
+        foreign key (entity_key) 
+        references j3_uddi_entity;
+
+    alter table j3_business_service 
+        add constraint FK5D4255ACEF04CFEE 
+        foreign key (business_key) 
+        references j3_business_entity;
+
+    alter table j3_clerk 
+        add constraint FK34DC7D9F6BB0F935 
+        foreign key (node_name) 
+        references j3_node;
+
+    alter table j3_client_subscriptioninfo 
+        add constraint FKDF04CC095BFC6733 
+        foreign key (fromClerk_clerk_name) 
+        references j3_clerk;
+
+    alter table j3_client_subscriptioninfo 
+        add constraint FKDF04CC09F3CE9C04 
+        foreign key (toClerk_clerk_name) 
+        references j3_clerk;
+
+    alter table j3_contact 
+        add constraint FK7551BEEABEB92A91 
+        foreign key (entity_key) 
+        references j3_business_entity;
+
+    alter table j3_contact_descr 
+        add constraint FK56CA9E6C2E3FD94F 
+        foreign key (contact_id) 
+        references j3_contact;
+
+    alter table j3_discovery_url 
+        add constraint FKA042FDAABEB92A91 
+        foreign key (entity_key) 
+        references j3_business_entity;
+
+    alter table j3_email 
+        add constraint FK34F910E62E3FD94F 
+        foreign key (contact_id) 
+        references j3_contact;
+
+    alter table j3_instance_details_descr 
+        add constraint FK3CC165902B115C6F 
+        foreign key (tmodel_instance_info_id) 
+        references j3_tmodel_instance_info;
+
+    alter table j3_instance_details_doc_descr 
+        add constraint FK447324492B115C6F 
+        foreign key (tmodel_instance_info_id) 
+        references j3_tmodel_instance_info;
+
+    alter table j3_keyed_reference 
+        add constraint FK350C8454E075C8D7 
+        foreign key (keyed_reference_group_id) 
+        references j3_keyed_reference_group;
+
+    alter table j3_keyed_reference 
+        add constraint FK350C84541DB72652 
+        foreign key (category_bag_id) 
+        references j3_category_bag;
+
+    alter table j3_keyed_reference_group 
+        add constraint FKF6224ED41DB72652 
+        foreign key (category_bag_id) 
+        references j3_category_bag;
+
+    alter table j3_overview_doc 
+        add constraint FK5CD8D0E8C5BF8903 
+        foreign key (entity_key) 
+        references j3_tmodel;
+
+    alter table j3_overview_doc 
+        add constraint FK5CD8D0E8E8CE1B36 
+        foreign key (tomodel_instance_info_id) 
+        references j3_tmodel_instance_info;
+
+    alter table j3_overview_doc_descr 
+        add constraint FK36FB9EA9BDC711C 
+        foreign key (overview_doc_id) 
+        references j3_overview_doc;
+
+    alter table j3_person_name 
+        add constraint FKCB7B8AFF2E3FD94F 
+        foreign key (contact_id) 
+        references j3_contact;
+
+    alter table j3_phone 
+        add constraint FK359202B82E3FD94F 
+        foreign key (contact_id) 
+        references j3_contact;
+
+    alter table j3_publisher_assertion 
+        add constraint FK8A102449E3544929 
+        foreign key (to_key) 
+        references j3_business_entity;
+
+    alter table j3_publisher_assertion 
+        add constraint FK8A102449CCEE22D8 
+        foreign key (from_key) 
+        references j3_business_entity;
+
+    alter table j3_service_category_bag 
+        add constraint FK185A68076A68D45A 
+        foreign key (id) 
+        references j3_category_bag;
+
+    alter table j3_service_category_bag 
+        add constraint FK185A680748D0656D 
+        foreign key (entity_key) 
+        references j3_business_service;
+
+    alter table j3_service_descr 
+        add constraint FKB6D63D4148D0656D 
+        foreign key (entity_key) 
+        references j3_business_service;
+
+    alter table j3_service_name 
+        add constraint FKCC1BE94B48D0656D 
+        foreign key (entity_key) 
+        references j3_business_service;
+
+    alter table j3_service_projection 
+        add constraint FK629F290F2E448F3F 
+        foreign key (service_key) 
+        references j3_business_service;
+
+    alter table j3_service_projection 
+        add constraint FK629F290FEF04CFEE 
+        foreign key (business_key) 
+        references j3_business_entity;
+
+    alter table j3_subscription_match 
+        add constraint FK5B9C2F19BEEE42E5 
+        foreign key (subscription_key) 
+        references j3_subscription;
+
+    alter table j3_tmodel 
+        add constraint FK83C8072BD1823CA5 
+        foreign key (entity_key) 
+        references j3_uddi_entity;
+
+    alter table j3_tmodel_category_bag 
+        add constraint FK7E0859DB6A68D45A 
+        foreign key (id) 
+        references j3_category_bag;
+
+    alter table j3_tmodel_category_bag 
+        add constraint FK7E0859DBC5BF8903 
+        foreign key (entity_key) 
+        references j3_tmodel;
+
+    alter table j3_tmodel_descr 
+        add constraint FK63DFF1EDC5BF8903 
+        foreign key (entity_key) 
+        references j3_tmodel;
+
+    alter table j3_tmodel_identifier 
+        add constraint FKD5FB623DC5BF8903 
+        foreign key (entity_key) 
+        references j3_tmodel;
+
+    alter table j3_tmodel_instance_info 
+        add constraint FKDC6C9004CFBD88B7 
+        foreign key (entity_key) 
+        references j3_binding_template;
+
+    alter table j3_tmodel_instance_info_descr 
+        add constraint FKD826B4062B115C6F 
+        foreign key (tmodel_instance_info_id) 
+        references j3_tmodel_instance_info;
+
+    alter table j3_transfer_token_keys 
+        add constraint FK8BBF49185ED9DD48 
+        foreign key (transfer_token) 
+        references j3_transfer_token;
+
+    create table hibernate_unique_key (
+         next_hi integer 
+    );
+
+    insert into hibernate_unique_key values ( 0 );

Copied: labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/hsqldb (from rev 33044, labs/jbossesb/tags/JBESB_4_7_CP2_ER2/product/install/jUDDI-registryV3/juddi-sql/hsqldb)

Deleted: labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/hsqldb/import.sql
===================================================================
--- labs/jbossesb/tags/JBESB_4_7_CP2_ER2/product/install/jUDDI-registryV3/juddi-sql/hsqldb/import.sql	2010-05-24 14:43:21 UTC (rev 33044)
+++ labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/hsqldb/import.sql	2010-05-24 16:38:08 UTC (rev 33050)
@@ -1,629 +0,0 @@
-
-    create table j3_address (
-        id bigint generated by default as identity (start with 1),
-        sort_code varchar(10),
-        tmodel_key varchar(255),
-        use_type varchar(255),
-        address_id bigint not null,
-        primary key (id)
-    );
-
-    create table j3_address_line (
-        id bigint generated by default as identity (start with 1),
-        key_name varchar(255),
-        key_value varchar(255),
-        line varchar(80) not null,
-        address_id bigint not null,
-        primary key (id)
-    );
-
-    create table j3_auth_token (
-        auth_token varchar(51) not null,
-        authorized_name varchar(255) not null,
-        created timestamp not null,
-        last_used timestamp not null,
-        number_of_uses integer not null,
-        token_state integer not null,
-        primary key (auth_token)
-    );
-
-    create table j3_binding_category_bag (
-        id bigint not null,
-        entity_key varchar(255) not null,
-        primary key (id),
-        unique (entity_key)
-    );
-
-    create table j3_binding_descr (
-        id bigint generated by default as identity (start with 1),
-        descr varchar(1024) not null,
-        lang_code varchar(5),
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_binding_template (
-        access_point_type varchar(255),
-        access_point_url varchar(4000),
-        hosting_redirector varchar(255),
-        entity_key varchar(255) not null,
-        service_key varchar(255) not null,
-        primary key (entity_key)
-    );
-
-    create table j3_business_category_bag (
-        id bigint not null,
-        entity_key varchar(255) not null,
-        primary key (id),
-        unique (entity_key)
-    );
-
-    create table j3_business_descr (
-        id bigint generated by default as identity (start with 1),
-        descr varchar(1024) not null,
-        lang_code varchar(5),
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_business_entity (
-        entity_key varchar(255) not null,
-        primary key (entity_key)
-    );
-
-    create table j3_business_identifier (
-        id bigint generated by default as identity (start with 1),
-        key_name varchar(255),
-        key_value varchar(255) not null,
-        tmodel_key_ref varchar(255),
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_business_name (
-        id bigint generated by default as identity (start with 1),
-        lang_code varchar(5),
-        name varchar(255) not null,
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_business_service (
-        entity_key varchar(255) not null,
-        business_key varchar(255) not null,
-        primary key (entity_key)
-    );
-
-    create table j3_category_bag (
-        id bigint generated by default as identity (start with 1),
-        primary key (id)
-    );
-
-    create table j3_clerk (
-        clerk_name varchar(255) not null,
-        cred varchar(255),
-        publisher_id varchar(255) not null,
-        node_name varchar(255),
-        primary key (clerk_name)
-    );
-
-    create table j3_client_subscriptioninfo (
-        subscription_key varchar(255) not null,
-        last_notified timestamp,
-        fromClerk_clerk_name varchar(255),
-        toClerk_clerk_name varchar(255),
-        primary key (subscription_key)
-    );
-
-    create table j3_contact (
-        id bigint generated by default as identity (start with 1),
-        use_type varchar(255),
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_contact_descr (
-        id bigint generated by default as identity (start with 1),
-        descr varchar(1024) not null,
-        lang_code varchar(5),
-        contact_id bigint not null,
-        primary key (id)
-    );
-
-    create table j3_discovery_url (
-        id bigint generated by default as identity (start with 1),
-        url varchar(255) not null,
-        use_type varchar(255) not null,
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_email (
-        id bigint generated by default as identity (start with 1),
-        email_address varchar(255) not null,
-        use_type varchar(255),
-        contact_id bigint not null,
-        primary key (id)
-    );
-
-    create table j3_instance_details_descr (
-        id bigint generated by default as identity (start with 1),
-        descr varchar(1024) not null,
-        lang_code varchar(5),
-        tmodel_instance_info_id bigint not null,
-        primary key (id)
-    );
-
-    create table j3_instance_details_doc_descr (
-        id bigint generated by default as identity (start with 1),
-        descr varchar(1024) not null,
-        lang_code varchar(5),
-        tmodel_instance_info_id bigint not null,
-        primary key (id)
-    );
-
-    create table j3_keyed_reference (
-        id bigint generated by default as identity (start with 1),
-        key_name varchar(255),
-        key_value varchar(255) not null,
-        tmodel_key_ref varchar(255),
-        category_bag_id bigint,
-        keyed_reference_group_id bigint,
-        primary key (id)
-    );
-
-    create table j3_keyed_reference_group (
-        id bigint generated by default as identity (start with 1),
-        tmodel_key varchar(255),
-        category_bag_id bigint not null,
-        primary key (id)
-    );
-
-    create table j3_node (
-        name varchar(255) not null,
-        custody_transfer_url varchar(255) not null,
-        factory_initial varchar(255),
-        factory_naming_provider varchar(255),
-        factory_url_pkgs varchar(255),
-        inquiry_url varchar(255) not null,
-        juddi_api_url varchar(255),
-        manager_name varchar(255) not null,
-        proxy_transport varchar(255) not null,
-        publish_url varchar(255) not null,
-        security_url varchar(255) not null,
-        subscription_url varchar(255) not null,
-        primary key (name)
-    );
-
-    create table j3_overview_doc (
-        id bigint generated by default as identity (start with 1),
-        overview_url varchar(255) not null,
-        overview_url_use_type varchar(255),
-        entity_key varchar(255),
-        tomodel_instance_info_id bigint,
-        primary key (id)
-    );
-
-    create table j3_overview_doc_descr (
-        id bigint generated by default as identity (start with 1),
-        descr varchar(1024) not null,
-        lang_code varchar(5),
-        overview_doc_id bigint,
-        primary key (id)
-    );
-
-    create table j3_person_name (
-        id bigint generated by default as identity (start with 1),
-        lang_code varchar(5),
-        name varchar(255) not null,
-        contact_id bigint not null,
-        primary key (id)
-    );
-
-    create table j3_phone (
-        id bigint generated by default as identity (start with 1),
-        phone_number varchar(50) not null,
-        use_type varchar(255),
-        contact_id bigint not null,
-        primary key (id)
-    );
-
-    create table j3_publisher (
-        authorized_name varchar(255) not null,
-        email_address varchar(255),
-        is_admin varchar(5),
-        is_enabled varchar(5),
-        max_bindings_per_service integer,
-        max_businesses integer,
-        max_services_per_business integer,
-        max_tmodels integer,
-        publisher_name varchar(255) not null,
-        primary key (authorized_name)
-    );
-
-    create table j3_publisher_assertion (
-        from_key varchar(255) not null,
-        to_key varchar(255) not null,
-        from_check varchar(5) not null,
-        key_name varchar(255) not null,
-        key_value varchar(255) not null,
-        tmodel_key varchar(255) not null,
-        to_check varchar(5) not null,
-        primary key (from_key, to_key)
-    );
-
-    create table j3_service_category_bag (
-        id bigint not null,
-        entity_key varchar(255) not null,
-        primary key (id),
-        unique (entity_key)
-    );
-
-    create table j3_service_descr (
-        id bigint generated by default as identity (start with 1),
-        descr varchar(1024) not null,
-        lang_code varchar(5),
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_service_name (
-        id bigint generated by default as identity (start with 1),
-        lang_code varchar(5),
-        name varchar(255) not null,
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_service_projection (
-        business_key varchar(255) not null,
-        service_key varchar(255) not null,
-        primary key (business_key, service_key)
-    );
-
-    create table j3_subscription (
-        subscription_key varchar(255) not null,
-        authorized_name varchar(255) not null,
-        binding_key varchar(255),
-        brief bit,
-        create_date timestamp not null,
-        expires_after timestamp,
-        last_notified timestamp,
-        max_entities integer,
-        notification_interval varchar(255),
-        subscription_filter longvarchar not null,
-        primary key (subscription_key)
-    );
-
-    create table j3_subscription_chunk_token (
-        chunk_token varchar(255) not null,
-        data integer not null,
-        end_point timestamp,
-        expires_after timestamp not null,
-        start_point timestamp,
-        subscription_key varchar(255) not null,
-        primary key (chunk_token)
-    );
-
-    create table j3_subscription_match (
-        id bigint generated by default as identity (start with 1),
-        entity_key varchar(255) not null,
-        subscription_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_tmodel (
-        deleted bit,
-        lang_code varchar(5),
-        name varchar(255) not null,
-        entity_key varchar(255) not null,
-        primary key (entity_key)
-    );
-
-    create table j3_tmodel_category_bag (
-        id bigint not null,
-        entity_key varchar(255) not null,
-        primary key (id),
-        unique (entity_key)
-    );
-
-    create table j3_tmodel_descr (
-        id bigint generated by default as identity (start with 1),
-        descr varchar(1024) not null,
-        lang_code varchar(5),
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_tmodel_identifier (
-        id bigint generated by default as identity (start with 1),
-        key_name varchar(255),
-        key_value varchar(255) not null,
-        tmodel_key_ref varchar(255),
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_tmodel_instance_info (
-        id bigint generated by default as identity (start with 1),
-        instance_parms varchar(512),
-        tmodel_key varchar(255) not null,
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_tmodel_instance_info_descr (
-        id bigint generated by default as identity (start with 1),
-        descr varchar(1024) not null,
-        lang_code varchar(5),
-        tmodel_instance_info_id bigint not null,
-        primary key (id)
-    );
-
-    create table j3_transfer_token (
-        transfer_token varchar(51) not null,
-        expiration_date timestamp not null,
-        primary key (transfer_token)
-    );
-
-    create table j3_transfer_token_keys (
-        id bigint generated by default as identity (start with 1),
-        entity_key varchar(255),
-        transfer_token varchar(51) not null,
-        primary key (id)
-    );
-
-    create table j3_uddi_entity (
-        entity_key varchar(255) not null,
-        authorized_name varchar(255) not null,
-        created timestamp,
-        modified timestamp not null,
-        modified_including_children timestamp,
-        node_id varchar(255),
-        primary key (entity_key)
-    );
-
-    alter table j3_address 
-        add constraint FKF83236BE75D860FB 
-        foreign key (address_id) 
-        references j3_contact;
-
-    alter table j3_address_line 
-        add constraint FKC665B8D5F8B8D8CF 
-        foreign key (address_id) 
-        references j3_address;
-
-    alter table j3_binding_category_bag 
-        add constraint FKCF34B2376A68D45A 
-        foreign key (id) 
-        references j3_category_bag;
-
-    alter table j3_binding_category_bag 
-        add constraint FKCF34B237CFBD88B7 
-        foreign key (entity_key) 
-        references j3_binding_template;
-
-    alter table j3_binding_descr 
-        add constraint FK5EA60911CFBD88B7 
-        foreign key (entity_key) 
-        references j3_binding_template;
-
-    alter table j3_binding_template 
-        add constraint FKD044BD6A2E448F3F 
-        foreign key (service_key) 
-        references j3_business_service;
-
-    alter table j3_binding_template 
-        add constraint FKD044BD6AD1823CA5 
-        foreign key (entity_key) 
-        references j3_uddi_entity;
-
-    alter table j3_business_category_bag 
-        add constraint FKD6D3ECB06A68D45A 
-        foreign key (id) 
-        references j3_category_bag;
-
-    alter table j3_business_category_bag 
-        add constraint FKD6D3ECB0BEB92A91 
-        foreign key (entity_key) 
-        references j3_business_entity;
-
-    alter table j3_business_descr 
-        add constraint FK3A24B4B8BEB92A91 
-        foreign key (entity_key) 
-        references j3_business_entity;
-
-    alter table j3_business_entity 
-        add constraint FKCA61A0CD1823CA5 
-        foreign key (entity_key) 
-        references j3_uddi_entity;
-
-    alter table j3_business_identifier 
-        add constraint FKB0C7A652BEB92A91 
-        foreign key (entity_key) 
-        references j3_business_entity;
-
-    alter table j3_business_name 
-        add constraint FK43F526F4BEB92A91 
-        foreign key (entity_key) 
-        references j3_business_entity;
-
-    alter table j3_business_service 
-        add constraint FK5D4255ACD1823CA5 
-        foreign key (entity_key) 
-        references j3_uddi_entity;
-
-    alter table j3_business_service 
-        add constraint FK5D4255ACEF04CFEE 
-        foreign key (business_key) 
-        references j3_business_entity;
-
-    alter table j3_clerk 
-        add constraint FK34DC7D9F6BB0F935 
-        foreign key (node_name) 
-        references j3_node;
-
-    alter table j3_client_subscriptioninfo 
-        add constraint FKDF04CC095BFC6733 
-        foreign key (fromClerk_clerk_name) 
-        references j3_clerk;
-
-    alter table j3_client_subscriptioninfo 
-        add constraint FKDF04CC09F3CE9C04 
-        foreign key (toClerk_clerk_name) 
-        references j3_clerk;
-
-    alter table j3_contact 
-        add constraint FK7551BEEABEB92A91 
-        foreign key (entity_key) 
-        references j3_business_entity;
-
-    alter table j3_contact_descr 
-        add constraint FK56CA9E6C2E3FD94F 
-        foreign key (contact_id) 
-        references j3_contact;
-
-    alter table j3_discovery_url 
-        add constraint FKA042FDAABEB92A91 
-        foreign key (entity_key) 
-        references j3_business_entity;
-
-    alter table j3_email 
-        add constraint FK34F910E62E3FD94F 
-        foreign key (contact_id) 
-        references j3_contact;
-
-    alter table j3_instance_details_descr 
-        add constraint FK3CC165902B115C6F 
-        foreign key (tmodel_instance_info_id) 
-        references j3_tmodel_instance_info;
-
-    alter table j3_instance_details_doc_descr 
-        add constraint FK447324492B115C6F 
-        foreign key (tmodel_instance_info_id) 
-        references j3_tmodel_instance_info;
-
-    alter table j3_keyed_reference 
-        add constraint FK350C8454E075C8D7 
-        foreign key (keyed_reference_group_id) 
-        references j3_keyed_reference_group;
-
-    alter table j3_keyed_reference 
-        add constraint FK350C84541DB72652 
-        foreign key (category_bag_id) 
-        references j3_category_bag;
-
-    alter table j3_keyed_reference_group 
-        add constraint FKF6224ED41DB72652 
-        foreign key (category_bag_id) 
-        references j3_category_bag;
-
-    alter table j3_overview_doc 
-        add constraint FK5CD8D0E8C5BF8903 
-        foreign key (entity_key) 
-        references j3_tmodel;
-
-    alter table j3_overview_doc 
-        add constraint FK5CD8D0E8E8CE1B36 
-        foreign key (tomodel_instance_info_id) 
-        references j3_tmodel_instance_info;
-
-    alter table j3_overview_doc_descr 
-        add constraint FK36FB9EA9BDC711C 
-        foreign key (overview_doc_id) 
-        references j3_overview_doc;
-
-    alter table j3_person_name 
-        add constraint FKCB7B8AFF2E3FD94F 
-        foreign key (contact_id) 
-        references j3_contact;
-
-    alter table j3_phone 
-        add constraint FK359202B82E3FD94F 
-        foreign key (contact_id) 
-        references j3_contact;
-
-    alter table j3_publisher_assertion 
-        add constraint FK8A102449E3544929 
-        foreign key (to_key) 
-        references j3_business_entity;
-
-    alter table j3_publisher_assertion 
-        add constraint FK8A102449CCEE22D8 
-        foreign key (from_key) 
-        references j3_business_entity;
-
-    alter table j3_service_category_bag 
-        add constraint FK185A68076A68D45A 
-        foreign key (id) 
-        references j3_category_bag;
-
-    alter table j3_service_category_bag 
-        add constraint FK185A680748D0656D 
-        foreign key (entity_key) 
-        references j3_business_service;
-
-    alter table j3_service_descr 
-        add constraint FKB6D63D4148D0656D 
-        foreign key (entity_key) 
-        references j3_business_service;
-
-    alter table j3_service_name 
-        add constraint FKCC1BE94B48D0656D 
-        foreign key (entity_key) 
-        references j3_business_service;
-
-    alter table j3_service_projection 
-        add constraint FK629F290F2E448F3F 
-        foreign key (service_key) 
-        references j3_business_service;
-
-    alter table j3_service_projection 
-        add constraint FK629F290FEF04CFEE 
-        foreign key (business_key) 
-        references j3_business_entity;
-
-    alter table j3_subscription_match 
-        add constraint FK5B9C2F19BEEE42E5 
-        foreign key (subscription_key) 
-        references j3_subscription;
-
-    alter table j3_tmodel 
-        add constraint FK83C8072BD1823CA5 
-        foreign key (entity_key) 
-        references j3_uddi_entity;
-
-    alter table j3_tmodel_category_bag 
-        add constraint FK7E0859DB6A68D45A 
-        foreign key (id) 
-        references j3_category_bag;
-
-    alter table j3_tmodel_category_bag 
-        add constraint FK7E0859DBC5BF8903 
-        foreign key (entity_key) 
-        references j3_tmodel;
-
-    alter table j3_tmodel_descr 
-        add constraint FK63DFF1EDC5BF8903 
-        foreign key (entity_key) 
-        references j3_tmodel;
-
-    alter table j3_tmodel_identifier 
-        add constraint FKD5FB623DC5BF8903 
-        foreign key (entity_key) 
-        references j3_tmodel;
-
-    alter table j3_tmodel_instance_info 
-        add constraint FKDC6C9004CFBD88B7 
-        foreign key (entity_key) 
-        references j3_binding_template;
-
-    alter table j3_tmodel_instance_info_descr 
-        add constraint FKD826B4062B115C6F 
-        foreign key (tmodel_instance_info_id) 
-        references j3_tmodel_instance_info;
-
-    alter table j3_transfer_token_keys 
-        add constraint FK8BBF49185ED9DD48 
-        foreign key (transfer_token) 
-        references j3_transfer_token;

Copied: labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/hsqldb/import.sql (from rev 33044, labs/jbossesb/tags/JBESB_4_7_CP2_ER2/product/install/jUDDI-registryV3/juddi-sql/hsqldb/import.sql)
===================================================================
--- labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/hsqldb/import.sql	                        (rev 0)
+++ labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/hsqldb/import.sql	2010-05-24 16:38:08 UTC (rev 33050)
@@ -0,0 +1,629 @@
+
+    create table j3_address (
+        id bigint generated by default as identity (start with 1),
+        sort_code varchar(10),
+        tmodel_key varchar(255),
+        use_type varchar(255),
+        address_id bigint not null,
+        primary key (id)
+    );
+
+    create table j3_address_line (
+        id bigint generated by default as identity (start with 1),
+        key_name varchar(255),
+        key_value varchar(255),
+        line varchar(80) not null,
+        address_id bigint not null,
+        primary key (id)
+    );
+
+    create table j3_auth_token (
+        auth_token varchar(51) not null,
+        authorized_name varchar(255) not null,
+        created timestamp not null,
+        last_used timestamp not null,
+        number_of_uses integer not null,
+        token_state integer not null,
+        primary key (auth_token)
+    );
+
+    create table j3_binding_category_bag (
+        id bigint not null,
+        entity_key varchar(255) not null,
+        primary key (id),
+        unique (entity_key)
+    );
+
+    create table j3_binding_descr (
+        id bigint generated by default as identity (start with 1),
+        descr varchar(1024) not null,
+        lang_code varchar(5),
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_binding_template (
+        access_point_type varchar(255),
+        access_point_url varchar(4000),
+        hosting_redirector varchar(255),
+        entity_key varchar(255) not null,
+        service_key varchar(255) not null,
+        primary key (entity_key)
+    );
+
+    create table j3_business_category_bag (
+        id bigint not null,
+        entity_key varchar(255) not null,
+        primary key (id),
+        unique (entity_key)
+    );
+
+    create table j3_business_descr (
+        id bigint generated by default as identity (start with 1),
+        descr varchar(1024) not null,
+        lang_code varchar(5),
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_business_entity (
+        entity_key varchar(255) not null,
+        primary key (entity_key)
+    );
+
+    create table j3_business_identifier (
+        id bigint generated by default as identity (start with 1),
+        key_name varchar(255),
+        key_value varchar(255) not null,
+        tmodel_key_ref varchar(255),
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_business_name (
+        id bigint generated by default as identity (start with 1),
+        lang_code varchar(5),
+        name varchar(255) not null,
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_business_service (
+        entity_key varchar(255) not null,
+        business_key varchar(255) not null,
+        primary key (entity_key)
+    );
+
+    create table j3_category_bag (
+        id bigint generated by default as identity (start with 1),
+        primary key (id)
+    );
+
+    create table j3_clerk (
+        clerk_name varchar(255) not null,
+        cred varchar(255),
+        publisher_id varchar(255) not null,
+        node_name varchar(255),
+        primary key (clerk_name)
+    );
+
+    create table j3_client_subscriptioninfo (
+        subscription_key varchar(255) not null,
+        last_notified timestamp,
+        fromClerk_clerk_name varchar(255),
+        toClerk_clerk_name varchar(255),
+        primary key (subscription_key)
+    );
+
+    create table j3_contact (
+        id bigint generated by default as identity (start with 1),
+        use_type varchar(255),
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_contact_descr (
+        id bigint generated by default as identity (start with 1),
+        descr varchar(1024) not null,
+        lang_code varchar(5),
+        contact_id bigint not null,
+        primary key (id)
+    );
+
+    create table j3_discovery_url (
+        id bigint generated by default as identity (start with 1),
+        url varchar(255) not null,
+        use_type varchar(255) not null,
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_email (
+        id bigint generated by default as identity (start with 1),
+        email_address varchar(255) not null,
+        use_type varchar(255),
+        contact_id bigint not null,
+        primary key (id)
+    );
+
+    create table j3_instance_details_descr (
+        id bigint generated by default as identity (start with 1),
+        descr varchar(1024) not null,
+        lang_code varchar(5),
+        tmodel_instance_info_id bigint not null,
+        primary key (id)
+    );
+
+    create table j3_instance_details_doc_descr (
+        id bigint generated by default as identity (start with 1),
+        descr varchar(1024) not null,
+        lang_code varchar(5),
+        tmodel_instance_info_id bigint not null,
+        primary key (id)
+    );
+
+    create table j3_keyed_reference (
+        id bigint generated by default as identity (start with 1),
+        key_name varchar(255),
+        key_value varchar(255) not null,
+        tmodel_key_ref varchar(255),
+        category_bag_id bigint,
+        keyed_reference_group_id bigint,
+        primary key (id)
+    );
+
+    create table j3_keyed_reference_group (
+        id bigint generated by default as identity (start with 1),
+        tmodel_key varchar(255),
+        category_bag_id bigint not null,
+        primary key (id)
+    );
+
+    create table j3_node (
+        name varchar(255) not null,
+        custody_transfer_url varchar(255) not null,
+        factory_initial varchar(255),
+        factory_naming_provider varchar(255),
+        factory_url_pkgs varchar(255),
+        inquiry_url varchar(255) not null,
+        juddi_api_url varchar(255),
+        manager_name varchar(255) not null,
+        proxy_transport varchar(255) not null,
+        publish_url varchar(255) not null,
+        security_url varchar(255) not null,
+        subscription_url varchar(255) not null,
+        primary key (name)
+    );
+
+    create table j3_overview_doc (
+        id bigint generated by default as identity (start with 1),
+        overview_url varchar(255) not null,
+        overview_url_use_type varchar(255),
+        entity_key varchar(255),
+        tomodel_instance_info_id bigint,
+        primary key (id)
+    );
+
+    create table j3_overview_doc_descr (
+        id bigint generated by default as identity (start with 1),
+        descr varchar(1024) not null,
+        lang_code varchar(5),
+        overview_doc_id bigint,
+        primary key (id)
+    );
+
+    create table j3_person_name (
+        id bigint generated by default as identity (start with 1),
+        lang_code varchar(5),
+        name varchar(255) not null,
+        contact_id bigint not null,
+        primary key (id)
+    );
+
+    create table j3_phone (
+        id bigint generated by default as identity (start with 1),
+        phone_number varchar(50) not null,
+        use_type varchar(255),
+        contact_id bigint not null,
+        primary key (id)
+    );
+
+    create table j3_publisher (
+        authorized_name varchar(255) not null,
+        email_address varchar(255),
+        is_admin varchar(5),
+        is_enabled varchar(5),
+        max_bindings_per_service integer,
+        max_businesses integer,
+        max_services_per_business integer,
+        max_tmodels integer,
+        publisher_name varchar(255) not null,
+        primary key (authorized_name)
+    );
+
+    create table j3_publisher_assertion (
+        from_key varchar(255) not null,
+        to_key varchar(255) not null,
+        from_check varchar(5) not null,
+        key_name varchar(255) not null,
+        key_value varchar(255) not null,
+        tmodel_key varchar(255) not null,
+        to_check varchar(5) not null,
+        primary key (from_key, to_key)
+    );
+
+    create table j3_service_category_bag (
+        id bigint not null,
+        entity_key varchar(255) not null,
+        primary key (id),
+        unique (entity_key)
+    );
+
+    create table j3_service_descr (
+        id bigint generated by default as identity (start with 1),
+        descr varchar(1024) not null,
+        lang_code varchar(5),
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_service_name (
+        id bigint generated by default as identity (start with 1),
+        lang_code varchar(5),
+        name varchar(255) not null,
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_service_projection (
+        business_key varchar(255) not null,
+        service_key varchar(255) not null,
+        primary key (business_key, service_key)
+    );
+
+    create table j3_subscription (
+        subscription_key varchar(255) not null,
+        authorized_name varchar(255) not null,
+        binding_key varchar(255),
+        brief bit,
+        create_date timestamp not null,
+        expires_after timestamp,
+        last_notified timestamp,
+        max_entities integer,
+        notification_interval varchar(255),
+        subscription_filter longvarchar not null,
+        primary key (subscription_key)
+    );
+
+    create table j3_subscription_chunk_token (
+        chunk_token varchar(255) not null,
+        data integer not null,
+        end_point timestamp,
+        expires_after timestamp not null,
+        start_point timestamp,
+        subscription_key varchar(255) not null,
+        primary key (chunk_token)
+    );
+
+    create table j3_subscription_match (
+        id bigint generated by default as identity (start with 1),
+        entity_key varchar(255) not null,
+        subscription_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_tmodel (
+        deleted bit,
+        lang_code varchar(5),
+        name varchar(255) not null,
+        entity_key varchar(255) not null,
+        primary key (entity_key)
+    );
+
+    create table j3_tmodel_category_bag (
+        id bigint not null,
+        entity_key varchar(255) not null,
+        primary key (id),
+        unique (entity_key)
+    );
+
+    create table j3_tmodel_descr (
+        id bigint generated by default as identity (start with 1),
+        descr varchar(1024) not null,
+        lang_code varchar(5),
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_tmodel_identifier (
+        id bigint generated by default as identity (start with 1),
+        key_name varchar(255),
+        key_value varchar(255) not null,
+        tmodel_key_ref varchar(255),
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_tmodel_instance_info (
+        id bigint generated by default as identity (start with 1),
+        instance_parms varchar(512),
+        tmodel_key varchar(255) not null,
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_tmodel_instance_info_descr (
+        id bigint generated by default as identity (start with 1),
+        descr varchar(1024) not null,
+        lang_code varchar(5),
+        tmodel_instance_info_id bigint not null,
+        primary key (id)
+    );
+
+    create table j3_transfer_token (
+        transfer_token varchar(51) not null,
+        expiration_date timestamp not null,
+        primary key (transfer_token)
+    );
+
+    create table j3_transfer_token_keys (
+        id bigint generated by default as identity (start with 1),
+        entity_key varchar(255),
+        transfer_token varchar(51) not null,
+        primary key (id)
+    );
+
+    create table j3_uddi_entity (
+        entity_key varchar(255) not null,
+        authorized_name varchar(255) not null,
+        created timestamp,
+        modified timestamp not null,
+        modified_including_children timestamp,
+        node_id varchar(255),
+        primary key (entity_key)
+    );
+
+    alter table j3_address 
+        add constraint FKF83236BE75D860FB 
+        foreign key (address_id) 
+        references j3_contact;
+
+    alter table j3_address_line 
+        add constraint FKC665B8D5F8B8D8CF 
+        foreign key (address_id) 
+        references j3_address;
+
+    alter table j3_binding_category_bag 
+        add constraint FKCF34B2376A68D45A 
+        foreign key (id) 
+        references j3_category_bag;
+
+    alter table j3_binding_category_bag 
+        add constraint FKCF34B237CFBD88B7 
+        foreign key (entity_key) 
+        references j3_binding_template;
+
+    alter table j3_binding_descr 
+        add constraint FK5EA60911CFBD88B7 
+        foreign key (entity_key) 
+        references j3_binding_template;
+
+    alter table j3_binding_template 
+        add constraint FKD044BD6A2E448F3F 
+        foreign key (service_key) 
+        references j3_business_service;
+
+    alter table j3_binding_template 
+        add constraint FKD044BD6AD1823CA5 
+        foreign key (entity_key) 
+        references j3_uddi_entity;
+
+    alter table j3_business_category_bag 
+        add constraint FKD6D3ECB06A68D45A 
+        foreign key (id) 
+        references j3_category_bag;
+
+    alter table j3_business_category_bag 
+        add constraint FKD6D3ECB0BEB92A91 
+        foreign key (entity_key) 
+        references j3_business_entity;
+
+    alter table j3_business_descr 
+        add constraint FK3A24B4B8BEB92A91 
+        foreign key (entity_key) 
+        references j3_business_entity;
+
+    alter table j3_business_entity 
+        add constraint FKCA61A0CD1823CA5 
+        foreign key (entity_key) 
+        references j3_uddi_entity;
+
+    alter table j3_business_identifier 
+        add constraint FKB0C7A652BEB92A91 
+        foreign key (entity_key) 
+        references j3_business_entity;
+
+    alter table j3_business_name 
+        add constraint FK43F526F4BEB92A91 
+        foreign key (entity_key) 
+        references j3_business_entity;
+
+    alter table j3_business_service 
+        add constraint FK5D4255ACD1823CA5 
+        foreign key (entity_key) 
+        references j3_uddi_entity;
+
+    alter table j3_business_service 
+        add constraint FK5D4255ACEF04CFEE 
+        foreign key (business_key) 
+        references j3_business_entity;
+
+    alter table j3_clerk 
+        add constraint FK34DC7D9F6BB0F935 
+        foreign key (node_name) 
+        references j3_node;
+
+    alter table j3_client_subscriptioninfo 
+        add constraint FKDF04CC095BFC6733 
+        foreign key (fromClerk_clerk_name) 
+        references j3_clerk;
+
+    alter table j3_client_subscriptioninfo 
+        add constraint FKDF04CC09F3CE9C04 
+        foreign key (toClerk_clerk_name) 
+        references j3_clerk;
+
+    alter table j3_contact 
+        add constraint FK7551BEEABEB92A91 
+        foreign key (entity_key) 
+        references j3_business_entity;
+
+    alter table j3_contact_descr 
+        add constraint FK56CA9E6C2E3FD94F 
+        foreign key (contact_id) 
+        references j3_contact;
+
+    alter table j3_discovery_url 
+        add constraint FKA042FDAABEB92A91 
+        foreign key (entity_key) 
+        references j3_business_entity;
+
+    alter table j3_email 
+        add constraint FK34F910E62E3FD94F 
+        foreign key (contact_id) 
+        references j3_contact;
+
+    alter table j3_instance_details_descr 
+        add constraint FK3CC165902B115C6F 
+        foreign key (tmodel_instance_info_id) 
+        references j3_tmodel_instance_info;
+
+    alter table j3_instance_details_doc_descr 
+        add constraint FK447324492B115C6F 
+        foreign key (tmodel_instance_info_id) 
+        references j3_tmodel_instance_info;
+
+    alter table j3_keyed_reference 
+        add constraint FK350C8454E075C8D7 
+        foreign key (keyed_reference_group_id) 
+        references j3_keyed_reference_group;
+
+    alter table j3_keyed_reference 
+        add constraint FK350C84541DB72652 
+        foreign key (category_bag_id) 
+        references j3_category_bag;
+
+    alter table j3_keyed_reference_group 
+        add constraint FKF6224ED41DB72652 
+        foreign key (category_bag_id) 
+        references j3_category_bag;
+
+    alter table j3_overview_doc 
+        add constraint FK5CD8D0E8C5BF8903 
+        foreign key (entity_key) 
+        references j3_tmodel;
+
+    alter table j3_overview_doc 
+        add constraint FK5CD8D0E8E8CE1B36 
+        foreign key (tomodel_instance_info_id) 
+        references j3_tmodel_instance_info;
+
+    alter table j3_overview_doc_descr 
+        add constraint FK36FB9EA9BDC711C 
+        foreign key (overview_doc_id) 
+        references j3_overview_doc;
+
+    alter table j3_person_name 
+        add constraint FKCB7B8AFF2E3FD94F 
+        foreign key (contact_id) 
+        references j3_contact;
+
+    alter table j3_phone 
+        add constraint FK359202B82E3FD94F 
+        foreign key (contact_id) 
+        references j3_contact;
+
+    alter table j3_publisher_assertion 
+        add constraint FK8A102449E3544929 
+        foreign key (to_key) 
+        references j3_business_entity;
+
+    alter table j3_publisher_assertion 
+        add constraint FK8A102449CCEE22D8 
+        foreign key (from_key) 
+        references j3_business_entity;
+
+    alter table j3_service_category_bag 
+        add constraint FK185A68076A68D45A 
+        foreign key (id) 
+        references j3_category_bag;
+
+    alter table j3_service_category_bag 
+        add constraint FK185A680748D0656D 
+        foreign key (entity_key) 
+        references j3_business_service;
+
+    alter table j3_service_descr 
+        add constraint FKB6D63D4148D0656D 
+        foreign key (entity_key) 
+        references j3_business_service;
+
+    alter table j3_service_name 
+        add constraint FKCC1BE94B48D0656D 
+        foreign key (entity_key) 
+        references j3_business_service;
+
+    alter table j3_service_projection 
+        add constraint FK629F290F2E448F3F 
+        foreign key (service_key) 
+        references j3_business_service;
+
+    alter table j3_service_projection 
+        add constraint FK629F290FEF04CFEE 
+        foreign key (business_key) 
+        references j3_business_entity;
+
+    alter table j3_subscription_match 
+        add constraint FK5B9C2F19BEEE42E5 
+        foreign key (subscription_key) 
+        references j3_subscription;
+
+    alter table j3_tmodel 
+        add constraint FK83C8072BD1823CA5 
+        foreign key (entity_key) 
+        references j3_uddi_entity;
+
+    alter table j3_tmodel_category_bag 
+        add constraint FK7E0859DB6A68D45A 
+        foreign key (id) 
+        references j3_category_bag;
+
+    alter table j3_tmodel_category_bag 
+        add constraint FK7E0859DBC5BF8903 
+        foreign key (entity_key) 
+        references j3_tmodel;
+
+    alter table j3_tmodel_descr 
+        add constraint FK63DFF1EDC5BF8903 
+        foreign key (entity_key) 
+        references j3_tmodel;
+
+    alter table j3_tmodel_identifier 
+        add constraint FKD5FB623DC5BF8903 
+        foreign key (entity_key) 
+        references j3_tmodel;
+
+    alter table j3_tmodel_instance_info 
+        add constraint FKDC6C9004CFBD88B7 
+        foreign key (entity_key) 
+        references j3_binding_template;
+
+    alter table j3_tmodel_instance_info_descr 
+        add constraint FKD826B4062B115C6F 
+        foreign key (tmodel_instance_info_id) 
+        references j3_tmodel_instance_info;
+
+    alter table j3_transfer_token_keys 
+        add constraint FK8BBF49185ED9DD48 
+        foreign key (transfer_token) 
+        references j3_transfer_token;

Copied: labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/mysql (from rev 33044, labs/jbossesb/tags/JBESB_4_7_CP2_ER2/product/install/jUDDI-registryV3/juddi-sql/mysql)

Deleted: labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/mysql/import.sql
===================================================================
--- labs/jbossesb/tags/JBESB_4_7_CP2_ER2/product/install/jUDDI-registryV3/juddi-sql/mysql/import.sql	2010-05-24 14:43:21 UTC (rev 33044)
+++ labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/mysql/import.sql	2010-05-24 16:38:08 UTC (rev 33050)
@@ -1,678 +0,0 @@
-
-    create table j3_address (
-        id bigint not null auto_increment,
-        sort_code varchar(10),
-        tmodel_key varchar(255),
-        use_type varchar(255),
-        address_id bigint not null,
-        primary key (id)
-    );
-
-    create table j3_address_line (
-        id bigint not null auto_increment,
-        key_name varchar(255),
-        key_value varchar(255),
-        line varchar(80) not null,
-        address_id bigint not null,
-        primary key (id)
-    );
-
-    create table j3_auth_token (
-        auth_token varchar(51) not null,
-        authorized_name varchar(255) not null,
-        created datetime not null,
-        last_used datetime not null,
-        number_of_uses integer not null,
-        token_state integer not null,
-        primary key (auth_token)
-    );
-
-    create table j3_binding_category_bag (
-        id bigint not null,
-        entity_key varchar(255) not null,
-        primary key (id),
-        unique (entity_key)
-    );
-
-    create table j3_binding_descr (
-        id bigint not null auto_increment,
-        descr longtext not null,
-        lang_code varchar(5),
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_binding_template (
-        access_point_type varchar(255),
-        access_point_url longtext,
-        hosting_redirector varchar(255),
-        entity_key varchar(255) not null,
-        service_key varchar(255) not null,
-        primary key (entity_key)
-    );
-
-    create table j3_business_category_bag (
-        id bigint not null,
-        entity_key varchar(255) not null,
-        primary key (id),
-        unique (entity_key)
-    );
-
-    create table j3_business_descr (
-        id bigint not null auto_increment,
-        descr longtext not null,
-        lang_code varchar(5),
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_business_entity (
-        entity_key varchar(255) not null,
-        primary key (entity_key)
-    );
-
-    create table j3_business_identifier (
-        id bigint not null auto_increment,
-        key_name varchar(255),
-        key_value varchar(255) not null,
-        tmodel_key_ref varchar(255),
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_business_name (
-        id bigint not null auto_increment,
-        lang_code varchar(5),
-        name varchar(255) not null,
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_business_service (
-        entity_key varchar(255) not null,
-        business_key varchar(255) not null,
-        primary key (entity_key)
-    );
-
-    create table j3_category_bag (
-        id bigint not null auto_increment,
-        primary key (id)
-    );
-
-    create table j3_clerk (
-        clerk_name varchar(255) not null,
-        cred varchar(255),
-        publisher_id varchar(255) not null,
-        node_name varchar(255),
-        primary key (clerk_name)
-    );
-
-    create table j3_client_subscriptioninfo (
-        subscription_key varchar(255) not null,
-        last_notified datetime,
-        fromClerk_clerk_name varchar(255),
-        toClerk_clerk_name varchar(255),
-        primary key (subscription_key)
-    );
-
-    create table j3_contact (
-        id bigint not null auto_increment,
-        use_type varchar(255),
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_contact_descr (
-        id bigint not null auto_increment,
-        descr longtext not null,
-        lang_code varchar(5),
-        contact_id bigint not null,
-        primary key (id)
-    );
-
-    create table j3_discovery_url (
-        id bigint not null auto_increment,
-        url varchar(255) not null,
-        use_type varchar(255) not null,
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_email (
-        id bigint not null auto_increment,
-        email_address varchar(255) not null,
-        use_type varchar(255),
-        contact_id bigint not null,
-        primary key (id)
-    );
-
-    create table j3_instance_details_descr (
-        id bigint not null auto_increment,
-        descr longtext not null,
-        lang_code varchar(5),
-        tmodel_instance_info_id bigint not null,
-        primary key (id)
-    );
-
-    create table j3_instance_details_doc_descr (
-        id bigint not null auto_increment,
-        descr longtext not null,
-        lang_code varchar(5),
-        tmodel_instance_info_id bigint not null,
-        primary key (id)
-    );
-
-    create table j3_keyed_reference (
-        id bigint not null auto_increment,
-        key_name varchar(255),
-        key_value varchar(255) not null,
-        tmodel_key_ref varchar(255),
-        category_bag_id bigint,
-        keyed_reference_group_id bigint,
-        primary key (id)
-    );
-
-    create table j3_keyed_reference_group (
-        id bigint not null auto_increment,
-        tmodel_key varchar(255),
-        category_bag_id bigint not null,
-        primary key (id)
-    );
-
-    create table j3_node (
-        name varchar(255) not null,
-        custody_transfer_url varchar(255) not null,
-        factory_initial varchar(255),
-        factory_naming_provider varchar(255),
-        factory_url_pkgs varchar(255),
-        inquiry_url varchar(255) not null,
-        juddi_api_url varchar(255),
-        manager_name varchar(255) not null,
-        proxy_transport varchar(255) not null,
-        publish_url varchar(255) not null,
-        security_url varchar(255) not null,
-        subscription_url varchar(255) not null,
-        primary key (name)
-    );
-
-    create table j3_overview_doc (
-        id bigint not null auto_increment,
-        overview_url varchar(255) not null,
-        overview_url_use_type varchar(255),
-        entity_key varchar(255),
-        tomodel_instance_info_id bigint,
-        primary key (id)
-    );
-
-    create table j3_overview_doc_descr (
-        id bigint not null auto_increment,
-        descr longtext not null,
-        lang_code varchar(5),
-        overview_doc_id bigint,
-        primary key (id)
-    );
-
-    create table j3_person_name (
-        id bigint not null auto_increment,
-        lang_code varchar(5),
-        name varchar(255) not null,
-        contact_id bigint not null,
-        primary key (id)
-    );
-
-    create table j3_phone (
-        id bigint not null auto_increment,
-        phone_number varchar(50) not null,
-        use_type varchar(255),
-        contact_id bigint not null,
-        primary key (id)
-    );
-
-    create table j3_publisher (
-        authorized_name varchar(255) not null,
-        email_address varchar(255),
-        is_admin varchar(5),
-        is_enabled varchar(5),
-        max_bindings_per_service integer,
-        max_businesses integer,
-        max_services_per_business integer,
-        max_tmodels integer,
-        publisher_name varchar(255) not null,
-        primary key (authorized_name)
-    );
-
-    create table j3_publisher_assertion (
-        from_key varchar(255) not null,
-        to_key varchar(255) not null,
-        from_check varchar(5) not null,
-        key_name varchar(255) not null,
-        key_value varchar(255) not null,
-        tmodel_key varchar(255) not null,
-        to_check varchar(5) not null,
-        primary key (from_key, to_key)
-    );
-
-    create table j3_service_category_bag (
-        id bigint not null,
-        entity_key varchar(255) not null,
-        primary key (id),
-        unique (entity_key)
-    );
-
-    create table j3_service_descr (
-        id bigint not null auto_increment,
-        descr longtext not null,
-        lang_code varchar(5),
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_service_name (
-        id bigint not null auto_increment,
-        lang_code varchar(5),
-        name varchar(255) not null,
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_service_projection (
-        business_key varchar(255) not null,
-        service_key varchar(255) not null,
-        primary key (business_key, service_key)
-    );
-
-    create table j3_subscription (
-        subscription_key varchar(255) not null,
-        authorized_name varchar(255) not null,
-        binding_key varchar(255),
-        brief bit,
-        create_date datetime not null,
-        expires_after datetime,
-        last_notified datetime,
-        max_entities integer,
-        notification_interval varchar(255),
-        subscription_filter longtext not null,
-        primary key (subscription_key)
-    );
-
-    create table j3_subscription_chunk_token (
-        chunk_token varchar(255) not null,
-        data integer not null,
-        end_point datetime,
-        expires_after datetime not null,
-        start_point datetime,
-        subscription_key varchar(255) not null,
-        primary key (chunk_token)
-    );
-
-    create table j3_subscription_match (
-        id bigint not null auto_increment,
-        entity_key varchar(255) not null,
-        subscription_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_tmodel (
-        deleted bit,
-        lang_code varchar(5),
-        name varchar(255) not null,
-        entity_key varchar(255) not null,
-        primary key (entity_key)
-    );
-
-    create table j3_tmodel_category_bag (
-        id bigint not null,
-        entity_key varchar(255) not null,
-        primary key (id),
-        unique (entity_key)
-    );
-
-    create table j3_tmodel_descr (
-        id bigint not null auto_increment,
-        descr longtext not null,
-        lang_code varchar(5),
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_tmodel_identifier (
-        id bigint not null auto_increment,
-        key_name varchar(255),
-        key_value varchar(255) not null,
-        tmodel_key_ref varchar(255),
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_tmodel_instance_info (
-        id bigint not null auto_increment,
-        instance_parms longtext,
-        tmodel_key varchar(255) not null,
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_tmodel_instance_info_descr (
-        id bigint not null auto_increment,
-        descr longtext not null,
-        lang_code varchar(5),
-        tmodel_instance_info_id bigint not null,
-        primary key (id)
-    );
-
-    create table j3_transfer_token (
-        transfer_token varchar(51) not null,
-        expiration_date datetime not null,
-        primary key (transfer_token)
-    );
-
-    create table j3_transfer_token_keys (
-        id bigint not null auto_increment,
-        entity_key varchar(255),
-        transfer_token varchar(51) not null,
-        primary key (id)
-    );
-
-    create table j3_uddi_entity (
-        entity_key varchar(255) not null,
-        authorized_name varchar(255) not null,
-        created datetime,
-        modified datetime not null,
-        modified_including_children datetime,
-        node_id varchar(255),
-        primary key (entity_key)
-    );
-
-    alter table j3_address 
-        add index FKF83236BE75D860FB (address_id), 
-        add constraint FKF83236BE75D860FB 
-        foreign key (address_id) 
-        references j3_contact (id);
-
-    alter table j3_address_line 
-        add index FKC665B8D5F8B8D8CF (address_id), 
-        add constraint FKC665B8D5F8B8D8CF 
-        foreign key (address_id) 
-        references j3_address (id);
-
-    alter table j3_binding_category_bag 
-        add index FKCF34B2376A68D45A (id), 
-        add constraint FKCF34B2376A68D45A 
-        foreign key (id) 
-        references j3_category_bag (id);
-
-    alter table j3_binding_category_bag 
-        add index FKCF34B237CFBD88B7 (entity_key), 
-        add constraint FKCF34B237CFBD88B7 
-        foreign key (entity_key) 
-        references j3_binding_template (entity_key);
-
-    alter table j3_binding_descr 
-        add index FK5EA60911CFBD88B7 (entity_key), 
-        add constraint FK5EA60911CFBD88B7 
-        foreign key (entity_key) 
-        references j3_binding_template (entity_key);
-
-    alter table j3_binding_template 
-        add index FKD044BD6A2E448F3F (service_key), 
-        add constraint FKD044BD6A2E448F3F 
-        foreign key (service_key) 
-        references j3_business_service (entity_key);
-
-    alter table j3_binding_template 
-        add index FKD044BD6AD1823CA5 (entity_key), 
-        add constraint FKD044BD6AD1823CA5 
-        foreign key (entity_key) 
-        references j3_uddi_entity (entity_key);
-
-    alter table j3_business_category_bag 
-        add index FKD6D3ECB06A68D45A (id), 
-        add constraint FKD6D3ECB06A68D45A 
-        foreign key (id) 
-        references j3_category_bag (id);
-
-    alter table j3_business_category_bag 
-        add index FKD6D3ECB0BEB92A91 (entity_key), 
-        add constraint FKD6D3ECB0BEB92A91 
-        foreign key (entity_key) 
-        references j3_business_entity (entity_key);
-
-    alter table j3_business_descr 
-        add index FK3A24B4B8BEB92A91 (entity_key), 
-        add constraint FK3A24B4B8BEB92A91 
-        foreign key (entity_key) 
-        references j3_business_entity (entity_key);
-
-    alter table j3_business_entity 
-        add index FKCA61A0CD1823CA5 (entity_key), 
-        add constraint FKCA61A0CD1823CA5 
-        foreign key (entity_key) 
-        references j3_uddi_entity (entity_key);
-
-    alter table j3_business_identifier 
-        add index FKB0C7A652BEB92A91 (entity_key), 
-        add constraint FKB0C7A652BEB92A91 
-        foreign key (entity_key) 
-        references j3_business_entity (entity_key);
-
-    alter table j3_business_name 
-        add index FK43F526F4BEB92A91 (entity_key), 
-        add constraint FK43F526F4BEB92A91 
-        foreign key (entity_key) 
-        references j3_business_entity (entity_key);
-
-    alter table j3_business_service 
-        add index FK5D4255ACD1823CA5 (entity_key), 
-        add constraint FK5D4255ACD1823CA5 
-        foreign key (entity_key) 
-        references j3_uddi_entity (entity_key);
-
-    alter table j3_business_service 
-        add index FK5D4255ACEF04CFEE (business_key), 
-        add constraint FK5D4255ACEF04CFEE 
-        foreign key (business_key) 
-        references j3_business_entity (entity_key);
-
-    alter table j3_clerk 
-        add index FK34DC7D9F6BB0F935 (node_name), 
-        add constraint FK34DC7D9F6BB0F935 
-        foreign key (node_name) 
-        references j3_node (name);
-
-    alter table j3_client_subscriptioninfo 
-        add index FKDF04CC095BFC6733 (fromClerk_clerk_name), 
-        add constraint FKDF04CC095BFC6733 
-        foreign key (fromClerk_clerk_name) 
-        references j3_clerk (clerk_name);
-
-    alter table j3_client_subscriptioninfo 
-        add index FKDF04CC09F3CE9C04 (toClerk_clerk_name), 
-        add constraint FKDF04CC09F3CE9C04 
-        foreign key (toClerk_clerk_name) 
-        references j3_clerk (clerk_name);
-
-    alter table j3_contact 
-        add index FK7551BEEABEB92A91 (entity_key), 
-        add constraint FK7551BEEABEB92A91 
-        foreign key (entity_key) 
-        references j3_business_entity (entity_key);
-
-    alter table j3_contact_descr 
-        add index FK56CA9E6C2E3FD94F (contact_id), 
-        add constraint FK56CA9E6C2E3FD94F 
-        foreign key (contact_id) 
-        references j3_contact (id);
-
-    alter table j3_discovery_url 
-        add index FKA042FDAABEB92A91 (entity_key), 
-        add constraint FKA042FDAABEB92A91 
-        foreign key (entity_key) 
-        references j3_business_entity (entity_key);
-
-    alter table j3_email 
-        add index FK34F910E62E3FD94F (contact_id), 
-        add constraint FK34F910E62E3FD94F 
-        foreign key (contact_id) 
-        references j3_contact (id);
-
-    alter table j3_instance_details_descr 
-        add index FK3CC165902B115C6F (tmodel_instance_info_id), 
-        add constraint FK3CC165902B115C6F 
-        foreign key (tmodel_instance_info_id) 
-        references j3_tmodel_instance_info (id);
-
-    alter table j3_instance_details_doc_descr 
-        add index FK447324492B115C6F (tmodel_instance_info_id), 
-        add constraint FK447324492B115C6F 
-        foreign key (tmodel_instance_info_id) 
-        references j3_tmodel_instance_info (id);
-
-    alter table j3_keyed_reference 
-        add index FK350C8454E075C8D7 (keyed_reference_group_id), 
-        add constraint FK350C8454E075C8D7 
-        foreign key (keyed_reference_group_id) 
-        references j3_keyed_reference_group (id);
-
-    alter table j3_keyed_reference 
-        add index FK350C84541DB72652 (category_bag_id), 
-        add constraint FK350C84541DB72652 
-        foreign key (category_bag_id) 
-        references j3_category_bag (id);
-
-    alter table j3_keyed_reference_group 
-        add index FKF6224ED41DB72652 (category_bag_id), 
-        add constraint FKF6224ED41DB72652 
-        foreign key (category_bag_id) 
-        references j3_category_bag (id);
-
-    alter table j3_overview_doc 
-        add index FK5CD8D0E8C5BF8903 (entity_key), 
-        add constraint FK5CD8D0E8C5BF8903 
-        foreign key (entity_key) 
-        references j3_tmodel (entity_key);
-
-    alter table j3_overview_doc 
-        add index FK5CD8D0E8E8CE1B36 (tomodel_instance_info_id), 
-        add constraint FK5CD8D0E8E8CE1B36 
-        foreign key (tomodel_instance_info_id) 
-        references j3_tmodel_instance_info (id);
-
-    alter table j3_overview_doc_descr 
-        add index FK36FB9EA9BDC711C (overview_doc_id), 
-        add constraint FK36FB9EA9BDC711C 
-        foreign key (overview_doc_id) 
-        references j3_overview_doc (id);
-
-    alter table j3_person_name 
-        add index FKCB7B8AFF2E3FD94F (contact_id), 
-        add constraint FKCB7B8AFF2E3FD94F 
-        foreign key (contact_id) 
-        references j3_contact (id);
-
-    alter table j3_phone 
-        add index FK359202B82E3FD94F (contact_id), 
-        add constraint FK359202B82E3FD94F 
-        foreign key (contact_id) 
-        references j3_contact (id);
-
-    alter table j3_publisher_assertion 
-        add index FK8A102449E3544929 (to_key), 
-        add constraint FK8A102449E3544929 
-        foreign key (to_key) 
-        references j3_business_entity (entity_key);
-
-    alter table j3_publisher_assertion 
-        add index FK8A102449CCEE22D8 (from_key), 
-        add constraint FK8A102449CCEE22D8 
-        foreign key (from_key) 
-        references j3_business_entity (entity_key);
-
-    alter table j3_service_category_bag 
-        add index FK185A68076A68D45A (id), 
-        add constraint FK185A68076A68D45A 
-        foreign key (id) 
-        references j3_category_bag (id);
-
-    alter table j3_service_category_bag 
-        add index FK185A680748D0656D (entity_key), 
-        add constraint FK185A680748D0656D 
-        foreign key (entity_key) 
-        references j3_business_service (entity_key);
-
-    alter table j3_service_descr 
-        add index FKB6D63D4148D0656D (entity_key), 
-        add constraint FKB6D63D4148D0656D 
-        foreign key (entity_key) 
-        references j3_business_service (entity_key);
-
-    alter table j3_service_name 
-        add index FKCC1BE94B48D0656D (entity_key), 
-        add constraint FKCC1BE94B48D0656D 
-        foreign key (entity_key) 
-        references j3_business_service (entity_key);
-
-    alter table j3_service_projection 
-        add index FK629F290F2E448F3F (service_key), 
-        add constraint FK629F290F2E448F3F 
-        foreign key (service_key) 
-        references j3_business_service (entity_key);
-
-    alter table j3_service_projection 
-        add index FK629F290FEF04CFEE (business_key), 
-        add constraint FK629F290FEF04CFEE 
-        foreign key (business_key) 
-        references j3_business_entity (entity_key);
-
-    alter table j3_subscription_match 
-        add index FK5B9C2F19BEEE42E5 (subscription_key), 
-        add constraint FK5B9C2F19BEEE42E5 
-        foreign key (subscription_key) 
-        references j3_subscription (subscription_key);
-
-    alter table j3_tmodel 
-        add index FK83C8072BD1823CA5 (entity_key), 
-        add constraint FK83C8072BD1823CA5 
-        foreign key (entity_key) 
-        references j3_uddi_entity (entity_key);
-
-    alter table j3_tmodel_category_bag 
-        add index FK7E0859DB6A68D45A (id), 
-        add constraint FK7E0859DB6A68D45A 
-        foreign key (id) 
-        references j3_category_bag (id);
-
-    alter table j3_tmodel_category_bag 
-        add index FK7E0859DBC5BF8903 (entity_key), 
-        add constraint FK7E0859DBC5BF8903 
-        foreign key (entity_key) 
-        references j3_tmodel (entity_key);
-
-    alter table j3_tmodel_descr 
-        add index FK63DFF1EDC5BF8903 (entity_key), 
-        add constraint FK63DFF1EDC5BF8903 
-        foreign key (entity_key) 
-        references j3_tmodel (entity_key);
-
-    alter table j3_tmodel_identifier 
-        add index FKD5FB623DC5BF8903 (entity_key), 
-        add constraint FKD5FB623DC5BF8903 
-        foreign key (entity_key) 
-        references j3_tmodel (entity_key);
-
-    alter table j3_tmodel_instance_info 
-        add index FKDC6C9004CFBD88B7 (entity_key), 
-        add constraint FKDC6C9004CFBD88B7 
-        foreign key (entity_key) 
-        references j3_binding_template (entity_key);
-
-    alter table j3_tmodel_instance_info_descr 
-        add index FKD826B4062B115C6F (tmodel_instance_info_id), 
-        add constraint FKD826B4062B115C6F 
-        foreign key (tmodel_instance_info_id) 
-        references j3_tmodel_instance_info (id);
-
-    alter table j3_transfer_token_keys 
-        add index FK8BBF49185ED9DD48 (transfer_token), 
-        add constraint FK8BBF49185ED9DD48 
-        foreign key (transfer_token) 
-        references j3_transfer_token (transfer_token);

Copied: labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/mysql/import.sql (from rev 33044, labs/jbossesb/tags/JBESB_4_7_CP2_ER2/product/install/jUDDI-registryV3/juddi-sql/mysql/import.sql)
===================================================================
--- labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/mysql/import.sql	                        (rev 0)
+++ labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/mysql/import.sql	2010-05-24 16:38:08 UTC (rev 33050)
@@ -0,0 +1,678 @@
+
+    create table j3_address (
+        id bigint not null auto_increment,
+        sort_code varchar(10),
+        tmodel_key varchar(255),
+        use_type varchar(255),
+        address_id bigint not null,
+        primary key (id)
+    );
+
+    create table j3_address_line (
+        id bigint not null auto_increment,
+        key_name varchar(255),
+        key_value varchar(255),
+        line varchar(80) not null,
+        address_id bigint not null,
+        primary key (id)
+    );
+
+    create table j3_auth_token (
+        auth_token varchar(51) not null,
+        authorized_name varchar(255) not null,
+        created datetime not null,
+        last_used datetime not null,
+        number_of_uses integer not null,
+        token_state integer not null,
+        primary key (auth_token)
+    );
+
+    create table j3_binding_category_bag (
+        id bigint not null,
+        entity_key varchar(255) not null,
+        primary key (id),
+        unique (entity_key)
+    );
+
+    create table j3_binding_descr (
+        id bigint not null auto_increment,
+        descr longtext not null,
+        lang_code varchar(5),
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_binding_template (
+        access_point_type varchar(255),
+        access_point_url longtext,
+        hosting_redirector varchar(255),
+        entity_key varchar(255) not null,
+        service_key varchar(255) not null,
+        primary key (entity_key)
+    );
+
+    create table j3_business_category_bag (
+        id bigint not null,
+        entity_key varchar(255) not null,
+        primary key (id),
+        unique (entity_key)
+    );
+
+    create table j3_business_descr (
+        id bigint not null auto_increment,
+        descr longtext not null,
+        lang_code varchar(5),
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_business_entity (
+        entity_key varchar(255) not null,
+        primary key (entity_key)
+    );
+
+    create table j3_business_identifier (
+        id bigint not null auto_increment,
+        key_name varchar(255),
+        key_value varchar(255) not null,
+        tmodel_key_ref varchar(255),
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_business_name (
+        id bigint not null auto_increment,
+        lang_code varchar(5),
+        name varchar(255) not null,
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_business_service (
+        entity_key varchar(255) not null,
+        business_key varchar(255) not null,
+        primary key (entity_key)
+    );
+
+    create table j3_category_bag (
+        id bigint not null auto_increment,
+        primary key (id)
+    );
+
+    create table j3_clerk (
+        clerk_name varchar(255) not null,
+        cred varchar(255),
+        publisher_id varchar(255) not null,
+        node_name varchar(255),
+        primary key (clerk_name)
+    );
+
+    create table j3_client_subscriptioninfo (
+        subscription_key varchar(255) not null,
+        last_notified datetime,
+        fromClerk_clerk_name varchar(255),
+        toClerk_clerk_name varchar(255),
+        primary key (subscription_key)
+    );
+
+    create table j3_contact (
+        id bigint not null auto_increment,
+        use_type varchar(255),
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_contact_descr (
+        id bigint not null auto_increment,
+        descr longtext not null,
+        lang_code varchar(5),
+        contact_id bigint not null,
+        primary key (id)
+    );
+
+    create table j3_discovery_url (
+        id bigint not null auto_increment,
+        url varchar(255) not null,
+        use_type varchar(255) not null,
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_email (
+        id bigint not null auto_increment,
+        email_address varchar(255) not null,
+        use_type varchar(255),
+        contact_id bigint not null,
+        primary key (id)
+    );
+
+    create table j3_instance_details_descr (
+        id bigint not null auto_increment,
+        descr longtext not null,
+        lang_code varchar(5),
+        tmodel_instance_info_id bigint not null,
+        primary key (id)
+    );
+
+    create table j3_instance_details_doc_descr (
+        id bigint not null auto_increment,
+        descr longtext not null,
+        lang_code varchar(5),
+        tmodel_instance_info_id bigint not null,
+        primary key (id)
+    );
+
+    create table j3_keyed_reference (
+        id bigint not null auto_increment,
+        key_name varchar(255),
+        key_value varchar(255) not null,
+        tmodel_key_ref varchar(255),
+        category_bag_id bigint,
+        keyed_reference_group_id bigint,
+        primary key (id)
+    );
+
+    create table j3_keyed_reference_group (
+        id bigint not null auto_increment,
+        tmodel_key varchar(255),
+        category_bag_id bigint not null,
+        primary key (id)
+    );
+
+    create table j3_node (
+        name varchar(255) not null,
+        custody_transfer_url varchar(255) not null,
+        factory_initial varchar(255),
+        factory_naming_provider varchar(255),
+        factory_url_pkgs varchar(255),
+        inquiry_url varchar(255) not null,
+        juddi_api_url varchar(255),
+        manager_name varchar(255) not null,
+        proxy_transport varchar(255) not null,
+        publish_url varchar(255) not null,
+        security_url varchar(255) not null,
+        subscription_url varchar(255) not null,
+        primary key (name)
+    );
+
+    create table j3_overview_doc (
+        id bigint not null auto_increment,
+        overview_url varchar(255) not null,
+        overview_url_use_type varchar(255),
+        entity_key varchar(255),
+        tomodel_instance_info_id bigint,
+        primary key (id)
+    );
+
+    create table j3_overview_doc_descr (
+        id bigint not null auto_increment,
+        descr longtext not null,
+        lang_code varchar(5),
+        overview_doc_id bigint,
+        primary key (id)
+    );
+
+    create table j3_person_name (
+        id bigint not null auto_increment,
+        lang_code varchar(5),
+        name varchar(255) not null,
+        contact_id bigint not null,
+        primary key (id)
+    );
+
+    create table j3_phone (
+        id bigint not null auto_increment,
+        phone_number varchar(50) not null,
+        use_type varchar(255),
+        contact_id bigint not null,
+        primary key (id)
+    );
+
+    create table j3_publisher (
+        authorized_name varchar(255) not null,
+        email_address varchar(255),
+        is_admin varchar(5),
+        is_enabled varchar(5),
+        max_bindings_per_service integer,
+        max_businesses integer,
+        max_services_per_business integer,
+        max_tmodels integer,
+        publisher_name varchar(255) not null,
+        primary key (authorized_name)
+    );
+
+    create table j3_publisher_assertion (
+        from_key varchar(255) not null,
+        to_key varchar(255) not null,
+        from_check varchar(5) not null,
+        key_name varchar(255) not null,
+        key_value varchar(255) not null,
+        tmodel_key varchar(255) not null,
+        to_check varchar(5) not null,
+        primary key (from_key, to_key)
+    );
+
+    create table j3_service_category_bag (
+        id bigint not null,
+        entity_key varchar(255) not null,
+        primary key (id),
+        unique (entity_key)
+    );
+
+    create table j3_service_descr (
+        id bigint not null auto_increment,
+        descr longtext not null,
+        lang_code varchar(5),
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_service_name (
+        id bigint not null auto_increment,
+        lang_code varchar(5),
+        name varchar(255) not null,
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_service_projection (
+        business_key varchar(255) not null,
+        service_key varchar(255) not null,
+        primary key (business_key, service_key)
+    );
+
+    create table j3_subscription (
+        subscription_key varchar(255) not null,
+        authorized_name varchar(255) not null,
+        binding_key varchar(255),
+        brief bit,
+        create_date datetime not null,
+        expires_after datetime,
+        last_notified datetime,
+        max_entities integer,
+        notification_interval varchar(255),
+        subscription_filter longtext not null,
+        primary key (subscription_key)
+    );
+
+    create table j3_subscription_chunk_token (
+        chunk_token varchar(255) not null,
+        data integer not null,
+        end_point datetime,
+        expires_after datetime not null,
+        start_point datetime,
+        subscription_key varchar(255) not null,
+        primary key (chunk_token)
+    );
+
+    create table j3_subscription_match (
+        id bigint not null auto_increment,
+        entity_key varchar(255) not null,
+        subscription_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_tmodel (
+        deleted bit,
+        lang_code varchar(5),
+        name varchar(255) not null,
+        entity_key varchar(255) not null,
+        primary key (entity_key)
+    );
+
+    create table j3_tmodel_category_bag (
+        id bigint not null,
+        entity_key varchar(255) not null,
+        primary key (id),
+        unique (entity_key)
+    );
+
+    create table j3_tmodel_descr (
+        id bigint not null auto_increment,
+        descr longtext not null,
+        lang_code varchar(5),
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_tmodel_identifier (
+        id bigint not null auto_increment,
+        key_name varchar(255),
+        key_value varchar(255) not null,
+        tmodel_key_ref varchar(255),
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_tmodel_instance_info (
+        id bigint not null auto_increment,
+        instance_parms longtext,
+        tmodel_key varchar(255) not null,
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_tmodel_instance_info_descr (
+        id bigint not null auto_increment,
+        descr longtext not null,
+        lang_code varchar(5),
+        tmodel_instance_info_id bigint not null,
+        primary key (id)
+    );
+
+    create table j3_transfer_token (
+        transfer_token varchar(51) not null,
+        expiration_date datetime not null,
+        primary key (transfer_token)
+    );
+
+    create table j3_transfer_token_keys (
+        id bigint not null auto_increment,
+        entity_key varchar(255),
+        transfer_token varchar(51) not null,
+        primary key (id)
+    );
+
+    create table j3_uddi_entity (
+        entity_key varchar(255) not null,
+        authorized_name varchar(255) not null,
+        created datetime,
+        modified datetime not null,
+        modified_including_children datetime,
+        node_id varchar(255),
+        primary key (entity_key)
+    );
+
+    alter table j3_address 
+        add index FKF83236BE75D860FB (address_id), 
+        add constraint FKF83236BE75D860FB 
+        foreign key (address_id) 
+        references j3_contact (id);
+
+    alter table j3_address_line 
+        add index FKC665B8D5F8B8D8CF (address_id), 
+        add constraint FKC665B8D5F8B8D8CF 
+        foreign key (address_id) 
+        references j3_address (id);
+
+    alter table j3_binding_category_bag 
+        add index FKCF34B2376A68D45A (id), 
+        add constraint FKCF34B2376A68D45A 
+        foreign key (id) 
+        references j3_category_bag (id);
+
+    alter table j3_binding_category_bag 
+        add index FKCF34B237CFBD88B7 (entity_key), 
+        add constraint FKCF34B237CFBD88B7 
+        foreign key (entity_key) 
+        references j3_binding_template (entity_key);
+
+    alter table j3_binding_descr 
+        add index FK5EA60911CFBD88B7 (entity_key), 
+        add constraint FK5EA60911CFBD88B7 
+        foreign key (entity_key) 
+        references j3_binding_template (entity_key);
+
+    alter table j3_binding_template 
+        add index FKD044BD6A2E448F3F (service_key), 
+        add constraint FKD044BD6A2E448F3F 
+        foreign key (service_key) 
+        references j3_business_service (entity_key);
+
+    alter table j3_binding_template 
+        add index FKD044BD6AD1823CA5 (entity_key), 
+        add constraint FKD044BD6AD1823CA5 
+        foreign key (entity_key) 
+        references j3_uddi_entity (entity_key);
+
+    alter table j3_business_category_bag 
+        add index FKD6D3ECB06A68D45A (id), 
+        add constraint FKD6D3ECB06A68D45A 
+        foreign key (id) 
+        references j3_category_bag (id);
+
+    alter table j3_business_category_bag 
+        add index FKD6D3ECB0BEB92A91 (entity_key), 
+        add constraint FKD6D3ECB0BEB92A91 
+        foreign key (entity_key) 
+        references j3_business_entity (entity_key);
+
+    alter table j3_business_descr 
+        add index FK3A24B4B8BEB92A91 (entity_key), 
+        add constraint FK3A24B4B8BEB92A91 
+        foreign key (entity_key) 
+        references j3_business_entity (entity_key);
+
+    alter table j3_business_entity 
+        add index FKCA61A0CD1823CA5 (entity_key), 
+        add constraint FKCA61A0CD1823CA5 
+        foreign key (entity_key) 
+        references j3_uddi_entity (entity_key);
+
+    alter table j3_business_identifier 
+        add index FKB0C7A652BEB92A91 (entity_key), 
+        add constraint FKB0C7A652BEB92A91 
+        foreign key (entity_key) 
+        references j3_business_entity (entity_key);
+
+    alter table j3_business_name 
+        add index FK43F526F4BEB92A91 (entity_key), 
+        add constraint FK43F526F4BEB92A91 
+        foreign key (entity_key) 
+        references j3_business_entity (entity_key);
+
+    alter table j3_business_service 
+        add index FK5D4255ACD1823CA5 (entity_key), 
+        add constraint FK5D4255ACD1823CA5 
+        foreign key (entity_key) 
+        references j3_uddi_entity (entity_key);
+
+    alter table j3_business_service 
+        add index FK5D4255ACEF04CFEE (business_key), 
+        add constraint FK5D4255ACEF04CFEE 
+        foreign key (business_key) 
+        references j3_business_entity (entity_key);
+
+    alter table j3_clerk 
+        add index FK34DC7D9F6BB0F935 (node_name), 
+        add constraint FK34DC7D9F6BB0F935 
+        foreign key (node_name) 
+        references j3_node (name);
+
+    alter table j3_client_subscriptioninfo 
+        add index FKDF04CC095BFC6733 (fromClerk_clerk_name), 
+        add constraint FKDF04CC095BFC6733 
+        foreign key (fromClerk_clerk_name) 
+        references j3_clerk (clerk_name);
+
+    alter table j3_client_subscriptioninfo 
+        add index FKDF04CC09F3CE9C04 (toClerk_clerk_name), 
+        add constraint FKDF04CC09F3CE9C04 
+        foreign key (toClerk_clerk_name) 
+        references j3_clerk (clerk_name);
+
+    alter table j3_contact 
+        add index FK7551BEEABEB92A91 (entity_key), 
+        add constraint FK7551BEEABEB92A91 
+        foreign key (entity_key) 
+        references j3_business_entity (entity_key);
+
+    alter table j3_contact_descr 
+        add index FK56CA9E6C2E3FD94F (contact_id), 
+        add constraint FK56CA9E6C2E3FD94F 
+        foreign key (contact_id) 
+        references j3_contact (id);
+
+    alter table j3_discovery_url 
+        add index FKA042FDAABEB92A91 (entity_key), 
+        add constraint FKA042FDAABEB92A91 
+        foreign key (entity_key) 
+        references j3_business_entity (entity_key);
+
+    alter table j3_email 
+        add index FK34F910E62E3FD94F (contact_id), 
+        add constraint FK34F910E62E3FD94F 
+        foreign key (contact_id) 
+        references j3_contact (id);
+
+    alter table j3_instance_details_descr 
+        add index FK3CC165902B115C6F (tmodel_instance_info_id), 
+        add constraint FK3CC165902B115C6F 
+        foreign key (tmodel_instance_info_id) 
+        references j3_tmodel_instance_info (id);
+
+    alter table j3_instance_details_doc_descr 
+        add index FK447324492B115C6F (tmodel_instance_info_id), 
+        add constraint FK447324492B115C6F 
+        foreign key (tmodel_instance_info_id) 
+        references j3_tmodel_instance_info (id);
+
+    alter table j3_keyed_reference 
+        add index FK350C8454E075C8D7 (keyed_reference_group_id), 
+        add constraint FK350C8454E075C8D7 
+        foreign key (keyed_reference_group_id) 
+        references j3_keyed_reference_group (id);
+
+    alter table j3_keyed_reference 
+        add index FK350C84541DB72652 (category_bag_id), 
+        add constraint FK350C84541DB72652 
+        foreign key (category_bag_id) 
+        references j3_category_bag (id);
+
+    alter table j3_keyed_reference_group 
+        add index FKF6224ED41DB72652 (category_bag_id), 
+        add constraint FKF6224ED41DB72652 
+        foreign key (category_bag_id) 
+        references j3_category_bag (id);
+
+    alter table j3_overview_doc 
+        add index FK5CD8D0E8C5BF8903 (entity_key), 
+        add constraint FK5CD8D0E8C5BF8903 
+        foreign key (entity_key) 
+        references j3_tmodel (entity_key);
+
+    alter table j3_overview_doc 
+        add index FK5CD8D0E8E8CE1B36 (tomodel_instance_info_id), 
+        add constraint FK5CD8D0E8E8CE1B36 
+        foreign key (tomodel_instance_info_id) 
+        references j3_tmodel_instance_info (id);
+
+    alter table j3_overview_doc_descr 
+        add index FK36FB9EA9BDC711C (overview_doc_id), 
+        add constraint FK36FB9EA9BDC711C 
+        foreign key (overview_doc_id) 
+        references j3_overview_doc (id);
+
+    alter table j3_person_name 
+        add index FKCB7B8AFF2E3FD94F (contact_id), 
+        add constraint FKCB7B8AFF2E3FD94F 
+        foreign key (contact_id) 
+        references j3_contact (id);
+
+    alter table j3_phone 
+        add index FK359202B82E3FD94F (contact_id), 
+        add constraint FK359202B82E3FD94F 
+        foreign key (contact_id) 
+        references j3_contact (id);
+
+    alter table j3_publisher_assertion 
+        add index FK8A102449E3544929 (to_key), 
+        add constraint FK8A102449E3544929 
+        foreign key (to_key) 
+        references j3_business_entity (entity_key);
+
+    alter table j3_publisher_assertion 
+        add index FK8A102449CCEE22D8 (from_key), 
+        add constraint FK8A102449CCEE22D8 
+        foreign key (from_key) 
+        references j3_business_entity (entity_key);
+
+    alter table j3_service_category_bag 
+        add index FK185A68076A68D45A (id), 
+        add constraint FK185A68076A68D45A 
+        foreign key (id) 
+        references j3_category_bag (id);
+
+    alter table j3_service_category_bag 
+        add index FK185A680748D0656D (entity_key), 
+        add constraint FK185A680748D0656D 
+        foreign key (entity_key) 
+        references j3_business_service (entity_key);
+
+    alter table j3_service_descr 
+        add index FKB6D63D4148D0656D (entity_key), 
+        add constraint FKB6D63D4148D0656D 
+        foreign key (entity_key) 
+        references j3_business_service (entity_key);
+
+    alter table j3_service_name 
+        add index FKCC1BE94B48D0656D (entity_key), 
+        add constraint FKCC1BE94B48D0656D 
+        foreign key (entity_key) 
+        references j3_business_service (entity_key);
+
+    alter table j3_service_projection 
+        add index FK629F290F2E448F3F (service_key), 
+        add constraint FK629F290F2E448F3F 
+        foreign key (service_key) 
+        references j3_business_service (entity_key);
+
+    alter table j3_service_projection 
+        add index FK629F290FEF04CFEE (business_key), 
+        add constraint FK629F290FEF04CFEE 
+        foreign key (business_key) 
+        references j3_business_entity (entity_key);
+
+    alter table j3_subscription_match 
+        add index FK5B9C2F19BEEE42E5 (subscription_key), 
+        add constraint FK5B9C2F19BEEE42E5 
+        foreign key (subscription_key) 
+        references j3_subscription (subscription_key);
+
+    alter table j3_tmodel 
+        add index FK83C8072BD1823CA5 (entity_key), 
+        add constraint FK83C8072BD1823CA5 
+        foreign key (entity_key) 
+        references j3_uddi_entity (entity_key);
+
+    alter table j3_tmodel_category_bag 
+        add index FK7E0859DB6A68D45A (id), 
+        add constraint FK7E0859DB6A68D45A 
+        foreign key (id) 
+        references j3_category_bag (id);
+
+    alter table j3_tmodel_category_bag 
+        add index FK7E0859DBC5BF8903 (entity_key), 
+        add constraint FK7E0859DBC5BF8903 
+        foreign key (entity_key) 
+        references j3_tmodel (entity_key);
+
+    alter table j3_tmodel_descr 
+        add index FK63DFF1EDC5BF8903 (entity_key), 
+        add constraint FK63DFF1EDC5BF8903 
+        foreign key (entity_key) 
+        references j3_tmodel (entity_key);
+
+    alter table j3_tmodel_identifier 
+        add index FKD5FB623DC5BF8903 (entity_key), 
+        add constraint FKD5FB623DC5BF8903 
+        foreign key (entity_key) 
+        references j3_tmodel (entity_key);
+
+    alter table j3_tmodel_instance_info 
+        add index FKDC6C9004CFBD88B7 (entity_key), 
+        add constraint FKDC6C9004CFBD88B7 
+        foreign key (entity_key) 
+        references j3_binding_template (entity_key);
+
+    alter table j3_tmodel_instance_info_descr 
+        add index FKD826B4062B115C6F (tmodel_instance_info_id), 
+        add constraint FKD826B4062B115C6F 
+        foreign key (tmodel_instance_info_id) 
+        references j3_tmodel_instance_info (id);
+
+    alter table j3_transfer_token_keys 
+        add index FK8BBF49185ED9DD48 (transfer_token), 
+        add constraint FK8BBF49185ED9DD48 
+        foreign key (transfer_token) 
+        references j3_transfer_token (transfer_token);

Copied: labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/oracle9 (from rev 33044, labs/jbossesb/tags/JBESB_4_7_CP2_ER2/product/install/jUDDI-registryV3/juddi-sql/oracle9)

Deleted: labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/oracle9/import.sql
===================================================================
--- labs/jbossesb/tags/JBESB_4_7_CP2_ER2/product/install/jUDDI-registryV3/juddi-sql/oracle9/import.sql	2010-05-24 14:43:21 UTC (rev 33044)
+++ labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/oracle9/import.sql	2010-05-24 16:38:08 UTC (rev 33050)
@@ -1,631 +0,0 @@
-
-    create table j3_address (
-        id number(19,0) not null,
-        sort_code varchar2(10 char),
-        tmodel_key varchar2(255 char),
-        use_type varchar2(255 char),
-        address_id number(19,0) not null,
-        primary key (id)
-    );
-
-    create table j3_address_line (
-        id number(19,0) not null,
-        key_name varchar2(255 char),
-        key_value varchar2(255 char),
-        line varchar2(80 char) not null,
-        address_id number(19,0) not null,
-        primary key (id)
-    );
-
-    create table j3_auth_token (
-        auth_token varchar2(51 char) not null,
-        authorized_name varchar2(255 char) not null,
-        created timestamp not null,
-        last_used timestamp not null,
-        number_of_uses number(10,0) not null,
-        token_state number(10,0) not null,
-        primary key (auth_token)
-    );
-
-    create table j3_binding_category_bag (
-        id number(19,0) not null,
-        entity_key varchar2(255 char) not null,
-        primary key (id),
-        unique (entity_key)
-    );
-
-    create table j3_binding_descr (
-        id number(19,0) not null,
-        descr varchar2(1024 char) not null,
-        lang_code varchar2(5 char),
-        entity_key varchar2(255 char) not null,
-        primary key (id)
-    );
-
-    create table j3_binding_template (
-        access_point_type varchar2(255 char),
-        access_point_url varchar2(4000 char),
-        hosting_redirector varchar2(255 char),
-        entity_key varchar2(255 char) not null,
-        service_key varchar2(255 char) not null,
-        primary key (entity_key)
-    );
-
-    create table j3_business_category_bag (
-        id number(19,0) not null,
-        entity_key varchar2(255 char) not null,
-        primary key (id),
-        unique (entity_key)
-    );
-
-    create table j3_business_descr (
-        id number(19,0) not null,
-        descr varchar2(1024 char) not null,
-        lang_code varchar2(5 char),
-        entity_key varchar2(255 char) not null,
-        primary key (id)
-    );
-
-    create table j3_business_entity (
-        entity_key varchar2(255 char) not null,
-        primary key (entity_key)
-    );
-
-    create table j3_business_identifier (
-        id number(19,0) not null,
-        key_name varchar2(255 char),
-        key_value varchar2(255 char) not null,
-        tmodel_key_ref varchar2(255 char),
-        entity_key varchar2(255 char) not null,
-        primary key (id)
-    );
-
-    create table j3_business_name (
-        id number(19,0) not null,
-        lang_code varchar2(5 char),
-        name varchar2(255 char) not null,
-        entity_key varchar2(255 char) not null,
-        primary key (id)
-    );
-
-    create table j3_business_service (
-        entity_key varchar2(255 char) not null,
-        business_key varchar2(255 char) not null,
-        primary key (entity_key)
-    );
-
-    create table j3_category_bag (
-        id number(19,0) not null,
-        primary key (id)
-    );
-
-    create table j3_clerk (
-        clerk_name varchar2(255 char) not null,
-        cred varchar2(255 char),
-        publisher_id varchar2(255 char) not null,
-        node_name varchar2(255 char),
-        primary key (clerk_name)
-    );
-
-    create table j3_client_subscriptioninfo (
-        subscription_key varchar2(255 char) not null,
-        last_notified timestamp,
-        fromClerk_clerk_name varchar2(255 char),
-        toClerk_clerk_name varchar2(255 char),
-        primary key (subscription_key)
-    );
-
-    create table j3_contact (
-        id number(19,0) not null,
-        use_type varchar2(255 char),
-        entity_key varchar2(255 char) not null,
-        primary key (id)
-    );
-
-    create table j3_contact_descr (
-        id number(19,0) not null,
-        descr varchar2(1024 char) not null,
-        lang_code varchar2(5 char),
-        contact_id number(19,0) not null,
-        primary key (id)
-    );
-
-    create table j3_discovery_url (
-        id number(19,0) not null,
-        url varchar2(255 char) not null,
-        use_type varchar2(255 char) not null,
-        entity_key varchar2(255 char) not null,
-        primary key (id)
-    );
-
-    create table j3_email (
-        id number(19,0) not null,
-        email_address varchar2(255 char) not null,
-        use_type varchar2(255 char),
-        contact_id number(19,0) not null,
-        primary key (id)
-    );
-
-    create table j3_instance_details_descr (
-        id number(19,0) not null,
-        descr varchar2(1024 char) not null,
-        lang_code varchar2(5 char),
-        tmodel_instance_info_id number(19,0) not null,
-        primary key (id)
-    );
-
-    create table j3_instance_details_doc_descr (
-        id number(19,0) not null,
-        descr varchar2(1024 char) not null,
-        lang_code varchar2(5 char),
-        tmodel_instance_info_id number(19,0) not null,
-        primary key (id)
-    );
-
-    create table j3_keyed_reference (
-        id number(19,0) not null,
-        key_name varchar2(255 char),
-        key_value varchar2(255 char) not null,
-        tmodel_key_ref varchar2(255 char),
-        category_bag_id number(19,0),
-        keyed_reference_group_id number(19,0),
-        primary key (id)
-    );
-
-    create table j3_keyed_reference_group (
-        id number(19,0) not null,
-        tmodel_key varchar2(255 char),
-        category_bag_id number(19,0) not null,
-        primary key (id)
-    );
-
-    create table j3_node (
-        name varchar2(255 char) not null,
-        custody_transfer_url varchar2(255 char) not null,
-        factory_initial varchar2(255 char),
-        factory_naming_provider varchar2(255 char),
-        factory_url_pkgs varchar2(255 char),
-        inquiry_url varchar2(255 char) not null,
-        juddi_api_url varchar2(255 char),
-        manager_name varchar2(255 char) not null,
-        proxy_transport varchar2(255 char) not null,
-        publish_url varchar2(255 char) not null,
-        security_url varchar2(255 char) not null,
-        subscription_url varchar2(255 char) not null,
-        primary key (name)
-    );
-
-    create table j3_overview_doc (
-        id number(19,0) not null,
-        overview_url varchar2(255 char) not null,
-        overview_url_use_type varchar2(255 char),
-        entity_key varchar2(255 char),
-        tomodel_instance_info_id number(19,0),
-        primary key (id)
-    );
-
-    create table j3_overview_doc_descr (
-        id number(19,0) not null,
-        descr varchar2(1024 char) not null,
-        lang_code varchar2(5 char),
-        overview_doc_id number(19,0),
-        primary key (id)
-    );
-
-    create table j3_person_name (
-        id number(19,0) not null,
-        lang_code varchar2(5 char),
-        name varchar2(255 char) not null,
-        contact_id number(19,0) not null,
-        primary key (id)
-    );
-
-    create table j3_phone (
-        id number(19,0) not null,
-        phone_number varchar2(50 char) not null,
-        use_type varchar2(255 char),
-        contact_id number(19,0) not null,
-        primary key (id)
-    );
-
-    create table j3_publisher (
-        authorized_name varchar2(255 char) not null,
-        email_address varchar2(255 char),
-        is_admin varchar2(5 char),
-        is_enabled varchar2(5 char),
-        max_bindings_per_service number(10,0),
-        max_businesses number(10,0),
-        max_services_per_business number(10,0),
-        max_tmodels number(10,0),
-        publisher_name varchar2(255 char) not null,
-        primary key (authorized_name)
-    );
-
-    create table j3_publisher_assertion (
-        from_key varchar2(255 char) not null,
-        to_key varchar2(255 char) not null,
-        from_check varchar2(5 char) not null,
-        key_name varchar2(255 char) not null,
-        key_value varchar2(255 char) not null,
-        tmodel_key varchar2(255 char) not null,
-        to_check varchar2(5 char) not null,
-        primary key (from_key, to_key)
-    );
-
-    create table j3_service_category_bag (
-        id number(19,0) not null,
-        entity_key varchar2(255 char) not null,
-        primary key (id),
-        unique (entity_key)
-    );
-
-    create table j3_service_descr (
-        id number(19,0) not null,
-        descr varchar2(1024 char) not null,
-        lang_code varchar2(5 char),
-        entity_key varchar2(255 char) not null,
-        primary key (id)
-    );
-
-    create table j3_service_name (
-        id number(19,0) not null,
-        lang_code varchar2(5 char),
-        name varchar2(255 char) not null,
-        entity_key varchar2(255 char) not null,
-        primary key (id)
-    );
-
-    create table j3_service_projection (
-        business_key varchar2(255 char) not null,
-        service_key varchar2(255 char) not null,
-        primary key (business_key, service_key)
-    );
-
-    create table j3_subscription (
-        subscription_key varchar2(255 char) not null,
-        authorized_name varchar2(255 char) not null,
-        binding_key varchar2(255 char),
-        brief number(1,0),
-        create_date timestamp not null,
-        expires_after timestamp,
-        last_notified timestamp,
-        max_entities number(10,0),
-        notification_interval varchar2(255 char),
-        subscription_filter clob not null,
-        primary key (subscription_key)
-    );
-
-    create table j3_subscription_chunk_token (
-        chunk_token varchar2(255 char) not null,
-        data number(10,0) not null,
-        end_point timestamp,
-        expires_after timestamp not null,
-        start_point timestamp,
-        subscription_key varchar2(255 char) not null,
-        primary key (chunk_token)
-    );
-
-    create table j3_subscription_match (
-        id number(19,0) not null,
-        entity_key varchar2(255 char) not null,
-        subscription_key varchar2(255 char) not null,
-        primary key (id)
-    );
-
-    create table j3_tmodel (
-        deleted number(1,0),
-        lang_code varchar2(5 char),
-        name varchar2(255 char) not null,
-        entity_key varchar2(255 char) not null,
-        primary key (entity_key)
-    );
-
-    create table j3_tmodel_category_bag (
-        id number(19,0) not null,
-        entity_key varchar2(255 char) not null,
-        primary key (id),
-        unique (entity_key)
-    );
-
-    create table j3_tmodel_descr (
-        id number(19,0) not null,
-        descr varchar2(1024 char) not null,
-        lang_code varchar2(5 char),
-        entity_key varchar2(255 char) not null,
-        primary key (id)
-    );
-
-    create table j3_tmodel_identifier (
-        id number(19,0) not null,
-        key_name varchar2(255 char),
-        key_value varchar2(255 char) not null,
-        tmodel_key_ref varchar2(255 char),
-        entity_key varchar2(255 char) not null,
-        primary key (id)
-    );
-
-    create table j3_tmodel_instance_info (
-        id number(19,0) not null,
-        instance_parms varchar2(512 char),
-        tmodel_key varchar2(255 char) not null,
-        entity_key varchar2(255 char) not null,
-        primary key (id)
-    );
-
-    create table j3_tmodel_instance_info_descr (
-        id number(19,0) not null,
-        descr varchar2(1024 char) not null,
-        lang_code varchar2(5 char),
-        tmodel_instance_info_id number(19,0) not null,
-        primary key (id)
-    );
-
-    create table j3_transfer_token (
-        transfer_token varchar2(51 char) not null,
-        expiration_date timestamp not null,
-        primary key (transfer_token)
-    );
-
-    create table j3_transfer_token_keys (
-        id number(19,0) not null,
-        entity_key varchar2(255 char),
-        transfer_token varchar2(51 char) not null,
-        primary key (id)
-    );
-
-    create table j3_uddi_entity (
-        entity_key varchar2(255 char) not null,
-        authorized_name varchar2(255 char) not null,
-        created timestamp,
-        modified timestamp not null,
-        modified_including_children timestamp,
-        node_id varchar2(255 char),
-        primary key (entity_key)
-    );
-
-    alter table j3_address 
-        add constraint FKF83236BE75D860FB 
-        foreign key (address_id) 
-        references j3_contact;
-
-    alter table j3_address_line 
-        add constraint FKC665B8D5F8B8D8CF 
-        foreign key (address_id) 
-        references j3_address;
-
-    alter table j3_binding_category_bag 
-        add constraint FKCF34B2376A68D45A 
-        foreign key (id) 
-        references j3_category_bag;
-
-    alter table j3_binding_category_bag 
-        add constraint FKCF34B237CFBD88B7 
-        foreign key (entity_key) 
-        references j3_binding_template;
-
-    alter table j3_binding_descr 
-        add constraint FK5EA60911CFBD88B7 
-        foreign key (entity_key) 
-        references j3_binding_template;
-
-    alter table j3_binding_template 
-        add constraint FKD044BD6A2E448F3F 
-        foreign key (service_key) 
-        references j3_business_service;
-
-    alter table j3_binding_template 
-        add constraint FKD044BD6AD1823CA5 
-        foreign key (entity_key) 
-        references j3_uddi_entity;
-
-    alter table j3_business_category_bag 
-        add constraint FKD6D3ECB06A68D45A 
-        foreign key (id) 
-        references j3_category_bag;
-
-    alter table j3_business_category_bag 
-        add constraint FKD6D3ECB0BEB92A91 
-        foreign key (entity_key) 
-        references j3_business_entity;
-
-    alter table j3_business_descr 
-        add constraint FK3A24B4B8BEB92A91 
-        foreign key (entity_key) 
-        references j3_business_entity;
-
-    alter table j3_business_entity 
-        add constraint FKCA61A0CD1823CA5 
-        foreign key (entity_key) 
-        references j3_uddi_entity;
-
-    alter table j3_business_identifier 
-        add constraint FKB0C7A652BEB92A91 
-        foreign key (entity_key) 
-        references j3_business_entity;
-
-    alter table j3_business_name 
-        add constraint FK43F526F4BEB92A91 
-        foreign key (entity_key) 
-        references j3_business_entity;
-
-    alter table j3_business_service 
-        add constraint FK5D4255ACD1823CA5 
-        foreign key (entity_key) 
-        references j3_uddi_entity;
-
-    alter table j3_business_service 
-        add constraint FK5D4255ACEF04CFEE 
-        foreign key (business_key) 
-        references j3_business_entity;
-
-    alter table j3_clerk 
-        add constraint FK34DC7D9F6BB0F935 
-        foreign key (node_name) 
-        references j3_node;
-
-    alter table j3_client_subscriptioninfo 
-        add constraint FKDF04CC095BFC6733 
-        foreign key (fromClerk_clerk_name) 
-        references j3_clerk;
-
-    alter table j3_client_subscriptioninfo 
-        add constraint FKDF04CC09F3CE9C04 
-        foreign key (toClerk_clerk_name) 
-        references j3_clerk;
-
-    alter table j3_contact 
-        add constraint FK7551BEEABEB92A91 
-        foreign key (entity_key) 
-        references j3_business_entity;
-
-    alter table j3_contact_descr 
-        add constraint FK56CA9E6C2E3FD94F 
-        foreign key (contact_id) 
-        references j3_contact;
-
-    alter table j3_discovery_url 
-        add constraint FKA042FDAABEB92A91 
-        foreign key (entity_key) 
-        references j3_business_entity;
-
-    alter table j3_email 
-        add constraint FK34F910E62E3FD94F 
-        foreign key (contact_id) 
-        references j3_contact;
-
-    alter table j3_instance_details_descr 
-        add constraint FK3CC165902B115C6F 
-        foreign key (tmodel_instance_info_id) 
-        references j3_tmodel_instance_info;
-
-    alter table j3_instance_details_doc_descr 
-        add constraint FK447324492B115C6F 
-        foreign key (tmodel_instance_info_id) 
-        references j3_tmodel_instance_info;
-
-    alter table j3_keyed_reference 
-        add constraint FK350C8454E075C8D7 
-        foreign key (keyed_reference_group_id) 
-        references j3_keyed_reference_group;
-
-    alter table j3_keyed_reference 
-        add constraint FK350C84541DB72652 
-        foreign key (category_bag_id) 
-        references j3_category_bag;
-
-    alter table j3_keyed_reference_group 
-        add constraint FKF6224ED41DB72652 
-        foreign key (category_bag_id) 
-        references j3_category_bag;
-
-    alter table j3_overview_doc 
-        add constraint FK5CD8D0E8C5BF8903 
-        foreign key (entity_key) 
-        references j3_tmodel;
-
-    alter table j3_overview_doc 
-        add constraint FK5CD8D0E8E8CE1B36 
-        foreign key (tomodel_instance_info_id) 
-        references j3_tmodel_instance_info;
-
-    alter table j3_overview_doc_descr 
-        add constraint FK36FB9EA9BDC711C 
-        foreign key (overview_doc_id) 
-        references j3_overview_doc;
-
-    alter table j3_person_name 
-        add constraint FKCB7B8AFF2E3FD94F 
-        foreign key (contact_id) 
-        references j3_contact;
-
-    alter table j3_phone 
-        add constraint FK359202B82E3FD94F 
-        foreign key (contact_id) 
-        references j3_contact;
-
-    alter table j3_publisher_assertion 
-        add constraint FK8A102449E3544929 
-        foreign key (to_key) 
-        references j3_business_entity;
-
-    alter table j3_publisher_assertion 
-        add constraint FK8A102449CCEE22D8 
-        foreign key (from_key) 
-        references j3_business_entity;
-
-    alter table j3_service_category_bag 
-        add constraint FK185A68076A68D45A 
-        foreign key (id) 
-        references j3_category_bag;
-
-    alter table j3_service_category_bag 
-        add constraint FK185A680748D0656D 
-        foreign key (entity_key) 
-        references j3_business_service;
-
-    alter table j3_service_descr 
-        add constraint FKB6D63D4148D0656D 
-        foreign key (entity_key) 
-        references j3_business_service;
-
-    alter table j3_service_name 
-        add constraint FKCC1BE94B48D0656D 
-        foreign key (entity_key) 
-        references j3_business_service;
-
-    alter table j3_service_projection 
-        add constraint FK629F290F2E448F3F 
-        foreign key (service_key) 
-        references j3_business_service;
-
-    alter table j3_service_projection 
-        add constraint FK629F290FEF04CFEE 
-        foreign key (business_key) 
-        references j3_business_entity;
-
-    alter table j3_subscription_match 
-        add constraint FK5B9C2F19BEEE42E5 
-        foreign key (subscription_key) 
-        references j3_subscription;
-
-    alter table j3_tmodel 
-        add constraint FK83C8072BD1823CA5 
-        foreign key (entity_key) 
-        references j3_uddi_entity;
-
-    alter table j3_tmodel_category_bag 
-        add constraint FK7E0859DB6A68D45A 
-        foreign key (id) 
-        references j3_category_bag;
-
-    alter table j3_tmodel_category_bag 
-        add constraint FK7E0859DBC5BF8903 
-        foreign key (entity_key) 
-        references j3_tmodel;
-
-    alter table j3_tmodel_descr 
-        add constraint FK63DFF1EDC5BF8903 
-        foreign key (entity_key) 
-        references j3_tmodel;
-
-    alter table j3_tmodel_identifier 
-        add constraint FKD5FB623DC5BF8903 
-        foreign key (entity_key) 
-        references j3_tmodel;
-
-    alter table j3_tmodel_instance_info 
-        add constraint FKDC6C9004CFBD88B7 
-        foreign key (entity_key) 
-        references j3_binding_template;
-
-    alter table j3_tmodel_instance_info_descr 
-        add constraint FKD826B4062B115C6F 
-        foreign key (tmodel_instance_info_id) 
-        references j3_tmodel_instance_info;
-
-    alter table j3_transfer_token_keys 
-        add constraint FK8BBF49185ED9DD48 
-        foreign key (transfer_token) 
-        references j3_transfer_token;
-
-    create sequence juddi_sequence;

Copied: labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/oracle9/import.sql (from rev 33044, labs/jbossesb/tags/JBESB_4_7_CP2_ER2/product/install/jUDDI-registryV3/juddi-sql/oracle9/import.sql)
===================================================================
--- labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/oracle9/import.sql	                        (rev 0)
+++ labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/oracle9/import.sql	2010-05-24 16:38:08 UTC (rev 33050)
@@ -0,0 +1,631 @@
+
+    create table j3_address (
+        id number(19,0) not null,
+        sort_code varchar2(10 char),
+        tmodel_key varchar2(255 char),
+        use_type varchar2(255 char),
+        address_id number(19,0) not null,
+        primary key (id)
+    );
+
+    create table j3_address_line (
+        id number(19,0) not null,
+        key_name varchar2(255 char),
+        key_value varchar2(255 char),
+        line varchar2(80 char) not null,
+        address_id number(19,0) not null,
+        primary key (id)
+    );
+
+    create table j3_auth_token (
+        auth_token varchar2(51 char) not null,
+        authorized_name varchar2(255 char) not null,
+        created timestamp not null,
+        last_used timestamp not null,
+        number_of_uses number(10,0) not null,
+        token_state number(10,0) not null,
+        primary key (auth_token)
+    );
+
+    create table j3_binding_category_bag (
+        id number(19,0) not null,
+        entity_key varchar2(255 char) not null,
+        primary key (id),
+        unique (entity_key)
+    );
+
+    create table j3_binding_descr (
+        id number(19,0) not null,
+        descr varchar2(1024 char) not null,
+        lang_code varchar2(5 char),
+        entity_key varchar2(255 char) not null,
+        primary key (id)
+    );
+
+    create table j3_binding_template (
+        access_point_type varchar2(255 char),
+        access_point_url varchar2(4000 char),
+        hosting_redirector varchar2(255 char),
+        entity_key varchar2(255 char) not null,
+        service_key varchar2(255 char) not null,
+        primary key (entity_key)
+    );
+
+    create table j3_business_category_bag (
+        id number(19,0) not null,
+        entity_key varchar2(255 char) not null,
+        primary key (id),
+        unique (entity_key)
+    );
+
+    create table j3_business_descr (
+        id number(19,0) not null,
+        descr varchar2(1024 char) not null,
+        lang_code varchar2(5 char),
+        entity_key varchar2(255 char) not null,
+        primary key (id)
+    );
+
+    create table j3_business_entity (
+        entity_key varchar2(255 char) not null,
+        primary key (entity_key)
+    );
+
+    create table j3_business_identifier (
+        id number(19,0) not null,
+        key_name varchar2(255 char),
+        key_value varchar2(255 char) not null,
+        tmodel_key_ref varchar2(255 char),
+        entity_key varchar2(255 char) not null,
+        primary key (id)
+    );
+
+    create table j3_business_name (
+        id number(19,0) not null,
+        lang_code varchar2(5 char),
+        name varchar2(255 char) not null,
+        entity_key varchar2(255 char) not null,
+        primary key (id)
+    );
+
+    create table j3_business_service (
+        entity_key varchar2(255 char) not null,
+        business_key varchar2(255 char) not null,
+        primary key (entity_key)
+    );
+
+    create table j3_category_bag (
+        id number(19,0) not null,
+        primary key (id)
+    );
+
+    create table j3_clerk (
+        clerk_name varchar2(255 char) not null,
+        cred varchar2(255 char),
+        publisher_id varchar2(255 char) not null,
+        node_name varchar2(255 char),
+        primary key (clerk_name)
+    );
+
+    create table j3_client_subscriptioninfo (
+        subscription_key varchar2(255 char) not null,
+        last_notified timestamp,
+        fromClerk_clerk_name varchar2(255 char),
+        toClerk_clerk_name varchar2(255 char),
+        primary key (subscription_key)
+    );
+
+    create table j3_contact (
+        id number(19,0) not null,
+        use_type varchar2(255 char),
+        entity_key varchar2(255 char) not null,
+        primary key (id)
+    );
+
+    create table j3_contact_descr (
+        id number(19,0) not null,
+        descr varchar2(1024 char) not null,
+        lang_code varchar2(5 char),
+        contact_id number(19,0) not null,
+        primary key (id)
+    );
+
+    create table j3_discovery_url (
+        id number(19,0) not null,
+        url varchar2(255 char) not null,
+        use_type varchar2(255 char) not null,
+        entity_key varchar2(255 char) not null,
+        primary key (id)
+    );
+
+    create table j3_email (
+        id number(19,0) not null,
+        email_address varchar2(255 char) not null,
+        use_type varchar2(255 char),
+        contact_id number(19,0) not null,
+        primary key (id)
+    );
+
+    create table j3_instance_details_descr (
+        id number(19,0) not null,
+        descr varchar2(1024 char) not null,
+        lang_code varchar2(5 char),
+        tmodel_instance_info_id number(19,0) not null,
+        primary key (id)
+    );
+
+    create table j3_instance_details_doc_descr (
+        id number(19,0) not null,
+        descr varchar2(1024 char) not null,
+        lang_code varchar2(5 char),
+        tmodel_instance_info_id number(19,0) not null,
+        primary key (id)
+    );
+
+    create table j3_keyed_reference (
+        id number(19,0) not null,
+        key_name varchar2(255 char),
+        key_value varchar2(255 char) not null,
+        tmodel_key_ref varchar2(255 char),
+        category_bag_id number(19,0),
+        keyed_reference_group_id number(19,0),
+        primary key (id)
+    );
+
+    create table j3_keyed_reference_group (
+        id number(19,0) not null,
+        tmodel_key varchar2(255 char),
+        category_bag_id number(19,0) not null,
+        primary key (id)
+    );
+
+    create table j3_node (
+        name varchar2(255 char) not null,
+        custody_transfer_url varchar2(255 char) not null,
+        factory_initial varchar2(255 char),
+        factory_naming_provider varchar2(255 char),
+        factory_url_pkgs varchar2(255 char),
+        inquiry_url varchar2(255 char) not null,
+        juddi_api_url varchar2(255 char),
+        manager_name varchar2(255 char) not null,
+        proxy_transport varchar2(255 char) not null,
+        publish_url varchar2(255 char) not null,
+        security_url varchar2(255 char) not null,
+        subscription_url varchar2(255 char) not null,
+        primary key (name)
+    );
+
+    create table j3_overview_doc (
+        id number(19,0) not null,
+        overview_url varchar2(255 char) not null,
+        overview_url_use_type varchar2(255 char),
+        entity_key varchar2(255 char),
+        tomodel_instance_info_id number(19,0),
+        primary key (id)
+    );
+
+    create table j3_overview_doc_descr (
+        id number(19,0) not null,
+        descr varchar2(1024 char) not null,
+        lang_code varchar2(5 char),
+        overview_doc_id number(19,0),
+        primary key (id)
+    );
+
+    create table j3_person_name (
+        id number(19,0) not null,
+        lang_code varchar2(5 char),
+        name varchar2(255 char) not null,
+        contact_id number(19,0) not null,
+        primary key (id)
+    );
+
+    create table j3_phone (
+        id number(19,0) not null,
+        phone_number varchar2(50 char) not null,
+        use_type varchar2(255 char),
+        contact_id number(19,0) not null,
+        primary key (id)
+    );
+
+    create table j3_publisher (
+        authorized_name varchar2(255 char) not null,
+        email_address varchar2(255 char),
+        is_admin varchar2(5 char),
+        is_enabled varchar2(5 char),
+        max_bindings_per_service number(10,0),
+        max_businesses number(10,0),
+        max_services_per_business number(10,0),
+        max_tmodels number(10,0),
+        publisher_name varchar2(255 char) not null,
+        primary key (authorized_name)
+    );
+
+    create table j3_publisher_assertion (
+        from_key varchar2(255 char) not null,
+        to_key varchar2(255 char) not null,
+        from_check varchar2(5 char) not null,
+        key_name varchar2(255 char) not null,
+        key_value varchar2(255 char) not null,
+        tmodel_key varchar2(255 char) not null,
+        to_check varchar2(5 char) not null,
+        primary key (from_key, to_key)
+    );
+
+    create table j3_service_category_bag (
+        id number(19,0) not null,
+        entity_key varchar2(255 char) not null,
+        primary key (id),
+        unique (entity_key)
+    );
+
+    create table j3_service_descr (
+        id number(19,0) not null,
+        descr varchar2(1024 char) not null,
+        lang_code varchar2(5 char),
+        entity_key varchar2(255 char) not null,
+        primary key (id)
+    );
+
+    create table j3_service_name (
+        id number(19,0) not null,
+        lang_code varchar2(5 char),
+        name varchar2(255 char) not null,
+        entity_key varchar2(255 char) not null,
+        primary key (id)
+    );
+
+    create table j3_service_projection (
+        business_key varchar2(255 char) not null,
+        service_key varchar2(255 char) not null,
+        primary key (business_key, service_key)
+    );
+
+    create table j3_subscription (
+        subscription_key varchar2(255 char) not null,
+        authorized_name varchar2(255 char) not null,
+        binding_key varchar2(255 char),
+        brief number(1,0),
+        create_date timestamp not null,
+        expires_after timestamp,
+        last_notified timestamp,
+        max_entities number(10,0),
+        notification_interval varchar2(255 char),
+        subscription_filter clob not null,
+        primary key (subscription_key)
+    );
+
+    create table j3_subscription_chunk_token (
+        chunk_token varchar2(255 char) not null,
+        data number(10,0) not null,
+        end_point timestamp,
+        expires_after timestamp not null,
+        start_point timestamp,
+        subscription_key varchar2(255 char) not null,
+        primary key (chunk_token)
+    );
+
+    create table j3_subscription_match (
+        id number(19,0) not null,
+        entity_key varchar2(255 char) not null,
+        subscription_key varchar2(255 char) not null,
+        primary key (id)
+    );
+
+    create table j3_tmodel (
+        deleted number(1,0),
+        lang_code varchar2(5 char),
+        name varchar2(255 char) not null,
+        entity_key varchar2(255 char) not null,
+        primary key (entity_key)
+    );
+
+    create table j3_tmodel_category_bag (
+        id number(19,0) not null,
+        entity_key varchar2(255 char) not null,
+        primary key (id),
+        unique (entity_key)
+    );
+
+    create table j3_tmodel_descr (
+        id number(19,0) not null,
+        descr varchar2(1024 char) not null,
+        lang_code varchar2(5 char),
+        entity_key varchar2(255 char) not null,
+        primary key (id)
+    );
+
+    create table j3_tmodel_identifier (
+        id number(19,0) not null,
+        key_name varchar2(255 char),
+        key_value varchar2(255 char) not null,
+        tmodel_key_ref varchar2(255 char),
+        entity_key varchar2(255 char) not null,
+        primary key (id)
+    );
+
+    create table j3_tmodel_instance_info (
+        id number(19,0) not null,
+        instance_parms varchar2(512 char),
+        tmodel_key varchar2(255 char) not null,
+        entity_key varchar2(255 char) not null,
+        primary key (id)
+    );
+
+    create table j3_tmodel_instance_info_descr (
+        id number(19,0) not null,
+        descr varchar2(1024 char) not null,
+        lang_code varchar2(5 char),
+        tmodel_instance_info_id number(19,0) not null,
+        primary key (id)
+    );
+
+    create table j3_transfer_token (
+        transfer_token varchar2(51 char) not null,
+        expiration_date timestamp not null,
+        primary key (transfer_token)
+    );
+
+    create table j3_transfer_token_keys (
+        id number(19,0) not null,
+        entity_key varchar2(255 char),
+        transfer_token varchar2(51 char) not null,
+        primary key (id)
+    );
+
+    create table j3_uddi_entity (
+        entity_key varchar2(255 char) not null,
+        authorized_name varchar2(255 char) not null,
+        created timestamp,
+        modified timestamp not null,
+        modified_including_children timestamp,
+        node_id varchar2(255 char),
+        primary key (entity_key)
+    );
+
+    alter table j3_address 
+        add constraint FKF83236BE75D860FB 
+        foreign key (address_id) 
+        references j3_contact;
+
+    alter table j3_address_line 
+        add constraint FKC665B8D5F8B8D8CF 
+        foreign key (address_id) 
+        references j3_address;
+
+    alter table j3_binding_category_bag 
+        add constraint FKCF34B2376A68D45A 
+        foreign key (id) 
+        references j3_category_bag;
+
+    alter table j3_binding_category_bag 
+        add constraint FKCF34B237CFBD88B7 
+        foreign key (entity_key) 
+        references j3_binding_template;
+
+    alter table j3_binding_descr 
+        add constraint FK5EA60911CFBD88B7 
+        foreign key (entity_key) 
+        references j3_binding_template;
+
+    alter table j3_binding_template 
+        add constraint FKD044BD6A2E448F3F 
+        foreign key (service_key) 
+        references j3_business_service;
+
+    alter table j3_binding_template 
+        add constraint FKD044BD6AD1823CA5 
+        foreign key (entity_key) 
+        references j3_uddi_entity;
+
+    alter table j3_business_category_bag 
+        add constraint FKD6D3ECB06A68D45A 
+        foreign key (id) 
+        references j3_category_bag;
+
+    alter table j3_business_category_bag 
+        add constraint FKD6D3ECB0BEB92A91 
+        foreign key (entity_key) 
+        references j3_business_entity;
+
+    alter table j3_business_descr 
+        add constraint FK3A24B4B8BEB92A91 
+        foreign key (entity_key) 
+        references j3_business_entity;
+
+    alter table j3_business_entity 
+        add constraint FKCA61A0CD1823CA5 
+        foreign key (entity_key) 
+        references j3_uddi_entity;
+
+    alter table j3_business_identifier 
+        add constraint FKB0C7A652BEB92A91 
+        foreign key (entity_key) 
+        references j3_business_entity;
+
+    alter table j3_business_name 
+        add constraint FK43F526F4BEB92A91 
+        foreign key (entity_key) 
+        references j3_business_entity;
+
+    alter table j3_business_service 
+        add constraint FK5D4255ACD1823CA5 
+        foreign key (entity_key) 
+        references j3_uddi_entity;
+
+    alter table j3_business_service 
+        add constraint FK5D4255ACEF04CFEE 
+        foreign key (business_key) 
+        references j3_business_entity;
+
+    alter table j3_clerk 
+        add constraint FK34DC7D9F6BB0F935 
+        foreign key (node_name) 
+        references j3_node;
+
+    alter table j3_client_subscriptioninfo 
+        add constraint FKDF04CC095BFC6733 
+        foreign key (fromClerk_clerk_name) 
+        references j3_clerk;
+
+    alter table j3_client_subscriptioninfo 
+        add constraint FKDF04CC09F3CE9C04 
+        foreign key (toClerk_clerk_name) 
+        references j3_clerk;
+
+    alter table j3_contact 
+        add constraint FK7551BEEABEB92A91 
+        foreign key (entity_key) 
+        references j3_business_entity;
+
+    alter table j3_contact_descr 
+        add constraint FK56CA9E6C2E3FD94F 
+        foreign key (contact_id) 
+        references j3_contact;
+
+    alter table j3_discovery_url 
+        add constraint FKA042FDAABEB92A91 
+        foreign key (entity_key) 
+        references j3_business_entity;
+
+    alter table j3_email 
+        add constraint FK34F910E62E3FD94F 
+        foreign key (contact_id) 
+        references j3_contact;
+
+    alter table j3_instance_details_descr 
+        add constraint FK3CC165902B115C6F 
+        foreign key (tmodel_instance_info_id) 
+        references j3_tmodel_instance_info;
+
+    alter table j3_instance_details_doc_descr 
+        add constraint FK447324492B115C6F 
+        foreign key (tmodel_instance_info_id) 
+        references j3_tmodel_instance_info;
+
+    alter table j3_keyed_reference 
+        add constraint FK350C8454E075C8D7 
+        foreign key (keyed_reference_group_id) 
+        references j3_keyed_reference_group;
+
+    alter table j3_keyed_reference 
+        add constraint FK350C84541DB72652 
+        foreign key (category_bag_id) 
+        references j3_category_bag;
+
+    alter table j3_keyed_reference_group 
+        add constraint FKF6224ED41DB72652 
+        foreign key (category_bag_id) 
+        references j3_category_bag;
+
+    alter table j3_overview_doc 
+        add constraint FK5CD8D0E8C5BF8903 
+        foreign key (entity_key) 
+        references j3_tmodel;
+
+    alter table j3_overview_doc 
+        add constraint FK5CD8D0E8E8CE1B36 
+        foreign key (tomodel_instance_info_id) 
+        references j3_tmodel_instance_info;
+
+    alter table j3_overview_doc_descr 
+        add constraint FK36FB9EA9BDC711C 
+        foreign key (overview_doc_id) 
+        references j3_overview_doc;
+
+    alter table j3_person_name 
+        add constraint FKCB7B8AFF2E3FD94F 
+        foreign key (contact_id) 
+        references j3_contact;
+
+    alter table j3_phone 
+        add constraint FK359202B82E3FD94F 
+        foreign key (contact_id) 
+        references j3_contact;
+
+    alter table j3_publisher_assertion 
+        add constraint FK8A102449E3544929 
+        foreign key (to_key) 
+        references j3_business_entity;
+
+    alter table j3_publisher_assertion 
+        add constraint FK8A102449CCEE22D8 
+        foreign key (from_key) 
+        references j3_business_entity;
+
+    alter table j3_service_category_bag 
+        add constraint FK185A68076A68D45A 
+        foreign key (id) 
+        references j3_category_bag;
+
+    alter table j3_service_category_bag 
+        add constraint FK185A680748D0656D 
+        foreign key (entity_key) 
+        references j3_business_service;
+
+    alter table j3_service_descr 
+        add constraint FKB6D63D4148D0656D 
+        foreign key (entity_key) 
+        references j3_business_service;
+
+    alter table j3_service_name 
+        add constraint FKCC1BE94B48D0656D 
+        foreign key (entity_key) 
+        references j3_business_service;
+
+    alter table j3_service_projection 
+        add constraint FK629F290F2E448F3F 
+        foreign key (service_key) 
+        references j3_business_service;
+
+    alter table j3_service_projection 
+        add constraint FK629F290FEF04CFEE 
+        foreign key (business_key) 
+        references j3_business_entity;
+
+    alter table j3_subscription_match 
+        add constraint FK5B9C2F19BEEE42E5 
+        foreign key (subscription_key) 
+        references j3_subscription;
+
+    alter table j3_tmodel 
+        add constraint FK83C8072BD1823CA5 
+        foreign key (entity_key) 
+        references j3_uddi_entity;
+
+    alter table j3_tmodel_category_bag 
+        add constraint FK7E0859DB6A68D45A 
+        foreign key (id) 
+        references j3_category_bag;
+
+    alter table j3_tmodel_category_bag 
+        add constraint FK7E0859DBC5BF8903 
+        foreign key (entity_key) 
+        references j3_tmodel;
+
+    alter table j3_tmodel_descr 
+        add constraint FK63DFF1EDC5BF8903 
+        foreign key (entity_key) 
+        references j3_tmodel;
+
+    alter table j3_tmodel_identifier 
+        add constraint FKD5FB623DC5BF8903 
+        foreign key (entity_key) 
+        references j3_tmodel;
+
+    alter table j3_tmodel_instance_info 
+        add constraint FKDC6C9004CFBD88B7 
+        foreign key (entity_key) 
+        references j3_binding_template;
+
+    alter table j3_tmodel_instance_info_descr 
+        add constraint FKD826B4062B115C6F 
+        foreign key (tmodel_instance_info_id) 
+        references j3_tmodel_instance_info;
+
+    alter table j3_transfer_token_keys 
+        add constraint FK8BBF49185ED9DD48 
+        foreign key (transfer_token) 
+        references j3_transfer_token;
+
+    create sequence juddi_sequence;

Copied: labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/postgres (from rev 33044, labs/jbossesb/tags/JBESB_4_7_CP2_ER2/product/install/jUDDI-registryV3/juddi-sql/postgres)

Deleted: labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/postgres/import.sql
===================================================================
--- labs/jbossesb/tags/JBESB_4_7_CP2_ER2/product/install/jUDDI-registryV3/juddi-sql/postgres/import.sql	2010-05-24 14:43:21 UTC (rev 33044)
+++ labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/postgres/import.sql	2010-05-24 16:38:08 UTC (rev 33050)
@@ -1,631 +0,0 @@
-
-    create table j3_address (
-        id int8 not null,
-        sort_code varchar(10),
-        tmodel_key varchar(255),
-        use_type varchar(255),
-        address_id int8 not null,
-        primary key (id)
-    );
-
-    create table j3_address_line (
-        id int8 not null,
-        key_name varchar(255),
-        key_value varchar(255),
-        line varchar(80) not null,
-        address_id int8 not null,
-        primary key (id)
-    );
-
-    create table j3_auth_token (
-        auth_token varchar(51) not null,
-        authorized_name varchar(255) not null,
-        created timestamp not null,
-        last_used timestamp not null,
-        number_of_uses int4 not null,
-        token_state int4 not null,
-        primary key (auth_token)
-    );
-
-    create table j3_binding_category_bag (
-        id int8 not null,
-        entity_key varchar(255) not null,
-        primary key (id),
-        unique (entity_key)
-    );
-
-    create table j3_binding_descr (
-        id int8 not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_binding_template (
-        access_point_type varchar(255),
-        access_point_url varchar(4000),
-        hosting_redirector varchar(255),
-        entity_key varchar(255) not null,
-        service_key varchar(255) not null,
-        primary key (entity_key)
-    );
-
-    create table j3_business_category_bag (
-        id int8 not null,
-        entity_key varchar(255) not null,
-        primary key (id),
-        unique (entity_key)
-    );
-
-    create table j3_business_descr (
-        id int8 not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_business_entity (
-        entity_key varchar(255) not null,
-        primary key (entity_key)
-    );
-
-    create table j3_business_identifier (
-        id int8 not null,
-        key_name varchar(255),
-        key_value varchar(255) not null,
-        tmodel_key_ref varchar(255),
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_business_name (
-        id int8 not null,
-        lang_code varchar(5),
-        name varchar(255) not null,
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_business_service (
-        entity_key varchar(255) not null,
-        business_key varchar(255) not null,
-        primary key (entity_key)
-    );
-
-    create table j3_category_bag (
-        id int8 not null,
-        primary key (id)
-    );
-
-    create table j3_clerk (
-        clerk_name varchar(255) not null,
-        cred varchar(255),
-        publisher_id varchar(255) not null,
-        node_name varchar(255),
-        primary key (clerk_name)
-    );
-
-    create table j3_client_subscriptioninfo (
-        subscription_key varchar(255) not null,
-        last_notified timestamp,
-        fromClerk_clerk_name varchar(255),
-        toClerk_clerk_name varchar(255),
-        primary key (subscription_key)
-    );
-
-    create table j3_contact (
-        id int8 not null,
-        use_type varchar(255),
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_contact_descr (
-        id int8 not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
-        contact_id int8 not null,
-        primary key (id)
-    );
-
-    create table j3_discovery_url (
-        id int8 not null,
-        url varchar(255) not null,
-        use_type varchar(255) not null,
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_email (
-        id int8 not null,
-        email_address varchar(255) not null,
-        use_type varchar(255),
-        contact_id int8 not null,
-        primary key (id)
-    );
-
-    create table j3_instance_details_descr (
-        id int8 not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
-        tmodel_instance_info_id int8 not null,
-        primary key (id)
-    );
-
-    create table j3_instance_details_doc_descr (
-        id int8 not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
-        tmodel_instance_info_id int8 not null,
-        primary key (id)
-    );
-
-    create table j3_keyed_reference (
-        id int8 not null,
-        key_name varchar(255),
-        key_value varchar(255) not null,
-        tmodel_key_ref varchar(255),
-        category_bag_id int8,
-        keyed_reference_group_id int8,
-        primary key (id)
-    );
-
-    create table j3_keyed_reference_group (
-        id int8 not null,
-        tmodel_key varchar(255),
-        category_bag_id int8 not null,
-        primary key (id)
-    );
-
-    create table j3_node (
-        name varchar(255) not null,
-        custody_transfer_url varchar(255) not null,
-        factory_initial varchar(255),
-        factory_naming_provider varchar(255),
-        factory_url_pkgs varchar(255),
-        inquiry_url varchar(255) not null,
-        juddi_api_url varchar(255),
-        manager_name varchar(255) not null,
-        proxy_transport varchar(255) not null,
-        publish_url varchar(255) not null,
-        security_url varchar(255) not null,
-        subscription_url varchar(255) not null,
-        primary key (name)
-    );
-
-    create table j3_overview_doc (
-        id int8 not null,
-        overview_url varchar(255) not null,
-        overview_url_use_type varchar(255),
-        entity_key varchar(255),
-        tomodel_instance_info_id int8,
-        primary key (id)
-    );
-
-    create table j3_overview_doc_descr (
-        id int8 not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
-        overview_doc_id int8,
-        primary key (id)
-    );
-
-    create table j3_person_name (
-        id int8 not null,
-        lang_code varchar(5),
-        name varchar(255) not null,
-        contact_id int8 not null,
-        primary key (id)
-    );
-
-    create table j3_phone (
-        id int8 not null,
-        phone_number varchar(50) not null,
-        use_type varchar(255),
-        contact_id int8 not null,
-        primary key (id)
-    );
-
-    create table j3_publisher (
-        authorized_name varchar(255) not null,
-        email_address varchar(255),
-        is_admin varchar(5),
-        is_enabled varchar(5),
-        max_bindings_per_service int4,
-        max_businesses int4,
-        max_services_per_business int4,
-        max_tmodels int4,
-        publisher_name varchar(255) not null,
-        primary key (authorized_name)
-    );
-
-    create table j3_publisher_assertion (
-        from_key varchar(255) not null,
-        to_key varchar(255) not null,
-        from_check varchar(5) not null,
-        key_name varchar(255) not null,
-        key_value varchar(255) not null,
-        tmodel_key varchar(255) not null,
-        to_check varchar(5) not null,
-        primary key (from_key, to_key)
-    );
-
-    create table j3_service_category_bag (
-        id int8 not null,
-        entity_key varchar(255) not null,
-        primary key (id),
-        unique (entity_key)
-    );
-
-    create table j3_service_descr (
-        id int8 not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_service_name (
-        id int8 not null,
-        lang_code varchar(5),
-        name varchar(255) not null,
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_service_projection (
-        business_key varchar(255) not null,
-        service_key varchar(255) not null,
-        primary key (business_key, service_key)
-    );
-
-    create table j3_subscription (
-        subscription_key varchar(255) not null,
-        authorized_name varchar(255) not null,
-        binding_key varchar(255),
-        brief bool,
-        create_date timestamp not null,
-        expires_after timestamp,
-        last_notified timestamp,
-        max_entities int4,
-        notification_interval varchar(255),
-        subscription_filter text not null,
-        primary key (subscription_key)
-    );
-
-    create table j3_subscription_chunk_token (
-        chunk_token varchar(255) not null,
-        data int4 not null,
-        end_point timestamp,
-        expires_after timestamp not null,
-        start_point timestamp,
-        subscription_key varchar(255) not null,
-        primary key (chunk_token)
-    );
-
-    create table j3_subscription_match (
-        id int8 not null,
-        entity_key varchar(255) not null,
-        subscription_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_tmodel (
-        deleted bool,
-        lang_code varchar(5),
-        name varchar(255) not null,
-        entity_key varchar(255) not null,
-        primary key (entity_key)
-    );
-
-    create table j3_tmodel_category_bag (
-        id int8 not null,
-        entity_key varchar(255) not null,
-        primary key (id),
-        unique (entity_key)
-    );
-
-    create table j3_tmodel_descr (
-        id int8 not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_tmodel_identifier (
-        id int8 not null,
-        key_name varchar(255),
-        key_value varchar(255) not null,
-        tmodel_key_ref varchar(255),
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_tmodel_instance_info (
-        id int8 not null,
-        instance_parms varchar(512),
-        tmodel_key varchar(255) not null,
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_tmodel_instance_info_descr (
-        id int8 not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
-        tmodel_instance_info_id int8 not null,
-        primary key (id)
-    );
-
-    create table j3_transfer_token (
-        transfer_token varchar(51) not null,
-        expiration_date timestamp not null,
-        primary key (transfer_token)
-    );
-
-    create table j3_transfer_token_keys (
-        id int8 not null,
-        entity_key varchar(255),
-        transfer_token varchar(51) not null,
-        primary key (id)
-    );
-
-    create table j3_uddi_entity (
-        entity_key varchar(255) not null,
-        authorized_name varchar(255) not null,
-        created timestamp,
-        modified timestamp not null,
-        modified_including_children timestamp,
-        node_id varchar(255),
-        primary key (entity_key)
-    );
-
-    alter table j3_address 
-        add constraint FKF83236BE75D860FB 
-        foreign key (address_id) 
-        references j3_contact;
-
-    alter table j3_address_line 
-        add constraint FKC665B8D5F8B8D8CF 
-        foreign key (address_id) 
-        references j3_address;
-
-    alter table j3_binding_category_bag 
-        add constraint FKCF34B2376A68D45A 
-        foreign key (id) 
-        references j3_category_bag;
-
-    alter table j3_binding_category_bag 
-        add constraint FKCF34B237CFBD88B7 
-        foreign key (entity_key) 
-        references j3_binding_template;
-
-    alter table j3_binding_descr 
-        add constraint FK5EA60911CFBD88B7 
-        foreign key (entity_key) 
-        references j3_binding_template;
-
-    alter table j3_binding_template 
-        add constraint FKD044BD6A2E448F3F 
-        foreign key (service_key) 
-        references j3_business_service;
-
-    alter table j3_binding_template 
-        add constraint FKD044BD6AD1823CA5 
-        foreign key (entity_key) 
-        references j3_uddi_entity;
-
-    alter table j3_business_category_bag 
-        add constraint FKD6D3ECB06A68D45A 
-        foreign key (id) 
-        references j3_category_bag;
-
-    alter table j3_business_category_bag 
-        add constraint FKD6D3ECB0BEB92A91 
-        foreign key (entity_key) 
-        references j3_business_entity;
-
-    alter table j3_business_descr 
-        add constraint FK3A24B4B8BEB92A91 
-        foreign key (entity_key) 
-        references j3_business_entity;
-
-    alter table j3_business_entity 
-        add constraint FKCA61A0CD1823CA5 
-        foreign key (entity_key) 
-        references j3_uddi_entity;
-
-    alter table j3_business_identifier 
-        add constraint FKB0C7A652BEB92A91 
-        foreign key (entity_key) 
-        references j3_business_entity;
-
-    alter table j3_business_name 
-        add constraint FK43F526F4BEB92A91 
-        foreign key (entity_key) 
-        references j3_business_entity;
-
-    alter table j3_business_service 
-        add constraint FK5D4255ACD1823CA5 
-        foreign key (entity_key) 
-        references j3_uddi_entity;
-
-    alter table j3_business_service 
-        add constraint FK5D4255ACEF04CFEE 
-        foreign key (business_key) 
-        references j3_business_entity;
-
-    alter table j3_clerk 
-        add constraint FK34DC7D9F6BB0F935 
-        foreign key (node_name) 
-        references j3_node;
-
-    alter table j3_client_subscriptioninfo 
-        add constraint FKDF04CC095BFC6733 
-        foreign key (fromClerk_clerk_name) 
-        references j3_clerk;
-
-    alter table j3_client_subscriptioninfo 
-        add constraint FKDF04CC09F3CE9C04 
-        foreign key (toClerk_clerk_name) 
-        references j3_clerk;
-
-    alter table j3_contact 
-        add constraint FK7551BEEABEB92A91 
-        foreign key (entity_key) 
-        references j3_business_entity;
-
-    alter table j3_contact_descr 
-        add constraint FK56CA9E6C2E3FD94F 
-        foreign key (contact_id) 
-        references j3_contact;
-
-    alter table j3_discovery_url 
-        add constraint FKA042FDAABEB92A91 
-        foreign key (entity_key) 
-        references j3_business_entity;
-
-    alter table j3_email 
-        add constraint FK34F910E62E3FD94F 
-        foreign key (contact_id) 
-        references j3_contact;
-
-    alter table j3_instance_details_descr 
-        add constraint FK3CC165902B115C6F 
-        foreign key (tmodel_instance_info_id) 
-        references j3_tmodel_instance_info;
-
-    alter table j3_instance_details_doc_descr 
-        add constraint FK447324492B115C6F 
-        foreign key (tmodel_instance_info_id) 
-        references j3_tmodel_instance_info;
-
-    alter table j3_keyed_reference 
-        add constraint FK350C8454E075C8D7 
-        foreign key (keyed_reference_group_id) 
-        references j3_keyed_reference_group;
-
-    alter table j3_keyed_reference 
-        add constraint FK350C84541DB72652 
-        foreign key (category_bag_id) 
-        references j3_category_bag;
-
-    alter table j3_keyed_reference_group 
-        add constraint FKF6224ED41DB72652 
-        foreign key (category_bag_id) 
-        references j3_category_bag;
-
-    alter table j3_overview_doc 
-        add constraint FK5CD8D0E8C5BF8903 
-        foreign key (entity_key) 
-        references j3_tmodel;
-
-    alter table j3_overview_doc 
-        add constraint FK5CD8D0E8E8CE1B36 
-        foreign key (tomodel_instance_info_id) 
-        references j3_tmodel_instance_info;
-
-    alter table j3_overview_doc_descr 
-        add constraint FK36FB9EA9BDC711C 
-        foreign key (overview_doc_id) 
-        references j3_overview_doc;
-
-    alter table j3_person_name 
-        add constraint FKCB7B8AFF2E3FD94F 
-        foreign key (contact_id) 
-        references j3_contact;
-
-    alter table j3_phone 
-        add constraint FK359202B82E3FD94F 
-        foreign key (contact_id) 
-        references j3_contact;
-
-    alter table j3_publisher_assertion 
-        add constraint FK8A102449E3544929 
-        foreign key (to_key) 
-        references j3_business_entity;
-
-    alter table j3_publisher_assertion 
-        add constraint FK8A102449CCEE22D8 
-        foreign key (from_key) 
-        references j3_business_entity;
-
-    alter table j3_service_category_bag 
-        add constraint FK185A68076A68D45A 
-        foreign key (id) 
-        references j3_category_bag;
-
-    alter table j3_service_category_bag 
-        add constraint FK185A680748D0656D 
-        foreign key (entity_key) 
-        references j3_business_service;
-
-    alter table j3_service_descr 
-        add constraint FKB6D63D4148D0656D 
-        foreign key (entity_key) 
-        references j3_business_service;
-
-    alter table j3_service_name 
-        add constraint FKCC1BE94B48D0656D 
-        foreign key (entity_key) 
-        references j3_business_service;
-
-    alter table j3_service_projection 
-        add constraint FK629F290F2E448F3F 
-        foreign key (service_key) 
-        references j3_business_service;
-
-    alter table j3_service_projection 
-        add constraint FK629F290FEF04CFEE 
-        foreign key (business_key) 
-        references j3_business_entity;
-
-    alter table j3_subscription_match 
-        add constraint FK5B9C2F19BEEE42E5 
-        foreign key (subscription_key) 
-        references j3_subscription;
-
-    alter table j3_tmodel 
-        add constraint FK83C8072BD1823CA5 
-        foreign key (entity_key) 
-        references j3_uddi_entity;
-
-    alter table j3_tmodel_category_bag 
-        add constraint FK7E0859DB6A68D45A 
-        foreign key (id) 
-        references j3_category_bag;
-
-    alter table j3_tmodel_category_bag 
-        add constraint FK7E0859DBC5BF8903 
-        foreign key (entity_key) 
-        references j3_tmodel;
-
-    alter table j3_tmodel_descr 
-        add constraint FK63DFF1EDC5BF8903 
-        foreign key (entity_key) 
-        references j3_tmodel;
-
-    alter table j3_tmodel_identifier 
-        add constraint FKD5FB623DC5BF8903 
-        foreign key (entity_key) 
-        references j3_tmodel;
-
-    alter table j3_tmodel_instance_info 
-        add constraint FKDC6C9004CFBD88B7 
-        foreign key (entity_key) 
-        references j3_binding_template;
-
-    alter table j3_tmodel_instance_info_descr 
-        add constraint FKD826B4062B115C6F 
-        foreign key (tmodel_instance_info_id) 
-        references j3_tmodel_instance_info;
-
-    alter table j3_transfer_token_keys 
-        add constraint FK8BBF49185ED9DD48 
-        foreign key (transfer_token) 
-        references j3_transfer_token;
-
-    create sequence juddi_sequence;

Copied: labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/postgres/import.sql (from rev 33044, labs/jbossesb/tags/JBESB_4_7_CP2_ER2/product/install/jUDDI-registryV3/juddi-sql/postgres/import.sql)
===================================================================
--- labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/postgres/import.sql	                        (rev 0)
+++ labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/postgres/import.sql	2010-05-24 16:38:08 UTC (rev 33050)
@@ -0,0 +1,631 @@
+
+    create table j3_address (
+        id int8 not null,
+        sort_code varchar(10),
+        tmodel_key varchar(255),
+        use_type varchar(255),
+        address_id int8 not null,
+        primary key (id)
+    );
+
+    create table j3_address_line (
+        id int8 not null,
+        key_name varchar(255),
+        key_value varchar(255),
+        line varchar(80) not null,
+        address_id int8 not null,
+        primary key (id)
+    );
+
+    create table j3_auth_token (
+        auth_token varchar(51) not null,
+        authorized_name varchar(255) not null,
+        created timestamp not null,
+        last_used timestamp not null,
+        number_of_uses int4 not null,
+        token_state int4 not null,
+        primary key (auth_token)
+    );
+
+    create table j3_binding_category_bag (
+        id int8 not null,
+        entity_key varchar(255) not null,
+        primary key (id),
+        unique (entity_key)
+    );
+
+    create table j3_binding_descr (
+        id int8 not null,
+        descr varchar(1024) not null,
+        lang_code varchar(5),
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_binding_template (
+        access_point_type varchar(255),
+        access_point_url varchar(4000),
+        hosting_redirector varchar(255),
+        entity_key varchar(255) not null,
+        service_key varchar(255) not null,
+        primary key (entity_key)
+    );
+
+    create table j3_business_category_bag (
+        id int8 not null,
+        entity_key varchar(255) not null,
+        primary key (id),
+        unique (entity_key)
+    );
+
+    create table j3_business_descr (
+        id int8 not null,
+        descr varchar(1024) not null,
+        lang_code varchar(5),
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_business_entity (
+        entity_key varchar(255) not null,
+        primary key (entity_key)
+    );
+
+    create table j3_business_identifier (
+        id int8 not null,
+        key_name varchar(255),
+        key_value varchar(255) not null,
+        tmodel_key_ref varchar(255),
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_business_name (
+        id int8 not null,
+        lang_code varchar(5),
+        name varchar(255) not null,
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_business_service (
+        entity_key varchar(255) not null,
+        business_key varchar(255) not null,
+        primary key (entity_key)
+    );
+
+    create table j3_category_bag (
+        id int8 not null,
+        primary key (id)
+    );
+
+    create table j3_clerk (
+        clerk_name varchar(255) not null,
+        cred varchar(255),
+        publisher_id varchar(255) not null,
+        node_name varchar(255),
+        primary key (clerk_name)
+    );
+
+    create table j3_client_subscriptioninfo (
+        subscription_key varchar(255) not null,
+        last_notified timestamp,
+        fromClerk_clerk_name varchar(255),
+        toClerk_clerk_name varchar(255),
+        primary key (subscription_key)
+    );
+
+    create table j3_contact (
+        id int8 not null,
+        use_type varchar(255),
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_contact_descr (
+        id int8 not null,
+        descr varchar(1024) not null,
+        lang_code varchar(5),
+        contact_id int8 not null,
+        primary key (id)
+    );
+
+    create table j3_discovery_url (
+        id int8 not null,
+        url varchar(255) not null,
+        use_type varchar(255) not null,
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_email (
+        id int8 not null,
+        email_address varchar(255) not null,
+        use_type varchar(255),
+        contact_id int8 not null,
+        primary key (id)
+    );
+
+    create table j3_instance_details_descr (
+        id int8 not null,
+        descr varchar(1024) not null,
+        lang_code varchar(5),
+        tmodel_instance_info_id int8 not null,
+        primary key (id)
+    );
+
+    create table j3_instance_details_doc_descr (
+        id int8 not null,
+        descr varchar(1024) not null,
+        lang_code varchar(5),
+        tmodel_instance_info_id int8 not null,
+        primary key (id)
+    );
+
+    create table j3_keyed_reference (
+        id int8 not null,
+        key_name varchar(255),
+        key_value varchar(255) not null,
+        tmodel_key_ref varchar(255),
+        category_bag_id int8,
+        keyed_reference_group_id int8,
+        primary key (id)
+    );
+
+    create table j3_keyed_reference_group (
+        id int8 not null,
+        tmodel_key varchar(255),
+        category_bag_id int8 not null,
+        primary key (id)
+    );
+
+    create table j3_node (
+        name varchar(255) not null,
+        custody_transfer_url varchar(255) not null,
+        factory_initial varchar(255),
+        factory_naming_provider varchar(255),
+        factory_url_pkgs varchar(255),
+        inquiry_url varchar(255) not null,
+        juddi_api_url varchar(255),
+        manager_name varchar(255) not null,
+        proxy_transport varchar(255) not null,
+        publish_url varchar(255) not null,
+        security_url varchar(255) not null,
+        subscription_url varchar(255) not null,
+        primary key (name)
+    );
+
+    create table j3_overview_doc (
+        id int8 not null,
+        overview_url varchar(255) not null,
+        overview_url_use_type varchar(255),
+        entity_key varchar(255),
+        tomodel_instance_info_id int8,
+        primary key (id)
+    );
+
+    create table j3_overview_doc_descr (
+        id int8 not null,
+        descr varchar(1024) not null,
+        lang_code varchar(5),
+        overview_doc_id int8,
+        primary key (id)
+    );
+
+    create table j3_person_name (
+        id int8 not null,
+        lang_code varchar(5),
+        name varchar(255) not null,
+        contact_id int8 not null,
+        primary key (id)
+    );
+
+    create table j3_phone (
+        id int8 not null,
+        phone_number varchar(50) not null,
+        use_type varchar(255),
+        contact_id int8 not null,
+        primary key (id)
+    );
+
+    create table j3_publisher (
+        authorized_name varchar(255) not null,
+        email_address varchar(255),
+        is_admin varchar(5),
+        is_enabled varchar(5),
+        max_bindings_per_service int4,
+        max_businesses int4,
+        max_services_per_business int4,
+        max_tmodels int4,
+        publisher_name varchar(255) not null,
+        primary key (authorized_name)
+    );
+
+    create table j3_publisher_assertion (
+        from_key varchar(255) not null,
+        to_key varchar(255) not null,
+        from_check varchar(5) not null,
+        key_name varchar(255) not null,
+        key_value varchar(255) not null,
+        tmodel_key varchar(255) not null,
+        to_check varchar(5) not null,
+        primary key (from_key, to_key)
+    );
+
+    create table j3_service_category_bag (
+        id int8 not null,
+        entity_key varchar(255) not null,
+        primary key (id),
+        unique (entity_key)
+    );
+
+    create table j3_service_descr (
+        id int8 not null,
+        descr varchar(1024) not null,
+        lang_code varchar(5),
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_service_name (
+        id int8 not null,
+        lang_code varchar(5),
+        name varchar(255) not null,
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_service_projection (
+        business_key varchar(255) not null,
+        service_key varchar(255) not null,
+        primary key (business_key, service_key)
+    );
+
+    create table j3_subscription (
+        subscription_key varchar(255) not null,
+        authorized_name varchar(255) not null,
+        binding_key varchar(255),
+        brief bool,
+        create_date timestamp not null,
+        expires_after timestamp,
+        last_notified timestamp,
+        max_entities int4,
+        notification_interval varchar(255),
+        subscription_filter text not null,
+        primary key (subscription_key)
+    );
+
+    create table j3_subscription_chunk_token (
+        chunk_token varchar(255) not null,
+        data int4 not null,
+        end_point timestamp,
+        expires_after timestamp not null,
+        start_point timestamp,
+        subscription_key varchar(255) not null,
+        primary key (chunk_token)
+    );
+
+    create table j3_subscription_match (
+        id int8 not null,
+        entity_key varchar(255) not null,
+        subscription_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_tmodel (
+        deleted bool,
+        lang_code varchar(5),
+        name varchar(255) not null,
+        entity_key varchar(255) not null,
+        primary key (entity_key)
+    );
+
+    create table j3_tmodel_category_bag (
+        id int8 not null,
+        entity_key varchar(255) not null,
+        primary key (id),
+        unique (entity_key)
+    );
+
+    create table j3_tmodel_descr (
+        id int8 not null,
+        descr varchar(1024) not null,
+        lang_code varchar(5),
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_tmodel_identifier (
+        id int8 not null,
+        key_name varchar(255),
+        key_value varchar(255) not null,
+        tmodel_key_ref varchar(255),
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_tmodel_instance_info (
+        id int8 not null,
+        instance_parms varchar(512),
+        tmodel_key varchar(255) not null,
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_tmodel_instance_info_descr (
+        id int8 not null,
+        descr varchar(1024) not null,
+        lang_code varchar(5),
+        tmodel_instance_info_id int8 not null,
+        primary key (id)
+    );
+
+    create table j3_transfer_token (
+        transfer_token varchar(51) not null,
+        expiration_date timestamp not null,
+        primary key (transfer_token)
+    );
+
+    create table j3_transfer_token_keys (
+        id int8 not null,
+        entity_key varchar(255),
+        transfer_token varchar(51) not null,
+        primary key (id)
+    );
+
+    create table j3_uddi_entity (
+        entity_key varchar(255) not null,
+        authorized_name varchar(255) not null,
+        created timestamp,
+        modified timestamp not null,
+        modified_including_children timestamp,
+        node_id varchar(255),
+        primary key (entity_key)
+    );
+
+    alter table j3_address 
+        add constraint FKF83236BE75D860FB 
+        foreign key (address_id) 
+        references j3_contact;
+
+    alter table j3_address_line 
+        add constraint FKC665B8D5F8B8D8CF 
+        foreign key (address_id) 
+        references j3_address;
+
+    alter table j3_binding_category_bag 
+        add constraint FKCF34B2376A68D45A 
+        foreign key (id) 
+        references j3_category_bag;
+
+    alter table j3_binding_category_bag 
+        add constraint FKCF34B237CFBD88B7 
+        foreign key (entity_key) 
+        references j3_binding_template;
+
+    alter table j3_binding_descr 
+        add constraint FK5EA60911CFBD88B7 
+        foreign key (entity_key) 
+        references j3_binding_template;
+
+    alter table j3_binding_template 
+        add constraint FKD044BD6A2E448F3F 
+        foreign key (service_key) 
+        references j3_business_service;
+
+    alter table j3_binding_template 
+        add constraint FKD044BD6AD1823CA5 
+        foreign key (entity_key) 
+        references j3_uddi_entity;
+
+    alter table j3_business_category_bag 
+        add constraint FKD6D3ECB06A68D45A 
+        foreign key (id) 
+        references j3_category_bag;
+
+    alter table j3_business_category_bag 
+        add constraint FKD6D3ECB0BEB92A91 
+        foreign key (entity_key) 
+        references j3_business_entity;
+
+    alter table j3_business_descr 
+        add constraint FK3A24B4B8BEB92A91 
+        foreign key (entity_key) 
+        references j3_business_entity;
+
+    alter table j3_business_entity 
+        add constraint FKCA61A0CD1823CA5 
+        foreign key (entity_key) 
+        references j3_uddi_entity;
+
+    alter table j3_business_identifier 
+        add constraint FKB0C7A652BEB92A91 
+        foreign key (entity_key) 
+        references j3_business_entity;
+
+    alter table j3_business_name 
+        add constraint FK43F526F4BEB92A91 
+        foreign key (entity_key) 
+        references j3_business_entity;
+
+    alter table j3_business_service 
+        add constraint FK5D4255ACD1823CA5 
+        foreign key (entity_key) 
+        references j3_uddi_entity;
+
+    alter table j3_business_service 
+        add constraint FK5D4255ACEF04CFEE 
+        foreign key (business_key) 
+        references j3_business_entity;
+
+    alter table j3_clerk 
+        add constraint FK34DC7D9F6BB0F935 
+        foreign key (node_name) 
+        references j3_node;
+
+    alter table j3_client_subscriptioninfo 
+        add constraint FKDF04CC095BFC6733 
+        foreign key (fromClerk_clerk_name) 
+        references j3_clerk;
+
+    alter table j3_client_subscriptioninfo 
+        add constraint FKDF04CC09F3CE9C04 
+        foreign key (toClerk_clerk_name) 
+        references j3_clerk;
+
+    alter table j3_contact 
+        add constraint FK7551BEEABEB92A91 
+        foreign key (entity_key) 
+        references j3_business_entity;
+
+    alter table j3_contact_descr 
+        add constraint FK56CA9E6C2E3FD94F 
+        foreign key (contact_id) 
+        references j3_contact;
+
+    alter table j3_discovery_url 
+        add constraint FKA042FDAABEB92A91 
+        foreign key (entity_key) 
+        references j3_business_entity;
+
+    alter table j3_email 
+        add constraint FK34F910E62E3FD94F 
+        foreign key (contact_id) 
+        references j3_contact;
+
+    alter table j3_instance_details_descr 
+        add constraint FK3CC165902B115C6F 
+        foreign key (tmodel_instance_info_id) 
+        references j3_tmodel_instance_info;
+
+    alter table j3_instance_details_doc_descr 
+        add constraint FK447324492B115C6F 
+        foreign key (tmodel_instance_info_id) 
+        references j3_tmodel_instance_info;
+
+    alter table j3_keyed_reference 
+        add constraint FK350C8454E075C8D7 
+        foreign key (keyed_reference_group_id) 
+        references j3_keyed_reference_group;
+
+    alter table j3_keyed_reference 
+        add constraint FK350C84541DB72652 
+        foreign key (category_bag_id) 
+        references j3_category_bag;
+
+    alter table j3_keyed_reference_group 
+        add constraint FKF6224ED41DB72652 
+        foreign key (category_bag_id) 
+        references j3_category_bag;
+
+    alter table j3_overview_doc 
+        add constraint FK5CD8D0E8C5BF8903 
+        foreign key (entity_key) 
+        references j3_tmodel;
+
+    alter table j3_overview_doc 
+        add constraint FK5CD8D0E8E8CE1B36 
+        foreign key (tomodel_instance_info_id) 
+        references j3_tmodel_instance_info;
+
+    alter table j3_overview_doc_descr 
+        add constraint FK36FB9EA9BDC711C 
+        foreign key (overview_doc_id) 
+        references j3_overview_doc;
+
+    alter table j3_person_name 
+        add constraint FKCB7B8AFF2E3FD94F 
+        foreign key (contact_id) 
+        references j3_contact;
+
+    alter table j3_phone 
+        add constraint FK359202B82E3FD94F 
+        foreign key (contact_id) 
+        references j3_contact;
+
+    alter table j3_publisher_assertion 
+        add constraint FK8A102449E3544929 
+        foreign key (to_key) 
+        references j3_business_entity;
+
+    alter table j3_publisher_assertion 
+        add constraint FK8A102449CCEE22D8 
+        foreign key (from_key) 
+        references j3_business_entity;
+
+    alter table j3_service_category_bag 
+        add constraint FK185A68076A68D45A 
+        foreign key (id) 
+        references j3_category_bag;
+
+    alter table j3_service_category_bag 
+        add constraint FK185A680748D0656D 
+        foreign key (entity_key) 
+        references j3_business_service;
+
+    alter table j3_service_descr 
+        add constraint FKB6D63D4148D0656D 
+        foreign key (entity_key) 
+        references j3_business_service;
+
+    alter table j3_service_name 
+        add constraint FKCC1BE94B48D0656D 
+        foreign key (entity_key) 
+        references j3_business_service;
+
+    alter table j3_service_projection 
+        add constraint FK629F290F2E448F3F 
+        foreign key (service_key) 
+        references j3_business_service;
+
+    alter table j3_service_projection 
+        add constraint FK629F290FEF04CFEE 
+        foreign key (business_key) 
+        references j3_business_entity;
+
+    alter table j3_subscription_match 
+        add constraint FK5B9C2F19BEEE42E5 
+        foreign key (subscription_key) 
+        references j3_subscription;
+
+    alter table j3_tmodel 
+        add constraint FK83C8072BD1823CA5 
+        foreign key (entity_key) 
+        references j3_uddi_entity;
+
+    alter table j3_tmodel_category_bag 
+        add constraint FK7E0859DB6A68D45A 
+        foreign key (id) 
+        references j3_category_bag;
+
+    alter table j3_tmodel_category_bag 
+        add constraint FK7E0859DBC5BF8903 
+        foreign key (entity_key) 
+        references j3_tmodel;
+
+    alter table j3_tmodel_descr 
+        add constraint FK63DFF1EDC5BF8903 
+        foreign key (entity_key) 
+        references j3_tmodel;
+
+    alter table j3_tmodel_identifier 
+        add constraint FKD5FB623DC5BF8903 
+        foreign key (entity_key) 
+        references j3_tmodel;
+
+    alter table j3_tmodel_instance_info 
+        add constraint FKDC6C9004CFBD88B7 
+        foreign key (entity_key) 
+        references j3_binding_template;
+
+    alter table j3_tmodel_instance_info_descr 
+        add constraint FKD826B4062B115C6F 
+        foreign key (tmodel_instance_info_id) 
+        references j3_tmodel_instance_info;
+
+    alter table j3_transfer_token_keys 
+        add constraint FK8BBF49185ED9DD48 
+        foreign key (transfer_token) 
+        references j3_transfer_token;
+
+    create sequence juddi_sequence;

Copied: labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/sqlserver (from rev 33044, labs/jbossesb/tags/JBESB_4_7_CP2_ER2/product/install/jUDDI-registryV3/juddi-sql/sqlserver)

Deleted: labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/sqlserver/import.sql
===================================================================
--- labs/jbossesb/tags/JBESB_4_7_CP2_ER2/product/install/jUDDI-registryV3/juddi-sql/sqlserver/import.sql	2010-05-24 14:43:21 UTC (rev 33044)
+++ labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/sqlserver/import.sql	2010-05-24 16:38:08 UTC (rev 33050)
@@ -1,629 +0,0 @@
-
-    create table j3_address (
-        id numeric(19,0) identity not null,
-        sort_code varchar(10) null,
-        tmodel_key varchar(255) null,
-        use_type varchar(255) null,
-        address_id numeric(19,0) not null,
-        primary key (id)
-    );
-
-    create table j3_address_line (
-        id numeric(19,0) identity not null,
-        key_name varchar(255) null,
-        key_value varchar(255) null,
-        line varchar(80) not null,
-        address_id numeric(19,0) not null,
-        primary key (id)
-    );
-
-    create table j3_auth_token (
-        auth_token varchar(51) not null,
-        authorized_name varchar(255) not null,
-        created datetime not null,
-        last_used datetime not null,
-        number_of_uses int not null,
-        token_state int not null,
-        primary key (auth_token)
-    );
-
-    create table j3_binding_category_bag (
-        id numeric(19,0) not null,
-        entity_key varchar(255) not null,
-        primary key (id),
-        unique (entity_key)
-    );
-
-    create table j3_binding_descr (
-        id numeric(19,0) identity not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5) null,
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_binding_template (
-        access_point_type varchar(255) null,
-        access_point_url varchar(4000) null,
-        hosting_redirector varchar(255) null,
-        entity_key varchar(255) not null,
-        service_key varchar(255) not null,
-        primary key (entity_key)
-    );
-
-    create table j3_business_category_bag (
-        id numeric(19,0) not null,
-        entity_key varchar(255) not null,
-        primary key (id),
-        unique (entity_key)
-    );
-
-    create table j3_business_descr (
-        id numeric(19,0) identity not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5) null,
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_business_entity (
-        entity_key varchar(255) not null,
-        primary key (entity_key)
-    );
-
-    create table j3_business_identifier (
-        id numeric(19,0) identity not null,
-        key_name varchar(255) null,
-        key_value varchar(255) not null,
-        tmodel_key_ref varchar(255) null,
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_business_name (
-        id numeric(19,0) identity not null,
-        lang_code varchar(5) null,
-        name varchar(255) not null,
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_business_service (
-        entity_key varchar(255) not null,
-        business_key varchar(255) not null,
-        primary key (entity_key)
-    );
-
-    create table j3_category_bag (
-        id numeric(19,0) identity not null,
-        primary key (id)
-    );
-
-    create table j3_clerk (
-        clerk_name varchar(255) not null,
-        cred varchar(255) null,
-        publisher_id varchar(255) not null,
-        node_name varchar(255) null,
-        primary key (clerk_name)
-    );
-
-    create table j3_client_subscriptioninfo (
-        subscription_key varchar(255) not null,
-        last_notified datetime null,
-        fromClerk_clerk_name varchar(255) null,
-        toClerk_clerk_name varchar(255) null,
-        primary key (subscription_key)
-    );
-
-    create table j3_contact (
-        id numeric(19,0) identity not null,
-        use_type varchar(255) null,
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_contact_descr (
-        id numeric(19,0) identity not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5) null,
-        contact_id numeric(19,0) not null,
-        primary key (id)
-    );
-
-    create table j3_discovery_url (
-        id numeric(19,0) identity not null,
-        url varchar(255) not null,
-        use_type varchar(255) not null,
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_email (
-        id numeric(19,0) identity not null,
-        email_address varchar(255) not null,
-        use_type varchar(255) null,
-        contact_id numeric(19,0) not null,
-        primary key (id)
-    );
-
-    create table j3_instance_details_descr (
-        id numeric(19,0) identity not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5) null,
-        tmodel_instance_info_id numeric(19,0) not null,
-        primary key (id)
-    );
-
-    create table j3_instance_details_doc_descr (
-        id numeric(19,0) identity not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5) null,
-        tmodel_instance_info_id numeric(19,0) not null,
-        primary key (id)
-    );
-
-    create table j3_keyed_reference (
-        id numeric(19,0) identity not null,
-        key_name varchar(255) null,
-        key_value varchar(255) not null,
-        tmodel_key_ref varchar(255) null,
-        category_bag_id numeric(19,0) null,
-        keyed_reference_group_id numeric(19,0) null,
-        primary key (id)
-    );
-
-    create table j3_keyed_reference_group (
-        id numeric(19,0) identity not null,
-        tmodel_key varchar(255) null,
-        category_bag_id numeric(19,0) not null,
-        primary key (id)
-    );
-
-    create table j3_node (
-        name varchar(255) not null,
-        custody_transfer_url varchar(255) not null,
-        factory_initial varchar(255) null,
-        factory_naming_provider varchar(255) null,
-        factory_url_pkgs varchar(255) null,
-        inquiry_url varchar(255) not null,
-        juddi_api_url varchar(255) null,
-        manager_name varchar(255) not null,
-        proxy_transport varchar(255) not null,
-        publish_url varchar(255) not null,
-        security_url varchar(255) not null,
-        subscription_url varchar(255) not null,
-        primary key (name)
-    );
-
-    create table j3_overview_doc (
-        id numeric(19,0) identity not null,
-        overview_url varchar(255) not null,
-        overview_url_use_type varchar(255) null,
-        entity_key varchar(255) null,
-        tomodel_instance_info_id numeric(19,0) null,
-        primary key (id)
-    );
-
-    create table j3_overview_doc_descr (
-        id numeric(19,0) identity not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5) null,
-        overview_doc_id numeric(19,0) null,
-        primary key (id)
-    );
-
-    create table j3_person_name (
-        id numeric(19,0) identity not null,
-        lang_code varchar(5) null,
-        name varchar(255) not null,
-        contact_id numeric(19,0) not null,
-        primary key (id)
-    );
-
-    create table j3_phone (
-        id numeric(19,0) identity not null,
-        phone_number varchar(50) not null,
-        use_type varchar(255) null,
-        contact_id numeric(19,0) not null,
-        primary key (id)
-    );
-
-    create table j3_publisher (
-        authorized_name varchar(255) not null,
-        email_address varchar(255) null,
-        is_admin varchar(5) null,
-        is_enabled varchar(5) null,
-        max_bindings_per_service int null,
-        max_businesses int null,
-        max_services_per_business int null,
-        max_tmodels int null,
-        publisher_name varchar(255) not null,
-        primary key (authorized_name)
-    );
-
-    create table j3_publisher_assertion (
-        from_key varchar(255) not null,
-        to_key varchar(255) not null,
-        from_check varchar(5) not null,
-        key_name varchar(255) not null,
-        key_value varchar(255) not null,
-        tmodel_key varchar(255) not null,
-        to_check varchar(5) not null,
-        primary key (from_key, to_key)
-    );
-
-    create table j3_service_category_bag (
-        id numeric(19,0) not null,
-        entity_key varchar(255) not null,
-        primary key (id),
-        unique (entity_key)
-    );
-
-    create table j3_service_descr (
-        id numeric(19,0) identity not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5) null,
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_service_name (
-        id numeric(19,0) identity not null,
-        lang_code varchar(5) null,
-        name varchar(255) not null,
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_service_projection (
-        business_key varchar(255) not null,
-        service_key varchar(255) not null,
-        primary key (business_key, service_key)
-    );
-
-    create table j3_subscription (
-        subscription_key varchar(255) not null,
-        authorized_name varchar(255) not null,
-        binding_key varchar(255) null,
-        brief tinyint null,
-        create_date datetime not null,
-        expires_after datetime null,
-        last_notified datetime null,
-        max_entities int null,
-        notification_interval varchar(255) null,
-        subscription_filter text not null,
-        primary key (subscription_key)
-    );
-
-    create table j3_subscription_chunk_token (
-        chunk_token varchar(255) not null,
-        data int not null,
-        end_point datetime null,
-        expires_after datetime not null,
-        start_point datetime null,
-        subscription_key varchar(255) not null,
-        primary key (chunk_token)
-    );
-
-    create table j3_subscription_match (
-        id numeric(19,0) identity not null,
-        entity_key varchar(255) not null,
-        subscription_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_tmodel (
-        deleted tinyint null,
-        lang_code varchar(5) null,
-        name varchar(255) not null,
-        entity_key varchar(255) not null,
-        primary key (entity_key)
-    );
-
-    create table j3_tmodel_category_bag (
-        id numeric(19,0) not null,
-        entity_key varchar(255) not null,
-        primary key (id),
-        unique (entity_key)
-    );
-
-    create table j3_tmodel_descr (
-        id numeric(19,0) identity not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5) null,
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_tmodel_identifier (
-        id numeric(19,0) identity not null,
-        key_name varchar(255) null,
-        key_value varchar(255) not null,
-        tmodel_key_ref varchar(255) null,
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_tmodel_instance_info (
-        id numeric(19,0) identity not null,
-        instance_parms varchar(512) null,
-        tmodel_key varchar(255) not null,
-        entity_key varchar(255) not null,
-        primary key (id)
-    );
-
-    create table j3_tmodel_instance_info_descr (
-        id numeric(19,0) identity not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5) null,
-        tmodel_instance_info_id numeric(19,0) not null,
-        primary key (id)
-    );
-
-    create table j3_transfer_token (
-        transfer_token varchar(51) not null,
-        expiration_date datetime not null,
-        primary key (transfer_token)
-    );
-
-    create table j3_transfer_token_keys (
-        id numeric(19,0) identity not null,
-        entity_key varchar(255) null,
-        transfer_token varchar(51) not null,
-        primary key (id)
-    );
-
-    create table j3_uddi_entity (
-        entity_key varchar(255) not null,
-        authorized_name varchar(255) not null,
-        created datetime null,
-        modified datetime not null,
-        modified_including_children datetime null,
-        node_id varchar(255) null,
-        primary key (entity_key)
-    );
-
-    alter table j3_address 
-        add constraint FKF83236BE75D860FB 
-        foreign key (address_id) 
-        references j3_contact;
-
-    alter table j3_address_line 
-        add constraint FKC665B8D5F8B8D8CF 
-        foreign key (address_id) 
-        references j3_address;
-
-    alter table j3_binding_category_bag 
-        add constraint FKCF34B2376A68D45A 
-        foreign key (id) 
-        references j3_category_bag;
-
-    alter table j3_binding_category_bag 
-        add constraint FKCF34B237CFBD88B7 
-        foreign key (entity_key) 
-        references j3_binding_template;
-
-    alter table j3_binding_descr 
-        add constraint FK5EA60911CFBD88B7 
-        foreign key (entity_key) 
-        references j3_binding_template;
-
-    alter table j3_binding_template 
-        add constraint FKD044BD6A2E448F3F 
-        foreign key (service_key) 
-        references j3_business_service;
-
-    alter table j3_binding_template 
-        add constraint FKD044BD6AD1823CA5 
-        foreign key (entity_key) 
-        references j3_uddi_entity;
-
-    alter table j3_business_category_bag 
-        add constraint FKD6D3ECB06A68D45A 
-        foreign key (id) 
-        references j3_category_bag;
-
-    alter table j3_business_category_bag 
-        add constraint FKD6D3ECB0BEB92A91 
-        foreign key (entity_key) 
-        references j3_business_entity;
-
-    alter table j3_business_descr 
-        add constraint FK3A24B4B8BEB92A91 
-        foreign key (entity_key) 
-        references j3_business_entity;
-
-    alter table j3_business_entity 
-        add constraint FKCA61A0CD1823CA5 
-        foreign key (entity_key) 
-        references j3_uddi_entity;
-
-    alter table j3_business_identifier 
-        add constraint FKB0C7A652BEB92A91 
-        foreign key (entity_key) 
-        references j3_business_entity;
-
-    alter table j3_business_name 
-        add constraint FK43F526F4BEB92A91 
-        foreign key (entity_key) 
-        references j3_business_entity;
-
-    alter table j3_business_service 
-        add constraint FK5D4255ACD1823CA5 
-        foreign key (entity_key) 
-        references j3_uddi_entity;
-
-    alter table j3_business_service 
-        add constraint FK5D4255ACEF04CFEE 
-        foreign key (business_key) 
-        references j3_business_entity;
-
-    alter table j3_clerk 
-        add constraint FK34DC7D9F6BB0F935 
-        foreign key (node_name) 
-        references j3_node;
-
-    alter table j3_client_subscriptioninfo 
-        add constraint FKDF04CC095BFC6733 
-        foreign key (fromClerk_clerk_name) 
-        references j3_clerk;
-
-    alter table j3_client_subscriptioninfo 
-        add constraint FKDF04CC09F3CE9C04 
-        foreign key (toClerk_clerk_name) 
-        references j3_clerk;
-
-    alter table j3_contact 
-        add constraint FK7551BEEABEB92A91 
-        foreign key (entity_key) 
-        references j3_business_entity;
-
-    alter table j3_contact_descr 
-        add constraint FK56CA9E6C2E3FD94F 
-        foreign key (contact_id) 
-        references j3_contact;
-
-    alter table j3_discovery_url 
-        add constraint FKA042FDAABEB92A91 
-        foreign key (entity_key) 
-        references j3_business_entity;
-
-    alter table j3_email 
-        add constraint FK34F910E62E3FD94F 
-        foreign key (contact_id) 
-        references j3_contact;
-
-    alter table j3_instance_details_descr 
-        add constraint FK3CC165902B115C6F 
-        foreign key (tmodel_instance_info_id) 
-        references j3_tmodel_instance_info;
-
-    alter table j3_instance_details_doc_descr 
-        add constraint FK447324492B115C6F 
-        foreign key (tmodel_instance_info_id) 
-        references j3_tmodel_instance_info;
-
-    alter table j3_keyed_reference 
-        add constraint FK350C8454E075C8D7 
-        foreign key (keyed_reference_group_id) 
-        references j3_keyed_reference_group;
-
-    alter table j3_keyed_reference 
-        add constraint FK350C84541DB72652 
-        foreign key (category_bag_id) 
-        references j3_category_bag;
-
-    alter table j3_keyed_reference_group 
-        add constraint FKF6224ED41DB72652 
-        foreign key (category_bag_id) 
-        references j3_category_bag;
-
-    alter table j3_overview_doc 
-        add constraint FK5CD8D0E8C5BF8903 
-        foreign key (entity_key) 
-        references j3_tmodel;
-
-    alter table j3_overview_doc 
-        add constraint FK5CD8D0E8E8CE1B36 
-        foreign key (tomodel_instance_info_id) 
-        references j3_tmodel_instance_info;
-
-    alter table j3_overview_doc_descr 
-        add constraint FK36FB9EA9BDC711C 
-        foreign key (overview_doc_id) 
-        references j3_overview_doc;
-
-    alter table j3_person_name 
-        add constraint FKCB7B8AFF2E3FD94F 
-        foreign key (contact_id) 
-        references j3_contact;
-
-    alter table j3_phone 
-        add constraint FK359202B82E3FD94F 
-        foreign key (contact_id) 
-        references j3_contact;
-
-    alter table j3_publisher_assertion 
-        add constraint FK8A102449E3544929 
-        foreign key (to_key) 
-        references j3_business_entity;
-
-    alter table j3_publisher_assertion 
-        add constraint FK8A102449CCEE22D8 
-        foreign key (from_key) 
-        references j3_business_entity;
-
-    alter table j3_service_category_bag 
-        add constraint FK185A68076A68D45A 
-        foreign key (id) 
-        references j3_category_bag;
-
-    alter table j3_service_category_bag 
-        add constraint FK185A680748D0656D 
-        foreign key (entity_key) 
-        references j3_business_service;
-
-    alter table j3_service_descr 
-        add constraint FKB6D63D4148D0656D 
-        foreign key (entity_key) 
-        references j3_business_service;
-
-    alter table j3_service_name 
-        add constraint FKCC1BE94B48D0656D 
-        foreign key (entity_key) 
-        references j3_business_service;
-
-    alter table j3_service_projection 
-        add constraint FK629F290F2E448F3F 
-        foreign key (service_key) 
-        references j3_business_service;
-
-    alter table j3_service_projection 
-        add constraint FK629F290FEF04CFEE 
-        foreign key (business_key) 
-        references j3_business_entity;
-
-    alter table j3_subscription_match 
-        add constraint FK5B9C2F19BEEE42E5 
-        foreign key (subscription_key) 
-        references j3_subscription;
-
-    alter table j3_tmodel 
-        add constraint FK83C8072BD1823CA5 
-        foreign key (entity_key) 
-        references j3_uddi_entity;
-
-    alter table j3_tmodel_category_bag 
-        add constraint FK7E0859DB6A68D45A 
-        foreign key (id) 
-        references j3_category_bag;
-
-    alter table j3_tmodel_category_bag 
-        add constraint FK7E0859DBC5BF8903 
-        foreign key (entity_key) 
-        references j3_tmodel;
-
-    alter table j3_tmodel_descr 
-        add constraint FK63DFF1EDC5BF8903 
-        foreign key (entity_key) 
-        references j3_tmodel;
-
-    alter table j3_tmodel_identifier 
-        add constraint FKD5FB623DC5BF8903 
-        foreign key (entity_key) 
-        references j3_tmodel;
-
-    alter table j3_tmodel_instance_info 
-        add constraint FKDC6C9004CFBD88B7 
-        foreign key (entity_key) 
-        references j3_binding_template;
-
-    alter table j3_tmodel_instance_info_descr 
-        add constraint FKD826B4062B115C6F 
-        foreign key (tmodel_instance_info_id) 
-        references j3_tmodel_instance_info;
-
-    alter table j3_transfer_token_keys 
-        add constraint FK8BBF49185ED9DD48 
-        foreign key (transfer_token) 
-        references j3_transfer_token;

Copied: labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/sqlserver/import.sql (from rev 33044, labs/jbossesb/tags/JBESB_4_7_CP2_ER2/product/install/jUDDI-registryV3/juddi-sql/sqlserver/import.sql)
===================================================================
--- labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/sqlserver/import.sql	                        (rev 0)
+++ labs/jbossesb/trunk/product/install/jUDDI-registryV3/juddi-sql/sqlserver/import.sql	2010-05-24 16:38:08 UTC (rev 33050)
@@ -0,0 +1,629 @@
+
+    create table j3_address (
+        id numeric(19,0) identity not null,
+        sort_code varchar(10) null,
+        tmodel_key varchar(255) null,
+        use_type varchar(255) null,
+        address_id numeric(19,0) not null,
+        primary key (id)
+    );
+
+    create table j3_address_line (
+        id numeric(19,0) identity not null,
+        key_name varchar(255) null,
+        key_value varchar(255) null,
+        line varchar(80) not null,
+        address_id numeric(19,0) not null,
+        primary key (id)
+    );
+
+    create table j3_auth_token (
+        auth_token varchar(51) not null,
+        authorized_name varchar(255) not null,
+        created datetime not null,
+        last_used datetime not null,
+        number_of_uses int not null,
+        token_state int not null,
+        primary key (auth_token)
+    );
+
+    create table j3_binding_category_bag (
+        id numeric(19,0) not null,
+        entity_key varchar(255) not null,
+        primary key (id),
+        unique (entity_key)
+    );
+
+    create table j3_binding_descr (
+        id numeric(19,0) identity not null,
+        descr varchar(1024) not null,
+        lang_code varchar(5) null,
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_binding_template (
+        access_point_type varchar(255) null,
+        access_point_url varchar(4000) null,
+        hosting_redirector varchar(255) null,
+        entity_key varchar(255) not null,
+        service_key varchar(255) not null,
+        primary key (entity_key)
+    );
+
+    create table j3_business_category_bag (
+        id numeric(19,0) not null,
+        entity_key varchar(255) not null,
+        primary key (id),
+        unique (entity_key)
+    );
+
+    create table j3_business_descr (
+        id numeric(19,0) identity not null,
+        descr varchar(1024) not null,
+        lang_code varchar(5) null,
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_business_entity (
+        entity_key varchar(255) not null,
+        primary key (entity_key)
+    );
+
+    create table j3_business_identifier (
+        id numeric(19,0) identity not null,
+        key_name varchar(255) null,
+        key_value varchar(255) not null,
+        tmodel_key_ref varchar(255) null,
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_business_name (
+        id numeric(19,0) identity not null,
+        lang_code varchar(5) null,
+        name varchar(255) not null,
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_business_service (
+        entity_key varchar(255) not null,
+        business_key varchar(255) not null,
+        primary key (entity_key)
+    );
+
+    create table j3_category_bag (
+        id numeric(19,0) identity not null,
+        primary key (id)
+    );
+
+    create table j3_clerk (
+        clerk_name varchar(255) not null,
+        cred varchar(255) null,
+        publisher_id varchar(255) not null,
+        node_name varchar(255) null,
+        primary key (clerk_name)
+    );
+
+    create table j3_client_subscriptioninfo (
+        subscription_key varchar(255) not null,
+        last_notified datetime null,
+        fromClerk_clerk_name varchar(255) null,
+        toClerk_clerk_name varchar(255) null,
+        primary key (subscription_key)
+    );
+
+    create table j3_contact (
+        id numeric(19,0) identity not null,
+        use_type varchar(255) null,
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_contact_descr (
+        id numeric(19,0) identity not null,
+        descr varchar(1024) not null,
+        lang_code varchar(5) null,
+        contact_id numeric(19,0) not null,
+        primary key (id)
+    );
+
+    create table j3_discovery_url (
+        id numeric(19,0) identity not null,
+        url varchar(255) not null,
+        use_type varchar(255) not null,
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_email (
+        id numeric(19,0) identity not null,
+        email_address varchar(255) not null,
+        use_type varchar(255) null,
+        contact_id numeric(19,0) not null,
+        primary key (id)
+    );
+
+    create table j3_instance_details_descr (
+        id numeric(19,0) identity not null,
+        descr varchar(1024) not null,
+        lang_code varchar(5) null,
+        tmodel_instance_info_id numeric(19,0) not null,
+        primary key (id)
+    );
+
+    create table j3_instance_details_doc_descr (
+        id numeric(19,0) identity not null,
+        descr varchar(1024) not null,
+        lang_code varchar(5) null,
+        tmodel_instance_info_id numeric(19,0) not null,
+        primary key (id)
+    );
+
+    create table j3_keyed_reference (
+        id numeric(19,0) identity not null,
+        key_name varchar(255) null,
+        key_value varchar(255) not null,
+        tmodel_key_ref varchar(255) null,
+        category_bag_id numeric(19,0) null,
+        keyed_reference_group_id numeric(19,0) null,
+        primary key (id)
+    );
+
+    create table j3_keyed_reference_group (
+        id numeric(19,0) identity not null,
+        tmodel_key varchar(255) null,
+        category_bag_id numeric(19,0) not null,
+        primary key (id)
+    );
+
+    create table j3_node (
+        name varchar(255) not null,
+        custody_transfer_url varchar(255) not null,
+        factory_initial varchar(255) null,
+        factory_naming_provider varchar(255) null,
+        factory_url_pkgs varchar(255) null,
+        inquiry_url varchar(255) not null,
+        juddi_api_url varchar(255) null,
+        manager_name varchar(255) not null,
+        proxy_transport varchar(255) not null,
+        publish_url varchar(255) not null,
+        security_url varchar(255) not null,
+        subscription_url varchar(255) not null,
+        primary key (name)
+    );
+
+    create table j3_overview_doc (
+        id numeric(19,0) identity not null,
+        overview_url varchar(255) not null,
+        overview_url_use_type varchar(255) null,
+        entity_key varchar(255) null,
+        tomodel_instance_info_id numeric(19,0) null,
+        primary key (id)
+    );
+
+    create table j3_overview_doc_descr (
+        id numeric(19,0) identity not null,
+        descr varchar(1024) not null,
+        lang_code varchar(5) null,
+        overview_doc_id numeric(19,0) null,
+        primary key (id)
+    );
+
+    create table j3_person_name (
+        id numeric(19,0) identity not null,
+        lang_code varchar(5) null,
+        name varchar(255) not null,
+        contact_id numeric(19,0) not null,
+        primary key (id)
+    );
+
+    create table j3_phone (
+        id numeric(19,0) identity not null,
+        phone_number varchar(50) not null,
+        use_type varchar(255) null,
+        contact_id numeric(19,0) not null,
+        primary key (id)
+    );
+
+    create table j3_publisher (
+        authorized_name varchar(255) not null,
+        email_address varchar(255) null,
+        is_admin varchar(5) null,
+        is_enabled varchar(5) null,
+        max_bindings_per_service int null,
+        max_businesses int null,
+        max_services_per_business int null,
+        max_tmodels int null,
+        publisher_name varchar(255) not null,
+        primary key (authorized_name)
+    );
+
+    create table j3_publisher_assertion (
+        from_key varchar(255) not null,
+        to_key varchar(255) not null,
+        from_check varchar(5) not null,
+        key_name varchar(255) not null,
+        key_value varchar(255) not null,
+        tmodel_key varchar(255) not null,
+        to_check varchar(5) not null,
+        primary key (from_key, to_key)
+    );
+
+    create table j3_service_category_bag (
+        id numeric(19,0) not null,
+        entity_key varchar(255) not null,
+        primary key (id),
+        unique (entity_key)
+    );
+
+    create table j3_service_descr (
+        id numeric(19,0) identity not null,
+        descr varchar(1024) not null,
+        lang_code varchar(5) null,
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_service_name (
+        id numeric(19,0) identity not null,
+        lang_code varchar(5) null,
+        name varchar(255) not null,
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_service_projection (
+        business_key varchar(255) not null,
+        service_key varchar(255) not null,
+        primary key (business_key, service_key)
+    );
+
+    create table j3_subscription (
+        subscription_key varchar(255) not null,
+        authorized_name varchar(255) not null,
+        binding_key varchar(255) null,
+        brief tinyint null,
+        create_date datetime not null,
+        expires_after datetime null,
+        last_notified datetime null,
+        max_entities int null,
+        notification_interval varchar(255) null,
+        subscription_filter text not null,
+        primary key (subscription_key)
+    );
+
+    create table j3_subscription_chunk_token (
+        chunk_token varchar(255) not null,
+        data int not null,
+        end_point datetime null,
+        expires_after datetime not null,
+        start_point datetime null,
+        subscription_key varchar(255) not null,
+        primary key (chunk_token)
+    );
+
+    create table j3_subscription_match (
+        id numeric(19,0) identity not null,
+        entity_key varchar(255) not null,
+        subscription_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_tmodel (
+        deleted tinyint null,
+        lang_code varchar(5) null,
+        name varchar(255) not null,
+        entity_key varchar(255) not null,
+        primary key (entity_key)
+    );
+
+    create table j3_tmodel_category_bag (
+        id numeric(19,0) not null,
+        entity_key varchar(255) not null,
+        primary key (id),
+        unique (entity_key)
+    );
+
+    create table j3_tmodel_descr (
+        id numeric(19,0) identity not null,
+        descr varchar(1024) not null,
+        lang_code varchar(5) null,
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_tmodel_identifier (
+        id numeric(19,0) identity not null,
+        key_name varchar(255) null,
+        key_value varchar(255) not null,
+        tmodel_key_ref varchar(255) null,
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_tmodel_instance_info (
+        id numeric(19,0) identity not null,
+        instance_parms varchar(512) null,
+        tmodel_key varchar(255) not null,
+        entity_key varchar(255) not null,
+        primary key (id)
+    );
+
+    create table j3_tmodel_instance_info_descr (
+        id numeric(19,0) identity not null,
+        descr varchar(1024) not null,
+        lang_code varchar(5) null,
+        tmodel_instance_info_id numeric(19,0) not null,
+        primary key (id)
+    );
+
+    create table j3_transfer_token (
+        transfer_token varchar(51) not null,
+        expiration_date datetime not null,
+        primary key (transfer_token)
+    );
+
+    create table j3_transfer_token_keys (
+        id numeric(19,0) identity not null,
+        entity_key varchar(255) null,
+        transfer_token varchar(51) not null,
+        primary key (id)
+    );
+
+    create table j3_uddi_entity (
+        entity_key varchar(255) not null,
+        authorized_name varchar(255) not null,
+        created datetime null,
+        modified datetime not null,
+        modified_including_children datetime null,
+        node_id varchar(255) null,
+        primary key (entity_key)
+    );
+
+    alter table j3_address 
+        add constraint FKF83236BE75D860FB 
+        foreign key (address_id) 
+        references j3_contact;
+
+    alter table j3_address_line 
+        add constraint FKC665B8D5F8B8D8CF 
+        foreign key (address_id) 
+        references j3_address;
+
+    alter table j3_binding_category_bag 
+        add constraint FKCF34B2376A68D45A 
+        foreign key (id) 
+        references j3_category_bag;
+
+    alter table j3_binding_category_bag 
+        add constraint FKCF34B237CFBD88B7 
+        foreign key (entity_key) 
+        references j3_binding_template;
+
+    alter table j3_binding_descr 
+        add constraint FK5EA60911CFBD88B7 
+        foreign key (entity_key) 
+        references j3_binding_template;
+
+    alter table j3_binding_template 
+        add constraint FKD044BD6A2E448F3F 
+        foreign key (service_key) 
+        references j3_business_service;
+
+    alter table j3_binding_template 
+        add constraint FKD044BD6AD1823CA5 
+        foreign key (entity_key) 
+        references j3_uddi_entity;
+
+    alter table j3_business_category_bag 
+        add constraint FKD6D3ECB06A68D45A 
+        foreign key (id) 
+        references j3_category_bag;
+
+    alter table j3_business_category_bag 
+        add constraint FKD6D3ECB0BEB92A91 
+        foreign key (entity_key) 
+        references j3_business_entity;
+
+    alter table j3_business_descr 
+        add constraint FK3A24B4B8BEB92A91 
+        foreign key (entity_key) 
+        references j3_business_entity;
+
+    alter table j3_business_entity 
+        add constraint FKCA61A0CD1823CA5 
+        foreign key (entity_key) 
+        references j3_uddi_entity;
+
+    alter table j3_business_identifier 
+        add constraint FKB0C7A652BEB92A91 
+        foreign key (entity_key) 
+        references j3_business_entity;
+
+    alter table j3_business_name 
+        add constraint FK43F526F4BEB92A91 
+        foreign key (entity_key) 
+        references j3_business_entity;
+
+    alter table j3_business_service 
+        add constraint FK5D4255ACD1823CA5 
+        foreign key (entity_key) 
+        references j3_uddi_entity;
+
+    alter table j3_business_service 
+        add constraint FK5D4255ACEF04CFEE 
+        foreign key (business_key) 
+        references j3_business_entity;
+
+    alter table j3_clerk 
+        add constraint FK34DC7D9F6BB0F935 
+        foreign key (node_name) 
+        references j3_node;
+
+    alter table j3_client_subscriptioninfo 
+        add constraint FKDF04CC095BFC6733 
+        foreign key (fromClerk_clerk_name) 
+        references j3_clerk;
+
+    alter table j3_client_subscriptioninfo 
+        add constraint FKDF04CC09F3CE9C04 
+        foreign key (toClerk_clerk_name) 
+        references j3_clerk;
+
+    alter table j3_contact 
+        add constraint FK7551BEEABEB92A91 
+        foreign key (entity_key) 
+        references j3_business_entity;
+
+    alter table j3_contact_descr 
+        add constraint FK56CA9E6C2E3FD94F 
+        foreign key (contact_id) 
+        references j3_contact;
+
+    alter table j3_discovery_url 
+        add constraint FKA042FDAABEB92A91 
+        foreign key (entity_key) 
+        references j3_business_entity;
+
+    alter table j3_email 
+        add constraint FK34F910E62E3FD94F 
+        foreign key (contact_id) 
+        references j3_contact;
+
+    alter table j3_instance_details_descr 
+        add constraint FK3CC165902B115C6F 
+        foreign key (tmodel_instance_info_id) 
+        references j3_tmodel_instance_info;
+
+    alter table j3_instance_details_doc_descr 
+        add constraint FK447324492B115C6F 
+        foreign key (tmodel_instance_info_id) 
+        references j3_tmodel_instance_info;
+
+    alter table j3_keyed_reference 
+        add constraint FK350C8454E075C8D7 
+        foreign key (keyed_reference_group_id) 
+        references j3_keyed_reference_group;
+
+    alter table j3_keyed_reference 
+        add constraint FK350C84541DB72652 
+        foreign key (category_bag_id) 
+        references j3_category_bag;
+
+    alter table j3_keyed_reference_group 
+        add constraint FKF6224ED41DB72652 
+        foreign key (category_bag_id) 
+        references j3_category_bag;
+
+    alter table j3_overview_doc 
+        add constraint FK5CD8D0E8C5BF8903 
+        foreign key (entity_key) 
+        references j3_tmodel;
+
+    alter table j3_overview_doc 
+        add constraint FK5CD8D0E8E8CE1B36 
+        foreign key (tomodel_instance_info_id) 
+        references j3_tmodel_instance_info;
+
+    alter table j3_overview_doc_descr 
+        add constraint FK36FB9EA9BDC711C 
+        foreign key (overview_doc_id) 
+        references j3_overview_doc;
+
+    alter table j3_person_name 
+        add constraint FKCB7B8AFF2E3FD94F 
+        foreign key (contact_id) 
+        references j3_contact;
+
+    alter table j3_phone 
+        add constraint FK359202B82E3FD94F 
+        foreign key (contact_id) 
+        references j3_contact;
+
+    alter table j3_publisher_assertion 
+        add constraint FK8A102449E3544929 
+        foreign key (to_key) 
+        references j3_business_entity;
+
+    alter table j3_publisher_assertion 
+        add constraint FK8A102449CCEE22D8 
+        foreign key (from_key) 
+        references j3_business_entity;
+
+    alter table j3_service_category_bag 
+        add constraint FK185A68076A68D45A 
+        foreign key (id) 
+        references j3_category_bag;
+
+    alter table j3_service_category_bag 
+        add constraint FK185A680748D0656D 
+        foreign key (entity_key) 
+        references j3_business_service;
+
+    alter table j3_service_descr 
+        add constraint FKB6D63D4148D0656D 
+        foreign key (entity_key) 
+        references j3_business_service;
+
+    alter table j3_service_name 
+        add constraint FKCC1BE94B48D0656D 
+        foreign key (entity_key) 
+        references j3_business_service;
+
+    alter table j3_service_projection 
+        add constraint FK629F290F2E448F3F 
+        foreign key (service_key) 
+        references j3_business_service;
+
+    alter table j3_service_projection 
+        add constraint FK629F290FEF04CFEE 
+        foreign key (business_key) 
+        references j3_business_entity;
+
+    alter table j3_subscription_match 
+        add constraint FK5B9C2F19BEEE42E5 
+        foreign key (subscription_key) 
+        references j3_subscription;
+
+    alter table j3_tmodel 
+        add constraint FK83C8072BD1823CA5 
+        foreign key (entity_key) 
+        references j3_uddi_entity;
+
+    alter table j3_tmodel_category_bag 
+        add constraint FK7E0859DB6A68D45A 
+        foreign key (id) 
+        references j3_category_bag;
+
+    alter table j3_tmodel_category_bag 
+        add constraint FK7E0859DBC5BF8903 
+        foreign key (entity_key) 
+        references j3_tmodel;
+
+    alter table j3_tmodel_descr 
+        add constraint FK63DFF1EDC5BF8903 
+        foreign key (entity_key) 
+        references j3_tmodel;
+
+    alter table j3_tmodel_identifier 
+        add constraint FKD5FB623DC5BF8903 
+        foreign key (entity_key) 
+        references j3_tmodel;
+
+    alter table j3_tmodel_instance_info 
+        add constraint FKDC6C9004CFBD88B7 
+        foreign key (entity_key) 
+        references j3_binding_template;
+
+    alter table j3_tmodel_instance_info_descr 
+        add constraint FKD826B4062B115C6F 
+        foreign key (tmodel_instance_info_id) 
+        references j3_tmodel_instance_info;
+
+    alter table j3_transfer_token_keys 
+        add constraint FK8BBF49185ED9DD48 
+        foreign key (transfer_token) 
+        references j3_transfer_token;

Modified: labs/jbossesb/trunk/product/install/jUDDI-registryV3/persistence.xml
===================================================================
--- labs/jbossesb/trunk/product/install/jUDDI-registryV3/persistence.xml	2010-05-24 16:26:15 UTC (rev 33049)
+++ labs/jbossesb/trunk/product/install/jUDDI-registryV3/persistence.xml	2010-05-24 16:38:08 UTC (rev 33050)
@@ -61,7 +61,6 @@
 
     <properties>
       <property name="hibernate.archive.autodetection" value="class"/>
-      <property name="hibernate.hbm2ddl.auto" value="create"/>
       <property name="hibernate.show_sql" value="false"/>
 
       <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect" />

Modified: labs/jbossesb/trunk/product/install/registry-jboss-service-jbossas5.xml
===================================================================
--- labs/jbossesb/trunk/product/install/registry-jboss-service-jbossas5.xml	2010-05-24 16:26:15 UTC (rev 33049)
+++ labs/jbossesb/trunk/product/install/registry-jboss-service-jbossas5.xml	2010-05-24 16:38:08 UTC (rev 33050)
@@ -14,7 +14,7 @@
 		<attribute name="NumThreads">20</attribute>
 		<attribute name="Timeout">20</attribute>
 
-		<depends>jboss.jca:service=DataSourceBinding,name=juddiDB</depends>
+		<depends>jboss.esb:service=JUDDIDatabaseInitializer</depends>
 		<depends>jboss.esb:service=PropertyService</depends>
 	</mbean>
 	<loader-repository>

Modified: labs/jbossesb/trunk/product/install/registry-jboss-service.xml
===================================================================
--- labs/jbossesb/trunk/product/install/registry-jboss-service.xml	2010-05-24 16:26:15 UTC (rev 33049)
+++ labs/jbossesb/trunk/product/install/registry-jboss-service.xml	2010-05-24 16:38:08 UTC (rev 33050)
@@ -7,7 +7,7 @@
 		<attribute name="NumThreads">20</attribute>
 		<attribute name="Timeout">20</attribute>
 
-		<depends>jboss.jca:service=DataSourceBinding,name=juddiDB</depends>
+		<depends>jboss.esb:service=JUDDIDatabaseInitializer</depends>
 		<depends>jboss.esb:service=PropertyService</depends>
 	</mbean>
 	<loader-repository>

Modified: labs/jbossesb/trunk/product/ivy.xml
===================================================================
--- labs/jbossesb/trunk/product/ivy.xml	2010-05-24 16:26:15 UTC (rev 33049)
+++ labs/jbossesb/trunk/product/ivy.xml	2010-05-24 16:38:08 UTC (rev 33050)
@@ -40,7 +40,6 @@
         <dependency org="jboss" name="jboss-system" rev="4.2.2.GA"/>
         <dependency org="jboss" name="jboss" rev="4.2.2.GA"/>
         <dependency org="jboss" name="jbossall-client" rev="4.2.2.GA"/>
-        <!-- dependency org="jboss" name="jbossts.jbossts-common" rev="4.2.2.GA"/ -->
         <dependency org="com.jcraft" name="jsch" rev="0.1.38"/>
         <!-- temporary until 3.0.1 is pushed into maven.  Also need to add juddiv3.war
 	<dependency org="org.apache.juddi" name="uddi-ws" rev="3.0.1"/>

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/listeners/war/HttpGatewayDeploymentFactory.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/listeners/war/HttpGatewayDeploymentFactory.java	2010-05-24 16:26:15 UTC (rev 33049)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/listeners/war/HttpGatewayDeploymentFactory.java	2010-05-24 16:38:08 UTC (rev 33050)
@@ -65,7 +65,12 @@
         // Set the endpoint urlPattern so as to map requests from that namespace into
         // this servlet instance...
         servlet.getUrlMappings().add(urlMapping);
-        
+
+        String allowedPorts = webEndpointConfig.getAttribute(Servlet.ALLOWED_PORTS);
+        if(allowedPorts != null) {
+            servlet.getParams().add( new KeyValuePair(Servlet.ALLOWED_PORTS, allowedPorts) );
+        }
+
         // Add the endpoint address of the servlet...
         addEndpointAddress(webEndpointConfig, servlet, urlMapping);
 

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/listeners/war/Servlet.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/listeners/war/Servlet.java	2010-05-24 16:26:15 UTC (rev 33049)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/listeners/war/Servlet.java	2010-05-24 16:38:08 UTC (rev 33050)
@@ -34,12 +34,14 @@
 public class Servlet extends AbstractWebComponent {
 	
 	public static final String ENDPOINT_ADDRESS = "endpointAddress";
+	public static final String ALLOWED_PORTS = "allowedPorts";
 
 	private Integer loadOnStartup = null;
     private List<String> urlMappings = new ArrayList<String>();
     private SecurityConstraints securityConstraints;
     private Service service = null;
     private String endpointAddress = null;
+    private String allowedPorts = null;
 
     public Servlet(String name, String runtimeClass, WebModel webModel) {
         super(name, runtimeClass, webModel);
@@ -82,4 +84,12 @@
     	this.endpointAddress = endpointAddress;
     }
     
+    public String getAllowedPorts() {
+    	return allowedPorts;
+    }
+    
+    public void setAllowedPorts(String allowedPorts) {
+    	this.allowedPorts = allowedPorts;
+    }
+    
 }

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java	2010-05-24 16:26:15 UTC (rev 33049)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java	2010-05-24 16:38:08 UTC (rev 33050)
@@ -77,6 +77,7 @@
 {
 	private static Logger logger = Logger.getLogger(JAXRRegistryImpl.class);
     private JAXRConnectionFactory jaxrConnectionFactory;
+	private ClassificationScheme jbossESBScheme;
 	private static Concept jbossTModelXXX;
 	public static final String JBOSS_ESB_CATEGORY = "org.jboss.soa.esb.:category";
     private static final String REGISTERED_BY_JBOSSESB = "Registered by JBoss ESB";
@@ -103,10 +104,7 @@
 		    //Adding the category as prefix for the name
 			service = blm.createService(blm.createInternationalString(serviceName));
 			service.setDescription(blm.createInternationalString(serviceDescription));
-            Collection<String> findQualifiers = new ArrayList<String>();
-            findQualifiers.add(FindQualifier.AND_ALL_KEYS);
-            findQualifiers.add(FindQualifier.SORT_BY_NAME_DESC);
-			ClassificationScheme cScheme = bqm.findClassificationSchemeByName(findQualifiers, orgCategory);
+			ClassificationScheme cScheme = getClassificationScheme(bqm, blm);
             Classification classification = blm.createClassification(cScheme, "category", category);
 			service.addClassification(classification);
 			organization.addService(service);
@@ -189,10 +187,7 @@
             serviceBindings.add(serviceBinding);
             
             service.addServiceBindings(serviceBindings);
-            Collection<String> findQualifiers = new ArrayList<String>();
-            findQualifiers.add(FindQualifier.AND_ALL_KEYS);
-            findQualifiers.add(FindQualifier.SORT_BY_NAME_DESC);
-            ClassificationScheme cScheme = bqm.findClassificationSchemeByName(findQualifiers, orgCategory);
+            ClassificationScheme cScheme = getClassificationScheme(bqm, blm);
             Classification classification = blm.createClassification(cScheme, "category", category);
             service.addClassification(classification);
             
@@ -219,7 +214,7 @@
                         + category + " and name = " + serviceName);
             }
             Collection serviceBindings = findServiceBindings(service);
-            service.addServiceBindings(serviceBindings);
+            String toBeDeletedEPRXml = EPRHelper.toXMLString(toBeDeletedEPR).trim();
             for (Iterator i=serviceBindings.iterator();i.hasNext();){
                 ServiceBinding serviceBinding = (ServiceBinding) i.next();
                 String eprXML = serviceBinding.getAccessURI().trim();
@@ -235,7 +230,6 @@
                         logger.error(ue.getMessage(), ue);
                     }
                 }
-                String toBeDeletedEPRXml = EPRHelper.toXMLString(toBeDeletedEPR).trim();
                 if (eprXML.equals(toBeDeletedEPRXml)) {
                     RegistryService rs = connection.getRegistryService();
                     BusinessLifeCycleManager blm = rs.getBusinessLifeCycleManager();
@@ -317,14 +311,6 @@
 			//Converting them to EPRs
 			for (Iterator i=serviceBindings.iterator();i.hasNext();) {
 				ServiceBinding serviceBinding = (ServiceBinding) i.next();
-				
-	            Collection<String> findQualifiers = new ArrayList<String>();
-	            findQualifiers.add(FindQualifier.AND_ALL_KEYS);
-	            findQualifiers.add(FindQualifier.SORT_BY_NAME_DESC);
-				
-	            SpecificationLink sl = new SpecificationLinkImpl(blm);
-	            sl.setSpecificationObject(jbossTModel);
-	            serviceBinding.getSpecificationLinks().add(sl);
 
 				String eprXML = serviceBinding.getAccessURI();
                 EPR epr = null;
@@ -374,9 +360,6 @@
             Collection<ServiceBinding> serviceBindings = findServiceBindings(service);
             if (serviceBindings.iterator().hasNext()) {
                 ServiceBinding serviceBinding = (ServiceBinding) serviceBindings.iterator().next();
-                SpecificationLink sl = new SpecificationLinkImpl(blm);
-	            sl.setSpecificationObject(jbossTModel);
-	            serviceBinding.getSpecificationLinks().add(sl);
 
                 String eprXML = serviceBinding.getAccessURI();
                 // for backwards compatibility still have the decoder if
@@ -473,25 +456,8 @@
 			RegistryService rs = connection.getRegistryService();
 			BusinessQueryManager bqm = rs.getBusinessQueryManager();
             BusinessLifeCycleManager blm = rs.getBusinessLifeCycleManager();
-			// Define find qualifiers and name patterns
-            Collection<String> findQualifiers = new ArrayList<String>();
-            findQualifiers.add(FindQualifier.AND_ALL_KEYS);
-            findQualifiers.add(FindQualifier.EXACT_NAME_MATCH);
-            findQualifiers.add(FindQualifier.SORT_BY_NAME_DESC);
-            ClassificationScheme cScheme = bqm.findClassificationSchemeByName(findQualifiers, orgCategory);
+            final ClassificationScheme cScheme = getClassificationScheme(bqm, blm) ;
             Collection<Classification> classifications = new ArrayList<Classification>();
-            // If the scheme returned null, then we have to create a org.jboss.soa.esb.:category scheme to use
-            if (cScheme == null) {
-            	try {
-            		ClassificationScheme scheme = blm.createClassificationScheme(orgCategory, orgCategory);
-            		ArrayList<ClassificationScheme> cSchemes = new ArrayList<ClassificationScheme>();
-                    cSchemes.add(scheme);
-                    BulkResponse br = blm.saveClassificationSchemes(cSchemes);
-            	} catch (Exception e) {
-            		throw new JAXRException(e);
-            	}
-            	cScheme = bqm.findClassificationSchemeByName(findQualifiers, orgCategory);
-            }
             Classification classification =
                 blm.createClassification(
                   cScheme,
@@ -506,6 +472,10 @@
 			specifications.add(sl);
             
 	        //Find based upon qualifier type and values
+			Collection<String> findQualifiers = new ArrayList<String>();
+			findQualifiers.add(FindQualifier.AND_ALL_KEYS);
+			findQualifiers.add(FindQualifier.EXACT_NAME_MATCH);
+			findQualifiers.add(FindQualifier.SORT_BY_NAME_DESC);
 			logger.log(Level.DEBUG, "Going to query the registry for name pattern " + namePatterns);
 			BulkResponse response = bqm.findServices(null, findQualifiers,
 					namePatterns, classifications, specifications);
@@ -550,15 +520,17 @@
 			RegistryService rs = connection.getRegistryService();
 			BusinessQueryManager bqm = rs.getBusinessQueryManager();
             BusinessLifeCycleManager blm = rs.getBusinessLifeCycleManager();
-            Collection<String> findQualifiers = new ArrayList<String>();
-            findQualifiers.add(FindQualifier.AND_ALL_KEYS);
-            findQualifiers.add(FindQualifier.SORT_BY_NAME_DESC);
-            ClassificationScheme cScheme = bqm.findClassificationSchemeByName(findQualifiers, orgCategory);
+            ClassificationScheme cScheme = getClassificationScheme(bqm, blm);
             //Create classification
             Classification classification =
                 blm.createClassification(
                   cScheme,
                   "category", category );
+
+			// Define find qualifiers and name patterns
+            Collection<String> findQualifiers = new ArrayList<String>();
+            findQualifiers.add(FindQualifier.AND_ALL_KEYS);
+			findQualifiers.add(FindQualifier.SORT_BY_NAME_DESC);
 			Collection<Classification> classifications = new ArrayList<Classification>();
             classifications.add(classification);
 	        //Find based upon qualifier type and values
@@ -751,6 +723,38 @@
 		
 		return jbossESBOrganization;
 	}
+	
+	/**
+	 * finds the JBossESB category classification scheme and creates one if it is not there.
+	 * 
+	 * @return JBossESB category classification scheme
+	 * @throws JAXRException For errors during querying/creating.
+	 */
+	private synchronized ClassificationScheme getClassificationScheme(final BusinessQueryManager bqm, final BusinessLifeCycleManager blm) throws JAXRException
+	{
+		if (jbossESBScheme == null) {
+			// Define find qualifiers and name patterns
+			Collection<String> findQualifiers = new ArrayList<String>();
+			findQualifiers.add(FindQualifier.AND_ALL_KEYS);
+			findQualifiers.add(FindQualifier.EXACT_NAME_MATCH);
+			findQualifiers.add(FindQualifier.SORT_BY_NAME_DESC);
+			ClassificationScheme cScheme = bqm.findClassificationSchemeByName(findQualifiers, JBOSS_ESB_CATEGORY);
+			// If the scheme returned null, then we have to create a org.jboss.soa.esb.:category scheme to use
+			if (cScheme == null) {
+				try {
+					ClassificationScheme scheme = blm.createClassificationScheme(JBOSS_ESB_CATEGORY, JBOSS_ESB_CATEGORY);
+					ArrayList<ClassificationScheme> cSchemes = new ArrayList<ClassificationScheme>();
+					cSchemes.add(scheme);
+					BulkResponse br = blm.saveClassificationSchemes(cSchemes);
+				} catch (Exception e) {
+					throw new JAXRException(e);
+				}
+				cScheme = bqm.findClassificationSchemeByName(findQualifiers, JBOSS_ESB_CATEGORY);
+			}
+			jbossESBScheme = cScheme ;
+		}
+		return jbossESBScheme ;
+	}
 
     /**
 	 * Find the ServiceBindings for a given Service
@@ -761,6 +765,16 @@
 	@SuppressWarnings("unchecked")
 	private Collection<ServiceBinding> findServiceBindings(Service service) throws RegistryException
 	{
+		final Collection currentBindings ;
+		try {
+			currentBindings = service.getServiceBindings() ;
+		} catch (final JAXRException jaxre) {
+			throw new RegistryException(jaxre.getLocalizedMessage(), jaxre);
+		}
+		if ((currentBindings != null) && (currentBindings.size() > 0)) {
+			return currentBindings;
+		}
+		
 		Collection<ServiceBinding> serviceBindings = new ArrayList<ServiceBinding>();
 		Connection connection = jaxrConnectionFactory.getConnection();
 		try {

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBContractGenerator.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBContractGenerator.java	2010-05-24 16:26:15 UTC (rev 33049)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/webservice/ESBContractGenerator.java	2010-05-24 16:38:08 UTC (rev 33050)
@@ -67,7 +67,6 @@
 import org.jboss.soa.esb.Service;
 import org.jboss.soa.esb.dom.YADOMUtil;
 import org.jboss.soa.esb.listeners.config.WebserviceInfo;
-import org.jboss.soa.esb.util.ClassUtil;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -82,7 +81,18 @@
 import com.ibm.wsdl.extensions.soap.SOAPOperationImpl;
 
 public class ESBContractGenerator {
-	private static final QName XSD_QN = new QName("http://www.w3.org/2001/XMLSchema", "schema");
+	private static final String SCHEMA_NAMESPACE = "http://www.w3.org/2001/XMLSchema" ;
+	private static final String SCHEMA_NAME = "schema" ;
+	private static final String SCHEMA_PREFIX = "xs" ;
+	private static final String SCHEMA_ELEMENT = SCHEMA_PREFIX + ':' + SCHEMA_NAME ;
+	private static final String SCHEMA_TARGETNAMESPACE_ATTRIBUTE = "targetNamespace" ;
+	private static final String SCHEMA_VERSION_ATTRIBUTE = "version" ;
+	private static final String SCHEMA_VERSION_VALUE = "1.0" ;
+	
+	private static final String SCHEMA_INCLUDE_ELEMENT = SCHEMA_PREFIX + ":include" ;
+	private static final String IMPORT_SCHEMA_LOCATION_ATTRIBUTE = "schemaLocation" ;
+	
+	private static final QName XSD_QN = new QName(SCHEMA_NAMESPACE, SCHEMA_NAME);
 	private static final String WSDL_NAMESPACE = "http://schemas.xmlsoap.org/wsdl/" ;
 	private static final String WSDL_REQUIRED = "required" ;
 	private static final String WSAW_NAMESPACE = "http://www.w3.org/2006/05/addressing/wsdl" ;
@@ -91,10 +101,6 @@
 	private static final QName WSAW_USING_ADDRESSING_QN = new QName(WSAW_NAMESPACE, "UsingAddressing", WSAW_PREFIX) ;
 	private static WSDLFactory wsdlFactory ;
 	
-	public static String generateWSDL(final WebserviceInfo serviceConfig, final ESBServiceEndpointInfo serviceInfo) throws ConfigurationException {
-	    return generateWSDL(serviceConfig, serviceInfo, null);
-	}
-	
 	public static String generateWSDL(final WebserviceInfo serviceConfig, final ESBServiceEndpointInfo serviceInfo, final ClassLoader classLoader) throws ConfigurationException {
 		final Definition def = getWSDLFactory().newDefinition() ;
 		final String namespace = serviceInfo.getNamespace() ;
@@ -123,45 +129,34 @@
 
 		int nsSuffixCounter = 0 ;
 		if (inXsd != null) {
-			try {
-				Document doc = YADOMUtil.parseStream(getResourceAsStream(inXsd, classLoader), false, false);
-				if (doc != null) {
-					reqMessage = addMessage(def, doc.getDocumentElement(),
-							serviceInfo.getRequestName(), "in", ++nsSuffixCounter, schemasAdded);
-				}
-			} catch (Exception e) {
-				throw new ConfigurationException("File defined in inXsd attribute '" + inXsd + "' not found in classpath.", e);
+			final QName[] elementNames = getElementNames(inXsd, classLoader, schemasAdded, def, ++nsSuffixCounter) ;
+			if ((elementNames == null) || (elementNames.length == 0)) {
+				throw new ConfigurationException("File defined in inXsd attribute '" + inXsd + "' not found in classpath or contains no elements.");
+			} else {
+				reqMessage = addMessage(def, elementNames[0], serviceInfo.getRequestName(), "in");
 			} 
 		}
 
 		if (outXsd != null) {
-			try {
-				Document doc = YADOMUtil.parseStream(getResourceAsStream(outXsd, classLoader), false, false);
-				if (doc != null) {
-					resMessage = addMessage(def, doc.getDocumentElement(),
-						serviceInfo.getResponseName(), "out", ++nsSuffixCounter, schemasAdded);
-				}
-			} catch (Exception e) {
-				throw new ConfigurationException("File defined in outXsd attribute '" + outXsd + "' not found in classpath.", e);
+			final QName[] elementNames = getElementNames(outXsd, classLoader, schemasAdded, def, ++nsSuffixCounter) ;
+			if ((elementNames == null) || (elementNames.length == 0)) {
+				throw new ConfigurationException("File defined in outXsd attribute '" + outXsd + "' not found in classpath or contains no elements.");
+			} else {
+				resMessage = addMessage(def, elementNames[0], serviceInfo.getResponseName(), "out");
 			} 
-
 		}
 
 		if ((faultXsd != null) && !serviceInfo.isOneWay()) {
-			try {
-				final String[] xsds = faultXsd.split(",") ;
-				faultMessages = new ArrayList<Message>();
-				for(String xsd: xsds) {
-					Document doc = YADOMUtil.parseStream(getResourceAsStream(xsd, classLoader), false, false);
-					if (doc != null) {
-						addFaultMessage(faultMessages, def, doc.getDocumentElement(),
-							serviceInfo.getFaultName(), "fault", ++nsSuffixCounter, schemasAdded);
-					}
+			final String[] xsds = faultXsd.split(",") ;
+			faultMessages = new ArrayList<Message>();
+			for(String xsd: xsds) {
+				final QName[] elementNames = getElementNames(xsd, classLoader, schemasAdded, def, ++nsSuffixCounter) ;
+				if ((elementNames == null) || (elementNames.length == 0)) {
+					throw new ConfigurationException("File defined in faultXsd attribute '" + xsd + "' not found in classpath or contains no elements.");
+				} else {
+					addFaultMessage(faultMessages, def, elementNames, serviceInfo.getFaultName(), "fault");
 				}
-			} catch (Exception e) {
-				throw new ConfigurationException("File defined in faultXsd attribute '" + faultXsd + "' not found in classpath.", e);
-			} 
-
+			}
 		}
 
 		PortType portType = addPortType(def, serviceInfo, reqMessage,
@@ -178,28 +173,92 @@
 		return sw.toString();
 	}
 	
-	private static void addSchema(Types types, Element xsdElement, Set<String> schemasAdded) throws SAXException, IOException, TransformerException, ParserConfigurationException {
-	    if (add(xsdElement, schemasAdded))
-	    {
-    		SchemaImpl schemaImpl = new SchemaImpl();
-    		schemaImpl.setElement(xsdElement);
-    		schemaImpl.setElementType(XSD_QN);
-    		types.addExtensibilityElement(schemaImpl);
-	    }
+	private static QName[] getElementNames(final String resource, final ClassLoader classLoader, final Set<String> schemasAdded,
+		Definition def, int nsSuffixCounter) throws ConfigurationException
+	{
+		final String schemaLocation = getRelativeResource(resource) ;
+		final InputStream is = getResourceAsStream(schemaLocation, classLoader) ;
+		if (is == null)
+		{
+			return null ;
+		}
+		final Document doc ;
+		try
+		{
+			try
+			{
+				doc = YADOMUtil.parseStream(is, false, false);
+			}
+			finally
+			{
+				is.close() ;
+			}
+		}
+		catch (final Exception ex)
+		{
+			throw new ConfigurationException("Unexpected exception parsing schema resource: " + schemaLocation, ex) ;
+		}
+		final Element schemaElement = doc.getDocumentElement() ;
+		final String targetNamespace = YADOMUtil.getAttribute(schemaElement, SCHEMA_TARGETNAMESPACE_ATTRIBUTE, "") ;
+		final boolean added ;
+		try
+		{
+			added = add(schemaElement, schemasAdded) ;
+		}
+		catch (final Exception ex)
+		{
+			throw new ConfigurationException("Unexpected exception adding schema to known resources: " + schemaLocation, ex) ;
+		}
+		if (added)
+		{
+			if (def.getNamespace(targetNamespace) == null)
+			{
+				def.addNamespace("esbns" + nsSuffixCounter, targetNamespace) ;
+			}
+			final Types types = def.getTypes() ;
+			SchemaImpl schemaImpl = new SchemaImpl();
+			final Document schemaDoc = YADOMUtil.createDocument() ;
+			final Element xsdElement = schemaDoc.createElementNS(SCHEMA_NAMESPACE, SCHEMA_ELEMENT) ;
+			xsdElement.setAttribute(SCHEMA_TARGETNAMESPACE_ATTRIBUTE, targetNamespace) ;
+			xsdElement.setAttribute(SCHEMA_VERSION_ATTRIBUTE, SCHEMA_VERSION_VALUE) ;
+			final Element xsdInclude = schemaDoc.createElementNS(SCHEMA_NAMESPACE, SCHEMA_INCLUDE_ELEMENT) ;
+			xsdInclude.setAttribute(IMPORT_SCHEMA_LOCATION_ATTRIBUTE, schemaLocation) ;
+			xsdElement.appendChild(xsdInclude) ;
+			schemaImpl.setElement(xsdElement) ;
+			schemaImpl.setElementType(XSD_QN);
+			types.addExtensibilityElement(schemaImpl);
+		}
+		final NodeList nodes = YADOMUtil.getNodeList(schemaElement, "/schema/element") ;
+		final int numNodes = nodes.getLength() ;
+		final QName[] result = new QName[numNodes] ;
+		for (int count = 0 ; count < numNodes ; count++)
+		{
+			final Node node = nodes.item(count) ;
+			result[count] = new QName(targetNamespace, YADOMUtil.getAttribute((Element) node, "name", "")) ;
+		}
+		return result ;
 	}
 	
+	private static String getRelativeResource(final String resource)
+	{
+		final int length = resource.length() ;
+		for(int count = 0 ; count < length ; count++)
+		{
+			if (resource.charAt(count) != '/')
+			{
+				return resource.substring(count) ;
+			}
+		}
+		return "" ;
+	}
+
 	private static InputStream getResourceAsStream(final String resource, final ClassLoader classLoader)
 	{
-	    if (classLoader != null)
-	    {
-	        final InputStream in = classLoader.getResourceAsStream(resource);
-	        if (in !=null )
-	        {
-	            return in;
-	        }
-	    }
-	    // Fallback to using the class's clasloader.
-		return ClassUtil.getResourceAsStream(resource, ESBContractGenerator.class);
+		if (classLoader != null)
+		{
+			return classLoader.getResourceAsStream(resource) ;
+		}
+		return null ;
 	}
 
 	private static boolean add(final Element schemaElement, final Set<String> schemasAdded) throws SAXException, IOException, TransformerException, ParserConfigurationException
@@ -234,49 +293,32 @@
         return false;
     }
 
-    private static Message addMessage(Definition def, Element element, String msgName, String partName, int nsSuffixCounter, Set<String> schemasAdded) throws SAXException, IOException, TransformerException, ParserConfigurationException {
-		String schemaNs = YADOMUtil
-				.getAttribute(element, "targetNamespace", "");
-		addSchema(def.getTypes(), element, schemasAdded);
-		if (def.getNamespace(schemaNs) == null) {
-			def.addNamespace("ns" + nsSuffixCounter, schemaNs);
-		}
+	private static Message addMessage(Definition def, QName elementName, String msgName, String partName) {
 		// add request message
-		Node node = YADOMUtil.getNode(element, "/schema/element");
 		Message msg = def.createMessage();
 		msg.setQName(new QName(def.getTargetNamespace(), msgName));
 		msg.setUndefined(false);
 		Part part = def.createPart();
 		part.setName(partName);
-		part.setElementName(new QName(schemaNs, YADOMUtil.getAttribute(
-				(Element) node, "name", "")));
+		part.setElementName(elementName) ;
 		msg.addPart(part);
 		def.addMessage(msg);
 		return msg;
 	}
 
 	private static void addFaultMessage(final List<Message> faultMessages,
-			Definition def, Element element, String msgName, String partName,
-			int nsSuffixCounter, Set<String> schemasAdded) throws SAXException, IOException, TransformerException, ParserConfigurationException {
-		String schemaNs = YADOMUtil
-				.getAttribute(element, "targetNamespace", "");
-		addSchema(def.getTypes(), element, schemasAdded);
-		if (def.getNamespace(schemaNs) == null) {
-			def.addNamespace("ns" + nsSuffixCounter, schemaNs);
-		}
+			Definition def, QName[] elementNames, String msgName, String partName) {
 		// add request message
-		NodeList nodes = YADOMUtil.getNodeList(element, "/schema/element");
-		for (int i = 0; i < nodes.getLength(); i++) {
+		final int numElements = (elementNames == null ? 0 : elementNames.length) ;
+		for (int i = 0; i < numElements; i++) {
 			final int nameIndex = i + 1;
-			Node node = nodes.item(0);
 			Message msg = def.createMessage();
 			msg.setQName(new QName(def.getTargetNamespace(), msgName
 					+ nameIndex));
 			msg.setUndefined(false);
 			Part part = def.createPart();
 			part.setName(partName + nameIndex);
-			part.setElementName(new QName(schemaNs, YADOMUtil.getAttribute(
-					(Element) node, "name", "")));
+			part.setElementName(elementNames[i]);
 			msg.addPart(part);
 			def.addMessage(msg);
 			faultMessages.add(msg);

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/routing/JMSRouter.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/routing/JMSRouter.java	2010-05-24 16:26:15 UTC (rev 33049)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/routing/JMSRouter.java	2010-05-24 16:38:08 UTC (rev 33050)
@@ -33,7 +33,6 @@
 import javax.jms.Message;
 import javax.jms.MessageProducer;
 import javax.jms.ObjectMessage;
-import javax.jms.Queue;
 import javax.jms.TextMessage;
 import javax.naming.Context;
 import javax.naming.NamingException;
@@ -167,9 +166,9 @@
      */
     private ConfigTree properties;
     /**
-     * The JMS Queue name from the configuration
+     * The JMS Destination name from the configuration
      */
-    private String queueName;
+    private String destinationName;
     /**
      * Strategy for setting JMSProperties
      */
@@ -217,7 +216,7 @@
      * Sole public constructor.
      * 
      * @param propertiesTree Action properties.
-     * @throws ConfigurationException Queue name not configured.
+     * @throws ConfigurationException Destination name not configured.
      * @throws JMSException Unable to configure JMS destination.
      * @throws NamingException Unable to configure JMS destination.
      */
@@ -226,8 +225,8 @@
 
         this.properties = propertiesTree;
 
-        queueName = properties.getAttribute("jndiName");
-        if(queueName == null) {
+        destinationName = properties.getAttribute("jndiName");
+        if(destinationName == null) {
             throw new ConfigurationException("JMSRouter must specify a 'jndiName' property.");
         }
 
@@ -284,7 +283,7 @@
             throw new ConfigurationException("Unexpected error obtaining JMS connection pool") ;
         }
         
-        createQueueSetup(queueName, jndiContextFactory, jndiUrl, jndiPkgPrefix, connectionFactory, securityPrincipal, securityCredential);
+        createQueueSetup(destinationName, jndiContextFactory, jndiUrl, jndiPkgPrefix, connectionFactory, securityPrincipal, securityCredential);
     }
 
     /**
@@ -332,7 +331,7 @@
         SESSION.set(jmsSession) ;
         try {
             if(!(message instanceof org.jboss.soa.esb.message.Message)) {
-                throw new ActionProcessingException("Cannot send Object [" + message.getClass().getName() + "] to destination [" + queueName + "]. Object must be an instance of org.jboss.soa.esb.message.Message) .");
+                throw new ActionProcessingException("Cannot send Object [" + message.getClass().getName() + "] to destination [" + destinationName + "]. Object must be an instance of org.jboss.soa.esb.message.Message) .");
             }
         
             final org.jboss.soa.esb.message.Message esbMessage = (org.jboss.soa.esb.message.Message)message;
@@ -355,7 +354,7 @@
             } catch (JMSException jmse) {
                 throw jmse ;
             } catch(Exception e) {
-                final String errorMessage = "Exception while sending message [" + message + "] to destination [" + queueName + "]." ;
+                final String errorMessage = "Exception while sending message [" + message + "] to destination [" + destinationName + "]." ;
                 logger.error(errorMessage);
                 throw new ActionProcessingException(errorMessage, e);
             }
@@ -383,7 +382,7 @@
         	jmsMessage = SESSION.get().createTextMessage();
 
             if(logger.isDebugEnabled()) {
-                logger.debug("Sending Text message: [" + objectFromBody + "] to destination [" + queueName + "].");
+                logger.debug("Sending Text message: [" + objectFromBody + "] to destination [" + destinationName + "].");
             }
 
             ((TextMessage)jmsMessage).setText((String)objectFromBody);
@@ -391,7 +390,7 @@
         	jmsMessage = SESSION.get().createBytesMessage();
 
             if(logger.isDebugEnabled()) {
-                logger.debug("Sending byte[] message: [" + objectFromBody + "] to destination [" + queueName + "].");
+                logger.debug("Sending byte[] message: [" + objectFromBody + "] to destination [" + destinationName + "].");
             }
 
             ((BytesMessage)jmsMessage).writeBytes((byte[])objectFromBody);
@@ -439,7 +438,7 @@
 		jmsMessage = SESSION.get().createObjectMessage();
 
 		if(logger.isDebugEnabled()) {
-		    logger.debug("Sending Object message: [" + message + "] to destination [" + queueName + "].");
+		    logger.debug("Sending Object message: [" + message + "] to destination [" + destinationName + "].");
 		}
 		((ObjectMessage)jmsMessage).setObject((Serializable) message);
 		return jmsMessage;
@@ -471,7 +470,7 @@
         return null;
     }
 
-    protected void createQueueSetup( String queueName,
+    protected void createQueueSetup( String destinationName,
     		String jndiContextFactory,
     		String jndiUrl,
     		String jndiPkgPrefix,
@@ -487,15 +486,10 @@
                 Context oCtx = NamingContextPool.getNamingContext(environment);
                 try {
                     try {
-                        jmsDestination = (Queue) oCtx.lookup(queueName);
+                        jmsDestination = (Destination) oCtx.lookup(destinationName);
                     } catch (NamingException ne) {
-                        try {
-                            oCtx = NamingContextPool.replaceNamingContext(oCtx, environment);
-                            jmsDestination = (Queue) oCtx.lookup(queueName);
-                        } catch (NamingException nex) {
-                            //ActiveMQ
-                            jmsDestination = jmsSession.createQueue(queueName);
-                        }
+                        oCtx = NamingContextPool.replaceNamingContext(oCtx, environment);
+                        jmsDestination = (Destination) oCtx.lookup(destinationName);
                     }
                     final MessageProducer jmsProducer = jmsSession.createProducer(jmsDestination);
                     jmsProducer.close() ;
@@ -508,7 +502,7 @@
 		} 
 		catch (Throwable t) 
 		{
-			throw new ConfigurationException("Failed to configure JMS Queue for routing.", t);
+			throw new ConfigurationException("Failed to configure JMS Destination for routing.", t);
 		}
     }
     
@@ -517,9 +511,9 @@
         return environment ;
     }
     
-    protected void createQueueSetup( String queueName ) throws ConfigurationException
+    protected void createQueueSetup( String destinationName ) throws ConfigurationException
 	{
-    	createQueueSetup(queueName, null, null, null, null, null, null);
+    	createQueueSetup(destinationName, null, null, null, null, null, null);
 	}
     
 

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/validation/SchemaValidationAction.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/validation/SchemaValidationAction.java	2010-05-24 16:26:15 UTC (rev 33049)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/actions/validation/SchemaValidationAction.java	2010-05-24 16:38:08 UTC (rev 33050)
@@ -1,12 +1,10 @@
 package org.jboss.soa.esb.actions.validation;
 
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.StringReader;
 
 import javax.xml.XMLConstants;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;
@@ -22,7 +20,6 @@
 import org.jboss.soa.esb.message.Message;
 import org.jboss.soa.esb.message.MessagePayloadProxy;
 import org.jboss.soa.esb.util.ClassUtil;
-import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
 
 /**
@@ -61,11 +58,6 @@
     private String schemaLanguage;
 
     /**
-     * DocumentBuilderFactory.
-     */
-    private DocumentBuilderFactory docBuilderFactory;
-
-    /**
      * The schema that will be used for validation.
      */
     private Schema schema;
@@ -87,7 +79,6 @@
         schemaLanguage = config.getAttribute("schemaLanguage", XMLConstants.W3C_XML_SCHEMA_NS_URI);
 
         payloadProxy = new MessagePayloadProxy(config);
-        docBuilderFactory = createDocumentBuilderFactory();
         schema = createSchema(xsd);
     }
 
@@ -112,7 +103,7 @@
         try
         {
             final Validator validator = schema.newValidator();
-            validator.validate(createDomSourceFromPayload(xml));
+            validator.validate(createSourceFromPayload(xml));
         }
         catch (final SAXException e)
         {
@@ -160,26 +151,9 @@
      *
      * @throws ActionProcessingException If an exception occurs while trying to create the DOMSource.
      */
-    private DOMSource createDomSourceFromPayload(final String xml) throws ActionProcessingException
+    private Source createSourceFromPayload(final String xml) throws ActionProcessingException
     {
-        try
-        {
-            final DocumentBuilder parser = docBuilderFactory.newDocumentBuilder();
-            final Document document = parser.parse(new ByteArrayInputStream(xml.getBytes()));
-            return new DOMSource(document);
-        }
-        catch (final ParserConfigurationException e)
-        {
-            throw new ActionProcessingException(e.getMessage(), e);
-        }
-        catch (final SAXException e)
-        {
-            throw new ActionProcessingException(e.getMessage(), e);
-        }
-        catch (final IOException e)
-        {
-            throw new ActionProcessingException(e.getMessage(), e);
-        }
+    	return new StreamSource(new StringReader(xml));
     }
 
     /**
@@ -202,16 +176,4 @@
             throw new ConfigurationException("Could not create a validator for schema '" + xsd + "'", e);
         }
     }
-
-    /**
-     * Creates a DocumentBuilderFactory that is namespace aware.
-     *
-     * @return {@link DocumentBuilderFactory} that is namespace aware.
-     */
-    private DocumentBuilderFactory createDocumentBuilderFactory()
-    {
-        final DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
-        docBuilderFactory.setNamespaceAware(true);
-        return docBuilderFactory;
-    }
 }

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/helpers/persist/JdbcCleanConn.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/helpers/persist/JdbcCleanConn.java	2010-05-24 16:26:15 UTC (rev 33049)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/helpers/persist/JdbcCleanConn.java	2010-05-24 16:38:08 UTC (rev 33050)
@@ -59,9 +59,12 @@
 	
 	public void commit() throws SQLException
 	{
-		if ((null != m_conn) && (!transactional))
+		if (null != m_conn)
 		{
-			m_conn.commit();
+			if(!transactional) 
+			{
+				m_conn.commit();
+			}
 		}
 		else
 			throw new SQLException("Connection is null!");
@@ -69,9 +72,11 @@
 
 	public void rollback() throws SQLException
 	{
-		if ((null != m_conn) && (!transactional))
+		if (null != m_conn)
 		{
-			m_conn.rollback();
+			if(!transactional) {
+				m_conn.rollback();
+			}
 		} else {
 			throw new SQLException("Connection is null");
 		}
@@ -288,6 +293,10 @@
 
 		if (!transactional)
 		{
+			if(m_conn.isClosed()) {
+				System.out.println("*** DS returning dead connections!!!");
+			}
+			
 			m_conn.setAutoCommit(false);
 			m_conn.setTransactionIsolation(Connection.TRANSACTION_SERIALIZABLE);
 		}

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java	2010-05-24 16:26:15 UTC (rev 33049)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployer.java	2010-05-24 16:38:08 UTC (rev 33050)
@@ -456,7 +456,7 @@
                        }
                        
                        final ESBServiceEndpointInfo serviceInfo = new ESBServiceEndpointInfo(webserviceInfo) ;
-                       final String wsdl = ESBContractGenerator.generateWSDL(webserviceInfo, serviceInfo) ;
+                       final String wsdl = ESBContractGenerator.generateWSDL(webserviceInfo, serviceInfo, di.localCl) ;
                        webDeployment.addEntry(serviceInfo.getWSDLFileName(), wsdl.getBytes("UTF-8"));
 
                        final String handlers = JBossDeployerUtil.getHandlers(serviceInfo) ;

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbDeployment.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbDeployment.java	2010-05-24 16:26:15 UTC (rev 33049)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbDeployment.java	2010-05-24 16:38:08 UTC (rev 33050)
@@ -117,22 +117,28 @@
     }
 
     public void start() throws Exception
-    {
-        log.info("Starting ESB Deployment '" + deploymentName + "'");
-        
+    {    
         if (controller == null)
         {
+        	log.info("Starting ESB Deployment '" + deploymentName + "'");
             controller = Configuration.create(jbossEsbXml, new ObjectName(mbeanName), publishers, servlets);
             controller.start();
         }
     }
 
+	public boolean isStarted() {
+		return (controller != null);
+	}
+
     public void stop() throws Exception
-    {
-        log.info("Stopping '" + deploymentName + "'");
-        
-        ServicePublisher.removeServicePublishers(controller);
-        controller.stop();
+    {        
+        if (controller != null)
+        {
+        	log.info("Stopping '" + deploymentName + "'");
+	        ServicePublisher.removeServicePublishers(controller);
+	        controller.stop();
+	        controller = null;
+        }
     }
 
     public void destroy() throws Exception

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbDeploymentMBean.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbDeploymentMBean.java	2010-05-24 16:26:15 UTC (rev 33049)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbDeploymentMBean.java	2010-05-24 16:38:08 UTC (rev 33050)
@@ -35,6 +35,13 @@
     void start() throws Exception;
 
     /**
+     * Is the deployment started.
+     * 
+     * @return True if the deployment is started, otherwise false.
+     */
+    boolean isStarted();
+
+    /**
      * Stop a deployment.
      * 
      * @throws Exception  If an exeption occurs while stoping.

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbWsdlDeployer.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbWsdlDeployer.java	2010-05-24 16:26:15 UTC (rev 33049)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/EsbWsdlDeployer.java	2010-05-24 16:38:08 UTC (rev 33050)
@@ -122,21 +122,24 @@
                 
                 final List<URL> wsdls = new ArrayList<URL>();
                 
-                for (WebserviceInfo wsInfo : webServices)
+                if (webServices.size() > 0)
                 {
-                    // Generate the wsdl for the web service.
-                    final ESBServiceEndpointInfo serviceInfo = new ESBServiceEndpointInfo(wsInfo);
-                    final String wsdl = ESBContractGenerator.generateWSDL(wsInfo, serviceInfo, unit.getClassLoader());
-                    final URL wsdlUrl = VfsUtil.createInMemUrl(inMemRootUrl, serviceInfo.getWSDLFileName());
-                    log.info("Generating wsdl url : " + wsdlUrl);
+                    for (WebserviceInfo wsInfo : webServices)
+                    {
+                        // Generate the wsdl for the web service.
+                        final ESBServiceEndpointInfo serviceInfo = new ESBServiceEndpointInfo(wsInfo);
+                        final String wsdl = ESBContractGenerator.generateWSDL(wsInfo, serviceInfo, unit.getClassLoader());
+                        final URL wsdlUrl = VfsUtil.createInMemUrl(inMemRootUrl, serviceInfo.getWSDLFileName());
+                        log.info("Generating wsdl url : " + wsdlUrl);
+                        
+                        // Add the wsdl in the virtual file system
+                        VirtualFile wsdlFile = VfsUtil.addFile(inMemRootUrl, serviceInfo.getWSDLFileName(), wsdl.getBytes());
+                        wsdls.add(wsdlUrl);
+                        
+                        // Add any additional schemas in the deployment unit to the in-memory vfs.
+                        addSchemasToVfs(getSchemas(unit.getRoot()), wsdlFile.getParent(), esbMetaData.getArchiveName());
+                    }
                     
-                    // Add the wsdl in the virtual file system
-                    VirtualFile wsdlFile = VfsUtil.addFile(inMemRootUrl, serviceInfo.getWSDLFileName(), wsdl.getBytes());
-                    wsdls.add(wsdlUrl);
-                    
-                    // Add any additional schemas in the deployment unit to the in-memory vfs.
-                    addSchemasToVfs(getSchemas(unit.getRoot()), wsdlFile.getParent(), esbMetaData.getArchiveName());
-                    
                     // Add the root of the virtual file system as a meta data location.
                     unit.appendMetaDataLocation(inMemRootDir);
                 }

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/util/VfsUtil.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/util/VfsUtil.java	2010-05-24 16:26:15 UTC (rev 33049)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/deployers/mc/util/VfsUtil.java	2010-05-24 16:38:08 UTC (rev 33050)
@@ -128,20 +128,27 @@
         }
         
         final int idx = path.indexOf(pathName);
+        final String subpath ;
         if (idx != -1)
         {
-            String filePath = path.substring(idx + pathName.length());
-            if (pathPrefix == null)
-            {
-                return filePath;
-            }
-            else 
-            {
-                return pathPrefix + filePath;
-            }
+            subpath = path.substring(idx + pathName.length());
         }
-        return path;
-        
+        else
+        {
+            subpath = path ;
+        }
+        if (pathPrefix == null)
+        {
+            return subpath;
+        }
+        else if (subpath.startsWith("/")) 
+        {
+            return pathPrefix + subpath;
+        }
+        else
+        {
+            return pathPrefix + "/" + subpath;
+        }
     }
     
     static String subpath(final String path, final String pathName)

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/SqlTableGatewayListener.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/SqlTableGatewayListener.java	2010-05-24 16:26:15 UTC (rev 33049)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/SqlTableGatewayListener.java	2010-05-24 16:38:08 UTC (rev 33050)
@@ -101,6 +101,8 @@
      * The current transaction strategy
      */
     private TransactionStrategy transactionStrategy ;
+
+	private boolean transacted;
     
     public SqlTableGatewayListener(ConfigTree config)
             throws ConfigurationException {
@@ -146,10 +148,7 @@
         }
         finally {
             if (failure) {
-                if (_dbConn != null) {
-                    _dbConn.release();
-                    _dbConn = null;
-                }
+                releaseDBConnection();
             }
         }
     }
@@ -396,7 +395,7 @@
             }
         }
         
-        final boolean transacted = _config.getBooleanAttribute(ListenerTagNames.TRANSACTED_TAG, false) ;
+        transacted = _config.getBooleanAttribute(ListenerTagNames.TRANSACTED_TAG, false);
         transactionStrategy = TransactionStrategy.getTransactionStrategy(transacted) ;
     } // ________________________________
 
@@ -519,11 +518,21 @@
     } // ________________________________
 
     public void refreshDatasource() {
-    	_dbConn = null;
+    	releaseDBConnection();    	
     	if (_datasource != null) {
     		getDbConn();
     	}
     }
+
+	private void releaseDBConnection() {
+		if(_dbConn != null) {
+			try {
+				_dbConn.release();
+			} finally {
+				_dbConn = null;
+			}
+    	}
+	}
     
     /**
      * Obtain a new database connection with parameter info
@@ -554,13 +563,14 @@
         	 * at the appropriate time.
         	 */
         	
-            _dbConn = new JdbcCleanConn(oDS);
+        	_dbConn = new JdbcCleanConn(oDS, transacted);
         } 
       
         if ((null != _dbConn) && (_dbConn.getStatements().size() == 0)) {
         	try {
-				prepareStatements();
+				prepareStatements();				
 			} catch (SQLException e) {
+				releaseDBConnection();
 				_logger.warn("Exception preparing statements", e);
 			}
         }

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/http/HttpGatewayServlet.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/http/HttpGatewayServlet.java	2010-05-24 16:26:15 UTC (rev 33049)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/http/HttpGatewayServlet.java	2010-05-24 16:38:08 UTC (rev 33050)
@@ -25,6 +25,7 @@
 import java.io.OutputStream;
 import java.util.Enumeration;
 import java.util.Map;
+import java.util.StringTokenizer;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
@@ -87,6 +88,7 @@
     private MessageComposer<HttpRequestWrapper> messageComposer;
     private long blockingTimeout = 30000L;
     private Map<String, Integer> exceptionMappings;
+    private int[] allowedPorts = new int[0];
 
     public void init(ServletConfig config) throws ServletException {
         service = new Service(
@@ -99,8 +101,19 @@
             throw new ServletException("Unable to create ServiceInvoker for Service '" + service + "'.", e);
         }
     	endpointAddress = config.getInitParameter(Servlet.ENDPOINT_ADDRESS);
-        
+
+        String allow = config.getInitParameter(Servlet.ALLOWED_PORTS);
+        if (allow != null) {
+            StringTokenizer tokens = new StringTokenizer(allow, ",");
+            int noOfItems = tokens.countTokens();
+            this.allowedPorts = new int[noOfItems];
+            for (int i = 0; i < noOfItems; i++) {
+                this.allowedPorts[i] = Integer.parseInt(tokens.nextToken());
+            }
+        }
+
         ConfigTree configTree = toConfigTree(config);
+
         try {
             messageComposer = MessageComposer.Factory.getInstance(configTree.getAttribute(ListenerTagNames.GATEWAY_COMPOSER_CLASS_TAG, HttpMessageComposer.class.getName()), configTree);
         } catch (ConfigurationException e) {
@@ -143,13 +156,36 @@
     }
 
     protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-    	// if it's a wsdl request, serve up the contract then short-circuit
-    	String query = req.getQueryString();
-    	if (query != null && query.toLowerCase().startsWith("wsdl")) {
-    		handleWsdlRequest(req, resp);
-    		return;
-    	}
-    	
+        int noOfItems = this.allowedPorts.length;
+        int port = req.getServerPort();
+        boolean allow = false;
+        if (noOfItems == 0) {
+            allow = true;
+        }
+        else {
+            for (int i = 0; i < noOfItems; i++) {
+                if (allowedPorts[i] == port) {
+                    allow = true;
+                    break;
+                }
+            }
+        }
+
+        if (allow) {
+            processServiceRequest(req, resp);
+        } else {
+            resp.sendError(HttpServletResponse.SC_NOT_FOUND);
+        }
+    }
+
+    private void processServiceRequest(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        // if it's a wsdl request, serve up the contract then short-circuit
+        String query = req.getQueryString();
+        if (query != null && query.toLowerCase().startsWith("wsdl")) {
+            handleWsdlRequest(req, resp);
+            return;
+        }
+        
         HttpRequestWrapper wrapper = new HttpRequestWrapper(req, resp, service);
 
         Message inMessage;

Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/ESBContractGeneratorUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/ESBContractGeneratorUnitTest.java	2010-05-24 16:26:15 UTC (rev 33049)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/ESBContractGeneratorUnitTest.java	2010-05-24 16:38:08 UTC (rev 33050)
@@ -23,6 +23,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
+import java.net.URL;
 import java.util.List;
 
 import javax.wsdl.Binding;
@@ -145,10 +146,18 @@
         List<WebserviceInfo> services = generator.getModel().getWebserviceServices();
         final WebserviceInfo service = services.get(0) ;
         final ESBServiceEndpointInfo endpointInfo = new ESBServiceEndpointInfo(service) ;
-        String wsdl = ESBContractGenerator.generateWSDL(service, endpointInfo);
+        String wsdl = ESBContractGenerator.generateWSDL(service, endpointInfo, ESBContractGenerator.class.getClassLoader());
+        
+        final URL resourceURL = getClass().getResource("request.xsd") ;
+        assertNotNull("Resource location", resourceURL) ;
+        final String resourceLocation = resourceURL.toString() ;
+        final int orgIndex = resourceLocation.lastIndexOf("/org/") ;
+        assertTrue("org package index", orgIndex >= 0) ;
+        final String wsdlLocation = resourceLocation.substring(0, orgIndex) + "/tmp.wsdl" ;
+        
         java.io.StringReader strReader = new java.io.StringReader(wsdl);
         InputSource inputSource = new InputSource(strReader);
-        Definition def = WSDLFactory.newInstance().newWSDLReader().readWSDL("file://tmp.wsdl", inputSource);
+        Definition def = WSDLFactory.newInstance().newWSDLReader().readWSDL(wsdlLocation, inputSource);
         assertNotNull("Failed to generate wsdl file" , def);
 
         return def;

Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/request.xsd
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/request.xsd	2010-05-24 16:26:15 UTC (rev 33049)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/request.xsd	2010-05-24 16:38:08 UTC (rev 33050)
@@ -1,8 +1,4 @@
-<xs:schema version="1.0" targetNamespace="http://www.jboss.org/sayHi" xmlns:x1="http://www.jboss.org/sayHi"  xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+<xs:schema version="1.0" targetNamespace="http://www.jboss.org/sayHi" xmlns:x1="http://www.jboss.org/sayHiType"  xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+  <xs:import namespace="http://www.jboss.org/sayHiType" schemaLocation="requestType.xsd"/>
   <xs:element name="sayHi" type="x1:sayHi"/>
-  <xs:complexType name="sayHi">
-    <xs:sequence>
-      <xs:element name="arg0" type="xs:string" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
 </xs:schema>

Copied: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/requestType.xsd (from rev 33044, labs/jbossesb/tags/JBESB_4_7_CP2_ER2/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/requestType.xsd)
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/requestType.xsd	                        (rev 0)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/internal/soa/esb/webservice/requestType.xsd	2010-05-24 16:38:08 UTC (rev 33050)
@@ -0,0 +1,7 @@
+<xs:schema version="1.0" targetNamespace="http://www.jboss.org/sayHiType" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+  <xs:complexType name="sayHi">
+    <xs:sequence>
+      <xs:element name="arg0" type="xs:string" minOccurs="0"/>
+    </xs:sequence>
+  </xs:complexType>
+</xs:schema>

Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/routing/JMSRouterUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/routing/JMSRouterUnitTest.java	2010-05-24 16:26:15 UTC (rev 33049)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/actions/routing/JMSRouterUnitTest.java	2010-05-24 16:38:08 UTC (rev 33050)
@@ -43,6 +43,7 @@
 import javax.jms.QueueSession;
 import javax.jms.Session;
 import javax.jms.TextMessage;
+import javax.jms.TopicConnection;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
@@ -66,9 +67,11 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.mockejb.jms.MockQueue;
+import org.mockejb.jms.MockTopic;
 import org.mockejb.jms.ObjectMessageImpl;
 import org.mockejb.jms.QueueConnectionFactoryImpl;
 import org.mockejb.jms.TextMessageImpl;
+import org.mockejb.jms.TopicConnectionFactoryImpl;
 import org.mockejb.jndi.MockContextFactory;
 
 /**
@@ -79,7 +82,9 @@
 public class JMSRouterUnitTest
 {
     private static final String CONNECTION_FACTORY = "ConnectionFactory" ;
+    private static final String TOPIC_CONNECTION_FACTORY = "TopicConnectionFactory" ;
     private static final String QUEUE_NAME = "failQueue" ;
+    private static final String TOPIC_NAME = "failTopic" ;
     private static final String PROPERTY_SETTER_TEST_NAME = "MockJMSPropertiesSetter" ;
     private final String messageID = "1234-junittest";
     private final String bodyContent = "hello";
@@ -96,7 +101,9 @@
         try
         {
             ctx.rebind(CONNECTION_FACTORY, new MockQueueConnectionFactory());
+            ctx.rebind(TOPIC_CONNECTION_FACTORY, new MockTopicConnectionFactory());
             ctx.rebind(QUEUE_NAME, new MockQueue(QUEUE_NAME));
+            ctx.rebind(TOPIC_NAME, new MockTopic(TOPIC_NAME));
         }
         finally
         {
@@ -326,6 +333,16 @@
         router.route(msg) ;
         assertEquals("Property setter value", PROPERTY_SETTER_TEST_NAME, router.getJmsMessage().getStringProperty(PROPERTY_SETTER_TEST_NAME)) ;
     }
+
+    @Test
+    public void testTopicDestination() throws ConfigurationException, NamingException, JMSException
+    {
+        final ConfigTree config = new ConfigTree("topic") ;
+        config.setAttribute("jndiName", TOPIC_NAME);
+        config.setAttribute(JMSEpr.CONNECTION_FACTORY_TAG, TOPIC_CONNECTION_FACTORY);
+        new JMSRouter(config) ;
+        assertEquals("Topic Connection creation count", 1, MockTopicConnectionFactory.topicConnectionCount) ;
+    }
     
     private void assertProcessContract( final String messageID, final org.jboss.soa.esb.message.Message msg, JMSRouter router ) throws ActionProcessingException, JMSException
     {
@@ -362,7 +379,20 @@
                     new MockQueueExceptionHandlerInvocationHandler(super.createQueueConnection())) ;
         }
     }
-    
+
+    private static final class MockTopicConnectionFactory extends TopicConnectionFactoryImpl
+    {
+        static int topicConnectionCount ;
+        
+        @Override
+        public TopicConnection createTopicConnection() throws JMSException
+        {
+            topicConnectionCount++ ;
+            return (TopicConnection)Proxy.newProxyInstance(getClass().getClassLoader(), new Class[] {TopicConnection.class},
+                    new MockTopicExceptionHandlerInvocationHandler(super.createTopicConnection())) ;
+        }
+    }
+
     private static final class MockQueueExceptionHandlerInvocationHandler implements InvocationHandler
     {
         private final QueueConnection queueConnection ;
@@ -413,6 +443,36 @@
         }
     }
     
+    private static final class MockTopicExceptionHandlerInvocationHandler implements InvocationHandler
+    {
+        private final TopicConnection topicConnection ;
+        private ExceptionListener exceptionListener ;
+            
+        MockTopicExceptionHandlerInvocationHandler(final TopicConnection topicConnection)
+        {
+            this.topicConnection = topicConnection ;
+        }
+            
+        public Object invoke(final Object proxy, final Method method, final Object[] args)
+            throws Throwable
+        {
+            final String methodName = method.getName() ;
+            if ("setExceptionListener".equals(methodName))
+            {
+                exceptionListener = (ExceptionListener)args[0] ;
+                return null ;
+            }
+            else if ("getExceptionListener".equals(methodName))
+            {
+                return exceptionListener ;
+            }
+            else
+            {
+                return method.invoke(topicConnection, args) ;
+            }
+        }
+    }
+    
     private static final class MockQueueSessionInvocationHandler implements InvocationHandler
     {
         private final MockQueueExceptionHandlerInvocationHandler exceptionHandler ;

Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/util/VfsUtilUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/util/VfsUtilUnitTest.java	2010-05-24 16:26:15 UTC (rev 33049)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/util/VfsUtilUnitTest.java	2010-05-24 16:38:08 UTC (rev 33050)
@@ -195,4 +195,12 @@
         assertEquals(expectedPath, VfsUtil.subpath(actualPath, "Test.esb", "WEB-INF/wsdl"));
     }
 
+    @Test
+    public void subpathWithoutPrefix()
+    {
+        String actualPath = "types/custom-request-type.xsd";
+        String expectedPath = "WEB-INF/wsdl/types/custom-request-type.xsd";
+
+        assertEquals(expectedPath, VfsUtil.subpath(actualPath, "Test.esb", "WEB-INF/wsdl"));
+    }
 }

Modified: labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/jboss-esb-unfiltered.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/jboss-esb-unfiltered.xml	2010-05-24 16:26:15 UTC (rev 33049)
+++ labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/jboss-esb-unfiltered.xml	2010-05-24 16:38:08 UTC (rev 33050)
@@ -48,7 +48,9 @@
                  description="BPM Orchestration Sample 1: Use this service to start a process instance">
             <listeners>
                 <fs-listener name="Gateway" busidref="startGwChannel"
-                    is-gateway="true" />
+                    is-gateway="true">
+                    <property name="composer-class" value="org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.composer.GatewayMessageComposer"/>
+                </fs-listener>
                 <fs-listener name="ESB-Listener" busidref="startEsbChannel"/>
             </listeners>
             <actions mep="OneWay">

Copied: labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration1/composer (from rev 33044, labs/jbossesb/tags/JBESB_4_7_CP2_ER2/product/samples/quickstarts/bpm_orchestration1/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration1/composer)

Deleted: labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration1/composer/GatewayMessageComposer.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_7_CP2_ER2/product/samples/quickstarts/bpm_orchestration1/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration1/composer/GatewayMessageComposer.java	2010-05-24 14:43:21 UTC (rev 33044)
+++ labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration1/composer/GatewayMessageComposer.java	2010-05-24 16:38:08 UTC (rev 33050)
@@ -1,78 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA  02110-1301, USA.
- */
-package org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.composer;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-
-import org.jboss.soa.esb.ConfigurationException;
-import org.jboss.soa.esb.helpers.ConfigTree;
-import org.jboss.soa.esb.listeners.gateway.LocalFileMessageComposer;
-import org.jboss.soa.esb.listeners.message.MessageDeliverException;
-import org.jboss.soa.esb.message.Message;
-
-public class GatewayMessageComposer extends LocalFileMessageComposer<File>
-{
-    private static final String DEFAULT_CHARSET = "UTF-8" ;
-    
-    private String charset = DEFAULT_CHARSET ;
-    
-    public void setConfiguration(final ConfigTree config)
-        throws ConfigurationException
-    {
-        super.setConfiguration(config) ;
-        charset = config.getAttribute("encoding", DEFAULT_CHARSET) ;
-    }
-    protected Object getPayload(final File inputFile)
-        throws IOException
-    {
-        final Object contents = super.getPayload(inputFile) ;
-        if (contents instanceof byte[])
-        {
-            final byte[] bytes = (byte[]) contents ;
-            return new String(bytes, charset) ;
-        }
-        else
-        {
-            return contents ;
-        }
-    }
-
-    public Object decompose(final Message message, final File inputFile)
-        throws MessageDeliverException
-    {
-        final Object payload = super.decompose(message, inputFile) ;
-        if (payload instanceof String)
-        {
-            final String result = (String)payload ;
-            try
-            {
-                return result.getBytes(charset) ;
-            }
-            catch (final UnsupportedEncodingException uee)
-            {
-                throw new MessageDeliverException("Unsupported encoding: " + charset, uee) ;
-            }
-        }
-        else
-        {
-            return payload ;
-        }
-    }
-}
\ No newline at end of file

Copied: labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration1/composer/GatewayMessageComposer.java (from rev 33044, labs/jbossesb/tags/JBESB_4_7_CP2_ER2/product/samples/quickstarts/bpm_orchestration1/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration1/composer/GatewayMessageComposer.java)
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration1/composer/GatewayMessageComposer.java	                        (rev 0)
+++ labs/jbossesb/trunk/product/samples/quickstarts/bpm_orchestration1/src/org/jboss/soa/esb/samples/quickstarts/bpm_orchestration1/composer/GatewayMessageComposer.java	2010-05-24 16:38:08 UTC (rev 33050)
@@ -0,0 +1,78 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ */
+package org.jboss.soa.esb.samples.quickstarts.bpm_orchestration1.composer;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+
+import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.helpers.ConfigTree;
+import org.jboss.soa.esb.listeners.gateway.LocalFileMessageComposer;
+import org.jboss.soa.esb.listeners.message.MessageDeliverException;
+import org.jboss.soa.esb.message.Message;
+
+public class GatewayMessageComposer extends LocalFileMessageComposer<File>
+{
+    private static final String DEFAULT_CHARSET = "UTF-8" ;
+    
+    private String charset = DEFAULT_CHARSET ;
+    
+    public void setConfiguration(final ConfigTree config)
+        throws ConfigurationException
+    {
+        super.setConfiguration(config) ;
+        charset = config.getAttribute("encoding", DEFAULT_CHARSET) ;
+    }
+    protected Object getPayload(final File inputFile)
+        throws IOException
+    {
+        final Object contents = super.getPayload(inputFile) ;
+        if (contents instanceof byte[])
+        {
+            final byte[] bytes = (byte[]) contents ;
+            return new String(bytes, charset) ;
+        }
+        else
+        {
+            return contents ;
+        }
+    }
+
+    public Object decompose(final Message message, final File inputFile)
+        throws MessageDeliverException
+    {
+        final Object payload = super.decompose(message, inputFile) ;
+        if (payload instanceof String)
+        {
+            final String result = (String)payload ;
+            try
+            {
+                return result.getBytes(charset) ;
+            }
+            catch (final UnsupportedEncodingException uee)
+            {
+                throw new MessageDeliverException("Unsupported encoding: " + charset, uee) ;
+            }
+        }
+        else
+        {
+            return payload ;
+        }
+    }
+}
\ No newline at end of file

Modified: labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml	2010-05-24 16:26:15 UTC (rev 33049)
+++ labs/jbossesb/trunk/product/samples/quickstarts/conf/base-build.xml	2010-05-24 16:38:08 UTC (rev 33050)
@@ -205,6 +205,9 @@
             <fileset dir="${org.jboss.esb.server.common.lib}" includes="jbossws-native-jaxws.jar jbossws-native-jaxws-ext.jar jboss-saaj.jar jbossws-common.jar"/>
             <fileset dir="${org.jboss.esb.server.common.lib}" includes="jbossws-common.jar jbossws-framework.jar jbossws-native-jaxrpc.jar jbossws-native-saaj.jar jbossws-spi.jar"/>
 
+            <!-- jbossts jars -->
+            <fileset dir="${org.jboss.esb.server.common.lib}" includes="jbossts-common.jar"/>
+
             <fileset dir="${org.jboss.esb.server.server}/deployers/esb.deployer/lib" includes="*.jar"/>
             <!-- jbossesb.esb jars -->
             <fileset dir="${org.jboss.esb.server.deploy.dir}/jbossesb.esb" includes="*.jar"/>

Modified: labs/jbossesb/trunk/product/samples/quickstarts/http_gateway/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/quickstarts/http_gateway/jboss-esb.xml	2010-05-24 16:26:15 UTC (rev 33049)
+++ labs/jbossesb/trunk/product/samples/quickstarts/http_gateway/jboss-esb.xml	2010-05-24 16:38:08 UTC (rev 33050)
@@ -67,6 +67,34 @@
             </actions>
         </service>
 
+        <service category="PortFilter01" name="List" description="" invmScope="GLOBAL">
+            <listeners>
+                <!-- Receives: http://<host>:8081/Quickstart_http_gateway/http/ports01/*
+                               Uses the default http bus configuration
+                               The requests with http://<host>:8080/* will be returned with Status 404... -->
+                <http-gateway name="PortFilter01" urlPattern="ports01/*">
+                    <property name="allowedPorts" value="8081"/>
+                </http-gateway>
+            </listeners>
+            <actions mep="RequestResponse">
+                <action name="print" class="org.jboss.soa.esb.samples.quickstart.httpgateway.MyAction"/>
+            </actions>
+        </service>
+
+        <service category="PortFilter02" name="List" description="" invmScope="GLOBAL">
+            <listeners>
+                <!-- Receives: http://<host>:8080/Quickstart_http_gateway/http/ports02/*
+                               Uses the default http bus configuration
+                               The requests with http://<host>:8081/* will be returned with Status 404... -->
+                <http-gateway name="PortFilter02" urlPattern="ports02/*">
+                    <property name="allowedPorts" value="8080"/>
+                </http-gateway>
+            </listeners>
+            <actions mep="RequestResponse">
+                <action name="print" class="org.jboss.soa.esb.samples.quickstart.httpgateway.MyAction"/>
+            </actions>
+        </service>
+
         <service category="Exceptions" name="Exception1" description="" invmScope="GLOBAL">
             <listeners>
                 <http-gateway name="Exception2" />

Modified: labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/AsyncProcessSignal.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/AsyncProcessSignal.java	2010-05-24 16:26:15 UTC (rev 33049)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/cmd/AsyncProcessSignal.java	2010-05-24 16:38:08 UTC (rev 33050)
@@ -198,10 +198,6 @@
         {
             contextInstance.setVariableLocally(name, value, token) ;
         }
-        else
-        {
-            contextInstance.deleteVariable(name, token) ;
-        }
     }
     
     /**
@@ -281,16 +277,16 @@
             }
             final ProcessInstance processInstance = token.getProcessInstance() ;
             final ContextInstance contextInstance = processInstance.getContextInstance() ;
-            final String transitionName = (String)contextInstance.getVariableLocally(ESB_ASYNC_SIGNAL_TRANSITION_VARIABLE_NAME, token) ;
-            final String actor = (String)contextInstance.getVariableLocally(ESB_ASYNC_SIGNAL_ACTOR_VARIABLE_NAME, token) ;
             final JbpmContext jbpmContext = executionContext.getJbpmContext() ;
+            final String transitionName = (String)removeVariableLocally(jbpmContext, contextInstance, ESB_ASYNC_SIGNAL_TRANSITION_VARIABLE_NAME, token) ;
+            final String actor = (String)removeVariableLocally(jbpmContext, contextInstance, ESB_ASYNC_SIGNAL_ACTOR_VARIABLE_NAME, token) ;
             final String origActor = jbpmContext.getActorId() ;
             
-            final int variableCount = Integer.parseInt((String)contextInstance.getVariableLocally(ESB_ASYNC_SIGNAL_VARIABLE_COUNT, token)) ;
+            final int variableCount = Integer.parseInt((String)removeVariableLocally(jbpmContext, contextInstance, ESB_ASYNC_SIGNAL_VARIABLE_COUNT, token)) ;
             for(int count = 0 ; count < variableCount ; count++)
             {
-                final String name = (String)contextInstance.getVariableLocally(ESB_ASYNC_SIGNAL_VARIABLE_NAMES + count, token) ;
-                final Object value = contextInstance.getVariableLocally(name, token) ;
+                final String name = (String)removeVariableLocally(jbpmContext, contextInstance, ESB_ASYNC_SIGNAL_VARIABLE_NAMES + count, token) ;
+                final Object value = removeVariableLocally(jbpmContext, contextInstance, name, token) ;
                 contextInstance.setVariable(name, value) ;
             }
             
@@ -313,6 +309,17 @@
                     token.getProcessInstance().getId()) ;
             }
         }
+        
+        private Object removeVariableLocally(final JbpmContext jbpmContext, final ContextInstance contextInstance, final String name, final Token token)
+        {
+            final Object value = contextInstance.getVariableLocally(name, token) ;
+
+            if (value != null)
+            {
+                contextInstance.deleteVariable(name, token) ;
+            }
+            return value ;
+        }
     }
     
     /**

Copied: labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/integration/AbstractJmsServiceFactory.java (from rev 33044, labs/jbossesb/tags/JBESB_4_7_CP2_ER2/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/integration/AbstractJmsServiceFactory.java)
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/integration/AbstractJmsServiceFactory.java	                        (rev 0)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/integration/AbstractJmsServiceFactory.java	2010-05-24 16:38:08 UTC (rev 33050)
@@ -0,0 +1,187 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ */
+package org.jboss.soa.esb.services.jbpm.integration;
+
+import javax.jms.ConnectionFactory;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+import org.jboss.jms.jndi.JMSProviderAdapter;
+import org.jboss.jms.jndi.JNDIProviderAdapter;
+import org.jbpm.JbpmException;
+import org.jbpm.svc.ServiceFactory;
+
+/**
+ * Abstract base JMS service factory.
+ */
+public abstract class AbstractJmsServiceFactory implements ServiceFactory
+{
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 2312177513288418710L;
+
+    /**
+     * The JNDI name of a jms provider adapter.
+     */
+    String providerAdapterJNDI;
+    /**
+     * The JNDI name for locating the JMS connection factory.
+     */
+    String connectionFactoryJndiName = "java:/JmsXA";
+    /**
+     * A flag indicating whether commit should be invoked on the JMS session.
+     */
+    boolean isCommitEnabled = false;
+    /**
+     * The JMS connection factory associated with the scheduler.
+     */
+    private ConnectionFactory connectionFactory;
+
+    /**
+     * The JMS provider adapter.
+     */
+    private JMSProviderAdapter jmsProviderAdapter ;
+
+    /**
+     * Get the commitEnabled flag.
+     * @return true if commit is to be invoked on the JMS session, false otherwise.
+     */
+    public boolean isCommitEnabled()
+    {
+      return isCommitEnabled;
+    }
+
+    /**
+     * Lookup a name within JNDI.
+     * @param name The JNDI name to locate.
+     * @return The object bound to the name.
+     * @throws NamingException For errors locating the specified object within JNDI.
+     */
+    protected Object lookup(String name) throws NamingException
+    {
+      final JMSProviderAdapter adapter = getJMSProviderAdapter() ;
+      final Context initial = adapter.getInitialContext() ;
+      try
+      {
+        return initial.lookup(name);
+      }
+      finally
+      {
+        initial.close();
+      }
+    }
+
+    /**
+     * Get the JMS provider adapter.
+     * @return The JMS provider adapter.
+     * @throws NamingException For errors locating the adapter within JNDI.
+     */
+    protected JMSProviderAdapter getJMSProviderAdapter()
+      throws NamingException
+    {
+      if (jmsProviderAdapter == null)
+      {
+        if (providerAdapterJNDI != null)
+        {
+          final String lookup ;
+          if (!providerAdapterJNDI.startsWith("java:"))
+          {
+            lookup = "java:" + providerAdapterJNDI ;
+          }
+          else
+          {
+            lookup = providerAdapterJNDI ;
+          }
+          
+          final Context initial = new InitialContext();
+          final Object adapter ;
+          try
+          {
+            adapter = initial.lookup(lookup);
+          }
+          finally
+          {
+            initial.close();
+          }
+          if ((adapter != null) && (adapter instanceof JMSProviderAdapter))
+          {
+            jmsProviderAdapter = (JMSProviderAdapter)adapter ;
+          }
+          else
+          {
+            jmsProviderAdapter = new JNDIProviderAdapter() ;
+          }
+        }
+        else
+        {
+          jmsProviderAdapter = new JNDIProviderAdapter() ;
+        }
+      }
+      return jmsProviderAdapter ;
+    }
+    
+    /**
+     * Get the JMS connection factory associated with this service factory.
+     * @return The associated JMS connection factory.
+     */
+    protected ConnectionFactory getConnectionFactory()
+    {
+      if (connectionFactory == null)
+      {
+        try
+        {
+          final JMSProviderAdapter adapter = getJMSProviderAdapter() ;
+          final String jndiName ;
+          final String adapterQueueFactory = adapter.getQueueFactoryRef() ;
+          if (adapterQueueFactory != null)
+          {
+              jndiName = adapterQueueFactory ;
+          }
+          else
+          {
+              final String adapterFactory = adapter.getFactoryRef() ;
+              if (adapterFactory != null)
+              {
+                  jndiName = adapterFactory ;
+              }
+              else
+              {
+                  jndiName = connectionFactoryJndiName ;
+              }
+          }
+          connectionFactory = (ConnectionFactory)lookup(jndiName);
+        }
+        catch (NamingException e)
+        {
+          throw new JbpmException("could not retrieve message connection factory", e);
+        }
+      }
+      return connectionFactory;
+    }
+
+    /**
+     * Close this factory.
+     */
+    public void close()
+    {
+      jmsProviderAdapter = null;
+      connectionFactory = null;
+    }
+}

Modified: labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/integration/msg/JmsMessageServiceFactory.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/integration/msg/JmsMessageServiceFactory.java	2010-05-24 16:26:15 UTC (rev 33049)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/integration/msg/JmsMessageServiceFactory.java	2010-05-24 16:38:08 UTC (rev 33050)
@@ -21,16 +21,13 @@
  */
 package org.jboss.soa.esb.services.jbpm.integration.msg;
 
-import javax.jms.ConnectionFactory;
 import javax.jms.Destination;
 import javax.jms.JMSException;
-import javax.naming.Context;
-import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
+import org.jboss.soa.esb.services.jbpm.integration.AbstractJmsServiceFactory;
 import org.jbpm.JbpmException;
 import org.jbpm.svc.Service;
-import org.jbpm.svc.ServiceFactory;
 
 /**
  * Based on the jBPM JmsMessageServiceFactory, this service delivers messages to the
@@ -49,20 +46,17 @@
  * <li><code>idleInterval</code></li>
  * <li><code>maxIdleInterval</code></li>
  * <li><code>maxRetryJobs</code></li>
+ * <li><code>providerAdapterJNDI</code></li>
  * </ul>
  * 
  * @author Tom Baeyens
  * @author Alejandro Guizar
  */
-public final class JmsMessageServiceFactory implements ServiceFactory
+public final class JmsMessageServiceFactory extends AbstractJmsServiceFactory
 {
   private static final long serialVersionUID = 1L;
 
   /**
-   * The JNDI name for locating the JMS connection factory.
-   */
-  String connectionFactoryJndiName = "java:/JmsXA";
-  /**
    * The JNDI name for locating the jBPM job queue destination.
    */
   String destinationJndiName = "queue/JbpmJobQueue";
@@ -75,10 +69,6 @@
    */
   String dlqJndiName = "queue/JbpmDLQ";
   /**
-   * A flag indicating whether commit should be invoked on the JMS session.
-   */
-  boolean isCommitEnabled = false;
-  /**
    * The default idle interval for the retry executor.
    */
   int idleInterval = 15000; // 15 secs
@@ -92,10 +82,6 @@
   int maxRetryJobs = 20;
 
   /**
-   * The JMS connection factory associated with the scheduler.
-   */
-  private ConnectionFactory connectionFactory;
-  /**
    * The JMS destination for the jBPM job queue.
    */
   private Destination destination;
@@ -125,26 +111,6 @@
     retryExecutorThread = new Thread(retryExecutor) ;
     retryExecutorThread.start() ;
   }
-  
-  /**
-   * Get the JMS connection factory associated with this scheduler.
-   * @return The associated JMS connection factory.
-   */
-  public ConnectionFactory getConnectionFactory()
-  {
-    if (connectionFactory == null)
-    {
-      try
-      {
-        connectionFactory = (ConnectionFactory)lookup(connectionFactoryJndiName);
-      }
-      catch (NamingException e)
-      {
-        throw new JbpmException("could not retrieve message connection factory", e);
-      }
-    }
-    return connectionFactory;
-  }
 
   /**
    * Get the jBPM job queue destination associated with this message service.
@@ -207,41 +173,13 @@
   }
 
   /**
-   * Get the commitEnabled flag.
-   * @return true if commit is to be invoked on the JMS session, false otherwise.
-   */
-  public boolean isCommitEnabled()
-  {
-    return isCommitEnabled;
-  }
-
-  /**
-   * Lookup a name within JNDI.
-   * @param name The JNDI name to locate.
-   * @return The object bound to the name.
-   * @throws NamingException For errors locating the specified object within JNDI.
-   */
-  private static Object lookup(String name) throws NamingException
-  {
-    Context initial = new InitialContext();
-    try
-    {
-      return initial.lookup(name);
-    }
-    finally
-    {
-      initial.close();
-    }
-  }
-
-  /**
    * Create a JMS message service based on this factory.
    */
   public Service openService()
   {
     try
     {
-      return new JmsMessageService(getConnectionFactory(), getDestination(), isCommitEnabled);
+      return new JmsMessageService(getConnectionFactory(), getDestination(), isCommitEnabled());
     }
     catch (JMSException e)
     {
@@ -254,7 +192,7 @@
    */
   public void close()
   {
-    connectionFactory = null;
+    super.close() ;
     destination = null;
     commandDestination = null;
     dlqDestination = null;

Modified: labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/integration/timer/JmsSchedulerServiceFactory.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/integration/timer/JmsSchedulerServiceFactory.java	2010-05-24 16:26:15 UTC (rev 33049)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/integration/timer/JmsSchedulerServiceFactory.java	2010-05-24 16:38:08 UTC (rev 33050)
@@ -21,22 +21,29 @@
  */
 package org.jboss.soa.esb.services.jbpm.integration.timer;
 
-import javax.jms.ConnectionFactory;
 import javax.jms.Destination;
 import javax.jms.JMSException;
-import javax.naming.Context;
-import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
+import org.jboss.soa.esb.services.jbpm.integration.AbstractJmsServiceFactory;
 import org.jbpm.JbpmConfiguration;
 import org.jbpm.JbpmException;
 import org.jbpm.svc.Service;
-import org.jbpm.svc.ServiceFactory;
 
 /**
  * Implementation of a scheduler service using quartz.
+ * <h3>Configuration</h3>
+ * 
+ * The JMS message service factory exposes the following configurable fields.
+ * 
+ * <ul>
+ * <li><code>connectionFactoryJndiName</code></li>
+ * <li><code>destinationJndiName</code></li>
+ * <li><code>isCommitEnabled</code></li>
+ * <li><code>providerAdapterJNDI</code></li>
+ * </ul>
  */
-public class JmsSchedulerServiceFactory implements ServiceFactory
+public class JmsSchedulerServiceFactory extends AbstractJmsServiceFactory
 {
     /**
      * Serial Version UID for this class.
@@ -44,48 +51,15 @@
     private static final long serialVersionUID = 1642915732295620551L;
     
     /**
-     * The JNDI name for locating the JMS connection factory.
-     */
-    String connectionFactoryJndiName = "java:/JmsXA";
-    /**
      * The JNDI name for locating the jBPM timer queue destination.
      */
     String destinationJndiName = "queue/JbpmTimerQueue";
     /**
-     * A flag indicating whether commit should be invoked on the JMS session.
-     */
-    boolean isCommitEnabled = false;
-
-    /**
-     * The JMS connection factory associated with the scheduler.
-     */
-    private ConnectionFactory connectionFactory;
-    /**
      * The JMS destination for the scheduler.
      */
     private Destination destination;
 
     /**
-     * Get the JMS connection factory associated with this scheduler.
-     * @return The associated JMS connection factory.
-     */
-    public ConnectionFactory getConnectionFactory()
-    {
-      if (connectionFactory == null)
-      {
-        try
-        {
-          connectionFactory = (ConnectionFactory)lookup(connectionFactoryJndiName);
-        }
-        catch (NamingException e)
-        {
-          throw new JbpmException("could not retrieve message connection factory", e);
-        }
-      }
-      return connectionFactory;
-    }
-
-    /**
      * Get the JMS destination associated with this scheduler.
      * @return The associated JMS destination.
      */
@@ -106,34 +80,6 @@
     }
 
     /**
-     * Get the commitEnabled flag.
-     * @return true if commit is to be invoked on the JMS session, false otherwise.
-     */
-    public boolean isCommitEnabled()
-    {
-      return isCommitEnabled;
-    }
-
-    /**
-     * Lookup a name within JNDI.
-     * @param name The JNDI name to locate.
-     * @return The object bound to the name.
-     * @throws NamingException For errors locating the specified object within JNDI.
-     */
-    private static Object lookup(String name) throws NamingException
-    {
-      Context initial = new InitialContext();
-      try
-      {
-        return initial.lookup(name);
-      }
-      finally
-      {
-        initial.close();
-      }
-    }
-
-    /**
      * Create a JMS scheduler service based on this factory.
      */
     public Service openService()
@@ -141,7 +87,7 @@
       try
       {
         return new JmsSchedulerService(JbpmConfiguration.getInstance().getCurrentJbpmContext(),
-            getConnectionFactory(), getDestination(), isCommitEnabled);
+            getConnectionFactory(), getDestination(), isCommitEnabled());
       }
       catch (JMSException e)
       {
@@ -154,7 +100,7 @@
      */
     public void close()
     {
-      connectionFactory = null;
+      super.close() ;
       destination = null;
     }
 }

Modified: labs/jbossesb/trunk/product/services/jbpm/src/main/resources/config/jmsscheduler/jbpm.cfg.xml.config
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/resources/config/jmsscheduler/jbpm.cfg.xml.config	2010-05-24 16:26:15 UTC (rev 33049)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/resources/config/jmsscheduler/jbpm.cfg.xml.config	2010-05-24 16:38:08 UTC (rev 33050)
@@ -12,11 +12,11 @@
     <service name="persistence">
       <factory>
         <bean class="org.jbpm.persistence.jta.JtaDbPersistenceServiceFactory">
-          <field name="isTransactionEnabled"><false/></field>
-          <field name="isCurrentSessionEnabled"><true/></field>
-          <!--field name="sessionFactoryJndiName">
+          <property name="isTransactionEnabled"><false/></property>
+          <property name="isCurrentSessionEnabled"><true/></property>
+          <!--property name="sessionFactoryJndiName">
             <string value="java:/myHibSessFactJndiName" />
-          </field-->
+          </property-->
         </bean>
      </factory>
      </service>

Modified: labs/jbossesb/trunk/product/services/jbpm/src/main/resources/config/quartzscheduler/jbpm.cfg.xml.config
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/resources/config/quartzscheduler/jbpm.cfg.xml.config	2010-05-24 16:26:15 UTC (rev 33049)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/resources/config/quartzscheduler/jbpm.cfg.xml.config	2010-05-24 16:38:08 UTC (rev 33050)
@@ -12,11 +12,11 @@
     <service name="persistence">
       <factory>
         <bean class="org.jbpm.persistence.jta.JtaDbPersistenceServiceFactory">
-          <field name="isTransactionEnabled"><false/></field>
-          <field name="isCurrentSessionEnabled"><true/></field>
-          <!--field name="sessionFactoryJndiName">
+          <property name="isTransactionEnabled"><false/></property>
+          <property name="isCurrentSessionEnabled"><true/></property>
+          <!--property name="sessionFactoryJndiName">
             <string value="java:/myHibSessFactJndiName" />
-          </field-->
+          </property-->
         </bean>
      </factory>
      </service>

Modified: labs/jbossesb/trunk/product/services/jbpm/src/main/resources/jbpm.cfg.xml
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/resources/jbpm.cfg.xml	2010-05-24 16:26:15 UTC (rev 33049)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/resources/jbpm.cfg.xml	2010-05-24 16:38:08 UTC (rev 33050)
@@ -12,11 +12,11 @@
     <service name="persistence">
       <factory>
         <bean class="org.jbpm.persistence.jta.JtaDbPersistenceServiceFactory">
-          <field name="isTransactionEnabled"><false/></field>
-          <field name="isCurrentSessionEnabled"><true/></field>
-          <!--field name="sessionFactoryJndiName">
+          <property name="isTransactionEnabled"><false/></property>
+          <property name="isCurrentSessionEnabled"><true/></property>
+          <!--property name="sessionFactoryJndiName">
             <string value="java:/myHibSessFactJndiName" />
-          </field-->
+          </property-->
         </bean>
      </factory>
      </service>
@@ -48,14 +48,14 @@
   <string name="jbpm.mail.from.address" value="jbpm at noreply" />
   
   <bean name="jbpm.job.executor" class="org.jbpm.job.executor.JobExecutor">
-    <field name="jbpmConfiguration"><ref bean="jbpmConfiguration" /></field>
-    <field name="name"><string value="JbpmJobExector" /></field>
-    <field name="nbrOfThreads"><int value="1" /></field>
-    <field name="idleInterval"><int value="5000" /></field>
-    <field name="maxIdleInterval"><int value="3600000" /></field> <!-- 1 hour -->
-    <field name="historyMaxSize"><int value="20" /></field>
-    <field name="maxLockTime"><int value="600000" /></field> <!-- 10 minutes -->
-    <field name="lockMonitorInterval"><int value="60000" /></field> <!-- 1 minute -->
-    <field name="lockBufferTime"><int value="5000" /></field> <!-- 5 seconds -->
+    <property name="jbpmConfiguration"><ref bean="jbpmConfiguration" /></property>
+    <property name="name"><string value="JbpmJobExector" /></property>
+    <property name="nbrOfThreads"><int value="1" /></property>
+    <property name="idleInterval"><int value="5000" /></property>
+    <property name="maxIdleInterval"><int value="3600000" /></property> <!-- 1 hour -->
+    <property name="historyMaxSize"><int value="20" /></property>
+    <property name="maxLockTime"><int value="600000" /></property> <!-- 10 minutes -->
+    <property name="lockMonitorInterval"><int value="60000" /></property> <!-- 1 minute -->
+    <property name="lockBufferTime"><int value="5000" /></property> <!-- 5 seconds -->
   </bean>
 </jbpm-configuration>

Modified: labs/jbossesb/trunk/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ESBMessageEventPoller.java
===================================================================
--- labs/jbossesb/trunk/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ESBMessageEventPoller.java	2010-05-24 16:26:15 UTC (rev 33049)
+++ labs/jbossesb/trunk/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ESBMessageEventPoller.java	2010-05-24 16:38:08 UTC (rev 33050)
@@ -98,9 +98,10 @@
 	 * Set the Ems connection and grab the emsbean.
 	 * @param connection
 	 */
-	public void setConnection(EmsConnection connection) {
+	public boolean setConnection(EmsConnection connection) {
 		this.connection = connection;
-		this.emsbean = connection.getBean(MESSAGE_ALERTS_BEAN);	
+		this.emsbean = connection.getBean(MESSAGE_ALERTS_BEAN);
+		return (emsbean != null) ;
 	}
 	   
 	/** Return the type of events we handle
@@ -113,32 +114,30 @@
 	/** Return collected events
 	* @see org.rhq.core.pluginapi.event.EventPoller#poll()
 	*/
-	public Set<Event> poll() {
-		synchronized(emsbean) {
-			if (emsbean != null) {
-	    		try {
-	    			EmsAttribute alertAttribute = emsbean.getAttribute(ALERTS_ATTRIBUTE);
-	    			if (alertAttribute != null) {
-	    				Vector<Hashtable> notifList = null;
-		    			notifList = (Vector<Hashtable>) alertAttribute.refresh();
-						for (Hashtable notifHash : notifList) {
-					    	long timestamp = (new Long ((String) notifHash.get(NOTIFICATION_TIMESTAMP_LONG))).longValue();
-						    	
-					    	Event event = new Event(getEventType(), 
-									((String)notifHash.get(NOTIFICATION_TYPE)),
-									timestamp,
-									EventSeverity.WARN,
-									((String)notifHash.get(NOTIFICATION_MESSAGE)));
-					    	EmsOperation clear = emsbean.getOperation(CLEAR_ALERT_OPERATION);
-					    	clear.invoke();
-					    	events.add(event);
-					    }
-    				}
-    			} catch (Exception e) {
-    				e.printStackTrace();
-    			} 
-    		}
-    	}
+	public synchronized Set<Event> poll() {
+		if (emsbean != null) {
+    		try {
+    			EmsAttribute alertAttribute = emsbean.getAttribute(ALERTS_ATTRIBUTE);
+    			if (alertAttribute != null) {
+    				Vector<Hashtable> notifList = null;
+	    			notifList = (Vector<Hashtable>) alertAttribute.refresh();
+					for (Hashtable notifHash : notifList) {
+				    	long timestamp = (new Long ((String) notifHash.get(NOTIFICATION_TIMESTAMP_LONG))).longValue();
+					    	
+				    	Event event = new Event(getEventType(), 
+								((String)notifHash.get(NOTIFICATION_TYPE)),
+								timestamp,
+								EventSeverity.WARN,
+								((String)notifHash.get(NOTIFICATION_MESSAGE)));
+				    	EmsOperation clear = emsbean.getOperation(CLEAR_ALERT_OPERATION);
+				    	clear.invoke();
+				    	events.add(event);
+				    }
+   				}
+   			} catch (Exception e) {
+   				e.printStackTrace();
+   			} 
+   		}
     	return events;
     }
 }

Modified: labs/jbossesb/trunk/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ServiceComponent.java
===================================================================
--- labs/jbossesb/trunk/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ServiceComponent.java	2010-05-24 16:26:15 UTC (rev 33049)
+++ labs/jbossesb/trunk/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ServiceComponent.java	2010-05-24 16:38:08 UTC (rev 33050)
@@ -69,8 +69,9 @@
         eventContext = context.getEventContext();
 
         ESBMessageEventPoller ep = new ESBMessageEventPoller(ESB_MESSAGE_EVENT);
-        ep.setConnection(getEmsConnection());
-        eventContext.registerEventPoller(ep, 53);
+        if (ep.setConnection(getEmsConnection())) {
+            eventContext.registerEventPoller(ep, 53);
+        }
     }
 
     @Override

Modified: labs/jbossesb/trunk/product/tools/systinet/build.xml
===================================================================
--- labs/jbossesb/trunk/product/tools/systinet/build.xml	2010-05-24 16:26:15 UTC (rev 33049)
+++ labs/jbossesb/trunk/product/tools/systinet/build.xml	2010-05-24 16:38:08 UTC (rev 33050)
@@ -1,10 +1,13 @@
 <project name="jon-build" default="deploy" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
 
     <property name="build.dir" location="build"/>
-    <property name="classes.dir" value="${build.dir}/classes"/>
-    <property name="classpath.dir" location="../../../antlib"/>
+    <property name="classes.dir" location="${build.dir}/classes"/>
 
-    <property name="soap.classes.dir" location="${basedir}/../../services/soap/build/classes"/>
+    <property name="product.dir" location="../.."/>
+    <property name="product.build.dir" location="${product.dir}/build"/>
+    <property name="product.lib.dir" location="${product.build.dir}/lib"/>
+    <property name="jbossesb.lib.dir" location="${product.build.dir}/jbossesb/lib"/>
+
     <property name="esb.transport.jar.version" value="1.0"/>
     <property name="esb.transport.jar.name" value="jbossesb-transport-${esb.transport.jar.version}.jar"/>
     <property name="esb.transport.client.jar.name" value="jbossesb-transport-client-${esb.transport.jar.version}.jar"/>
@@ -15,17 +18,12 @@
     <property name="java.dir" location="${src.dir}/java"/>
     <property name="resources.dir" location="${src.dir}/resources"/>
 	
-    <property file="systinet.properties"/>
-
     <target name="clean">
         <delete dir="${build.dir}"/>
     </target>
 
     <path id="classpath">
-    	<fileset dir="/home/tcunning/jboss-4.2.2.GA/server/default/lib"
-    		includes="**/*.jar"/>
-    	<fileset dir="${systinet.reg.dir}/lib" includes="**/*.jar"/>
-    	<fileset dir="${systinet.reg.dir}/app/uddi" includes="**/*.jar"/>
+    	<fileset dir="${product.lib.dir}" includes="servlet-api-*.jar"/>
     </path>
 
     <target name="compile-transport">
@@ -50,12 +48,9 @@
     </target>
 
     <target name="deploy" depends="jar-transport">
-    	<copy file="${esb.transport.jar}"
-    		overwrite="true"
-    		todir="/home/tcunning/jboss-4.2.2.GA/server/default/deploy/registry.war/WEB-INF/lib"/>
-    	<copy file="${esb.client.transport.jar}"
-    		overwrite="true"
-    		todir="/home/tcunning/jboss-4.2.2.GA/server/default/deploy/jbossesb.sar/lib"/>
+        <copy todir="${jbossesb.lib.dir}">
+            <fileset file="${esb.transport.jar}"/>
+            <fileset file="${esb.client.transport.jar}"/>
+        </copy>
     </target>
-
 </project>

Modified: labs/jbossesb/trunk/product/tools/systinet/src/main/java/org/jboss/soa/esb/registry/rmi/InquiryService.java
===================================================================
--- labs/jbossesb/trunk/product/tools/systinet/src/main/java/org/jboss/soa/esb/registry/rmi/InquiryService.java	2010-05-24 16:26:15 UTC (rev 33049)
+++ labs/jbossesb/trunk/product/tools/systinet/src/main/java/org/jboss/soa/esb/registry/rmi/InquiryService.java	2010-05-24 16:38:08 UTC (rev 33050)
@@ -38,7 +38,6 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.apache.xerces.parsers.DOMParser;
 import org.jboss.soa.esb.http.mock.SOAPProcessorHttpServletRequest;
 import org.jboss.soa.esb.http.mock.SOAPProcessorHttpServletResponse;
 import org.w3c.dom.Document;
@@ -88,11 +87,7 @@
 	}
 
 	private Node marshalResult(String result) throws SAXException, IOException {
-		DOMParser parser = new DOMParser();
-		InputStream is = new ByteArrayInputStream(result.getBytes());
-		parser.parse(new InputSource(is));
-		
-		Document document = parser.getDocument();
+		Document document = Utils.parse(result) ;
 		Element docelement = document.getDocumentElement();
 		
 		Node bodyNode = docelement.getFirstChild();

Modified: labs/jbossesb/trunk/product/tools/systinet/src/main/java/org/jboss/soa/esb/registry/rmi/PublishService.java
===================================================================
--- labs/jbossesb/trunk/product/tools/systinet/src/main/java/org/jboss/soa/esb/registry/rmi/PublishService.java	2010-05-24 16:26:15 UTC (rev 33049)
+++ labs/jbossesb/trunk/product/tools/systinet/src/main/java/org/jboss/soa/esb/registry/rmi/PublishService.java	2010-05-24 16:38:08 UTC (rev 33050)
@@ -38,7 +38,6 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.apache.xerces.parsers.DOMParser;
 import org.jboss.soa.esb.http.mock.SOAPProcessorHttpServletRequest;
 import org.jboss.soa.esb.http.mock.SOAPProcessorHttpServletResponse;
 import org.w3c.dom.Document;
@@ -88,11 +87,7 @@
 	}
 
 	private Node marshalResult(String result) throws SAXException, IOException {
-		DOMParser parser = new DOMParser();
-		InputStream is = new ByteArrayInputStream(result.getBytes());
-		parser.parse(new InputSource(is));
-		
-		Document document = parser.getDocument();
+		Document document = Utils.parse(result) ;
 		Element docelement = document.getDocumentElement();	
 		Node bodyNode = docelement.getFirstChild();
 		

Copied: labs/jbossesb/trunk/product/tools/systinet/src/main/java/org/jboss/soa/esb/registry/rmi/Utils.java (from rev 33044, labs/jbossesb/tags/JBESB_4_7_CP2_ER2/product/tools/systinet/src/main/java/org/jboss/soa/esb/registry/rmi/Utils.java)
===================================================================
--- labs/jbossesb/trunk/product/tools/systinet/src/main/java/org/jboss/soa/esb/registry/rmi/Utils.java	                        (rev 0)
+++ labs/jbossesb/trunk/product/tools/systinet/src/main/java/org/jboss/soa/esb/registry/rmi/Utils.java	2010-05-24 16:38:08 UTC (rev 33050)
@@ -0,0 +1,57 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ */
+package org.jboss.soa.esb.registry.rmi;
+
+import java.io.IOException;
+import java.io.StringReader;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+class Utils
+{
+    private static final DocumentBuilderFactory DOCUMENT_BUILDER_FACTORY ;
+
+    static
+    {
+        final DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
+        docBuilderFactory.setNamespaceAware(true);
+        DOCUMENT_BUILDER_FACTORY = docBuilderFactory ;
+    }
+
+    public static Document parse(final String result)
+        throws SAXException, IOException
+    {
+        final InputSource is = new InputSource(new StringReader(result)) ;
+        final DocumentBuilder builder ;
+        try
+        {
+            builder = DOCUMENT_BUILDER_FACTORY.newDocumentBuilder() ;
+        }
+        catch (final ParserConfigurationException pce)
+        {
+            throw new SAXException("Unexpected exception obtaining document builder", pce);
+        }
+        return builder.parse(is) ;
+    }
+}

Deleted: labs/jbossesb/trunk/product/tools/systinet/systinet.properties
===================================================================
--- labs/jbossesb/trunk/product/tools/systinet/systinet.properties	2010-05-24 16:26:15 UTC (rev 33049)
+++ labs/jbossesb/trunk/product/tools/systinet/systinet.properties	2010-05-24 16:38:08 UTC (rev 33050)
@@ -1,2 +0,0 @@
-systinet.reg.dir=/opt/hp/registry
-jboss.home.dir=/home/tcunning/jboss-4.2.2.GA

Modified: labs/jbossesb/trunk/qa/base-cp.xml
===================================================================
--- labs/jbossesb/trunk/qa/base-cp.xml	2010-05-24 16:26:15 UTC (rev 33049)
+++ labs/jbossesb/trunk/qa/base-cp.xml	2010-05-24 16:38:08 UTC (rev 33050)
@@ -37,6 +37,7 @@
 		<echo message="JBoss AS 4.x compatible build = ${jbossas4}"/>
 		<path id="base.cp">
 			<pathelement location="${product.dir}/build/lib/jaxr-api-1.0rc1.jar" />
+			<fileset dir="${org.jboss.esb.server.server}/lib" includes="jbossts-common.jar" /> <!-- Required for Arjuna Common Util Code. -->
 			<fileset dir="${org.jboss.esb.server.server}/lib" includes="jboss-remoting.jar jboss-j2ee.jar" /> <!-- Required for JMS Client Code. -->
 			<fileset dir="${org.jboss.esb.server.home}/client" includes="jboss-messaging-client.jar" /> <!-- Required for JMS Client Code. -->
 			<fileset dir="${org.jboss.esb.server.server}/lib"
@@ -156,6 +157,7 @@
             <fileset dir="${org.jboss.esb.server.home}/client" includes="jboss-aop-*.jar"/>
 
             <!-- common lib jars -->
+            <fileset dir="${org.jboss.esb.server.common.lib}" includes="jbossts-common.jar"/> <!-- Required for Arjuna Common Util Code. -->
             <fileset dir="${org.jboss.esb.server.common.lib}" includes="bsh.jar"/>
             <fileset dir="${org.jboss.esb.server.common.lib}" includes="commons-collections.jar"/>
             <fileset dir="${org.jboss.esb.server.common.lib}" includes="jboss-jaxws.jar jboss-saaj.jar jbossws-common.jar jbossws-spi.jar"/>

Copied: labs/jbossesb/trunk/qa/junit/resources/server/ebws/META-INF/deployment.xml (from rev 33044, labs/jbossesb/tags/JBESB_4_7_CP2_ER2/qa/junit/resources/server/ebws/META-INF/deployment.xml)
===================================================================
--- labs/jbossesb/trunk/qa/junit/resources/server/ebws/META-INF/deployment.xml	                        (rev 0)
+++ labs/jbossesb/trunk/qa/junit/resources/server/ebws/META-INF/deployment.xml	2010-05-24 16:38:08 UTC (rev 33050)
@@ -0,0 +1,5 @@
+<jbossesb-deployment>
+  <depends>jboss.esb.qa.junit.destination:service=Queue,name=ebws1</depends>
+  <depends>jboss.esb.qa.junit.destination:service=Queue,name=ebws2</depends>
+  <depends>jboss.esb.qa.junit.destination:service=Queue,name=ebws3</depends>
+</jbossesb-deployment>

Modified: labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HttpGatewayTest.java
===================================================================
--- labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HttpGatewayTest.java	2010-05-24 16:26:15 UTC (rev 33049)
+++ labs/jbossesb/trunk/qa/quickstarts/src/org/jboss/soa/esb/quickstart/test/HttpGatewayTest.java	2010-05-24 16:38:08 UTC (rev 33050)
@@ -23,6 +23,7 @@
 
 import junit.framework.Test;
 
+import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLConnection;
 import java.io.InputStreamReader;
@@ -44,6 +45,8 @@
 	public void testMessage() throws Exception {
 	    clearMessages() ;
 	    sendMessage() ;
+	    sendPorts01Message() ;
+	    sendPorts02Message() ;
 	}
 
 	public void sendMessage() throws Exception {
@@ -62,6 +65,22 @@
         }
     }
 
+	public void sendPorts01Message() throws Exception {
+        URL request = new URL("http://localhost:8080/Quickstart_http_gateway/http/ports01");
+
+        HttpURLConnection connection = (HttpURLConnection)request.openConnection();
+        connection.connect();
+        assertEquals(HttpURLConnection.HTTP_NOT_FOUND, connection.getResponseCode());
+    }
+
+	public void sendPorts02Message() throws Exception {
+        URL request = new URL("http://localhost:8080/Quickstart_http_gateway/http/ports02");
+
+        HttpURLConnection connection = (HttpURLConnection)request.openConnection();
+        connection.connect();
+        assertEquals(HttpURLConnection.HTTP_OK, connection.getResponseCode());
+    }
+
 	public static Test suite() throws Exception {
 		return getDeploySetup(HttpGatewayTest.class,
 				"QuickstartMessageStoreServer.sar, Quickstart_http_gateway.esb");



More information about the jboss-svn-commits mailing list