geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jboy...@apache.org
Subject svn commit: r209551 - in /geronimo/trunk: applications/uddi-server/ applications/uddi-server/src/ applications/uddi-server/src/webapp/ applications/uddi-server/src/webapp/WEB-INF/ modules/assembly/ modules/assembly/src/sql/ modules/assembly/src/var/con...
Date Thu, 07 Jul 2005 00:46:33 GMT
Author: jboynes
Date: Wed Jul  6 17:46:31 2005
New Revision: 209551

URL: http://svn.apache.org/viewcvs?rev=209551&view=rev
Log:
add jUDDI server into default assembly

Added:
    geronimo/trunk/applications/uddi-server/   (with props)
    geronimo/trunk/applications/uddi-server/LICENSE.txt
      - copied unchanged from r209514, geronimo/trunk/applications/demo/LICENSE.txt
    geronimo/trunk/applications/uddi-server/NOTICE
      - copied unchanged from r209514, geronimo/trunk/applications/demo/NOTICE
    geronimo/trunk/applications/uddi-server/maven.xml   (with props)
    geronimo/trunk/applications/uddi-server/project.properties   (with props)
    geronimo/trunk/applications/uddi-server/project.xml   (with props)
    geronimo/trunk/applications/uddi-server/src/
    geronimo/trunk/applications/uddi-server/src/webapp/
    geronimo/trunk/applications/uddi-server/src/webapp/WEB-INF/
    geronimo/trunk/applications/uddi-server/src/webapp/WEB-INF/geronimo-web.xml   (with props)
    geronimo/trunk/applications/uddi-server/src/webapp/WEB-INF/juddi.properties   (with props)
    geronimo/trunk/applications/uddi-server/src/webapp/WEB-INF/web.xml   (with props)
    geronimo/trunk/applications/uddi-server/src/webapp/happyjuddi.jsp
    geronimo/trunk/modules/assembly/src/sql/
    geronimo/trunk/modules/assembly/src/sql/juddi.sql
Modified:
    geronimo/trunk/modules/assembly/maven.xml
    geronimo/trunk/modules/assembly/project.properties
    geronimo/trunk/modules/assembly/project.xml
    geronimo/trunk/modules/assembly/src/var/config/config.list

Propchange: geronimo/trunk/applications/uddi-server/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jul  6 17:46:31 2005
@@ -0,0 +1,7 @@
+*.iml
+.project
+.classpath
+maven.log
+velocity.log
+junit*.properties
+target

Added: geronimo/trunk/applications/uddi-server/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/uddi-server/maven.xml?rev=209551&view=auto
==============================================================================
--- geronimo/trunk/applications/uddi-server/maven.xml (added)
+++ geronimo/trunk/applications/uddi-server/maven.xml Wed Jul  6 17:46:31 2005
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    Copyright 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.
+-->
+
+<!-- $Rev: 160900 $ $Date: 2005-04-11 08:09:38 -0700 (Mon, 11 Apr 2005) $ -->
+
+<project
+    xmlns:velocity="jelly:velocity"
+    default="default"
+    >
+
+    <goal name="default">
+        <attainGoal name="war:install"/>
+    </goal>
+    <preGoal name="war:war">
+        <velocity:merge basedir="${maven.war.src}/WEB-INF" template="geronimo-web.xml" name="${maven.war.webapp.dir}/WEB-INF/geronimo-web.xml"/>
+    </preGoal>
+</project>
\ No newline at end of file

Propchange: geronimo/trunk/applications/uddi-server/maven.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/applications/uddi-server/maven.xml
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Added: geronimo/trunk/applications/uddi-server/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/uddi-server/project.properties?rev=209551&view=auto
==============================================================================
--- geronimo/trunk/applications/uddi-server/project.properties (added)
+++ geronimo/trunk/applications/uddi-server/project.properties Wed Jul  6 17:46:31 2005
@@ -0,0 +1,23 @@
+##
+##
+##   Copyright 2005 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.
+##
+
+##
+## $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

Propchange: geronimo/trunk/applications/uddi-server/project.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/applications/uddi-server/project.properties
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Added: geronimo/trunk/applications/uddi-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/uddi-server/project.xml?rev=209551&view=auto
==============================================================================
--- geronimo/trunk/applications/uddi-server/project.xml (added)
+++ geronimo/trunk/applications/uddi-server/project.xml Wed Jul  6 17:46:31 2005
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    Copyright 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.
+-->
+
+<!-- $Rev: 160900 $ $Date: 2005-04-11 08:09:38 -0700 (Mon, 11 Apr 2005) $ -->
+
+<project>
+    <pomVersion>3</pomVersion>
+    <extend>../../etc/project.xml</extend>
+
+    <!-- ===================== -->
+    <!-- Module Identification -->
+    <!-- ===================== -->
+
+    <name>Geronimo :: UDDI-Server</name>
+    <id>geronimo-uddi-server</id>
+    <shortDescription>Geronimo UDDI Server</shortDescription>
+    <description>Geronimo UDDI Server</description>
+
+</project>

Propchange: geronimo/trunk/applications/uddi-server/project.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/applications/uddi-server/project.xml
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Added: geronimo/trunk/applications/uddi-server/src/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/uddi-server/src/webapp/WEB-INF/geronimo-web.xml?rev=209551&view=auto
==============================================================================
--- geronimo/trunk/applications/uddi-server/src/webapp/WEB-INF/geronimo-web.xml (added)
+++ geronimo/trunk/applications/uddi-server/src/webapp/WEB-INF/geronimo-web.xml Wed Jul  6 17:46:31 2005
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 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.
+-->
+
+<!-- $Rev: 160900 $ $Date: 2005-04-11 08:09:38 -0700 (Mon, 11 Apr 2005) $ -->
+
+<web-app
+    xmlns="http://geronimo.apache.org/xml/ns/web"
+    configId="org/apache/geronimo/juddiServer/${pom.currentVersion}"
+    parentId="org/apache/geronimo/SystemDatabase"
+    >
+
+    <dependency>
+        <uri>juddi/jars/juddi-${juddi_version}.jar</uri>
+    </dependency>
+
+    <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>

Propchange: geronimo/trunk/applications/uddi-server/src/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/applications/uddi-server/src/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Added: geronimo/trunk/applications/uddi-server/src/webapp/WEB-INF/juddi.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/uddi-server/src/webapp/WEB-INF/juddi.properties?rev=209551&view=auto
==============================================================================
--- geronimo/trunk/applications/uddi-server/src/webapp/WEB-INF/juddi.properties (added)
+++ geronimo/trunk/applications/uddi-server/src/webapp/WEB-INF/juddi.properties Wed Jul  6 17:46:31 2005
@@ -0,0 +1,73 @@
+##
+##
+##   Copyright 2005 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.
+##
+
+##
+## $Rev: 151530 $ $Date: 2005-02-05 15:47:24 -0800 (Sat, 05 Feb 2005) $
+##
+
+# jUDDI Registry Properties (used by RegistryServer)
+# see http://www.juddi.org for more information
+
+# The UDDI Operator Name
+juddi.operatorName = jUDDI.org
+
+# The i18n locale default codes
+juddi.i18n.languageCode = en
+juddi.i18n.countryCode = US
+
+# The UDDI DiscoveryURL Prefix
+juddi.discoveryURL = http://localhost:8080/juddi/uddiget.jsp?
+
+# The UDDI Operator Contact Email Address
+juddi.operatorEmailAddress = admin@juddi.org
+
+# The maximum name size and maximum number
+# of name elements allows in several of the
+# 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
+
+# jUDDI Authentication module to use
+juddi.auth = org.apache.juddi.auth.DefaultAuthenticator
+
+# jUDDI DataStore module currently to use
+juddi.dataStore = org.apache.juddi.datastore.jdbc.JDBCDataStore
+
+# jUDDI DataSource to use
+juddi.dataSource=java:comp/env/jdbc/juddiDB
+
+# jUDDI UUIDGen implementation to use
+juddi.uuidgen = org.apache.juddi.uuidgen.DefaultUUIDGen
+
+# jUDDI Cryptor implementation to use
+juddi.cryptor = org.apache.juddi.cryptor.DefaultCryptor
+
+# jUDDI Validator to use
+juddi.validator=org.apache.juddi.validator.DefaultValidator
+
+# jUDDI Proxy Properties (used by RegistryProxy)
+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.securityProvider = com.sun.net.ssl.internal.ssl.Provider
+juddi.proxy.protocolHandler = com.sun.net.ssl.internal.www.protocol

Propchange: geronimo/trunk/applications/uddi-server/src/webapp/WEB-INF/juddi.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/applications/uddi-server/src/webapp/WEB-INF/juddi.properties
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Added: geronimo/trunk/applications/uddi-server/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/uddi-server/src/webapp/WEB-INF/web.xml?rev=209551&view=auto
==============================================================================
--- geronimo/trunk/applications/uddi-server/src/webapp/WEB-INF/web.xml (added)
+++ geronimo/trunk/applications/uddi-server/src/webapp/WEB-INF/web.xml Wed Jul  6 17:46:31 2005
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 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.
+-->
+
+<!-- $Rev: 160900 $ $Date: 2005-04-11 08:09:38 -0700 (Mon, 11 Apr 2005) $ -->
+
+<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">
+
+    <!--
+      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>
+        <servlet-class>org.apache.juddi.registry.RegistryServlet</servlet-class>
+        <init-param>
+            <param-name>juddi.propertiesFile</param-name>
+            <param-value>/WEB-INF/juddi.properties</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <display-name>jUDDI Admin Service</display-name>
+        <servlet-name>jUDDIAdminService</servlet-name>
+        <servlet-class>org.apache.juddi.registry.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>
+    </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>
+    </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>
+
+    <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>
+    </resource-ref>
+
+</web-app>

Propchange: geronimo/trunk/applications/uddi-server/src/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/applications/uddi-server/src/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Added: geronimo/trunk/applications/uddi-server/src/webapp/happyjuddi.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/uddi-server/src/webapp/happyjuddi.jsp?rev=209551&view=auto
==============================================================================
--- geronimo/trunk/applications/uddi-server/src/webapp/happyjuddi.jsp (added)
+++ geronimo/trunk/applications/uddi-server/src/webapp/happyjuddi.jsp Wed Jul  6 17:46:31 2005
@@ -0,0 +1,348 @@
+<%@ page session="false"
+         import="java.io.File,
+                 java.io.IOException,
+                 java.net.URL,
+                 java.net.JarURLConnection,
+                 java.sql.Connection,
+                 java.sql.ResultSet,
+                 java.sql.Statement,
+                 java.util.Properties,
+                 java.util.Iterator,
+                 java.util.SortedSet,
+                 java.util.TreeSet,
+                 javax.naming.Context,
+                 javax.naming.InitialContext,
+                 javax.sql.DataSource"
+%>
+<%
+/*
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+%>
+<%!
+
+    /**
+     * Look for the named class in the classpath
+     *
+     * @param name of the class to lookup
+     * @return the location of the named class
+     * @throws IOException
+     */
+    String lookupClass(String className) 
+      throws IOException 
+    {
+      // load the class (if it exists)
+      Class clazz = null;      
+      try {
+        clazz = Class.forName(className);
+        if (clazz == null)
+          return null;
+      }
+      catch (ClassNotFoundException e) {
+        return null;
+      }
+
+      // class was found, now get it's URL
+      URL url = null;
+      try {
+        url = clazz.getProtectionDomain().getCodeSource().getLocation();
+        if (url == null)
+          return "";
+      }
+      catch(Throwable t) {
+        return "";
+      }
+      
+      // got the classes URL, now determine it's location
+      String location = getLocation(url);
+      if (location == null) 
+        return "";
+      else
+        return location;   
+    }
+
+    /**
+     * Look for the named resource or properties file.
+     *
+     * @param resourceName
+     * @return true if the file was found
+     */
+    String lookupResource(String resourceName) 
+    {
+      URL url = null;
+      ClassLoader classLoader = null;
+
+      classLoader = this.getClass().getClassLoader();
+      if (classLoader != null) 
+      {
+        url = classLoader.getResource(resourceName);
+        if (url != null) {
+          return getLocation(url);
+        }
+      }
+      else      
+      {
+        classLoader = System.class.getClassLoader(); 
+        if (classLoader != null) 
+        {
+          url = classLoader.getResource(resourceName);
+          if (url != null) {
+            return getLocation(url);
+          }
+        }
+      }
+
+      return null;
+    }
+
+    /**
+     * Determine the location of the Java class.
+     *
+     * @param clazz
+     * @return the file path to the jar file or class 
+     *  file where the class was located.
+     */
+    String getLocation(URL url)
+    {
+      try
+      {
+        String location = url.toString();
+        if (location.startsWith("jar:file:/"))
+        {
+          File file = new File(url.getFile());
+          return file.getPath().substring(6);
+        }
+        else if (location.startsWith("jar")) 
+        {
+          url = ((JarURLConnection)url.openConnection()).getJarFileURL();
+          return url.toString();
+        }
+        else if (location.startsWith("file")) 
+        {
+          File file = new File(url.getFile());
+          return file.getAbsolutePath();
+        }
+        else
+        {
+          return url.toString();
+        }
+      } 
+      catch (Throwable t) { 
+        return null;
+      }
+    }
+%>
+<html>
+<head>
+<title>jUDDI Happiness Page</title>
+<link rel="stylesheet" href="juddi.css">
+</head>
+<body>
+
+<div class="nav" align="right"><font size="-2"><a href="http://ws.apache.org/juddi/">jUDDI@Apache</a></font></div>
+<h1>jUDDI</h1>
+
+<div class="announcement">
+<p>
+<h3>Happy jUDDI!</h3>
+
+<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>
+<%
+    String[] classArray = {
+      "org.apache.juddi.IRegistry",
+      "org.apache.axis.transport.http.AxisServlet",
+      "org.apache.commons.discovery.Resource",
+      "org.apache.commons.logging.Log",
+      "org.apache.log4j.Layout",
+      "javax.xml.soap.SOAPMessage",
+      "javax.xml.rpc.Service",
+      "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"
+    };
+    
+    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>
+
+<h4>jUDDI DataSource Validation</h4>
+<pre>
+<%
+  String dsname = null;
+  Context ctx = null;
+  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>");
+  }
+  catch(Exception ex)
+  {
+    out.print("<font color=\"red\">");
+    out.print("- No JNDI Context ("+ex.getMessage()+")");
+    out.println("</font>");
+  }
+
+  try
+  {
+    ds = (DataSource)ctx.lookup(dsname);
+    if (ds == null)
+      throw new Exception("No Context");
+
+    out.print("<font color=\"green\">");
+    out.print("+ Got a JDBC DataSource (dsname="+dsname+")");
+    out.println("</font>");
+  }
+  catch(Exception ex)
+  {
+    out.print("<font color=\"red\">");
+    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)");  
+
+    out.print("<font color=\"green\">");
+    out.print("+ Got a JDBC Connection!");
+    out.println("</font>");
+  }
+  catch(Exception ex)
+  {
+    out.print("<font color=\"red\">");
+    out.print("- DB connection was not aquired. ("+ex.getMessage()+")");
+    out.println("</font>");
+  }
+  
+  try
+  {
+    Statement stmt = conn.createStatement();
+    ResultSet rs = stmt.executeQuery(sql);
+
+    out.print("<font color=\"green\">");
+    out.print("+ "+sql+" = ");
+    if (rs.next())
+      out.print(rs.getString(1));
+    out.println("</font>");
+
+    conn.close();
+  }
+  catch (Exception ex)
+  {
+    out.print("<font color=\"red\">");
+    out.print("- "+sql+" failed ("+ex.getMessage()+")");
+    out.println("</font>");
+  }
+%>
+</pre>
+
+
+<h4>System Properties</h4>
+<pre>
+<%
+  try
+  {
+    Properties sysProps = System.getProperties();
+    SortedSet sortedProperties = new TreeSet(sysProps.keySet()); 
+    for (Iterator keys = sortedProperties.iterator(); keys.hasNext();)
+    {
+      String key = (String)keys.next();
+      out.println("<b>"+key + "</b>: " + sysProps.getProperty(key));
+    }
+  }
+  catch(Exception e)
+  {
+    e.printStackTrace();
+  }
+%>
+</pre>
+
+<hr>
+Platform: <%= getServletConfig().getServletContext().getServerInfo() %>
+
+<table width="100%" border="0">
+<tr><td height="50" align="center" valign="bottom" nowrap><div class="footer">&nbsp;</div></td></tr>
+</table>
+
+</body>
+</div>
+</html>
\ No newline at end of file

Modified: geronimo/trunk/modules/assembly/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/maven.xml?rev=209551&r1=209550&r2=209551&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/maven.xml (original)
+++ geronimo/trunk/modules/assembly/maven.xml Wed Jul  6 17:46:31 2005
@@ -529,6 +529,21 @@
                 <ant:arg value="target/plan/j2ee-remote-classloading-deployer-plan.xml"/>
             </ant:java>
 
+            <!-- build the remote class loading deployer configuration "org/apache/geronimo/RemoteClassLoadingDeployer"-->
+            <ant:echo>Building juddi-server configuration</ant:echo>
+            <ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">
+                <ant:jvmarg value="-ea"/>
+                <ant:arg value="--user"/>
+                <ant:arg value="system"/>
+                <ant:arg value="--password"/>
+                <ant:arg value="manager"/>
+                <ant:arg value="distribute"/>
+                <ant:arg value="${maven.repo.local}/geronimo/wars/geronimo-uddi-server-${pom.currentVersion}.war"/>
+            </ant:java>
+
+            <!-- create SystemDatabase -->
+            <attainGoal name="init-database"/>
+
             <j:if test="${context.getVariable('geronimo.assemble.offline') != 'true'}">
                 <deploy:stopRemoteServer
                     uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
@@ -544,6 +559,19 @@
                 </ant:copy>
             </j:if>
         </j:if>
+    </goal>
+
+    <goal name="init-database">
+        <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>
+        <ant:sql driver="org.apache.derby.jdbc.EmbeddedDriver" url="jdbc:derby:SystemDatabase;create=true" userid="" password="">
+            <ant:fileset dir="src/sql"/>
+            <ant:classpath>
+                <ant:pathelement location="${maven.repo.local}/incubator-derby/jars/derby-${derby_version}.jar"/>
+            </ant:classpath>
+        </ant:sql>
     </goal>
 
     <goal name="cli">

Modified: geronimo/trunk/modules/assembly/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/project.properties?rev=209551&r1=209550&r2=209551&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/project.properties (original)
+++ geronimo/trunk/modules/assembly/project.properties Wed Jul  6 17:46:31 2005
@@ -17,3 +17,5 @@
 #controls whether to remove previous versions even if clean was not explicitly called
 geronimo.assemble.clean=true
 #geronimo.assemble.minimal=true
+
+derby.system.home=${maven.build.dir}/${pom.groupId}-${pom.currentVersion}/var/derby
\ No newline at end of file

Modified: geronimo/trunk/modules/assembly/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/project.xml?rev=209551&r1=209550&r2=209551&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/project.xml (original)
+++ geronimo/trunk/modules/assembly/project.xml Wed Jul  6 17:46:31 2005
@@ -1287,6 +1287,16 @@
             </properties>
         </dependency>
 
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-uddi-server</artifactId>
+            <version>${pom.currentVersion}</version>
+            <type>war</type>
+            <properties>
+                <repository>true</repository>
+            </properties>
+        </dependency>
+
         <!-- JBI ServiceMix -->
         <dependency>
             <groupId>geronimo</groupId>

Added: geronimo/trunk/modules/assembly/src/sql/juddi.sql
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/sql/juddi.sql?rev=209551&view=auto
==============================================================================
--- geronimo/trunk/modules/assembly/src/sql/juddi.sql (added)
+++ geronimo/trunk/modules/assembly/src/sql/juddi.sql Wed Jul  6 17:46:31 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/modules/assembly/src/var/config/config.list
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/var/config/config.list?rev=209551&r1=209550&r2=209551&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/var/config/config.list (original)
+++ geronimo/trunk/modules/assembly/src/var/config/config.list Wed Jul  6 17:46:31 2005
@@ -3,3 +3,4 @@
 org/apache/geronimo/SystemDatabase
 org/apache/geronimo/SystemJMS
 org/apache/geronimo/RuntimeDeployer
+org/apache/geronimo/juddiServer/1.0-SNAPSHOT



Mime
View raw message