You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2005/12/05 08:48:31 UTC
svn commit: r354009 - in /geronimo/trunk: applications/uddi-db/
applications/uddi-db/src/ applications/uddi-db/src/sql/
assemblies/j2ee-tomcat-server/src/var/catalina/
configs/j2ee-deployer/src/plan/ configs/j2ee-server/
configs/system-database/ config...
Author: djencks
Date: Sun Dec 4 23:48:13 2005
New Revision: 354009
URL: http://svn.apache.org/viewcvs?rev=354009&view=rev
Log:
Move the DirectoryInitializationGBean. Use it for the uddi db. Use a separate db for uddi. Clean up tomcat config file unpacking
Added:
geronimo/trunk/applications/uddi-db/
geronimo/trunk/applications/uddi-db/maven.xml
- copied, changed from r351907, geronimo/trunk/applications/uddi-server/maven.xml
geronimo/trunk/applications/uddi-db/project.properties
- copied, changed from r351907, geronimo/trunk/applications/uddi-server/project.properties
geronimo/trunk/applications/uddi-db/project.xml
- copied, changed from r351907, geronimo/trunk/applications/uddi-server/project.xml
geronimo/trunk/applications/uddi-db/src/
- copied from r351907, geronimo/trunk/applications/uddi-server/src/
geronimo/trunk/applications/uddi-db/src/sql/
geronimo/trunk/applications/uddi-db/src/sql/juddi.sql
geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/util/
geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/util/DirectoryInitializationGBean.java
- copied, changed from r351907, geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/util/DirectoryInitializationGBean.java
geronimo/trunk/modules/tomcat/src/resources/META-INF/geronimo-tomcat/
geronimo/trunk/modules/tomcat/src/resources/META-INF/geronimo-tomcat/var/
- copied from r351907, geronimo/trunk/modules/tomcat/src/resources/META-INF/var/
Removed:
geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/catalina/
geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/util/DirectoryInitializationGBean.java
geronimo/trunk/modules/tomcat/src/resources/META-INF/var/
Modified:
geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml
geronimo/trunk/configs/j2ee-server/project.xml
geronimo/trunk/configs/system-database/project.xml
geronimo/trunk/configs/tomcat/src/plan/plan.xml
geronimo/trunk/configs/uddi-jetty/project.properties
geronimo/trunk/configs/uddi-jetty/project.xml
geronimo/trunk/configs/uddi-jetty/src/plan/plan.xml
geronimo/trunk/configs/uddi-tomcat/project.properties
geronimo/trunk/configs/uddi-tomcat/project.xml
geronimo/trunk/configs/uddi-tomcat/src/plan/plan.xml
geronimo/trunk/modules/tomcat/maven.xml
Copied: geronimo/trunk/applications/uddi-db/maven.xml (from r351907, geronimo/trunk/applications/uddi-server/maven.xml)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/uddi-db/maven.xml?p2=geronimo/trunk/applications/uddi-db/maven.xml&p1=geronimo/trunk/applications/uddi-server/maven.xml&r1=351907&r2=354009&rev=354009&view=diff
==============================================================================
--- geronimo/trunk/applications/uddi-server/maven.xml (original)
+++ geronimo/trunk/applications/uddi-db/maven.xml Sun Dec 4 23:48:13 2005
@@ -20,11 +20,51 @@
<project
xmlns:velocity="jelly:velocity"
+ xmlns:j="jelly:core"
+ xmlns:maven="jelly:maven"
default="default"
>
<goal name="default">
- <attainGoal name="war:install"/>
+ <attainGoal name="jar:install"/>
</goal>
-</project>
\ No newline at end of file
+ <preGoal name="java:prepare-filesystem">
+ <attainGoal name="init-database"/>
+ </preGoal>
+
+ <goal name="init-database">
+ <!--path id="uddi.resources.set"
+ location="${maven.build.dir}/resources/"/>
+
+ <maven:addPath id="maven.jar.resources.set"
+ refid="uddi.resources.set"/-->
+
+
+
+ <j:set var="derby.system.home" value="${maven.build.dir}/resources/META-INF/${pom.artifactId}/var/derby"/>
+ <delete dir="${derby.system.home}"/>
+ <mkdir dir="${derby.system.home}"/>
+
+ <!-- setup the lame system properties that derby needs -->
+ <j:invokeStatic className="java.lang.System" method="setProperty">
+ <j:arg type="java.lang.String" value="derby.system.home"/>
+ <j:arg type="java.lang.String" value="${derby.system.home}"/>
+ </j:invokeStatic>
+ <j:invokeStatic className="java.lang.System" method="setProperty">
+ <j:arg type="java.lang.String" value="derby.storage.fileSyncTransactionLog"/>
+ <j:arg type="java.lang.String" value="true"/>
+ </j:invokeStatic>
+ <sql driver="org.apache.derby.jdbc.EmbeddedDriver"
+ url="jdbc:derby:UddiDatabase;create=true"
+ userid="" password=""
+ autocommit="true"
+ onerror="abort"
+ delimiter=";">
+ <fileset dir="src/sql"/>
+ <classpath>
+ <pathelement location="${maven.repo.local}/org.apache.derby/jars/derby-${derby_version}.jar"/>
+ </classpath>
+ </sql>
+ </goal>
+</project>
Copied: geronimo/trunk/applications/uddi-db/project.properties (from r351907, geronimo/trunk/applications/uddi-server/project.properties)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/uddi-db/project.properties?p2=geronimo/trunk/applications/uddi-db/project.properties&p1=geronimo/trunk/applications/uddi-server/project.properties&r1=351907&r2=354009&rev=354009&view=diff
==============================================================================
--- geronimo/trunk/applications/uddi-server/project.properties (original)
+++ geronimo/trunk/applications/uddi-db/project.properties Sun Dec 4 23:48:13 2005
@@ -19,5 +19,4 @@
## $Rev: 151530 $ $Date: 2005-02-05 15:47:24 -0800 (Sat, 05 Feb 2005) $
##
-maven.multiproject.type=war
-maven.war.src.excludes=WEB-INF/geronimo-web.xml
+maven.multiproject.type=jar
Copied: geronimo/trunk/applications/uddi-db/project.xml (from r351907, geronimo/trunk/applications/uddi-server/project.xml)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/uddi-db/project.xml?p2=geronimo/trunk/applications/uddi-db/project.xml&p1=geronimo/trunk/applications/uddi-server/project.xml&r1=351907&r2=354009&rev=354009&view=diff
==============================================================================
--- geronimo/trunk/applications/uddi-server/project.xml (original)
+++ geronimo/trunk/applications/uddi-db/project.xml Sun Dec 4 23:48:13 2005
@@ -26,9 +26,20 @@
<!-- Module Identification -->
<!-- ===================== -->
- <name>Geronimo :: UDDI-Server</name>
- <id>geronimo-uddi-server</id>
- <shortDescription>Geronimo UDDI Server</shortDescription>
- <description>Geronimo UDDI Server</description>
+ <name>Geronimo :: UDDI-Server database</name>
+ <id>geronimo-uddi-db</id>
+ <shortDescription>Geronimo UDDI Server Database</shortDescription>
+ <description>Geronimo UDDI Server Database</description>
+ <build>
+
+ <resources>
+ <resource>
+ <directory>${basedir}/target/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
</project>
Added: geronimo/trunk/applications/uddi-db/src/sql/juddi.sql
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/uddi-db/src/sql/juddi.sql?rev=354009&view=auto
==============================================================================
--- geronimo/trunk/applications/uddi-db/src/sql/juddi.sql (added)
+++ geronimo/trunk/applications/uddi-db/src/sql/juddi.sql Sun Dec 4 23:48:13 2005
@@ -0,0 +1,532 @@
+CREATE TABLE BUSINESS_ENTITY
+(
+ BUSINESS_KEY VARCHAR(41) NOT NULL,
+ AUTHORIZED_NAME VARCHAR(255) NOT NULL,
+ PUBLISHER_ID VARCHAR(20) ,
+ OPERATOR VARCHAR(255) NOT NULL,
+ LAST_UPDATE TIMESTAMP NOT NULL,
+ PRIMARY KEY (BUSINESS_KEY)
+);
+
+CREATE TABLE BUSINESS_DESCR
+(
+ BUSINESS_KEY VARCHAR(41) NOT NULL,
+ BUSINESS_DESCR_ID INT NOT NULL,
+ LANG_CODE VARCHAR(5),
+ DESCR VARCHAR(255) NOT NULL,
+ PRIMARY KEY (BUSINESS_KEY,BUSINESS_DESCR_ID),
+ FOREIGN KEY (BUSINESS_KEY)
+ REFERENCES BUSINESS_ENTITY (BUSINESS_KEY)
+);
+
+CREATE TABLE BUSINESS_CATEGORY
+(
+ BUSINESS_KEY VARCHAR(41) NOT NULL,
+ CATEGORY_ID INT NOT NULL,
+ TMODEL_KEY_REF VARCHAR(41) ,
+ KEY_NAME VARCHAR(255) ,
+ KEY_VALUE VARCHAR(255) NOT NULL,
+ PRIMARY KEY (BUSINESS_KEY,CATEGORY_ID),
+ FOREIGN KEY (BUSINESS_KEY)
+ REFERENCES BUSINESS_ENTITY (BUSINESS_KEY)
+);
+
+CREATE TABLE BUSINESS_IDENTIFIER
+(
+ BUSINESS_KEY VARCHAR(41) NOT NULL,
+ IDENTIFIER_ID INT NOT NULL,
+ TMODEL_KEY_REF VARCHAR(41) ,
+ KEY_NAME VARCHAR(255) ,
+ KEY_VALUE VARCHAR(255) NOT NULL,
+ PRIMARY KEY (BUSINESS_KEY,IDENTIFIER_ID),
+ FOREIGN KEY (BUSINESS_KEY)
+ REFERENCES BUSINESS_ENTITY (BUSINESS_KEY)
+);
+
+CREATE TABLE BUSINESS_NAME
+(
+ BUSINESS_KEY VARCHAR(41) NOT NULL,
+ BUSINESS_NAME_ID INT NOT NULL,
+ LANG_CODE VARCHAR(5),
+ NAME VARCHAR(255) NOT NULL,
+ PRIMARY KEY (BUSINESS_KEY,BUSINESS_NAME_ID),
+ FOREIGN KEY (BUSINESS_KEY)
+ REFERENCES BUSINESS_ENTITY (BUSINESS_KEY)
+);
+
+CREATE TABLE CONTACT
+(
+ BUSINESS_KEY VARCHAR(41) NOT NULL,
+ CONTACT_ID INT NOT NULL,
+ USE_TYPE VARCHAR(255) ,
+ PERSON_NAME VARCHAR(255) NOT NULL,
+ PRIMARY KEY (BUSINESS_KEY,CONTACT_ID),
+ FOREIGN KEY (BUSINESS_KEY)
+ REFERENCES BUSINESS_ENTITY (BUSINESS_KEY)
+);
+
+CREATE TABLE CONTACT_DESCR
+(
+ BUSINESS_KEY VARCHAR(41) NOT NULL,
+ CONTACT_ID INT NOT NULL,
+ CONTACT_DESCR_ID INT NOT NULL,
+ LANG_CODE VARCHAR(5),
+ DESCR VARCHAR(255) NOT NULL,
+ PRIMARY KEY (BUSINESS_KEY,CONTACT_ID,CONTACT_DESCR_ID),
+ FOREIGN KEY (BUSINESS_KEY,CONTACT_ID)
+ REFERENCES CONTACT (BUSINESS_KEY,CONTACT_ID)
+);
+
+CREATE TABLE ADDRESS
+(
+ BUSINESS_KEY VARCHAR(41) NOT NULL,
+ CONTACT_ID INT NOT NULL,
+ ADDRESS_ID INT NOT NULL,
+ USE_TYPE VARCHAR(255) ,
+ SORT_CODE VARCHAR(10) ,
+ TMODEL_KEY VARCHAR(41) ,
+ PRIMARY KEY (BUSINESS_KEY,CONTACT_ID,ADDRESS_ID),
+ FOREIGN KEY (BUSINESS_KEY,CONTACT_ID)
+ REFERENCES CONTACT (BUSINESS_KEY,CONTACT_ID)
+);
+
+CREATE TABLE ADDRESS_LINE
+(
+ BUSINESS_KEY VARCHAR(41) NOT NULL,
+ CONTACT_ID INT NOT NULL,
+ ADDRESS_ID INT NOT NULL,
+ ADDRESS_LINE_ID INT NOT NULL,
+ LINE VARCHAR(80) NOT NULL,
+ KEY_NAME VARCHAR(255) ,
+ KEY_VALUE VARCHAR(255) ,
+ PRIMARY KEY (BUSINESS_KEY,CONTACT_ID,ADDRESS_ID,ADDRESS_LINE_ID),
+ FOREIGN KEY (BUSINESS_KEY,CONTACT_ID,ADDRESS_ID)
+ REFERENCES ADDRESS (BUSINESS_KEY,CONTACT_ID,ADDRESS_ID)
+);
+
+CREATE TABLE EMAIL
+(
+ BUSINESS_KEY VARCHAR(41) NOT NULL,
+ CONTACT_ID INT NOT NULL,
+ EMAIL_ID INT NOT NULL,
+ USE_TYPE VARCHAR(255) ,
+ EMAIL_ADDRESS VARCHAR(255) NOT NULL,
+ PRIMARY KEY (BUSINESS_KEY,CONTACT_ID,EMAIL_ID),
+ FOREIGN KEY (BUSINESS_KEY,CONTACT_ID)
+ REFERENCES CONTACT (BUSINESS_KEY,CONTACT_ID)
+);
+
+CREATE TABLE PHONE
+(
+ BUSINESS_KEY VARCHAR(41) NOT NULL,
+ CONTACT_ID INT NOT NULL,
+ PHONE_ID INT NOT NULL,
+ USE_TYPE VARCHAR(255) ,
+ PHONE_NUMBER VARCHAR(50) NOT NULL,
+ PRIMARY KEY (BUSINESS_KEY,CONTACT_ID,PHONE_ID),
+ FOREIGN KEY (BUSINESS_KEY,CONTACT_ID)
+ REFERENCES CONTACT (BUSINESS_KEY,CONTACT_ID)
+);
+
+CREATE TABLE DISCOVERY_URL
+(
+ BUSINESS_KEY VARCHAR(41) NOT NULL,
+ DISCOVERY_URL_ID INT NOT NULL,
+ USE_TYPE VARCHAR(255) NOT NULL,
+ URL VARCHAR(255) NOT NULL,
+ PRIMARY KEY (BUSINESS_KEY,DISCOVERY_URL_ID),
+ FOREIGN KEY (BUSINESS_KEY)
+ REFERENCES BUSINESS_ENTITY (BUSINESS_KEY)
+);
+
+CREATE TABLE BUSINESS_SERVICE
+(
+ BUSINESS_KEY VARCHAR(41) NOT NULL,
+ SERVICE_KEY VARCHAR(41) NOT NULL,
+ LAST_UPDATE TIMESTAMP NOT NULL,
+ PRIMARY KEY (SERVICE_KEY),
+ FOREIGN KEY (BUSINESS_KEY)
+ REFERENCES BUSINESS_ENTITY (BUSINESS_KEY)
+);
+
+CREATE TABLE SERVICE_DESCR
+(
+ SERVICE_KEY VARCHAR(41) NOT NULL,
+ SERVICE_DESCR_ID INT NOT NULL,
+ LANG_CODE VARCHAR(5),
+ DESCR VARCHAR(255) NOT NULL,
+ PRIMARY KEY (SERVICE_KEY,SERVICE_DESCR_ID),
+ FOREIGN KEY (SERVICE_KEY)
+ REFERENCES BUSINESS_SERVICE (SERVICE_KEY)
+);
+
+CREATE TABLE SERVICE_CATEGORY
+(
+ SERVICE_KEY VARCHAR(41) NOT NULL,
+ CATEGORY_ID INT NOT NULL,
+ TMODEL_KEY_REF VARCHAR(41) ,
+ KEY_NAME VARCHAR(255) ,
+ KEY_VALUE VARCHAR(255) NOT NULL,
+ PRIMARY KEY (SERVICE_KEY,CATEGORY_ID),
+ FOREIGN KEY (SERVICE_KEY)
+ REFERENCES BUSINESS_SERVICE (SERVICE_KEY)
+);
+
+CREATE TABLE SERVICE_NAME
+(
+ SERVICE_KEY VARCHAR(41) NOT NULL,
+ SERVICE_NAME_ID INT NOT NULL,
+ LANG_CODE VARCHAR(5) ,
+ NAME VARCHAR(255) NOT NULL,
+ PRIMARY KEY (SERVICE_KEY,SERVICE_NAME_ID),
+ FOREIGN KEY (SERVICE_KEY)
+ REFERENCES BUSINESS_SERVICE (SERVICE_KEY)
+);
+
+CREATE TABLE BINDING_TEMPLATE
+(
+ SERVICE_KEY VARCHAR(41) NOT NULL,
+ BINDING_KEY VARCHAR(41) NOT NULL,
+ ACCESS_POINT_TYPE VARCHAR(20) ,
+ ACCESS_POINT_URL VARCHAR(255) ,
+ HOSTING_REDIRECTOR VARCHAR(255) ,
+ LAST_UPDATE TIMESTAMP NOT NULL,
+ PRIMARY KEY (BINDING_KEY),
+ FOREIGN KEY (SERVICE_KEY)
+ REFERENCES BUSINESS_SERVICE (SERVICE_KEY)
+);
+
+CREATE TABLE BINDING_CATEGORY
+(
+ BINDING_KEY VARCHAR(41) NOT NULL,
+ CATEGORY_ID INT NOT NULL,
+ TMODEL_KEY_REF VARCHAR(41),
+ KEY_NAME VARCHAR(255),
+ KEY_VALUE VARCHAR(255) NOT NULL,
+ PRIMARY KEY (BINDING_KEY,CATEGORY_ID),
+ FOREIGN KEY (BINDING_KEY)
+ REFERENCES BINDING_TEMPLATE (BINDING_KEY)
+);
+
+CREATE TABLE BINDING_DESCR
+(
+ BINDING_KEY VARCHAR(41) NOT NULL,
+ BINDING_DESCR_ID INT NOT NULL,
+ LANG_CODE VARCHAR(5),
+ DESCR VARCHAR(255) NOT NULL,
+ PRIMARY KEY (BINDING_KEY,BINDING_DESCR_ID),
+ FOREIGN KEY (BINDING_KEY)
+ REFERENCES BINDING_TEMPLATE (BINDING_KEY)
+);
+
+CREATE TABLE TMODEL_INSTANCE_INFO
+(
+ BINDING_KEY VARCHAR(41) NOT NULL,
+ TMODEL_INSTANCE_INFO_ID INT NOT NULL,
+ TMODEL_KEY VARCHAR(41) NOT NULL,
+ OVERVIEW_URL VARCHAR(255) ,
+ INSTANCE_PARMS VARCHAR(255) ,
+ PRIMARY KEY (BINDING_KEY,TMODEL_INSTANCE_INFO_ID),
+ FOREIGN KEY (BINDING_KEY)
+ REFERENCES BINDING_TEMPLATE (BINDING_KEY)
+);
+
+CREATE TABLE TMODEL_INSTANCE_INFO_DESCR
+(
+ BINDING_KEY VARCHAR(41) NOT NULL,
+ TMODEL_INSTANCE_INFO_ID INT NOT NULL,
+ TMODEL_INSTANCE_INFO_DESCR_ID INT NOT NULL,
+ LANG_CODE VARCHAR(5),
+ DESCR VARCHAR(255) NOT NULL,
+ PRIMARY KEY (BINDING_KEY,TMODEL_INSTANCE_INFO_ID,TMODEL_INSTANCE_INFO_DESCR_ID),
+ FOREIGN KEY (BINDING_KEY,TMODEL_INSTANCE_INFO_ID)
+ REFERENCES TMODEL_INSTANCE_INFO (BINDING_KEY,TMODEL_INSTANCE_INFO_ID)
+);
+
+CREATE TABLE INSTANCE_DETAILS_DESCR
+(
+ BINDING_KEY VARCHAR(41) NOT NULL,
+ TMODEL_INSTANCE_INFO_ID INT NOT NULL,
+ INSTANCE_DETAILS_DESCR_ID INT NOT NULL,
+ LANG_CODE VARCHAR(5),
+ DESCR VARCHAR(255) NOT NULL,
+ PRIMARY KEY (BINDING_KEY,TMODEL_INSTANCE_INFO_ID,INSTANCE_DETAILS_DESCR_ID),
+ FOREIGN KEY (BINDING_KEY,TMODEL_INSTANCE_INFO_ID)
+ REFERENCES TMODEL_INSTANCE_INFO (BINDING_KEY,TMODEL_INSTANCE_INFO_ID)
+);
+
+CREATE TABLE INSTANCE_DETAILS_DOC_DESCR
+(
+ BINDING_KEY VARCHAR(41) NOT NULL,
+ TMODEL_INSTANCE_INFO_ID INT NOT NULL,
+ INSTANCE_DETAILS_DOC_DESCR_ID INT NOT NULL,
+ LANG_CODE VARCHAR(5),
+ DESCR VARCHAR(255) NOT NULL,
+ PRIMARY KEY (BINDING_KEY,TMODEL_INSTANCE_INFO_ID,INSTANCE_DETAILS_DOC_DESCR_ID),
+ FOREIGN KEY (BINDING_KEY,TMODEL_INSTANCE_INFO_ID)
+ REFERENCES TMODEL_INSTANCE_INFO (BINDING_KEY,TMODEL_INSTANCE_INFO_ID)
+);
+
+CREATE TABLE TMODEL
+(
+ TMODEL_KEY VARCHAR(41) NOT NULL,
+ AUTHORIZED_NAME VARCHAR(255) NOT NULL,
+ PUBLISHER_ID VARCHAR(20) ,
+ OPERATOR VARCHAR(255) NOT NULL,
+ NAME VARCHAR(255) NOT NULL,
+ OVERVIEW_URL VARCHAR(255) ,
+ DELETED VARCHAR(5),
+ LAST_UPDATE TIMESTAMP NOT NULL,
+ PRIMARY KEY (TMODEL_KEY)
+);
+
+CREATE TABLE TMODEL_DESCR
+(
+ TMODEL_KEY VARCHAR(41) NOT NULL,
+ TMODEL_DESCR_ID INT NOT NULL,
+ LANG_CODE VARCHAR(5),
+ DESCR VARCHAR(255) NOT NULL,
+ PRIMARY KEY (TMODEL_KEY,TMODEL_DESCR_ID),
+ FOREIGN KEY (TMODEL_KEY)
+ REFERENCES TMODEL (TMODEL_KEY)
+);
+
+CREATE TABLE TMODEL_CATEGORY
+(
+ TMODEL_KEY VARCHAR(41) NOT NULL,
+ CATEGORY_ID INT NOT NULL,
+ TMODEL_KEY_REF VARCHAR(255) ,
+ KEY_NAME VARCHAR(255) ,
+ KEY_VALUE VARCHAR(255) NOT NULL,
+ PRIMARY KEY (TMODEL_KEY,CATEGORY_ID),
+ FOREIGN KEY (TMODEL_KEY)
+ REFERENCES TMODEL (TMODEL_KEY)
+);
+
+CREATE TABLE TMODEL_IDENTIFIER
+(
+ TMODEL_KEY VARCHAR(41) NOT NULL,
+ IDENTIFIER_ID INT NOT NULL,
+ TMODEL_KEY_REF VARCHAR(255) ,
+ KEY_NAME VARCHAR(255) ,
+ KEY_VALUE VARCHAR(255) NOT NULL,
+ PRIMARY KEY (TMODEL_KEY,IDENTIFIER_ID),
+ FOREIGN KEY (TMODEL_KEY)
+ REFERENCES TMODEL (TMODEL_KEY)
+);
+
+CREATE TABLE TMODEL_DOC_DESCR
+(
+ TMODEL_KEY VARCHAR(41) NOT NULL,
+ TMODEL_DOC_DESCR_ID INT NOT NULL,
+ LANG_CODE VARCHAR(5),
+ DESCR VARCHAR(255) NOT NULL,
+ PRIMARY KEY (TMODEL_KEY,TMODEL_DOC_DESCR_ID),
+ FOREIGN KEY (TMODEL_KEY)
+ REFERENCES TMODEL (TMODEL_KEY)
+);
+
+CREATE TABLE PUBLISHER_ASSERTION
+(
+ FROM_KEY VARCHAR(41) NOT NULL,
+ TO_KEY VARCHAR(41) NOT NULL,
+ TMODEL_KEY VARCHAR(41) NOT NULL,
+ KEY_NAME VARCHAR(255) NOT NULL,
+ KEY_VALUE VARCHAR(255) NOT NULL,
+ FROM_CHECK VARCHAR(5) NOT NULL,
+ TO_CHECK VARCHAR(5) NOT NULL,
+ FOREIGN KEY (FROM_KEY)
+ REFERENCES BUSINESS_ENTITY (BUSINESS_KEY),
+ FOREIGN KEY (TO_KEY)
+ REFERENCES BUSINESS_ENTITY (BUSINESS_KEY)
+);
+
+CREATE TABLE PUBLISHER
+(
+ PUBLISHER_ID VARCHAR(20) NOT NULL,
+ PUBLISHER_NAME VARCHAR(255) NOT NULL,
+ EMAIL_ADDRESS VARCHAR(255),
+ IS_ADMIN VARCHAR(5),
+ IS_ENABLED VARCHAR(5),
+ PRIMARY KEY (PUBLISHER_ID)
+);
+
+CREATE TABLE AUTH_TOKEN
+(
+ AUTH_TOKEN VARCHAR(51) NOT NULL,
+ PUBLISHER_ID VARCHAR(20) NOT NULL,
+ PUBLISHER_NAME VARCHAR(255) NOT NULL,
+ CREATED TIMESTAMP NOT NULL,
+ LAST_USED TIMESTAMP NOT NULL,
+ NUMBER_OF_USES INT NOT NULL,
+ TOKEN_STATE INT NOT NULL,
+ PRIMARY KEY (AUTH_TOKEN)
+);
+
+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');
+
+INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+VALUES ('uuid:DB77450D-9FA8-45D4-A7BC-04411D14E384','Administrator','jUDDI.org','unspsc-org:unspsc:3-1','http://www.uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#UNSPSC31',CURRENT TIMESTAMP);
+
+INSERT INTO TMODEL_DESCR (TMODEL_KEY,TMODEL_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:DB77450D-9FA8-45D4-A7BC-04411D14E384',0,'en','Product Taxonomy: UNSPSC (Version 3.1)');
+
+INSERT INTO TMODEL_DOC_DESCR (TMODEL_KEY,TMODEL_DOC_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:DB77450D-9FA8-45D4-A7BC-04411D14E384',0,'en','This tModel defines the UNSPSC product taxonomy.');
+
+INSERT INTO TMODEL_CATEGORY (TMODEL_KEY,CATEGORY_ID,TMODEL_KEY_REF,KEY_NAME,KEY_VALUE)
+VALUES ('uuid:DB77450D-9FA8-45D4-A7BC-04411D14E384',0,'uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4','types','categorization');
+
+INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+VALUES ('uuid:CD153257-086A-4237-B336-6BDCBDCC6634','Administrator','jUDDI.org','unspsc-org:unspsc','http://www.uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#UNSPSC',CURRENT TIMESTAMP);
+
+INSERT INTO TMODEL_DESCR (TMODEL_KEY,TMODEL_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:CD153257-086A-4237-B336-6BDCBDCC6634',0,'en','Product Taxonomy: UNSPSC (Version 7.3)');
+
+INSERT INTO TMODEL_DOC_DESCR (TMODEL_KEY,TMODEL_DOC_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:CD153257-086A-4237-B336-6BDCBDCC6634',0,'en','This tModel defines Version 7.3 of the UNSPSC product taxonomy.');
+
+INSERT INTO TMODEL_CATEGORY (TMODEL_KEY,CATEGORY_ID,TMODEL_KEY_REF,KEY_NAME,KEY_VALUE)
+VALUES ('uuid:CD153257-086A-4237-B336-6BDCBDCC6634',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:CD153257-086A-4237-B336-6BDCBDCC6634',1,'uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4','types','Checked');
+
+INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+VALUES ('uuid:C0B9FE13-179F-413D-8A5B-5004DB8E5BB2','Administrator','jUDDI.org','ntis-gov:naics:1997','http://www.uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#NAICS',CURRENT TIMESTAMP);
+
+INSERT INTO TMODEL_DESCR (TMODEL_KEY,TMODEL_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:C0B9FE13-179F-413D-8A5B-5004DB8E5BB2',0,'en','Business Taxonomy: NAICS(1997 Release)');
+
+INSERT INTO TMODEL_DOC_DESCR (TMODEL_KEY,TMODEL_DOC_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:C0B9FE13-179F-413D-8A5B-5004DB8E5BB2',0,'en','This tModel defines the NAICS industry taxonomy.');
+
+INSERT INTO TMODEL_CATEGORY (TMODEL_KEY,CATEGORY_ID,TMODEL_KEY_REF,KEY_NAME,KEY_VALUE)
+VALUES ('uuid:C0B9FE13-179F-413D-8A5B-5004DB8E5BB2',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:C0B9FE13-179F-413D-8A5B-5004DB8E5BB2',1,'uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4','types','checked');
+
+INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+VALUES ('uuid:4E49A8D6-D5A2-4FC2-93A0-0411D8D19E88','Administrator','jUDDI.org','uddi-org:iso-ch:3166-1999','http://www.uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#ISO3166',CURRENT TIMESTAMP);
+
+INSERT INTO TMODEL_DESCR (TMODEL_KEY,TMODEL_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:4E49A8D6-D5A2-4FC2-93A0-0411D8D19E88',0,'en','ISO 3166-1:1997 and 3166-2:1998. Codes for names of countries and their subdivisions. Part 1: Country codes. Part 2:Country subdivision codes. Update newsletters include ISO 3166-1 V-1 (1998-02-05), V-2 (1999-10-01), ISO 3166-2 I-1 (1998)');
+
+INSERT INTO TMODEL_DOC_DESCR (TMODEL_KEY,TMODEL_DOC_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:4E49A8D6-D5A2-4FC2-93A0-0411D8D19E88',0,'en','Taxonomy used to categorize entries by geographic location.');
+
+INSERT INTO TMODEL_CATEGORY (TMODEL_KEY,CATEGORY_ID,TMODEL_KEY_REF,KEY_NAME,KEY_VALUE)
+VALUES ('uuid:4E49A8D6-D5A2-4FC2-93A0-0411D8D19E88',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:4E49A8D6-D5A2-4FC2-93A0-0411D8D19E88',1,'uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4','types','checked');
+
+INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+VALUES ('uuid:A035A07C-F362-44DD-8F95-E2B134BF43B4','Administrator','jUDDI.org','uddi-org:general_keywords','http://www.uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#GenKW',CURRENT TIMESTAMP);
+
+INSERT INTO TMODEL_DESCR (TMODEL_KEY,TMODEL_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:A035A07C-F362-44DD-8F95-E2B134BF43B4',0,'en','Special taxonomy consisting of namespace identifiers and the keywords associated with the namespaces');
+
+INSERT INTO TMODEL_DOC_DESCR (TMODEL_KEY,TMODEL_DOC_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:A035A07C-F362-44DD-8F95-E2B134BF43B4',0,'en','This tModel defines an unidentified taxonomy.');
+
+INSERT INTO TMODEL_CATEGORY (TMODEL_KEY,CATEGORY_ID,TMODEL_KEY_REF,KEY_NAME,KEY_VALUE)
+VALUES ('uuid:A035A07C-F362-44DD-8F95-E2B134BF43B4',0,'uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4','types','categorization');
+
+INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+VALUES ('uuid:4064C064-6D14-4F35-8953-9652106476A9','Administrator','jUDDI.org','uddi-org:owningBusiness','http://www.uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#owningBusiness',CURRENT TIMESTAMP);
+
+INSERT INTO TMODEL_DESCR (TMODEL_KEY,TMODEL_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:4064C064-6D14-4F35-8953-9652106476A9',0,'en','A pointer to a businessEntity that owns the tagged data.');
+
+INSERT INTO TMODEL_DOC_DESCR (TMODEL_KEY,TMODEL_DOC_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:4064C064-6D14-4F35-8953-9652106476A9',0,'en','This tModel indicates the businessEntity that published or owns the tagged tModel. Used with tModels to establish an "owned" relationship with a registered businessEntity.');
+
+INSERT INTO TMODEL_CATEGORY (TMODEL_KEY,CATEGORY_ID,TMODEL_KEY_REF,KEY_NAME,KEY_VALUE)
+VALUES ('uuid:4064C064-6D14-4F35-8953-9652106476A9',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:4064C064-6D14-4F35-8953-9652106476A9',1,'uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4','types','checked');
+
+INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+VALUES ('uuid:807A2C6A-EE22-470D-ADC7-E0424A337C03','Administrator','jUDDI.org','uddi-org:relationships','http://www.uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#Relationships',CURRENT TIMESTAMP);
+
+INSERT INTO TMODEL_DESCR (TMODEL_KEY,TMODEL_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:807A2C6A-EE22-470D-ADC7-E0424A337C03',0,'en','Starter set classifications of businessEntity relationships');
+
+INSERT INTO TMODEL_DOC_DESCR (TMODEL_KEY,TMODEL_DOC_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:807A2C6A-EE22-470D-ADC7-E0424A337C03',0,'en','This tModel is used to describe business relationships. Used in the publisher assertion messages.');
+
+INSERT INTO TMODEL_CATEGORY (TMODEL_KEY,CATEGORY_ID,TMODEL_KEY_REF,KEY_NAME,KEY_VALUE)
+VALUES ('uuid:807A2C6A-EE22-470D-ADC7-E0424A337C03',0,'uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4','types','relationship');
+
+INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+VALUES ('uuid:327A56F0-3299-4461-BC23-5CD513E95C55','Administrator','jUDDI.org','uddi-org:operators','http://www.uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#Operators',CURRENT TIMESTAMP);
+
+INSERT INTO TMODEL_DESCR (TMODEL_KEY,TMODEL_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:327A56F0-3299-4461-BC23-5CD513E95C55',0,'en','Taxonomy for categorizing the businessEntity of an operator of a registry.');
+
+INSERT INTO TMODEL_DOC_DESCR (TMODEL_KEY,TMODEL_DOC_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:327A56F0-3299-4461-BC23-5CD513E95C55',0,'en','This checked value set is used to identify UDDI operators.');
+
+INSERT INTO TMODEL_CATEGORY (TMODEL_KEY,CATEGORY_ID,TMODEL_KEY_REF,KEY_NAME,KEY_VALUE)
+VALUES ('uuid:327A56F0-3299-4461-BC23-5CD513E95C55',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:327A56F0-3299-4461-BC23-5CD513E95C55',1,'uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4','types','checked');
+
+INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+VALUES ('uuid:E59AE320-77A5-11D5-B898-0004AC49CC1E','Administrator','jUDDI.org','uddi-org:isReplacedBy','http://www.uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#IsReplacedBy',CURRENT TIMESTAMP);
+
+INSERT INTO TMODEL_DESCR (TMODEL_KEY,TMODEL_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:E59AE320-77A5-11D5-B898-0004AC49CC1E',0,'en','An identifier system used to point (using UDDI keys) to the tModel (or businessEntity) that is the logical replacement for the one in which isReplacedBy is used');
+
+INSERT INTO TMODEL_DOC_DESCR (TMODEL_KEY,TMODEL_DOC_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:E59AE320-77A5-11D5-B898-0004AC49CC1E',0,'en','This is a checked value set.');
+
+INSERT INTO TMODEL_CATEGORY (TMODEL_KEY,CATEGORY_ID,TMODEL_KEY_REF,KEY_NAME,KEY_VALUE)
+VALUES ('uuid:E59AE320-77A5-11D5-B898-0004AC49CC1E',0,'uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4','types','identifier');
+
+INSERT INTO TMODEL_CATEGORY (TMODEL_KEY,CATEGORY_ID,TMODEL_KEY_REF,KEY_NAME,KEY_VALUE)
+VALUES ('uuid:E59AE320-77A5-11D5-B898-0004AC49CC1E',1,'uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4','types','checked');
+
+INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+VALUES ('uuid:8609C81E-EE1F-4D5A-B202-3EB13AD01823','Administrator','jUDDI.org','dnb-com:D-U-N-S','http://www.uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#D-U-N-S',CURRENT TIMESTAMP);
+
+INSERT INTO TMODEL_DESCR (TMODEL_KEY,TMODEL_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:8609C81E-EE1F-4D5A-B202-3EB13AD01823',0,'en','Dun&Bradstreet D-U-N-S� Number');
+
+INSERT INTO TMODEL_DOC_DESCR (TMODEL_KEY,TMODEL_DOC_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:8609C81E-EE1F-4D5A-B202-3EB13AD01823',0,'en','This tModel is used for the Dun&Bradstreet D-U-N-S� Number identifier.');
+
+INSERT INTO TMODEL_CATEGORY (TMODEL_KEY,CATEGORY_ID,TMODEL_KEY_REF,KEY_NAME,KEY_VALUE)
+VALUES ('uuid:8609C81E-EE1F-4D5A-B202-3EB13AD01823',0,'uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4','types','identifier');
+
+INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
+VALUES ('uuid:B1B1BAF5-2329-43E6-AE13-BA8E97195039','Administrator','jUDDI.org','thomasregister-com:supplierID','http://www.uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#Thomas',CURRENT TIMESTAMP);
+
+INSERT INTO TMODEL_DESCR (TMODEL_KEY,TMODEL_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:B1B1BAF5-2329-43E6-AE13-BA8E97195039',0,'en','Thomas Registry Suppliers');
+
+INSERT INTO TMODEL_DOC_DESCR (TMODEL_KEY,TMODEL_DOC_DESCR_ID,LANG_CODE,DESCR)
+VALUES ('uuid:B1B1BAF5-2329-43E6-AE13-BA8E97195039',0,'en','This tModel is used for the Thomas Register supplier identifier codes.');
+
+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');
Modified: geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml?rev=354009&r1=354008&r2=354009&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml Sun Dec 4 23:48:13 2005
@@ -31,6 +31,7 @@
<attribute name="connectionTrackerObjectName">*:name=ConnectionTracker,*</attribute>
<attribute name="transactionalTimerObjectName">geronimo.server:name=TransactionalThreadPooledTimer,*</attribute>
<attribute name="nonTransactionalTimerObjectName">geronimo.server:name=NonTransactionalThreadPooledTimer,*</attribute>
+ <attribute name="corbaGBeanObjectName">geronimo.server:J2EEApplication=null,J2EEModule=geronimo/server-corba/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=CORBABean,name=Server</attribute>
<reference name="Repository">
<gbean-name>*:name=Repository,*</gbean-name>
</reference>
@@ -98,6 +99,7 @@
<attribute name="defaultServerParentId">${pom.groupId}/j2ee-server/${pom.currentVersion}/car</attribute>
<attribute name="transactionContextManagerObjectName">geronimo.client:name=TransactionContextManager,*</attribute>
<attribute name="connectionTrackerObjectName">geronimo.client:name=ConnectionTracker,*</attribute>
+ <attribute name="corbaGBeanObjectName">geronimo.client:J2EEApplication=null,J2EEModule=geronimo/client-corba/${pom.currentVersion}/car,J2EEServer=client,j2eeType=CORBABean,name=Server</attribute>
<reference name="EJBReferenceBuilder">
<name>ClientEJBReferenceBuilder</name>
</reference>
Modified: geronimo/trunk/configs/j2ee-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-server/project.xml?rev=354009&r1=354008&r2=354009&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-server/project.xml (original)
+++ geronimo/trunk/configs/j2ee-server/project.xml Sun Dec 4 23:48:13 2005
@@ -196,6 +196,8 @@
</properties>
</dependency>
+
+ <!-- TODO why are these here rather than in system-database??? -->
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-derby</artifactId>
Modified: geronimo/trunk/configs/system-database/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/system-database/project.xml?rev=354009&r1=354008&r2=354009&view=diff
==============================================================================
--- geronimo/trunk/configs/system-database/project.xml (original)
+++ geronimo/trunk/configs/system-database/project.xml Sun Dec 4 23:48:13 2005
@@ -55,6 +55,34 @@
<geronimo.import>true</geronimo.import>
</properties>
</dependency>
+
+
+ <!--TODO these are also in j2ee-server config. why ?? -->
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-derby</artifactId>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>${derby_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbynet</artifactId>
+ <version>${derby_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-system</artifactId>
Modified: geronimo/trunk/configs/tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/tomcat/src/plan/plan.xml?rev=354009&r1=354008&r2=354009&view=diff
==============================================================================
--- geronimo/trunk/configs/tomcat/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/tomcat/src/plan/plan.xml Sun Dec 4 23:48:13 2005
@@ -26,8 +26,9 @@
configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
>
- <gbean name="TomcatResources" class="org.apache.geronimo.tomcat.util.DirectoryInitializationGBean">
+ <gbean name="TomcatResources" class="org.apache.geronimo.system.util.DirectoryInitializationGBean">
<!-- copies tomcat initialization files into specified location -->
+ <attribute name="prefix">META-INF/geronimo-tomcat</attribute>
<attribute name="path">var/catalina</attribute>
<reference name="ServerInfo">
<module>geronimo/j2ee-system/${pom.currentVersion}/car</module>
Modified: geronimo/trunk/configs/uddi-jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/uddi-jetty/project.properties?rev=354009&r1=354008&r2=354009&view=diff
==============================================================================
--- geronimo/trunk/configs/uddi-jetty/project.properties (original)
+++ geronimo/trunk/configs/uddi-jetty/project.properties Sun Dec 4 23:48:13 2005
@@ -23,5 +23,5 @@
geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/jetty-deployer/${geronimo_version}/car
-geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/wars/geronimo-uddi-server-${geronimo_version}.war
+#geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/wars/geronimo-uddi-server-${geronimo_version}.war
Modified: geronimo/trunk/configs/uddi-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/uddi-jetty/project.xml?rev=354009&r1=354008&r2=354009&view=diff
==============================================================================
--- geronimo/trunk/configs/uddi-jetty/project.xml (original)
+++ geronimo/trunk/configs/uddi-jetty/project.xml Sun Dec 4 23:48:13 2005
@@ -70,6 +70,14 @@
<geronimo.dependency>true</geronimo.dependency>
</properties>
</dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-uddi-db</artifactId>
+ <version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
<!-- should be transitive deps -->
<dependency>
Modified: geronimo/trunk/configs/uddi-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/uddi-jetty/src/plan/plan.xml?rev=354009&r1=354008&r2=354009&view=diff
==============================================================================
--- geronimo/trunk/configs/uddi-jetty/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/uddi-jetty/src/plan/plan.xml Sun Dec 4 23:48:13 2005
@@ -17,16 +17,70 @@
-->
<!-- $Rev: 160900 $ $Date: 2005-04-11 08:09:38 -0700 (Mon, 11 Apr 2005) $ -->
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
+ configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car">
-<web-app
- xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0"
- configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
- >
-
- <context-root>/juddi</context-root>
- <context-priority-classloader>false</context-priority-classloader>
- <resource-ref>
- <ref-name>jdbc/juddiDB</ref-name>
- <resource-link>SystemDatasource</resource-link>
- </resource-ref>
-</web-app>
+ <ext-module>
+ <web>uddi-jetty</web>
+ <external-path>geronimo/geronimo-uddi-server/${pom.currentVersion}/war</external-path>
+ <web-app
+ xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0"
+ configId="juddi-server"
+ >
+
+ <context-root>/juddi</context-root>
+ <context-priority-classloader>false</context-priority-classloader>
+<!--
+ <resource-ref>
+ <ref-name>jdbc/juddiDB</ref-name>
+ <resource-link>SystemDatasource</resource-link>
+ </resource-ref>
+-->
+ <gbean name="UDDIResources" class="org.apache.geronimo.system.util.DirectoryInitializationGBean">
+ <!-- copies uddi derby db files into specified location -->
+ <attribute name="prefix">META-INF/geronimo-uddi-db</attribute>
+ <attribute name="path">var/derby</attribute>
+ <reference name="ServerInfo">
+ <application>null</application>
+ <moduleType>J2EEModule</moduleType>
+ <module>geronimo/j2ee-system/${pom.currentVersion}/car</module>
+ <name>ServerInfo</name>
+ </reference>
+ </gbean>
+ </web-app>
+ </ext-module>
+
+ <ext-module>
+ <connector>uddi-db</connector>
+ <external-path>tranql/tranql-connector-derby-embed-local/${tranql_vendors_version}/rar</external-path>
+ <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0"
+ configId="uddi-db"
+ >
+ <resourceadapter>
+ <outbound-resourceadapter>
+ <connection-definition>
+ <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
+ <connectiondefinition-instance>
+ <name>jdbc/juddiDB</name>
+ <config-property-setting name="UserName"></config-property-setting>
+ <config-property-setting name="Password"></config-property-setting>
+ <config-property-setting name="DatabaseName">UddiDatabase</config-property-setting>
+ <config-property-setting name="CreateDatabase">false</config-property-setting>
+ <connectionmanager>
+ <local-transaction/>
+ <single-pool>
+ <max-size>100</max-size>
+ <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+ <match-one/>
+ </single-pool>
+ </connectionmanager>
+ </connectiondefinition-instance>
+ </connection-definition>
+ </outbound-resourceadapter>
+ </resourceadapter>
+
+
+ </connector>
+ </ext-module>
+
+</application>
Modified: geronimo/trunk/configs/uddi-tomcat/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/uddi-tomcat/project.properties?rev=354009&r1=354008&r2=354009&view=diff
==============================================================================
--- geronimo/trunk/configs/uddi-tomcat/project.properties (original)
+++ geronimo/trunk/configs/uddi-tomcat/project.properties Sun Dec 4 23:48:13 2005
@@ -22,6 +22,3 @@
maven.multiproject.type=car
geronimo.packaging.deploymentConfig=geronimo/geronimo-gbean-deployer/${geronimo_version}/car,geronimo/j2ee-deployer/${geronimo_version}/car,geronimo/tomcat-deployer/${geronimo_version}/car
-
-geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/wars/geronimo-uddi-server-${geronimo_version}.war
-
Modified: geronimo/trunk/configs/uddi-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/uddi-tomcat/project.xml?rev=354009&r1=354008&r2=354009&view=diff
==============================================================================
--- geronimo/trunk/configs/uddi-tomcat/project.xml (original)
+++ geronimo/trunk/configs/uddi-tomcat/project.xml Sun Dec 4 23:48:13 2005
@@ -51,7 +51,7 @@
<type>car</type>
</dependency>
- <!-- parent config -->
+ <!-- parent config should be j2ee-server?-->
<dependency>
<groupId>geronimo</groupId>
<artifactId>system-database</artifactId>
@@ -70,7 +70,31 @@
<geronimo.dependency>true</geronimo.dependency>
</properties>
</dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-uddi-db</artifactId>
+ <version>${geronimo_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+ <!-- needed??? -->
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>${derby_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>tranql</groupId>
+ <artifactId>tranql-connector-derby-embed-local</artifactId>
+ <version>${tranql_vendors_version}</version>
+ <type>rar</type>
+ </dependency>
<!-- should be transitive deps -->
<dependency>
<groupId>geronimo</groupId>
Modified: geronimo/trunk/configs/uddi-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/uddi-tomcat/src/plan/plan.xml?rev=354009&r1=354008&r2=354009&view=diff
==============================================================================
--- geronimo/trunk/configs/uddi-tomcat/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/uddi-tomcat/src/plan/plan.xml Sun Dec 4 23:48:13 2005
@@ -17,16 +17,64 @@
-->
<!-- $Rev: 47568 $ $Date: 2004-09-30 01:21:54 -0700 (Thu, 30 Sep 2004) $ -->
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
+ configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car">
-<web-app
- xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0"
- configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
- >
-
- <context-root>/juddi</context-root>
- <context-priority-classloader>false</context-priority-classloader>
- <resource-ref>
- <ref-name>jdbc/juddiDB</ref-name>
- <resource-link>SystemDatasource</resource-link>
- </resource-ref>
-</web-app>
+ <ext-module>
+ <web>uddi-jetty</web>
+ <external-path>geronimo/geronimo-uddi-server/${pom.currentVersion}/war</external-path>
+ <web-app
+ xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0"
+ configId="juddi-server"
+ >
+
+ <context-root>/juddi</context-root>
+ <context-priority-classloader>false</context-priority-classloader>
+ <gbean name="UDDIResources" class="org.apache.geronimo.system.util.DirectoryInitializationGBean">
+ <!-- copies uddi derby db files into specified location -->
+ <attribute name="prefix">META-INF/geronimo-uddi-db</attribute>
+ <attribute name="path">var/derby</attribute>
+ <reference name="ServerInfo">
+ <application>null</application>
+ <moduleType>J2EEModule</moduleType>
+ <module>geronimo/j2ee-system/${pom.currentVersion}/car</module>
+ <name>ServerInfo</name>
+ </reference>
+ </gbean>
+ </web-app>
+ </ext-module>
+
+ <ext-module>
+ <connector>uddi-db</connector>
+ <external-path>tranql/tranql-connector-derby-embed-local/${tranql_vendors_version}/rar</external-path>
+ <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0"
+ configId="uddi-db"
+ >
+ <resourceadapter>
+ <outbound-resourceadapter>
+ <connection-definition>
+ <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
+ <connectiondefinition-instance>
+ <name>jdbc/juddiDB</name>
+ <config-property-setting name="UserName"></config-property-setting>
+ <config-property-setting name="Password"></config-property-setting>
+ <config-property-setting name="DatabaseName">UddiDatabase</config-property-setting>
+ <config-property-setting name="CreateDatabase">false</config-property-setting>
+ <connectionmanager>
+ <local-transaction/>
+ <single-pool>
+ <max-size>100</max-size>
+ <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+ <match-one/>
+ </single-pool>
+ </connectionmanager>
+ </connectiondefinition-instance>
+ </connection-definition>
+ </outbound-resourceadapter>
+ </resourceadapter>
+
+
+ </connector>
+ </ext-module>
+
+</application>
Copied: geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/util/DirectoryInitializationGBean.java (from r351907, geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/util/DirectoryInitializationGBean.java)
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/util/DirectoryInitializationGBean.java?p2=geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/util/DirectoryInitializationGBean.java&p1=geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/util/DirectoryInitializationGBean.java&r1=351907&r2=354009&rev=354009&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/util/DirectoryInitializationGBean.java (original)
+++ geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/util/DirectoryInitializationGBean.java Sun Dec 4 23:48:13 2005
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.geronimo.tomcat.util;
+package org.apache.geronimo.system.util;
import java.io.File;
import java.io.FileOutputStream;
@@ -30,7 +30,6 @@
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.system.serverinfo.ServerInfo;
/**
@@ -39,13 +38,17 @@
public class DirectoryInitializationGBean {
- public DirectoryInitializationGBean(String path, ServerInfo serverInfo, ClassLoader classLoader) throws IOException {
+ public DirectoryInitializationGBean(String prefix, String path, ServerInfo serverInfo, ClassLoader classLoader) throws IOException {
- if (!path.equals("/")) {
+ if (!prefix.endsWith("/")) {
+ prefix = prefix + "/";
+ }
+ int prefixLength = prefix.length();
+ if (!path.endsWith("/")) {
path = path + "/";
}
- URL sourceURL = classLoader.getResource("META-INF/" + path);
+ URL sourceURL = classLoader.getResource(prefix + path);
URLConnection conn = sourceURL.openConnection();
JarURLConnection jarConn = (JarURLConnection) conn;
JarFile jarFile = jarConn.getJarFile();
@@ -55,7 +58,7 @@
JarEntry entry = (JarEntry) entries.nextElement();
if (entry.getName().startsWith(sourceEntry.getName())) {
String entryName = entry.getName();
- String entryPath = entryName.substring("META-INF/".length());
+ String entryPath = entryName.substring(prefixLength);
File targetPath = serverInfo.resolve(entryPath);
if (!targetPath.exists()) {
if (entry.isDirectory()) {
@@ -86,12 +89,13 @@
public static final GBeanInfo GBEAN_INFO;
static {
- GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(DirectoryInitializationGBean.class, NameFactory.GERONIMO_SERVICE);
+ GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(DirectoryInitializationGBean.class, "GBean");
+ infoBuilder.addAttribute("prefix", String.class, true);
infoBuilder.addAttribute("path", String.class, true);
- infoBuilder.addReference("ServerInfo", ServerInfo.class, NameFactory.GERONIMO_SERVICE);
+ infoBuilder.addReference("ServerInfo", ServerInfo.class, "GBean");
infoBuilder.addAttribute("classLoader", ClassLoader.class, false);
- infoBuilder.setConstructor(new String[]{"path", "ServerInfo", "classLoader"});
+ infoBuilder.setConstructor(new String[]{"prefix", "path", "ServerInfo", "classLoader"});
GBEAN_INFO = infoBuilder.getBeanInfo();
}
Modified: geronimo/trunk/modules/tomcat/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/maven.xml?rev=354009&r1=354008&r2=354009&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/maven.xml (original)
+++ geronimo/trunk/modules/tomcat/maven.xml Sun Dec 4 23:48:13 2005
@@ -54,7 +54,7 @@
<mkdir dir="${maven.build.dir}/var/catalina"/>
<mkdir dir="${maven.build.dir}/var/catalina/webapps"/>
<mkdir dir="${maven.build.dir}/var/catalina/conf"/>
- <copy todir="${maven.build.dir}/var/catalina/conf" file="src/resources/META-INF/var/catalina/conf/web.xml"/>
+ <copy todir="${maven.build.dir}/var/catalina/conf" file="src/resources/META-INF/geronimo-tomcat/var/catalina/conf/web.xml"/>
<copy todir="${maven.build.dir}/var/catalina/webapps">
<fileset dir="src/test-resources/deployables">
<include name="war1/**"/>