Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 69192 invoked from network); 22 Jun 2009 09:11:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 22 Jun 2009 09:11:09 -0000 Received: (qmail 47913 invoked by uid 500); 22 Jun 2009 09:11:20 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 47840 invoked by uid 500); 22 Jun 2009 09:11:20 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 47831 invoked by uid 99); 22 Jun 2009 09:11:19 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Jun 2009 09:11:19 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Jun 2009 09:11:14 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 675E923888A0; Mon, 22 Jun 2009 09:10:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090622091053.675E923888A0@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ org.apache.geronimo.plugins - uddi-server + uddi 2.2-SNAPSHOT @@ -34,7 +34,7 @@ - juddi + org.apache.juddi juddi provided 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 @@ - + - - - - - - - - happyjuddi.jsp - +/* + * 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. + */ + --> + + + + + jUDDI + + jUDDI is Java-based implmementation of a UDDI version 2.0 registry. + + This Servlet is used to create, initialize and cleanup + resources used by jUDDI. It ABSOLUTELY MUST be loaded first. + --> - jUDDI Registry Servlet jUDDIRegistryServlet + jUDDI Registry Servlet org.apache.juddi.registry.RegistryServlet juddi.propertiesFile @@ -44,39 +43,57 @@ - jUDDI Admin Service jUDDIAdminService - org.apache.juddi.registry.AdminService + jUDDI Admin Service + org.apache.juddi.registry.service.AdminService + - UDDI Version 2.0 Inquiry Service UDDIV2InquiryService - org.apache.juddi.registry.InquiryService + UDDI Version 2.0 Inquiry Service + org.apache.juddi.registry.service.InquiryService + - UDDI Version 2.0 Publish Service UDDIV2PublishService - org.apache.juddi.registry.PublishService + UDDI Version 2.0 Publish Service + org.apache.juddi.registry.service.PublishService + + + jUDDIAdminService /admin + UDDIV2InquiryService /inquiry + UDDIV2PublishService /publish + + index.jsp + index.html + + jUDDI DataSource jdbc/juddiDB javax.sql.DataSource Container + Shareable 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 @@

jUDDI Version Information

 jUDDI Version: <%= org.apache.juddi.util.Release.getRegistryVersion() %>
-Build Date:    <%= org.apache.juddi.util.Release.getLastModified() %>
 UDDI Version:  <%= org.apache.juddi.util.Release.getUDDIVersion() %>
- +

jUDDI Dependencies: Class Files & Libraries

 <%
+
+    //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; iLooking for: "+classArray[i]+"
");
-      
+
       String result = lookupClass(classArray[i]);
       if (result == null)
       {
         out.write("-Not Found
");
       }
       else if (result.length() == 0)
-      {        
+      {
         out.write("+Found in an unknown location
");
       }
       else
-      {        
+      {
         out.write("+Found in: "+ result +"
");
       }
-    }   
+    }
 %>
- +

jUDDI Dependencies: Resource & Properties Files

 <%
     String[] resourceArray = {
-      "log4j.xml"
+      //"log4j.xml"
     };
-    
+
     for (int i=0; iLooking for: "+resourceArray[i]+"
");
-      
+
       String result = lookupResource(resourceArray[i]);
       if (result == null)
       {
         out.write("-Not Found
");
       }
       else if (result.length() == 0)
-      {        
+      {
         out.write("+Found in an unknown location
");
       }
       else
-      {        
+      {
         out.write("+Found in: "+ result +"
");
       }
-    }   
+    }
 %>
@@ -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(""); out.print("+ Got a JNDI Context!"); out.println(""); @@ -268,10 +277,7 @@ throw new Exception("No Context"); out.print(""); - /** 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(""); } catch(Exception ex) @@ -280,12 +286,12 @@ out.print("- No '"+dsname+"' DataSource Located("+ex.getMessage()+")"); out.println(""); } - + try { conn = ds.getConnection(); if (conn == null) - throw new Exception("No Connection (conn=null)"); + throw new Exception("No Connection (conn=null)"); out.print(""); out.print("+ Got a JDBC Connection!"); @@ -294,10 +300,10 @@ catch(Exception ex) { out.print(""); - out.print("- DB connection was not aquired. ("+ex.getMessage()+")"); + out.print("- DB connection was not acquired. ("+ex.getMessage()+")"); out.println(""); } - + try { Statement stmt = conn.createStatement(); @@ -320,14 +326,14 @@ %> -
Platform: <%= getServletConfig().getServletContext().getServerInfo() %> @@ -349,6 +354,6 @@
 
- - + + \ 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 @@ geronimo-uddi-db - uddi-server + geronimo-uddi-server + uddi-jetty6 + uddi-tomcat + + + + + + org.apache.geronimo.plugins + system-database + ${version} + pom + import + + + org.apache.juddi + juddi + 2.0rc6 + + + avalon-framework + avalon-framework + + + commons-logging + commons-logging + + + javax.servlet + servlet-api + + + logkit + logkit + + + + + org.apache.juddi + juddi-ws + 2.0rc6 + + + org.apache.axis2 + axis2-kernel + + + org.apache.axis2 + axis2-saaj + + + commons-logging + commons-logging + + + xml-apis + xml-apis + + + + + + 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 @@ org.apache.geronimo.plugins - uddi-server + uddi 2.2-SNAPSHOT @@ -94,10 +94,15 @@ - juddi + org.apache.juddi juddi - + + + org.apache.juddi + juddi-ws + + org.apache.geronimo.configs jasper 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 @@ car - juddi - juddi - jar - - org.apache.geronimo.configs axis car @@ -31,4 +26,14 @@ geronimo-uddi-db jar + + org.apache.juddi + juddi + jar + + + org.apache.juddi + juddi-ws + jar + 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 @@ org.apache.geronimo.plugins - uddi-server + uddi 2.2-SNAPSHOT @@ -94,10 +94,15 @@ - juddi + org.apache.juddi juddi - + + + org.apache.juddi + juddi-ws + + org.apache.geronimo.configs jasper @@ -120,10 +125,6 @@ ${jasperDeployer} Web Services - - true - true - 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 @@ car - juddi - juddi - jar - - org.apache.geronimo.configs axis car @@ -31,4 +26,14 @@ geronimo-uddi-db jar + + org.apache.juddi + juddi + jar + + + org.apache.juddi + juddi-ws + jar +