geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r787532 - in /geronimo/server/trunk/plugins/uddi: ./ geronimo-uddi-db/ uddi-db/ uddi-db/src/main/appended-resources/META-INF/ uddi-db/src/main/history/ uddi-db/src/main/plan/ uddi-db/src/main/sql/ uddi-jetty/ uddi-jetty/src/main/history/ ud...
Date Tue, 23 Jun 2009 03:59:30 GMT
Author: djencks
Date: Tue Jun 23 03:59:29 2009
New Revision: 787532

URL: http://svn.apache.org/viewvc?rev=787532&view=rev
Log:
GERONIMO-4702 set up uddi database more sensibly, take out the tck data

Added:
    geronimo/server/trunk/plugins/uddi/uddi-db/
      - copied from r787305, geronimo/server/trunk/plugins/uddi/geronimo-uddi-db/
    geronimo/server/trunk/plugins/uddi/uddi-db/src/main/history/
    geronimo/server/trunk/plugins/uddi/uddi-db/src/main/history/dependencies.xml   (with props)
    geronimo/server/trunk/plugins/uddi/uddi-db/src/main/plan/
    geronimo/server/trunk/plugins/uddi/uddi-db/src/main/plan/plan.xml   (with props)
Removed:
    geronimo/server/trunk/plugins/uddi/geronimo-uddi-db/
Modified:
    geronimo/server/trunk/plugins/uddi/pom.xml
    geronimo/server/trunk/plugins/uddi/uddi-db/pom.xml
    geronimo/server/trunk/plugins/uddi/uddi-db/src/main/appended-resources/META-INF/NOTICE.vm
    geronimo/server/trunk/plugins/uddi/uddi-db/src/main/sql/juddi.sql
    geronimo/server/trunk/plugins/uddi/uddi-jetty/pom.xml
    geronimo/server/trunk/plugins/uddi/uddi-jetty/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/uddi/uddi-jetty/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/uddi/uddi-tomcat/pom.xml
    geronimo/server/trunk/plugins/uddi/uddi-tomcat/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/uddi/uddi-tomcat/src/main/plan/plan.xml

Modified: geronimo/server/trunk/plugins/uddi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/pom.xml?rev=787532&r1=787531&r2=787532&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/pom.xml (original)
+++ geronimo/server/trunk/plugins/uddi/pom.xml Tue Jun 23 03:59:29 2009
@@ -37,7 +37,7 @@
     </description>
 
     <modules>
-        <module>geronimo-uddi-db</module>
+        <module>uddi-db</module>
         <module>geronimo-uddi-server</module>
         <module>uddi-jetty</module>
         <module>uddi-tomcat</module>

Modified: geronimo/server/trunk/plugins/uddi/uddi-db/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-db/pom.xml?rev=787532&r1=787305&r2=787532&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-db/pom.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-db/pom.xml Tue Jun 23 03:59:29 2009
@@ -19,22 +19,58 @@
 <!-- $Rev$ $Date$ -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    
+
     <modelVersion>4.0.0</modelVersion>
-    
+
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>uddi</artifactId>
         <version>2.2-SNAPSHOT</version>
     </parent>
 
-    <artifactId>geronimo-uddi-db</artifactId>
+    <artifactId>uddi-db</artifactId>
+    <packaging>car</packaging>
     <name>Geronimo Plugins, UDDI : Database</name>
-    
-    <properties>
-        <derby.system.home>${project.build.outputDirectory}/META-INF/${pom.artifactId}/var/derby</derby.system.home>
-    </properties>
-    
+
+    <!--<properties>-->
+        <!--<derby.system.home>${project.build.outputDirectory}/META-INF/${pom.artifactId}/var/derby</derby.system.home>-->
+    <!--</properties>-->
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>system-database</artifactId>
+                <version>${geronimoVersion}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>connector-deployer</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>system-database</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>org.tranql</groupId>
+            <artifactId>tranql-connector-derby-embed-local</artifactId>
+            <type>rar</type>
+            <scope>provided</scope>
+        </dependency>
+
+    </dependencies>
+
     <build>
         <plugins>
             <plugin>
@@ -56,11 +92,11 @@
                     </execution>
                 </executions>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>sql-maven-plugin</artifactId>
-                
+
                 <dependencies>
                     <dependency>
                         <groupId>org.apache.derby</groupId>
@@ -69,7 +105,7 @@
                         <version>${derbyVersion}</version>
                     </dependency>
                 </dependencies>
-                
+
                 <executions>
                     <execution>
                         <id>create-db</id>
@@ -79,7 +115,7 @@
                         </goals>
                         <configuration>
                             <driver>org.apache.derby.jdbc.EmbeddedDriver</driver>
-                            <url>jdbc:derby:${derby.system.home}/UddiDatabase;create=true</url>
+                            <url>jdbc:derby:${project.build.outputDirectory}/var/derby/UddiDatabase;create=true</url>
                             <autocommit>true</autocommit>
                             <onError>abort</onError>
                             <delimiter>;</delimiter>
@@ -90,7 +126,30 @@
                     </execution>
                 </executions>
             </plugin>
+
+
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${connectorDeployer}</deploymentConfig>
+                    </deploymentConfigs>
+                    <module>
+                        <groupId>org.tranql</groupId>
+                        <artifactId>tranql-connector-derby-embed-local</artifactId>
+                        <type>rar</type>
+                    </module>
+                    <instance>
+                        <plugin-artifact>
+                            <copy-file relative-to="server" dest-dir="var">var/derby</copy-file>
+                        </plugin-artifact>
+                    </instance>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
-    
+
 </project>

Modified: geronimo/server/trunk/plugins/uddi/uddi-db/src/main/appended-resources/META-INF/NOTICE.vm
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-db/src/main/appended-resources/META-INF/NOTICE.vm?rev=787532&r1=787305&r2=787532&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-db/src/main/appended-resources/META-INF/NOTICE.vm
(original)
+++ geronimo/server/trunk/plugins/uddi/uddi-db/src/main/appended-resources/META-INF/NOTICE.vm
Tue Jun 23 03:59:29 2009
@@ -1,27 +1,6 @@
-##
-## Licensed to the Apache Software Foundation (ASF) under one
-## or more contributor license agreements.  See the NOTICE file
-## distributed with this work for additional information
-## regarding copyright ownership.  The ASF licenses this file
-## to you under the Apache License, Version 2.0 (the
-## "License"); you may not use this file except in compliance
-## with the License.  You may obtain a copy of the License at
-##
-##  http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing,
-## software distributed under the License is distributed on an
-## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-## KIND, either express or implied.  See the License for the
-## specific language governing permissions and limitations
-## under the License.
-##
-## $Rev: 651007 $ $Date: 2008-04-23 14:59:19 -0400 (Wed, 23 Apr 2008) $
-##
-
 Portions of the UDDI integration were developed by the Apache Web Services
 jUDDI community.
 
 Apache Web Services jUDDI Project
-Copyright 2003-2008 The Apache Software Foundation
+Copyright 2003-2009 The Apache Software Foundation
 

Added: geronimo/server/trunk/plugins/uddi/uddi-db/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-db/src/main/history/dependencies.xml?rev=787532&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-db/src/main/history/dependencies.xml (added)
+++ geronimo/server/trunk/plugins/uddi/uddi-db/src/main/history/dependencies.xml Tue Jun 23
03:59:29 2009
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+    <module-id>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>uddi-db</artifactId>
+        <version>2.2-SNAPSHOT</version>
+        <type>car</type>
+    </module-id>
+    <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>system-database</artifactId>
+        <type>car</type>
+    </dependency>
+</plugin-artifact>

Propchange: geronimo/server/trunk/plugins/uddi/uddi-db/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/uddi/uddi-db/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/uddi/uddi-db/src/main/history/dependencies.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/server/trunk/plugins/uddi/uddi-db/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-db/src/main/plan/plan.xml?rev=787532&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-db/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/plugins/uddi/uddi-db/src/main/plan/plan.xml Tue Jun 23 03:59:29
2009
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-${geronimoSchemaVersion}">
+    <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>

Propchange: geronimo/server/trunk/plugins/uddi/uddi-db/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/uddi/uddi-db/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/uddi/uddi-db/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/server/trunk/plugins/uddi/uddi-db/src/main/sql/juddi.sql
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-db/src/main/sql/juddi.sql?rev=787532&r1=787305&r2=787532&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-db/src/main/sql/juddi.sql (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-db/src/main/sql/juddi.sql Tue Jun 23 03:59:29
2009
@@ -387,9 +387,6 @@
   PRIMARY KEY (AUTH_TOKEN)
 );
 
-INSERT INTO PUBLISHER (PUBLISHER_ID, PUBLISHER_NAME)
-VALUES ('juddi', 'juddi');
-
 INSERT INTO TMODEL (TMODEL_KEY,AUTHORIZED_NAME,OPERATOR,NAME,OVERVIEW_URL,LAST_UPDATE)
 VALUES ('uuid:C1ACF26D-9672-4404-9D70-39B756E62AB4','Administrator','jUDDI.org','uddi-org:types','http://www.uddi.org/taxonomies/UDDI_Taxonomy_tModels.htm#UDDItypes',CURRENT
TIMESTAMP);
 

Modified: geronimo/server/trunk/plugins/uddi/uddi-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-jetty/pom.xml?rev=787532&r1=787531&r2=787532&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-jetty/pom.xml Tue Jun 23 03:59:29 2009
@@ -34,13 +34,6 @@
     <packaging>car</packaging>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>connector-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -60,13 +53,6 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>system-database</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>axis</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -74,8 +60,9 @@
 
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>geronimo-uddi-db</artifactId>
+            <artifactId>uddi-db</artifactId>
             <version>${version}</version>
+            <type>car</type>
         </dependency>
         
         <dependency>
@@ -87,13 +74,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.tranql</groupId>
-            <artifactId>tranql-connector-derby-embed-local</artifactId>
-            <type>rar</type>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.juddi</groupId>
             <artifactId>juddi</artifactId>
         </dependency>
@@ -121,10 +101,15 @@
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${jettyDeployer}</deploymentConfig>
-                        <deploymentConfig>${connectorDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <category>Web Services</category>
+                    <module>
+                        <groupId>org.apache.geronimo.plugins</groupId>
+                        <artifactId>geronimo-uddi-server</artifactId>
+                        <version>${version}</version>
+                        <type>war</type>
+                    </module>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugins/uddi/uddi-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-jetty/src/main/history/dependencies.xml?rev=787532&r1=787531&r2=787532&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-jetty/src/main/history/dependencies.xml Tue Jun
23 03:59:29 2009
@@ -2,7 +2,7 @@
 <plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
     <module-id>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>uddi-jetty6</artifactId>
+        <artifactId>uddi-jetty</artifactId>
         <version>2.2-SNAPSHOT</version>
         <type>car</type>
     </module-id>
@@ -17,14 +17,9 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>system-database</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>geronimo-uddi-db</artifactId>
-        <type>jar</type>
+        <artifactId>uddi-db</artifactId>
+        <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.juddi</groupId>

Modified: geronimo/server/trunk/plugins/uddi/uddi-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-jetty/src/main/plan/plan.xml?rev=787532&r1=787531&r2=787532&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-jetty/src/main/plan/plan.xml Tue Jun 23 03:59:29
2009
@@ -18,63 +18,14 @@
 
 <!-- $Rev$ $Date$ -->
 
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-${geronimoSchemaVersion}">
-
-    <ext-module>
-        <web>uddi-jetty</web>
-        <external-path xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
-            <dep:groupId>org.apache.geronimo.plugins</dep:groupId>
-            <dep:artifactId>geronimo-uddi-server</dep:artifactId>
-            <dep:type>war</dep:type>
-        </external-path>
-        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-${geronimoSchemaVersion}">
-            <context-root>/juddi</context-root>
-            <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">
-                    <name>ServerInfo</name>
-                </reference>
-            </gbean>
-        </web-app>
-    </ext-module>
-
-    <ext-module>
-        <connector>uddi-db</connector>
-        <external-path xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
-            <dep:groupId>org.tranql</dep:groupId>
-            <dep:artifactId>tranql-connector-derby-embed-local</dep:artifactId>
-            <dep:type>rar</dep:type>
-        </external-path>
-        <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-${geronimoSchemaVersion}">
-            <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>
-
-    <!--<gbean name="eis/JAXR" class="org.apache.geronimo.webservices.jaxr.JAXRGBean"/>-->
-
-</application>
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0.2">
+  <context-root>/juddi</context-root>
+  <!--<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">-->
+      <!--<name>ServerInfo</name>-->
+    <!--</reference>-->
+  <!--</gbean>-->
+</web-app>

Modified: geronimo/server/trunk/plugins/uddi/uddi-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-tomcat/pom.xml?rev=787532&r1=787531&r2=787532&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-tomcat/pom.xml Tue Jun 23 03:59:29 2009
@@ -44,14 +44,6 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>connector-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -60,13 +52,6 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>system-database</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>axis</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -74,8 +59,9 @@
 
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>geronimo-uddi-db</artifactId>
+            <artifactId>uddi-db</artifactId>
             <version>${version}</version>
+            <type>car</type>
         </dependency>
         
         <dependency>
@@ -87,13 +73,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.tranql</groupId>
-            <artifactId>tranql-connector-derby-embed-local</artifactId>
-            <type>rar</type>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.juddi</groupId>
             <artifactId>juddi</artifactId>
         </dependency>
@@ -121,10 +100,15 @@
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${tomcatDeployer}</deploymentConfig>
-                        <deploymentConfig>${connectorDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <category>Web Services</category>
+                    <module>
+                        <groupId>org.apache.geronimo.plugins</groupId>
+                        <artifactId>geronimo-uddi-server</artifactId>
+                        <version>${version}</version>
+                        <type>war</type>
+                    </module>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugins/uddi/uddi-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-tomcat/src/main/history/dependencies.xml?rev=787532&r1=787531&r2=787532&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-tomcat/src/main/history/dependencies.xml Tue Jun
23 03:59:29 2009
@@ -17,14 +17,9 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>system-database</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>geronimo-uddi-db</artifactId>
-        <type>jar</type>
+        <artifactId>uddi-db</artifactId>
+        <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.juddi</groupId>

Modified: geronimo/server/trunk/plugins/uddi/uddi-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-tomcat/src/main/plan/plan.xml?rev=787532&r1=787531&r2=787532&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-tomcat/src/main/plan/plan.xml Tue Jun 23 03:59:29
2009
@@ -18,64 +18,15 @@
 
 <!-- $Rev$ $Date$ -->
 
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-${geronimoSchemaVersion}">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1">
 
-    <ext-module>
-        <web>uddi-tomcat</web>
-        <external-path xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
-            <dep:groupId>org.apache.geronimo.plugins</dep:groupId>
-            <dep:artifactId>geronimo-uddi-server</dep:artifactId>
-            <dep:type>war</dep:type>
-        </external-path>
-        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-${geronimoSchemaVersion}">
-
-            <context-root>/juddi</context-root>
-            <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">
-                    <name>ServerInfo</name>
-                </reference>
-            </gbean>
-        </web-app>
-    </ext-module>
-
-    <ext-module>
-        <connector>uddi-db</connector>
-        <external-path xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
-            <dep:groupId>org.tranql</dep:groupId>
-            <dep:artifactId>tranql-connector-derby-embed-local</dep:artifactId>
-            <dep:type>rar</dep:type>
-        </external-path>
-        <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-${geronimoSchemaVersion}">
-            <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>
-
-    <!--<gbean name="eis/JAXR" class="org.apache.geronimo.webservices.jaxr.JAXRGBean"/>-->
-
-</application>
+  <context-root>/juddi</context-root>
+  <!--<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">-->
+      <!--<name>ServerInfo</name>-->
+    <!--</reference>-->
+  <!--</gbean>-->
+</web-app>



Mime
View raw message