Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 86608 invoked from network); 7 Jul 2006 05:18:22 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 7 Jul 2006 05:18:22 -0000 Received: (qmail 86990 invoked by uid 500); 7 Jul 2006 05:18:19 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 86837 invoked by uid 500); 7 Jul 2006 05:18:17 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 86490 invoked by uid 99); 7 Jul 2006 05:18:16 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Jul 2006 22:18:16 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Jul 2006 22:18:09 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 89AFF1A981A; Thu, 6 Jul 2006 22:17:49 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r419805 [1/6] - in /geronimo/trunk: ./ applications/ applications/console/ applications/console/console-core/ applications/console/console-ear/ applications/console/console-framework/ applications/console/console-standard/ applications/demo... Date: Fri, 07 Jul 2006 05:17:30 -0000 To: scm@geronimo.apache.org From: jdillon@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060707051749.89AFF1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jdillon Date: Thu Jul 6 22:17:25 2006 New Revision: 419805 URL: http://svn.apache.org/viewvc?rev=419805&view=rev Log: Applied GERONIMO-2161; m2 for the masses Modified: geronimo/trunk/applications/console/console-core/pom.xml geronimo/trunk/applications/console/console-ear/pom.xml geronimo/trunk/applications/console/console-framework/pom.xml geronimo/trunk/applications/console/console-standard/pom.xml geronimo/trunk/applications/console/pom.xml geronimo/trunk/applications/demo/pom.xml geronimo/trunk/applications/ldap-realm-demo/pom.xml geronimo/trunk/applications/magicGball/magicGball-client/pom.xml geronimo/trunk/applications/magicGball/magicGball-ear/pom.xml geronimo/trunk/applications/magicGball/magicGball-ejb/pom.xml geronimo/trunk/applications/magicGball/magicGball-web/pom.xml geronimo/trunk/applications/magicGball/pom.xml geronimo/trunk/applications/pom.xml geronimo/trunk/applications/remote-deploy/pom.xml geronimo/trunk/applications/uddi-db/pom.xml geronimo/trunk/applications/uddi-server/pom.xml geronimo/trunk/applications/welcome/pom.xml geronimo/trunk/configs/activemq-broker/pom.xml geronimo/trunk/configs/activemq/pom.xml geronimo/trunk/configs/axis-deployer/pom.xml geronimo/trunk/configs/axis/pom.xml geronimo/trunk/configs/client-corba/pom.xml geronimo/trunk/configs/client-deployer/pom.xml geronimo/trunk/configs/client-security/pom.xml geronimo/trunk/configs/client-system/pom.xml geronimo/trunk/configs/client/pom.xml geronimo/trunk/configs/console-jetty/pom.xml geronimo/trunk/configs/console-tomcat/pom.xml geronimo/trunk/configs/directory/pom.xml geronimo/trunk/configs/geronimo-gbean-deployer/pom.xml geronimo/trunk/configs/hot-deployer/pom.xml geronimo/trunk/configs/j2ee-corba/pom.xml geronimo/trunk/configs/j2ee-deployer/pom.xml geronimo/trunk/configs/j2ee-security/pom.xml geronimo/trunk/configs/j2ee-server/pom.xml geronimo/trunk/configs/j2ee-system/pom.xml geronimo/trunk/configs/javamail/pom.xml geronimo/trunk/configs/jetty-deployer/pom.xml geronimo/trunk/configs/jetty/pom.xml geronimo/trunk/configs/jsp-examples-jetty/pom.xml geronimo/trunk/configs/jsp-examples-tomcat/pom.xml geronimo/trunk/configs/ldap-demo-jetty/pom.xml geronimo/trunk/configs/ldap-demo-tomcat/pom.xml geronimo/trunk/configs/ldap-realm/pom.xml geronimo/trunk/configs/online-deployer/pom.xml geronimo/trunk/configs/openejb-deployer/pom.xml geronimo/trunk/configs/openejb/pom.xml geronimo/trunk/configs/pom.xml geronimo/trunk/configs/rmi-naming/pom.xml geronimo/trunk/configs/servlets-examples-jetty/pom.xml geronimo/trunk/configs/servlets-examples-tomcat/pom.xml geronimo/trunk/configs/sharedlib/pom.xml geronimo/trunk/configs/shutdown/pom.xml geronimo/trunk/configs/system-database/pom.xml geronimo/trunk/configs/tomcat-deployer/pom.xml geronimo/trunk/configs/tomcat/pom.xml geronimo/trunk/configs/unavailable-client-deployer/pom.xml geronimo/trunk/configs/unavailable-ejb-deployer/pom.xml geronimo/trunk/configs/unavailable-webservices-deployer/pom.xml geronimo/trunk/configs/upgrade-cli/pom.xml geronimo/trunk/configs/upgrade/pom.xml geronimo/trunk/configs/welcome-jetty/pom.xml geronimo/trunk/configs/welcome-tomcat/pom.xml geronimo/trunk/m2-plugins/geronimo-packaging-plugin/pom.xml geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/AbstractDistributor.java geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/AbstractPackagingMojo.java geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/ConfigCopier.java geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/ConfigCopierMojo.java geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenAttributeStore.java geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenConfigStore.java geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilderShellMojo.java geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackagingCommandLine.java geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PlanProcessorMojo.java geronimo/trunk/m2-plugins/geronimo-packaging-plugin/src/resources/META-INF/plexus/components.xml geronimo/trunk/modules/activemq-embedded-rar/pom.xml geronimo/trunk/modules/activemq-gbean-management/pom.xml geronimo/trunk/modules/activemq-gbean/pom.xml geronimo/trunk/modules/axis-builder/pom.xml geronimo/trunk/modules/axis/pom.xml geronimo/trunk/modules/client-builder/pom.xml geronimo/trunk/modules/client/pom.xml geronimo/trunk/modules/common/pom.xml geronimo/trunk/modules/connector-builder/pom.xml geronimo/trunk/modules/connector/pom.xml geronimo/trunk/modules/converter/pom.xml geronimo/trunk/modules/core/pom.xml geronimo/trunk/modules/deploy-jsr88/pom.xml geronimo/trunk/modules/deploy-tool/pom.xml geronimo/trunk/modules/deployment/pom.xml geronimo/trunk/modules/derby/pom.xml geronimo/trunk/modules/directory/pom.xml geronimo/trunk/modules/hot-deploy/pom.xml geronimo/trunk/modules/installer-support/pom.xml geronimo/trunk/modules/j2ee-builder/pom.xml geronimo/trunk/modules/j2ee-schema/pom.xml geronimo/trunk/modules/j2ee/pom.xml geronimo/trunk/modules/jetty-builder/pom.xml geronimo/trunk/modules/jetty/pom.xml geronimo/trunk/modules/jmx-remoting/pom.xml geronimo/trunk/modules/mail/pom.xml geronimo/trunk/modules/management/pom.xml geronimo/trunk/modules/naming-builder/pom.xml geronimo/trunk/modules/pom.xml geronimo/trunk/modules/security-builder/pom.xml geronimo/trunk/modules/service-builder/pom.xml geronimo/trunk/modules/system/pom.xml geronimo/trunk/modules/test-ddbean/pom.xml geronimo/trunk/modules/timer/pom.xml geronimo/trunk/modules/tomcat-builder/pom.xml geronimo/trunk/modules/tomcat/pom.xml geronimo/trunk/modules/transaction/pom.xml geronimo/trunk/modules/upgrade/pom.xml geronimo/trunk/modules/web-builder/pom.xml geronimo/trunk/pom.xml Modified: geronimo/trunk/applications/console/console-core/pom.xml URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/console/console-core/pom.xml?rev=419805&r1=419804&r2=419805&view=diff ============================================================================== --- geronimo/trunk/applications/console/console-core/pom.xml (original) +++ geronimo/trunk/applications/console/console-core/pom.xml Thu Jul 6 22:17:25 2006 @@ -17,7 +17,11 @@ - + + 4.0.0 @@ -28,17 +32,20 @@ geronimo-console-core - Geronimo :: Console :: Common Code + Geronimo Applications, Console :: Core org.apache.geronimo.modules geronimo-connector + ${pom.version} + mx4j mx4j-remote + org.apache.geronimo.specs geronimo-jms_1.1_spec @@ -70,11 +77,11 @@ ##### Generated by Maven2 #### -version=${geronimoVersion} +version=${pom.version} build.date=${build.date} build.time=${build.time} copyright=Copyright (C) 2003-${build.year}, The Apache Software Foundation -geronimo.build.version=${geronimoVersion} +geronimo.build.version=${pom.version} geronimo.spec.version=${geronimoSpecJmsVersion} portal.core.version=${plutoVersion} Modified: geronimo/trunk/applications/console/console-ear/pom.xml URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/console/console-ear/pom.xml?rev=419805&r1=419804&r2=419805&view=diff ============================================================================== --- geronimo/trunk/applications/console/console-ear/pom.xml (original) +++ geronimo/trunk/applications/console/console-ear/pom.xml Thu Jul 6 22:17:25 2006 @@ -17,7 +17,11 @@ - + + 4.0.0 @@ -29,60 +33,22 @@ geronimo-console ear - Geronimo :: Console :: Application EAR + Geronimo Applications, Console :: EAR org.apache.geronimo.applications.console geronimo-console-framework - ${geronimoVersion} + ${pom.version} war + org.apache.geronimo.applications.console geronimo-console-standard - ${geronimoVersion} + ${pom.version} war - Modified: geronimo/trunk/applications/console/console-framework/pom.xml URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/console/console-framework/pom.xml?rev=419805&r1=419804&r2=419805&view=diff ============================================================================== --- geronimo/trunk/applications/console/console-framework/pom.xml (original) +++ geronimo/trunk/applications/console/console-framework/pom.xml Thu Jul 6 22:17:25 2006 @@ -17,7 +17,11 @@ - + + 4.0.0 @@ -28,35 +32,56 @@ geronimo-console-framework + Geronimo Applications, Console :: Portal Framework war - Geronimo :: Console :: Portal Framework - + castor castor + org.apache.geronimo.specs geronimo-servlet_2.4_spec provided + org.apache.pluto pluto - ${plutoVersion} provided + org.apache.pluto pluto-portal - ${plutoVersion} + org.apache.pluto pluto-descriptors - ${plutoVersion} + + + + + tomcat + jasper-runtime + + + + + org.codehaus.mojo + jspc-maven-plugin + + + + org.apache.maven.plugins + maven-war-plugin + + + Modified: geronimo/trunk/applications/console/console-standard/pom.xml URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/console/console-standard/pom.xml?rev=419805&r1=419804&r2=419805&view=diff ============================================================================== --- geronimo/trunk/applications/console/console-standard/pom.xml (original) +++ geronimo/trunk/applications/console/console-standard/pom.xml Thu Jul 6 22:17:25 2006 @@ -17,7 +17,11 @@ - + + 4.0.0 @@ -29,100 +33,127 @@ geronimo-console-standard war - Geronimo :: Console :: Standard Portlets + Geronimo Applications, Console :: Standard Portlets + - org.apache.geronimo.specs - geronimo-servlet_2.4_spec - provided - - - org.apache.geronimo.applications.console - geronimo-console-core - ${geronimoVersion} + org.apache.geronimo.modules + geronimo-upgrade + ${pom.version} provided - - castor - castor - + org.apache.geronimo.modules geronimo-converter - ${geronimoVersion} + ${pom.version} provided + org.apache.geronimo.modules geronimo-derby + ${pom.version} provided + org.apache.geronimo.modules geronimo-deploy-jsr88 + ${pom.version} + provided + + + + org.apache.geronimo.specs + geronimo-servlet_2.4_spec provided + + + org.apache.geronimo.applications.console + geronimo-console-core + ${pom.version} + provided + + + + castor + castor + + commons-digester commons-digester - ${commonsDigesterVersion} + commons-fileupload commons-fileupload - ${commonsFileuploadVersion} + commons-io commons-io - ${commonsIoVersion} - - - org.apache.geronimo.modules - geronimo-upgrade - provided + org.apache.pluto pluto - ${plutoVersion} + activemq activemq-core - ${activeMqVersion} provided + taglibs standard - ${standardTaglibsVersion} + javax.servlet jstl - ${jstlVersion} + dwr dwr - ${dwrVersion} + + + + + tomcat + jasper-runtime - + - ${basedir}/src/conf + ${pom.basedir}/src/conf true - + + + + org.codehaus.mojo + jspc-maven-plugin + + + + org.apache.maven.plugins + maven-war-plugin + + Modified: geronimo/trunk/applications/console/pom.xml URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/console/pom.xml?rev=419805&r1=419804&r2=419805&view=diff ============================================================================== --- geronimo/trunk/applications/console/pom.xml (original) +++ geronimo/trunk/applications/console/pom.xml Thu Jul 6 22:17:25 2006 @@ -17,7 +17,11 @@ - + + 4.0.0 @@ -30,16 +34,15 @@ org.apache.geronimo.applications.console console-parent pom - Geronimo Console Application - Geronimo Console Application + Geronimo Applications :: Console portlet-api portlet-api - ${portletApiVersion} provided + org.apache.geronimo.specs geronimo-jsp_2.0_spec Modified: geronimo/trunk/applications/demo/pom.xml URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/demo/pom.xml?rev=419805&r1=419804&r2=419805&view=diff ============================================================================== --- geronimo/trunk/applications/demo/pom.xml (original) +++ geronimo/trunk/applications/demo/pom.xml Thu Jul 6 22:17:25 2006 @@ -17,7 +17,11 @@ - + + 4.0.0 @@ -29,7 +33,28 @@ demo war - Geronimo Demo Application - Geronimo Demo Application - + Geronimo Applications :: Demo + + + + + tomcat + jasper-runtime + + + + + + + org.codehaus.mojo + jspc-maven-plugin + + + + org.apache.maven.plugins + maven-war-plugin + + + + Modified: geronimo/trunk/applications/ldap-realm-demo/pom.xml URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/ldap-realm-demo/pom.xml?rev=419805&r1=419804&r2=419805&view=diff ============================================================================== --- geronimo/trunk/applications/ldap-realm-demo/pom.xml (original) +++ geronimo/trunk/applications/ldap-realm-demo/pom.xml Thu Jul 6 22:17:25 2006 @@ -17,7 +17,11 @@ - + + 4.0.0 @@ -29,10 +33,32 @@ geronimo-ldap-demo war - Geronimo LDAP Demo Application + Geronimo Applications :: LDAP Demo This is a very simple application that is intended to demonstrate the ldap security mechanism. + + + + + tomcat + jasper-runtime + + + + + + + org.codehaus.mojo + jspc-maven-plugin + + + + org.apache.maven.plugins + maven-war-plugin + + + Modified: geronimo/trunk/applications/magicGball/magicGball-client/pom.xml URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/magicGball/magicGball-client/pom.xml?rev=419805&r1=419804&r2=419805&view=diff ============================================================================== --- geronimo/trunk/applications/magicGball/magicGball-client/pom.xml (original) +++ geronimo/trunk/applications/magicGball/magicGball-client/pom.xml Thu Jul 6 22:17:25 2006 @@ -17,7 +17,11 @@ - + + 4.0.0 @@ -29,13 +33,13 @@ magicGball-client jar - Geronimo :: The Magic G Ball Sample :: Client + Geronimo Applications, The Magic G Ball :: Client org.apache.geronimo.applications.magicGball magicGball-ejb - 1.2-SNAPSHOT + ${pom.version} Modified: geronimo/trunk/applications/magicGball/magicGball-ear/pom.xml URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/magicGball/magicGball-ear/pom.xml?rev=419805&r1=419804&r2=419805&view=diff ============================================================================== --- geronimo/trunk/applications/magicGball/magicGball-ear/pom.xml (original) +++ geronimo/trunk/applications/magicGball/magicGball-ear/pom.xml Thu Jul 6 22:17:25 2006 @@ -17,7 +17,11 @@ - + + 4.0.0 @@ -29,23 +33,25 @@ magicGball-ear ear - Geronimo :: The Magic G Ball Sample Application + Geronimo Applications, The Magic G Ball :: EAR org.apache.geronimo.applications.magicGball magicGball-client - 1.2-SNAPSHOT + ${pom.version} + org.apache.geronimo.applications.magicGball magicGball-ejb - 1.2-SNAPSHOT + ${pom.version} + org.apache.geronimo.applications.magicGball magicGball-web - 1.2-SNAPSHOT + ${pom.version} war Modified: geronimo/trunk/applications/magicGball/magicGball-ejb/pom.xml URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/magicGball/magicGball-ejb/pom.xml?rev=419805&r1=419804&r2=419805&view=diff ============================================================================== --- geronimo/trunk/applications/magicGball/magicGball-ejb/pom.xml (original) +++ geronimo/trunk/applications/magicGball/magicGball-ejb/pom.xml Thu Jul 6 22:17:25 2006 @@ -17,7 +17,11 @@ - + + 4.0.0 @@ -29,6 +33,6 @@ magicGball-ejb ejb - Geronimo :: The Magic G Ball Sample :: EJB + Geronimo Applications, The Magic G Ball :: EJB Modified: geronimo/trunk/applications/magicGball/magicGball-web/pom.xml URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/magicGball/magicGball-web/pom.xml?rev=419805&r1=419804&r2=419805&view=diff ============================================================================== --- geronimo/trunk/applications/magicGball/magicGball-web/pom.xml (original) +++ geronimo/trunk/applications/magicGball/magicGball-web/pom.xml Thu Jul 6 22:17:25 2006 @@ -17,7 +17,11 @@ - + + 4.0.0 @@ -29,14 +33,35 @@ magicGball-web war - Geronimo :: The Magic G Ball Sample :: WAR + Geronimo Applications, The Magic G Ball :: WAR org.apache.geronimo.applications.magicGball magicGball-ejb - 1.2-SNAPSHOT + ${pom.version} + + + + + tomcat + jasper-runtime + + + + + org.codehaus.mojo + jspc-maven-plugin + + + + org.apache.maven.plugins + maven-war-plugin + + + + Modified: geronimo/trunk/applications/magicGball/pom.xml URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/magicGball/pom.xml?rev=419805&r1=419804&r2=419805&view=diff ============================================================================== --- geronimo/trunk/applications/magicGball/pom.xml (original) +++ geronimo/trunk/applications/magicGball/pom.xml Thu Jul 6 22:17:25 2006 @@ -17,7 +17,11 @@ - + + 4.0.0 @@ -30,7 +34,7 @@ org.apache.geronimo.applications.magicGball magicGball-parent pom - Geronimo :: The Magic G Ball + Geronimo Applications :: The Magic G Ball @@ -38,32 +42,30 @@ geronimo-servlet_2.4_spec provided + org.apache.geronimo.specs geronimo-jsp_2.0_spec provided + org.apache.geronimo.specs geronimo-qname_1.1_spec provided + org.apache.geronimo.specs geronimo-ejb_2.1_spec provided + org.apache.geronimo.specs geronimo-jaxrpc_1.1_spec provided - Modified: geronimo/trunk/applications/pom.xml URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/pom.xml?rev=419805&r1=419804&r2=419805&view=diff ============================================================================== --- geronimo/trunk/applications/pom.xml (original) +++ geronimo/trunk/applications/pom.xml Thu Jul 6 22:17:25 2006 @@ -17,7 +17,11 @@ - + + 4.0.0 @@ -29,48 +33,9 @@ org.apache.geronimo.applications applications-parent + Geronimo :: Applications pom - Geronimo Applications - Geronimo Applications - - - - - maven-war-plugin - - ${basedir}/src/webapp - true - ${basedir}/target/jspweb.xml - - - - org.codehaus.mojo - jspc-maven-plugin - - - jspc - - compile - - - ${basedir}/src/webapp - ${basedir}/src/webapp/WEB-INF/web.xml - - - - - - - - - - tomcat - jasper-runtime - ${jasperVersion} - provided - - - + demo ldap-realm-demo @@ -81,4 +46,16 @@ console welcome + + + + + tomcat + jasper-runtime + ${tomcatVersion} + provided + + + + Modified: geronimo/trunk/applications/remote-deploy/pom.xml URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/remote-deploy/pom.xml?rev=419805&r1=419804&r2=419805&view=diff ============================================================================== --- geronimo/trunk/applications/remote-deploy/pom.xml (original) +++ geronimo/trunk/applications/remote-deploy/pom.xml Thu Jul 6 22:17:25 2006 @@ -17,7 +17,11 @@ - + + 4.0.0 @@ -29,7 +33,7 @@ geronimo-remote-deploy war - Geronimo Remote Deploy Application + Geronimo Applications :: Remote Deploy This application is essentially a servlet that accepts file upload requests from remote clients, which is necessary for remote @@ -46,8 +50,28 @@ org.apache.geronimo.modules geronimo-kernel - ${geronimoVersion} + ${pom.version} + + + + + tomcat + jasper-runtime + + + + + org.codehaus.mojo + jspc-maven-plugin + + + + org.apache.maven.plugins + maven-war-plugin + + + Modified: geronimo/trunk/applications/uddi-db/pom.xml URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/uddi-db/pom.xml?rev=419805&r1=419804&r2=419805&view=diff ============================================================================== --- geronimo/trunk/applications/uddi-db/pom.xml (original) +++ geronimo/trunk/applications/uddi-db/pom.xml Thu Jul 6 22:17:25 2006 @@ -17,7 +17,11 @@ - + + 4.0.0 @@ -28,14 +32,33 @@ geronimo-uddi-db - Geronimo UDDI Server Database - Geronimo UDDI Server Database - + Geronimo Applications :: UDDI Server Database + + + + org.apache.geronimo.specs + geronimo-j2ee_1.4_spec + provided + + + + juddi + juddi + ${juddiVersion} + provided + + + + + tomcat + jasper-runtime + + + - - ${basedir}/target/resources + ${pom.basedir}/target/resources @@ -49,15 +72,32 @@ + + - + url="jdbc:derby:${derby.system.home}/UddiDatabase;create=true" + userid="" + password="" + autocommit="true" + onerror="continue" + delimiter=";"> + + + + - + @@ -68,6 +108,25 @@ + + + + org.apache.derby + derby + + ${derbyVersion} + + + + + + org.codehaus.mojo + jspc-maven-plugin + + + + org.apache.maven.plugins + maven-war-plugin Modified: geronimo/trunk/applications/uddi-server/pom.xml URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/uddi-server/pom.xml?rev=419805&r1=419804&r2=419805&view=diff ============================================================================== --- geronimo/trunk/applications/uddi-server/pom.xml (original) +++ geronimo/trunk/applications/uddi-server/pom.xml Thu Jul 6 22:17:25 2006 @@ -17,7 +17,11 @@ - + + 4.0.0 @@ -29,21 +33,41 @@ geronimo-uddi-server war - Geronimo UDDI Server - Geronimo UDDI Server - + Geronimo Applications :: UDDI Server + org.apache.geronimo.specs geronimo-j2ee_1.4_spec provided + juddi juddi ${juddiVersion} provided + + + + tomcat + jasper-runtime + + + + + + org.codehaus.mojo + jspc-maven-plugin + + + + org.apache.maven.plugins + maven-war-plugin + + + Modified: geronimo/trunk/applications/welcome/pom.xml URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/welcome/pom.xml?rev=419805&r1=419804&r2=419805&view=diff ============================================================================== --- geronimo/trunk/applications/welcome/pom.xml (original) +++ geronimo/trunk/applications/welcome/pom.xml Thu Jul 6 22:17:25 2006 @@ -17,7 +17,11 @@ - + + 4.0.0 @@ -29,7 +33,7 @@ geronimo-welcome war - Geronimo Welcome Application + Geronimo Applications :: Welcome This is a very simple application that is intended to serve as the default page that can be viewed when the server is first installed so that someone can see @@ -40,18 +44,42 @@ org.apache.geronimo.modules geronimo-kernel + ${pom.version} provided + org.apache.geronimo.modules geronimo-system + ${pom.version} provided + org.apache.geronimo.specs geronimo-j2ee_1.4_spec provided + + + + tomcat + jasper-runtime + + + + + + org.codehaus.mojo + jspc-maven-plugin + + + + org.apache.maven.plugins + maven-war-plugin + + + Modified: geronimo/trunk/configs/activemq-broker/pom.xml URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/activemq-broker/pom.xml?rev=419805&r1=419804&r2=419805&view=diff ============================================================================== --- geronimo/trunk/configs/activemq-broker/pom.xml (original) +++ geronimo/trunk/configs/activemq-broker/pom.xml Thu Jul 6 22:17:25 2006 @@ -16,6 +16,7 @@ --> + 4.0.0 @@ -26,53 +27,35 @@ ../pom.xml - org.apache.geronimo.configs activemq-broker + Geronimo Configs :: ActiveMQ Broker car - ActiveMQ Broker Configuration - - - - - - org.apache.geronimo.plugins - geronimo-packaging-plugin - true - - - - - - - - - + + org.apache.geronimo.configs system-database - ${geronimoVersion} + ${pom.version} car activemq activemq-core - ${activeMqVersion} activemq activemq-gbean-g1_1 - ${activeMqVersion} activemq activemq-gbean-management-g1_1 - ${activeMqVersion} - + + Modified: geronimo/trunk/configs/activemq/pom.xml URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/activemq/pom.xml?rev=419805&r1=419804&r2=419805&view=diff ============================================================================== --- geronimo/trunk/configs/activemq/pom.xml (original) +++ geronimo/trunk/configs/activemq/pom.xml Thu Jul 6 22:17:25 2006 @@ -16,6 +16,7 @@ --> + 4.0.0 @@ -26,54 +27,48 @@ ../pom.xml - org.apache.geronimo.configs activemq + Geronimo Configs :: ActiveMQ car - Activemq Configuration - - - - - - org.apache.geronimo.plugins - geronimo-packaging-plugin - true - - ${j2eeNowebServer} - ${settings.localRepository}/org/apache/geronimo/modules/ge-activemq-rar/${geronimoVersion}/ge-activemq-rar-${geronimoVersion}.rar - - - - - - - localhost - 61616 - - - - - - + + org.apache.geronimo.configs activemq-broker + ${pom.version} car + org.apache.geronimo.configs system-database + ${pom.version} car org.apache.geronimo.modules ge-activemq-rar + ${pom.version} rar + + + + + org.apache.geronimo.plugins + geronimo-packaging-plugin + + ${j2eeNowebServer} + ${settings.localRepository}/org/apache/geronimo/modules/ge-activemq-rar/${pom.version}/ge-activemq-rar-${pom.version}.rar + + + + + Modified: geronimo/trunk/configs/axis-deployer/pom.xml URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/axis-deployer/pom.xml?rev=419805&r1=419804&r2=419805&view=diff ============================================================================== --- geronimo/trunk/configs/axis-deployer/pom.xml (original) +++ geronimo/trunk/configs/axis-deployer/pom.xml Thu Jul 6 22:17:25 2006 @@ -28,69 +28,35 @@ axis-deployer + Geronimo Configs :: Axis Deployer car - Axis Configuration for performing J2EE deployments - - - - - org.apache.geronimo.plugins - geronimo-packaging-plugin - true - - - - - - - - org.apache.geronimo.configs j2ee-deployer - ${geronimoVersion} + ${pom.version} car org.apache.geronimo.modules geronimo-axis + ${pom.version} org.apache.geronimo.modules geronimo-axis-builder + ${pom.version} org.apache.geronimo.modules geronimo-webservices - - - - openejb - openejb-pkgen-builder - ${openejbVersion} - - - - openejb - openejb-core - ${openejbVersion} - - - - tranql - tranql - ${tranqlVersion} - - - - org.apache.geronimo.modules - geronimo-web-builder + ${pom.version} + Modified: geronimo/trunk/configs/axis/pom.xml URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/axis/pom.xml?rev=419805&r1=419804&r2=419805&view=diff ============================================================================== --- geronimo/trunk/configs/axis/pom.xml (original) +++ geronimo/trunk/configs/axis/pom.xml Thu Jul 6 22:17:25 2006 @@ -16,6 +16,7 @@ --> + 4.0.0 @@ -27,36 +28,23 @@ axis + Geronimo Configs :: Axis car - Axis Configuration for the J2EE Server - - - - - org.apache.geronimo.plugins - geronimo-packaging-plugin - true - - - - - - - - org.apache.geronimo.configs j2ee-server - ${geronimoVersion} + ${pom.version} car org.apache.geronimo.modules geronimo-axis + ${pom.version} + Modified: geronimo/trunk/configs/client-corba/pom.xml URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/client-corba/pom.xml?rev=419805&r1=419804&r2=419805&view=diff ============================================================================== --- geronimo/trunk/configs/client-corba/pom.xml (original) +++ geronimo/trunk/configs/client-corba/pom.xml Thu Jul 6 22:17:25 2006 @@ -27,48 +27,17 @@ ../pom.xml - org.apache.geronimo.configs client-corba + Geronimo Configs :: Corba J2EE Client car - Corba Configuration for the J2EE Client - - - localhost - 1050 - localhost - 2001 - 8080 - 8443 - 4201 - localhost - 127.0.0.1 - 4242 - - - - - - org.apache.geronimo.plugins - geronimo-packaging-plugin - true - - ${gbeanDeployer},${j2eeDeployer},${openejbDeployer},${axisDeployer} - - - - - - - - - + org.apache.geronimo.configs client - ${geronimoVersion} + ${pom.version} car @@ -76,16 +45,29 @@ org.apache.geronimo.configs openejb-deployer - ${geronimoVersion} + ${pom.version} car provided - openejb + org.openejb openejb-core - ${openejbVersion} - + + + + + + + org.apache.geronimo.plugins + geronimo-packaging-plugin + + ${gbeanDeployer},${j2eeDeployer},${openejbDeployer},${axisDeployer} + + + + + Modified: geronimo/trunk/configs/client-deployer/pom.xml URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/client-deployer/pom.xml?rev=419805&r1=419804&r2=419805&view=diff ============================================================================== --- geronimo/trunk/configs/client-deployer/pom.xml (original) +++ geronimo/trunk/configs/client-deployer/pom.xml Thu Jul 6 22:17:25 2006 @@ -27,32 +27,16 @@ ../pom.xml - org.apache.geronimo.configs client-deployer + Geronimo Configs :: Application Client Deployments car - Configuration for Application Client Deployments - - - - - org.apache.geronimo.plugins - geronimo-packaging-plugin - true - - - - - - - - org.apache.geronimo.configs j2ee-deployer - ${geronimoVersion} + ${pom.version} car @@ -66,84 +50,82 @@ org.apache.geronimo.modules geronimo-management + ${pom.version} org.apache.geronimo.modules geronimo-transaction + ${pom.version} + org.apache.geronimo.modules geronimo-j2ee-builder + ${pom.version} org.apache.geronimo.modules geronimo-client-builder + ${pom.version} org.apache.geronimo.modules geronimo-naming-builder + ${pom.version} - + org.apache.geronimo.modules geronimo-naming + ${pom.version} org.apache.geronimo.modules geronimo-security-builder + ${pom.version} - + org.apache.geronimo.modules geronimo-security + ${pom.version} + org.apache.geronimo.modules geronimo-axis + ${pom.version} org.apache.geronimo.modules geronimo-webservices + ${pom.version} org.apache.geronimo.modules geronimo-connector-builder + ${pom.version} - + org.apache.geronimo.modules geronimo-connector + ${pom.version} org.apache.geronimo.modules geronimo-web-builder - - - - - openejb - openejb-pkgen-builder - ${openejbVersion} - - - - openejb - openejb-core - ${openejbVersion} - - - - tranql - tranql - ${tranqlVersion} + ${pom.version} + + Modified: geronimo/trunk/configs/client-security/pom.xml URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/client-security/pom.xml?rev=419805&r1=419804&r2=419805&view=diff ============================================================================== --- geronimo/trunk/configs/client-security/pom.xml (original) +++ geronimo/trunk/configs/client-security/pom.xml Thu Jul 6 22:17:25 2006 @@ -27,70 +27,60 @@ ../pom.xml - org.apache.geronimo.configs client-security + Geronimo Configs :: J2EE Client Security car - Security Configuration for the J2EE Client - - - 8080 - 8443 - 4201 - localhost - 127.0.0.1 - 4242 - - - - - - - org.apache.geronimo.plugins - geronimo-packaging-plugin - true - - ${gbeanDeployer},${j2eeDeployer} - - - - - - - - - + org.apache.geronimo.configs client - ${geronimoVersion} + ${pom.version} car + org.apache.geronimo.configs j2ee-deployer - ${geronimoVersion} + ${pom.version} car provided + org.apache.geronimo.modules geronimo-security + ${pom.version} + + + + + org.apache.geronimo.plugins + geronimo-packaging-plugin + + ${gbeanDeployer},${j2eeDeployer} + + + + + Modified: geronimo/trunk/configs/client-system/pom.xml URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/client-system/pom.xml?rev=419805&r1=419804&r2=419805&view=diff ============================================================================== --- geronimo/trunk/configs/client-system/pom.xml (original) +++ geronimo/trunk/configs/client-system/pom.xml Thu Jul 6 22:17:25 2006 @@ -29,23 +29,50 @@ client-system + Geronimo Configs :: Client System car - System Configuration for the J2EE Client + + + + org.apache.geronimo.modules + geronimo-kernel + ${pom.version} + + + + + org.apache.geronimo.modules + geronimo-system + ${pom.version} + + + + + xerces + xercesImpl + + + + xerces + xmlParserAPIs + + + + org.apache.geronimo.plugins geronimo-packaging-plugin - true ../lib/geronimo-qname_1.1_spec-${geronimoSpecQnameVersion}.jar \ - ../lib/geronimo-common-${geronimoVersion}.jar \ - ../lib/geronimo-kernel-${geronimoVersion}.jar \ - ../lib/geronimo-system-${geronimoVersion}.jar \ - ../lib/geronimo-util-${geronimoVersion}.jar \ + ../lib/geronimo-common-${pom.version}.jar \ + ../lib/geronimo-kernel-${pom.version}.jar \ + ../lib/geronimo-system-${pom.version}.jar \ + ../lib/geronimo-util-${pom.version}.jar \ ../lib/cglib-nodep-${cglibVersion}.jar \ ../lib/commons-cli-${commonsCliVersion}.jar \ ../lib/commons-logging-${commonsLoggingVersion}.jar \ @@ -63,35 +90,4 @@ - - - - - - - - org.apache.geronimo.modules - geronimo-kernel - - - - - org.apache.geronimo.modules - geronimo-system - - - - - xerces - xercesImpl - ${xercesVersion} - - - - xerces - xmlParserAPIs - ${xmlParserApisVersion} - - - Modified: geronimo/trunk/configs/client/pom.xml URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/client/pom.xml?rev=419805&r1=419804&r2=419805&view=diff ============================================================================== --- geronimo/trunk/configs/client/pom.xml (original) +++ geronimo/trunk/configs/client/pom.xml Thu Jul 6 22:17:25 2006 @@ -27,59 +27,40 @@ ../pom.xml - org.apache.geronimo.configs client + Geronimo Configs :: J2EE Client car - Configuration for the J2EE Client - - - 8080 - 8443 - 1099 - 4201 - localhost - 127.0.0.1 - 4242 - - - - - - - org.apache.geronimo.plugins - geronimo-packaging-plugin - true - - - - - - - + org.apache.geronimo.configs client-system - ${geronimoVersion} + ${pom.version} car org.apache.geronimo.modules geronimo-activation + ${pom.version} + org.apache.geronimo.modules geronimo-connector + ${pom.version} + org.apache.geronimo.modules geronimo-core + ${pom.version} + + org.apache.geronimo.modules geronimo-naming + ${pom.version} + org.apache.geronimo.modules geronimo-management + ${pom.version} org.apache.geronimo.modules geronimo-transaction + ${pom.version} + + org.apache.geronimo.modules geronimo-client + ${pom.version} + org.apache.geronimo.modules geronimo-axis + ${pom.version} org.apache.geronimo.modules geronimo-webservices + ${pom.version} + - + + concurrent concurrent - + + geronimo-spec geronimo-spec-corba + org.apache.geronimo.specs geronimo-j2ee_1.4_spec + + Modified: geronimo/trunk/configs/console-jetty/pom.xml URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/console-jetty/pom.xml?rev=419805&r1=419804&r2=419805&view=diff ============================================================================== --- geronimo/trunk/configs/console-jetty/pom.xml (original) +++ geronimo/trunk/configs/console-jetty/pom.xml Thu Jul 6 22:17:25 2006 @@ -27,172 +27,183 @@ ../pom.xml - org.apache.geronimo.configs webconsole-jetty + Geronimo Configs :: Console Jetty car - Web console deployed on jetty - - - - - org.apache.geronimo.plugins - geronimo-packaging-plugin - true - - ${j2eeJettyServer} - ${settings.localRepository}/org/apache/geronimo/applications/console/geronimo-console/${geronimoVersion}/geronimo-console-${geronimoVersion}.ear - - - - - - - - - + + org.apache.geronimo.configs j2ee-server + ${pom.version} car org.apache.geronimo.configs system-database + ${pom.version} car + org.apache.geronimo.configs j2ee-security + ${pom.version} car + org.apache.geronimo.configs jetty-deployer + ${pom.version} car provided - org.apache.pluto - pluto - ${plutoVersion} - - - - portlet-api - portlet-api - ${portletApiVersion} - - - org.apache.geronimo.applications.console geronimo-console-core - ${geronimoVersion} + ${pom.version} org.apache.geronimo.applications.console geronimo-console - ${geronimoVersion} + ${pom.version} ear org.apache.geronimo.modules geronimo-converter + ${pom.version} org.apache.geronimo.modules geronimo-connector-builder + ${pom.version} org.apache.geronimo.modules geronimo-deploy-jsr88 + ${pom.version} org.apache.geronimo.modules geronimo-deploy-config + ${pom.version} org.apache.geronimo.modules geronimo-j2ee-schema + ${pom.version} org.apache.geronimo.modules geronimo-jetty + ${pom.version} org.apache.geronimo.modules geronimo-management + ${pom.version} org.apache.geronimo.modules geronimo-naming-builder + ${pom.version} org.apache.geronimo.modules geronimo-security-builder + ${pom.version} org.apache.geronimo.modules geronimo-service-builder + ${pom.version} org.apache.geronimo.modules geronimo-test-ddbean + ${pom.version} org.apache.geronimo.modules geronimo-upgrade + ${pom.version} org.apache.geronimo.modules geronimo-util + ${pom.version} activemq activemq-gbean-g1_1 - ${activeMqVersion} + activemq activemq-gbean-management-g1_1 - ${activeMqVersion} jdom jdom - ${jdomVersion} + xmlbeans xbean - ${xmlbeansVersion} stax stax-api - ${staxApiVersion} + + + org.apache.pluto + pluto + + + + portlet-api + portlet-api + + + + + + + org.apache.geronimo.plugins + geronimo-packaging-plugin + + ${j2eeJettyServer} + ${settings.localRepository}/org/apache/geronimo/applications/console/geronimo-console/${pom.version}/geronimo-console-${pom.version}.ear + + + + +