You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/07/28 17:15:35 UTC
svn commit: r426555 - in /geronimo/sandbox/svkmerge/m2migration: ./ configs/
configs/uddi-jetty/ configs/uddi-jetty/src/plan/ configs/uddi-tomcat/
configs/uddi-tomcat/src/plan/ m2-assemblies/geronimo-jetty-j2ee/
m2-assemblies/geronimo-jetty-j2ee/src/ma...
Author: jdillon
Date: Fri Jul 28 08:15:34 2006
New Revision: 426555
URL: http://svn.apache.org/viewvc?rev=426555&view=rev
Log:
(GERONIMO-2229) Enable uddi configs for m2 build
Added:
geronimo/sandbox/svkmerge/m2migration/configs/uddi-jetty/pom.xml (with props)
geronimo/sandbox/svkmerge/m2migration/configs/uddi-tomcat/pom.xml (with props)
Modified:
geronimo/sandbox/svkmerge/m2migration/configs/pom.xml
geronimo/sandbox/svkmerge/m2migration/configs/uddi-jetty/src/plan/plan.xml
geronimo/sandbox/svkmerge/m2migration/configs/uddi-tomcat/src/plan/plan.xml
geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml
geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml
geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/pom.xml
geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml
geronimo/sandbox/svkmerge/m2migration/pom.xml
Modified: geronimo/sandbox/svkmerge/m2migration/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/pom.xml?rev=426555&r1=426554&r2=426555&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/pom.xml Fri Jul 28 08:15:34 2006
@@ -146,8 +146,8 @@
<module>system-database</module>
<module>tomcat</module>
<module>tomcat-deployer</module>
- <!-- <module>uddi-jetty</module> -->
- <!-- <module>uddi-tomcat</module> -->
+ <module>uddi-jetty</module>
+ <module>uddi-tomcat</module>
<module>unavailable-client-deployer</module>
<module>unavailable-ejb-deployer</module>
<module>unavailable-webservices-deployer</module>
Added: geronimo/sandbox/svkmerge/m2migration/configs/uddi-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/uddi-jetty/pom.xml?rev=426555&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/uddi-jetty/pom.xml (added)
+++ geronimo/sandbox/svkmerge/m2migration/configs/uddi-jetty/pom.xml Fri Jul 28 08:15:34 2006
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Copyright 2006 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$ $Date$ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>configs</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>uddi-jetty</artifactId>
+ <name>Geronimo Configs :: UDDI Jetty</name>
+ <packaging>car</packaging>
+
+ <properties>
+ <!--
+ FIXME: Remove the need for these properties
+ -->
+ <geronimo_groupId>org.apache.geronimo.applications</geronimo_groupId>
+ <tranql_vendors_version>${tranqlVendorsVersion}</tranql_vendors_version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>system-database</artifactId>
+ <version>${pom.Version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>axis</artifactId>
+ <version>${pom.Version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.applications</groupId>
+ <artifactId>geronimo-uddi-db</artifactId>
+ <version>${pom.Version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>tranql</groupId>
+ <artifactId>tranql-connector-derby-embed-local</artifactId>
+ <type>rar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>juddi</groupId>
+ <artifactId>juddi</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>scout</groupId>
+ <artifactId>scout</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>car-maven-plugin</artifactId>
+ <configuration>
+ <deploymentConfigs>
+ <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+ <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+ <deploymentConfig>${jettyDeployer}</deploymentConfig>
+ <deploymentConfig>${clientDeployer}</deploymentConfig>
+ <deploymentConfig>${openejbDeployer}</deploymentConfig>
+ <deploymentConfig>${axisDeployer}</deploymentConfig>
+ </deploymentConfigs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: geronimo/sandbox/svkmerge/m2migration/configs/uddi-jetty/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/svkmerge/m2migration/configs/uddi-jetty/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/sandbox/svkmerge/m2migration/configs/uddi-jetty/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/sandbox/svkmerge/m2migration/configs/uddi-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/uddi-jetty/src/plan/plan.xml?rev=426555&r1=426554&r2=426555&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/uddi-jetty/src/plan/plan.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/uddi-jetty/src/plan/plan.xml Fri Jul 28 08:15:34 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2004-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,11 +16,12 @@
-->
<!-- $Rev$ $Date$ -->
+
<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
<ext-module>
<web>uddi-jetty</web>
- <external-path>geronimo/geronimo-uddi-server/${pom.currentVersion}/war</external-path>
+ <external-path>${geronimo_groupId}/geronimo-uddi-server/${pom.currentVersion}/war</external-path>
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
<context-root>/juddi</context-root>
Added: geronimo/sandbox/svkmerge/m2migration/configs/uddi-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/uddi-tomcat/pom.xml?rev=426555&view=auto
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/uddi-tomcat/pom.xml (added)
+++ geronimo/sandbox/svkmerge/m2migration/configs/uddi-tomcat/pom.xml Fri Jul 28 08:15:34 2006
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Copyright 2006 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$ $Date$ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>configs</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>uddi-tomcat</artifactId>
+ <name>Geronimo Configs :: UDDI Tomcat</name>
+ <packaging>car</packaging>
+
+ <properties>
+ <!--
+ FIXME: Remove the need for these properties
+ -->
+ <geronimo_groupId>org.apache.geronimo.applications</geronimo_groupId>
+ <tranql_vendors_version>${tranqlVendorsVersion}</tranql_vendors_version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>system-database</artifactId>
+ <version>${pom.Version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>axis</artifactId>
+ <version>${pom.Version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.applications</groupId>
+ <artifactId>geronimo-uddi-db</artifactId>
+ <version>${pom.Version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>tranql</groupId>
+ <artifactId>tranql-connector-derby-embed-local</artifactId>
+ <type>rar</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>juddi</groupId>
+ <artifactId>juddi</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>scout</groupId>
+ <artifactId>scout</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>car-maven-plugin</artifactId>
+ <configuration>
+ <deploymentConfigs>
+ <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+ <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+ <deploymentConfig>${tomcatDeployer}</deploymentConfig>
+ <deploymentConfig>${clientDeployer}</deploymentConfig>
+ <deploymentConfig>${openejbDeployer}</deploymentConfig>
+ <deploymentConfig>${axisDeployer}</deploymentConfig>
+ </deploymentConfigs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: geronimo/sandbox/svkmerge/m2migration/configs/uddi-tomcat/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/svkmerge/m2migration/configs/uddi-tomcat/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/sandbox/svkmerge/m2migration/configs/uddi-tomcat/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/sandbox/svkmerge/m2migration/configs/uddi-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/uddi-tomcat/src/plan/plan.xml?rev=426555&r1=426554&r2=426555&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/uddi-tomcat/src/plan/plan.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/uddi-tomcat/src/plan/plan.xml Fri Jul 28 08:15:34 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2004-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,12 +16,12 @@
-->
<!-- $Rev$ $Date$ -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1"
- >
+
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
<ext-module>
<web>uddi-tomcat</web>
- <external-path>geronimo/geronimo-uddi-server/${pom.currentVersion}/war</external-path>
+ <external-path>${geronimo_groupId}/geronimo-uddi-server/${pom.currentVersion}/war</external-path>
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1">
<context-root>/juddi</context-root>
Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml?rev=426555&r1=426554&r2=426555&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml Fri Jul 28 08:15:34 2006
@@ -234,15 +234,6 @@
<type>car</type>
</dependency>
- <!--
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jmxdebug-jetty</artifactId>
- <version>${pom.version}</version>
- <type>car</type>
- </dependency>
- -->
-
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>remote-deploy-jetty</artifactId>
@@ -250,14 +241,12 @@
<type>car</type>
</dependency>
- <!--
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>uddi-jetty</artifactId>
<version>${pom.version}</version>
<type>car</type>
</dependency>
- -->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml?rev=426555&r1=426554&r2=426555&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml Fri Jul 28 08:15:34 2006
@@ -135,9 +135,7 @@
<module name="org.apache.geronimo.configs/webconsole-jetty/${pom.version}/car"/>
- <!--
<module name="org.apache.geronimo.configs/uddi-jetty/${pom.version}/car" load="false"/>
- -->
<module name="org.apache.geronimo.configs/remote-deploy-jetty/${pom.version}/car"/>
Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/pom.xml?rev=426555&r1=426554&r2=426555&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/pom.xml Fri Jul 28 08:15:34 2006
@@ -219,15 +219,6 @@
<type>car</type>
</dependency>
- <!--
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>ldap-demo-tomcat</artifactId>
- <version>${pom.version}</version>
- <type>car</type>
- </dependency>
- -->
-
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>welcome-tomcat</artifactId>
@@ -235,22 +226,6 @@
<type>car</type>
</dependency>
- <!--
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>servlets-examples-tomcat</artifactId>
- <version>${pom.version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jsp-examples-tomcat</artifactId>
- <version>${pom.version}</version>
- <type>car</type>
- </dependency>
- -->
-
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>webconsole-tomcat</artifactId>
@@ -258,15 +233,6 @@
<type>car</type>
</dependency>
- <!--<
- dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jmxdebug-tomcat</artifactId>
- <version>${pom.version}</version>
- <type>car</type>
- </dependency>
- -->
-
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>remote-deploy-tomcat</artifactId>
@@ -274,28 +240,12 @@
<type>car</type>
</dependency>
- <!--
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>uddi-tomcat</artifactId>
<version>${pom.version}</version>
<type>car</type>
</dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>daytrader-derby-tomcat</artifactId>
- <version>${pom.version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>daytrader-derby-tomcat-streamer-client</artifactId>
- <version>${pom.version}</version>
- <type>car</type>
- </dependency>
- -->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml?rev=426555&r1=426554&r2=426555&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-tomcat-j2ee/src/main/var/config/config.xml Fri Jul 28 08:15:34 2006
@@ -144,9 +144,7 @@
<module name="org.apache.geronimo.configs/webconsole-tomcat/${pom.version}/car"/>
- <!--
<module name="org.apache.geronimo.configs/uddi-tomcat/${pom.version}/car" load="false"/>
- -->
<module name="org.apache.geronimo.configs/remote-deploy-tomcat/${pom.version}/car" />
Modified: geronimo/sandbox/svkmerge/m2migration/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/pom.xml?rev=426555&r1=426554&r2=426555&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/pom.xml Fri Jul 28 08:15:34 2006
@@ -603,6 +603,13 @@
</dependency>
<dependency>
+ <groupId>tranql</groupId>
+ <artifactId>tranql-connector-derby-embed-local</artifactId>
+ <version>${tranqlVendorsVersion}</version>
+ <type>rar</type>
+ </dependency>
+
+ <dependency>
<groupId>juddi</groupId>
<artifactId>juddi</artifactId>
<version>0.9rc4</version>