[jboss-svn-commits] JBL Code SVN: r38313 - in labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product: etc/test/registry/META-INF and 12 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Apr 9 06:05:41 EDT 2013
Author: mputz
Date: 2013-04-09 06:05:40 -0400 (Tue, 09 Apr 2013)
New Revision: 38313
Modified:
labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/etc/test/registry/META-INF/persistence.xml
labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/install/jUDDI-registryV3/esb-juddi-orm.xml
labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/install/jUDDI-registryV3/juddi-sql/db2/import.sql
labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/install/jUDDI-registryV3/juddi-sql/derby/import.sql
labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/install/jUDDI-registryV3/juddi-sql/hsqldb/import.sql
labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/install/jUDDI-registryV3/juddi-sql/mysql/import.sql
labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/install/jUDDI-registryV3/juddi-sql/oracle9/import.sql
labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/install/jUDDI-registryV3/juddi-sql/postgres/import.sql
labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/install/jUDDI-registryV3/juddi-sql/sqlserver/import.sql
labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/install/jUDDI-registryV3/juddi-sql/sybase/import.sql
labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/install/jUDDI-registryV3/persistence.xml
labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/ivy.xml
labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/ivysettings.xml
labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/rosetta/build.xml
labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java
labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/rosetta/src/org/jboss/soa/esb/common/Configuration.java
labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/rosetta/src/org/jboss/soa/esb/common/Environment.java
Log:
Bug 947952: One-off patch to backport fixes from JBESB-3907 to SOA-P 5.2.0 + Rollup patch 20120417
Modified: labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/etc/test/registry/META-INF/persistence.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/etc/test/registry/META-INF/persistence.xml 2013-04-08 16:00:57 UTC (rev 38312)
+++ labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/etc/test/registry/META-INF/persistence.xml 2013-04-09 10:05:40 UTC (rev 38313)
@@ -18,6 +18,7 @@
<class>org.apache.juddi.model.BusinessIdentifier</class>
<class>org.apache.juddi.model.BusinessName</class>
<class>org.apache.juddi.model.BusinessService</class>
+ <class>org.apache.juddi.model.CanonicalizationMethod</class>
<class>org.apache.juddi.model.CategoryBag</class>
<class>org.apache.juddi.model.Contact</class>
<class>org.apache.juddi.model.ContactDescr</class>
@@ -27,6 +28,10 @@
<class>org.apache.juddi.model.InstanceDetailsDocDescr</class>
<class>org.apache.juddi.model.KeyedReference</class>
<class>org.apache.juddi.model.KeyedReferenceGroup</class>
+ <class>org.apache.juddi.model.KeyDataValue</class>
+ <class>org.apache.juddi.model.KeyInfo</class>
+ <class>org.apache.juddi.model.ObjectType</class>
+ <class>org.apache.juddi.model.ObjectTypeContent</class>
<class>org.apache.juddi.model.OverviewDoc</class>
<class>org.apache.juddi.model.OverviewDocDescr</class>
<class>org.apache.juddi.model.PersonName</class>
@@ -34,10 +39,18 @@
<class>org.apache.juddi.model.Publisher</class>
<class>org.apache.juddi.model.PublisherAssertion</class>
<class>org.apache.juddi.model.PublisherAssertionId</class>
+ <class>org.apache.juddi.model.Reference</class>
<class>org.apache.juddi.model.ServiceCategoryBag</class>
<class>org.apache.juddi.model.ServiceDescr</class>
<class>org.apache.juddi.model.ServiceName</class>
<class>org.apache.juddi.model.ServiceProjection</class>
+ <class>org.apache.juddi.model.ServiceProjectionId</class>
+ <class>org.apache.juddi.model.Signature</class>
+ <class>org.apache.juddi.model.SignatureMethod</class>
+ <class>org.apache.juddi.model.SignatureTransform</class>
+ <class>org.apache.juddi.model.SignatureTransformDataValue</class>
+ <class>org.apache.juddi.model.SignatureValue</class>
+ <class>org.apache.juddi.model.SignedInfo</class>
<class>org.apache.juddi.model.Subscription</class>
<class>org.apache.juddi.model.SubscriptionChunkToken</class>
<class>org.apache.juddi.model.SubscriptionMatch</class>
Modified: labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/install/jUDDI-registryV3/esb-juddi-orm.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/install/jUDDI-registryV3/esb-juddi-orm.xml 2013-04-08 16:00:57 UTC (rev 38312)
+++ labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/install/jUDDI-registryV3/esb-juddi-orm.xml 2013-04-09 10:05:40 UTC (rev 38313)
@@ -22,6 +22,14 @@
</attributes>
</entity>
+ <entity class="org.apache.juddi.model.BindingCategoryBag">
+ <attributes>
+ <id name="id">
+ <generated-value generator="juddi_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
<entity class="org.apache.juddi.model.BindingDescr">
<attributes>
<id name="id">
@@ -30,6 +38,14 @@
</attributes>
</entity>
+ <entity class="org.apache.juddi.model.BusinessCategoryBag">
+ <attributes>
+ <id name="id">
+ <generated-value generator="juddi_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
<entity class="org.apache.juddi.model.BusinessDescr">
<attributes>
<id name="id">
@@ -54,6 +70,14 @@
</attributes>
</entity>
+ <entity class="org.apache.juddi.model.CanonicalizationMethod">
+ <attributes>
+ <id name="id">
+ <generated-value generator="juddi_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
<entity class="org.apache.juddi.model.CategoryBag">
<attributes>
<id name="id">
@@ -110,7 +134,7 @@
</attributes>
</entity>
- <entity class="org.apache.juddi.model.KeyedReference">
+ <entity class="org.apache.juddi.model.KeyDataValue">
<attributes>
<id name="id">
<generated-value generator="juddi_sequence" strategy="AUTO"/>
@@ -118,6 +142,22 @@
</attributes>
</entity>
+ <entity class="org.apache.juddi.model.KeyInfo">
+ <attributes>
+ <id name="id">
+ <generated-value generator="juddi_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
+ <entity class="org.apache.juddi.model.KeyedReference">
+ <attributes>
+ <id name="id">
+ <generated-value generator="juddi_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
<entity class="org.apache.juddi.model.KeyedReferenceGroup">
<attributes>
<id name="id">
@@ -126,6 +166,22 @@
</attributes>
</entity>
+ <entity class="org.apache.juddi.model.ObjectType">
+ <attributes>
+ <id name="id">
+ <generated-value generator="juddi_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
+ <entity class="org.apache.juddi.model.ObjectTypeContent">
+ <attributes>
+ <id name="id">
+ <generated-value generator="juddi_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
<entity class="org.apache.juddi.model.OverviewDoc">
<attributes>
<id name="id">
@@ -158,6 +214,22 @@
</attributes>
</entity>
+ <entity class="org.apache.juddi.model.Reference">
+ <attributes>
+ <id name="id">
+ <generated-value generator="juddi_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
+ <entity class="org.apache.juddi.model.ServiceCategoryBag">
+ <attributes>
+ <id name="id">
+ <generated-value generator="juddi_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
<entity class="org.apache.juddi.model.ServiceDescr">
<attributes>
<id name="id">
@@ -174,6 +246,55 @@
</attributes>
</entity>
+ <entity class="org.apache.juddi.model.Signature">
+ <attributes>
+ <id name="id">
+ <generated-value generator="juddi_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
+ <entity class="org.apache.juddi.model.SignatureMethod">
+ <attributes>
+ <id name="id">
+ <generated-value generator="juddi_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
+ <entity class="org.apache.juddi.model.SignatureTransform">
+ <attributes>
+ <id name="id">
+ <generated-value generator="juddi_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
+ <entity class="org.apache.juddi.model.SignatureTransformDataValue">
+ <table name="j3_signature_transform_data"/>
+ <attributes>
+ <id name="id">
+ <generated-value generator="juddi_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
+ <entity class="org.apache.juddi.model.SignatureValue">
+ <attributes>
+ <id name="id">
+ <generated-value generator="juddi_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
+ <entity class="org.apache.juddi.model.SignedInfo">
+ <attributes>
+ <id name="id">
+ <generated-value generator="juddi_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
<entity class="org.apache.juddi.model.SubscriptionMatch">
<attributes>
<id name="id">
@@ -182,6 +303,14 @@
</attributes>
</entity>
+ <entity class="org.apache.juddi.model.TmodelCategoryBag">
+ <attributes>
+ <id name="id">
+ <generated-value generator="juddi_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
<entity class="org.apache.juddi.model.TmodelDescr">
<attributes>
<id name="id">
Modified: labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/install/jUDDI-registryV3/juddi-sql/db2/import.sql
===================================================================
--- labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/install/jUDDI-registryV3/juddi-sql/db2/import.sql 2013-04-08 16:00:57 UTC (rev 38312)
+++ labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/install/jUDDI-registryV3/juddi-sql/db2/import.sql 2013-04-09 10:05:40 UTC (rev 38313)
@@ -94,6 +94,12 @@
primary key (entity_key)
);
+ create table j3_canonicalization_method (
+ id bigint generated by default as identity,
+ algorithm varchar(255),
+ primary key (id)
+ );
+
create table j3_category_bag (
id bigint generated by default as identity,
primary key (id)
@@ -162,6 +168,23 @@
primary key (id)
);
+ create table j3_key_data_value (
+ id bigint generated by default as identity,
+ key_data_name varchar(255),
+ key_data_type varchar(255),
+ key_data_value blob(255),
+ key_data_value_string clob(255),
+ key_data_value_key bigint,
+ key_info_key bigint,
+ primary key (id)
+ );
+
+ create table j3_key_info (
+ id bigint generated by default as identity,
+ xml_id varchar(255),
+ primary key (id)
+ );
+
create table j3_keyed_reference (
id bigint generated by default as identity,
key_name varchar(255),
@@ -195,6 +218,22 @@
primary key (name)
);
+ create table j3_object_type (
+ id bigint generated by default as identity,
+ encoding varchar(255),
+ mime_type varchar(255),
+ xml_id varchar(255),
+ signature_key bigint not null,
+ primary key (id)
+ );
+
+ create table j3_object_type_content (
+ id bigint generated by default as identity,
+ content blob(255),
+ object_type_key bigint not null,
+ primary key (id)
+ );
+
create table j3_overview_doc (
id bigint generated by default as identity,
overview_url varchar(255) not null,
@@ -252,6 +291,17 @@
primary key (from_key, to_key)
);
+ create table j3_reference (
+ id bigint generated by default as identity,
+ digest_method varchar(255),
+ digest_value blob(255),
+ type varchar(255),
+ uri varchar(255),
+ xml_id varchar(255),
+ signed_info_key bigint not null,
+ primary key (id)
+ );
+
create table j3_service_category_bag (
id bigint not null,
entity_key varchar(255) not null,
@@ -281,6 +331,56 @@
primary key (business_key, service_key)
);
+ create table j3_signature (
+ id bigint generated by default as identity,
+ xml_id varchar(255),
+ binding_template_key varchar(255),
+ business_key varchar(255),
+ business_service_key varchar(255),
+ key_info bigint not null,
+ publisher_key varchar(255),
+ signature_value bigint not null,
+ signed_info bigint not null,
+ tmodel_key varchar(255),
+ primary key (id)
+ );
+
+ create table j3_signature_method (
+ id bigint generated by default as identity,
+ algorithm varchar(255),
+ primary key (id)
+ );
+
+ create table j3_signature_transform (
+ id bigint generated by default as identity,
+ transform varchar(255),
+ reference_key bigint not null,
+ primary key (id)
+ );
+
+ create table j3_signature_transform_data (
+ id bigint generated by default as identity,
+ content_bytes blob(255),
+ content_type varchar(255),
+ signature_transform_key bigint not null,
+ primary key (id)
+ );
+
+ create table j3_signature_value (
+ id bigint generated by default as identity,
+ value_bytes blob(255),
+ xml_id varchar(255),
+ primary key (id)
+ );
+
+ create table j3_signed_info (
+ id bigint generated by default as identity,
+ xml_id varchar(255),
+ canonicalization_method bigint not null,
+ signature_method bigint not null,
+ primary key (id)
+ );
+
create table j3_subscription (
subscription_key varchar(255) not null,
authorized_name varchar(255) not null,
@@ -503,6 +603,16 @@
foreign key (tmodel_instance_info_id)
references j3_tmodel_instance_info;
+ alter table j3_key_data_value
+ add constraint FK74B7E072843143EF
+ foreign key (key_data_value_key)
+ references j3_key_data_value;
+
+ alter table j3_key_data_value
+ add constraint FK74B7E07238C90470
+ foreign key (key_info_key)
+ references j3_key_info;
+
alter table j3_keyed_reference
add constraint FK350C8454E075C8D7
foreign key (keyed_reference_group_id)
@@ -518,6 +628,16 @@
foreign key (category_bag_id)
references j3_category_bag;
+ alter table j3_object_type
+ add constraint FK98BBFA04BC6AD65
+ foreign key (signature_key)
+ references j3_signature;
+
+ alter table j3_object_type_content
+ add constraint FK987A913E71FA643E
+ foreign key (object_type_key)
+ references j3_object_type;
+
alter table j3_overview_doc
add constraint FK5CD8D0E8C5BF8903
foreign key (entity_key)
@@ -553,6 +673,11 @@
foreign key (from_key)
references j3_business_entity;
+ alter table j3_reference
+ add constraint FK493A4F951E480746
+ foreign key (signed_info_key)
+ references j3_signed_info;
+
alter table j3_service_category_bag
add constraint FK185A68076A68D45A
foreign key (id)
@@ -583,6 +708,66 @@
foreign key (business_key)
references j3_business_entity;
+ alter table j3_signature
+ add constraint FKC05CA90256E87DED
+ foreign key (publisher_key)
+ references j3_publisher;
+
+ alter table j3_signature
+ add constraint FKC05CA90271CD8948
+ foreign key (binding_template_key)
+ references j3_binding_template;
+
+ alter table j3_signature
+ add constraint FKC05CA90212F40D40
+ foreign key (business_service_key)
+ references j3_business_service;
+
+ alter table j3_signature
+ add constraint FKC05CA9028ACE9A26
+ foreign key (signed_info)
+ references j3_signed_info;
+
+ alter table j3_signature
+ add constraint FKC05CA9027CE6418E
+ foreign key (signature_value)
+ references j3_signature_value;
+
+ alter table j3_signature
+ add constraint FKC05CA9025793CF55
+ foreign key (tmodel_key)
+ references j3_tmodel;
+
+ alter table j3_signature
+ add constraint FKC05CA902DA6C2DD0
+ foreign key (key_info)
+ references j3_key_info;
+
+ alter table j3_signature
+ add constraint FKC05CA902EF04CFEE
+ foreign key (business_key)
+ references j3_business_entity;
+
+ alter table j3_signature_transform
+ add constraint FK726346F9256790B
+ foreign key (reference_key)
+ references j3_reference;
+
+ alter table j3_signature_transform_data
+ add constraint FK3242526C7B88B2A4
+ foreign key (signature_transform_key)
+ references j3_signature_transform;
+
+ alter table j3_signed_info
+ add constraint FKD2E7E5BB877110CC
+ foreign key (canonicalization_method)
+ references j3_canonicalization_method;
+
+ alter table j3_signed_info
+ add constraint FKD2E7E5BB1A25896
+ foreign key (signature_method)
+ references j3_signature_method;
+
alter table j3_subscription_match
add constraint FK5B9C2F19BEEE42E5
foreign key (subscription_key)
Modified: labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/install/jUDDI-registryV3/juddi-sql/derby/import.sql
===================================================================
--- labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/install/jUDDI-registryV3/juddi-sql/derby/import.sql 2013-04-08 16:00:57 UTC (rev 38312)
+++ labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/install/jUDDI-registryV3/juddi-sql/derby/import.sql 2013-04-09 10:05:40 UTC (rev 38313)
@@ -94,6 +94,12 @@
primary key (entity_key)
);
+ create table j3_canonicalization_method (
+ id bigint not null,
+ algorithm varchar(255),
+ primary key (id)
+ );
+
create table j3_category_bag (
id bigint not null,
primary key (id)
@@ -162,6 +168,23 @@
primary key (id)
);
+ create table j3_key_data_value (
+ id bigint not null,
+ key_data_name varchar(255),
+ key_data_type varchar(255),
+ key_data_value blob(255),
+ key_data_value_string clob(255),
+ key_data_value_key bigint,
+ key_info_key bigint,
+ primary key (id)
+ );
+
+ create table j3_key_info (
+ id bigint not null,
+ xml_id varchar(255),
+ primary key (id)
+ );
+
create table j3_keyed_reference (
id bigint not null,
key_name varchar(255),
@@ -195,6 +218,22 @@
primary key (name)
);
+ create table j3_object_type (
+ id bigint not null,
+ encoding varchar(255),
+ mime_type varchar(255),
+ xml_id varchar(255),
+ signature_key bigint not null,
+ primary key (id)
+ );
+
+ create table j3_object_type_content (
+ id bigint not null,
+ content blob(255),
+ object_type_key bigint not null,
+ primary key (id)
+ );
+
create table j3_overview_doc (
id bigint not null,
overview_url varchar(255) not null,
@@ -252,6 +291,17 @@
primary key (from_key, to_key)
);
+ create table j3_reference (
+ id bigint not null,
+ digest_method varchar(255),
+ digest_value blob(255),
+ type varchar(255),
+ uri varchar(255),
+ xml_id varchar(255),
+ signed_info_key bigint not null,
+ primary key (id)
+ );
+
create table j3_service_category_bag (
id bigint not null,
entity_key varchar(255) not null,
@@ -281,6 +331,56 @@
primary key (business_key, service_key)
);
+ create table j3_signature (
+ id bigint not null,
+ xml_id varchar(255),
+ binding_template_key varchar(255),
+ business_key varchar(255),
+ business_service_key varchar(255),
+ key_info bigint not null,
+ publisher_key varchar(255),
+ signature_value bigint not null,
+ signed_info bigint not null,
+ tmodel_key varchar(255),
+ primary key (id)
+ );
+
+ create table j3_signature_method (
+ id bigint not null,
+ algorithm varchar(255),
+ primary key (id)
+ );
+
+ create table j3_signature_transform (
+ id bigint not null,
+ transform varchar(255),
+ reference_key bigint not null,
+ primary key (id)
+ );
+
+ create table j3_signature_transform_data (
+ id bigint not null,
+ content_bytes blob(255),
+ content_type varchar(255),
+ signature_transform_key bigint not null,
+ primary key (id)
+ );
+
+ create table j3_signature_value (
+ id bigint not null,
+ value_bytes blob(255),
+ xml_id varchar(255),
+ primary key (id)
+ );
+
+ create table j3_signed_info (
+ id bigint not null,
+ xml_id varchar(255),
+ canonicalization_method bigint not null,
+ signature_method bigint not null,
+ primary key (id)
+ );
+
create table j3_subscription (
subscription_key varchar(255) not null,
authorized_name varchar(255) not null,
@@ -503,6 +603,16 @@
foreign key (tmodel_instance_info_id)
references j3_tmodel_instance_info;
+ alter table j3_key_data_value
+ add constraint FK74B7E072843143EF
+ foreign key (key_data_value_key)
+ references j3_key_data_value;
+
+ alter table j3_key_data_value
+ add constraint FK74B7E07238C90470
+ foreign key (key_info_key)
+ references j3_key_info;
+
alter table j3_keyed_reference
add constraint FK350C8454E075C8D7
foreign key (keyed_reference_group_id)
@@ -518,6 +628,16 @@
foreign key (category_bag_id)
references j3_category_bag;
+ alter table j3_object_type
+ add constraint FK98BBFA04BC6AD65
+ foreign key (signature_key)
+ references j3_signature;
+
+ alter table j3_object_type_content
+ add constraint FK987A913E71FA643E
+ foreign key (object_type_key)
+ references j3_object_type;
+
alter table j3_overview_doc
add constraint FK5CD8D0E8C5BF8903
foreign key (entity_key)
@@ -553,6 +673,11 @@
foreign key (from_key)
references j3_business_entity;
+ alter table j3_reference
+ add constraint FK493A4F951E480746
+ foreign key (signed_info_key)
+ references j3_signed_info;
+
alter table j3_service_category_bag
add constraint FK185A68076A68D45A
foreign key (id)
@@ -583,6 +708,66 @@
foreign key (business_key)
references j3_business_entity;
+ alter table j3_signature
+ add constraint FKC05CA90256E87DED
+ foreign key (publisher_key)
+ references j3_publisher;
+
+ alter table j3_signature
+ add constraint FKC05CA90271CD8948
+ foreign key (binding_template_key)
+ references j3_binding_template;
+
+ alter table j3_signature
+ add constraint FKC05CA90212F40D40
+ foreign key (business_service_key)
+ references j3_business_service;
+
+ alter table j3_signature
+ add constraint FKC05CA9028ACE9A26
+ foreign key (signed_info)
+ references j3_signed_info;
+
+ alter table j3_signature
+ add constraint FKC05CA9027CE6418E
+ foreign key (signature_value)
+ references j3_signature_value;
+
+ alter table j3_signature
+ add constraint FKC05CA9025793CF55
+ foreign key (tmodel_key)
+ references j3_tmodel;
+
+ alter table j3_signature
+ add constraint FKC05CA902DA6C2DD0
+ foreign key (key_info)
+ references j3_key_info;
+
+ alter table j3_signature
+ add constraint FKC05CA902EF04CFEE
+ foreign key (business_key)
+ references j3_business_entity;
+
+ alter table j3_signature_transform
+ add constraint FK726346F9256790B
+ foreign key (reference_key)
+ references j3_reference;
+
+ alter table j3_signature_transform_data
+ add constraint FK3242526C7B88B2A4
+ foreign key (signature_transform_key)
+ references j3_signature_transform;
+
+ alter table j3_signed_info
+ add constraint FKD2E7E5BB877110CC
+ foreign key (canonicalization_method)
+ references j3_canonicalization_method;
+
+ alter table j3_signed_info
+ add constraint FKD2E7E5BB1A25896
+ foreign key (signature_method)
+ references j3_signature_method;
+
alter table j3_subscription_match
add constraint FK5B9C2F19BEEE42E5
foreign key (subscription_key)
Modified: labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/install/jUDDI-registryV3/juddi-sql/hsqldb/import.sql
===================================================================
--- labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/install/jUDDI-registryV3/juddi-sql/hsqldb/import.sql 2013-04-08 16:00:57 UTC (rev 38312)
+++ labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/install/jUDDI-registryV3/juddi-sql/hsqldb/import.sql 2013-04-09 10:05:40 UTC (rev 38313)
@@ -94,6 +94,12 @@
primary key (entity_key)
);
+ create table j3_canonicalization_method (
+ id bigint generated by default as identity (start with 1),
+ algorithm varchar(255),
+ primary key (id)
+ );
+
create table j3_category_bag (
id bigint generated by default as identity (start with 1),
primary key (id)
@@ -162,6 +168,23 @@
primary key (id)
);
+ create table j3_key_data_value (
+ id bigint generated by default as identity (start with 1),
+ key_data_name varchar(255),
+ key_data_type varchar(255),
+ key_data_value longvarbinary not null,
+ key_data_value_string longvarchar not null,
+ key_data_value_key bigint,
+ key_info_key bigint,
+ primary key (id)
+ );
+
+ create table j3_key_info (
+ id bigint generated by default as identity (start with 1),
+ xml_id varchar(255),
+ primary key (id)
+ );
+
create table j3_keyed_reference (
id bigint generated by default as identity (start with 1),
key_name varchar(255),
@@ -195,6 +218,22 @@
primary key (name)
);
+ create table j3_object_type (
+ id bigint generated by default as identity (start with 1),
+ encoding varchar(255),
+ mime_type varchar(255),
+ xml_id varchar(255),
+ signature_key bigint not null,
+ primary key (id)
+ );
+
+ create table j3_object_type_content (
+ id bigint generated by default as identity (start with 1),
+ content longvarbinary not null,
+ object_type_key bigint not null,
+ primary key (id)
+ );
+
create table j3_overview_doc (
id bigint generated by default as identity (start with 1),
overview_url varchar(255) not null,
@@ -252,6 +291,17 @@
primary key (from_key, to_key)
);
+ create table j3_reference (
+ id bigint generated by default as identity (start with 1),
+ digest_method varchar(255),
+ digest_value longvarbinary not null,
+ type varchar(255),
+ uri varchar(255),
+ xml_id varchar(255),
+ signed_info_key bigint not null,
+ primary key (id)
+ );
+
create table j3_service_category_bag (
id bigint not null,
entity_key varchar(255) not null,
@@ -281,6 +331,56 @@
primary key (business_key, service_key)
);
+ create table j3_signature (
+ id bigint generated by default as identity (start with 1),
+ xml_id varchar(255),
+ binding_template_key varchar(255),
+ business_key varchar(255),
+ business_service_key varchar(255),
+ key_info bigint not null,
+ publisher_key varchar(255),
+ signature_value bigint not null,
+ signed_info bigint not null,
+ tmodel_key varchar(255),
+ primary key (id)
+ );
+
+ create table j3_signature_method (
+ id bigint generated by default as identity (start with 1),
+ algorithm varchar(255),
+ primary key (id)
+ );
+
+ create table j3_signature_transform (
+ id bigint generated by default as identity (start with 1),
+ transform varchar(255),
+ reference_key bigint not null,
+ primary key (id)
+ );
+
+ create table j3_signature_transform_data (
+ id bigint generated by default as identity (start with 1),
+ content_bytes longvarbinary not null,
+ content_type varchar(255),
+ signature_transform_key bigint not null,
+ primary key (id)
+ );
+
+ create table j3_signature_value (
+ id bigint generated by default as identity (start with 1),
+ value_bytes longvarbinary not null,
+ xml_id varchar(255),
+ primary key (id)
+ );
+
+ create table j3_signed_info (
+ id bigint generated by default as identity (start with 1),
+ xml_id varchar(255),
+ canonicalization_method bigint not null,
+ signature_method bigint not null,
+ primary key (id)
+ );
+
create table j3_subscription (
subscription_key varchar(255) not null,
authorized_name varchar(255) not null,
@@ -503,6 +603,16 @@
foreign key (tmodel_instance_info_id)
references j3_tmodel_instance_info;
+ alter table j3_key_data_value
+ add constraint FK74B7E072843143EF
+ foreign key (key_data_value_key)
+ references j3_key_data_value;
+
+ alter table j3_key_data_value
+ add constraint FK74B7E07238C90470
+ foreign key (key_info_key)
+ references j3_key_info;
+
alter table j3_keyed_reference
add constraint FK350C8454E075C8D7
foreign key (keyed_reference_group_id)
@@ -518,6 +628,16 @@
foreign key (category_bag_id)
references j3_category_bag;
+ alter table j3_object_type
+ add constraint FK98BBFA04BC6AD65
+ foreign key (signature_key)
+ references j3_signature;
+
+ alter table j3_object_type_content
+ add constraint FK987A913E71FA643E
+ foreign key (object_type_key)
+ references j3_object_type;
+
alter table j3_overview_doc
add constraint FK5CD8D0E8C5BF8903
foreign key (entity_key)
@@ -553,6 +673,11 @@
foreign key (from_key)
references j3_business_entity;
+ alter table j3_reference
+ add constraint FK493A4F951E480746
+ foreign key (signed_info_key)
+ references j3_signed_info;
+
alter table j3_service_category_bag
add constraint FK185A68076A68D45A
foreign key (id)
@@ -583,6 +708,66 @@
foreign key (business_key)
references j3_business_entity;
+ alter table j3_signature
+ add constraint FKC05CA90256E87DED
+ foreign key (publisher_key)
+ references j3_publisher;
+
+ alter table j3_signature
+ add constraint FKC05CA90271CD8948
+ foreign key (binding_template_key)
+ references j3_binding_template;
+
+ alter table j3_signature
+ add constraint FKC05CA90212F40D40
+ foreign key (business_service_key)
+ references j3_business_service;
+
+ alter table j3_signature
+ add constraint FKC05CA9028ACE9A26
+ foreign key (signed_info)
+ references j3_signed_info;
+
+ alter table j3_signature
+ add constraint FKC05CA9027CE6418E
+ foreign key (signature_value)
+ references j3_signature_value;
+
+ alter table j3_signature
+ add constraint FKC05CA9025793CF55
+ foreign key (tmodel_key)
+ references j3_tmodel;
+
+ alter table j3_signature
+ add constraint FKC05CA902DA6C2DD0
+ foreign key (key_info)
+ references j3_key_info;
+
+ alter table j3_signature
+ add constraint FKC05CA902EF04CFEE
+ foreign key (business_key)
+ references j3_business_entity;
+
+ alter table j3_signature_transform
+ add constraint FK726346F9256790B
+ foreign key (reference_key)
+ references j3_reference;
+
+ alter table j3_signature_transform_data
+ add constraint FK3242526C7B88B2A4
+ foreign key (signature_transform_key)
+ references j3_signature_transform;
+
+ alter table j3_signed_info
+ add constraint FKD2E7E5BB877110CC
+ foreign key (canonicalization_method)
+ references j3_canonicalization_method;
+
+ alter table j3_signed_info
+ add constraint FKD2E7E5BB1A25896
+ foreign key (signature_method)
+ references j3_signature_method;
+
alter table j3_subscription_match
add constraint FK5B9C2F19BEEE42E5
foreign key (subscription_key)
Modified: labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/install/jUDDI-registryV3/juddi-sql/mysql/import.sql
===================================================================
--- labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/install/jUDDI-registryV3/juddi-sql/mysql/import.sql 2013-04-08 16:00:57 UTC (rev 38312)
+++ labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/install/jUDDI-registryV3/juddi-sql/mysql/import.sql 2013-04-09 10:05:40 UTC (rev 38313)
@@ -94,6 +94,12 @@
primary key (entity_key)
);
+ create table j3_canonicalization_method (
+ id bigint not null auto_increment,
+ algorithm varchar(255),
+ primary key (id)
+ );
+
create table j3_category_bag (
id bigint not null auto_increment,
primary key (id)
@@ -162,6 +168,23 @@
primary key (id)
);
+ create table j3_key_data_value (
+ id bigint not null auto_increment,
+ key_data_name varchar(255),
+ key_data_type varchar(255),
+ key_data_value longblob,
+ key_data_value_string longtext,
+ key_data_value_key bigint,
+ key_info_key bigint,
+ primary key (id)
+ );
+
+ create table j3_key_info (
+ id bigint not null auto_increment,
+ xml_id varchar(255),
+ primary key (id)
+ );
+
create table j3_keyed_reference (
id bigint not null auto_increment,
key_name varchar(255),
@@ -195,6 +218,22 @@
primary key (name)
);
+ create table j3_object_type (
+ id bigint not null auto_increment,
+ encoding varchar(255),
+ mime_type varchar(255),
+ xml_id varchar(255),
+ signature_key bigint not null,
+ primary key (id)
+ );
+
+ create table j3_object_type_content (
+ id bigint not null auto_increment,
+ content longblob,
+ object_type_key bigint not null,
+ primary key (id)
+ );
+
create table j3_overview_doc (
id bigint not null auto_increment,
overview_url varchar(255) not null,
@@ -252,6 +291,17 @@
primary key (from_key, to_key)
);
+ create table j3_reference (
+ id bigint not null auto_increment,
+ digest_method varchar(255),
+ digest_value longblob,
+ type varchar(255),
+ uri varchar(255),
+ xml_id varchar(255),
+ signed_info_key bigint not null,
+ primary key (id)
+ );
+
create table j3_service_category_bag (
id bigint not null,
entity_key varchar(255) not null,
@@ -281,6 +331,56 @@
primary key (business_key, service_key)
);
+ create table j3_signature (
+ id bigint not null auto_increment,
+ xml_id varchar(255),
+ binding_template_key varchar(255),
+ business_key varchar(255),
+ business_service_key varchar(255),
+ key_info bigint not null,
+ publisher_key varchar(255),
+ signature_value bigint not null,
+ signed_info bigint not null,
+ tmodel_key varchar(255),
+ primary key (id)
+ );
+
+ create table j3_signature_method (
+ id bigint not null auto_increment,
+ algorithm varchar(255),
+ primary key (id)
+ );
+
+ create table j3_signature_transform (
+ id bigint not null auto_increment,
+ transform varchar(255),
+ reference_key bigint not null,
+ primary key (id)
+ );
+
+ create table j3_signature_transform_data (
+ id bigint not null auto_increment,
+ content_bytes longblob,
+ content_type varchar(255),
+ signature_transform_key bigint not null,
+ primary key (id)
+ );
+
+ create table j3_signature_value (
+ id bigint not null auto_increment,
+ value_bytes longblob,
+ xml_id varchar(255),
+ primary key (id)
+ );
+
+ create table j3_signed_info (
+ id bigint not null auto_increment,
+ xml_id varchar(255),
+ canonicalization_method bigint not null,
+ signature_method bigint not null,
+ primary key (id)
+ );
+
create table j3_subscription (
subscription_key varchar(255) not null,
authorized_name varchar(255) not null,
@@ -527,6 +627,18 @@
foreign key (tmodel_instance_info_id)
references j3_tmodel_instance_info (id);
+ alter table j3_key_data_value
+ add index FK74B7E072843143EF (key_data_value_key),
+ add constraint FK74B7E072843143EF
+ foreign key (key_data_value_key)
+ references j3_key_data_value (id);
+
+ alter table j3_key_data_value
+ add index FK74B7E07238C90470 (key_info_key),
+ add constraint FK74B7E07238C90470
+ foreign key (key_info_key)
+ references j3_key_info (id);
+
alter table j3_keyed_reference
add index FK350C8454E075C8D7 (keyed_reference_group_id),
add constraint FK350C8454E075C8D7
@@ -545,6 +657,18 @@
foreign key (category_bag_id)
references j3_category_bag (id);
+ alter table j3_object_type
+ add index FK98BBFA04BC6AD65 (signature_key),
+ add constraint FK98BBFA04BC6AD65
+ foreign key (signature_key)
+ references j3_signature (id);
+
+ alter table j3_object_type_content
+ add index FK987A913E71FA643E (object_type_key),
+ add constraint FK987A913E71FA643E
+ foreign key (object_type_key)
+ references j3_object_type (id);
+
alter table j3_overview_doc
add index FK5CD8D0E8C5BF8903 (entity_key),
add constraint FK5CD8D0E8C5BF8903
@@ -587,6 +711,12 @@
foreign key (from_key)
references j3_business_entity (entity_key);
+ alter table j3_reference
+ add index FK493A4F951E480746 (signed_info_key),
+ add constraint FK493A4F951E480746
+ foreign key (signed_info_key)
+ references j3_signed_info (id);
+
alter table j3_service_category_bag
add index FK185A68076A68D45A (id),
add constraint FK185A68076A68D45A
@@ -623,6 +753,78 @@
foreign key (business_key)
references j3_business_entity (entity_key);
+ alter table j3_signature
+ add index FKC05CA90256E87DED (publisher_key),
+ add constraint FKC05CA90256E87DED
+ foreign key (publisher_key)
+ references j3_publisher (authorized_name);
+
+ alter table j3_signature
+ add index FKC05CA90271CD8948 (binding_template_key),
+ add constraint FKC05CA90271CD8948
+ foreign key (binding_template_key)
+ references j3_binding_template (entity_key);
+
+ alter table j3_signature
+ add index FKC05CA90212F40D40 (business_service_key),
+ add constraint FKC05CA90212F40D40
+ foreign key (business_service_key)
+ references j3_business_service (entity_key);
+
+ alter table j3_signature
+ add index FKC05CA9028ACE9A26 (signed_info),
+ add constraint FKC05CA9028ACE9A26
+ foreign key (signed_info)
+ references j3_signed_info (id);
+
+ alter table j3_signature
+ add index FKC05CA9027CE6418E (signature_value),
+ add constraint FKC05CA9027CE6418E
+ foreign key (signature_value)
+ references j3_signature_value (id);
+
+ alter table j3_signature
+ add index FKC05CA9025793CF55 (tmodel_key),
+ add constraint FKC05CA9025793CF55
+ foreign key (tmodel_key)
+ references j3_tmodel (entity_key);
+
+ alter table j3_signature
+ add index FKC05CA902DA6C2DD0 (key_info),
+ add constraint FKC05CA902DA6C2DD0
+ foreign key (key_info)
+ references j3_key_info (id);
+
+ alter table j3_signature
+ add index FKC05CA902EF04CFEE (business_key),
+ add constraint FKC05CA902EF04CFEE
+ foreign key (business_key)
+ references j3_business_entity (entity_key);
+
+ alter table j3_signature_transform
+ add index FK726346F9256790B (reference_key),
+ add constraint FK726346F9256790B
+ foreign key (reference_key)
+ references j3_reference (id);
+
+ alter table j3_signature_transform_data
+ add index FK3242526C7B88B2A4 (signature_transform_key),
+ add constraint FK3242526C7B88B2A4
+ foreign key (signature_transform_key)
+ references j3_signature_transform (id);
+
+ alter table j3_signed_info
+ add index FKD2E7E5BB877110CC (canonicalization_method),
+ add constraint FKD2E7E5BB877110CC
+ foreign key (canonicalization_method)
+ references j3_canonicalization_method (id);
+
+ alter table j3_signed_info
+ add index FKD2E7E5BB1A25896 (signature_method),
+ add constraint FKD2E7E5BB1A25896
+ foreign key (signature_method)
+ references j3_signature_method (id);
+
alter table j3_subscription_match
add index FK5B9C2F19BEEE42E5 (subscription_key),
add constraint FK5B9C2F19BEEE42E5
Modified: labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/install/jUDDI-registryV3/juddi-sql/oracle9/import.sql
===================================================================
--- labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/install/jUDDI-registryV3/juddi-sql/oracle9/import.sql 2013-04-08 16:00:57 UTC (rev 38312)
+++ labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/install/jUDDI-registryV3/juddi-sql/oracle9/import.sql 2013-04-09 10:05:40 UTC (rev 38313)
@@ -94,6 +94,12 @@
primary key (entity_key)
);
+ create table j3_canonicalization_method (
+ id number(19,0) not null,
+ algorithm varchar2(255 char),
+ primary key (id)
+ );
+
create table j3_category_bag (
id number(19,0) not null,
primary key (id)
@@ -162,6 +168,23 @@
primary key (id)
);
+ create table j3_key_data_value (
+ id number(19,0) not null,
+ key_data_name varchar2(255 char),
+ key_data_type varchar2(255 char),
+ key_data_value blob,
+ key_data_value_string clob,
+ key_data_value_key number(19,0),
+ key_info_key number(19,0),
+ primary key (id)
+ );
+
+ create table j3_key_info (
+ id number(19,0) not null,
+ xml_id varchar2(255 char),
+ primary key (id)
+ );
+
create table j3_keyed_reference (
id number(19,0) not null,
key_name varchar2(255 char),
@@ -195,6 +218,22 @@
primary key (name)
);
+ create table j3_object_type (
+ id number(19,0) not null,
+ encoding varchar2(255 char),
+ mime_type varchar2(255 char),
+ xml_id varchar2(255 char),
+ signature_key number(19,0) not null,
+ primary key (id)
+ );
+
+ create table j3_object_type_content (
+ id number(19,0) not null,
+ content blob,
+ object_type_key number(19,0) not null,
+ primary key (id)
+ );
+
create table j3_overview_doc (
id number(19,0) not null,
overview_url varchar2(255 char) not null,
@@ -252,6 +291,17 @@
primary key (from_key, to_key)
);
+ create table j3_reference (
+ id number(19,0) not null,
+ digest_method varchar2(255 char),
+ digest_value blob,
+ type varchar2(255 char),
+ uri varchar2(255 char),
+ xml_id varchar2(255 char),
+ signed_info_key number(19,0) not null,
+ primary key (id)
+ );
+
create table j3_service_category_bag (
id number(19,0) not null,
entity_key varchar2(255 char) not null,
@@ -281,6 +331,56 @@
primary key (business_key, service_key)
);
+ create table j3_signature (
+ id number(19,0) not null,
+ xml_id varchar2(255 char),
+ binding_template_key varchar2(255 char),
+ business_key varchar2(255 char),
+ business_service_key varchar2(255 char),
+ key_info number(19,0) not null,
+ publisher_key varchar2(255 char),
+ signature_value number(19,0) not null,
+ signed_info number(19,0) not null,
+ tmodel_key varchar2(255 char),
+ primary key (id)
+ );
+
+ create table j3_signature_method (
+ id number(19,0) not null,
+ algorithm varchar2(255 char),
+ primary key (id)
+ );
+
+ create table j3_signature_transform (
+ id number(19,0) not null,
+ transform varchar2(255 char),
+ reference_key number(19,0) not null,
+ primary key (id)
+ );
+
+ create table j3_signature_transform_data (
+ id number(19,0) not null,
+ content_bytes blob,
+ content_type varchar2(255 char),
+ signature_transform_key number(19,0) not null,
+ primary key (id)
+ );
+
+ create table j3_signature_value (
+ id number(19,0) not null,
+ value_bytes blob,
+ xml_id varchar2(255 char),
+ primary key (id)
+ );
+
+ create table j3_signed_info (
+ id number(19,0) not null,
+ xml_id varchar2(255 char),
+ canonicalization_method number(19,0) not null,
+ signature_method number(19,0) not null,
+ primary key (id)
+ );
+
create table j3_subscription (
subscription_key varchar2(255 char) not null,
authorized_name varchar2(255 char) not null,
@@ -503,6 +603,16 @@
foreign key (tmodel_instance_info_id)
references j3_tmodel_instance_info;
+ alter table j3_key_data_value
+ add constraint FK74B7E072843143EF
+ foreign key (key_data_value_key)
+ references j3_key_data_value;
+
+ alter table j3_key_data_value
+ add constraint FK74B7E07238C90470
+ foreign key (key_info_key)
+ references j3_key_info;
+
alter table j3_keyed_reference
add constraint FK350C8454E075C8D7
foreign key (keyed_reference_group_id)
@@ -518,6 +628,16 @@
foreign key (category_bag_id)
references j3_category_bag;
+ alter table j3_object_type
+ add constraint FK98BBFA04BC6AD65
+ foreign key (signature_key)
+ references j3_signature;
+
+ alter table j3_object_type_content
+ add constraint FK987A913E71FA643E
+ foreign key (object_type_key)
+ references j3_object_type;
+
alter table j3_overview_doc
add constraint FK5CD8D0E8C5BF8903
foreign key (entity_key)
@@ -553,6 +673,11 @@
foreign key (from_key)
references j3_business_entity;
+ alter table j3_reference
+ add constraint FK493A4F951E480746
+ foreign key (signed_info_key)
+ references j3_signed_info;
+
alter table j3_service_category_bag
add constraint FK185A68076A68D45A
foreign key (id)
@@ -583,6 +708,66 @@
foreign key (business_key)
references j3_business_entity;
+ alter table j3_signature
+ add constraint FKC05CA90256E87DED
+ foreign key (publisher_key)
+ references j3_publisher;
+
+ alter table j3_signature
+ add constraint FKC05CA90271CD8948
+ foreign key (binding_template_key)
+ references j3_binding_template;
+
+ alter table j3_signature
+ add constraint FKC05CA90212F40D40
+ foreign key (business_service_key)
+ references j3_business_service;
+
+ alter table j3_signature
+ add constraint FKC05CA9028ACE9A26
+ foreign key (signed_info)
+ references j3_signed_info;
+
+ alter table j3_signature
+ add constraint FKC05CA9027CE6418E
+ foreign key (signature_value)
+ references j3_signature_value;
+
+ alter table j3_signature
+ add constraint FKC05CA9025793CF55
+ foreign key (tmodel_key)
+ references j3_tmodel;
+
+ alter table j3_signature
+ add constraint FKC05CA902DA6C2DD0
+ foreign key (key_info)
+ references j3_key_info;
+
+ alter table j3_signature
+ add constraint FKC05CA902EF04CFEE
+ foreign key (business_key)
+ references j3_business_entity;
+
+ alter table j3_signature_transform
+ add constraint FK726346F9256790B
+ foreign key (reference_key)
+ references j3_reference;
+
+ alter table j3_signature_transform_data
+ add constraint FK3242526C7B88B2A4
+ foreign key (signature_transform_key)
+ references j3_signature_transform;
+
+ alter table j3_signed_info
+ add constraint FKD2E7E5BB877110CC
+ foreign key (canonicalization_method)
+ references j3_canonicalization_method;
+
+ alter table j3_signed_info
+ add constraint FKD2E7E5BB1A25896
+ foreign key (signature_method)
+ references j3_signature_method;
+
alter table j3_subscription_match
add constraint FK5B9C2F19BEEE42E5
foreign key (subscription_key)
Modified: labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/install/jUDDI-registryV3/juddi-sql/postgres/import.sql
===================================================================
--- labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/install/jUDDI-registryV3/juddi-sql/postgres/import.sql 2013-04-08 16:00:57 UTC (rev 38312)
+++ labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/install/jUDDI-registryV3/juddi-sql/postgres/import.sql 2013-04-09 10:05:40 UTC (rev 38313)
@@ -94,6 +94,12 @@
primary key (entity_key)
);
+ create table j3_canonicalization_method (
+ id int8 not null,
+ algorithm varchar(255),
+ primary key (id)
+ );
+
create table j3_category_bag (
id int8 not null,
primary key (id)
@@ -162,6 +168,23 @@
primary key (id)
);
+ create table j3_key_data_value (
+ id int8 not null,
+ key_data_name varchar(255),
+ key_data_type varchar(255),
+ key_data_value oid,
+ key_data_value_string text,
+ key_data_value_key int8,
+ key_info_key int8,
+ primary key (id)
+ );
+
+ create table j3_key_info (
+ id int8 not null,
+ xml_id varchar(255),
+ primary key (id)
+ );
+
create table j3_keyed_reference (
id int8 not null,
key_name varchar(255),
@@ -195,6 +218,22 @@
primary key (name)
);
+ create table j3_object_type (
+ id int8 not null,
+ encoding varchar(255),
+ mime_type varchar(255),
+ xml_id varchar(255),
+ signature_key int8 not null,
+ primary key (id)
+ );
+
+ create table j3_object_type_content (
+ id int8 not null,
+ content oid,
+ object_type_key int8 not null,
+ primary key (id)
+ );
+
create table j3_overview_doc (
id int8 not null,
overview_url varchar(255) not null,
@@ -252,6 +291,17 @@
primary key (from_key, to_key)
);
+ create table j3_reference (
+ id int8 not null,
+ digest_method varchar(255),
+ digest_value oid,
+ type varchar(255),
+ uri varchar(255),
+ xml_id varchar(255),
+ signed_info_key int8 not null,
+ primary key (id)
+ );
+
create table j3_service_category_bag (
id int8 not null,
entity_key varchar(255) not null,
@@ -281,6 +331,56 @@
primary key (business_key, service_key)
);
+ create table j3_signature (
+ id int8 not null,
+ xml_id varchar(255),
+ binding_template_key varchar(255),
+ business_key varchar(255),
+ business_service_key varchar(255),
+ key_info int8 not null,
+ publisher_key varchar(255),
+ signature_value int8 not null,
+ signed_info int8 not null,
+ tmodel_key varchar(255),
+ primary key (id)
+ );
+
+ create table j3_signature_method (
+ id int8 not null,
+ algorithm varchar(255),
+ primary key (id)
+ );
+
+ create table j3_signature_transform (
+ id int8 not null,
+ transform varchar(255),
+ reference_key int8 not null,
+ primary key (id)
+ );
+
+ create table j3_signature_transform_data (
+ id int8 not null,
+ content_bytes oid,
+ content_type varchar(255),
+ signature_transform_key int8 not null,
+ primary key (id)
+ );
+
+ create table j3_signature_value (
+ id int8 not null,
+ value_bytes oid,
+ xml_id varchar(255),
+ primary key (id)
+ );
+
+ create table j3_signed_info (
+ id int8 not null,
+ xml_id varchar(255),
+ canonicalization_method int8 not null,
+ signature_method int8 not null,
+ primary key (id)
+ );
+
create table j3_subscription (
subscription_key varchar(255) not null,
authorized_name varchar(255) not null,
@@ -503,6 +603,16 @@
foreign key (tmodel_instance_info_id)
references j3_tmodel_instance_info;
+ alter table j3_key_data_value
+ add constraint FK74B7E072843143EF
+ foreign key (key_data_value_key)
+ references j3_key_data_value;
+
+ alter table j3_key_data_value
+ add constraint FK74B7E07238C90470
+ foreign key (key_info_key)
+ references j3_key_info;
+
alter table j3_keyed_reference
add constraint FK350C8454E075C8D7
foreign key (keyed_reference_group_id)
@@ -518,6 +628,16 @@
foreign key (category_bag_id)
references j3_category_bag;
+ alter table j3_object_type
+ add constraint FK98BBFA04BC6AD65
+ foreign key (signature_key)
+ references j3_signature;
+
+ alter table j3_object_type_content
+ add constraint FK987A913E71FA643E
+ foreign key (object_type_key)
+ references j3_object_type;
+
alter table j3_overview_doc
add constraint FK5CD8D0E8C5BF8903
foreign key (entity_key)
@@ -553,6 +673,11 @@
foreign key (from_key)
references j3_business_entity;
+ alter table j3_reference
+ add constraint FK493A4F951E480746
+ foreign key (signed_info_key)
+ references j3_signed_info;
+
alter table j3_service_category_bag
add constraint FK185A68076A68D45A
foreign key (id)
@@ -583,6 +708,66 @@
foreign key (business_key)
references j3_business_entity;
+ alter table j3_signature
+ add constraint FKC05CA90256E87DED
+ foreign key (publisher_key)
+ references j3_publisher;
+
+ alter table j3_signature
+ add constraint FKC05CA90271CD8948
+ foreign key (binding_template_key)
+ references j3_binding_template;
+
+ alter table j3_signature
+ add constraint FKC05CA90212F40D40
+ foreign key (business_service_key)
+ references j3_business_service;
+
+ alter table j3_signature
+ add constraint FKC05CA9028ACE9A26
+ foreign key (signed_info)
+ references j3_signed_info;
+
+ alter table j3_signature
+ add constraint FKC05CA9027CE6418E
+ foreign key (signature_value)
+ references j3_signature_value;
+
+ alter table j3_signature
+ add constraint FKC05CA9025793CF55
+ foreign key (tmodel_key)
+ references j3_tmodel;
+
+ alter table j3_signature
+ add constraint FKC05CA902DA6C2DD0
+ foreign key (key_info)
+ references j3_key_info;
+
+ alter table j3_signature
+ add constraint FKC05CA902EF04CFEE
+ foreign key (business_key)
+ references j3_business_entity;
+
+ alter table j3_signature_transform
+ add constraint FK726346F9256790B
+ foreign key (reference_key)
+ references j3_reference;
+
+ alter table j3_signature_transform_data
+ add constraint FK3242526C7B88B2A4
+ foreign key (signature_transform_key)
+ references j3_signature_transform;
+
+ alter table j3_signed_info
+ add constraint FKD2E7E5BB877110CC
+ foreign key (canonicalization_method)
+ references j3_canonicalization_method;
+
+ alter table j3_signed_info
+ add constraint FKD2E7E5BB1A25896
+ foreign key (signature_method)
+ references j3_signature_method;
+
alter table j3_subscription_match
add constraint FK5B9C2F19BEEE42E5
foreign key (subscription_key)
Modified: labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/install/jUDDI-registryV3/juddi-sql/sqlserver/import.sql
===================================================================
--- labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/install/jUDDI-registryV3/juddi-sql/sqlserver/import.sql 2013-04-08 16:00:57 UTC (rev 38312)
+++ labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/install/jUDDI-registryV3/juddi-sql/sqlserver/import.sql 2013-04-09 10:05:40 UTC (rev 38313)
@@ -94,6 +94,12 @@
primary key (entity_key)
);
+ create table j3_canonicalization_method (
+ id numeric(19,0) identity not null,
+ algorithm varchar(255) null,
+ primary key (id)
+ );
+
create table j3_category_bag (
id numeric(19,0) identity not null,
primary key (id)
@@ -162,6 +168,23 @@
primary key (id)
);
+ create table j3_key_data_value (
+ id numeric(19,0) identity not null,
+ key_data_name varchar(255) null,
+ key_data_type varchar(255) null,
+ key_data_value image null,
+ key_data_value_string text null,
+ key_data_value_key numeric(19,0) null,
+ key_info_key numeric(19,0) null,
+ primary key (id)
+ );
+
+ create table j3_key_info (
+ id numeric(19,0) identity not null,
+ xml_id varchar(255) null,
+ primary key (id)
+ );
+
create table j3_keyed_reference (
id numeric(19,0) identity not null,
key_name varchar(255) null,
@@ -195,6 +218,22 @@
primary key (name)
);
+ create table j3_object_type (
+ id numeric(19,0) identity not null,
+ encoding varchar(255) null,
+ mime_type varchar(255) null,
+ xml_id varchar(255) null,
+ signature_key numeric(19,0) not null,
+ primary key (id)
+ );
+
+ create table j3_object_type_content (
+ id numeric(19,0) identity not null,
+ content image null,
+ object_type_key numeric(19,0) not null,
+ primary key (id)
+ );
+
create table j3_overview_doc (
id numeric(19,0) identity not null,
overview_url varchar(255) not null,
@@ -252,6 +291,17 @@
primary key (from_key, to_key)
);
+ create table j3_reference (
+ id numeric(19,0) identity not null,
+ digest_method varchar(255) null,
+ digest_value image null,
+ type varchar(255) null,
+ uri varchar(255) null,
+ xml_id varchar(255) null,
+ signed_info_key numeric(19,0) not null,
+ primary key (id)
+ );
+
create table j3_service_category_bag (
id numeric(19,0) not null,
entity_key varchar(255) not null,
@@ -281,6 +331,56 @@
primary key (business_key, service_key)
);
+ create table j3_signature (
+ id numeric(19,0) identity not null,
+ xml_id varchar(255) null,
+ binding_template_key varchar(255) null,
+ business_key varchar(255) null,
+ business_service_key varchar(255) null,
+ key_info numeric(19,0) not null,
+ publisher_key varchar(255) null,
+ signature_value numeric(19,0) not null,
+ signed_info numeric(19,0) not null,
+ tmodel_key varchar(255) null,
+ primary key (id)
+ );
+
+ create table j3_signature_method (
+ id numeric(19,0) identity not null,
+ algorithm varchar(255) null,
+ primary key (id)
+ );
+
+ create table j3_signature_transform (
+ id numeric(19,0) identity not null,
+ transform varchar(255) null,
+ reference_key numeric(19,0) not null,
+ primary key (id)
+ );
+
+ create table j3_signature_transform_data (
+ id numeric(19,0) identity not null,
+ content_bytes image null,
+ content_type varchar(255) null,
+ signature_transform_key numeric(19,0) not null,
+ primary key (id)
+ );
+
+ create table j3_signature_value (
+ id numeric(19,0) identity not null,
+ value_bytes image null,
+ xml_id varchar(255) null,
+ primary key (id)
+ );
+
+ create table j3_signed_info (
+ id numeric(19,0) identity not null,
+ xml_id varchar(255) null,
+ canonicalization_method numeric(19,0) not null,
+ signature_method numeric(19,0) not null,
+ primary key (id)
+ );
+
create table j3_subscription (
subscription_key varchar(255) not null,
authorized_name varchar(255) not null,
@@ -503,6 +603,16 @@
foreign key (tmodel_instance_info_id)
references j3_tmodel_instance_info;
+ alter table j3_key_data_value
+ add constraint FK74B7E072843143EF
+ foreign key (key_data_value_key)
+ references j3_key_data_value;
+
+ alter table j3_key_data_value
+ add constraint FK74B7E07238C90470
+ foreign key (key_info_key)
+ references j3_key_info;
+
alter table j3_keyed_reference
add constraint FK350C8454E075C8D7
foreign key (keyed_reference_group_id)
@@ -518,6 +628,16 @@
foreign key (category_bag_id)
references j3_category_bag;
+ alter table j3_object_type
+ add constraint FK98BBFA04BC6AD65
+ foreign key (signature_key)
+ references j3_signature;
+
+ alter table j3_object_type_content
+ add constraint FK987A913E71FA643E
+ foreign key (object_type_key)
+ references j3_object_type;
+
alter table j3_overview_doc
add constraint FK5CD8D0E8C5BF8903
foreign key (entity_key)
@@ -553,6 +673,11 @@
foreign key (from_key)
references j3_business_entity;
+ alter table j3_reference
+ add constraint FK493A4F951E480746
+ foreign key (signed_info_key)
+ references j3_signed_info;
+
alter table j3_service_category_bag
add constraint FK185A68076A68D45A
foreign key (id)
@@ -583,6 +708,66 @@
foreign key (business_key)
references j3_business_entity;
+ alter table j3_signature
+ add constraint FKC05CA90256E87DED
+ foreign key (publisher_key)
+ references j3_publisher;
+
+ alter table j3_signature
+ add constraint FKC05CA90271CD8948
+ foreign key (binding_template_key)
+ references j3_binding_template;
+
+ alter table j3_signature
+ add constraint FKC05CA90212F40D40
+ foreign key (business_service_key)
+ references j3_business_service;
+
+ alter table j3_signature
+ add constraint FKC05CA9028ACE9A26
+ foreign key (signed_info)
+ references j3_signed_info;
+
+ alter table j3_signature
+ add constraint FKC05CA9027CE6418E
+ foreign key (signature_value)
+ references j3_signature_value;
+
+ alter table j3_signature
+ add constraint FKC05CA9025793CF55
+ foreign key (tmodel_key)
+ references j3_tmodel;
+
+ alter table j3_signature
+ add constraint FKC05CA902DA6C2DD0
+ foreign key (key_info)
+ references j3_key_info;
+
+ alter table j3_signature
+ add constraint FKC05CA902EF04CFEE
+ foreign key (business_key)
+ references j3_business_entity;
+
+ alter table j3_signature_transform
+ add constraint FK726346F9256790B
+ foreign key (reference_key)
+ references j3_reference;
+
+ alter table j3_signature_transform_data
+ add constraint FK3242526C7B88B2A4
+ foreign key (signature_transform_key)
+ references j3_signature_transform;
+
+ alter table j3_signed_info
+ add constraint FKD2E7E5BB877110CC
+ foreign key (canonicalization_method)
+ references j3_canonicalization_method;
+
+ alter table j3_signed_info
+ add constraint FKD2E7E5BB1A25896
+ foreign key (signature_method)
+ references j3_signature_method;
+
alter table j3_subscription_match
add constraint FK5B9C2F19BEEE42E5
foreign key (subscription_key)
Modified: labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/install/jUDDI-registryV3/juddi-sql/sybase/import.sql
===================================================================
--- labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/install/jUDDI-registryV3/juddi-sql/sybase/import.sql 2013-04-08 16:00:57 UTC (rev 38312)
+++ labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/install/jUDDI-registryV3/juddi-sql/sybase/import.sql 2013-04-09 10:05:40 UTC (rev 38313)
@@ -94,6 +94,12 @@
primary key (entity_key)
);
+ create table j3_canonicalization_method (
+ id numeric(19,0) identity not null,
+ algorithm varchar(255) null,
+ primary key (id)
+ );
+
create table j3_category_bag (
id numeric(19,0) identity not null,
primary key (id)
@@ -162,6 +168,23 @@
primary key (id)
);
+ create table j3_key_data_value (
+ id numeric(19,0) identity not null,
+ key_data_name varchar(255) null,
+ key_data_type varchar(255) null,
+ key_data_value image null,
+ key_data_value_string text null,
+ key_data_value_key numeric(19,0) null,
+ key_info_key numeric(19,0) null,
+ primary key (id)
+ );
+
+ create table j3_key_info (
+ id numeric(19,0) identity not null,
+ xml_id varchar(255) null,
+ primary key (id)
+ );
+
create table j3_keyed_reference (
id numeric(19,0) identity not null,
key_name varchar(255) null,
@@ -195,6 +218,22 @@
primary key (name)
);
+ create table j3_object_type (
+ id numeric(19,0) identity not null,
+ encoding varchar(255) null,
+ mime_type varchar(255) null,
+ xml_id varchar(255) null,
+ signature_key numeric(19,0) not null,
+ primary key (id)
+ );
+
+ create table j3_object_type_content (
+ id numeric(19,0) identity not null,
+ content image null,
+ object_type_key numeric(19,0) not null,
+ primary key (id)
+ );
+
create table j3_overview_doc (
id numeric(19,0) identity not null,
overview_url varchar(255) not null,
@@ -252,6 +291,17 @@
primary key (from_key, to_key)
);
+ create table j3_reference (
+ id numeric(19,0) identity not null,
+ digest_method varchar(255) null,
+ digest_value image null,
+ type varchar(255) null,
+ uri varchar(255) null,
+ xml_id varchar(255) null,
+ signed_info_key numeric(19,0) not null,
+ primary key (id)
+ );
+
create table j3_service_category_bag (
id numeric(19,0) not null,
entity_key varchar(255) not null,
@@ -281,6 +331,56 @@
primary key (business_key, service_key)
);
+ create table j3_signature (
+ id numeric(19,0) identity not null,
+ xml_id varchar(255) null,
+ binding_template_key varchar(255) null,
+ business_key varchar(255) null,
+ business_service_key varchar(255) null,
+ key_info numeric(19,0) not null,
+ publisher_key varchar(255) null,
+ signature_value numeric(19,0) not null,
+ signed_info numeric(19,0) not null,
+ tmodel_key varchar(255) null,
+ primary key (id)
+ );
+
+ create table j3_signature_method (
+ id numeric(19,0) identity not null,
+ algorithm varchar(255) null,
+ primary key (id)
+ );
+
+ create table j3_signature_transform (
+ id numeric(19,0) identity not null,
+ transform varchar(255) null,
+ reference_key numeric(19,0) not null,
+ primary key (id)
+ );
+
+ create table j3_signature_transform_data (
+ id numeric(19,0) identity not null,
+ content_bytes image null,
+ content_type varchar(255) null,
+ signature_transform_key numeric(19,0) not null,
+ primary key (id)
+ );
+
+ create table j3_signature_value (
+ id numeric(19,0) identity not null,
+ value_bytes image null,
+ xml_id varchar(255) null,
+ primary key (id)
+ );
+
+ create table j3_signed_info (
+ id numeric(19,0) identity not null,
+ xml_id varchar(255) null,
+ canonicalization_method numeric(19,0) not null,
+ signature_method numeric(19,0) not null,
+ primary key (id)
+ );
+
create table j3_subscription (
subscription_key varchar(255) not null,
authorized_name varchar(255) not null,
@@ -503,6 +603,16 @@
foreign key (tmodel_instance_info_id)
references j3_tmodel_instance_info;
+ alter table j3_key_data_value
+ add constraint FK74B7E072843143EF
+ foreign key (key_data_value_key)
+ references j3_key_data_value;
+
+ alter table j3_key_data_value
+ add constraint FK74B7E07238C90470
+ foreign key (key_info_key)
+ references j3_key_info;
+
alter table j3_keyed_reference
add constraint FK350C8454E075C8D7
foreign key (keyed_reference_group_id)
@@ -518,6 +628,16 @@
foreign key (category_bag_id)
references j3_category_bag;
+ alter table j3_object_type
+ add constraint FK98BBFA04BC6AD65
+ foreign key (signature_key)
+ references j3_signature;
+
+ alter table j3_object_type_content
+ add constraint FK987A913E71FA643E
+ foreign key (object_type_key)
+ references j3_object_type;
+
alter table j3_overview_doc
add constraint FK5CD8D0E8C5BF8903
foreign key (entity_key)
@@ -553,6 +673,11 @@
foreign key (from_key)
references j3_business_entity;
+ alter table j3_reference
+ add constraint FK493A4F951E480746
+ foreign key (signed_info_key)
+ references j3_signed_info;
+
alter table j3_service_category_bag
add constraint FK185A68076A68D45A
foreign key (id)
@@ -583,6 +708,66 @@
foreign key (business_key)
references j3_business_entity;
+ alter table j3_signature
+ add constraint FKC05CA90256E87DED
+ foreign key (publisher_key)
+ references j3_publisher;
+
+ alter table j3_signature
+ add constraint FKC05CA90271CD8948
+ foreign key (binding_template_key)
+ references j3_binding_template;
+
+ alter table j3_signature
+ add constraint FKC05CA90212F40D40
+ foreign key (business_service_key)
+ references j3_business_service;
+
+ alter table j3_signature
+ add constraint FKC05CA9028ACE9A26
+ foreign key (signed_info)
+ references j3_signed_info;
+
+ alter table j3_signature
+ add constraint FKC05CA9027CE6418E
+ foreign key (signature_value)
+ references j3_signature_value;
+
+ alter table j3_signature
+ add constraint FKC05CA9025793CF55
+ foreign key (tmodel_key)
+ references j3_tmodel;
+
+ alter table j3_signature
+ add constraint FKC05CA902DA6C2DD0
+ foreign key (key_info)
+ references j3_key_info;
+
+ alter table j3_signature
+ add constraint FKC05CA902EF04CFEE
+ foreign key (business_key)
+ references j3_business_entity;
+
+ alter table j3_signature_transform
+ add constraint FK726346F9256790B
+ foreign key (reference_key)
+ references j3_reference;
+
+ alter table j3_signature_transform_data
+ add constraint FK3242526C7B88B2A4
+ foreign key (signature_transform_key)
+ references j3_signature_transform;
+
+ alter table j3_signed_info
+ add constraint FKD2E7E5BB877110CC
+ foreign key (canonicalization_method)
+ references j3_canonicalization_method;
+
+ alter table j3_signed_info
+ add constraint FKD2E7E5BB1A25896
+ foreign key (signature_method)
+ references j3_signature_method;
+
alter table j3_subscription_match
add constraint FK5B9C2F19BEEE42E5
foreign key (subscription_key)
Modified: labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/install/jUDDI-registryV3/persistence.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/install/jUDDI-registryV3/persistence.xml 2013-04-08 16:00:57 UTC (rev 38312)
+++ labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/install/jUDDI-registryV3/persistence.xml 2013-04-09 10:05:40 UTC (rev 38313)
@@ -22,6 +22,7 @@
<class>org.apache.juddi.model.BusinessIdentifier</class>
<class>org.apache.juddi.model.BusinessName</class>
<class>org.apache.juddi.model.BusinessService</class>
+ <class>org.apache.juddi.model.CanonicalizationMethod</class>
<class>org.apache.juddi.model.CategoryBag</class>
<class>org.apache.juddi.model.Clerk</class>
<class>org.apache.juddi.model.ClientSubscriptionInfo</class>
@@ -33,7 +34,11 @@
<class>org.apache.juddi.model.InstanceDetailsDocDescr</class>
<class>org.apache.juddi.model.KeyedReference</class>
<class>org.apache.juddi.model.KeyedReferenceGroup</class>
+ <class>org.apache.juddi.model.KeyDataValue</class>
+ <class>org.apache.juddi.model.KeyInfo</class>
<class>org.apache.juddi.model.Node</class>
+ <class>org.apache.juddi.model.ObjectType</class>
+ <class>org.apache.juddi.model.ObjectTypeContent</class>
<class>org.apache.juddi.model.OverviewDoc</class>
<class>org.apache.juddi.model.OverviewDocDescr</class>
<class>org.apache.juddi.model.PersonName</class>
@@ -41,11 +46,19 @@
<class>org.apache.juddi.model.Publisher</class>
<class>org.apache.juddi.model.PublisherAssertion</class>
<class>org.apache.juddi.model.PublisherAssertionId</class>
+ <class>org.apache.juddi.model.Reference</class>
<class>org.apache.juddi.model.ServiceCategoryBag</class>
<class>org.apache.juddi.model.ServiceDescr</class>
<class>org.apache.juddi.model.ServiceName</class>
- <class>org.apache.juddi.model.ServiceProjection</class>
- <class>org.apache.juddi.model.Subscription</class>
+ <class>org.apache.juddi.model.ServiceProjection</class>
+ <class>org.apache.juddi.model.ServiceProjectionId</class>
+ <class>org.apache.juddi.model.Signature</class>
+ <class>org.apache.juddi.model.SignatureMethod</class>
+ <class>org.apache.juddi.model.SignatureTransform</class>
+ <class>org.apache.juddi.model.SignatureTransformDataValue</class>
+ <class>org.apache.juddi.model.SignatureValue</class>
+ <class>org.apache.juddi.model.SignedInfo</class>
+ <class>org.apache.juddi.model.Subscription</class>
<class>org.apache.juddi.model.SubscriptionChunkToken</class>
<class>org.apache.juddi.model.SubscriptionMatch</class>
<class>org.apache.juddi.model.Tmodel</class>
Modified: labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/ivy.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/ivy.xml 2013-04-08 16:00:57 UTC (rev 38312)
+++ labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/ivy.xml 2013-04-09 10:05:40 UTC (rev 38313)
@@ -38,7 +38,7 @@
<dependency org="javassist" name="javassist" rev="3.6.0.GA"/>
<dependency org="org.apache.ws.scout" name="jaxr-api" rev="1.0"/>
- <dependency org="org.apache.ws.scout" name="scout" rev="1.2.3"/>
+ <dependency org="org.apache.juddi.scout" name="scout" rev="1.2.7"/>
<dependency org="org.apache.camel" name="camel-core" rev="2.4.0"/>
<dependency org="org.fusesource.commonman" name="commons-management" rev="1.0"/>
@@ -49,12 +49,12 @@
<dependency org="org.jboss.client" name="jbossall-client" rev="4.2.3.GA"/>
<dependency org="com.jcraft" name="jsch" rev="0.1.38"/>
- <dependency org="org.apache.juddi" name="juddiv3-war" rev="3.1.2">
+ <dependency org="org.apache.juddi" name="juddiv3-war" rev="3.1.4">
<artifact name="juddiv3-war" type="war"/>
</dependency>
- <dependency org="org.apache.juddi" name="uddi-ws" rev="3.1.2"/>
- <dependency org="org.apache.juddi" name="juddi-client" rev="3.1.2"/>
- <dependency org="org.apache.juddi" name="juddi-core" rev="3.1.2"/>
+ <dependency org="org.apache.juddi" name="uddi-ws" rev="3.1.4"/>
+ <dependency org="org.apache.juddi" name="juddi-client" rev="3.1.4"/>
+ <dependency org="org.apache.juddi" name="juddi-core" rev="3.1.4"/>
<dependency org="xerces" name="xercesImpl" rev="2.8.0"/>
<dependency org="log4j" name="log4j" rev="1.2.14"/>
@@ -166,7 +166,13 @@
<dependency org="org.jboss.security" name="jbosssx" rev="2.0.3.SP1"/>
<!-- JBoss Identity Federation -->
- <dependency org="org.picketlink" name="picketlink-fed-api" rev="1.0.3.final"/>
+ <dependency org="org.picketlink" name="picketlink-fed-api" rev="1.0.3.final">
+ <exclude module="openid4java-consumer"/>
+ <exclude module="openid4java-server"/>
+ <exclude module="openid4java-server-JdbcServerAssociationStore"/>
+ <exclude module="openid4java-server-SampleServer"/>
+ <exclude module="openid4java-consumer-SampleConsumer"/>
+ </dependency>
<dependency org="org.picketlink" name="picketlink-fed-core" rev="1.0.3.final"/>
<dependency org="org.picketlink" name="picketlink-fed-model" rev="1.0.3.final"/>
<dependency org="org.picketlink" name="picketlink-xmlsec-model" rev="1.0.3.final"/>
Modified: labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/ivysettings.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/ivysettings.xml 2013-04-08 16:00:57 UTC (rev 38312)
+++ labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/ivysettings.xml 2013-04-09 10:05:40 UTC (rev 38313)
@@ -28,9 +28,9 @@
<url name="juddi">
<artifact pattern="http://repo1.maven.org/maven2/org/apache/juddi/[artifact]/[revision]/[artifact]-[revision].[ext]"/>
</url>
- <url name="scout">
- <artifact pattern="http://repo1.maven.org/maven2/org/apache/ws/scout/[artifact]/[revision]/[artifact]-[revision].[ext]"/>
- </url>
+ <url name="scout">
+ <artifact pattern="http://repo1.maven.org/maven2/org/apache/juddi/scout/[artifact]/[revision]/[artifact]-[revision].[ext]"/>
+ </url>
<url name="camel">
<artifact pattern="http://repo1.maven.org/maven2/org/apache/camel/[artifact]/[revision]/[artifact]-[revision].[ext]"/>
</url>
@@ -42,7 +42,7 @@
<module organisation="org.milyn" name="*" resolver="smooks"/>
<module organisation="org/hibernate" name="ejb3-persistence" resolver="ejb3"/>
<module organisation="org.apache.juddi" name="*" resolver="juddi"/>
- <module organisation="org.apache.ws.scout" name="*" resolver="scout"/>
+ <module organisation="org.apache.juddi.scout" name="*" resolver="scout"/>
<module organisation="org.apache.camel" name="*" resolver="camel"/>
<module organisation="org.fusesource.commonman" name="*" resolver="commonman"/>
<module organisation="hibernate-entitymanager" name="hibernate-entitymanager" resolver="jboss-deprecated"/>
Modified: labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/rosetta/build.xml
===================================================================
--- labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/rosetta/build.xml 2013-04-08 16:00:57 UTC (rev 38312)
+++ labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/rosetta/build.xml 2013-04-09 10:05:40 UTC (rev 38313)
@@ -7,8 +7,8 @@
<property name="org.jboss.esb.rosetta.distrib.dir" location="${org.jboss.esb.internal.dest}/jbossesb"/>
<property name="org.jboss.esb.rosetta.classes.dir" location="${org.jboss.esb.internal.dest}/classes/rosetta"/>
- <property name="uddi.webservices.jar" value="uddi-ws-3.1.2.jar"/>
- <property name="juddi.v3.war" value="juddiv3-war-3.1.2.war"/>
+ <property name="uddi.webservices.jar" value="uddi-ws-3.1.4.jar"/>
+ <property name="juddi.v3.war" value="juddiv3-war-3.1.4.war"/>
<property name="juddi.v3.wsdl.location" value="org/jboss/internal/soa/esb/registry/client/wsdl"/>
<property name="juddi.v3.wsdl.dir" location="juddiv3.wsdl"/>
Modified: labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java 2013-04-08 16:00:57 UTC (rev 38312)
+++ labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java 2013-04-09 10:05:40 UTC (rev 38313)
@@ -54,6 +54,7 @@
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
+import org.apache.ws.scout.registry.infomodel.ClassificationImpl;
import org.apache.ws.scout.registry.infomodel.SpecificationLinkImpl;
import org.jboss.internal.soa.esb.addressing.helpers.EPRHelper;
import org.jboss.soa.esb.ConfigurationException;
@@ -81,10 +82,10 @@
private ClassificationScheme jbossESBScheme;
private static Concept jbossTModelXXX;
public static final String JBOSS_ESB_CATEGORY = "org.jboss.soa.esb.:category";
+ private static final boolean isV3;
public static final String REGISTERED_BY_JBOSSESB = "Registered by JBoss ESB";
public static final String SERVICE_DESCRIPTION = "JBoss ESB Service";
public String orgCategory;
- private static final boolean isV3;
public JAXRRegistryImpl() throws ConfigurationException {
jaxrConnectionFactory = new JAXRConnectionFactory();
@@ -124,6 +125,7 @@
}
return service;
}
+
/**
* Remove an EPR from the Registry
* @param category
@@ -151,6 +153,12 @@
JAXRConnectionSingleton.recycleConnection(jaxrConnectionFactory, connection);
}
}
+
+ private String getHost() {
+ return "esbhost:" + Configuration.getBindAddress() + ":" + Configuration.getEsbWebPort();
+ }
+
+
/**
* Publish an EPR to the Registry
* @param category
@@ -174,6 +182,31 @@
{
throw new RegistryException("Null EPR argument specified") ;
}
+
+ String xml;
+ try {
+ xml = EPRHelper.toXMLString(epr);
+ } catch (MarshalException me) {
+ throw new RegistryException(me.getLocalizedMessage(), me);
+ }
+
+ // If we find something here, there's already an EPR registered, why create a dupe?
+ List<EPR> eprs;
+ try {
+ eprs = findEPRs(category, serviceName, getHost());
+ for (EPR foundEpr : eprs) {
+ if (foundEpr.equals(epr)) {
+ return;
+ }
+ }
+ } catch (RegistryException re) {
+ logger.error(re);
+ } catch (ServiceNotFoundException sfe) {
+ //logger.error(sfe);
+ //this is expected when the service is registered for the first time, so just logging this at INFO
+ logger.info(sfe);
+ }
+
Connection connection = JAXRConnectionSingleton.getConnection(jaxrConnectionFactory);
try {
final Concept jbossTModel = getJBossESBTModel(connection);
@@ -189,8 +222,14 @@
BusinessLifeCycleManager blm = rs.getBusinessLifeCycleManager();
BusinessQueryManager bqm = rs.getBusinessQueryManager();
ServiceBinding serviceBinding = blm.createServiceBinding();
- String xml = EPRHelper.toXMLString(epr);
serviceBinding.setAccessURI(xml);
+
+ ClassificationScheme cScheme = getClassificationScheme(bqm, blm);
+ // Add a host string as a classification
+ // so we can try to prevent stale EPR
+ Classification hostClassification = blm.createClassification(cScheme,
+ "host", getHost());
+ serviceBinding.addClassification(hostClassification);
ArrayList<ServiceBinding> serviceBindings = new ArrayList<ServiceBinding>();
SpecificationLink sl = new SpecificationLinkImpl(blm);
@@ -204,15 +243,13 @@
serviceBindings.add(serviceBinding);
service.addServiceBindings(serviceBindings);
- ClassificationScheme cScheme = getClassificationScheme(bqm, blm);
+
Classification classification = blm.createClassification(cScheme, "category", category);
service.addClassification(classification);
saveRegistryObject(serviceBinding, jaxrConnectionFactory);
} catch (JAXRException je) {
throw new RegistryException(je.getLocalizedMessage(), je);
- } catch (MarshalException me) {
- throw new RegistryException(me.getLocalizedMessage(), me);
} finally {
JAXRConnectionSingleton.recycleConnection(jaxrConnectionFactory, connection);
}
@@ -311,6 +348,7 @@
}
return serviceNames;
}
+
/**
* @param category
* @param serviceName
@@ -363,6 +401,75 @@
}
return eprs;
}
+
+ /**
+ * This version of findEPRs checks whether the serviceBinding has an ESB host ID
+ * classification (esb + bind.address + : + web.port), and returns an EPR only if
+ * it can find that classification.
+ * @param category
+ * @param serviceName
+ * @param esbHost
+ * @return epr list
+ * @throws RegistryException
+ * @throws ServiceNotFoundException
+ */
+ public List<EPR> findEPRs(String category, String serviceName, String esbHost) throws RegistryException, ServiceNotFoundException
+ {
+ List<EPR> eprs = new ArrayList<EPR>();
+
+ Connection connection = JAXRConnectionSingleton.getConnection(jaxrConnectionFactory);
+ try {
+ final Concept jbossTModel = getJBossESBTModel(connection);
+
+ Service service = findService(category, serviceName);
+ if (service==null){
+ throw new ServiceNotFoundException("Could not find service with category=" + category + " and serviceName=" + serviceName);
+ }
+ // Get registry service and business query manager
+ Collection<ServiceBinding> serviceBindings = findServiceBindings(service);
+ //Converting them to EPRs
+ for (Iterator i=serviceBindings.iterator();i.hasNext();) {
+ ServiceBinding serviceBinding = (ServiceBinding) i.next();
+
+ if (serviceBinding.getClassifications().size() > 0) {
+ ArrayList<Classification> classifications = new ArrayList(serviceBinding.getClassifications());
+
+ boolean registeredFlag = false;
+ for (Classification classification : classifications) {
+ // If the classification name is "host" and the host matches the current host
+ ((ClassificationImpl)classification).setExternal(true);
+ if ((classification.getName().getValue().equals("host"))
+ && (classification.getValue().equals(esbHost)) ) {
+ String eprXML = serviceBinding.getAccessURI();
+ EPR epr = null;
+ //for backwards compatibility still have the decoder if
+ //unmarchalling fails
+ try {
+ epr = EPRHelper.fromXMLString(eprXML);
+ eprs.add(epr);
+ } catch (UnmarshalException unme) {
+ try {
+ eprXML = URLDecoder.decode(eprXML, "UTF-8");
+ epr = EPRHelper.fromXMLString(eprXML);
+ eprs.add(epr);
+ } catch (UnsupportedEncodingException ue) {
+ logger.error(ue.getMessage(), ue);
+ throw new UnmarshalException(ue.getMessage(), ue);
+ }
+ }
+ }
+ }
+ }
+ }
+ } catch (JAXRException je) {
+ throw new RegistryException(je.getLocalizedMessage(), je);
+ } catch (UnmarshalException me) {
+ throw new RegistryException(me.getLocalizedMessage(), me);
+ } finally {
+ JAXRConnectionSingleton.recycleConnection(jaxrConnectionFactory, connection);
+ }
+ return eprs;
+ }
/**
* @param category
@@ -969,11 +1076,11 @@
Collection<String> findQualifiers = null;
//Collection<String> findQualifiers = new ArrayList<String>();
//findQualifiers.add(FindQualifier.SORT_BY_DATE_ASC);
- ArrayList<SpecificationLink> specs = new ArrayList<SpecificationLink>();
- SpecificationLink sl = new SpecificationLinkImpl(blm);
- sl.setSpecificationObject(jbossTModel);
+ ArrayList<Concept> specs = new ArrayList<Concept>();
+ //SpecificationLink sl = new SpecificationLinkImpl(blm);
+ //sl.setSpecificationObject(jbossTModel);
- specs.add(sl);
+ specs.add(jbossTModel);
BulkResponse bulkResponse = bqm.findServiceBindings(service.getKey(),findQualifiers,null,specs);
if (bulkResponse.getStatus()==JAXRResponse.STATUS_SUCCESS){
serviceBindings = (Collection<ServiceBinding>)bulkResponse.getCollection();
Modified: labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/rosetta/src/org/jboss/soa/esb/common/Configuration.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/rosetta/src/org/jboss/soa/esb/common/Configuration.java 2013-04-08 16:00:57 UTC (rev 38312)
+++ labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/rosetta/src/org/jboss/soa/esb/common/Configuration.java 2013-04-09 10:05:40 UTC (rev 38313)
@@ -95,6 +95,7 @@
new KeyValuePair(Environment.REGISTRY_CACHE_MAX_SIZE ,getRegistryCacheMaxSize()),
new KeyValuePair(Environment.REGISTRY_CACHE_VALIDITY_PERIOD ,getRegistryCacheValidityPeriod()),
new KeyValuePair(Environment.ESB_BIND_ADDRESS ,getBindAddress()),
+ new KeyValuePair(Environment.ESB_WEB_PORT,getEsbWebPort()),
new KeyValuePair(Environment.RULES_CONTINUE_STATE ,getRulesContinueState()),
new KeyValuePair(Environment.RULES_RESOURCE_SCANNER_INTERVAL,getRulesResourceScannerInterval()),
new KeyValuePair(Environment.DEPLOYMENT_SCHEMA_VALIDATION ,getDeploymentSchemaValidation()),
@@ -651,6 +652,16 @@
return ModulePropertyManager.getPropertyManager(ModulePropertyManager.SECURITY_MODULE).getProperty(Environment.SECURITY_JBOSSAS_SECURITY_CONTEXT_OPERATIONS_CLASS);
}
+ public static String getEsbWebPort()
+ {
+ String address = System.getProperty(Environment.ESB_WEB_PORT) ;
+ if (address == null)
+ {
+ address = "8080" ;
+ }
+ return address ;
+ }
+
/**
* Get the bind address.
* @return the bind address.
@@ -697,4 +708,4 @@
return ModulePropertyManager.getPropertyManager(ModulePropertyManager.SECURITY_MODULE).getProperty(Environment.BINARY_SECURITY_TOKEN_IMPLEMENTATION_CLASS,
"org.jboss.soa.esb.services.security.auth.ws.BinarySecurityTokenImpl");
}
-}
\ No newline at end of file
+}
Modified: labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/rosetta/src/org/jboss/soa/esb/common/Environment.java
===================================================================
--- labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/rosetta/src/org/jboss/soa/esb/common/Environment.java 2013-04-08 16:00:57 UTC (rev 38312)
+++ labs/jbossesb/tags/JBESB_4_10_CP-BZ947952/product/rosetta/src/org/jboss/soa/esb/common/Environment.java 2013-04-09 10:05:40 UTC (rev 38313)
@@ -35,6 +35,7 @@
* Binding properties
*/
public static final String ESB_BIND_ADDRESS = "jboss.esb.bind.address" ;
+ public static final String ESB_WEB_PORT = "org.jboss.esb.web.port";
/**
* Schema validation
*/
More information about the jboss-svn-commits
mailing list