You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2005/11/16 03:42:32 UTC
svn commit: r344852 [1/2] - in /geronimo/trunk: assemblies/j2ee-server/
configs/client-corba/ configs/console-jetty/src/plan/
configs/geronimo-gbean-deployer/src/plan/ configs/j2ee-deployer/src/plan/
configs/j2ee-security/src/plan/ configs/j2ee-system/...
Author: djencks
Date: Tue Nov 15 18:42:23 2005
New Revision: 344852
URL: http://svn.apache.org/viewcvs?rev=344852&view=rev
Log:
Clean up dependencies and make jetty welcome and uddi work
Modified:
geronimo/trunk/assemblies/j2ee-server/maven.xml
geronimo/trunk/assemblies/j2ee-server/project.xml
geronimo/trunk/configs/client-corba/project.properties
geronimo/trunk/configs/console-jetty/src/plan/plan.xml
geronimo/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml
geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml
geronimo/trunk/configs/j2ee-security/src/plan/plan.xml
geronimo/trunk/configs/j2ee-system/src/plan/plan.xml
geronimo/trunk/configs/jetty-deployer/project.xml
geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml
geronimo/trunk/configs/uddi-jetty/project.properties
geronimo/trunk/configs/uddi-jetty/project.xml
geronimo/trunk/configs/uddi-jetty/src/plan/plan.xml
geronimo/trunk/configs/welcome-jetty/project.properties
geronimo/trunk/configs/welcome-jetty/project.xml
geronimo/trunk/configs/welcome-jetty/src/plan/plan.xml
Modified: geronimo/trunk/assemblies/j2ee-server/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-server/maven.xml?rev=344852&r1=344851&r2=344852&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-server/maven.xml (original)
+++ geronimo/trunk/assemblies/j2ee-server/maven.xml Tue Nov 15 18:42:23 2005
@@ -20,11 +20,7 @@
<!-- $Rev: 158417 $ $Date: 2005-03-20 23:25:45 -0800 (Sun, 20 Mar 2005) $ -->
<project default="default"
- xmlns:ant="jelly:ant"
>
<goal name="default" prereqs="geronimo:assemble"/>
- <postGoal name="geronimo:assemble-lib">
- <ant:mkdir dir="${geronimo.assembly.dest}/lib/endorsed"/>
- </postGoal>
</project>
Modified: geronimo/trunk/assemblies/j2ee-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-server/project.xml?rev=344852&r1=344851&r2=344852&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-server/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-server/project.xml Tue Nov 15 18:42:23 2005
@@ -25,138 +25,153 @@
<description>An assembly of Geronimo into a J2EE Server</description>
<dependencies>
- <!-- Third-party dependencies to preload into the repository -->
+ <!-- plugin we use -->
<dependency>
- <groupId>howl</groupId>
- <artifactId>howl-logger</artifactId>
- <version>${howl_version}</version>
- <url>http://forge.objectweb.org/projects/howl</url>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-assembly-plugin</artifactId>
+ <type>plugin</type>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+
+ <!-- configurations to install -->
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>j2ee-system</artifactId>
+ <type>car</type>
+ <version>${pom.currentVersion}</version>
<properties>
- <geronimo.assemble>repository</geronimo.assemble>
+ <geronimo.assemble>install</geronimo.assemble>
+ <geronimo.assemble.executable>bin/server.jar</geronimo.assemble.executable>
</properties>
</dependency>
-
<dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <version>${ant_version}</version>
+ <groupId>geronimo</groupId>
+ <artifactId>rmi-naming</artifactId>
+ <type>car</type>
+ <version>${pom.currentVersion}</version>
<properties>
- <geronimo.assemble>repository</geronimo.assemble>
+ <geronimo.assemble>install</geronimo.assemble>
</properties>
</dependency>
-
<dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- <version>${asm_version}</version>
+ <groupId>geronimo</groupId>
+ <artifactId>j2ee-server</artifactId>
+ <type>car</type>
+ <version>${pom.currentVersion}</version>
<properties>
- <geronimo.assemble>repository</geronimo.assemble>
+ <geronimo.assemble>install</geronimo.assemble>
</properties>
</dependency>
-
- <!-- jdbc timer WorkerPersistence -->
<dependency>
- <groupId>xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>${xstream_version}</version>
+ <groupId>geronimo</groupId>
+ <artifactId>j2ee-security</artifactId>
+ <type>car</type>
+ <version>${pom.currentVersion}</version>
<properties>
- <geronimo.assemble>repository</geronimo.assemble>
+ <geronimo.assemble>install</geronimo.assemble>
</properties>
</dependency>
-
<dependency>
- <!--License is at http://www.extreme.indiana.edu/viewcvs/~checkout~/XPP3/java/LICENSE.txt -->
- <!-- it is modified BSD -->
- <groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
- <url>http://www.extreme.indiana.edu/xgws/xsoap/xpp</url>
- <!-- can we get by with 1.1.3.3_min?-->
- <version>${xpp3_version}</version>
+ <groupId>geronimo</groupId>
+ <artifactId>jetty</artifactId>
+ <type>car</type>
+ <version>${pom.currentVersion}</version>
<properties>
- <geronimo.assemble>repository</geronimo.assemble>
+ <geronimo.assemble>install</geronimo.assemble>
</properties>
</dependency>
-
<dependency>
- <groupId>activeio</groupId>
- <artifactId>activeio</artifactId>
- <version>${activeio_version}</version>
+ <groupId>geronimo</groupId>
+ <artifactId>directory</artifactId>
+ <type>car</type>
+ <version>${pom.currentVersion}</version>
<properties>
- <geronimo.assemble>repository</geronimo.assemble>
+ <geronimo.assemble>install</geronimo.assemble>
</properties>
</dependency>
-
- <!-- dependencies due to activemq -->
<dependency>
- <groupId>activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>${activemq_version}</version>
+ <groupId>geronimo</groupId>
+ <artifactId>system-database</artifactId>
+ <type>car</type>
+ <version>${pom.currentVersion}</version>
<properties>
- <geronimo.assemble>repository</geronimo.assemble>
+ <geronimo.assemble>install</geronimo.assemble>
</properties>
</dependency>
<dependency>
- <groupId>activemq</groupId>
- <artifactId>activemq-gbean</artifactId>
- <version>${activemq_version}</version>
+ <groupId>geronimo</groupId>
+ <artifactId>activemq-broker</artifactId>
+ <type>car</type>
+ <version>${pom.currentVersion}</version>
<properties>
- <geronimo.assemble>repository</geronimo.assemble>
+ <geronimo.assemble>install</geronimo.assemble>
</properties>
</dependency>
<dependency>
- <groupId>activemq</groupId>
- <artifactId>activemq-gbean-management</artifactId>
- <version>${activemq_version}</version>
+ <groupId>geronimo</groupId>
+ <artifactId>activemq</artifactId>
+ <type>car</type>
+ <version>${pom.currentVersion}</version>
<properties>
- <geronimo.assemble>repository</geronimo.assemble>
+ <geronimo.assemble>install</geronimo.assemble>
</properties>
</dependency>
<dependency>
- <groupId>activemq</groupId>
- <artifactId>activemq-ra</artifactId>
- <version>${activemq_version}</version>
- <type>rar</type>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-gbean-deployer</artifactId>
+ <type>car</type>
+ <version>${pom.currentVersion}</version>
<properties>
- <geronimo.assemble>repository</geronimo.assemble>
+ <geronimo.assemble>install</geronimo.assemble>
</properties>
</dependency>
-
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby_version}</version>
+ <groupId>geronimo</groupId>
+ <artifactId>j2ee-deployer</artifactId>
+ <type>car</type>
+ <version>${pom.currentVersion}</version>
<properties>
- <geronimo.assemble>repository</geronimo.assemble>
+ <geronimo.assemble>install</geronimo.assemble>
</properties>
</dependency>
-
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbynet</artifactId>
- <version>${derby_version}</version>
+ <groupId>geronimo</groupId>
+ <artifactId>jetty-deployer</artifactId>
+ <type>car</type>
+ <version>${pom.currentVersion}</version>
<properties>
- <geronimo.assemble>repository</geronimo.assemble>
+ <geronimo.assemble>install</geronimo.assemble>
</properties>
</dependency>
-
<dependency>
- <groupId>castor</groupId>
- <artifactId>castor</artifactId>
- <version>${castor_version}</version>
+ <groupId>geronimo</groupId>
+ <artifactId>welcome-jetty</artifactId>
+ <type>car</type>
+ <version>${pom.currentVersion}</version>
<properties>
- <geronimo.assemble>repository</geronimo.assemble>
+ <geronimo.assemble>install</geronimo.assemble>
</properties>
</dependency>
-
<dependency>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- <version>${oro_version}</version>
+ <groupId>geronimo</groupId>
+ <artifactId>webconsole-jetty</artifactId>
+ <type>car</type>
+ <version>${pom.currentVersion}</version>
<properties>
- <geronimo.assemble>repository</geronimo.assemble>
+ <geronimo.assemble>install</geronimo.assemble>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>uddi-jetty</artifactId>
+ <type>car</type>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <geronimo.assemble>install</geronimo.assemble>
</properties>
</dependency>
+ <!-- lib dependencies -->
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
@@ -176,70 +191,76 @@
</dependency>
<dependency>
- <!--axion only-->
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>${commons_collections_version}</version>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons_logging_version}</version>
+ <url>http://jakarta.apache.org/commons/logging/</url>
<properties>
- <geronimo.assemble>repository</geronimo.assemble>
+ <geronimo.assemble>library</geronimo.assemble>
</properties>
</dependency>
<dependency>
- <groupId>commons-el</groupId>
- <artifactId>commons-el</artifactId>
- <version>${commons_el_version}</version>
- <url>http://jakarta.apache.org/commons/el/</url>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-common</artifactId>
+ <version>${pom.currentVersion}</version>
<properties>
- <geronimo.assemble>repository</geronimo.assemble>
+ <geronimo.assemble>library</geronimo.assemble>
</properties>
</dependency>
<dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>${commons_fileupload_version}</version>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-deploy-tool</artifactId>
+ <version>${pom.currentVersion}</version>
<properties>
- <geronimo.assemble>repository</geronimo.assemble>
+ <geronimo.assemble>library</geronimo.assemble>
</properties>
</dependency>
<dependency>
- <!--axion-->
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons_logging_version}</version>
- <url>http://jakarta.apache.org/commons/logging/</url>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-deployment</artifactId>
+ <version>${pom.currentVersion}</version>
<properties>
<geronimo.assemble>library</geronimo.assemble>
</properties>
</dependency>
-
+
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-kernel</artifactId>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <geronimo.assemble>library</geronimo.assemble>
+ </properties>
+ </dependency>
+
<dependency>
- <!--axion-->
- <groupId>commons-primitives</groupId>
- <artifactId>commons-primitives</artifactId>
- <version>${commons_primitives_version}</version>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-system</artifactId>
+ <version>${pom.currentVersion}</version>
<properties>
- <geronimo.assemble>repository</geronimo.assemble>
+ <geronimo.assemble>library</geronimo.assemble>
</properties>
</dependency>
<dependency>
- <groupId>concurrent</groupId>
- <artifactId>concurrent</artifactId>
- <version>${concurrent_version}</version>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-qname</artifactId>
+ <version>${geronimo_spec_qname_version}</version>
<properties>
- <geronimo.assemble>repository</geronimo.assemble>
+ <geronimo.assemble>library</geronimo.assemble>
</properties>
</dependency>
+ <!-- what is this doing here?? -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit_version}</version>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-j2ee-deployment</artifactId>
+ <version>${geronimo_spec_j2ee_deployment_version}</version>
<properties>
- <geronimo.assemble>repository</geronimo.assemble>
+ <geronimo.assemble>library</geronimo.assemble>
</properties>
</dependency>
@@ -271,1054 +292,684 @@
</properties>
</dependency>
+ <!-- endorsed -->
<dependency>
- <groupId>openejb</groupId>
- <artifactId>openejb-core</artifactId>
- <version>${openejb_version}</version>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>${xerces_version}</version>
<properties>
- <geronimo.assemble>repository</geronimo.assemble>
+ <geronimo.assemble>endorsed</geronimo.assemble>
</properties>
</dependency>
<dependency>
- <groupId>openejb</groupId>
- <artifactId>openejb-pkgen-builder</artifactId>
- <version>${openejb_version}</version>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ <version>${xml_parser_apis_version}</version>
<properties>
- <geronimo.assemble>repository</geronimo.assemble>
+ <geronimo.assemble>endorsed</geronimo.assemble>
</properties>
</dependency>
+
+
+ <!-- packages we include for others to use, mostly rars -->
<dependency>
- <groupId>openejb</groupId>
- <artifactId>openejb-builder</artifactId>
- <version>${openejb_version}</version>
+ <!-- included to make additional deployments easier -->
+ <groupId>activemq</groupId>
+ <artifactId>activemq-ra</artifactId>
+ <version>${activemq_version}</version>
+ <type>rar</type>
<properties>
<geronimo.assemble>repository</geronimo.assemble>
</properties>
</dependency>
<dependency>
- <!--axion-->
- <groupId>regexp</groupId>
- <artifactId>regexp</artifactId>
- <version>${regexp_version}</version>
+ <groupId>tranql</groupId>
+ <artifactId>tranql-connector</artifactId>
+ <version>${tranql_connector_version}</version>
+ <type>rar</type>
<properties>
<geronimo.assemble>repository</geronimo.assemble>
</properties>
- <url>http://jakarta.apache.org/regexp</url>
</dependency>
<dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>${xerces_version}</version>
+ <groupId>tranql</groupId>
+ <artifactId>tranql-connector-derby-embed-xa</artifactId>
+ <version>${tranql_vendors_version}</version>
+ <type>rar</type>
<properties>
- <geronimo.assemble>endorsed</geronimo.assemble>
+ <geronimo.assemble>repository</geronimo.assemble>
</properties>
</dependency>
+ <!-- Dependencies that should be resolved by transitive dependencies and are loaded by the assembly plugin into the repository -->
<dependency>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- <version>${xml_parser_apis_version}</version>
- <properties>
- <geronimo.assemble>endorsed</geronimo.assemble>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean</artifactId>
- <version>${xmlbeans_version}</version>
- <properties>
- <geronimo.assemble>library</geronimo.assemble>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>tranql</groupId>
- <artifactId>tranql</artifactId>
- <version>${tranql_version}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ <version>${activemq_version}</version>
</dependency>
<dependency>
- <groupId>tranql</groupId>
- <artifactId>tranql-connector</artifactId>
- <version>${tranql_connector_version}</version>
- <type>rar</type>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>activemq</groupId>
+ <artifactId>activemq-gbean</artifactId>
+ <version>${activemq_version}</version>
</dependency>
<dependency>
- <groupId>tranql</groupId>
- <artifactId>tranql-connector-derby-embed-xa</artifactId>
- <version>${tranql_vendors_version}</version>
- <type>rar</type>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>activemq</groupId>
+ <artifactId>activemq-gbean-management</artifactId>
+ <version>${activemq_version}</version>
</dependency>
<dependency>
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
<version>${antlr_version}</version> `
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
</dependency>
- <!--web specific modules-->
<dependency>
- <groupId>jetty</groupId>
- <artifactId>org.mortbay.jetty</artifactId>
- <version>${jetty_version}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <!--what is using this? -->
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>${asm_version}</version> `
</dependency>
+
<dependency>
- <groupId>tomcat</groupId>
- <artifactId>catalina</artifactId>
- <version>${tomcat_version}</version>
- <url>http://jakarta.apache.org/tomcat/</url>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>axis</groupId>
+ <artifactId>axis</artifactId>
+ <version>${axis_version}</version>
</dependency>
+
<dependency>
- <groupId>tomcat</groupId>
- <artifactId>catalina</artifactId>
- <version>${tomcat_version}</version>
- <url>http://jakarta.apache.org/tomcat/</url>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>${commons_collections_version}</version>
</dependency>
+
<dependency>
- <groupId>tomcat</groupId>
- <artifactId>catalina-optional</artifactId>
- <version>${tomcat_version}</version>
- <url>http://jakarta.apache.org/tomcat/</url>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>commons-discovery</groupId>
+ <artifactId>commons-discovery</artifactId>
+ <version>${commons_discovery_version}</version>
</dependency>
+
<dependency>
- <groupId>tomcat</groupId>
- <artifactId>tomcat-coyote</artifactId>
- <version>${tomcat_version}</version>
- <url>http://jakarta.apache.org/tomcat/</url>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>commons-el</groupId>
+ <artifactId>commons-el</artifactId>
+ <version>${commons_el_version}</version>
+ <url>http://jakarta.apache.org/commons/el/</url>
</dependency>
+
<dependency>
- <groupId>tomcat</groupId>
- <artifactId>tomcat-http</artifactId>
- <version>${tomcat_version}</version>
- <url>http://jakarta.apache.org/tomcat/</url>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons_io_version}</version>
+ <url>http://jakarta.apache.org/commons/io</url>
</dependency>
+
<dependency>
- <groupId>tomcat</groupId>
- <artifactId>tomcat-util</artifactId>
- <version>${tomcat_version}</version>
- <url>http://jakarta.apache.org/tomcat/</url>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>${commons_lang_version}</version>
+ <url>http://jakarta.apache.org/commons/lang/api</url>
</dependency>
+
<dependency>
- <groupId>tomcat</groupId>
- <artifactId>naming-resources</artifactId>
- <version>${tomcat_version}</version>
- <url>http://jakarta.apache.org/tomcat/</url>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>commons-primitives</groupId>
+ <artifactId>commons-primitives</artifactId>
+ <version>${commons_primitives_version}</version>
</dependency>
+
<dependency>
- <groupId>tomcat</groupId>
- <artifactId>servlets-default</artifactId>
- <version>${tomcat_version}</version>
- <url>http://jakarta.apache.org/tomcat/</url>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>${concurrent_version}</version>
</dependency>
+
<dependency>
- <groupId>tomcat</groupId>
- <artifactId>servlets-invoker</artifactId>
- <version>${tomcat_version}</version>
- <url>http://jakarta.apache.org/tomcat/</url>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>directory</groupId>
+ <artifactId>apacheds-core</artifactId>
+ <version>${apacheds_version}</version>
</dependency>
+
<dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>${commons_beanutils_version}</version>
- <url>http://jakarta.apache.org/commons/beanutils</url>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>directory</groupId>
+ <artifactId>apacheds-shared</artifactId>
+ <version>${apacheds_version}</version>
</dependency>
+
<dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>${commons_digester_version}</version>
- <url>http://jakarta.apache.org/commons/digester</url>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>directory-asn1</groupId>
+ <artifactId>asn1-ber</artifactId>
+ <version>${asn1_version}</version>
</dependency>
+
<dependency>
- <groupId>commons-modeler</groupId>
- <artifactId>commons-modeler</artifactId>
- <version>${commons_modeler_version}</version>
- <url>http://jakarta.apache.org/commons/modeler</url>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>directory-asn1</groupId>
+ <artifactId>asn1-codec</artifactId>
+ <version>${asn1_version}</version>
</dependency>
- <!-- for jsps -->
<dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-compiler</artifactId>
- <version>${jasper_version}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>directory-asn1</groupId>
+ <artifactId>asn1-der</artifactId>
+ <version>${asn1_version}</version>
</dependency>
+
<dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-compiler-jdt</artifactId>
- <version>${jasper_version}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>directory-network</groupId>
+ <artifactId>mina</artifactId>
+ <version>${mina_version}</version>
</dependency>
+
<dependency>
- <groupId>tomcat</groupId>
- <artifactId>jasper-runtime</artifactId>
- <version>${jasper_version}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>directory-protocols</groupId>
+ <artifactId>kerberos-protocol</artifactId>
+ <version>${kerberos_protocols_version}</version>
</dependency>
+ <dependency>
+ <groupId>directory-protocols</groupId>
+ <artifactId>ldap-protocol</artifactId>
+ <version>${ldap_protocols_version}</version>
+ </dependency>
<dependency>
- <groupId>axis</groupId>
- <artifactId>axis</artifactId>
- <version>${axis_version}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>directory-shared</groupId>
+ <artifactId>apache-ldapber-provider</artifactId>
+ <version>${apacheds_version}</version>
</dependency>
<dependency>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- <version>${wsdl4j_version}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>directory-shared</groupId>
+ <artifactId>kerberos-common</artifactId>
+ <version>${kerberos_common_version}</version>
</dependency>
<dependency>
- <groupId>commons-discovery</groupId>
- <artifactId>commons-discovery</artifactId>
- <version>${commons_discovery_version}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>directory-shared</groupId>
+ <artifactId>ldap-common</artifactId>
+ <version>${apacheds_version}</version>
</dependency>
+<!-- geronimo jars -->
+<!-- geronimo-spec jars -->
+
<dependency>
- <groupId>xfire</groupId>
- <artifactId>xfire</artifactId>
- <version>${xfire_version}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>howl</groupId>
+ <artifactId>howl-logger</artifactId>
+ <version>${howl_version}</version>
</dependency>
-<!-- <dependency>
- <groupId>xfire</groupId>
- <artifactId>xfire-java</artifactId>
- <version>${xfire_version}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <dependency>
+ <groupId>jdbm</groupId>
+ <artifactId>jdbm</artifactId>
+ <version>${jdbm_version}</version>
+ <url>http://jdbm.sourceforge.net</url>
</dependency>
--->
+
<dependency>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- <version>${wsdl4j_version}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>${jdom_version}</version>
</dependency>
-<!-- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax</artifactId>
- <version>${stax_version}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <dependency>
+ <groupId>jetty</groupId>
+ <artifactId>org.mortbay.jetty</artifactId>
+ <version>${jetty_version}</version>
</dependency>
--->
+
<dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>${stax_api_version}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>juddi</groupId>
+ <artifactId>juddi</artifactId>
+ <version>${juddi_version}</version>
</dependency>
- <!-- end corba support-->
- <!-- directory -->
<dependency>
- <groupId>directory</groupId>
- <artifactId>apacheds-core</artifactId>
- <version>${apacheds_version}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>openejb</groupId>
+ <artifactId>openejb-builder</artifactId>
+ <version>${openejb_version}</version>
</dependency>
<dependency>
- <groupId>directory</groupId>
- <artifactId>apacheds-shared</artifactId>
- <version>${apacheds_version}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>openejb</groupId>
+ <artifactId>openejb-core</artifactId>
+ <version>${openejb_version}</version>
</dependency>
<dependency>
- <groupId>directory-asn1</groupId>
- <artifactId>asn1-codec</artifactId>
- <version>${asn1_version}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>openejb</groupId>
+ <artifactId>openejb-pkgen-builder</artifactId>
+ <version>${openejb_version}</version>
</dependency>
<dependency>
- <groupId>directory-shared</groupId>
- <artifactId>apache-ldapber-provider</artifactId>
- <version>${apacheds_version}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>${derby_version}</version>
</dependency>
<dependency>
- <groupId>directory-asn1</groupId>
- <artifactId>asn1-ber</artifactId>
- <version>${asn1_version}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbynet</artifactId>
+ <version>${derby_version}</version>
</dependency>
<dependency>
- <groupId>directory-asn1</groupId>
- <artifactId>asn1-der</artifactId>
- <version>${asn1_version}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto</artifactId>
+ <version>${pluto_version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4j_version}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
</dependency>
<dependency>
- <groupId>directory-shared</groupId>
- <artifactId>ldap-common</artifactId>
- <version>${apacheds_version}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <version>${oro_version}</version>
</dependency>
<dependency>
- <groupId>directory-shared</groupId>
- <artifactId>kerberos-common</artifactId>
- <version>${kerberos_common_version}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>portlet-api</groupId>
+ <artifactId>portlet-api</artifactId>
+ <version>${portlet_api_version}</version>
</dependency>
<dependency>
- <groupId>directory-network</groupId>
- <artifactId>mina</artifactId>
- <version>${mina_version}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>regexp</groupId>
+ <artifactId>regexp</artifactId>
+ <version>${regexp_version}</version>
+ <url>http://jakarta.apache.org/regexp</url>
</dependency>
<dependency>
- <groupId>directory-protocols</groupId>
- <artifactId>kerberos-protocol</artifactId>
- <version>${kerberos_protocols_version}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>scout</groupId>
+ <artifactId>jaxr-api</artifactId>
+ <version>${scout_version}</version>
</dependency>
<dependency>
- <groupId>directory-protocols</groupId>
- <artifactId>ldap-protocol</artifactId>
- <version>${ldap_protocols_version}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>scout</groupId>
+ <artifactId>scout</artifactId>
+ <version>${scout_version}</version>
</dependency>
<dependency>
- <groupId>jdbm</groupId>
- <artifactId>jdbm</artifactId>
- <version>${jdbm_version}</version>
- <url>http://jdbm.sourceforge.net</url>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>${stax_api_version}</version>
</dependency>
+<!-- tomcat -->
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons_lang_version}</version>
- <url>http://jakarta.apache.org/commons/lang/api</url>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>tomcat</groupId>
+ <artifactId>catalina</artifactId>
+ <version>${tomcat_version}</version>
+ <url>http://jakarta.apache.org/tomcat/</url>
</dependency>
-
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons_io_version}</version>
- <url>http://jakarta.apache.org/commons/io</url>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>tomcat</groupId>
+ <artifactId>catalina</artifactId>
+ <version>${tomcat_version}</version>
+ <url>http://jakarta.apache.org/tomcat/</url>
</dependency>
-
-
- <!-- unknown purpose -->
<dependency>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>${jdom_version}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>tomcat</groupId>
+ <artifactId>catalina-optional</artifactId>
+ <version>${tomcat_version}</version>
+ <url>http://jakarta.apache.org/tomcat/</url>
</dependency>
-
- <!-- spring support-->
<dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-spring</artifactId>
- <version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>tomcat</groupId>
+ <artifactId>tomcat-coyote</artifactId>
+ <version>${tomcat_version}</version>
+ <url>http://jakarta.apache.org/tomcat/</url>
</dependency>
<dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-spring-builder</artifactId>
- <version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>tomcat</groupId>
+ <artifactId>tomcat-http</artifactId>
+ <version>${tomcat_version}</version>
+ <url>http://jakarta.apache.org/tomcat/</url>
</dependency>
<dependency>
- <groupId>springframework</groupId>
- <artifactId>spring</artifactId>
- <version>${spring_version}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>tomcat</groupId>
+ <artifactId>tomcat-util</artifactId>
+ <version>${tomcat_version}</version>
+ <url>http://jakarta.apache.org/tomcat/</url>
</dependency>
- <!-- end spring support-->
-
- <!-- JAXR (Apache Scout)-->
<dependency>
- <groupId>scout</groupId>
- <artifactId>jaxr-api</artifactId>
- <version>${scout_version}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>tomcat</groupId>
+ <artifactId>naming-resources</artifactId>
+ <version>${tomcat_version}</version>
+ <url>http://jakarta.apache.org/tomcat/</url>
</dependency>
-
<dependency>
- <groupId>scout</groupId>
- <artifactId>scout</artifactId>
- <version>${scout_version}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>tomcat</groupId>
+ <artifactId>servlets-default</artifactId>
+ <version>${tomcat_version}</version>
+ <url>http://jakarta.apache.org/tomcat/</url>
</dependency>
-
<dependency>
- <groupId>juddi</groupId>
- <artifactId>juddi</artifactId>
- <version>${juddi_version}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>tomcat</groupId>
+ <artifactId>servlets-invoker</artifactId>
+ <version>${tomcat_version}</version>
+ <url>http://jakarta.apache.org/tomcat/</url>
</dependency>
+<!-- jasper -->
<dependency>
- <groupId>portlet-api</groupId>
- <artifactId>portlet-api</artifactId>
- <version>${portlet_api_version}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler</artifactId>
+ <version>${jasper_version}</version>
</dependency>
<dependency>
- <groupId>org.apache.pluto</groupId>
- <artifactId>pluto</artifactId>
- <version>${pluto_version}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler-jdt</artifactId>
+ <version>${jasper_version}</version>
</dependency>
<dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-console-core</artifactId>
- <version>${geronimo_version}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ <version>${jasper_version}</version>
</dependency>
- <!-- Specification dependencies to preload into the repository -->
<dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2ee</artifactId>
- <version>${geronimo_spec_j2ee_version}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>tranql</groupId>
+ <artifactId>tranql</artifactId>
+ <version>${tranql_version}</version>
</dependency>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2ee-deployment</artifactId>
- <version>${geronimo_spec_j2ee_deployment_version}</version>
- <properties>
- <geronimo.assemble>library</geronimo.assemble>
- </properties>
+ <dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ <version>${wsdl4j_version}</version>
</dependency>
<dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2ee-jacc</artifactId>
- <version>${geronimo_spec_j2ee_jacc_version}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean</artifactId>
+ <version>${xmlbeans_version}</version>
</dependency>
<dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-qname</artifactId>
- <version>${geronimo_spec_qname_version}</version>
- <properties>
- <geronimo.assemble>library</geronimo.assemble>
- </properties>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
+ <version>${xpp3_version}</version>
</dependency>
<dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-activation</artifactId>
- <version>${geronimo_spec_activation_version}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <version>${xstream_version}</version>
</dependency>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-javamail</artifactId>
- <version>${geronimo_spec_javamail_version}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
- </dependency>
+<!-- stuff that has no clear purpose -->
<dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-corba</artifactId>
- <version>${geronimo_spec_corba_version}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>castor</groupId>
+ <artifactId>castor</artifactId>
+ <version>${castor_version}</version>
</dependency>
- <!-- Geronimo modules to preload into the repository -->
<dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-activation</artifactId>
- <version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-axis</artifactId>
- <version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-axis-builder</artifactId>
- <version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-client</artifactId>
- <version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-client-builder</artifactId>
- <version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-clustering</artifactId>
- <version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-common</artifactId>
- <version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>library</geronimo.assemble>
- </properties>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>${commons_fileupload_version}</version>
</dependency>
+
<dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-connector</artifactId>
- <version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit_version}</version>
</dependency>
+
+ <!--web specific modules-->
<dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-connector-builder</artifactId>
- <version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>${commons_beanutils_version}</version>
+ <url>http://jakarta.apache.org/commons/beanutils</url>
</dependency>
<dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-core</artifactId>
- <version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>${commons_digester_version}</version>
+ <url>http://jakarta.apache.org/commons/digester</url>
</dependency>
<dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-deployment</artifactId>
- <version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>library</geronimo.assemble>
- </properties>
+ <groupId>commons-modeler</groupId>
+ <artifactId>commons-modeler</artifactId>
+ <version>${commons_modeler_version}</version>
+ <url>http://jakarta.apache.org/commons/modeler</url>
</dependency>
+
<dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-deploy-tool</artifactId>
- <version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>library</geronimo.assemble>
- </properties>
+ <groupId>xfire</groupId>
+ <artifactId>xfire</artifactId>
+ <version>${xfire_version}</version>
</dependency>
+
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-derby</artifactId>
+ <artifactId>geronimo-spring</artifactId>
<version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-directory</artifactId>
+ <artifactId>geronimo-spring-builder</artifactId>
<version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
</dependency>
<dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-j2ee</artifactId>
- <version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>springframework</groupId>
+ <artifactId>spring</artifactId>
+ <version>${spring_version}</version>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-j2ee-builder</artifactId>
- <version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <artifactId>geronimo-console-core</artifactId>
+ <version>${geronimo_version}</version>
</dependency>
+
+ <!-- Specification dependencies to preload into the repository -->
<dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-j2ee-schema</artifactId>
- <version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-j2ee</artifactId>
+ <version>${geronimo_spec_j2ee_version}</version>
</dependency>
+
<dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-jetty</artifactId>
- <version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-j2ee-jacc</artifactId>
+ <version>${geronimo_spec_j2ee_jacc_version}</version>
</dependency>
+
<dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-jetty-builder</artifactId>
- <version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-activation</artifactId>
+ <version>${geronimo_spec_activation_version}</version>
</dependency>
+
<dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-jmxremoting</artifactId>
- <version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-javamail</artifactId>
+ <version>${geronimo_spec_javamail_version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-corba</artifactId>
+ <version>${geronimo_spec_corba_version}</version>
</dependency>
+
+ <!-- Geronimo modules to preload into the repository -->
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-kernel</artifactId>
+ <artifactId>geronimo-activation</artifactId>
<version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>library</geronimo.assemble>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-mail</artifactId>
+ <artifactId>geronimo-axis</artifactId>
<version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
- </dependency>
+ </dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-management</artifactId>
+ <artifactId>geronimo-axis-builder</artifactId>
<version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
- </dependency>
+ </dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-naming</artifactId>
+ <artifactId>geronimo-client</artifactId>
<version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-naming-builder</artifactId>
+ <artifactId>geronimo-client-builder</artifactId>
<version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-security</artifactId>
+ <artifactId>geronimo-clustering</artifactId>
<version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-security-builder</artifactId>
+ <artifactId>geronimo-connector</artifactId>
<version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-service-builder</artifactId>
+ <artifactId>geronimo-connector-builder</artifactId>
<version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-servicemix</artifactId>
+ <artifactId>geronimo-core</artifactId>
<version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-servicemix-builder</artifactId>
+ <artifactId>geronimo-derby</artifactId>
<version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-system</artifactId>
+ <artifactId>geronimo-directory</artifactId>
<version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>library</geronimo.assemble>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-timer</artifactId>
+ <artifactId>geronimo-j2ee</artifactId>
<version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-tomcat</artifactId>
+ <artifactId>geronimo-j2ee-builder</artifactId>
<version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-transaction</artifactId>
+ <artifactId>geronimo-j2ee-schema</artifactId>
<version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-util</artifactId>
+ <artifactId>geronimo-jetty</artifactId>
<version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-web-builder</artifactId>
+ <artifactId>geronimo-jetty-builder</artifactId>
<version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-webservices</artifactId>
+ <artifactId>geronimo-jmxremoting</artifactId>
<version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>repository</geronimo.assemble>
- </properties>
</dependency>
-
- <!-- configurations to install -->
<dependency>
<groupId>geronimo</groupId>
- <artifactId>j2ee-system</artifactId>
- <type>car</type>
+ <artifactId>geronimo-mail</artifactId>
<version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>install</geronimo.assemble>
- <geronimo.assemble.executable>bin/server.jar</geronimo.assemble.executable>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>rmi-naming</artifactId>
- <type>car</type>
+ <artifactId>geronimo-management</artifactId>
<version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>install</geronimo.assemble>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>j2ee-server</artifactId>
- <type>car</type>
+ <artifactId>geronimo-naming</artifactId>
<version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>install</geronimo.assemble>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>j2ee-security</artifactId>
- <type>car</type>
+ <artifactId>geronimo-naming-builder</artifactId>
<version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>install</geronimo.assemble>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>jetty</artifactId>
- <type>car</type>
+ <artifactId>geronimo-security</artifactId>
<version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>install</geronimo.assemble>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>directory</artifactId>
- <type>car</type>
+ <artifactId>geronimo-security-builder</artifactId>
<version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>install</geronimo.assemble>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>system-database</artifactId>
- <type>car</type>
+ <artifactId>geronimo-service-builder</artifactId>
<version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>install</geronimo.assemble>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>activemq-broker</artifactId>
- <type>car</type>
+ <artifactId>geronimo-servicemix</artifactId>
<version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>install</geronimo.assemble>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>activemq</artifactId>
- <type>car</type>
+ <artifactId>geronimo-servicemix-builder</artifactId>
<version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>install</geronimo.assemble>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-gbean-deployer</artifactId>
- <type>car</type>
+ <artifactId>geronimo-timer</artifactId>
<version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>install</geronimo.assemble>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>j2ee-deployer</artifactId>
- <type>car</type>
+ <artifactId>geronimo-tomcat</artifactId>
<version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>install</geronimo.assemble>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>jetty-deployer</artifactId>
- <type>car</type>
+ <artifactId>geronimo-transaction</artifactId>
<version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>install</geronimo.assemble>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>welcome-jetty</artifactId>
- <type>car</type>
+ <artifactId>geronimo-util</artifactId>
<version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>install</geronimo.assemble>
- </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>webconsole-jetty</artifactId>
- <type>car</type>
+ <artifactId>geronimo-web-builder</artifactId>
<version>${pom.currentVersion}</version>
- <properties>
- <geronimo.assemble>install</geronimo.assemble>
- </properties>
</dependency>
-
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-assembly-plugin</artifactId>
- <type>plugin</type>
+ <artifactId>geronimo-webservices</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
+
</dependencies>
</project>
Modified: geronimo/trunk/configs/client-corba/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/client-corba/project.properties?rev=344852&r1=344851&r2=344852&view=diff
==============================================================================
--- geronimo/trunk/configs/client-corba/project.properties (original)
+++ geronimo/trunk/configs/client-corba/project.properties Tue Nov 15 18:42:23 2005
@@ -21,6 +21,8 @@
maven.multiproject.type=car
+geronimo.packaging.deploymentConfig=geronimo/cars/geronimo-gbean-deployer-${geronimo_version}.car,geronimo/cars/j2ee-deployer-${geronimo_version}.car
+
PlanHTTPPort=8080
PlanHTTPSPort=8443
PlanOpenEJBPort=4201
Modified: geronimo/trunk/configs/console-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/console-jetty/src/plan/plan.xml?rev=344852&r1=344851&r2=344852&view=diff
==============================================================================
--- geronimo/trunk/configs/console-jetty/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/console-jetty/src/plan/plan.xml Tue Nov 15 18:42:23 2005
@@ -4,36 +4,6 @@
configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
>
- <!-- these dependencies must be kept here so that their classes are loaded in the "EARs" classloader. -->
-<!-- <dependency>
- <groupId>portlet-api</groupId>
- <artifactId>portlet-api</artifactId>
- <version>${portlet_api_version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.pluto</groupId>
- <artifactId>pluto</artifactId>
- <version>${pluto_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-console-core</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-management</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
-
-
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-util</artifactId>
- <version>${geronimo_version}</version>
- </dependency>-->
-
-
<module>
<web>geronimo-console-framework-${pom.currentVersion}.war</web>
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0" configId="console">
Modified: geronimo/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml?rev=344852&r1=344851&r2=344852&view=diff
==============================================================================
--- geronimo/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml Tue Nov 15 18:42:23 2005
@@ -22,41 +22,6 @@
server="geronimo"
>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-system</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-common</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-deployment</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-j2ee</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-service-builder</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean</artifactId>
- <version>${xmlbeans_version}</version>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>${stax_api_version}</version>
- </dependency>
<!-- Deployer used to process modules and plans -->
<gbean gbeanName="geronimo.maven:name=Deployer,j2eeType=Deployer,J2EEModule=${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car" class="org.apache.geronimo.deployment.Deployer">
Modified: geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml?rev=344852&r1=344851&r2=344852&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/j2ee-deployer/src/plan/plan.xml Tue Nov 15 18:42:23 2005
@@ -22,136 +22,7 @@
<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
>
-<!--
- <import>
- <groupId>geronimo</groupId>
- <type>car</type>
- <artifactId>j2ee-server</artifactId>
- <version>${pom.currentVersion}</version>
- </import>
-
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-j2ee</artifactId>
- <version>${geronimo_spec_j2ee_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-corba</artifactId>
- <version>${geronimo_spec_corba_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-j2ee-schema</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-core</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-management</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-transaction</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
-
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-j2ee-builder</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-client-builder</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-naming-builder</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-naming</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-security-builder</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-security</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-axis-builder</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-axis</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-webservices</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
-
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-web-builder</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
-
- <dependency>
- <groupId>openejb</groupId>
- <artifactId>openejb-builder</artifactId>
- <version>${openejb_version}</version>
- </dependency>
- <dependency>
- <groupId>openejb</groupId>
- <artifactId>openejb-pkgen-builder</artifactId>
- <version>${openejb_version}</version>
- </dependency>
- <dependency>
- <groupId>openejb</groupId>
- <artifactId>openejb-core</artifactId>
- <version>${openejb_version}</version>
- </dependency>
- <dependency>
- <groupId>tranql</groupId>
- <artifactId>tranql</artifactId>
- <version>${tranql_version}</version>
- </dependency>
-
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-connector-builder</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-connector</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
-
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-servicemix-builder</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
--->
<gbean name="EARBuilder" class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
<attribute name="defaultParentId">${pom.groupId}/cars/j2ee-server-${pom.currentVersion}.car</attribute>
<!--domain set to wildcard so datasources may be deployed independently on client. -->
Modified: geronimo/trunk/configs/j2ee-security/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-security/src/plan/plan.xml?rev=344852&r1=344851&r2=344852&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-security/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/j2ee-security/src/plan/plan.xml Tue Nov 15 18:42:23 2005
@@ -29,10 +29,6 @@
<!--runtime dependencies-->
- <!-- <dependency>
- <uri>geronimo/jars/geronimo-jmxremoting-${geronimo_version}.jar</uri>
- </dependency>
--->
<gbean name="SecurityService" class="org.apache.geronimo.security.SecurityServiceImpl">
<reference name="ServerInfo"><module>geronimo/cars/j2ee-system-${pom.currentVersion}.car</module><name>ServerInfo</name></reference>
Modified: geronimo/trunk/configs/j2ee-system/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-system/src/plan/plan.xml?rev=344852&r1=344851&r2=344852&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-system/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/j2ee-system/src/plan/plan.xml Tue Nov 15 18:42:23 2005
@@ -66,14 +66,6 @@
</reference>
</gbean>
- <!-- Persistent List of running Configurations service -->
-<!-- <gbean name="Default" class="org.apache.geronimo.system.configuration.KernelMonitoringConfigurationList">-->
-<!-- <reference name="Delegate">-->
-<!-- <type>AttributeStore</type>-->
-<!-- <name>AttributeManager</name>-->
-<!-- </reference>-->
-<!-- </gbean>-->
-
<!-- Repository -->
<gbean name="Repository" class="org.apache.geronimo.system.repository.ReadOnlyRepository">
<attribute name="root">repository/</attribute>
Modified: geronimo/trunk/configs/jetty-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jetty-deployer/project.xml?rev=344852&r1=344851&r2=344852&view=diff
==============================================================================
--- geronimo/trunk/configs/jetty-deployer/project.xml (original)
+++ geronimo/trunk/configs/jetty-deployer/project.xml Tue Nov 15 18:42:23 2005
@@ -31,21 +31,31 @@
<!-- parent config -->
<dependency>
<groupId>geronimo</groupId>
- <artifactId>jetty</artifactId>
+ <artifactId>j2ee-deployer</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
+ <properties>
+ <geronimo.import>true</geronimo.import>
+ </properties>
</dependency>
+
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-system</artifactId>
+ <artifactId>jetty</artifactId>
<version>${geronimo_version}</version>
+ <type>car</type>
+ <properties>
+ <geronimo.import>true</geronimo.import>
+ </properties>
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>j2ee-deployer</artifactId>
+ <artifactId>geronimo-jetty-builder</artifactId>
<version>${geronimo_version}</version>
- <type>car</type>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
</dependency>
<dependency>
Modified: geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml?rev=344852&r1=344851&r2=344852&view=diff
==============================================================================
--- geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/jetty-deployer/src/plan/plan.xml Tue Nov 15 18:42:23 2005
@@ -16,21 +16,12 @@
-->
<!-- $Rev: 216115 $ $Date: 2005-07-12 23:22:18 -0600 (Tue, 12 Jul 2005) $ -->
-
+<!-- parentId="${pom.groupId}/cars/j2ee-deployer-${pom.currentVersion}.car"
+-->
<configuration
xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
- parentId="${pom.groupId}/cars/j2ee-deployer-${pom.currentVersion}.car"
>
-
- <import>
- <uri>${pom.groupId}/cars/jetty-${pom.currentVersion}.car</uri>
- </import>
-
-
- <dependency>
- <uri>geronimo/jars/geronimo-jetty-builder-${geronimo_version}.jar</uri>
- </dependency>
<gbean name="JettyWebBuilder" class="org.apache.geronimo.jetty.deployment.JettyModuleBuilder">
<attribute name="defaultParentId">${pom.groupId}/cars/j2ee-server-${pom.currentVersion}.car,${pom.groupId}/cars/jetty-${pom.currentVersion}.car</attribute>
Modified: geronimo/trunk/configs/uddi-jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/uddi-jetty/project.properties?rev=344852&r1=344851&r2=344852&view=diff
==============================================================================
--- geronimo/trunk/configs/uddi-jetty/project.properties (original)
+++ geronimo/trunk/configs/uddi-jetty/project.properties Tue Nov 15 18:42:23 2005
@@ -21,5 +21,7 @@
maven.multiproject.type=car
-geronimo.packaging.moduleFile=${maven.repo.local}/tranql/rars/tranql-connector-derby-embed-xa-${tranql_connector_version}.rar
+geronimo.packaging.deploymentConfig=geronimo/cars/geronimo-gbean-deployer-${geronimo_version}.car,geronimo/cars/j2ee-deployer-${geronimo_version}.car,geronimo/cars/jetty-deployer-${geronimo_version}.car
+
+geronimo.packaging.moduleFile=${maven.repo.local}/geronimo/wars/geronimo-uddi-server-${geronimo_version}.war
Modified: geronimo/trunk/configs/uddi-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/uddi-jetty/project.xml?rev=344852&r1=344851&r2=344852&view=diff
==============================================================================
--- geronimo/trunk/configs/uddi-jetty/project.xml (original)
+++ geronimo/trunk/configs/uddi-jetty/project.xml Tue Nov 15 18:42:23 2005
@@ -21,17 +21,31 @@
<project>
<pomVersion>3</pomVersion>
<extend>../../etc/project.xml</extend>
- <id>system-database</id>
- <name>System Database Configuration for the J2EE Server</name>
+ <id>uddi-jetty</id>
+ <name>UDDI server Configuration for the J2EE Jetty Server</name>
<dependencies>
<!-- parent config -->
<dependency>
<groupId>geronimo</groupId>
- <artifactId>j2ee-server</artifactId>
+ <artifactId>system-database</artifactId>
<version>${geronimo_version}</version>
<type>car</type>
+ <properties>
+ <geronimo.import>true</geronimo.import>
+ </properties>
</dependency>
+
+ <dependency>
+ <groupId>juddi</groupId>
+ <artifactId>juddi</artifactId>
+ <version>${juddi_version}</version>
+ <properties>
+ <geronimo.dependency>true</geronimo.dependency>
+ </properties>
+ </dependency>
+
+<!-- should be transitive deps -->
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-system</artifactId>