You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/06/29 01:39:46 UTC
svn commit: r417903 [1/2] - in /geronimo/trunk: ./ applications/
applications/console/ applications/console/console-core/
applications/console/console-ear/ applications/console/console-framework/
applications/console/console-standard/ applications/demo...
Author: jdillon
Date: Wed Jun 28 16:39:43 2006
New Revision: 417903
URL: http://svn.apache.org/viewvc?rev=417903&view=rev
Log:
Applied GERONIMO-2157
Cleaned up pom headers
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/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=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/applications/console/console-core/pom.xml (original)
+++ geronimo/trunk/applications/console/console-core/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,33 +18,34 @@
<!-- $Rev$ $Date$ -->
<project>
- <parent>
- <groupId>org.apache.geronimo.applications.console</groupId>
- <artifactId>console-parent</artifactId>
- <version>1.2-SNAPSHOT</version>
- </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.applications.console</groupId>
+ <artifactId>console-parent</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>geronimo-console-core</artifactId>
- <version>1.2-SNAPSHOT</version>
- <name>Geronimo :: Console :: Common Code</name>
+ <artifactId>geronimo-console-core</artifactId>
+ <name>Geronimo :: Console :: Common Code</name>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-connector</artifactId>
- </dependency>
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j-remote</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-connector</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j-remote</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ </dependency>
+ </dependencies>
- <build>
+ <build>
<!-- resources>
<resource>
<directory>${basedir}/src/resources</directory>
@@ -53,22 +53,22 @@
</resource>
</resources -->
<!-- use the antrun plugin till we get timestamp plugin from Geronimo-1659 -->
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-resources</phase>
- <configuration>
- <tasks>
- <tstamp>
- <format property="build.date" pattern="yyyy.MM.dd" />
- <format property="build.time" pattern="HH:mm:ss.SSSZ" />
- <format property="build.year" pattern="yyyy" />
- </tstamp>
- <property name="gen.file.name" value="${basedir}/target/classes/org/apache/geronimo/console/core/system/serverinfo/geronimo-version.properties"/>
- <touch file="${gen.file.name}" mkdirs="true"/>
- <echo file="${gen.file.name}">
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <configuration>
+ <tasks>
+ <tstamp>
+ <format property="build.date" pattern="yyyy.MM.dd" />
+ <format property="build.time" pattern="HH:mm:ss.SSSZ" />
+ <format property="build.year" pattern="yyyy" />
+ </tstamp>
+ <property name="gen.file.name" value="${basedir}/target/classes/org/apache/geronimo/console/core/system/serverinfo/geronimo-version.properties"/>
+ <touch file="${gen.file.name}" mkdirs="true"/>
+ <echo file="${gen.file.name}">
##### Generated by Maven2 ####
version=${geronimoVersion}
build.date=${build.date}
@@ -78,15 +78,15 @@
geronimo.spec.version=${geronimoSpecJmsVersion}
portal.core.version=${plutoVersion}
</echo>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: geronimo/trunk/applications/console/console-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/console/console-ear/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/applications/console/console-ear/pom.xml (original)
+++ geronimo/trunk/applications/console/console-ear/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,31 +18,32 @@
<!-- $Rev$ $Date$ -->
<project>
- <parent>
- <groupId>org.apache.geronimo.applications.console</groupId>
- <artifactId>console-parent</artifactId>
- <version>1.2-SNAPSHOT</version>
- </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.applications.console</groupId>
+ <artifactId>console-parent</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>geronimo-console</artifactId>
- <packaging>ear</packaging>
- <version>1.2-SNAPSHOT</version>
- <name>Geronimo :: Console :: Application EAR</name>
+ <artifactId>geronimo-console</artifactId>
+ <packaging>ear</packaging>
+ <name>Geronimo :: Console :: Application EAR</name>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.applications.console</groupId>
- <artifactId>geronimo-console-framework</artifactId>
- <version>${geronimoVersion}</version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.applications.console</groupId>
- <artifactId>geronimo-console-standard</artifactId>
- <version>${geronimoVersion}</version>
- <type>war</type>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.applications.console</groupId>
+ <artifactId>geronimo-console-framework</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.applications.console</groupId>
+ <artifactId>geronimo-console-standard</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>war</type>
+ </dependency>
<!-- dependency>
<groupId>org.apache.geronimo.applications.console</groupId>
<artifactId>geronimo-console-core</artifactId>
@@ -83,32 +83,32 @@
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-management</artifactId>
</dependency -->
- </dependencies>
+ </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ear-plugin</artifactId>
- <configuration>
- <displayName>Geronimo Console Application</displayName>
- <generateApplicationXml>true</generateApplicationXml>
- <version>1.4</version>
- <modules>
- <webModule>
- <groupId>org.apache.geronimo.applications.console</groupId>
- <artifactId>geronimo-console-framework</artifactId>
- <contextRoot>/console</contextRoot>
- </webModule>
- <webModule>
- <groupId>org.apache.geronimo.applications.console</groupId>
- <artifactId>geronimo-console-standard</artifactId>
- <contextRoot>/console-standard</contextRoot>
- </webModule>
- </modules>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ear-plugin</artifactId>
+ <configuration>
+ <displayName>Geronimo Console Application</displayName>
+ <generateApplicationXml>true</generateApplicationXml>
+ <version>1.4</version>
+ <modules>
+ <webModule>
+ <groupId>org.apache.geronimo.applications.console</groupId>
+ <artifactId>geronimo-console-framework</artifactId>
+ <contextRoot>/console</contextRoot>
+ </webModule>
+ <webModule>
+ <groupId>org.apache.geronimo.applications.console</groupId>
+ <artifactId>geronimo-console-standard</artifactId>
+ <contextRoot>/console-standard</contextRoot>
+ </webModule>
+ </modules>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: geronimo/trunk/applications/console/console-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/console/console-framework/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/applications/console/console-framework/pom.xml (original)
+++ geronimo/trunk/applications/console/console-framework/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,44 +18,45 @@
<!-- $Rev$ $Date$ -->
<project>
- <parent>
- <groupId>org.apache.geronimo.applications.console</groupId>
- <artifactId>console-parent</artifactId>
- <version>1.2-SNAPSHOT</version>
- </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.applications.console</groupId>
+ <artifactId>console-parent</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>geronimo-console-framework</artifactId>
- <packaging>war</packaging>
- <version>1.2-SNAPSHOT</version>
- <name>Geronimo :: Console :: Portal Framework</name>
+ <artifactId>geronimo-console-framework</artifactId>
+ <packaging>war</packaging>
+ <name>Geronimo :: Console :: Portal Framework</name>
- <dependencies>
- <dependency>
- <groupId>castor</groupId>
- <artifactId>castor</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.4_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.pluto</groupId>
- <artifactId>pluto</artifactId>
- <version>${plutoVersion}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.pluto</groupId>
- <artifactId>pluto-portal</artifactId>
- <version>${plutoVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.pluto</groupId>
- <artifactId>pluto-descriptors</artifactId>
- <version>${plutoVersion}</version>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>castor</groupId>
+ <artifactId>castor</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.4_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto</artifactId>
+ <version>${plutoVersion}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto-portal</artifactId>
+ <version>${plutoVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto-descriptors</artifactId>
+ <version>${plutoVersion}</version>
+ </dependency>
+ </dependencies>
</project>
Modified: geronimo/trunk/applications/console/console-standard/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/console/console-standard/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/applications/console/console-standard/pom.xml (original)
+++ geronimo/trunk/applications/console/console-standard/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,111 +18,112 @@
<!-- $Rev$ $Date$ -->
<project>
- <parent>
- <groupId>org.apache.geronimo.applications.console</groupId>
- <artifactId>console-parent</artifactId>
- <version>1.2-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>geronimo-console-standard</artifactId>
- <packaging>war</packaging>
- <version>1.2-SNAPSHOT</version>
- <name>Geronimo :: Console :: Standard Portlets</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.4_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.applications.console</groupId>
- <artifactId>geronimo-console-core</artifactId>
- <version>${geronimoVersion}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>castor</groupId>
- <artifactId>castor</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-converter</artifactId>
- <version>${geronimoVersion}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-derby</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-deploy-jsr88</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>${commonsDigesterVersion}</version>
- </dependency>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>${commonsFileuploadVersion}</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commonsIoVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-upgrade</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.pluto</groupId>
- <artifactId>pluto</artifactId>
- <version>${plutoVersion}</version>
- </dependency>
-
- <!-- JMS dependencies -->
- <dependency>
- <groupId>activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>${activeMqVersion}</version>
- <scope>provided</scope>
- </dependency>
-
-
- <!-- Used to pre compile JSPs -->
- <dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- <version>${standardTaglibsVersion}</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>${jstlVersion}</version>
- </dependency>
- <dependency>
- <groupId>dwr</groupId>
- <artifactId>dwr</artifactId>
- <version>${dwrVersion}</version>
- </dependency>
- </dependencies>
-
- <build>
- <resources>
- <resource>
- <directory>${basedir}/src/conf</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.applications.console</groupId>
+ <artifactId>console-parent</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>geronimo-console-standard</artifactId>
+ <packaging>war</packaging>
+ <name>Geronimo :: Console :: Standard Portlets</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.4_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.applications.console</groupId>
+ <artifactId>geronimo-console-core</artifactId>
+ <version>${geronimoVersion}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>castor</groupId>
+ <artifactId>castor</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-converter</artifactId>
+ <version>${geronimoVersion}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-derby</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-deploy-jsr88</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>${commonsDigesterVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>${commonsFileuploadVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commonsIoVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-upgrade</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto</artifactId>
+ <version>${plutoVersion}</version>
+ </dependency>
+
+ <!-- JMS dependencies -->
+ <dependency>
+ <groupId>activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ <version>${activeMqVersion}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Used to pre compile JSPs -->
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <version>${standardTaglibsVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>${jstlVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>dwr</groupId>
+ <artifactId>dwr</artifactId>
+ <version>${dwrVersion}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/conf</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
- </build>
+ </build>
</project>
Modified: geronimo/trunk/applications/console/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/console/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/applications/console/pom.xml (original)
+++ geronimo/trunk/applications/console/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,39 +18,40 @@
<!-- $Rev$ $Date$ -->
<project>
- <parent>
- <groupId>org.apache.geronimo.applications</groupId>
- <artifactId>applications-parent</artifactId>
- <version>1.2-SNAPSHOT</version>
- </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.applications</groupId>
+ <artifactId>applications-parent</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.geronimo.applications.console</groupId>
- <artifactId>console-parent</artifactId>
- <version>1.2-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>Geronimo Console Application</name>
- <description>Geronimo Console Application</description>
+ <groupId>org.apache.geronimo.applications.console</groupId>
+ <artifactId>console-parent</artifactId>
+ <packaging>pom</packaging>
+ <name>Geronimo Console Application</name>
+ <description>Geronimo Console Application</description>
- <dependencies>
- <dependency>
- <groupId>portlet-api</groupId>
- <artifactId>portlet-api</artifactId>
- <version>${portletApiVersion}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>portlet-api</groupId>
+ <artifactId>portlet-api</artifactId>
+ <version>${portletApiVersion}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jsp_2.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
- <modules>
- <module>console-core</module>
- <module>console-standard</module>
- <module>console-framework</module>
- <module>console-ear</module>
- </modules>
+ <modules>
+ <module>console-core</module>
+ <module>console-standard</module>
+ <module>console-framework</module>
+ <module>console-ear</module>
+ </modules>
</project>
Modified: geronimo/trunk/applications/demo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/demo/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/applications/demo/pom.xml (original)
+++ geronimo/trunk/applications/demo/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,17 +18,18 @@
<!-- $Rev$ $Date$ -->
<project>
- <parent>
- <groupId>org.apache.geronimo.applications</groupId>
- <artifactId>applications-parent</artifactId>
- <version>1.2-SNAPSHOT</version>
- </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.applications</groupId>
+ <artifactId>applications-parent</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
- <modelVersion>4.0.0</modelVersion>
- <version>${geronimoVersion}</version>
- <artifactId>demo</artifactId>
- <packaging>war</packaging>
- <name>Geronimo Demo Application</name>
- <description>Geronimo Demo Application</description>
+ <artifactId>demo</artifactId>
+ <packaging>war</packaging>
+ <name>Geronimo Demo Application</name>
+ <description>Geronimo Demo Application</description>
</project>
Modified: geronimo/trunk/applications/ldap-realm-demo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/ldap-realm-demo/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/applications/ldap-realm-demo/pom.xml (original)
+++ geronimo/trunk/applications/ldap-realm-demo/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,17 +18,18 @@
<!-- $Rev$ $Date$ -->
<project>
- <parent>
- <groupId>org.apache.geronimo.applications</groupId>
- <artifactId>applications-parent</artifactId>
- <version>1.2-SNAPSHOT</version>
- </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.applications</groupId>
+ <artifactId>applications-parent</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
- <modelVersion>4.0.0</modelVersion>
- <version>${geronimoVersion}</version>
- <artifactId>geronimo-ldap-demo</artifactId>
- <packaging>war</packaging>
- <name>Geronimo LDAP Demo Application</name>
+ <artifactId>geronimo-ldap-demo</artifactId>
+ <packaging>war</packaging>
+ <name>Geronimo LDAP Demo Application</name>
<description>
This is a very simple application that is intended to demonstrate the ldap
security mechanism.
Modified: geronimo/trunk/applications/magicGball/magicGball-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/magicGball/magicGball-client/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/applications/magicGball/magicGball-client/pom.xml (original)
+++ geronimo/trunk/applications/magicGball/magicGball-client/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,37 +18,36 @@
<!-- $Rev$ $Date$ -->
<project>
- <parent>
- <groupId>org.apache.geronimo.applications.magicGball</groupId>
- <version>1.2-SNAPSHOT</version>
- <artifactId>magicGball-parent</artifactId>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>magicGball-client</artifactId>
- <version>1.2-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>Geronimo :: The Magic G Ball Sample :: Client</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.applications.magicGball</groupId>
- <artifactId>magicGball-ejb</artifactId>
- <version>1.2-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-ejb-plugin</artifactId>
- <configuration>
- <generateClient>true</generateClient>
- </configuration>
- </plugin>
- </plugins>
-
-
- </build>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.applications.magicGball</groupId>
+ <version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ <artifactId>magicGball-parent</artifactId>
+ </parent>
+
+ <artifactId>magicGball-client</artifactId>
+ <packaging>jar</packaging>
+ <name>Geronimo :: The Magic G Ball Sample :: Client</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.applications.magicGball</groupId>
+ <artifactId>magicGball-ejb</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-ejb-plugin</artifactId>
+ <configuration>
+ <generateClient>true</generateClient>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: geronimo/trunk/applications/magicGball/magicGball-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/magicGball/magicGball-ear/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/applications/magicGball/magicGball-ear/pom.xml (original)
+++ geronimo/trunk/applications/magicGball/magicGball-ear/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,35 +18,36 @@
<!-- $Rev$ $Date$ -->
<project>
- <parent>
- <groupId>org.apache.geronimo.applications.magicGball</groupId>
- <version>1.2-SNAPSHOT</version>
- <artifactId>magicGball-parent</artifactId>
- </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.applications.magicGball</groupId>
+ <version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ <artifactId>magicGball-parent</artifactId>
+ </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>magicGball-ear</artifactId>
- <version>1.2-SNAPSHOT</version>
- <packaging>ear</packaging>
- <name>Geronimo :: The Magic G Ball Sample Application</name>
+ <artifactId>magicGball-ear</artifactId>
+ <packaging>ear</packaging>
+ <name>Geronimo :: The Magic G Ball Sample Application</name>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.applications.magicGball</groupId>
- <artifactId>magicGball-client</artifactId>
- <version>1.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.applications.magicGball</groupId>
- <artifactId>magicGball-ejb</artifactId>
- <version>1.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.applications.magicGball</groupId>
- <artifactId>magicGball-web</artifactId>
- <version>1.2-SNAPSHOT</version>
- <type>war</type>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.applications.magicGball</groupId>
+ <artifactId>magicGball-client</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.applications.magicGball</groupId>
+ <artifactId>magicGball-ejb</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.applications.magicGball</groupId>
+ <artifactId>magicGball-web</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ <type>war</type>
+ </dependency>
+ </dependencies>
</project>
Modified: geronimo/trunk/applications/magicGball/magicGball-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/magicGball/magicGball-ejb/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/applications/magicGball/magicGball-ejb/pom.xml (original)
+++ geronimo/trunk/applications/magicGball/magicGball-ejb/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,16 +18,17 @@
<!-- $Rev$ $Date$ -->
<project>
- <parent>
- <groupId>org.apache.geronimo.applications.magicGball</groupId>
- <version>1.2-SNAPSHOT</version>
- <artifactId>magicGball-parent</artifactId>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>magicGball-ejb</artifactId>
- <version>1.2-SNAPSHOT</version>
- <packaging>ejb</packaging>
- <name>Geronimo :: The Magic G Ball Sample :: EJB</name>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.applications.magicGball</groupId>
+ <version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ <artifactId>magicGball-parent</artifactId>
+ </parent>
+
+ <artifactId>magicGball-ejb</artifactId>
+ <packaging>ejb</packaging>
+ <name>Geronimo :: The Magic G Ball Sample :: EJB</name>
</project>
Modified: geronimo/trunk/applications/magicGball/magicGball-web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/magicGball/magicGball-web/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/applications/magicGball/magicGball-web/pom.xml (original)
+++ geronimo/trunk/applications/magicGball/magicGball-web/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,24 +18,25 @@
<!-- $Rev$ $Date$ -->
<project>
- <parent>
- <groupId>org.apache.geronimo.applications.magicGball</groupId>
- <version>1.2-SNAPSHOT</version>
- <artifactId>magicGball-parent</artifactId>
- </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.applications.magicGball</groupId>
+ <version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ <artifactId>magicGball-parent</artifactId>
+ </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>magicGball-web</artifactId>
- <version>1.2-SNAPSHOT</version>
- <packaging>war</packaging>
- <name>Geronimo :: The Magic G Ball Sample :: WAR</name>
+ <artifactId>magicGball-web</artifactId>
+ <packaging>war</packaging>
+ <name>Geronimo :: The Magic G Ball Sample :: WAR</name>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.applications.magicGball</groupId>
- <artifactId>magicGball-ejb</artifactId>
- <version>1.2-SNAPSHOT</version>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.applications.magicGball</groupId>
+ <artifactId>magicGball-ejb</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
- </project>
+</project>
Modified: geronimo/trunk/applications/magicGball/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/magicGball/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/applications/magicGball/pom.xml (original)
+++ geronimo/trunk/applications/magicGball/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,58 +18,60 @@
<!-- $Rev$ $Date$ -->
<project>
- <parent>
- <groupId>org.apache.geronimo.applications</groupId>
- <artifactId>applications-parent</artifactId>
- <version>1.2-SNAPSHOT</version>
- </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.applications</groupId>
+ <artifactId>applications-parent</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.geronimo.applications.magicGball</groupId>
- <artifactId>magicGball-parent</artifactId>
- <version>1.2-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>Geronimo :: The Magic G Ball </name>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.geronimo.applications.magicGball</groupId>
+ <artifactId>magicGball-parent</artifactId>
+ <packaging>pom</packaging>
+ <name>Geronimo :: The Magic G Ball </name>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.4_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-qname_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_2.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.4_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jsp_2.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-qname_1.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ejb_2.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!--dependency>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>geronimo-deployment-plugin</artifactId>
<version>${geronimoVersion}</version>
<scope>provided</scope>
</dependency-->
- </dependencies>
+ </dependencies>
- <modules>
- <module>magicGball-ejb</module>
- <module>magicGball-client</module>
- <module>magicGball-web</module>
- <module>magicGball-ear</module>
- </modules>
+ <modules>
+ <module>magicGball-ejb</module>
+ <module>magicGball-client</module>
+ <module>magicGball-web</module>
+ <module>magicGball-ear</module>
+ </modules>
</project>
Modified: geronimo/trunk/applications/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/applications/pom.xml (original)
+++ geronimo/trunk/applications/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,67 +18,67 @@
<!-- $Rev$ $Date$ -->
<project>
- <parent>
- <groupId>org.apache.geronimo</groupId>
- <artifactId>geronimo-parent</artifactId>
- <version>1.2-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.geronimo.applications</groupId>
- <artifactId>applications-parent</artifactId>
- <version>1.2-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>Geronimo Applications</name>
- <description>Geronimo Applications</description>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <warSourceDirectory>${basedir}/src/webapp</warSourceDirectory>
- <archiveClasses>true</archiveClasses>
- <webXml>${basedir}/target/jspweb.xml</webXml>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jspc-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>jspc</id>
- <goals>
- <goal>compile</goal>
- </goals>
- <configuration>
- <warSourceDirectory>${basedir}/src/webapp</warSourceDirectory>
- <inputWebXml>${basedir}/src/webapp/WEB-INF/web.xml</inputWebXml>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-runtime</artifactId>
- <version>${jasperVersion}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
-
- <modules>
- <module>demo</module>
- <module>ldap-realm-demo</module>
- <module>magicGball</module>
- <module>remote-deploy</module>
- <module>uddi-db</module>
- <module>uddi-server</module>
- <module>console</module>
- <module>welcome</module>
- </modules>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo</groupId>
+ <artifactId>geronimo-parent</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.geronimo.applications</groupId>
+ <artifactId>applications-parent</artifactId>
+ <packaging>pom</packaging>
+ <name>Geronimo Applications</name>
+ <description>Geronimo Applications</description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <warSourceDirectory>${basedir}/src/webapp</warSourceDirectory>
+ <archiveClasses>true</archiveClasses>
+ <webXml>${basedir}/target/jspweb.xml</webXml>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jspc-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>jspc</id>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ <configuration>
+ <warSourceDirectory>${basedir}/src/webapp</warSourceDirectory>
+ <inputWebXml>${basedir}/src/webapp/WEB-INF/web.xml</inputWebXml>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ <version>${jasperVersion}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <modules>
+ <module>demo</module>
+ <module>ldap-realm-demo</module>
+ <module>magicGball</module>
+ <module>remote-deploy</module>
+ <module>uddi-db</module>
+ <module>uddi-server</module>
+ <module>console</module>
+ <module>welcome</module>
+ </modules>
</project>
Modified: geronimo/trunk/applications/remote-deploy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/remote-deploy/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/applications/remote-deploy/pom.xml (original)
+++ geronimo/trunk/applications/remote-deploy/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,36 +18,36 @@
<!-- $Rev$ $Date$ -->
<project>
- <parent>
- <groupId>org.apache.geronimo.applications</groupId>
- <artifactId>applications-parent</artifactId>
- <version>1.2-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <version>${geronimoVersion}</version>
- <artifactId>geronimo-remote-deploy</artifactId>
- <packaging>war</packaging>
- <name>Geronimo Remote Deploy Application</name>
- <description>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.applications</groupId>
+ <artifactId>applications-parent</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>geronimo-remote-deploy</artifactId>
+ <packaging>war</packaging>
+ <name>Geronimo Remote Deploy Application</name>
+ <description>
This application is essentially a servlet that accepts file upload
requests from remote clients, which is necessary for remote
deployment operations to work properly.
- </description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.4_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-kernel</artifactId>
- <version>${geronimoVersion}</version>
- </dependency>
- </dependencies>
-
+ </description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.4_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-kernel</artifactId>
+ <version>${geronimoVersion}</version>
+ </dependency>
+ </dependencies>
+
</project>
Modified: geronimo/trunk/applications/uddi-db/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/uddi-db/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/applications/uddi-db/pom.xml (original)
+++ geronimo/trunk/applications/uddi-db/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,60 +18,58 @@
<!-- $Rev$ $Date$ -->
<project>
- <parent>
- <groupId>org.apache.geronimo.applications</groupId>
- <artifactId>applications-parent</artifactId>
- <version>1.2-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>geronimo-uddi-db</artifactId>
- <version>${geronimoVersion}</version>
- <name>Geronimo UDDI Server Database</name>
- <description>Geronimo UDDI Server Database</description>
-
- <build>
+ <modelVersion>4.0.0</modelVersion>
-
- <resources>
- <resource>
+ <parent>
+ <groupId>org.apache.geronimo.applications</groupId>
+ <artifactId>applications-parent</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>geronimo-uddi-db</artifactId>
+ <name>Geronimo UDDI Server Database</name>
+ <description>Geronimo UDDI Server Database</description>
+
+ <build>
+ <resources>
+ <resource>
<!-- ${project.build.directory} doesn't work in the following line. -->
- <directory>${basedir}/target/resources</directory>
- </resource>
- </resources>
-
-
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-resources</phase>
- <configuration>
- <tasks>
- <property name="derby.system.home" value="${project.build.directory}/resources/META-INF/${pom.artifactId}/var/derby"/>
- <property name="derby.storage.fileSyncTransactionLog" value="true"/>
- <delete dir="${derby.system.home}"/>
- <mkdir dir="${derby.system.home}"/>
- <sql driver="org.apache.derby.jdbc.EmbeddedDriver"
- url="jdbc:derby:${derby.system.home}/UddiDatabase;create=true"
- userid="" password="" autocommit="true" onerror="abort" delimiter=";">
- <fileset dir="src/sql"/>
- <classpath>
- <fileset dir="${settings.localRepository}/org/apache/derby/derby/${derbyVersion}">
- <include name="**/derby-${derbyVersion}.jar" />
- </fileset>
- </classpath>
- </sql>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <directory>${basedir}/target/resources</directory>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <configuration>
+ <tasks>
+ <property name="derby.system.home" value="${project.build.directory}/resources/META-INF/${pom.artifactId}/var/derby"/>
+ <property name="derby.storage.fileSyncTransactionLog" value="true"/>
+ <delete dir="${derby.system.home}"/>
+ <mkdir dir="${derby.system.home}"/>
+ <sql driver="org.apache.derby.jdbc.EmbeddedDriver"
+ url="jdbc:derby:${derby.system.home}/UddiDatabase;create=true"
+ userid="" password="" autocommit="true" onerror="abort" delimiter=";">
+ <fileset dir="src/sql"/>
+ <classpath>
+ <fileset dir="${settings.localRepository}/org/apache/derby/derby/${derbyVersion}">
+ <include name="**/derby-${derbyVersion}.jar" />
+ </fileset>
+ </classpath>
+ </sql>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
- </project>
+</project>
Modified: geronimo/trunk/applications/uddi-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/uddi-server/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/applications/uddi-server/pom.xml (original)
+++ geronimo/trunk/applications/uddi-server/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,31 +18,32 @@
<!-- $Rev$ $Date$ -->
<project>
- <parent>
- <groupId>org.apache.geronimo.applications</groupId>
- <artifactId>applications-parent</artifactId>
- <version>1.2-SNAPSHOT</version>
- </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.applications</groupId>
+ <artifactId>applications-parent</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
- <modelVersion>4.0.0</modelVersion>
- <version>${geronimoVersion}</version>
- <artifactId>geronimo-uddi-server</artifactId>
- <packaging>war</packaging>
- <name>Geronimo UDDI Server</name>
- <description>Geronimo UDDI Server</description>
+ <artifactId>geronimo-uddi-server</artifactId>
+ <packaging>war</packaging>
+ <name>Geronimo UDDI Server</name>
+ <description>Geronimo UDDI Server</description>
-<dependencies>
- <dependency>
+ <dependencies>
+ <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee_1.4_spec</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>juddi</groupId>
<artifactId>juddi</artifactId>
<version>${juddiVersion}</version>
<scope>provided</scope>
</dependency>
- </dependencies>
+ </dependencies>
</project>
Modified: geronimo/trunk/applications/welcome/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/welcome/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/applications/welcome/pom.xml (original)
+++ geronimo/trunk/applications/welcome/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
Copyright 2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,24 +18,25 @@
<!-- $Rev$ $Date$ -->
<project>
- <parent>
- <groupId>org.apache.geronimo.applications</groupId>
- <artifactId>applications-parent</artifactId>
- <version>1.2-SNAPSHOT</version>
- </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.applications</groupId>
+ <artifactId>applications-parent</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
- <modelVersion>4.0.0</modelVersion>
- <version>${geronimoVersion}</version>
- <artifactId>geronimo-welcome</artifactId>
- <packaging>war</packaging>
- <name>Geronimo Welcome Application</name>
- <description>
+ <artifactId>geronimo-welcome</artifactId>
+ <packaging>war</packaging>
+ <name>Geronimo Welcome Application</name>
+ <description>
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
that the installation is working.
- </description>
+ </description>
- <dependencies>
+ <dependencies>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-kernel</artifactId>
@@ -52,6 +52,6 @@
<artifactId>geronimo-j2ee_1.4_spec</artifactId>
<scope>provided</scope>
</dependency>
- </dependencies>
+ </dependencies>
</project>
Modified: geronimo/trunk/configs/activemq-broker/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/activemq-broker/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/activemq-broker/pom.xml (original)
+++ geronimo/trunk/configs/activemq-broker/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
-
Copyright 2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,11 +23,11 @@
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>configs-parent</artifactId>
<version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>activemq-broker</artifactId>
- <version>${geronimoVersion}</version>
<packaging>car</packaging>
<name>ActiveMQ Broker Configuration</name>
Modified: geronimo/trunk/configs/activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/activemq/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/activemq/pom.xml (original)
+++ geronimo/trunk/configs/activemq/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
-
Copyright 2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,11 +23,11 @@
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>configs-parent</artifactId>
<version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>activemq</artifactId>
- <version>${geronimoVersion}</version>
<packaging>car</packaging>
<name>Activemq Configuration</name>
Modified: geronimo/trunk/configs/axis-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/axis-deployer/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/axis-deployer/pom.xml (original)
+++ geronimo/trunk/configs/axis-deployer/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
-
Copyright 2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,18 +16,21 @@
-->
<!-- $Rev$ $Date$ -->
+
<project>
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>configs-parent</artifactId>
<version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>axis-deployer</artifactId>
- <version>${geronimoVersion}</version>
<packaging>car</packaging>
<name>Axis Configuration for performing J2EE deployments</name>
+
<build>
<plugins>
<plugin>
Modified: geronimo/trunk/configs/axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/axis/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/axis/pom.xml (original)
+++ geronimo/trunk/configs/axis/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
-
Copyright 2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,16 +18,18 @@
<!-- $Rev$ $Date$ -->
<project>
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>configs-parent</artifactId>
<version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>axis</artifactId>
- <version>${geronimoVersion}</version>
<packaging>car</packaging>
<name>Axis Configuration for the J2EE Server</name>
+
<build>
<plugins>
<plugin>
Modified: geronimo/trunk/configs/client-corba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/client-corba/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/client-corba/pom.xml (original)
+++ geronimo/trunk/configs/client-corba/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
-
Copyright 2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,16 +16,19 @@
-->
<!-- $Rev$ $Date$ -->
+
<project>
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>configs-parent</artifactId>
<version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
+
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>client-corba</artifactId>
- <version>${geronimoVersion}</version>
<packaging>car</packaging>
<name>Corba Configuration for the J2EE Client</name>
@@ -35,7 +37,6 @@
<PlanCOSNamingPort>1050</PlanCOSNamingPort>
<PlanORBSSLHost>localhost</PlanORBSSLHost>
<PlanORBSSLPort>2001</PlanORBSSLPort>
-
<PlanHTTPPort>8080</PlanHTTPPort>
<PlanHTTPSPort>8443</PlanHTTPSPort>
<PlanOpenEJBPort>4201</PlanOpenEJBPort>
@@ -43,6 +44,7 @@
<PlanClientAddresses>127.0.0.1</PlanClientAddresses>
<PlanRemoteLoginPort>4242</PlanRemoteLoginPort>
</properties>
+
<build>
<plugins>
<!-- This plugin needed to support package type car -->
@@ -51,7 +53,7 @@
<artifactId>geronimo-packaging-plugin</artifactId>
<extensions>true</extensions>
<configuration>
-<deploymentConfig>${gbeanDeployer},${j2eeDeployer},${openejbDeployer},${axisDeployer}</deploymentConfig>
+ <deploymentConfig>${gbeanDeployer},${j2eeDeployer},${openejbDeployer},${axisDeployer}</deploymentConfig>
</configuration>
</plugin>
</plugins>
Modified: geronimo/trunk/configs/client-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/client-deployer/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/client-deployer/pom.xml (original)
+++ geronimo/trunk/configs/client-deployer/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
-
Copyright 2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,18 +16,22 @@
-->
<!-- $Rev$ $Date$ -->
+
<project>
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>configs-parent</artifactId>
<version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
+
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>client-deployer</artifactId>
- <version>${geronimoVersion}</version>
<packaging>car</packaging>
<name>Configuration for Application Client Deployments</name>
+
<build>
<plugins>
<plugin>
@@ -52,12 +55,14 @@
<version>${geronimoVersion}</version>
<type>car</type>
</dependency>
-<!--
+
+ <!--
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee_1.4_spec</artifactId>
</dependency>
--->
+ -->
+
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-management</artifactId>
Modified: geronimo/trunk/configs/client-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/client-security/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/client-security/pom.xml (original)
+++ geronimo/trunk/configs/client-security/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
-
Copyright 2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,16 +16,19 @@
-->
<!-- $Rev$ $Date$ -->
+
<project>
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>configs-parent</artifactId>
<version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
+
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>client-security</artifactId>
- <version>${geronimoVersion}</version>
<packaging>car</packaging>
<name>Security Configuration for the J2EE Client</name>
@@ -78,8 +80,9 @@
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-security</artifactId>
</dependency>
-<!--
- <dependency>
+
+ <!--
+ <dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-jmx-remoting</artifactId>
</dependency>
@@ -87,6 +90,7 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-util</artifactId>
- </dependency> -->
+ </dependency>
+ -->
</dependencies>
</project>
Modified: geronimo/trunk/configs/client-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/client-system/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/client-system/pom.xml (original)
+++ geronimo/trunk/configs/client-system/pom.xml Wed Jun 28 16:39:43 2006
@@ -17,16 +17,18 @@
-->
<!-- $Rev$ $Date$ -->
+
<project>
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>configs-parent</artifactId>
<version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>client-system</artifactId>
- <version>${geronimoVersion}</version>
<packaging>car</packaging>
<name>System Configuration for the J2EE Client</name>
@@ -40,20 +42,20 @@
<!-- uses default DeploymentConfig=geronimo-gbean-deployer -->
<!-- written to Manifest.mf -->
<classPath>../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/cglib-nodep-${cglibVersion}.jar \
- ../lib/commons-cli-${commonsCliVersion}.jar \
- ../lib/commons-logging-${commonsLoggingVersion}.jar \
- ../lib/log4j-${log4jVersion}.jar \
- ../lib/mx4j-${mx4jVersion}.jar \
- ../lib/mx4j-remote-${mx4jVersion}.jar \
- ../lib/endorsed/xercesImpl-${xercesVersion}.jar \
- ../lib/endorsed/xmlParserAPIs-${xmlParserApisVersion}.jar \
- ../lib/xpp3-${xpp3Version}.jar \
- ../lib/xstream-${xstreamVersion}.jar \</classPath>
+ ../lib/geronimo-common-${geronimoVersion}.jar \
+ ../lib/geronimo-kernel-${geronimoVersion}.jar \
+ ../lib/geronimo-system-${geronimoVersion}.jar \
+ ../lib/geronimo-util-${geronimoVersion}.jar \
+ ../lib/cglib-nodep-${cglibVersion}.jar \
+ ../lib/commons-cli-${commonsCliVersion}.jar \
+ ../lib/commons-logging-${commonsLoggingVersion}.jar \
+ ../lib/log4j-${log4jVersion}.jar \
+ ../lib/mx4j-${mx4jVersion}.jar \
+ ../lib/mx4j-remote-${mx4jVersion}.jar \
+ ../lib/endorsed/xercesImpl-${xercesVersion}.jar \
+ ../lib/endorsed/xmlParserAPIs-${xmlParserApisVersion}.jar \
+ ../lib/xpp3-${xpp3Version}.jar \
+ ../lib/xstream-${xstreamVersion}.jar \</classPath>
<mainClass>org.apache.geronimo.system.main.ClientCommandLine</mainClass>
<!-- default endorsedDirs and extensionDirs -->
</configuration>
@@ -71,11 +73,13 @@
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-kernel</artifactId>
</dependency>
+
<!-- To Do - are the deps of g-system needed in the plan.xml ? -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-system</artifactId>
</dependency>
+
<!-- need qname_spec ? -->
<dependency>
<groupId>xerces</groupId>
Modified: geronimo/trunk/configs/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/client/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/client/pom.xml (original)
+++ geronimo/trunk/configs/client/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
-
Copyright 2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +16,7 @@
-->
<!-- $Rev$ $Date$ -->
+
<project>
<modelVersion>4.0.0</modelVersion>
@@ -24,11 +24,11 @@
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>configs-parent</artifactId>
<version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>client</artifactId>
- <version>${geronimoVersion}</version>
<packaging>car</packaging>
<name>Configuration for the J2EE Client</name>
Modified: geronimo/trunk/configs/console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/console-jetty/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/console-jetty/pom.xml (original)
+++ geronimo/trunk/configs/console-jetty/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
-
Copyright 2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +16,7 @@
-->
<!-- $Rev$ $Date$ -->
+
<project>
<modelVersion>4.0.0</modelVersion>
@@ -24,11 +24,11 @@
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>configs-parent</artifactId>
<version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>webconsole-jetty</artifactId>
- <version>${geronimoVersion}</version>
<packaging>car</packaging>
<name>Web console deployed on jetty</name>
@@ -41,7 +41,7 @@
<extensions>true</extensions>
<configuration>
<deploymentConfig>${j2eeJettyServer}</deploymentConfig>
-<moduleFile>${settings.localRepository}/org/apache/geronimo/applications/console/geronimo-console/${geronimoVersion}/geronimo-console-${geronimoVersion}.ear</moduleFile>
+ <moduleFile>${settings.localRepository}/org/apache/geronimo/applications/console/geronimo-console/${geronimoVersion}/geronimo-console-${geronimoVersion}.ear</moduleFile>
</configuration>
</plugin>
</plugins>
Modified: geronimo/trunk/configs/console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/console-tomcat/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/console-tomcat/pom.xml (original)
+++ geronimo/trunk/configs/console-tomcat/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
-
Copyright 2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,11 +23,11 @@
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>configs-parent</artifactId>
<version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>webconsole-tomcat</artifactId>
- <version>${geronimoVersion}</version>
<packaging>car</packaging>
<name>Web console deployed on tomcat</name>
@@ -41,7 +40,7 @@
<extensions>true</extensions>
<configuration>
<deploymentConfig>${j2eeTomcatServer}</deploymentConfig>
-<moduleFile>${settings.localRepository}/org/apache/geronimo/applications/console/geronimo-console/${geronimoVersion}/geronimo-console-${geronimoVersion}.ear</moduleFile>
+ <moduleFile>${settings.localRepository}/org/apache/geronimo/applications/console/geronimo-console/${geronimoVersion}/geronimo-console-${geronimoVersion}.ear</moduleFile>
</configuration>
</plugin>
</plugins>
@@ -50,6 +49,7 @@
<!-- ============ -->
<!-- Dependencies -->
<!-- ============ -->
+
<dependencies>
<!-- parent configs -->
<dependency>
@@ -76,7 +76,6 @@
<type>car</type>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.pluto</groupId>
Modified: geronimo/trunk/configs/directory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/directory/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/directory/pom.xml (original)
+++ geronimo/trunk/configs/directory/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
-
Copyright 2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,18 +16,21 @@
-->
<!-- $Rev$ $Date$ -->
+
<project>
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>configs-parent</artifactId>
<version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>directory</artifactId>
- <version>${geronimoVersion}</version>
<packaging>car</packaging>
<name>Directory Configuration</name>
+
<build>
<plugins>
<plugin>
Modified: geronimo/trunk/configs/geronimo-gbean-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/geronimo-gbean-deployer/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/geronimo-gbean-deployer/pom.xml (original)
+++ geronimo/trunk/configs/geronimo-gbean-deployer/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
-
Copyright 2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,18 +16,21 @@
-->
<!-- $Rev$ $Date$ -->
+
<project>
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>configs-parent</artifactId>
<version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-gbean-deployer</artifactId>
- <version>${geronimoVersion}</version>
<packaging>car</packaging>
<name>Geronimo Configuration for performing service deployments</name>
+
<build>
<plugins>
<plugin>
Modified: geronimo/trunk/configs/hot-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/hot-deployer/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/hot-deployer/pom.xml (original)
+++ geronimo/trunk/configs/hot-deployer/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
-
Copyright 2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,18 +16,21 @@
-->
<!-- $Rev$ $Date$ -->
+
<project>
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>configs-parent</artifactId>
<version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hot-deployer</artifactId>
- <version>${geronimoVersion}</version>
<packaging>car</packaging>
<name>Hot Deployer</name>
+
<build>
<plugins>
<plugin>
Modified: geronimo/trunk/configs/j2ee-corba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/j2ee-corba/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-corba/pom.xml (original)
+++ geronimo/trunk/configs/j2ee-corba/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
-
Copyright 2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +16,7 @@
-->
<!-- $Rev$ $Date$ -->
+
<project>
<modelVersion>4.0.0</modelVersion>
@@ -24,11 +24,11 @@
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>configs-parent</artifactId>
<version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-corba</artifactId>
- <version>${geronimoVersion}</version>
<packaging>car</packaging>
<name>Corba Configuration for the J2EE Server</name>
@@ -37,7 +37,6 @@
<PlanCOSNamingPort>1050</PlanCOSNamingPort>
<PlanORBSSLHost>localhost</PlanORBSSLHost>
<PlanORBSSLPort>2001</PlanORBSSLPort>
-
<PlanHTTPPort>8080</PlanHTTPPort>
<PlanHTTPSPort>8443</PlanHTTPSPort>
<PlanOpenEJBPort>4201</PlanOpenEJBPort>
@@ -45,6 +44,7 @@
<PlanClientAddresses>127.0.0.1</PlanClientAddresses>
<PlanRemoteLoginPort>4242</PlanRemoteLoginPort>
</properties>
+
<build>
<plugins>
<!-- This plugin needed to support package type car -->
@@ -86,4 +86,5 @@
<type>car</type>
</dependency>
</dependencies>
+
</project>
Modified: geronimo/trunk/configs/j2ee-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/j2ee-deployer/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-deployer/pom.xml (original)
+++ geronimo/trunk/configs/j2ee-deployer/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
-
Copyright 2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,18 +16,21 @@
-->
<!-- $Rev$ $Date$ -->
+
<project>
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>configs-parent</artifactId>
<version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>j2ee-deployer</artifactId>
- <version>${geronimoVersion}</version>
<packaging>car</packaging>
<name>Configuration for performing J2EE deployments</name>
+
<build>
<plugins>
<plugin>
Modified: geronimo/trunk/configs/j2ee-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/j2ee-security/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-security/pom.xml (original)
+++ geronimo/trunk/configs/j2ee-security/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
-
Copyright 2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,17 +16,19 @@
-->
<!-- $Rev$ $Date$ -->
+
<project>
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>configs-parent</artifactId>
<version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>j2ee-security</artifactId>
<!-- change this to server-security -->
- <version>${geronimoVersion}</version>
<packaging>car</packaging>
<name>Security Configuration for the J2EE server</name>
@@ -68,7 +69,8 @@
<version>${geronimoVersion}</version>
<type>car</type>
</dependency>
-<!--
+
+ <!--
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-deployer</artifactId>
@@ -76,7 +78,8 @@
<type>car</type>
<scope>provided</scope>
</dependency>
--->
+ -->
+
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-security</artifactId>
Modified: geronimo/trunk/configs/j2ee-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/j2ee-server/pom.xml?rev=417903&r1=417902&r2=417903&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-server/pom.xml (original)
+++ geronimo/trunk/configs/j2ee-server/pom.xml Wed Jun 28 16:39:43 2006
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
-
Copyright 2006 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,16 +16,18 @@
-->
<!-- $Rev$ $Date$ -->
+
<project>
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>configs-parent</artifactId>
<version>1.2-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>j2ee-server</artifactId>
- <version>${geronimoVersion}</version>
<packaging>car</packaging>
<name>Server Configuration for the J2EE Server</name>