You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by al...@apache.org on 2013/05/16 05:03:29 UTC

svn commit: r1483174 [1/2] - in /juddi/branches/juddi-3.2.x: ./ docs/ docs/db/ddl/ docs/devguide/ docs/uddi3-specification/ docs/userguide/ juddi-client/ juddi-console/ juddi-console/juddi-portal/ juddi-console/uddi-portlets/ juddi-core-openjpa/ juddi-...

Author: alexoree
Date: Thu May 16 03:03:28 2013
New Revision: 1483174

URL: http://svn.apache.org/r1483174
Log:
synching with trunk

Added:
    juddi/branches/juddi-3.2.x/docs/Eclipse Setup.pdf
      - copied unchanged from r1483173, juddi/trunk/docs/Eclipse Setup.pdf
    juddi/branches/juddi-3.2.x/docs/uddi3-specification/Security Enhancements for UDDI - Obaidat, O'Ree.pdf
      - copied unchanged from r1483173, juddi/trunk/docs/uddi3-specification/Security Enhancements for UDDI - Obaidat, O'Ree.pdf
Modified:
    juddi/branches/juddi-3.2.x/   (props changed)
    juddi/branches/juddi-3.2.x/RELEASE_NOTES.html
    juddi/branches/juddi-3.2.x/docs/db/ddl/README.txt
    juddi/branches/juddi-3.2.x/docs/db/ddl/db2.ddl
    juddi/branches/juddi-3.2.x/docs/db/ddl/derby.ddl
    juddi/branches/juddi-3.2.x/docs/db/ddl/mysql.ddl
    juddi/branches/juddi-3.2.x/docs/db/ddl/mysql5.ddl
    juddi/branches/juddi-3.2.x/docs/db/ddl/mysql5InnoDB.ddl
    juddi/branches/juddi-3.2.x/docs/db/ddl/oracle9.ddl
    juddi/branches/juddi-3.2.x/docs/db/ddl/postgres.ddl
    juddi/branches/juddi-3.2.x/docs/db/ddl/sqlserver.ddl
    juddi/branches/juddi-3.2.x/docs/db/ddl/sybase.ddl
    juddi/branches/juddi-3.2.x/docs/devguide/pom.xml
    juddi/branches/juddi-3.2.x/docs/pom.xml
    juddi/branches/juddi-3.2.x/docs/userguide/pom.xml
    juddi/branches/juddi-3.2.x/juddi-client/   (props changed)
    juddi/branches/juddi-3.2.x/juddi-client/pom.xml
    juddi/branches/juddi-3.2.x/juddi-console/juddi-portal/pom.xml
    juddi/branches/juddi-3.2.x/juddi-console/pom.xml
    juddi/branches/juddi-3.2.x/juddi-console/uddi-portlets/pom.xml
    juddi/branches/juddi-3.2.x/juddi-core-openjpa/build.xml
    juddi/branches/juddi-3.2.x/juddi-core-openjpa/pom.xml
    juddi/branches/juddi-3.2.x/juddi-core/pom.xml
    juddi/branches/juddi-3.2.x/juddi-dist/pom.xml
    juddi/branches/juddi-3.2.x/juddi-examples/create-partition/pom.xml
    juddi/branches/juddi-3.2.x/juddi-examples/hello-world/pom.xml
    juddi/branches/juddi-3.2.x/juddi-examples/pom.xml
    juddi/branches/juddi-3.2.x/juddi-examples/simple-browse/pom.xml
    juddi/branches/juddi-3.2.x/juddi-examples/simple-publish/pom.xml
    juddi/branches/juddi-3.2.x/juddi-examples/uddi-annotations/pom.xml
    juddi/branches/juddi-3.2.x/juddi-examples/wsdl2uddi-lifecyle/pom.xml
    juddi/branches/juddi-3.2.x/juddi-examples/wsdl2uddi/pom.xml
    juddi/branches/juddi-3.2.x/juddi-tomcat/pom.xml
    juddi/branches/juddi-3.2.x/juddiv3-war/pom.xml
    juddi/branches/juddi-3.2.x/pom.xml
    juddi/branches/juddi-3.2.x/uddi-tck-base/pom.xml
    juddi/branches/juddi-3.2.x/uddi-tck/pom.xml
    juddi/branches/juddi-3.2.x/uddi-ws/pom.xml
    juddi/branches/juddi-3.2.x/uddi-ws/src/main/java/org/uddi/api_v3/Name.java

Propchange: juddi/branches/juddi-3.2.x/
------------------------------------------------------------------------------
  Merged /juddi/trunk:r1481603-1483173

Modified: juddi/branches/juddi-3.2.x/RELEASE_NOTES.html
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/RELEASE_NOTES.html?rev=1483174&r1=1483173&r2=1483174&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/RELEASE_NOTES.html (original)
+++ juddi/branches/juddi-3.2.x/RELEASE_NOTES.html Thu May 16 03:03:28 2013
@@ -14,6 +14,113 @@
  * limitations under the License.
  *
  * -->
+ 
+ 
+        <h1>Release Notes - jUDDI - Version 3.1.5
+                </h1>
+<h2>        Bug
+</h2>
+<ul>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-363'>JUDDI-363</a>] -         Move hibernate and openjpa persistence files out of resources
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-409'>JUDDI-409</a>] -         problems in digital signature on entity
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-496'>JUDDI-496</a>] -         The tModel is not loaded in the SubscriptionNotifier
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-545'>JUDDI-545</a>] -         combineCategoryBags findQualifier not performing correctly when used in find_business call
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-548'>JUDDI-548</a>] -         java7 compatibility
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-553'>JUDDI-553</a>] -         TModelDetail not deleted when TModel is deleted
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-557'>JUDDI-557</a>] -         Update all POMs on example
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-560'>JUDDI-560</a>] -         Issues from findbugs
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-561'>JUDDI-561</a>] -         Transaction rollback when PersonName Lang is greater than 5 characters
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-562'>JUDDI-562</a>] -         CI build integration failures
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-565'>JUDDI-565</a>] -         Binding template validation rules are incorrect
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-566'>JUDDI-566</a>] -         Using service/binding/hostingDirector causes a NPE
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-568'>JUDDI-568</a>] -         If publication of the root publisher fails, juddi goes into an infinite loop
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-569'>JUDDI-569</a>] -         Performance Issue fetching service list
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-571'>JUDDI-571</a>] -         find_services lang issue
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-572'>JUDDI-572</a>] -         Sending a business key for getServiceDetail causing a class cast exception
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-573'>JUDDI-573</a>] -         Performance Issue fetching business
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-574'>JUDDI-574</a>] -         findTmodel search results does not return the Lang element
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-576'>JUDDI-576</a>] -         Fix broken links and old wiki site
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-582'>JUDDI-582</a>] -         KeyedReferenceGroup/tModelKey is either not saved or not retrieved
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-589'>JUDDI-589</a>] -         find qualifier signaturePresent doesn&#39;t appear to follow the spec
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-591'>JUDDI-591</a>] -         Add support for email alerts for Subscription API
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-592'>JUDDI-592</a>] -         failing unit test on latest trunk
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-612'>JUDDI-612</a>] -         Build &#39;clean&#39; target does not remove the content in juddi-core-openjpa\src\main
+</li>
+</ul>
+                
+<h2>        Improvement
+</h2>
+<ul>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-89'>JUDDI-89</a>] -         JDBC Datastore performance improvements
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-554'>JUDDI-554</a>] -         Link to wiki from participation page goes to a different url
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-555'>JUDDI-555</a>] -         Add additional examples for working with UDDI
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-559'>JUDDI-559</a>] -         Authentication Tokens do not expire
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-575'>JUDDI-575</a>] -         Referential Integrity Check 
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-588'>JUDDI-588</a>] -         Default Juddi business has services with endpoints starting with ${juddi.server.baseurl}/juddiv3
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-601'>JUDDI-601</a>] -         Add more constant fields and documentation to juddi-client
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-611'>JUDDI-611</a>] -         UDDIClerkManager renamed to UDDIClient
+</li>
+</ul>
+    
+<h2>        New Feature
+</h2>
+<ul>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-563'>JUDDI-563</a>] -         Package a Jboss 5/6 compatible war
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-580'>JUDDI-580</a>] -         Validation Framework Enhancements
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-584'>JUDDI-584</a>] -         provide a working example of configuring juddi with postgres
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-585'>JUDDI-585</a>] -         Add a generated Release class to the juddi-client to provide version information at runtime
+</li>
+</ul>
+                        
+<h2>        Task
+</h2>
+<ul>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-480'>JUDDI-480</a>] -         Add juddiv3.war distribution for other appservers
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-514'>JUDDI-514</a>] -         Upgrade support WSDL2UDDI registration
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-540'>JUDDI-540</a>] -         Revisit Distro
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-541'>JUDDI-541</a>] -         Small changes to the build
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/JUDDI-586'>JUDDI-586</a>] -         Upgrade OpenJPA to 2.x
+</li>
+</ul>
+                    
+                    
 <h1>Release Notes - jUDDI - Version 3.1.4</h1>
                 
 <h2>        Bug

Modified: juddi/branches/juddi-3.2.x/docs/db/ddl/README.txt
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/docs/db/ddl/README.txt?rev=1483174&r1=1483173&r2=1483174&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/docs/db/ddl/README.txt (original)
+++ juddi/branches/juddi-3.2.x/docs/db/ddl/README.txt Thu May 16 03:03:28 2013
@@ -26,7 +26,7 @@ Dialects can be found at https://www.hib
 
 DB2Dialect
 DerbyDialect
-MySQLDBDialect
+MySQLDialect
 MySQL5InnoDBDialect
 Oracle9Dialect
 PostgreSQLDialect

Modified: juddi/branches/juddi-3.2.x/docs/db/ddl/db2.ddl
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/docs/db/ddl/db2.ddl?rev=1483174&r1=1483173&r2=1483174&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/docs/db/ddl/db2.ddl (original)
+++ juddi/branches/juddi-3.2.x/docs/db/ddl/db2.ddl Thu May 16 03:03:28 2013
@@ -1,19 +1,4 @@
-<*
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+
     create table j3_address (
         id bigint generated by default as identity,
         sort_code varchar(10),
@@ -51,15 +36,15 @@
 
     create table j3_binding_descr (
         id bigint generated by default as identity,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
+        descr varchar(255) not null,
+        lang_code varchar(26),
         entity_key varchar(255) not null,
         primary key (id)
     );
 
     create table j3_binding_template (
         access_point_type varchar(255),
-        access_point_url varchar(4000),
+        access_point_url varchar(4096),
         hosting_redirector varchar(255),
         entity_key varchar(255) not null,
         service_key varchar(255) not null,
@@ -75,8 +60,8 @@
 
     create table j3_business_descr (
         id bigint generated by default as identity,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
+        descr varchar(255) not null,
+        lang_code varchar(26),
         entity_key varchar(255) not null,
         primary key (id)
     );
@@ -97,7 +82,7 @@
 
     create table j3_business_name (
         id bigint generated by default as identity,
-        lang_code varchar(5),
+        lang_code varchar(26),
         name varchar(255) not null,
         entity_key varchar(255) not null,
         primary key (id)
@@ -145,15 +130,15 @@
 
     create table j3_contact_descr (
         id bigint generated by default as identity,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
+        descr varchar(255) not null,
+        lang_code varchar(26),
         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,
+        url varchar(4096) not null,
         use_type varchar(255) not null,
         entity_key varchar(255) not null,
         primary key (id)
@@ -161,7 +146,7 @@
 
     create table j3_email (
         id bigint generated by default as identity,
-        email_address varchar(255) not null,
+        email_address varchar(4096) not null,
         use_type varchar(255),
         contact_id bigint not null,
         primary key (id)
@@ -169,16 +154,16 @@
 
     create table j3_instance_details_descr (
         id bigint generated by default as identity,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
+        descr varchar(255) not null,
+        lang_code varchar(26),
         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),
+        descr varchar(255) not null,
+        lang_code varchar(26),
         tmodel_instance_info_id bigint not null,
         primary key (id)
     );
@@ -219,13 +204,13 @@
 
     create table j3_node (
         name varchar(255) not null,
+        client_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,
@@ -261,14 +246,14 @@
     create table j3_overview_doc_descr (
         id bigint generated by default as identity,
         descr varchar(1024) not null,
-        lang_code varchar(5),
+        lang_code varchar(26),
         overview_doc_id bigint,
         primary key (id)
     );
 
     create table j3_person_name (
         id bigint generated by default as identity,
-        lang_code varchar(5),
+        lang_code varchar(26),
         name varchar(255) not null,
         contact_id bigint not null,
         primary key (id)
@@ -327,14 +312,14 @@
     create table j3_service_descr (
         id bigint generated by default as identity,
         descr varchar(1024) not null,
-        lang_code varchar(5),
+        lang_code varchar(26),
         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),
+        lang_code varchar(26),
         name varchar(255) not null,
         entity_key varchar(255) not null,
         primary key (id)
@@ -427,9 +412,15 @@
         primary key (id)
     );
 
+    create table j3_temp_key (
+        entity_key varchar(255) not null,
+        tx_id varchar(255) not null,
+        primary key (entity_key, tx_id)
+    );
+
     create table j3_tmodel (
         deleted smallint,
-        lang_code varchar(5),
+        lang_code varchar(26),
         name varchar(255) not null,
         entity_key varchar(255) not null,
         primary key (entity_key)
@@ -444,8 +435,8 @@
 
     create table j3_tmodel_descr (
         id bigint generated by default as identity,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
+        descr varchar(255) not null,
+        lang_code varchar(26),
         entity_key varchar(255) not null,
         primary key (id)
     );
@@ -461,7 +452,7 @@
 
     create table j3_tmodel_instance_info (
         id bigint generated by default as identity,
-        instance_parms varchar(512),
+        instance_parms varchar(8192),
         tmodel_key varchar(255) not null,
         entity_key varchar(255) not null,
         primary key (id)
@@ -469,8 +460,8 @@
 
     create table j3_tmodel_instance_info_descr (
         id bigint generated by default as identity,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
+        descr varchar(255) not null,
+        lang_code varchar(26),
         tmodel_instance_info_id bigint not null,
         primary key (id)
     );

Modified: juddi/branches/juddi-3.2.x/docs/db/ddl/derby.ddl
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/docs/db/ddl/derby.ddl?rev=1483174&r1=1483173&r2=1483174&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/docs/db/ddl/derby.ddl (original)
+++ juddi/branches/juddi-3.2.x/docs/db/ddl/derby.ddl Thu May 16 03:03:28 2013
@@ -1,19 +1,4 @@
-<*
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+
     create table j3_address (
         id bigint not null,
         sort_code varchar(10),
@@ -51,15 +36,15 @@
 
     create table j3_binding_descr (
         id bigint not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
+        descr varchar(255) not null,
+        lang_code varchar(26),
         entity_key varchar(255) not null,
         primary key (id)
     );
 
     create table j3_binding_template (
         access_point_type varchar(255),
-        access_point_url varchar(4000),
+        access_point_url varchar(4096),
         hosting_redirector varchar(255),
         entity_key varchar(255) not null,
         service_key varchar(255) not null,
@@ -75,8 +60,8 @@
 
     create table j3_business_descr (
         id bigint not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
+        descr varchar(255) not null,
+        lang_code varchar(26),
         entity_key varchar(255) not null,
         primary key (id)
     );
@@ -97,7 +82,7 @@
 
     create table j3_business_name (
         id bigint not null,
-        lang_code varchar(5),
+        lang_code varchar(26),
         name varchar(255) not null,
         entity_key varchar(255) not null,
         primary key (id)
@@ -145,15 +130,15 @@
 
     create table j3_contact_descr (
         id bigint not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
+        descr varchar(255) not null,
+        lang_code varchar(26),
         contact_id bigint not null,
         primary key (id)
     );
 
     create table j3_discovery_url (
         id bigint not null,
-        url varchar(255) not null,
+        url varchar(4096) not null,
         use_type varchar(255) not null,
         entity_key varchar(255) not null,
         primary key (id)
@@ -161,7 +146,7 @@
 
     create table j3_email (
         id bigint not null,
-        email_address varchar(255) not null,
+        email_address varchar(4096) not null,
         use_type varchar(255),
         contact_id bigint not null,
         primary key (id)
@@ -169,16 +154,16 @@
 
     create table j3_instance_details_descr (
         id bigint not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
+        descr varchar(255) not null,
+        lang_code varchar(26),
         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),
+        descr varchar(255) not null,
+        lang_code varchar(26),
         tmodel_instance_info_id bigint not null,
         primary key (id)
     );
@@ -219,13 +204,13 @@
 
     create table j3_node (
         name varchar(255) not null,
+        client_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,
@@ -261,14 +246,14 @@
     create table j3_overview_doc_descr (
         id bigint not null,
         descr varchar(1024) not null,
-        lang_code varchar(5),
+        lang_code varchar(26),
         overview_doc_id bigint,
         primary key (id)
     );
 
     create table j3_person_name (
         id bigint not null,
-        lang_code varchar(5),
+        lang_code varchar(26),
         name varchar(255) not null,
         contact_id bigint not null,
         primary key (id)
@@ -327,14 +312,14 @@
     create table j3_service_descr (
         id bigint not null,
         descr varchar(1024) not null,
-        lang_code varchar(5),
+        lang_code varchar(26),
         entity_key varchar(255) not null,
         primary key (id)
     );
 
     create table j3_service_name (
         id bigint not null,
-        lang_code varchar(5),
+        lang_code varchar(26),
         name varchar(255) not null,
         entity_key varchar(255) not null,
         primary key (id)
@@ -427,9 +412,15 @@
         primary key (id)
     );
 
+    create table j3_temp_key (
+        entity_key varchar(255) not null,
+        tx_id varchar(255) not null,
+        primary key (entity_key, tx_id)
+    );
+
     create table j3_tmodel (
         deleted smallint,
-        lang_code varchar(5),
+        lang_code varchar(26),
         name varchar(255) not null,
         entity_key varchar(255) not null,
         primary key (entity_key)
@@ -444,8 +435,8 @@
 
     create table j3_tmodel_descr (
         id bigint not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
+        descr varchar(255) not null,
+        lang_code varchar(26),
         entity_key varchar(255) not null,
         primary key (id)
     );
@@ -461,7 +452,7 @@
 
     create table j3_tmodel_instance_info (
         id bigint not null,
-        instance_parms varchar(512),
+        instance_parms varchar(8192),
         tmodel_key varchar(255) not null,
         entity_key varchar(255) not null,
         primary key (id)
@@ -469,8 +460,8 @@
 
     create table j3_tmodel_instance_info_descr (
         id bigint not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
+        descr varchar(255) not null,
+        lang_code varchar(26),
         tmodel_instance_info_id bigint not null,
         primary key (id)
     );

Modified: juddi/branches/juddi-3.2.x/docs/db/ddl/mysql.ddl
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/docs/db/ddl/mysql.ddl?rev=1483174&r1=1483173&r2=1483174&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/docs/db/ddl/mysql.ddl (original)
+++ juddi/branches/juddi-3.2.x/docs/db/ddl/mysql.ddl Thu May 16 03:03:28 2013
@@ -1,19 +1,4 @@
-<*
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+
     create table j3_address (
         id bigint not null auto_increment,
         sort_code varchar(10),
@@ -51,8 +36,8 @@
 
     create table j3_binding_descr (
         id bigint not null auto_increment,
-        descr longtext not null,
-        lang_code varchar(5),
+        descr varchar(255) not null,
+        lang_code varchar(26),
         entity_key varchar(255) not null,
         primary key (id)
     );
@@ -75,8 +60,8 @@
 
     create table j3_business_descr (
         id bigint not null auto_increment,
-        descr longtext not null,
-        lang_code varchar(5),
+        descr varchar(255) not null,
+        lang_code varchar(26),
         entity_key varchar(255) not null,
         primary key (id)
     );
@@ -97,7 +82,7 @@
 
     create table j3_business_name (
         id bigint not null auto_increment,
-        lang_code varchar(5),
+        lang_code varchar(26),
         name varchar(255) not null,
         entity_key varchar(255) not null,
         primary key (id)
@@ -145,15 +130,15 @@
 
     create table j3_contact_descr (
         id bigint not null auto_increment,
-        descr longtext not null,
-        lang_code varchar(5),
+        descr varchar(255) not null,
+        lang_code varchar(26),
         contact_id bigint not null,
         primary key (id)
     );
 
     create table j3_discovery_url (
         id bigint not null auto_increment,
-        url varchar(255) not null,
+        url longtext not null,
         use_type varchar(255) not null,
         entity_key varchar(255) not null,
         primary key (id)
@@ -161,7 +146,7 @@
 
     create table j3_email (
         id bigint not null auto_increment,
-        email_address varchar(255) not null,
+        email_address longtext not null,
         use_type varchar(255),
         contact_id bigint not null,
         primary key (id)
@@ -169,16 +154,16 @@
 
     create table j3_instance_details_descr (
         id bigint not null auto_increment,
-        descr longtext not null,
-        lang_code varchar(5),
+        descr varchar(255) not null,
+        lang_code varchar(26),
         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),
+        descr varchar(255) not null,
+        lang_code varchar(26),
         tmodel_instance_info_id bigint not null,
         primary key (id)
     );
@@ -219,13 +204,13 @@
 
     create table j3_node (
         name varchar(255) not null,
+        client_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,
@@ -261,14 +246,14 @@
     create table j3_overview_doc_descr (
         id bigint not null auto_increment,
         descr longtext not null,
-        lang_code varchar(5),
+        lang_code varchar(26),
         overview_doc_id bigint,
         primary key (id)
     );
 
     create table j3_person_name (
         id bigint not null auto_increment,
-        lang_code varchar(5),
+        lang_code varchar(26),
         name varchar(255) not null,
         contact_id bigint not null,
         primary key (id)
@@ -327,14 +312,14 @@
     create table j3_service_descr (
         id bigint not null auto_increment,
         descr longtext not null,
-        lang_code varchar(5),
+        lang_code varchar(26),
         entity_key varchar(255) not null,
         primary key (id)
     );
 
     create table j3_service_name (
         id bigint not null auto_increment,
-        lang_code varchar(5),
+        lang_code varchar(26),
         name varchar(255) not null,
         entity_key varchar(255) not null,
         primary key (id)
@@ -427,9 +412,15 @@
         primary key (id)
     );
 
+    create table j3_temp_key (
+        entity_key varchar(255) not null,
+        tx_id varchar(255) not null,
+        primary key (entity_key, tx_id)
+    );
+
     create table j3_tmodel (
         deleted bit,
-        lang_code varchar(5),
+        lang_code varchar(26),
         name varchar(255) not null,
         entity_key varchar(255) not null,
         primary key (entity_key)
@@ -444,8 +435,8 @@
 
     create table j3_tmodel_descr (
         id bigint not null auto_increment,
-        descr longtext not null,
-        lang_code varchar(5),
+        descr varchar(255) not null,
+        lang_code varchar(26),
         entity_key varchar(255) not null,
         primary key (id)
     );
@@ -469,8 +460,8 @@
 
     create table j3_tmodel_instance_info_descr (
         id bigint not null auto_increment,
-        descr longtext not null,
-        lang_code varchar(5),
+        descr varchar(255) not null,
+        lang_code varchar(26),
         tmodel_instance_info_id bigint not null,
         primary key (id)
     );

Modified: juddi/branches/juddi-3.2.x/docs/db/ddl/mysql5.ddl
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/docs/db/ddl/mysql5.ddl?rev=1483174&r1=1483173&r2=1483174&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/docs/db/ddl/mysql5.ddl (original)
+++ juddi/branches/juddi-3.2.x/docs/db/ddl/mysql5.ddl Thu May 16 03:03:28 2013
@@ -1,19 +1,4 @@
-<*
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+
     create table j3_address (
         id bigint not null auto_increment,
         sort_code varchar(10),
@@ -51,15 +36,15 @@
 
     create table j3_binding_descr (
         id bigint not null auto_increment,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
+        descr varchar(255) not null,
+        lang_code varchar(26),
         entity_key varchar(255) not null,
         primary key (id)
     );
 
     create table j3_binding_template (
         access_point_type varchar(255),
-        access_point_url varchar(4000),
+        access_point_url varchar(4096),
         hosting_redirector varchar(255),
         entity_key varchar(255) not null,
         service_key varchar(255) not null,
@@ -75,8 +60,8 @@
 
     create table j3_business_descr (
         id bigint not null auto_increment,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
+        descr varchar(255) not null,
+        lang_code varchar(26),
         entity_key varchar(255) not null,
         primary key (id)
     );
@@ -97,7 +82,7 @@
 
     create table j3_business_name (
         id bigint not null auto_increment,
-        lang_code varchar(5),
+        lang_code varchar(26),
         name varchar(255) not null,
         entity_key varchar(255) not null,
         primary key (id)
@@ -145,15 +130,15 @@
 
     create table j3_contact_descr (
         id bigint not null auto_increment,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
+        descr varchar(255) not null,
+        lang_code varchar(26),
         contact_id bigint not null,
         primary key (id)
     );
 
     create table j3_discovery_url (
         id bigint not null auto_increment,
-        url varchar(255) not null,
+        url varchar(4096) not null,
         use_type varchar(255) not null,
         entity_key varchar(255) not null,
         primary key (id)
@@ -161,7 +146,7 @@
 
     create table j3_email (
         id bigint not null auto_increment,
-        email_address varchar(255) not null,
+        email_address varchar(4096) not null,
         use_type varchar(255),
         contact_id bigint not null,
         primary key (id)
@@ -169,16 +154,16 @@
 
     create table j3_instance_details_descr (
         id bigint not null auto_increment,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
+        descr varchar(255) not null,
+        lang_code varchar(26),
         tmodel_instance_info_id bigint not null,
         primary key (id)
     );
 
     create table j3_instance_details_doc_descr (
         id bigint not null auto_increment,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
+        descr varchar(255) not null,
+        lang_code varchar(26),
         tmodel_instance_info_id bigint not null,
         primary key (id)
     );
@@ -219,13 +204,13 @@
 
     create table j3_node (
         name varchar(255) not null,
+        client_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,
@@ -261,14 +246,14 @@
     create table j3_overview_doc_descr (
         id bigint not null auto_increment,
         descr varchar(1024) not null,
-        lang_code varchar(5),
+        lang_code varchar(26),
         overview_doc_id bigint,
         primary key (id)
     );
 
     create table j3_person_name (
         id bigint not null auto_increment,
-        lang_code varchar(5),
+        lang_code varchar(26),
         name varchar(255) not null,
         contact_id bigint not null,
         primary key (id)
@@ -327,14 +312,14 @@
     create table j3_service_descr (
         id bigint not null auto_increment,
         descr varchar(1024) not null,
-        lang_code varchar(5),
+        lang_code varchar(26),
         entity_key varchar(255) not null,
         primary key (id)
     );
 
     create table j3_service_name (
         id bigint not null auto_increment,
-        lang_code varchar(5),
+        lang_code varchar(26),
         name varchar(255) not null,
         entity_key varchar(255) not null,
         primary key (id)
@@ -427,9 +412,15 @@
         primary key (id)
     );
 
+    create table j3_temp_key (
+        entity_key varchar(255) not null,
+        tx_id varchar(255) not null,
+        primary key (entity_key, tx_id)
+    );
+
     create table j3_tmodel (
         deleted bit,
-        lang_code varchar(5),
+        lang_code varchar(26),
         name varchar(255) not null,
         entity_key varchar(255) not null,
         primary key (entity_key)
@@ -444,8 +435,8 @@
 
     create table j3_tmodel_descr (
         id bigint not null auto_increment,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
+        descr varchar(255) not null,
+        lang_code varchar(26),
         entity_key varchar(255) not null,
         primary key (id)
     );
@@ -461,7 +452,7 @@
 
     create table j3_tmodel_instance_info (
         id bigint not null auto_increment,
-        instance_parms varchar(512),
+        instance_parms varchar(8192),
         tmodel_key varchar(255) not null,
         entity_key varchar(255) not null,
         primary key (id)
@@ -469,8 +460,8 @@
 
     create table j3_tmodel_instance_info_descr (
         id bigint not null auto_increment,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
+        descr varchar(255) not null,
+        lang_code varchar(26),
         tmodel_instance_info_id bigint not null,
         primary key (id)
     );

Modified: juddi/branches/juddi-3.2.x/docs/db/ddl/mysql5InnoDB.ddl
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/docs/db/ddl/mysql5InnoDB.ddl?rev=1483174&r1=1483173&r2=1483174&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/docs/db/ddl/mysql5InnoDB.ddl (original)
+++ juddi/branches/juddi-3.2.x/docs/db/ddl/mysql5InnoDB.ddl Thu May 16 03:03:28 2013
@@ -1,19 +1,4 @@
-<*
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+
     create table j3_address (
         id bigint not null auto_increment,
         sort_code varchar(10),
@@ -51,15 +36,15 @@
 
     create table j3_binding_descr (
         id bigint not null auto_increment,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
+        descr varchar(255) not null,
+        lang_code varchar(26),
         entity_key varchar(255) not null,
         primary key (id)
     ) ENGINE=InnoDB;
 
     create table j3_binding_template (
         access_point_type varchar(255),
-        access_point_url varchar(4000),
+        access_point_url varchar(4096),
         hosting_redirector varchar(255),
         entity_key varchar(255) not null,
         service_key varchar(255) not null,
@@ -75,8 +60,8 @@
 
     create table j3_business_descr (
         id bigint not null auto_increment,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
+        descr varchar(255) not null,
+        lang_code varchar(26),
         entity_key varchar(255) not null,
         primary key (id)
     ) ENGINE=InnoDB;
@@ -97,7 +82,7 @@
 
     create table j3_business_name (
         id bigint not null auto_increment,
-        lang_code varchar(5),
+        lang_code varchar(26),
         name varchar(255) not null,
         entity_key varchar(255) not null,
         primary key (id)
@@ -145,15 +130,15 @@
 
     create table j3_contact_descr (
         id bigint not null auto_increment,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
+        descr varchar(255) not null,
+        lang_code varchar(26),
         contact_id bigint not null,
         primary key (id)
     ) ENGINE=InnoDB;
 
     create table j3_discovery_url (
         id bigint not null auto_increment,
-        url varchar(255) not null,
+        url varchar(4096) not null,
         use_type varchar(255) not null,
         entity_key varchar(255) not null,
         primary key (id)
@@ -161,7 +146,7 @@
 
     create table j3_email (
         id bigint not null auto_increment,
-        email_address varchar(255) not null,
+        email_address varchar(4096) not null,
         use_type varchar(255),
         contact_id bigint not null,
         primary key (id)
@@ -169,16 +154,16 @@
 
     create table j3_instance_details_descr (
         id bigint not null auto_increment,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
+        descr varchar(255) not null,
+        lang_code varchar(26),
         tmodel_instance_info_id bigint not null,
         primary key (id)
     ) ENGINE=InnoDB;
 
     create table j3_instance_details_doc_descr (
         id bigint not null auto_increment,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
+        descr varchar(255) not null,
+        lang_code varchar(26),
         tmodel_instance_info_id bigint not null,
         primary key (id)
     ) ENGINE=InnoDB;
@@ -219,13 +204,13 @@
 
     create table j3_node (
         name varchar(255) not null,
+        client_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,
@@ -261,14 +246,14 @@
     create table j3_overview_doc_descr (
         id bigint not null auto_increment,
         descr varchar(1024) not null,
-        lang_code varchar(5),
+        lang_code varchar(26),
         overview_doc_id bigint,
         primary key (id)
     ) ENGINE=InnoDB;
 
     create table j3_person_name (
         id bigint not null auto_increment,
-        lang_code varchar(5),
+        lang_code varchar(26),
         name varchar(255) not null,
         contact_id bigint not null,
         primary key (id)
@@ -327,14 +312,14 @@
     create table j3_service_descr (
         id bigint not null auto_increment,
         descr varchar(1024) not null,
-        lang_code varchar(5),
+        lang_code varchar(26),
         entity_key varchar(255) not null,
         primary key (id)
     ) ENGINE=InnoDB;
 
     create table j3_service_name (
         id bigint not null auto_increment,
-        lang_code varchar(5),
+        lang_code varchar(26),
         name varchar(255) not null,
         entity_key varchar(255) not null,
         primary key (id)
@@ -427,9 +412,15 @@
         primary key (id)
     ) ENGINE=InnoDB;
 
+    create table j3_temp_key (
+        entity_key varchar(255) not null,
+        tx_id varchar(255) not null,
+        primary key (entity_key, tx_id)
+    ) ENGINE=InnoDB;
+
     create table j3_tmodel (
         deleted bit,
-        lang_code varchar(5),
+        lang_code varchar(26),
         name varchar(255) not null,
         entity_key varchar(255) not null,
         primary key (entity_key)
@@ -444,8 +435,8 @@
 
     create table j3_tmodel_descr (
         id bigint not null auto_increment,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
+        descr varchar(255) not null,
+        lang_code varchar(26),
         entity_key varchar(255) not null,
         primary key (id)
     ) ENGINE=InnoDB;
@@ -461,7 +452,7 @@
 
     create table j3_tmodel_instance_info (
         id bigint not null auto_increment,
-        instance_parms varchar(512),
+        instance_parms varchar(8192),
         tmodel_key varchar(255) not null,
         entity_key varchar(255) not null,
         primary key (id)
@@ -469,8 +460,8 @@
 
     create table j3_tmodel_instance_info_descr (
         id bigint not null auto_increment,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
+        descr varchar(255) not null,
+        lang_code varchar(26),
         tmodel_instance_info_id bigint not null,
         primary key (id)
     ) ENGINE=InnoDB;

Modified: juddi/branches/juddi-3.2.x/docs/db/ddl/oracle9.ddl
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/docs/db/ddl/oracle9.ddl?rev=1483174&r1=1483173&r2=1483174&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/docs/db/ddl/oracle9.ddl (original)
+++ juddi/branches/juddi-3.2.x/docs/db/ddl/oracle9.ddl Thu May 16 03:03:28 2013
@@ -1,19 +1,4 @@
-<*
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+
     create table j3_address (
         id number(19,0) not null,
         sort_code varchar2(10 char),
@@ -51,15 +36,15 @@
 
     create table j3_binding_descr (
         id number(19,0) not null,
-        descr varchar2(1024 char) not null,
-        lang_code varchar2(5 char),
+        descr varchar2(255 char) not null,
+        lang_code varchar2(26 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),
+        access_point_url long,
         hosting_redirector varchar2(255 char),
         entity_key varchar2(255 char) not null,
         service_key varchar2(255 char) not null,
@@ -75,8 +60,8 @@
 
     create table j3_business_descr (
         id number(19,0) not null,
-        descr varchar2(1024 char) not null,
-        lang_code varchar2(5 char),
+        descr varchar2(255 char) not null,
+        lang_code varchar2(26 char),
         entity_key varchar2(255 char) not null,
         primary key (id)
     );
@@ -97,7 +82,7 @@
 
     create table j3_business_name (
         id number(19,0) not null,
-        lang_code varchar2(5 char),
+        lang_code varchar2(26 char),
         name varchar2(255 char) not null,
         entity_key varchar2(255 char) not null,
         primary key (id)
@@ -145,15 +130,15 @@
 
     create table j3_contact_descr (
         id number(19,0) not null,
-        descr varchar2(1024 char) not null,
-        lang_code varchar2(5 char),
+        descr varchar2(255 char) not null,
+        lang_code varchar2(26 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,
+        url long not null,
         use_type varchar2(255 char) not null,
         entity_key varchar2(255 char) not null,
         primary key (id)
@@ -161,7 +146,7 @@
 
     create table j3_email (
         id number(19,0) not null,
-        email_address varchar2(255 char) not null,
+        email_address long not null,
         use_type varchar2(255 char),
         contact_id number(19,0) not null,
         primary key (id)
@@ -169,16 +154,16 @@
 
     create table j3_instance_details_descr (
         id number(19,0) not null,
-        descr varchar2(1024 char) not null,
-        lang_code varchar2(5 char),
+        descr varchar2(255 char) not null,
+        lang_code varchar2(26 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),
+        descr varchar2(255 char) not null,
+        lang_code varchar2(26 char),
         tmodel_instance_info_id number(19,0) not null,
         primary key (id)
     );
@@ -219,13 +204,13 @@
 
     create table j3_node (
         name varchar2(255 char) not null,
+        client_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,
@@ -261,14 +246,14 @@
     create table j3_overview_doc_descr (
         id number(19,0) not null,
         descr varchar2(1024 char) not null,
-        lang_code varchar2(5 char),
+        lang_code varchar2(26 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),
+        lang_code varchar2(26 char),
         name varchar2(255 char) not null,
         contact_id number(19,0) not null,
         primary key (id)
@@ -327,14 +312,14 @@
     create table j3_service_descr (
         id number(19,0) not null,
         descr varchar2(1024 char) not null,
-        lang_code varchar2(5 char),
+        lang_code varchar2(26 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),
+        lang_code varchar2(26 char),
         name varchar2(255 char) not null,
         entity_key varchar2(255 char) not null,
         primary key (id)
@@ -427,9 +412,15 @@
         primary key (id)
     );
 
+    create table j3_temp_key (
+        entity_key varchar2(255 char) not null,
+        tx_id varchar2(255 char) not null,
+        primary key (entity_key, tx_id)
+    );
+
     create table j3_tmodel (
         deleted number(1,0),
-        lang_code varchar2(5 char),
+        lang_code varchar2(26 char),
         name varchar2(255 char) not null,
         entity_key varchar2(255 char) not null,
         primary key (entity_key)
@@ -444,8 +435,8 @@
 
     create table j3_tmodel_descr (
         id number(19,0) not null,
-        descr varchar2(1024 char) not null,
-        lang_code varchar2(5 char),
+        descr varchar2(255 char) not null,
+        lang_code varchar2(26 char),
         entity_key varchar2(255 char) not null,
         primary key (id)
     );
@@ -461,7 +452,7 @@
 
     create table j3_tmodel_instance_info (
         id number(19,0) not null,
-        instance_parms varchar2(512 char),
+        instance_parms long,
         tmodel_key varchar2(255 char) not null,
         entity_key varchar2(255 char) not null,
         primary key (id)
@@ -469,8 +460,8 @@
 
     create table j3_tmodel_instance_info_descr (
         id number(19,0) not null,
-        descr varchar2(1024 char) not null,
-        lang_code varchar2(5 char),
+        descr varchar2(255 char) not null,
+        lang_code varchar2(26 char),
         tmodel_instance_info_id number(19,0) not null,
         primary key (id)
     );

Modified: juddi/branches/juddi-3.2.x/docs/db/ddl/postgres.ddl
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/docs/db/ddl/postgres.ddl?rev=1483174&r1=1483173&r2=1483174&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/docs/db/ddl/postgres.ddl (original)
+++ juddi/branches/juddi-3.2.x/docs/db/ddl/postgres.ddl Thu May 16 03:03:28 2013
@@ -1,19 +1,4 @@
-<*
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+
     create table j3_address (
         id int8 not null,
         sort_code varchar(10),
@@ -51,15 +36,15 @@
 
     create table j3_binding_descr (
         id int8 not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
+        descr varchar(255) not null,
+        lang_code varchar(26),
         entity_key varchar(255) not null,
         primary key (id)
     );
 
     create table j3_binding_template (
         access_point_type varchar(255),
-        access_point_url varchar(4000),
+        access_point_url varchar(4096),
         hosting_redirector varchar(255),
         entity_key varchar(255) not null,
         service_key varchar(255) not null,
@@ -75,8 +60,8 @@
 
     create table j3_business_descr (
         id int8 not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
+        descr varchar(255) not null,
+        lang_code varchar(26),
         entity_key varchar(255) not null,
         primary key (id)
     );
@@ -97,7 +82,7 @@
 
     create table j3_business_name (
         id int8 not null,
-        lang_code varchar(5),
+        lang_code varchar(26),
         name varchar(255) not null,
         entity_key varchar(255) not null,
         primary key (id)
@@ -145,15 +130,15 @@
 
     create table j3_contact_descr (
         id int8 not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
+        descr varchar(255) not null,
+        lang_code varchar(26),
         contact_id int8 not null,
         primary key (id)
     );
 
     create table j3_discovery_url (
         id int8 not null,
-        url varchar(255) not null,
+        url varchar(4096) not null,
         use_type varchar(255) not null,
         entity_key varchar(255) not null,
         primary key (id)
@@ -161,7 +146,7 @@
 
     create table j3_email (
         id int8 not null,
-        email_address varchar(255) not null,
+        email_address varchar(4096) not null,
         use_type varchar(255),
         contact_id int8 not null,
         primary key (id)
@@ -169,16 +154,16 @@
 
     create table j3_instance_details_descr (
         id int8 not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
+        descr varchar(255) not null,
+        lang_code varchar(26),
         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),
+        descr varchar(255) not null,
+        lang_code varchar(26),
         tmodel_instance_info_id int8 not null,
         primary key (id)
     );
@@ -219,13 +204,13 @@
 
     create table j3_node (
         name varchar(255) not null,
+        client_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,
@@ -261,14 +246,14 @@
     create table j3_overview_doc_descr (
         id int8 not null,
         descr varchar(1024) not null,
-        lang_code varchar(5),
+        lang_code varchar(26),
         overview_doc_id int8,
         primary key (id)
     );
 
     create table j3_person_name (
         id int8 not null,
-        lang_code varchar(5),
+        lang_code varchar(26),
         name varchar(255) not null,
         contact_id int8 not null,
         primary key (id)
@@ -327,14 +312,14 @@
     create table j3_service_descr (
         id int8 not null,
         descr varchar(1024) not null,
-        lang_code varchar(5),
+        lang_code varchar(26),
         entity_key varchar(255) not null,
         primary key (id)
     );
 
     create table j3_service_name (
         id int8 not null,
-        lang_code varchar(5),
+        lang_code varchar(26),
         name varchar(255) not null,
         entity_key varchar(255) not null,
         primary key (id)
@@ -427,9 +412,15 @@
         primary key (id)
     );
 
+    create table j3_temp_key (
+        entity_key varchar(255) not null,
+        tx_id varchar(255) not null,
+        primary key (entity_key, tx_id)
+    );
+
     create table j3_tmodel (
         deleted bool,
-        lang_code varchar(5),
+        lang_code varchar(26),
         name varchar(255) not null,
         entity_key varchar(255) not null,
         primary key (entity_key)
@@ -444,8 +435,8 @@
 
     create table j3_tmodel_descr (
         id int8 not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
+        descr varchar(255) not null,
+        lang_code varchar(26),
         entity_key varchar(255) not null,
         primary key (id)
     );
@@ -461,7 +452,7 @@
 
     create table j3_tmodel_instance_info (
         id int8 not null,
-        instance_parms varchar(512),
+        instance_parms varchar(8192),
         tmodel_key varchar(255) not null,
         entity_key varchar(255) not null,
         primary key (id)
@@ -469,8 +460,8 @@
 
     create table j3_tmodel_instance_info_descr (
         id int8 not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5),
+        descr varchar(255) not null,
+        lang_code varchar(26),
         tmodel_instance_info_id int8 not null,
         primary key (id)
     );

Modified: juddi/branches/juddi-3.2.x/docs/db/ddl/sqlserver.ddl
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/docs/db/ddl/sqlserver.ddl?rev=1483174&r1=1483173&r2=1483174&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/docs/db/ddl/sqlserver.ddl (original)
+++ juddi/branches/juddi-3.2.x/docs/db/ddl/sqlserver.ddl Thu May 16 03:03:28 2013
@@ -1,19 +1,4 @@
-<*
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+
     create table j3_address (
         id numeric(19,0) identity not null,
         sort_code varchar(10) null,
@@ -51,15 +36,15 @@
 
     create table j3_binding_descr (
         id numeric(19,0) identity not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5) null,
+        descr varchar(255) not null,
+        lang_code varchar(26) 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,
+        access_point_url varchar(4096) null,
         hosting_redirector varchar(255) null,
         entity_key varchar(255) not null,
         service_key varchar(255) not null,
@@ -75,8 +60,8 @@
 
     create table j3_business_descr (
         id numeric(19,0) identity not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5) null,
+        descr varchar(255) not null,
+        lang_code varchar(26) null,
         entity_key varchar(255) not null,
         primary key (id)
     );
@@ -97,7 +82,7 @@
 
     create table j3_business_name (
         id numeric(19,0) identity not null,
-        lang_code varchar(5) null,
+        lang_code varchar(26) null,
         name varchar(255) not null,
         entity_key varchar(255) not null,
         primary key (id)
@@ -145,15 +130,15 @@
 
     create table j3_contact_descr (
         id numeric(19,0) identity not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5) null,
+        descr varchar(255) not null,
+        lang_code varchar(26) 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,
+        url varchar(4096) not null,
         use_type varchar(255) not null,
         entity_key varchar(255) not null,
         primary key (id)
@@ -161,7 +146,7 @@
 
     create table j3_email (
         id numeric(19,0) identity not null,
-        email_address varchar(255) not null,
+        email_address varchar(4096) not null,
         use_type varchar(255) null,
         contact_id numeric(19,0) not null,
         primary key (id)
@@ -169,16 +154,16 @@
 
     create table j3_instance_details_descr (
         id numeric(19,0) identity not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5) null,
+        descr varchar(255) not null,
+        lang_code varchar(26) 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,
+        descr varchar(255) not null,
+        lang_code varchar(26) null,
         tmodel_instance_info_id numeric(19,0) not null,
         primary key (id)
     );
@@ -219,13 +204,13 @@
 
     create table j3_node (
         name varchar(255) not null,
+        client_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,
@@ -261,14 +246,14 @@
     create table j3_overview_doc_descr (
         id numeric(19,0) identity not null,
         descr varchar(1024) not null,
-        lang_code varchar(5) null,
+        lang_code varchar(26) 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,
+        lang_code varchar(26) null,
         name varchar(255) not null,
         contact_id numeric(19,0) not null,
         primary key (id)
@@ -327,14 +312,14 @@
     create table j3_service_descr (
         id numeric(19,0) identity not null,
         descr varchar(1024) not null,
-        lang_code varchar(5) null,
+        lang_code varchar(26) 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,
+        lang_code varchar(26) null,
         name varchar(255) not null,
         entity_key varchar(255) not null,
         primary key (id)
@@ -427,9 +412,15 @@
         primary key (id)
     );
 
+    create table j3_temp_key (
+        entity_key varchar(255) not null,
+        tx_id varchar(255) not null,
+        primary key (entity_key, tx_id)
+    );
+
     create table j3_tmodel (
         deleted tinyint null,
-        lang_code varchar(5) null,
+        lang_code varchar(26) null,
         name varchar(255) not null,
         entity_key varchar(255) not null,
         primary key (entity_key)
@@ -444,8 +435,8 @@
 
     create table j3_tmodel_descr (
         id numeric(19,0) identity not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5) null,
+        descr varchar(255) not null,
+        lang_code varchar(26) null,
         entity_key varchar(255) not null,
         primary key (id)
     );
@@ -461,7 +452,7 @@
 
     create table j3_tmodel_instance_info (
         id numeric(19,0) identity not null,
-        instance_parms varchar(512) null,
+        instance_parms varchar(8192) null,
         tmodel_key varchar(255) not null,
         entity_key varchar(255) not null,
         primary key (id)
@@ -469,8 +460,8 @@
 
     create table j3_tmodel_instance_info_descr (
         id numeric(19,0) identity not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5) null,
+        descr varchar(255) not null,
+        lang_code varchar(26) null,
         tmodel_instance_info_id numeric(19,0) not null,
         primary key (id)
     );

Modified: juddi/branches/juddi-3.2.x/docs/db/ddl/sybase.ddl
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/docs/db/ddl/sybase.ddl?rev=1483174&r1=1483173&r2=1483174&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/docs/db/ddl/sybase.ddl (original)
+++ juddi/branches/juddi-3.2.x/docs/db/ddl/sybase.ddl Thu May 16 03:03:28 2013
@@ -1,19 +1,4 @@
-<*
- * Copyright 2001-2009 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+
     create table j3_address (
         id numeric(19,0) identity not null,
         sort_code varchar(10) null,
@@ -51,15 +36,15 @@
 
     create table j3_binding_descr (
         id numeric(19,0) identity not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5) null,
+        descr varchar(255) not null,
+        lang_code varchar(26) 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,
+        access_point_url varchar(4096) null,
         hosting_redirector varchar(255) null,
         entity_key varchar(255) not null,
         service_key varchar(255) not null,
@@ -75,8 +60,8 @@
 
     create table j3_business_descr (
         id numeric(19,0) identity not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5) null,
+        descr varchar(255) not null,
+        lang_code varchar(26) null,
         entity_key varchar(255) not null,
         primary key (id)
     );
@@ -97,7 +82,7 @@
 
     create table j3_business_name (
         id numeric(19,0) identity not null,
-        lang_code varchar(5) null,
+        lang_code varchar(26) null,
         name varchar(255) not null,
         entity_key varchar(255) not null,
         primary key (id)
@@ -145,15 +130,15 @@
 
     create table j3_contact_descr (
         id numeric(19,0) identity not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5) null,
+        descr varchar(255) not null,
+        lang_code varchar(26) 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,
+        url varchar(4096) not null,
         use_type varchar(255) not null,
         entity_key varchar(255) not null,
         primary key (id)
@@ -161,7 +146,7 @@
 
     create table j3_email (
         id numeric(19,0) identity not null,
-        email_address varchar(255) not null,
+        email_address varchar(4096) not null,
         use_type varchar(255) null,
         contact_id numeric(19,0) not null,
         primary key (id)
@@ -169,16 +154,16 @@
 
     create table j3_instance_details_descr (
         id numeric(19,0) identity not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5) null,
+        descr varchar(255) not null,
+        lang_code varchar(26) 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,
+        descr varchar(255) not null,
+        lang_code varchar(26) null,
         tmodel_instance_info_id numeric(19,0) not null,
         primary key (id)
     );
@@ -219,13 +204,13 @@
 
     create table j3_node (
         name varchar(255) not null,
+        client_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,
@@ -261,14 +246,14 @@
     create table j3_overview_doc_descr (
         id numeric(19,0) identity not null,
         descr varchar(1024) not null,
-        lang_code varchar(5) null,
+        lang_code varchar(26) 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,
+        lang_code varchar(26) null,
         name varchar(255) not null,
         contact_id numeric(19,0) not null,
         primary key (id)
@@ -327,14 +312,14 @@
     create table j3_service_descr (
         id numeric(19,0) identity not null,
         descr varchar(1024) not null,
-        lang_code varchar(5) null,
+        lang_code varchar(26) 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,
+        lang_code varchar(26) null,
         name varchar(255) not null,
         entity_key varchar(255) not null,
         primary key (id)
@@ -427,9 +412,15 @@
         primary key (id)
     );
 
+    create table j3_temp_key (
+        entity_key varchar(255) not null,
+        tx_id varchar(255) not null,
+        primary key (entity_key, tx_id)
+    );
+
     create table j3_tmodel (
         deleted tinyint null,
-        lang_code varchar(5) null,
+        lang_code varchar(26) null,
         name varchar(255) not null,
         entity_key varchar(255) not null,
         primary key (entity_key)
@@ -444,8 +435,8 @@
 
     create table j3_tmodel_descr (
         id numeric(19,0) identity not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5) null,
+        descr varchar(255) not null,
+        lang_code varchar(26) null,
         entity_key varchar(255) not null,
         primary key (id)
     );
@@ -461,7 +452,7 @@
 
     create table j3_tmodel_instance_info (
         id numeric(19,0) identity not null,
-        instance_parms varchar(512) null,
+        instance_parms varchar(8192) null,
         tmodel_key varchar(255) not null,
         entity_key varchar(255) not null,
         primary key (id)
@@ -469,8 +460,8 @@
 
     create table j3_tmodel_instance_info_descr (
         id numeric(19,0) identity not null,
-        descr varchar(1024) not null,
-        lang_code varchar(5) null,
+        descr varchar(255) not null,
+        lang_code varchar(26) null,
         tmodel_instance_info_id numeric(19,0) not null,
         primary key (id)
     );

Modified: juddi/branches/juddi-3.2.x/docs/devguide/pom.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/docs/devguide/pom.xml?rev=1483174&r1=1483173&r2=1483174&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/docs/devguide/pom.xml (original)
+++ juddi/branches/juddi-3.2.x/docs/devguide/pom.xml Thu May 16 03:03:28 2013
@@ -3,7 +3,7 @@
         <parent>
 	    <groupId>org.apache.juddi</groupId>
 	    <artifactId>juddi-parent</artifactId>
-	    <version>3.1.5-SNAPSHOT</version>
+	    <version>3.1.6-SNAPSHOT</version>
 	    <relativePath>../../pom.xml</relativePath>
 	</parent>
 	<groupId>org.apache.juddi</groupId>

Modified: juddi/branches/juddi-3.2.x/docs/pom.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/docs/pom.xml?rev=1483174&r1=1483173&r2=1483174&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/docs/pom.xml (original)
+++ juddi/branches/juddi-3.2.x/docs/pom.xml Thu May 16 03:03:28 2013
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>org.apache.juddi</groupId>
 		<artifactId>juddi-parent</artifactId>
-		<version>3.1.5-SNAPSHOT</version>
+		<version>3.1.6-SNAPSHOT</version>
 	</parent>
 	<artifactId>juddi-docs</artifactId>
 	<name>jUDDI Document Packaging</name>

Modified: juddi/branches/juddi-3.2.x/docs/userguide/pom.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/docs/userguide/pom.xml?rev=1483174&r1=1483173&r2=1483174&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/docs/userguide/pom.xml (original)
+++ juddi/branches/juddi-3.2.x/docs/userguide/pom.xml Thu May 16 03:03:28 2013
@@ -20,7 +20,7 @@
   <parent>
 	<groupId>org.apache.juddi</groupId>
 	<artifactId>juddi-parent</artifactId>
-	<version>3.1.5-SNAPSHOT</version>
+	<version>3.1.6-SNAPSHOT</version>
 	<relativePath>../../pom.xml</relativePath>
   </parent>
   <groupId>org.apache.juddi</groupId>

Propchange: juddi/branches/juddi-3.2.x/juddi-client/
            ('svn:mergeinfo' removed)

Modified: juddi/branches/juddi-3.2.x/juddi-client/pom.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-client/pom.xml?rev=1483174&r1=1483173&r2=1483174&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-client/pom.xml (original)
+++ juddi/branches/juddi-3.2.x/juddi-client/pom.xml Thu May 16 03:03:28 2013
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.juddi</groupId>
     <artifactId>juddi-parent</artifactId>
-    <version>3.1.5-SNAPSHOT</version>
+    <version>3.1.6-SNAPSHOT</version>
   </parent> 
   <artifactId>juddi-client</artifactId>
   <packaging>bundle</packaging>

Modified: juddi/branches/juddi-3.2.x/juddi-console/juddi-portal/pom.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-console/juddi-portal/pom.xml?rev=1483174&r1=1483173&r2=1483174&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-console/juddi-portal/pom.xml (original)
+++ juddi/branches/juddi-3.2.x/juddi-console/juddi-portal/pom.xml Thu May 16 03:03:28 2013
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>org.apache.juddi</groupId>
 		<artifactId>juddi-console</artifactId>
-		<version>3.1.5-SNAPSHOT</version>
+		<version>3.1.6-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>juddi-portal-bundle</artifactId>

Modified: juddi/branches/juddi-3.2.x/juddi-console/pom.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-console/pom.xml?rev=1483174&r1=1483173&r2=1483174&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-console/pom.xml (original)
+++ juddi/branches/juddi-3.2.x/juddi-console/pom.xml Thu May 16 03:03:28 2013
@@ -16,7 +16,7 @@
 	<parent>
 		<groupId>org.apache.juddi</groupId>
 		<artifactId>juddi-parent</artifactId>
-		<version>3.1.5-SNAPSHOT</version>
+		<version>3.1.6-SNAPSHOT</version>
 	</parent>
 	<artifactId>juddi-console</artifactId>
 	<name>jUDDI Console</name>

Modified: juddi/branches/juddi-3.2.x/juddi-console/uddi-portlets/pom.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-console/uddi-portlets/pom.xml?rev=1483174&r1=1483173&r2=1483174&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-console/uddi-portlets/pom.xml (original)
+++ juddi/branches/juddi-3.2.x/juddi-console/uddi-portlets/pom.xml Thu May 16 03:03:28 2013
@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>org.apache.juddi</groupId>
 		<artifactId>juddi-console</artifactId>
-		<version>3.1.5-SNAPSHOT</version>
+		<version>3.1.6-SNAPSHOT</version>
 	</parent>
 	<!--
 		GWT-Maven archetype generated POM 
@@ -80,12 +80,12 @@
 		<dependency>
 			<groupId>org.apache.juddi</groupId>
 			<artifactId>uddi-ws</artifactId>
-			<version>3.1.5-SNAPSHOT</version>
+			<version>3.1.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.juddi</groupId>
 			<artifactId>juddi-client</artifactId>
-			<version>3.1.5-SNAPSHOT</version>
+			<version>3.1.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.portlet</groupId>

Modified: juddi/branches/juddi-3.2.x/juddi-core-openjpa/build.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-core-openjpa/build.xml?rev=1483174&r1=1483173&r2=1483174&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-core-openjpa/build.xml (original)
+++ juddi/branches/juddi-3.2.x/juddi-core-openjpa/build.xml Thu May 16 03:03:28 2013
@@ -1,26 +1,18 @@
-<project name="juddi-core-jpa" default="package-jar" basedir=".">
-
-	<target name="unzip-jar">
-		<mkdir dir="${basedir}/target/classes"/>
-		<echo>unzip: ${dependency.juddi.core}</echo>
-		<unzip dest="${basedir}/target/classes">
-			<fileset file="${dependency.juddi.core}"/>
-		</unzip>
-	</target>
+<project name="juddi-core-jpa" default="copy-from-core" basedir=".">
 	
-	<target name="copy-src">
-		    <echo>delete: ${basedir}/src/main/java</echo>
-		    <delete dir="${basedir}/src/main/java"  />
-	        <mkdir dir="${basedir}/src/main/java"/>
-	        <echo>copy: ${juddi.core.dir}/src/test/java</echo>
-	        <copy todir="${basedir}/src/main/java">
-	            <fileset dir="${juddi.core.dir}/src/main/java">
-	               <include name="**/*.java"/>
+	<target name="copy-main">
+		    <echo>delete: ${basedir}/src/main/</echo>
+		    <delete dir="${basedir}/src/main/"  />
+	        <mkdir dir="${basedir}/src/main/"/>
+	        <echo>copy: ${juddi.core.dir}/src/main</echo>
+	        <copy todir="${basedir}/src/main">
+	            <fileset dir="${juddi.core.dir}/src/main">
+	               <include name="**/*"/>
 	            </fileset>
 	        </copy>
 	    </target>
 	
-	<target name="copy-tests">
+	<target name="copy-test-java">
 		<echo>delete: ${basedir}/src/test/java</echo>
 		<delete dir="${basedir}/src/test/java" />
         <mkdir dir="${basedir}/src/test/java"/>
@@ -32,6 +24,6 @@
         </copy>
     </target>
 	
-	<target name="package-jar" depends="copy-src,copy-tests,unzip-jar"/>
+	<target name="copy-from-core" depends="copy-main,copy-test-java"/>
 
 </project>

Modified: juddi/branches/juddi-3.2.x/juddi-core-openjpa/pom.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-core-openjpa/pom.xml?rev=1483174&r1=1483173&r2=1483174&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-core-openjpa/pom.xml (original)
+++ juddi/branches/juddi-3.2.x/juddi-core-openjpa/pom.xml Thu May 16 03:03:28 2013
@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>org.apache.juddi</groupId>
 		<artifactId>juddi-parent</artifactId>
-		<version>3.1.5-SNAPSHOT</version>
+		<version>3.1.6-SNAPSHOT</version>
 	</parent>
 	<artifactId>juddi-core-openjpa</artifactId>
 	<packaging>bundle</packaging>
@@ -37,7 +37,6 @@
 				<instructions>
 				<Export-Package>org.apache.juddi, org.apache.juddi.api, org.apache.juddi.api.impl, org.apache.juddi.api.util, org.apache.juddi.config, org.apache.juddi.config, org.apache.juddi.cryptor, org.apache.juddi.keygen, org.apache.juddi.mapping, org.apache.juddi.model, org.apache.juddi.query, org.apache.juddi.query.util, org.apache.juddi.rmi, org.apache.juddi.subscription, org.apache.juddi.subscription.notify, org.apache.juddi.validation, org.apache.juddi.v3.auth, org.apache.juddi.v3.error</Export-Package>
 				<Include-Resource>juddi_install_data=target/classes/juddi_install_data, target/classes/messages.properties</Include-Resource>
-			
 				</instructions>
 				</configuration>
 			</plugin>
@@ -47,15 +46,15 @@
 				<version>1.3</version>
 				<executions>
 					<execution>
-						<id>unzip</id>
-						<phase>compile</phase>
+						<id>copy</id>
+						<phase>validate</phase>
 						<configuration>
 							<tasks>
 								<property name="dependency.juddi.core" value="${maven.dependency.org.apache.juddi.juddi-core.jar.path}" />
 								<property name="juddi.core.dir" value="${basedir}/../juddi-core" />
-								<echo>Enhancing juddi-core=${dependency.juddi.core}</echo>
+								<echo>Copy from juddi-core dir =${juddi.core.dir}</echo>
 								<ant antfile="${basedir}/build.xml">
-									<target name="package-jar" />
+									<target name="copy-from-core" />
 								</ant>
 							</tasks>
 						</configuration>
@@ -66,24 +65,22 @@
 				</executions>
 				</plugin>
 				<plugin>
-                  <groupId>org.codehaus.mojo</groupId>
+                  <groupId>org.apache.openjpa</groupId>
                   <artifactId>openjpa-maven-plugin</artifactId>
-                  <version>1.2</version>
+                  <version>2.2.1</version>
+                  <configuration>
+			         <includes>**/org/apache/juddi/model/*.class</includes>
+			         <addDefaultConstructor>true</addDefaultConstructor>               
+			         <enforcePropertyRestrictions>true</enforcePropertyRestrictions>
+			         <persistenceXmlFile>${basedir}/src/test/resources/META-INF/persistence.xml</persistenceXmlFile>
+			      </configuration>
                   <executions>
-                      <execution>
-                              <id>enhancer</id>
-                                  <phase>process-classes</phase>
-                                  <configuration>
-                                      <classes>
-                            ${project.build.outputDirectory}/org/apache/juddi/model/
-                                                        </classes>
-                            <addDefaultConstructor>true</addDefaultConstructor>
-                            <enforcePropertyRestrictions>true</enforcePropertyRestrictions>
-                            <persistenceXmlFile>${basedir}/src/test/resources/META-INF/persistence.xml</persistenceXmlFile>
-                            </configuration>
-                        <goals>
-                            <goal>enhance</goal>
-                        </goals>
+                    <execution>
+                       <id>enhancer</id>
+                       <phase>process-classes</phase>   
+                       <goals>
+                          <goal>enhance</goal>
+                       </goals>
                     </execution>
                 </executions>
                 <dependencies>
@@ -92,7 +89,7 @@
                         <artifactId>openjpa</artifactId>
                         <version>2.2.1</version>
                     </dependency>
-                            </dependencies>
+                </dependencies>
                 </plugin>
 		</plugins>
 	</build>
@@ -130,12 +127,6 @@
                 
 		<dependency>
 			<groupId>org.apache.juddi</groupId>
-			<artifactId>juddi-core</artifactId>
-			<version>${project.parent.version}</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.juddi</groupId>
 			<artifactId>uddi-tck-base</artifactId>
 			<version>${project.parent.version}</version>
 			<scope>test</scope>

Modified: juddi/branches/juddi-3.2.x/juddi-core/pom.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-core/pom.xml?rev=1483174&r1=1483173&r2=1483174&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-core/pom.xml (original)
+++ juddi/branches/juddi-3.2.x/juddi-core/pom.xml Thu May 16 03:03:28 2013
@@ -7,13 +7,12 @@
 	License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS 
 	OF ANY KIND, either express or implied. * See the License for the specific 
 	language governing permissions and * limitations under the License. * */ -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.apache.juddi</groupId>
 		<artifactId>juddi-parent</artifactId>
-		<version>3.1.5-SNAPSHOT</version>
+		<version>3.1.6-SNAPSHOT</version>
 	</parent>
 	<artifactId>juddi-core</artifactId>
 	<packaging>bundle</packaging>

Modified: juddi/branches/juddi-3.2.x/juddi-dist/pom.xml
URL: http://svn.apache.org/viewvc/juddi/branches/juddi-3.2.x/juddi-dist/pom.xml?rev=1483174&r1=1483173&r2=1483174&view=diff
==============================================================================
--- juddi/branches/juddi-3.2.x/juddi-dist/pom.xml (original)
+++ juddi/branches/juddi-3.2.x/juddi-dist/pom.xml Thu May 16 03:03:28 2013
@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>org.apache.juddi</groupId>
 		<artifactId>juddi-parent</artifactId>
-		<version>3.1.5-SNAPSHOT</version>
+		<version>3.1.6-SNAPSHOT</version>
 	</parent>
 	<artifactId>juddi-dist</artifactId>
 	<name>jUDDI Distribution Assembly</name>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org