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 2008/01/23 00:00:03 UTC
svn commit: r614367 [1/8] - in /geronimo/server/trunk: ./ applications/
applications/ca-helper/ca-helper-jetty/
applications/ca-helper/ca-helper-tomcat/
applications/ca-helper/geronimo-ca-helper/ applications/geronimo-uddi-db/
applications/mejb/ applic...
Author: jdillon
Date: Tue Jan 22 14:59:41 2008
New Revision: 614367
URL: http://svn.apache.org/viewvc?rev=614367&view=rev
Log:
(GERONIMO-3747) Fixed parentage of module groups, though most still need to have their modules put into the proper groupId
Updated groupId of *everything* under framework/** to org.apache.geronimo.framework, and did my best to update all references
Modified:
geronimo/server/trunk/applications/ca-helper/ca-helper-jetty/pom.xml
geronimo/server/trunk/applications/ca-helper/ca-helper-tomcat/pom.xml
geronimo/server/trunk/applications/ca-helper/geronimo-ca-helper/pom.xml
geronimo/server/trunk/applications/geronimo-uddi-db/pom.xml
geronimo/server/trunk/applications/mejb/geronimo-mejb/pom.xml
geronimo/server/trunk/applications/mejb/mejb/pom.xml
geronimo/server/trunk/applications/mejb/pom.xml
geronimo/server/trunk/applications/monitoring/agent-ds/pom.xml
geronimo/server/trunk/applications/monitoring/agent-ds/src/main/plan/plan.xml
geronimo/server/trunk/applications/monitoring/agent-ear/pom.xml
geronimo/server/trunk/applications/monitoring/agent-ear/src/main/resources/MonitorDBPool.xml
geronimo/server/trunk/applications/monitoring/agent-ejb/pom.xml
geronimo/server/trunk/applications/monitoring/agent-ejb/src/main/resources/META-INF/openejb-jar.xml
geronimo/server/trunk/applications/monitoring/agent-jar/pom.xml
geronimo/server/trunk/applications/monitoring/agent-sql/pom.xml
geronimo/server/trunk/applications/monitoring/agent/pom.xml
geronimo/server/trunk/applications/monitoring/mconsole-ds/pom.xml
geronimo/server/trunk/applications/monitoring/mconsole-ds/src/main/plan/plan.xml
geronimo/server/trunk/applications/monitoring/mconsole-ear/pom.xml
geronimo/server/trunk/applications/monitoring/mconsole-ear/src/main/resources/MonitoringClientPool.xml
geronimo/server/trunk/applications/monitoring/mconsole-jetty/pom.xml
geronimo/server/trunk/applications/monitoring/mconsole-tomcat/pom.xml
geronimo/server/trunk/applications/monitoring/mconsole-war/pom.xml
geronimo/server/trunk/applications/monitoring/pom.xml
geronimo/server/trunk/applications/pom.xml
geronimo/server/trunk/applications/remote-deploy/geronimo-remote-deploy/pom.xml
geronimo/server/trunk/applications/remote-deploy/pom.xml
geronimo/server/trunk/applications/remote-deploy/remote-deploy-jetty/pom.xml
geronimo/server/trunk/applications/remote-deploy/remote-deploy-tomcat/pom.xml
geronimo/server/trunk/applications/sharedlib/pom.xml
geronimo/server/trunk/applications/uddi-server/geronimo-uddi-server/pom.xml
geronimo/server/trunk/applications/uddi-server/pom.xml
geronimo/server/trunk/applications/uddi-server/uddi-jetty6/pom.xml
geronimo/server/trunk/applications/uddi-server/uddi-tomcat/pom.xml
geronimo/server/trunk/applications/welcome/geronimo-welcome/pom.xml
geronimo/server/trunk/applications/welcome/pom.xml
geronimo/server/trunk/applications/welcome/welcome-jetty/pom.xml
geronimo/server/trunk/applications/welcome/welcome-tomcat/pom.xml
geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml
geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/assembly/boilerplate.xml
geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/underlay/etc/gsh-classworlds.conf
geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml
geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/pom.xml
geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml
geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/pom.xml
geronimo/server/trunk/assemblies/pom.xml
geronimo/server/trunk/buildsupport/buildsupport-maven-plugin/pom.xml
geronimo/server/trunk/buildsupport/car-maven-plugin/pom.xml
geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system-2/pom.xml
geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/j2ee-system/pom.xml
geronimo/server/trunk/buildsupport/car-maven-plugin/src/it/metadatageneration/pom.xml
geronimo/server/trunk/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java
geronimo/server/trunk/buildsupport/geronimo-maven-plugin/pom.xml
geronimo/server/trunk/buildsupport/pom.xml
geronimo/server/trunk/buildsupport/testsuite-archetype-plugin/pom.xml
geronimo/server/trunk/buildsupport/testsuite-maven-plugin/pom.xml
geronimo/server/trunk/components/pom.xml
geronimo/server/trunk/components/spring/pom.xml
geronimo/server/trunk/components/transformer-agent/pom.xml
geronimo/server/trunk/components/upgrade/pom.xml
geronimo/server/trunk/framework/configs/client-system/pom.xml
geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/pom.xml
geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/pom.xml
geronimo/server/trunk/framework/configs/j2ee-security/pom.xml
geronimo/server/trunk/framework/configs/j2ee-system/pom.xml
geronimo/server/trunk/framework/configs/jee-specs/pom.xml
geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml
geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml
geronimo/server/trunk/framework/configs/offline-deployer/pom.xml
geronimo/server/trunk/framework/configs/online-deployer/pom.xml
geronimo/server/trunk/framework/configs/plugin/pom.xml
geronimo/server/trunk/framework/configs/pom.xml
geronimo/server/trunk/framework/configs/rmi-naming/pom.xml
geronimo/server/trunk/framework/configs/server-security-config/pom.xml
geronimo/server/trunk/framework/configs/shutdown/pom.xml
geronimo/server/trunk/framework/configs/upgrade-cli/pom.xml
geronimo/server/trunk/framework/configs/xmlbeans/pom.xml
geronimo/server/trunk/framework/modules/geronimo-cli/pom.xml
geronimo/server/trunk/framework/modules/geronimo-commands/pom.xml
geronimo/server/trunk/framework/modules/geronimo-common/pom.xml
geronimo/server/trunk/framework/modules/geronimo-core/pom.xml
geronimo/server/trunk/framework/modules/geronimo-deploy-config/pom.xml
geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88-bootstrapper/pom.xml
geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/pom.xml
geronimo/server/trunk/framework/modules/geronimo-deploy-tool/pom.xml
geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/OfflineDeployerStarter.java
geronimo/server/trunk/framework/modules/geronimo-deployment/pom.xml
geronimo/server/trunk/framework/modules/geronimo-interceptor/pom.xml
geronimo/server/trunk/framework/modules/geronimo-j2ee/pom.xml
geronimo/server/trunk/framework/modules/geronimo-jdbc/pom.xml
geronimo/server/trunk/framework/modules/geronimo-jmx-remoting/pom.xml
geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml
geronimo/server/trunk/framework/modules/geronimo-management/pom.xml
geronimo/server/trunk/framework/modules/geronimo-naming/pom.xml
geronimo/server/trunk/framework/modules/geronimo-plugin/pom.xml
geronimo/server/trunk/framework/modules/geronimo-security/pom.xml
geronimo/server/trunk/framework/modules/geronimo-service-builder/pom.xml
geronimo/server/trunk/framework/modules/geronimo-system/pom.xml
geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/util/ConfiguredEncryption.java
geronimo/server/trunk/framework/modules/geronimo-transformer/pom.xml
geronimo/server/trunk/framework/modules/geronimo-upgrade/pom.xml
geronimo/server/trunk/framework/modules/geronimo-util/pom.xml
geronimo/server/trunk/framework/modules/pom.xml
geronimo/server/trunk/framework/pom.xml
geronimo/server/trunk/plugins/activemq/activemq-broker/pom.xml
geronimo/server/trunk/plugins/activemq/activemq-console-jetty/pom.xml
geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/pom.xml
geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml
geronimo/server/trunk/plugins/activemq/activemq-ra/pom.xml
geronimo/server/trunk/plugins/activemq/geronimo-activemq-management/pom.xml
geronimo/server/trunk/plugins/activemq/geronimo-activemq-ra/pom.xml
geronimo/server/trunk/plugins/activemq/geronimo-activemq/pom.xml
geronimo/server/trunk/plugins/activemq/pom.xml
geronimo/server/trunk/plugins/axis/axis-deployer/pom.xml
geronimo/server/trunk/plugins/axis/axis/pom.xml
geronimo/server/trunk/plugins/axis/geronimo-axis-builder/pom.xml
geronimo/server/trunk/plugins/axis/geronimo-axis/pom.xml
geronimo/server/trunk/plugins/axis/pom.xml
geronimo/server/trunk/plugins/axis2/axis2-deployer/pom.xml
geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/pom.xml
geronimo/server/trunk/plugins/axis2/axis2-ejb/pom.xml
geronimo/server/trunk/plugins/axis2/axis2/pom.xml
geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/pom.xml
geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb-builder/pom.xml
geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb/pom.xml
geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml
geronimo/server/trunk/plugins/axis2/pom.xml
geronimo/server/trunk/plugins/client/client-deployer/pom.xml
geronimo/server/trunk/plugins/client/client-security/pom.xml
geronimo/server/trunk/plugins/client/client/pom.xml
geronimo/server/trunk/plugins/client/geronimo-client-builder/pom.xml
geronimo/server/trunk/plugins/client/geronimo-client/pom.xml
geronimo/server/trunk/plugins/client/pom.xml
geronimo/server/trunk/plugins/clustering/clustering/pom.xml
geronimo/server/trunk/plugins/clustering/farming/pom.xml
geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml
geronimo/server/trunk/plugins/clustering/geronimo-clustering/pom.xml
geronimo/server/trunk/plugins/clustering/geronimo-farm/pom.xml
geronimo/server/trunk/plugins/clustering/pom.xml
geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml
geronimo/server/trunk/plugins/connector/client-transaction/pom.xml
geronimo/server/trunk/plugins/connector/connector-deployer/pom.xml
geronimo/server/trunk/plugins/connector/geronimo-connector-builder/pom.xml
geronimo/server/trunk/plugins/connector/geronimo-connector/pom.xml
geronimo/server/trunk/plugins/connector/geronimo-transaction/pom.xml
geronimo/server/trunk/plugins/connector/pom.xml
geronimo/server/trunk/plugins/connector/transaction/pom.xml
geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml
geronimo/server/trunk/plugins/console/console-core/pom.xml
geronimo/server/trunk/plugins/console/console-ear/pom.xml
geronimo/server/trunk/plugins/console/console-jetty/pom.xml
geronimo/server/trunk/plugins/console/console-portal-driver/pom.xml
geronimo/server/trunk/plugins/console/console-tomcat/pom.xml
geronimo/server/trunk/plugins/console/geronimo-converter/pom.xml
geronimo/server/trunk/plugins/console/plugin-console-jetty/pom.xml
geronimo/server/trunk/plugins/console/plugin-console-tomcat/pom.xml
geronimo/server/trunk/plugins/console/plugin-portlets/pom.xml
geronimo/server/trunk/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java
geronimo/server/trunk/plugins/console/pom.xml
geronimo/server/trunk/plugins/corba/client-corba-yoko/pom.xml
geronimo/server/trunk/plugins/corba/geronimo-corba-builder/pom.xml
geronimo/server/trunk/plugins/corba/geronimo-corba/pom.xml
geronimo/server/trunk/plugins/corba/geronimo-yoko/pom.xml
geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/pom.xml
geronimo/server/trunk/plugins/corba/openejb-corba-deployer/pom.xml
geronimo/server/trunk/plugins/corba/pom.xml
geronimo/server/trunk/plugins/cxf/cxf-deployer/pom.xml
geronimo/server/trunk/plugins/cxf/cxf-ejb-deployer/pom.xml
geronimo/server/trunk/plugins/cxf/cxf-ejb/pom.xml
geronimo/server/trunk/plugins/cxf/cxf/pom.xml
geronimo/server/trunk/plugins/cxf/geronimo-cxf-builder/pom.xml
geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb-builder/pom.xml
geronimo/server/trunk/plugins/cxf/geronimo-cxf-ejb/pom.xml
geronimo/server/trunk/plugins/cxf/geronimo-cxf/pom.xml
geronimo/server/trunk/plugins/cxf/pom.xml
geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/pom.xml
geronimo/server/trunk/plugins/debugviews/debugviews-console-tomcat/pom.xml
geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml
geronimo/server/trunk/plugins/debugviews/pom.xml
geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-jetty6/pom.xml
geronimo/server/trunk/plugins/dojo-legacy/dojo-legacy-tomcat/pom.xml
geronimo/server/trunk/plugins/dojo-legacy/geronimo-dojo-legacy/pom.xml
geronimo/server/trunk/plugins/dojo-legacy/pom.xml
geronimo/server/trunk/plugins/dojo/dojo-jetty6/pom.xml
geronimo/server/trunk/plugins/dojo/dojo-tomcat/pom.xml
geronimo/server/trunk/plugins/dojo/geronimo-dojo/pom.xml
geronimo/server/trunk/plugins/dojo/pom.xml
geronimo/server/trunk/plugins/hotdeploy/geronimo-hot-deploy/pom.xml
geronimo/server/trunk/plugins/hotdeploy/hot-deployer/pom.xml
geronimo/server/trunk/plugins/hotdeploy/pom.xml
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/pom.xml
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-schema/pom.xml
geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/pom.xml
geronimo/server/trunk/plugins/j2ee/geronimo-security-builder/pom.xml
geronimo/server/trunk/plugins/j2ee/geronimo-test-ddbean/pom.xml
geronimo/server/trunk/plugins/j2ee/geronimo-web-2.5-builder/pom.xml
geronimo/server/trunk/plugins/j2ee/j2ee-deployer/pom.xml
geronimo/server/trunk/plugins/j2ee/j2ee-server/pom.xml
geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/pom.xml
geronimo/server/trunk/plugins/j2ee/jsr88-jar-configurer/pom.xml
geronimo/server/trunk/plugins/j2ee/jsr88-rar-configurer/pom.xml
geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/pom.xml
geronimo/server/trunk/plugins/j2ee/pom.xml
geronimo/server/trunk/plugins/j2ee/unavailable-client-deployer/pom.xml
geronimo/server/trunk/plugins/j2ee/unavailable-ejb-deployer/pom.xml
geronimo/server/trunk/plugins/j2ee/unavailable-webservices-deployer/pom.xml
geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/pom.xml
geronimo/server/trunk/plugins/jasper/geronimo-jasper/pom.xml
geronimo/server/trunk/plugins/jasper/jasper-deployer/pom.xml
geronimo/server/trunk/plugins/jasper/jasper/pom.xml
geronimo/server/trunk/plugins/jasper/pom.xml
geronimo/server/trunk/plugins/javamail/geronimo-mail/pom.xml
geronimo/server/trunk/plugins/javamail/javamail/pom.xml
geronimo/server/trunk/plugins/javamail/pom.xml
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/pom.xml
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-ejb-builder/pom.xml
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml
geronimo/server/trunk/plugins/jaxws/jaxws-deployer/pom.xml
geronimo/server/trunk/plugins/jaxws/jaxws-ejb-deployer/pom.xml
geronimo/server/trunk/plugins/jaxws/jaxws-tools/pom.xml
geronimo/server/trunk/plugins/jaxws/pom.xml
geronimo/server/trunk/plugins/jetty/geronimo-jetty6-builder/pom.xml
geronimo/server/trunk/plugins/jetty/geronimo-jetty6-clustering-builder-wadi/pom.xml
geronimo/server/trunk/plugins/jetty/geronimo-jetty6-clustering-wadi/pom.xml
geronimo/server/trunk/plugins/jetty/geronimo-jetty6/pom.xml
geronimo/server/trunk/plugins/jetty/jetty6-clustering-builder-wadi/pom.xml
geronimo/server/trunk/plugins/jetty/jetty6-clustering-wadi/pom.xml
geronimo/server/trunk/plugins/jetty/jetty6-deployer/pom.xml
geronimo/server/trunk/plugins/jetty/jetty6/pom.xml
geronimo/server/trunk/plugins/jetty/pom.xml
geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/pom.xml
geronimo/server/trunk/plugins/myfaces/geronimo-myfaces/pom.xml
geronimo/server/trunk/plugins/myfaces/myfaces-deployer/pom.xml
geronimo/server/trunk/plugins/myfaces/myfaces/pom.xml
geronimo/server/trunk/plugins/myfaces/pom.xml
geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/pom.xml
geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml
geronimo/server/trunk/plugins/openejb/openejb-deployer/pom.xml
geronimo/server/trunk/plugins/openejb/openejb/pom.xml
geronimo/server/trunk/plugins/openejb/pom.xml
geronimo/server/trunk/plugins/openjpa/geronimo-openjpa/pom.xml
geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10-builder/pom.xml
geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10/pom.xml
geronimo/server/trunk/plugins/openjpa/openjpa/pom.xml
geronimo/server/trunk/plugins/openjpa/persistence-jpa10-deployer/pom.xml
geronimo/server/trunk/plugins/openjpa/pom.xml
geronimo/server/trunk/plugins/plancreator/plancreator-console-jetty/pom.xml
geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/pom.xml
geronimo/server/trunk/plugins/plancreator/plancreator-portlets/pom.xml
geronimo/server/trunk/plugins/plancreator/pom.xml
geronimo/server/trunk/plugins/pluto/geronimo-pluto/pom.xml
geronimo/server/trunk/plugins/pluto/pluto-support/pom.xml
geronimo/server/trunk/plugins/pluto/pom.xml
geronimo/server/trunk/plugins/pom.xml
geronimo/server/trunk/plugins/system-database/geronimo-derby/pom.xml
geronimo/server/trunk/plugins/system-database/geronimo-timer/pom.xml
geronimo/server/trunk/plugins/system-database/pom.xml
geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/pom.xml
geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/pom.xml
geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml
geronimo/server/trunk/plugins/system-database/system-database/pom.xml
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/pom.xml
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-builder-wadi/pom.xml
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-wadi/pom.xml
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml
geronimo/server/trunk/plugins/tomcat/pom.xml
geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-builder-wadi/pom.xml
geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-wadi/pom.xml
geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/pom.xml
geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml
geronimo/server/trunk/plugins/webservices/geronimo-webservices-builder/pom.xml
geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml
geronimo/server/trunk/plugins/webservices/pom.xml
geronimo/server/trunk/plugins/webservices/webservices-common/pom.xml
geronimo/server/trunk/pom.xml
geronimo/server/trunk/repository/pom.xml
geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-war/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-war/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml
geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-war/pom.xml
geronimo/server/trunk/testsuite/pom.xml
geronimo/server/trunk/testsuite/security-testsuite/test-security/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/jaxb-tests/jaxb-ejb/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml
geronimo/server/trunk/testsuite/webservices-testsuite/stax-tests/stax-ejb/pom.xml
geronimo/server/trunk/testsupport/pom.xml
Modified: geronimo/server/trunk/applications/ca-helper/ca-helper-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/ca-helper/ca-helper-jetty/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/applications/ca-helper/ca-helper-jetty/pom.xml (original)
+++ geronimo/server/trunk/applications/ca-helper/ca-helper-jetty/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,22 +23,22 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>configs</artifactId>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>ca-helper</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
-
+
+ <groupId>org.apache.geronimo.configs</groupId>
<artifactId>ca-helper-jetty</artifactId>
<name>Geronimo Configs :: CA Helper app - Jetty</name>
<packaging>car</packaging>
+
<description>
This is a helper application for CA to enable receiving CSR's through
and uploading certificates to web browsers.
</description>
<dependencies>
-
<dependency>
<groupId>org.apache.geronimo.applications</groupId>
<artifactId>geronimo-ca-helper</artifactId>
@@ -54,6 +54,7 @@
<type>car</type>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jasper-deployer</artifactId>
@@ -61,13 +62,13 @@
<type>car</type>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jasper</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
-
</dependencies>
<build>
Modified: geronimo/server/trunk/applications/ca-helper/ca-helper-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/ca-helper/ca-helper-tomcat/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/applications/ca-helper/ca-helper-tomcat/pom.xml (original)
+++ geronimo/server/trunk/applications/ca-helper/ca-helper-tomcat/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,22 +23,22 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>configs</artifactId>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>ca-helper</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
-
+
+ <groupId>org.apache.geronimo.configs</groupId>
<artifactId>ca-helper-tomcat</artifactId>
<name>Geronimo Configs :: CA Helper app - Tomcat</name>
<packaging>car</packaging>
+
<description>
This is a helper application for CA to enable receiving CSR's through
and uploading certificates to web browsers.
</description>
<dependencies>
-
<dependency>
<groupId>org.apache.geronimo.applications</groupId>
<artifactId>geronimo-ca-helper</artifactId>
@@ -54,6 +54,7 @@
<type>car</type>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jasper-deployer</artifactId>
@@ -61,13 +62,13 @@
<type>car</type>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jasper</artifactId>
<version>${version}</version>
<type>car</type>
</dependency>
-
</dependencies>
<build>
Modified: geronimo/server/trunk/applications/ca-helper/geronimo-ca-helper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/ca-helper/geronimo-ca-helper/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/applications/ca-helper/geronimo-ca-helper/pom.xml (original)
+++ geronimo/server/trunk/applications/ca-helper/geronimo-ca-helper/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,12 +23,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.applications</groupId>
- <artifactId>applications</artifactId>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>ca-helper</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
+ <groupId>org.apache.geronimo.applications</groupId>
<artifactId>geronimo-ca-helper</artifactId>
<name>Geronimo Applications :: CA Helper Application</name>
<packaging>war</packaging>
@@ -39,16 +39,15 @@
</description>
<dependencies>
-
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-kernel</artifactId>
<version>${version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-management</artifactId>
<version>${version}</version>
<scope>provided</scope>
@@ -65,7 +64,6 @@
<artifactId>geronimo-jsp_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>
-
</dependencies>
<build>
Modified: geronimo/server/trunk/applications/geronimo-uddi-db/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-uddi-db/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/applications/geronimo-uddi-db/pom.xml (original)
+++ geronimo/server/trunk/applications/geronimo-uddi-db/pom.xml Tue Jan 22 14:59:41 2008
@@ -26,7 +26,6 @@
<groupId>org.apache.geronimo.applications</groupId>
<artifactId>applications</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-uddi-db</artifactId>
Modified: geronimo/server/trunk/applications/mejb/geronimo-mejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/mejb/geronimo-mejb/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/applications/mejb/geronimo-mejb/pom.xml (original)
+++ geronimo/server/trunk/applications/mejb/geronimo-mejb/pom.xml Tue Jan 22 14:59:41 2008
@@ -25,12 +25,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.applications</groupId>
- <artifactId>applications</artifactId>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>mejb</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
-
+
+ <groupId>org.apache.geronimo.applications</groupId>
<artifactId>geronimo-mejb</artifactId>
<name>Geronimo Management EJB :: Stateless Session :: </name>
Modified: geronimo/server/trunk/applications/mejb/mejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/mejb/mejb/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/applications/mejb/mejb/pom.xml (original)
+++ geronimo/server/trunk/applications/mejb/mejb/pom.xml Tue Jan 22 14:59:41 2008
@@ -25,12 +25,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>configs</artifactId>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>mejb</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
+ <groupId>org.apache.geronimo.configs</groupId>
<artifactId>mejb</artifactId>
<name>Geronimo Configs :: Management EJB (MEJB)</name>
<packaging>car</packaging>
Modified: geronimo/server/trunk/applications/mejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/mejb/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/applications/mejb/pom.xml (original)
+++ geronimo/server/trunk/applications/mejb/pom.xml Tue Jan 22 14:59:41 2008
@@ -26,20 +26,19 @@
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>plugins</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>mejb</artifactId>
- <name>Geronimo Plugins :: mejb</name>
+ <name>Geronimo Plugins, MEJB</name>
<packaging>pom</packaging>
<description>
- mejb plugin
+ MEJB plugin
</description>
<modules>
-<module>geronimo-mejb</module>
-<module>mejb</module>
+ <module>geronimo-mejb</module>
+ <module>mejb</module>
</modules>
</project>
Modified: geronimo/server/trunk/applications/monitoring/agent-ds/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/monitoring/agent-ds/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/applications/monitoring/agent-ds/pom.xml (original)
+++ geronimo/server/trunk/applications/monitoring/agent-ds/pom.xml Tue Jan 22 14:59:41 2008
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?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.
+ 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$ -->
@@ -28,7 +28,6 @@
<groupId>org.apache.geronimo.plugins.monitoring</groupId>
<artifactId>monitoring</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.geronimo.plugins</groupId>
@@ -44,21 +43,27 @@
<type>car</type>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>system-database</artifactId>
+ <version>${version}</version>
<type>car</type>
</dependency>
+
<dependency>
<groupId>org.tranql</groupId>
<artifactId>tranql-connector-derby-embed-local</artifactId>
<type>rar</type>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>connector-deployer</artifactId>
+ <version>${version}</version>
<type>car</type>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.plugins.monitoring</groupId>
<artifactId>agent-sql</artifactId>
@@ -86,4 +91,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: geronimo/server/trunk/applications/monitoring/agent-ds/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/monitoring/agent-ds/src/main/plan/plan.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/applications/monitoring/agent-ds/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/applications/monitoring/agent-ds/src/main/plan/plan.xml Tue Jan 22 14:59:41 2008
@@ -1,4 +1,23 @@
<?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}">
<environment>
<moduleId>
@@ -75,10 +94,10 @@
</reference>
</gbean>
<gbean name="ArchiveDSGBean" class="org.apache.geronimo.connector.DatabaseInitializationGBean">
- <attribute name="testSQL">SELECT t.tablename FROM SYS.SYSTABLES t WHERE lower(t.tablename)='statistics'</attribute>
- <attribute name="path">META-INF/database/derby/createTables.sql</attribute>
- <reference name="DataSource">
- <name>jdbc/ArchiveDS</name>
- </reference>
+ <attribute name="testSQL">SELECT t.tablename FROM SYS.SYSTABLES t WHERE lower(t.tablename)='statistics'</attribute>
+ <attribute name="path">META-INF/database/derby/createTables.sql</attribute>
+ <reference name="DataSource">
+ <name>jdbc/ArchiveDS</name>
+ </reference>
</gbean>
</connector>
Modified: geronimo/server/trunk/applications/monitoring/agent-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/monitoring/agent-ear/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/applications/monitoring/agent-ear/pom.xml (original)
+++ geronimo/server/trunk/applications/monitoring/agent-ear/pom.xml Tue Jan 22 14:59:41 2008
@@ -1,23 +1,23 @@
<?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
+ 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
+ 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.
+ 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 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>
@@ -36,7 +36,6 @@
<description>Geronimo Monitoring Agent EAR Module</description>
<dependencies>
-
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>agent-ejb</artifactId>
@@ -75,8 +74,6 @@
</plugin>
</plugins>
</build>
-</project>
-
-
+</project>
Modified: geronimo/server/trunk/applications/monitoring/agent-ear/src/main/resources/MonitorDBPool.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/monitoring/agent-ear/src/main/resources/MonitorDBPool.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/applications/monitoring/agent-ear/src/main/resources/MonitorDBPool.xml (original)
+++ geronimo/server/trunk/applications/monitoring/agent-ear/src/main/resources/MonitorDBPool.xml Tue Jan 22 14:59:41 2008
@@ -1,6 +1,25 @@
<?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-1.1">
- <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+ <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
<dep:moduleId>
<dep:groupId>console.dbpool</dep:groupId>
<dep:artifactId>MonitoringDBPools</dep:artifactId>
Modified: geronimo/server/trunk/applications/monitoring/agent-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/monitoring/agent-ejb/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/applications/monitoring/agent-ejb/pom.xml (original)
+++ geronimo/server/trunk/applications/monitoring/agent-ejb/pom.xml Tue Jan 22 14:59:41 2008
@@ -1,31 +1,31 @@
<?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
+ 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
+ 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.
+ 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 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.monitoring</groupId>
<artifactId>monitoring</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>agent-ejb</artifactId>
@@ -35,38 +35,43 @@
<dependencies>
<!-- TODO get rid of this -->
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-kernel</artifactId>
+ <version>${version}</version>
<scope>provided</scope>
</dependency>
+
<!--TODO GERONIMO-3719 hack fix -->
<dependency>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ejb_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.plugins.monitoring</groupId>
<artifactId>agent-jar</artifactId>
<version>2.1-SNAPSHOT</version>
</dependency>
</dependencies>
-</project>
-
+</project>
Modified: geronimo/server/trunk/applications/monitoring/agent-ejb/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/monitoring/agent-ejb/src/main/resources/META-INF/openejb-jar.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/applications/monitoring/agent-ejb/src/main/resources/META-INF/openejb-jar.xml (original)
+++ geronimo/server/trunk/applications/monitoring/agent-ejb/src/main/resources/META-INF/openejb-jar.xml Tue Jan 22 14:59:41 2008
@@ -1,4 +1,23 @@
<?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$ -->
+
<openejb-jar
xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1"
xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.1"
@@ -23,7 +42,7 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>j2ee-security</artifactId>
<version>2.1-SNAPSHOT</version>
<type>car</type>
Modified: geronimo/server/trunk/applications/monitoring/agent-jar/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/monitoring/agent-jar/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/applications/monitoring/agent-jar/pom.xml (original)
+++ geronimo/server/trunk/applications/monitoring/agent-jar/pom.xml Tue Jan 22 14:59:41 2008
@@ -1,31 +1,31 @@
<?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
+ 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
+ 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.
+ 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: 605412 $ $Date: 2007-12-18 19:58:03 -0800 (Tue, 18 Dec 2007) $ -->
+
<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.monitoring</groupId>
<artifactId>monitoring</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>agent-jar</artifactId>
@@ -35,22 +35,26 @@
<dependencies>
<!-- TODO get rid of this -->
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-kernel</artifactId>
+ <version>${version}</version>
<scope>provided</scope>
</dependency>
+
<!--TODO GERONIMO-3719 hack fix -->
<dependency>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
+
</project>
Modified: geronimo/server/trunk/applications/monitoring/agent-sql/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/monitoring/agent-sql/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/applications/monitoring/agent-sql/pom.xml (original)
+++ geronimo/server/trunk/applications/monitoring/agent-sql/pom.xml Tue Jan 22 14:59:41 2008
@@ -1,27 +1,31 @@
+<?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.
-->
- <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">
+
+<!-- $Rev: 605412 $ $Date: 2007-12-18 19:58:03 -0800 (Tue, 18 Dec 2007) $ -->
+
+<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.monitoring</groupId>
<artifactId>monitoring</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>agent-sql</artifactId>
@@ -30,6 +34,7 @@
<description>
This module carries the Monitoring's SQL scripts for all databases.
</description>
+
<build>
<resources>
<resource>
@@ -39,4 +44,5 @@
</resource>
</resources>
</build>
+
</project>
Modified: geronimo/server/trunk/applications/monitoring/agent/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/monitoring/agent/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/applications/monitoring/agent/pom.xml (original)
+++ geronimo/server/trunk/applications/monitoring/agent/pom.xml Tue Jan 22 14:59:41 2008
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?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.
+ 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$ -->
@@ -28,7 +28,6 @@
<groupId>org.apache.geronimo.plugins.monitoring</groupId>
<artifactId>monitoring</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.geronimo.plugins</groupId>
@@ -44,6 +43,7 @@
<type>car</type>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>agent-ds</artifactId>
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>mejb</artifactId>
- <version>${geronimoVersion}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
</dependencies>
@@ -92,4 +92,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: geronimo/server/trunk/applications/monitoring/mconsole-ds/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/monitoring/mconsole-ds/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/applications/monitoring/mconsole-ds/pom.xml (original)
+++ geronimo/server/trunk/applications/monitoring/mconsole-ds/pom.xml Tue Jan 22 14:59:41 2008
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?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.
+ 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: 592158 $ $Date: 2007-11-05 16:46:54 -0500 (Mon, 05 Nov 2007) $ -->
+<!-- $Rev: 605412 $ $Date: 2007-12-18 19:58:03 -0800 (Tue, 18 Dec 2007) $ -->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -28,7 +28,6 @@
<groupId>org.apache.geronimo.plugins.monitoring</groupId>
<artifactId>monitoring</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.geronimo.plugins</groupId>
@@ -40,16 +39,20 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>system-database</artifactId>
+ <version>${version}</version>
<type>car</type>
</dependency>
+
<dependency>
<groupId>org.tranql</groupId>
<artifactId>tranql-connector-derby-embed-local</artifactId>
<type>rar</type>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>connector-deployer</artifactId>
+ <version>${version}</version>
<type>car</type>
</dependency>
</dependencies>
@@ -73,4 +76,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: geronimo/server/trunk/applications/monitoring/mconsole-ds/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/monitoring/mconsole-ds/src/main/plan/plan.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/applications/monitoring/mconsole-ds/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/applications/monitoring/mconsole-ds/src/main/plan/plan.xml Tue Jan 22 14:59:41 2008
@@ -1,22 +1,22 @@
<?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
+ 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
+ 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.
+ 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: 605412 $ $Date: 2007-12-18 19:58:03 -0800 (Tue, 18 Dec 2007) $ -->
<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-${geronimoSchemaVersion}">
<environment>
Modified: geronimo/server/trunk/applications/monitoring/mconsole-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/monitoring/mconsole-ear/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/applications/monitoring/mconsole-ear/pom.xml (original)
+++ geronimo/server/trunk/applications/monitoring/mconsole-ear/pom.xml Tue Jan 22 14:59:41 2008
@@ -1,23 +1,23 @@
<?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
+ 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
+ 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.
+ 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 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">
@@ -28,7 +28,6 @@
<groupId>org.apache.geronimo.plugins.monitoring</groupId>
<artifactId>monitoring</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>mconsole-ear</artifactId>
@@ -69,7 +68,6 @@
</archive>
</configuration>
</plugin>
-
</plugins>
</build>
Modified: geronimo/server/trunk/applications/monitoring/mconsole-ear/src/main/resources/MonitoringClientPool.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/monitoring/mconsole-ear/src/main/resources/MonitoringClientPool.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/applications/monitoring/mconsole-ear/src/main/resources/MonitoringClientPool.xml (original)
+++ geronimo/server/trunk/applications/monitoring/mconsole-ear/src/main/resources/MonitoringClientPool.xml Tue Jan 22 14:59:41 2008
@@ -1,22 +1,22 @@
<?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
+ 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
+ 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.
+ 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-1.2">
<dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
Modified: geronimo/server/trunk/applications/monitoring/mconsole-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/monitoring/mconsole-jetty/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/applications/monitoring/mconsole-jetty/pom.xml (original)
+++ geronimo/server/trunk/applications/monitoring/mconsole-jetty/pom.xml Tue Jan 22 14:59:41 2008
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?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.
+ 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: 592158 $ $Date: 2007-11-05 16:46:54 -0500 (Mon, 05 Nov 2007) $ -->
+<!-- $Rev: 605412 $ $Date: 2007-12-18 19:58:03 -0800 (Tue, 18 Dec 2007) $ -->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -28,7 +28,6 @@
<groupId>org.apache.geronimo.plugins.monitoring</groupId>
<artifactId>monitoring</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.geronimo.plugins</groupId>
@@ -44,6 +43,7 @@
<type>car</type>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jasper-deployer</artifactId>
@@ -51,6 +51,7 @@
<type>car</type>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>connector-deployer</artifactId>
@@ -58,6 +59,7 @@
<type>car</type>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>mconsole-ds</artifactId>
@@ -68,7 +70,7 @@
<dependency>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>console-jetty</artifactId>
- <version>${geronimoVersion}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
@@ -82,14 +84,14 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>dojo-legacy-jetty6</artifactId>
- <version>${geronimoVersion}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>openejb</artifactId>
- <version>${geronimoVersion}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
</dependencies>
@@ -97,7 +99,6 @@
<build>
<plugins>
<plugin>
-
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>car-maven-plugin</artifactId>
<configuration>
@@ -119,4 +120,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: geronimo/server/trunk/applications/monitoring/mconsole-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/monitoring/mconsole-tomcat/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/applications/monitoring/mconsole-tomcat/pom.xml (original)
+++ geronimo/server/trunk/applications/monitoring/mconsole-tomcat/pom.xml Tue Jan 22 14:59:41 2008
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?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.
+ 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: 592158 $ $Date: 2007-11-05 16:46:54 -0500 (Mon, 05 Nov 2007) $ -->
+<!-- $Rev: 605412 $ $Date: 2007-12-18 19:58:03 -0800 (Tue, 18 Dec 2007) $ -->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -28,7 +28,6 @@
<groupId>org.apache.geronimo.plugins.monitoring</groupId>
<artifactId>monitoring</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.geronimo.plugins</groupId>
@@ -44,6 +43,7 @@
<type>car</type>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jasper-deployer</artifactId>
@@ -51,6 +51,7 @@
<type>car</type>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>connector-deployer</artifactId>
@@ -58,7 +59,8 @@
<type>car</type>
<scope>provided</scope>
</dependency>
- <dependency>
+
+ <dependency>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>mconsole-ds</artifactId>
<version>${monitoringConsoleVersion}</version>
@@ -68,7 +70,7 @@
<dependency>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>console-tomcat</artifactId>
- <version>${geronimoVersion}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
@@ -80,16 +82,16 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>j2ee-security</artifactId>
- <version>${geronimoVersion}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>dojo-legacy-tomcat</artifactId>
- <version>${geronimoVersion}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
@@ -97,7 +99,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>openejb</artifactId>
- <version>${geronimoVersion}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
</dependencies>
@@ -126,4 +128,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: geronimo/server/trunk/applications/monitoring/mconsole-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/monitoring/mconsole-war/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/applications/monitoring/mconsole-war/pom.xml (original)
+++ geronimo/server/trunk/applications/monitoring/mconsole-war/pom.xml Tue Jan 22 14:59:41 2008
@@ -1,23 +1,23 @@
<?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
+ 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
+ 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.
+ 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 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">
@@ -28,7 +28,6 @@
<groupId>org.apache.geronimo.plugins.monitoring</groupId>
<artifactId>monitoring</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>mconsole-war</artifactId>
@@ -39,8 +38,9 @@
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-management</artifactId>
+ <version>${version}</version>
<scope>provided</scope>
</dependency>
@@ -77,7 +77,7 @@
<!-- for jspc maven plugin -->
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>jee-specs</artifactId>
<version>${version}</version>
<type>car</type>
@@ -106,4 +106,5 @@
</plugin>
</plugins>
</build>
+
</project>
Modified: geronimo/server/trunk/applications/monitoring/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/monitoring/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/applications/monitoring/pom.xml (original)
+++ geronimo/server/trunk/applications/monitoring/pom.xml Tue Jan 22 14:59:41 2008
@@ -1,21 +1,19 @@
<?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.
+ 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$ -->
@@ -62,35 +60,16 @@
<artifactId>jsr250-api</artifactId>
<version>1.0</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-kernel</artifactId>
- <version>${geronimoVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-management</artifactId>
- <version>${geronimoVersion}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>system-database</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>connector-deployer</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- </dependency>
</dependencies>
</dependencyManagement>
-
+
+ <dependencies>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ </dependencies>
+
<modules>
<module>agent</module>
<module>agent-ds</module>
@@ -113,6 +92,7 @@
<filtering>true</filtering>
</resource>
</resources>
+
<pluginManagement>
<plugins>
<!-- inheriting configration for war plugin, i,e, precompile JSPs -->
Modified: geronimo/server/trunk/applications/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/applications/pom.xml (original)
+++ geronimo/server/trunk/applications/pom.xml Tue Jan 22 14:59:41 2008
@@ -26,7 +26,6 @@
<groupId>org.apache.geronimo</groupId>
<artifactId>geronimo</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.geronimo.applications</groupId>
@@ -35,7 +34,7 @@
<packaging>pom</packaging>
<modules>
- <module>ca-helper</module>
+ <module>ca-helper</module>
<module>geronimo-uddi-db</module>
<module>mejb</module>
<module>monitoring</module>
Modified: geronimo/server/trunk/applications/remote-deploy/geronimo-remote-deploy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/remote-deploy/geronimo-remote-deploy/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/applications/remote-deploy/geronimo-remote-deploy/pom.xml (original)
+++ geronimo/server/trunk/applications/remote-deploy/geronimo-remote-deploy/pom.xml Tue Jan 22 14:59:41 2008
@@ -23,12 +23,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.geronimo.applications</groupId>
- <artifactId>applications</artifactId>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>remote-deploy</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
+ <groupId>org.apache.geronimo.applications</groupId>
<artifactId>geronimo-remote-deploy</artifactId>
<name>Geronimo Applications :: Remote Deploy</name>
<packaging>war</packaging>
@@ -40,7 +40,6 @@
</description>
<dependencies>
-
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
@@ -48,12 +47,11 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-kernel</artifactId>
<version>${version}</version>
<scope>provided</scope>
</dependency>
-
</dependencies>
<build>
Modified: geronimo/server/trunk/applications/remote-deploy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/remote-deploy/pom.xml?rev=614367&r1=614366&r2=614367&view=diff
==============================================================================
--- geronimo/server/trunk/applications/remote-deploy/pom.xml (original)
+++ geronimo/server/trunk/applications/remote-deploy/pom.xml Tue Jan 22 14:59:41 2008
@@ -26,7 +26,6 @@
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>plugins</artifactId>
<version>2.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>remote-deploy</artifactId>