geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r787176 - in /geronimo/server/trunk/plugins/uddi: ./ geronimo-uddi-db/src/main/sql/ geronimo-uddi-server/ geronimo-uddi-server/src/main/webapp/ geronimo-uddi-server/src/main/webapp/WEB-INF/ uddi-jetty6/ uddi-jetty6/src/main/history/ uddi-se...
Date Mon, 22 Jun 2009 09:10:52 GMT
Author: djencks
Date: Mon Jun 22 09:10:52 2009
New Revision: 787176

URL: http://svn.apache.org/viewvc?rev=787176&view=rev
Log:
GERONIMO-4702 upgrade juddi version, simplify uddi plugin project structure.  This includes minor data fiddling for the tck's benefit, which needs to be moved to the tck project. Part 1

Added:
    geronimo/server/trunk/plugins/uddi/geronimo-uddi-server/
      - copied from r785477, geronimo/server/trunk/plugins/uddi/uddi-server/geronimo-uddi-server/
    geronimo/server/trunk/plugins/uddi/uddi-jetty6/
      - copied from r785477, geronimo/server/trunk/plugins/uddi/uddi-server/uddi-jetty6/
    geronimo/server/trunk/plugins/uddi/uddi-jetty6/src/main/history/dependencies.xml
      - copied, changed from r785491, geronimo/server/trunk/plugins/uddi/uddi-server/uddi-jetty6/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/uddi/uddi-tomcat/
      - copied from r785477, geronimo/server/trunk/plugins/uddi/uddi-server/uddi-tomcat/
    geronimo/server/trunk/plugins/uddi/uddi-tomcat/src/main/history/dependencies.xml
      - copied, changed from r785491, geronimo/server/trunk/plugins/uddi/uddi-server/uddi-tomcat/src/main/history/dependencies.xml
Removed:
    geronimo/server/trunk/plugins/uddi/uddi-server/
Modified:
    geronimo/server/trunk/plugins/uddi/geronimo-uddi-db/src/main/sql/juddi.sql
    geronimo/server/trunk/plugins/uddi/geronimo-uddi-server/pom.xml
    geronimo/server/trunk/plugins/uddi/geronimo-uddi-server/src/main/webapp/WEB-INF/juddi.properties
    geronimo/server/trunk/plugins/uddi/geronimo-uddi-server/src/main/webapp/WEB-INF/web.xml
    geronimo/server/trunk/plugins/uddi/geronimo-uddi-server/src/main/webapp/happyjuddi.jsp
    geronimo/server/trunk/plugins/uddi/pom.xml
    geronimo/server/trunk/plugins/uddi/uddi-jetty6/pom.xml
    geronimo/server/trunk/plugins/uddi/uddi-tomcat/pom.xml

Modified: geronimo/server/trunk/plugins/uddi/geronimo-uddi-db/src/main/sql/juddi.sql
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/geronimo-uddi-db/src/main/sql/juddi.sql?rev=787176&r1=787175&r2=787176&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/geronimo-uddi-db/src/main/sql/juddi.sql (original)
+++ geronimo/server/trunk/plugins/uddi/geronimo-uddi-db/src/main/sql/juddi.sql Mon Jun 22 09:10:52 2009
@@ -207,7 +207,7 @@
   SERVICE_KEY VARCHAR(41) NOT NULL,
   BINDING_KEY VARCHAR(41) NOT NULL,
   ACCESS_POINT_TYPE VARCHAR(20) ,
-  ACCESS_POINT_URL VARCHAR(255) ,
+  ACCESS_POINT_URL VARCHAR(2000) ,
   HOSTING_REDIRECTOR VARCHAR(255) ,
   LAST_UPDATE TIMESTAMP NOT NULL,
   PRIMARY KEY (BINDING_KEY),
@@ -293,6 +293,7 @@
   PUBLISHER_ID VARCHAR(20) ,
   OPERATOR VARCHAR(255) NOT NULL,
   NAME VARCHAR(255) NOT NULL,
+  LANG_CODE VARCHAR(5),
   OVERVIEW_URL VARCHAR(255) ,
   DELETED VARCHAR(5),
   LAST_UPDATE TIMESTAMP NOT NULL,
@@ -354,10 +355,10 @@
   KEY_VALUE VARCHAR(255) NOT NULL,
   FROM_CHECK VARCHAR(5) NOT NULL,
   TO_CHECK VARCHAR(5) NOT NULL,
-  FOREIGN KEY (FROM_KEY) 
+  FOREIGN KEY (FROM_KEY)
     REFERENCES BUSINESS_ENTITY (BUSINESS_KEY),
-  FOREIGN KEY (TO_KEY) 
-    REFERENCES BUSINESS_ENTITY (BUSINESS_KEY) 
+  FOREIGN KEY (TO_KEY)
+    REFERENCES BUSINESS_ENTITY (BUSINESS_KEY)
 );
 
 CREATE TABLE PUBLISHER
@@ -367,6 +368,10 @@
   EMAIL_ADDRESS VARCHAR(255),
   IS_ADMIN VARCHAR(5),
   IS_ENABLED VARCHAR(5),
+  MAX_BUSINESSES INT,
+  MAX_SERVICES_PER_BUSINESS INT,
+  MAX_BINDINGS_PER_SERVICE INT,
+  MAX_TMODELS INT,
   PRIMARY KEY (PUBLISHER_ID)
 );
 
@@ -382,18 +387,21 @@
   PRIMARY KEY (AUTH_TOKEN)
 );
 
+INSERT INTO PUBLISHER (PUBLISHER_ID, PUBLISHER_NAME)
+VALUES ('juddi', 'juddi');
+
 INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
 VALUES ('uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4','Administrator','jUDDI.org','uddi-org:types','http://www.uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#UDDItypes',CURRENT TIMESTAMP);
 
 INSERT INTO TMODEL_DESCR (TMODEL_KEY,TMODEL_DESCR_ID,LANG_CODE,DESCR)
 VALUES ('uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4',0,'en','UDDI Type Taxonomy');
- 
+
 INSERT INTO TMODEL_DOC_DESCR (TMODEL_KEY,TMODEL_DOC_DESCR_ID,LANG_CODE,DESCR)
 VALUES ('uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4',0,'en','Taxonomy used to categorize Service Descriptions.');
- 
+
 INSERT INTO TMODEL_CATEGORY (TMODEL_KEY,CATEGORY_ID,TMODEL_KEY_REF,KEY_NAME,KEY_VALUE)
 VALUES ('uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4',0,'uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4','types','categorization');
- 
+
 INSERT INTO TMODEL_CATEGORY (TMODEL_KEY,CATEGORY_ID,TMODEL_KEY_REF,KEY_NAME,KEY_VALUE)
 VALUES ('uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4',1,'uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4','types','checked');
 
@@ -547,5 +555,174 @@
 INSERT INTO TMODEL_CATEGORY (TMODEL_KEY,CATEGORY_ID,TMODEL_KEY_REF,KEY_NAME,KEY_VALUE)
 VALUES ('uuid:B1B1BAF5-2329-43E6-AE13-BA8E97195039',0,'uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4','types','identifier');
 
-INSERT INTO PUBLISHER (PUBLISHER_ID,PUBLISHER_NAME,IS_ADMIN,IS_ENABLED)
-VALUES ('juddi', 'jUDDI User', 'false', 'true');
+
+
+INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+VALUES ('uuid:6E090AFA-33E5-36EB-81B7-1CA18373F457','Administrator','admin','jUDDI.org','uddi-org:wsdl:types','http://www.oasis-open.org/committees/uddi-spec/doc/tn/uddi-spec-tc-tn-wsdl-v2.htm#wsdlTypes',CURRENT TIMESTAMP);
+
+INSERT INTO TMODEL_DESCR (TMODEL_KEY,TMODEL_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:6E090AFA-33E5-36EB-81B7-1CA18373F457',0,'en','WSDL Type Category System');
+
+INSERT INTO TMODEL_DOC_DESCR (TMODEL_KEY,TMODEL_DOC_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:6E090AFA-33E5-36EB-81B7-1CA18373F457',0,'en','The WSDL Entity Type tModel uses a number of UDDI entities to represent the various entities within a WSDL document.');
+
+INSERT INTO TMODEL_CATEGORY (TMODEL_KEY,CATEGORY_ID,TMODEL_KEY_REF,KEY_NAME,KEY_VALUE)
+VALUES ('uuid:6E090AFA-33E5-36EB-81B7-1CA18373F457',0,'uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4','uddi-org:types','unchecked');
+
+INSERT INTO TMODEL_CATEGORY (TMODEL_KEY,CATEGORY_ID,TMODEL_KEY_REF,KEY_NAME,KEY_VALUE)
+VALUES ('uuid:6E090AFA-33E5-36EB-81B7-1CA18373F457',1,'uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4','uddi-org:types','categorization');
+
+
+INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+VALUES ('uuid:D01987D1-AB2E-3013-9BE2-2A66EB99D824','Administrator','admin','jUDDI.org','uddi-org:xml:namespace','http://www.oasis-open.org/committees/uddi-spec/doc/tn/uddi-spec-tc-tn-wsdl-v2.htm#xmlNamespace',CURRENT TIMESTAMP);
+
+INSERT INTO TMODEL_DESCR (TMODEL_KEY,TMODEL_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:D01987D1-AB2E-3013-9BE2-2A66EB99D824',0,'en','A category system used to indicate namespaces');
+
+INSERT INTO TMODEL_DOC_DESCR (TMODEL_KEY,TMODEL_DOC_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:D01987D1-AB2E-3013-9BE2-2A66EB99D824',0,'en','A namespace provides necessary qualifying information about a technical concept or model. The XML Namespace tModel provides a mechanism to associate a namespace with a UDDI entity.');
+
+INSERT INTO TMODEL_CATEGORY (TMODEL_KEY,CATEGORY_ID,TMODEL_KEY_REF,KEY_NAME,KEY_VALUE)
+VALUES ('uuid:D01987D1-AB2E-3013-9BE2-2A66EB99D824',0,'uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4','uddi-org:types','unchecked');
+
+INSERT INTO TMODEL_CATEGORY (TMODEL_KEY,CATEGORY_ID,TMODEL_KEY_REF,KEY_NAME,KEY_VALUE)
+VALUES ('uuid:D01987D1-AB2E-3013-9BE2-2A66EB99D824',1,'uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4','uddi-org:types','categorization');
+
+
+INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+VALUES ('uuid:2EC65201-9109-3919-9BEC-C9DBEFCACCF6','Administrator','admin','jUDDI.org','uddi-org:xml:localName','http://www.oasis-open.org/committees/uddi-spec/doc/tn/uddi-spec-tc-tn-wsdl-v2.htm#xmlLocalName',CURRENT TIMESTAMP);
+
+INSERT INTO TMODEL_DESCR (TMODEL_KEY,TMODEL_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:2EC65201-9109-3919-9BEC-C9DBEFCACCF6',0,'en','A category system used to indicate XML local names');
+
+INSERT INTO TMODEL_DOC_DESCR (TMODEL_KEY,TMODEL_DOC_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:2EC65201-9109-3919-9BEC-C9DBEFCACCF6',0,'en','The XML Local Name tModel provides a mechanism to indicate the name attribute for the uddi:businessService.');
+
+INSERT INTO TMODEL_CATEGORY (TMODEL_KEY,CATEGORY_ID,TMODEL_KEY_REF,KEY_NAME,KEY_VALUE)
+VALUES ('uuid:2EC65201-9109-3919-9BEC-C9DBEFCACCF6',0,'uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4','uddi-org:types','unchecked');
+
+INSERT INTO TMODEL_CATEGORY (TMODEL_KEY,CATEGORY_ID,TMODEL_KEY_REF,KEY_NAME,KEY_VALUE)
+VALUES ('uuid:2EC65201-9109-3919-9BEC-C9DBEFCACCF6',1,'uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4','uddi-org:types','categorization');
+
+
+INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+VALUES ('uuid:082B0851-25D8-303C-B332-F24A6D53E38E','Administrator','admin','jUDDI.org','uddi-org:wsdl:portTypeReference','http://www.oasis-open.org/committees/uddi-spec/doc/tn/uddi-spec-tc-tn-wsdl-v2.htm#portTypeReference',CURRENT TIMESTAMP);
+
+INSERT INTO TMODEL_DESCR (TMODEL_KEY,TMODEL_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:082B0851-25D8-303C-B332-F24A6D53E38E',0,'en','A category system used to reference a wsdl:portType tModel');
+
+INSERT INTO TMODEL_DOC_DESCR (TMODEL_KEY,TMODEL_DOC_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:082B0851-25D8-303C-B332-F24A6D53E38E',0,'en','The WSDL portType Reference category system provides a mechanism to indicate that a UDDI entity has a relationship with a certain wsdl:portType tModel.');
+
+INSERT INTO TMODEL_CATEGORY (TMODEL_KEY,CATEGORY_ID,TMODEL_KEY_REF,KEY_NAME,KEY_VALUE)
+VALUES ('uuid:082B0851-25D8-303C-B332-F24A6D53E38E',0,'uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4','uddi-org:types','checked');
+
+INSERT INTO TMODEL_CATEGORY (TMODEL_KEY,CATEGORY_ID,TMODEL_KEY_REF,KEY_NAME,KEY_VALUE)
+VALUES ('uuid:082B0851-25D8-303C-B332-F24A6D53E38E',1,'uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4','uddi-org:types','categorization');
+
+
+INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+VALUES ('uuid:AA254698-93DE-3870-8DF3-A5C075D64A0E','Administrator','admin','jUDDI.org','uddi-org:protocol:soap','http://www.oasis-open.org/committees/uddi-spec/doc/tn/uddi-spec-tc-tn-wsdl-v2.htm#soap',CURRENT TIMESTAMP);
+
+INSERT INTO TMODEL_DESCR (TMODEL_KEY,TMODEL_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:AA254698-93DE-3870-8DF3-A5C075D64A0E',0,'en','A tModel that represents the SOAP 1.1 protocol');
+
+INSERT INTO TMODEL_DOC_DESCR (TMODEL_KEY,TMODEL_DOC_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:AA254698-93DE-3870-8DF3-A5C075D64A0E',0,'en','The SOAP Protocol tModel can be used to indicate that a Web service supports the SOAP 1.1 protocol.');
+
+INSERT INTO TMODEL_CATEGORY (TMODEL_KEY,CATEGORY_ID,TMODEL_KEY_REF,KEY_NAME,KEY_VALUE)
+VALUES ('uuid:AA254698-93DE-3870-8DF3-A5C075D64A0E',0,'uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4','uddi-org:types','protocol');
+
+
+INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+VALUES ('uuid:6E10B91B-BABC-3442-B8FC-5A3C8FDE0794','Administrator','admin','jUDDI.org','uddi-org:protocol:http','http://www.oasis-open.org/committees/uddi-spec/doc/tn/uddi-spec-tc-tn-wsdl-v2.htm#http',CURRENT TIMESTAMP);
+
+INSERT INTO TMODEL_DESCR (TMODEL_KEY,TMODEL_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:6E10B91B-BABC-3442-B8FC-5A3C8FDE0794',0,'en','A tModel that represents the HTTP protocol');
+
+INSERT INTO TMODEL_DOC_DESCR (TMODEL_KEY,TMODEL_DOC_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:6E10B91B-BABC-3442-B8FC-5A3C8FDE0794',0,'en','The HTTP Protocol tModel can be used to indicate that a Web service supports the HTTP protocol.');
+
+INSERT INTO TMODEL_CATEGORY (TMODEL_KEY,CATEGORY_ID,TMODEL_KEY_REF,KEY_NAME,KEY_VALUE)
+VALUES ('uuid:6E10B91B-BABC-3442-B8FC-5A3C8FDE0794',0,'uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4','uddi-org:types','protocol');
+
+
+INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+VALUES ('uuid:4DC74177-7806-34D9-AECD-33C57DC3A865','Administrator','admin','jUDDI.org','uddi-org:wsdl:categorization:protocol','http://www.oasis-open.org/committees/uddi-spec/doc/tn/uddi-spec-tc-tn-wsdl-v2.htm#protocol',CURRENT TIMESTAMP);
+
+INSERT INTO TMODEL_DESCR (TMODEL_KEY,TMODEL_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:4DC74177-7806-34D9-AECD-33C57DC3A865',0,'en','Category system used to describe the protocol supported by a wsdl:binding.');
+
+INSERT INTO TMODEL_DOC_DESCR (TMODEL_KEY,TMODEL_DOC_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:4DC74177-7806-34D9-AECD-33C57DC3A865',0,'en','The Protocol Categorization tModel provides a mechanism to capture this protocol information in the UDDI binding tModel.');
+
+INSERT INTO TMODEL_CATEGORY (TMODEL_KEY,CATEGORY_ID,TMODEL_KEY_REF,KEY_NAME,KEY_VALUE)
+VALUES ('uuid:4DC74177-7806-34D9-AECD-33C57DC3A865',0,'uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4','uddi-org:types','categorization');
+
+INSERT INTO TMODEL_CATEGORY (TMODEL_KEY,CATEGORY_ID,TMODEL_KEY_REF,KEY_NAME,KEY_VALUE)
+VALUES ('uuid:4DC74177-7806-34D9-AECD-33C57DC3A865',1,'uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4','uddi-org:types','checked');
+
+
+INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+VALUES ('uuid:E5C43936-86E4-37BF-8196-1D04B35C0099','Administrator','admin','jUDDI.org','uddi-org:wsdl:categorization:transport','http://www.oasis-open.org/committees/uddi-spec/doc/tn/uddi-spec-tc-tn-wsdl-v2.htm#transport',CURRENT TIMESTAMP);
+
+INSERT INTO TMODEL_DESCR (TMODEL_KEY,TMODEL_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:E5C43936-86E4-37BF-8196-1D04B35C0099',0,'en','Category system used to describe the transport supported by a wsdl:binding.');
+
+INSERT INTO TMODEL_DOC_DESCR (TMODEL_KEY,TMODEL_DOC_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:E5C43936-86E4-37BF-8196-1D04B35C0099',0,'en','The Transport Categorization tModel provides a mechanism to capture transport information in the UDDI binding tModel which allows a user to search for bindings that implement a specific transport protocol.');
+
+INSERT INTO TMODEL_CATEGORY (TMODEL_KEY,CATEGORY_ID,TMODEL_KEY_REF,KEY_NAME,KEY_VALUE)
+VALUES ('uuid:E5C43936-86E4-37BF-8196-1D04B35C0099',0,'uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4','uddi-org:types','categorization');
+
+INSERT INTO TMODEL_CATEGORY (TMODEL_KEY,CATEGORY_ID,TMODEL_KEY_REF,KEY_NAME,KEY_VALUE)
+VALUES ('uuid:E5C43936-86E4-37BF-8196-1D04B35C0099',1,'uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4','uddi-org:types','checked');
+
+
+INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+VALUES ('uuid:AD61DE98-4DB8-31B2-A299-A2373DC97212','Administrator','admin','jUDDI.org','uddi-org:wsdl:address','http://www.oasis-open.org/committees/uddi-spec/doc/tn/uddi-spec-tc-tn-wsdl-v2.htm#Address',CURRENT TIMESTAMP);
+
+INSERT INTO TMODEL_DESCR (TMODEL_KEY,TMODEL_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:AD61DE98-4DB8-31B2-A299-A2373DC97212',0,'en','A tModel used to indicate the WSDL address option.');
+
+INSERT INTO TMODEL_DOC_DESCR (TMODEL_KEY,TMODEL_DOC_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:AD61DE98-4DB8-31B2-A299-A2373DC97212',0,'en','The WSDL Address tModel provides A mechanism to indicate that the endpoint address should be obtained from a WSDL document.');
+
+-- ** http transport **
+INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+VALUES ('uuid:68DE9E80-AD09-469D-8A37-088422BFBC36','Administrator','admin','jUDDI.org','uddi-org:http','http://www.uddi.org/taxonomies/UDDI_CoreOther_tModels.htm#overHTTP',CURRENT TIMESTAMP);
+INSERT INTO TMODEL_DESCR (TMODEL_KEY,TMODEL_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:68DE9E80-AD09-469D-8A37-088422BFBC36',0,'en','An HTTP or web browser-based web service');
+INSERT INTO TMODEL_CATEGORY (TMODEL_KEY,CATEGORY_ID,TMODEL_KEY_REF,KEY_NAME,KEY_VALUE)
+VALUES ('uuid:68DE9E80-AD09-469D-8A37-088422BFBC36',0,'uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4','tModelType','transport');
+
+-- ** uddi inquiry **
+INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+VALUES ('uuid:AC104DCC-D623-452F-88A7-F8ACD94D9B2B','Administrator','admin','jUDDI.org','uddi-org:inquiry_v2','http://www.uddi.org/wsdl/inquire_v2.wsdl',CURRENT TIMESTAMP);
+INSERT INTO TMODEL_DESCR (TMODEL_KEY,TMODEL_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:AC104DCC-D623-452F-88A7-F8ACD94D9B2B',0,'en','UDDI Inquiry API Version 2 - Core Specification');
+INSERT INTO TMODEL_DOC_DESCR (TMODEL_KEY,TMODEL_DOC_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:AC104DCC-D623-452F-88A7-F8ACD94D9B2B',0,'en','This tModel defines the inquiry API calls for interacting with a V2 UDDI node.');
+INSERT INTO TMODEL_CATEGORY (TMODEL_KEY,CATEGORY_ID,TMODEL_KEY_REF,KEY_NAME,KEY_VALUE)
+VALUES ('uuid:AC104DCC-D623-452F-88A7-F8ACD94D9B2B',0,'uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4','types','specification');
+INSERT INTO TMODEL_CATEGORY (TMODEL_KEY,CATEGORY_ID,TMODEL_KEY_REF,KEY_NAME,KEY_VALUE)
+VALUES ('uuid:AC104DCC-D623-452F-88A7-F8ACD94D9B2B',1,'uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4','types','xmlSpec');
+INSERT INTO TMODEL_CATEGORY (TMODEL_KEY,CATEGORY_ID,TMODEL_KEY_REF,KEY_NAME,KEY_VALUE)
+VALUES ('uuid:AC104DCC-D623-452F-88A7-F8ACD94D9B2B',2,'uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4','types','soapSpec');
+INSERT INTO TMODEL_CATEGORY (TMODEL_KEY,CATEGORY_ID,TMODEL_KEY_REF,KEY_NAME,KEY_VALUE)
+VALUES ('uuid:AC104DCC-D623-452F-88A7-F8ACD94D9B2B',3,'uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4','types','wsdlSpec');
+
+-- ** uddi-org:taxonomy_V2
+INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,PUBLISHER_ID,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+VALUES ('uuid:1E3E9CBC-F8CE-41ab-8F99-88326BAD324A','Administrator','admin','jUDDI.org','uddi-org:taxonomy_v2','http://www.uddi.org/taxonomies/UDDI_Registry_tModels.htm#TaxV2',CURRENT_TIMESTAMP);
+INSERT INTO TMODEL_DESCR (TMODEL_KEY,TMODEL_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:1E3E9CBC-F8CE-41ab-8F99-88326BAD324A',0,'en','UDDI Taxonomy API Version 2 - Core Specification');
+INSERT INTO TMODEL_DOC_DESCR (TMODEL_KEY,TMODEL_DOC_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:1E3E9CBC-F8CE-41ab-8F99-88326BAD324A',0,'en','This tModel defines the taxonomy validation API calls for interacting with a V2 UDDI node.');
+INSERT INTO TMODEL_CATEGORY (TMODEL_KEY,CATEGORY_ID,TMODEL_KEY_REF,KEY_NAME,KEY_VALUE)
+VALUES ('uuid:1E3E9CBC-F8CE-41ab-8F99-88326BAD324A',0,'uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4','types','specification');
+INSERT INTO TMODEL_CATEGORY (TMODEL_KEY,CATEGORY_ID,TMODEL_KEY_REF,KEY_NAME,KEY_VALUE)
+VALUES ('uuid:1E3E9CBC-F8CE-41ab-8F99-88326BAD324A',1,'uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4','types','xmlSpec');
+INSERT INTO TMODEL_CATEGORY (TMODEL_KEY,CATEGORY_ID,TMODEL_KEY_REF,KEY_NAME,KEY_VALUE)
+VALUES ('uuid:1E3E9CBC-F8CE-41ab-8F99-88326BAD324A',2,'uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4','types','soapSpec');
+

Modified: geronimo/server/trunk/plugins/uddi/geronimo-uddi-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/geronimo-uddi-server/pom.xml?rev=787176&r1=785477&r2=787176&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/geronimo-uddi-server/pom.xml (original)
+++ geronimo/server/trunk/plugins/uddi/geronimo-uddi-server/pom.xml Mon Jun 22 09:10:52 2009
@@ -24,7 +24,7 @@
 
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>uddi-server</artifactId>
+        <artifactId>uddi</artifactId>
         <version>2.2-SNAPSHOT</version>
     </parent>
     
@@ -34,7 +34,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>juddi</groupId>
+            <groupId>org.apache.juddi</groupId>
             <artifactId>juddi</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: geronimo/server/trunk/plugins/uddi/geronimo-uddi-server/src/main/webapp/WEB-INF/juddi.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/geronimo-uddi-server/src/main/webapp/WEB-INF/juddi.properties?rev=787176&r1=785477&r2=787176&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/geronimo-uddi-server/src/main/webapp/WEB-INF/juddi.properties (original)
+++ geronimo/server/trunk/plugins/uddi/geronimo-uddi-server/src/main/webapp/WEB-INF/juddi.properties Mon Jun 22 09:10:52 2009
@@ -41,11 +41,15 @@
 # FindXxxx and SaveXxxx UDDI functions.
 juddi.maxNameLength=255
 juddi.maxNameElementsAllowed=5
-juddi.maxBusinessEntitiesPerUser=25
-juddi.maxBusinessServicesPerBusiness=20
-juddi.maxBindingTemplatesPerService=10
-juddi.maxTModelsPerUser=100
-juddi.maxRowsLimit=10
+
+# The maximum number of UDDI artifacts allowed
+# per publisher. A value of '-1' indicates any
+# number of artifacts is valid (These values can be
+# overridden at the individual publisher level).
+juddi.maxBusinessesPerPublisher=25
+juddi.maxServicesPerBusiness=20
+juddi.maxBindingsPerService=10
+juddi.maxTModelsPerPublisher=100
 
 # jUDDI Authentication module to use
 juddi.auth = org.apache.juddi.auth.DefaultAuthenticator
@@ -54,8 +58,21 @@
 juddi.dataStore = org.apache.juddi.datastore.jdbc.JDBCDataStore
 
 # jUDDI DataSource to use
+juddi.isUseDataSource=true
 juddi.dataSource=java:comp/env/jdbc/juddiDB
 
+# straight JDBC
+#juddi.jdbcDriver=com.mysql.jdbc.Driver
+#juddi.jdbcUrl=jdbc:mysql://localhost/juddi
+#juddi.jdbcUsername=juddi
+#juddi.jdbcPassword=juddi
+
+# jUDDI database creation
+juddi.isCreateDatabase=true
+#juddi.tablePrefix=JUDDI_
+juddi.databaseExistsSql=select * from ${prefix}BUSINESS_ENTITY
+juddi.sqlFiles=juddi-sql/mysql/create_database.sql,juddi-sql/insert_publishers.sql
+
 # jUDDI UUIDGen implementation to use
 juddi.uuidgen = org.apache.juddi.uuidgen.DefaultUUIDGen
 
@@ -69,6 +86,11 @@
 juddi.proxy.adminURL = http://localhost:8080/juddi/admin
 juddi.proxy.inquiryURL = http://localhost:8080/juddi/inquiry
 juddi.proxy.publishURL = http://localhost:8080/juddi/publish
-juddi.proxy.transportClass = org.apache.juddi.proxy.AxisTransport
+juddi.proxy.transportClass = org.apache.juddi.registry.proxy.Axis2Transport
 juddi.proxy.securityProvider = com.sun.net.ssl.internal.ssl.Provider
 juddi.proxy.protocolHandler = com.sun.net.ssl.internal.www.protocol
+
+# JNDI settings (used by RMITransport)
+#java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+#java.naming.provider.url=jnp://localhost:1099
+#java.naming.factory.url.pkgs=org.jboss.naming

Modified: geronimo/server/trunk/plugins/uddi/geronimo-uddi-server/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/geronimo-uddi-server/src/main/webapp/WEB-INF/web.xml?rev=787176&r1=785477&r2=787176&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/geronimo-uddi-server/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/server/trunk/plugins/uddi/geronimo-uddi-server/src/main/webapp/WEB-INF/web.xml Mon Jun 22 09:10:52 2009
@@ -1,40 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You 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.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<web-app version="2.4"
-    xmlns="http://java.sun.com/xml/ns/j2ee"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-
-    <!-- Welcome File List -->
-    <welcome-file-list>
-        <welcome-file>happyjuddi.jsp</welcome-file>
-    </welcome-file-list>
+/*
+ * Copyright 2001-2004 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.
+ */
+ -->
+<!DOCTYPE web-app PUBLIC
+        "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+        "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app>
+
+    <display-name>jUDDI</display-name>
+    <description>
+        jUDDI is Java-based implmementation of a UDDI version 2.0 registry.
+    </description>
 
     <!--
-      This Servlet is used to create, initialize and cleanup
-      resources used by jUDDI. It ABSOLUTELY MUST be loaded first.
-     -->
+     This Servlet is used to create, initialize and cleanup
+     resources used by jUDDI. It ABSOLUTELY MUST be loaded first.
+    -->
     <servlet>
-        <display-name>jUDDI Registry Servlet</display-name>
         <servlet-name>jUDDIRegistryServlet</servlet-name>
+        <display-name>jUDDI Registry Servlet</display-name>
         <servlet-class>org.apache.juddi.registry.RegistryServlet</servlet-class>
         <init-param>
             <param-name>juddi.propertiesFile</param-name>
@@ -44,39 +43,57 @@
     </servlet>
 
     <servlet>
-        <display-name>jUDDI Admin Service</display-name>
         <servlet-name>jUDDIAdminService</servlet-name>
-        <servlet-class>org.apache.juddi.registry.AdminService</servlet-class>
+        <display-name>jUDDI Admin Service</display-name>
+        <servlet-class>org.apache.juddi.registry.service.AdminService</servlet-class>
     </servlet>
+
     <servlet>
-        <display-name>UDDI Version 2.0 Inquiry Service</display-name>
         <servlet-name>UDDIV2InquiryService</servlet-name>
-        <servlet-class>org.apache.juddi.registry.InquiryService</servlet-class>
+        <display-name>UDDI Version 2.0 Inquiry Service</display-name>
+        <servlet-class>org.apache.juddi.registry.service.InquiryService</servlet-class>
     </servlet>
+
     <servlet>
-        <display-name>UDDI Version 2.0 Publish Service</display-name>
         <servlet-name>UDDIV2PublishService</servlet-name>
-        <servlet-class>org.apache.juddi.registry.PublishService</servlet-class>
+        <display-name>UDDI Version 2.0 Publish Service</display-name>
+        <servlet-class>org.apache.juddi.registry.service.PublishService</servlet-class>
+    </servlet>
+
+    <!--  uncomment if you want to enable making calls in juddi with rmi
+    <servlet>
+        <servlet-name>RegisterServicesWithJNDI</servlet-name>
+        <servlet-class>org.apache.juddi.registry.rmi.RegistrationService</servlet-class>
+        <load-on-startup>1</load-on-startup>
     </servlet>
+    -->
 
     <servlet-mapping>
         <servlet-name>jUDDIAdminService</servlet-name>
         <url-pattern>/admin</url-pattern>
     </servlet-mapping>
+
     <servlet-mapping>
         <servlet-name>UDDIV2InquiryService</servlet-name>
         <url-pattern>/inquiry</url-pattern>
     </servlet-mapping>
+
     <servlet-mapping>
         <servlet-name>UDDIV2PublishService</servlet-name>
         <url-pattern>/publish</url-pattern>
     </servlet-mapping>
 
+    <welcome-file-list id="WelcomeFileList">
+        <welcome-file>index.jsp</welcome-file>
+        <welcome-file>index.html</welcome-file>
+    </welcome-file-list>
+
     <resource-ref>
         <description>jUDDI DataSource</description>
         <res-ref-name>jdbc/juddiDB</res-ref-name>
         <res-type>javax.sql.DataSource</res-type>
         <res-auth>Container</res-auth>
+        <res-sharing-scope>Shareable</res-sharing-scope>
     </resource-ref>
 
 </web-app>

Modified: geronimo/server/trunk/plugins/uddi/geronimo-uddi-server/src/main/webapp/happyjuddi.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/geronimo-uddi-server/src/main/webapp/happyjuddi.jsp?rev=787176&r1=785477&r2=787176&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/geronimo-uddi-server/src/main/webapp/happyjuddi.jsp (original)
+++ geronimo/server/trunk/plugins/uddi/geronimo-uddi-server/src/main/webapp/happyjuddi.jsp Mon Jun 22 09:10:52 2009
@@ -1,5 +1,4 @@
-<%@ page contentType="text/html; charset=UTF-8"
-         session="false"
+<%@ page session="false"
          import="java.io.File,
                  java.io.IOException,
                  java.net.URL,
@@ -13,19 +12,22 @@
                  java.util.TreeSet,
                  javax.naming.Context,
                  javax.naming.InitialContext,
-                 javax.sql.DataSource"
+                 javax.sql.DataSource,
+
+                 org.apache.juddi.registry.RegistryServlet,
+
+                 org.apache.juddi.registry.RegistryEngine"
 %>
 <%
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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
- * 
+ * Copyright 2002,2004 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.
@@ -42,11 +44,11 @@
      * @return the location of the named class
      * @throws IOException
      */
-    String lookupClass(String className) 
-      throws IOException 
+    String lookupClass(String className)
+      throws IOException
     {
       // load the class (if it exists)
-      Class clazz = null;      
+      Class clazz = null;
       try {
         clazz = Class.forName(className);
         if (clazz == null)
@@ -66,13 +68,13 @@
       catch(Throwable t) {
         return "";
       }
-      
+
       // got the classes URL, now determine it's location
       String location = getLocation(url);
-      if (location == null) 
+      if (location == null)
         return "";
       else
-        return location;   
+        return location;
     }
 
     /**
@@ -81,23 +83,23 @@
      * @param resourceName
      * @return true if the file was found
      */
-    String lookupResource(String resourceName) 
+    String lookupResource(String resourceName)
     {
       URL url = null;
       ClassLoader classLoader = null;
 
       classLoader = this.getClass().getClassLoader();
-      if (classLoader != null) 
+      if (classLoader != null)
       {
         url = classLoader.getResource(resourceName);
         if (url != null) {
           return getLocation(url);
         }
       }
-      else      
+      else
       {
-        classLoader = System.class.getClassLoader(); 
-        if (classLoader != null) 
+        classLoader = System.class.getClassLoader();
+        if (classLoader != null)
         {
           url = classLoader.getResource(resourceName);
           if (url != null) {
@@ -113,7 +115,7 @@
      * Determine the location of the Java class.
      *
      * @param clazz
-     * @return the file path to the jar file or class 
+     * @return the file path to the jar file or class
      *  file where the class was located.
      */
     String getLocation(URL url)
@@ -126,12 +128,12 @@
           File file = new File(url.getFile());
           return file.getPath().substring(6);
         }
-        else if (location.startsWith("jar")) 
+        else if (location.startsWith("jar"))
         {
           url = ((JarURLConnection)url.openConnection()).getJarFileURL();
           return url.toString();
         }
-        else if (location.startsWith("file")) 
+        else if (location.startsWith("file"))
         {
           File file = new File(url.getFile());
           return file.getAbsolutePath();
@@ -140,8 +142,8 @@
         {
           return url.toString();
         }
-      } 
-      catch (Throwable t) { 
+      }
+      catch (Throwable t) {
         return null;
       }
     }
@@ -163,13 +165,20 @@
 <h4>jUDDI Version Information</h4>
 <pre>
 <b>jUDDI Version:</b> <%= org.apache.juddi.util.Release.getRegistryVersion() %>
-<b>Build Date:</b>    <%= org.apache.juddi.util.Release.getLastModified() %>
 <b>UDDI Version:</b>  <%= org.apache.juddi.util.Release.getUDDIVersion() %>
 </pre>
-        
+
 <h4>jUDDI Dependencies: Class Files &amp; Libraries</h4>
 <pre>
 <%
+
+    //creates the schema if not there
+
+    RegistryEngine registry = RegistryServlet.getRegistry();
+
+    registry.init();
+
+
     String[] classArray = {
       "org.apache.juddi.IRegistry",
       "org.apache.axis.transport.http.AxisServlet",
@@ -181,53 +190,53 @@
       "com.ibm.wsdl.factory.WSDLFactoryImpl",
       "javax.xml.parsers.SAXParserFactory"
     };
-    
+
     for (int i=0; i<classArray.length; i++)
     {
       out.write("<b>Looking for</b>: "+classArray[i]+"<br>");
-      
+
       String result = lookupClass(classArray[i]);
       if (result == null)
       {
         out.write("<font color=\"red\">-Not Found</font><br>");
       }
       else if (result.length() == 0)
-      {        
+      {
         out.write("<font color=\"blue\">+Found in an unknown location</font><br>");
       }
       else
-      {        
+      {
         out.write("<font color=\"green\">+Found in: "+ result +"</font><br>");
       }
-    }   
+    }
 %>
 </pre>
-        
+
 <h4>jUDDI Dependencies: Resource &amp; Properties Files</h4>
 <pre>
 <%
     String[] resourceArray = {
-      "log4j.xml"
+      //"log4j.xml"
     };
-    
+
     for (int i=0; i<resourceArray.length; i++)
     {
       out.write("<b>Looking for</b>: "+resourceArray[i]+"<br>");
-      
+
       String result = lookupResource(resourceArray[i]);
       if (result == null)
       {
         out.write("<font color=\"red\">-Not Found</font><br>");
       }
       else if (result.length() == 0)
-      {        
+      {
         out.write("<font color=\"blue\">+Found in an unknown location</font><br>");
       }
       else
-      {        
+      {
         out.write("<font color=\"green\">+Found in: "+ result +"</font><br>");
       }
-    }   
+    }
 %>
 </pre>
 
@@ -239,17 +248,17 @@
   DataSource ds = null;
   Connection conn = null;
   String sql = "SELECT COUNT(*) FROM PUBLISHER";
-  
+
   try
   {
     dsname = request.getParameter("dsname");
     if ((dsname == null) || (dsname.trim().length() == 0))
       dsname = "java:comp/env/jdbc/juddiDB";
-    
+
     ctx = new InitialContext();
     if (ctx == null )
       throw new Exception("No Context");
-  
+
     out.print("<font color=\"green\">");
     out.print("+ Got a JNDI Context!");
     out.println("</font>");
@@ -268,10 +277,7 @@
       throw new Exception("No Context");
 
     out.print("<font color=\"green\">");
-    /** Removed to avoid a security risk in exposing a DS name
     out.print("+ Got a JDBC DataSource (dsname="+dsname+")");
-    **/
-    out.print("+ Got a JDBC DataSource!");
     out.println("</font>");
   }
   catch(Exception ex)
@@ -280,12 +286,12 @@
     out.print("- No '"+dsname+"' DataSource Located("+ex.getMessage()+")");
     out.println("</font>");
   }
-  
+
   try
   {
     conn = ds.getConnection();
     if (conn == null)
-    throw new Exception("No Connection (conn=null)");  
+    throw new Exception("No Connection (conn=null)");
 
     out.print("<font color=\"green\">");
     out.print("+ Got a JDBC Connection!");
@@ -294,10 +300,10 @@
   catch(Exception ex)
   {
     out.print("<font color=\"red\">");
-    out.print("- DB connection was not aquired. ("+ex.getMessage()+")");
+    out.print("- DB connection was not acquired. ("+ex.getMessage()+")");
     out.println("</font>");
   }
-  
+
   try
   {
     Statement stmt = conn.createStatement();
@@ -320,14 +326,14 @@
 %>
 </pre>
 
-<!-- removed to avoid exposing internal system properties to unauth user
+
 <h4>System Properties</h4>
 <pre>
 <%
   try
   {
     Properties sysProps = System.getProperties();
-    SortedSet sortedProperties = new TreeSet(sysProps.keySet()); 
+    SortedSet sortedProperties = new TreeSet(sysProps.keySet());
     for (Iterator keys = sortedProperties.iterator(); keys.hasNext();)
     {
       String key = (String)keys.next();
@@ -340,7 +346,6 @@
   }
 %>
 </pre>
--->
 
 <hr>
 Platform: <%= getServletConfig().getServletContext().getServerInfo() %>
@@ -349,6 +354,6 @@
 <tr><td height="50" align="center" valign="bottom" nowrap><div class="footer">&nbsp;</div></td></tr>
 </table>
 
-</body>
 </div>
-</html>
+</body>
+</html>
\ No newline at end of file

Modified: geronimo/server/trunk/plugins/uddi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/pom.xml?rev=787176&r1=787175&r2=787176&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/pom.xml (original)
+++ geronimo/server/trunk/plugins/uddi/pom.xml Mon Jun 22 09:10:52 2009
@@ -38,7 +38,69 @@
 
     <modules>
         <module>geronimo-uddi-db</module>
-        <module>uddi-server</module>
+        <module>geronimo-uddi-server</module>
+        <module>uddi-jetty6</module>
+        <module>uddi-tomcat</module>
     </modules>
 
+
+    <dependencyManagement>
+        <dependencies>
+
+            <dependency>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>system-database</artifactId>
+                <version>${version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.juddi</groupId>
+                <artifactId>juddi</artifactId>
+                <version>2.0rc6</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>avalon-framework</groupId>
+                        <artifactId>avalon-framework</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.servlet</groupId>
+                        <artifactId>servlet-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>logkit</groupId>
+                        <artifactId>logkit</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.juddi</groupId>
+                <artifactId>juddi-ws</artifactId>
+                <version>2.0rc6</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.axis2</groupId>
+                        <artifactId>axis2-kernel</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.axis2</groupId>
+                        <artifactId>axis2-saaj</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>xml-apis</groupId>
+                        <artifactId>xml-apis</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+        </dependencies>
+    </dependencyManagement>
 </project>

Modified: geronimo/server/trunk/plugins/uddi/uddi-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-jetty6/pom.xml?rev=787176&r1=785477&r2=787176&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-jetty6/pom.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-jetty6/pom.xml Mon Jun 22 09:10:52 2009
@@ -24,7 +24,7 @@
 
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>uddi-server</artifactId>
+        <artifactId>uddi</artifactId>
         <version>2.2-SNAPSHOT</version>
     </parent>
 
@@ -94,10 +94,15 @@
         </dependency>
 
         <dependency>
-            <groupId>juddi</groupId>
+            <groupId>org.apache.juddi</groupId>
             <artifactId>juddi</artifactId>
         </dependency>
-        
+
+        <dependency>
+            <groupId>org.apache.juddi</groupId>
+            <artifactId>juddi-ws</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper</artifactId>

Copied: geronimo/server/trunk/plugins/uddi/uddi-jetty6/src/main/history/dependencies.xml (from r785491, geronimo/server/trunk/plugins/uddi/uddi-server/uddi-jetty6/src/main/history/dependencies.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-jetty6/src/main/history/dependencies.xml?p2=geronimo/server/trunk/plugins/uddi/uddi-jetty6/src/main/history/dependencies.xml&p1=geronimo/server/trunk/plugins/uddi/uddi-server/uddi-jetty6/src/main/history/dependencies.xml&r1=785491&r2=787176&rev=787176&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-server/uddi-jetty6/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-jetty6/src/main/history/dependencies.xml Mon Jun 22 09:10:52 2009
@@ -7,11 +7,6 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>juddi</groupId>
-        <artifactId>juddi</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>axis</artifactId>
         <type>car</type>
@@ -31,4 +26,14 @@
         <artifactId>geronimo-uddi-db</artifactId>
         <type>jar</type>
     </dependency>
+    <dependency>
+        <groupId>org.apache.juddi</groupId>
+        <artifactId>juddi</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.juddi</groupId>
+        <artifactId>juddi-ws</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/uddi/uddi-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-tomcat/pom.xml?rev=787176&r1=785477&r2=787176&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-tomcat/pom.xml Mon Jun 22 09:10:52 2009
@@ -24,7 +24,7 @@
 
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>uddi-server</artifactId>
+        <artifactId>uddi</artifactId>
         <version>2.2-SNAPSHOT</version>
     </parent>
 
@@ -94,10 +94,15 @@
         </dependency>
 
         <dependency>
-            <groupId>juddi</groupId>
+            <groupId>org.apache.juddi</groupId>
             <artifactId>juddi</artifactId>
         </dependency>
-        
+
+        <dependency>
+            <groupId>org.apache.juddi</groupId>
+            <artifactId>juddi-ws</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper</artifactId>
@@ -120,10 +125,6 @@
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <category>Web Services</category>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
                 </configuration>
             </plugin>
         </plugins>

Copied: geronimo/server/trunk/plugins/uddi/uddi-tomcat/src/main/history/dependencies.xml (from r785491, geronimo/server/trunk/plugins/uddi/uddi-server/uddi-tomcat/src/main/history/dependencies.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-tomcat/src/main/history/dependencies.xml?p2=geronimo/server/trunk/plugins/uddi/uddi-tomcat/src/main/history/dependencies.xml&p1=geronimo/server/trunk/plugins/uddi/uddi-server/uddi-tomcat/src/main/history/dependencies.xml&r1=785491&r2=787176&rev=787176&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-server/uddi-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-tomcat/src/main/history/dependencies.xml Mon Jun 22 09:10:52 2009
@@ -7,11 +7,6 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>juddi</groupId>
-        <artifactId>juddi</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>axis</artifactId>
         <type>car</type>
@@ -31,4 +26,14 @@
         <artifactId>geronimo-uddi-db</artifactId>
         <type>jar</type>
     </dependency>
+    <dependency>
+        <groupId>org.apache.juddi</groupId>
+        <artifactId>juddi</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.juddi</groupId>
+        <artifactId>juddi-ws</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>



Mime
View raw message