geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jboy...@apache.org
Subject svn commit: r263817 - in /geronimo/trunk: ./ assemblies/j2ee-server/ assemblies/j2ee-server/src/var/config/ assemblies/j2ee-server/src/var/log/ assemblies/j2ee-server/src/var/security/ configs/geronimo-gbean-deployer/ configs/geronimo-gbean-deployer/sr...
Date Sun, 28 Aug 2005 04:19:29 GMT
Author: jboynes
Date: Sat Aug 27 21:19:12 2005
New Revision: 263817

URL: http://svn.apache.org/viewcvs?rev=263817&view=rev
Log:
first cut at assembly using the plugins; for now just does system and server configs, the rest to follow soon

Added:
    geronimo/trunk/assemblies/j2ee-server/src/var/security/keystore   (with props)
    geronimo/trunk/configs/j2ee-server/maven.xml   (with props)
    geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap.java   (with props)
Modified:
    geronimo/trunk/assemblies/j2ee-server/project.xml
    geronimo/trunk/assemblies/j2ee-server/src/var/config/config.list
    geronimo/trunk/assemblies/j2ee-server/src/var/log/server-log4j.properties
    geronimo/trunk/configs/geronimo-gbean-deployer/maven.xml
    geronimo/trunk/configs/geronimo-gbean-deployer/project.properties
    geronimo/trunk/configs/geronimo-gbean-deployer/project.xml
    geronimo/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml
    geronimo/trunk/configs/j2ee-server/project.properties
    geronimo/trunk/configs/j2ee-server/project.xml
    geronimo/trunk/configs/j2ee-server/src/plan/plan.xml
    geronimo/trunk/configs/j2ee-system/maven.xml
    geronimo/trunk/configs/j2ee-system/project.properties
    geronimo/trunk/configs/j2ee-system/project.xml
    geronimo/trunk/configs/j2ee-system/src/plan/plan.xml
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java
    geronimo/trunk/plugins/geronimo-assembly-plugin/maven.xml
    geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml
    geronimo/trunk/plugins/geronimo-packaging-plugin/maven.xml
    geronimo/trunk/plugins/geronimo-packaging-plugin/plugin.jelly
    geronimo/trunk/plugins/geronimo-packaging-plugin/project.xml
    geronimo/trunk/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java
    geronimo/trunk/project.properties

Modified: geronimo/trunk/assemblies/j2ee-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-server/project.xml?rev=263817&r1=263816&r2=263817&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-server/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-server/project.xml Sat Aug 27 21:19:12 2005
@@ -37,19 +37,18 @@
         </dependency>
 
         <dependency>
-            <groupId>tranql</groupId>
-            <artifactId>tranql-connector</artifactId>
-            <version>${tranql_connector_version}</version>
-            <type>rar</type>
+            <groupId>ant</groupId>
+            <artifactId>ant</artifactId>
+            <version>${ant_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
         </dependency>
 
         <dependency>
-            <groupId>ant</groupId>
-            <artifactId>ant</artifactId>
-            <version>${ant_version}</version>
+            <groupId>asm</groupId>
+            <artifactId>asm</artifactId>
+            <version>${asm_version}</version>
             <properties>
                 <geronimo.assemble>repository</geronimo.assemble>
             </properties>
@@ -88,6 +87,15 @@
             </properties>
         </dependency>
 
+        <dependency>
+            <groupId>activeio</groupId>
+            <artifactId>activeio</artifactId>
+            <version>${activeio_version}</version>
+            <properties>
+                <geronimo.assemble>repository</geronimo.assemble>
+            </properties>
+        </dependency>
+
         <!-- dependencies due to activemq -->
         <dependency>
             <groupId>activemq</groupId>
@@ -107,6 +115,14 @@
         </dependency>
         <dependency>
             <groupId>activemq</groupId>
+            <artifactId>activemq-gbean-management</artifactId>
+            <version>${activemq_version}</version>
+            <properties>
+                <geronimo.assemble>repository</geronimo.assemble>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>activemq</groupId>
             <artifactId>activemq-ra</artifactId>
             <version>${activemq_version}</version>
             <type>rar</type>
@@ -153,9 +169,8 @@
 
         <dependency>
             <groupId>cglib</groupId>
-            <artifactId>cglib-full</artifactId>
+            <artifactId>cglib-nodep</artifactId>
             <version>${cglib_version}</version>
-            <url>http://cglib.sf.net/</url>
             <properties>
                 <geronimo.assemble>library</geronimo.assemble>
             </properties>
@@ -165,7 +180,6 @@
             <groupId>commons-cli</groupId>
             <artifactId>commons-cli</artifactId>
             <version>${commons_cli_version}</version>
-            <url>http://jakarta.apache.org/commons/cli/</url>
             <properties>
                 <geronimo.assemble>library</geronimo.assemble>
             </properties>
@@ -318,7 +332,7 @@
 
         <dependency>
             <groupId>xmlbeans</groupId>
-            <artifactId>xbean-apache</artifactId>
+            <artifactId>xbean</artifactId>
             <version>${xmlbeans_version}</version>
             <properties>
                 <geronimo.assemble>library</geronimo.assemble>
@@ -335,6 +349,26 @@
         </dependency>
 
         <dependency>
+            <groupId>tranql</groupId>
+            <artifactId>tranql-connector</artifactId>
+            <version>${tranql_connector_version}</version>
+            <type>rar</type>
+            <properties>
+                <geronimo.assemble>repository</geronimo.assemble>
+            </properties>
+        </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>
+        </dependency>
+
+        <dependency>
             <groupId>antlr</groupId>
             <artifactId>antlr</artifactId>
             <version>${antlr_version}</version>                                                         `
@@ -498,15 +532,6 @@
         </dependency>
 
         <dependency>
-            <groupId>axis</groupId>
-            <artifactId>axis-saaj</artifactId>
-            <version>${axis_saaj_version}</version>
-            <properties>
-                <geronimo.assemble>repository</geronimo.assemble>
-            </properties>
-        </dependency>
-
-        <dependency>
             <groupId>wsdl4j</groupId>
             <artifactId>wsdl4j</artifactId>
             <version>${wsdl4j_version}</version>
@@ -690,6 +715,15 @@
             </properties>
         </dependency>
 
+        <dependency>
+            <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-corba</artifactId>
+            <version>${geronimo_spec_corba_version}</version>
+            <properties>
+                <geronimo.assemble>repository</geronimo.assemble>
+            </properties>
+        </dependency>
+
         <!-- Geronimo modules to preload into the repository -->
         <dependency>
             <groupId>geronimo</groupId>
@@ -796,14 +830,6 @@
             </properties>
         </dependency>
         <dependency>
-            <groupId>tranql</groupId>
-            <artifactId>tranql-connector-derby-embed-xa</artifactId>
-            <version>${tranql_vendors_version}</version>
-             <properties>
-                <geronimo.assemble>repository</geronimo.assemble>
-            </properties>
-        </dependency>
-        <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-j2ee</artifactId>
             <version>${pom.currentVersion}</version>
@@ -869,6 +895,14 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>geronimo-management</artifactId>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <geronimo.assemble>repository</geronimo.assemble>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>geronimo-naming</artifactId>
             <version>${pom.currentVersion}</version>
             <properties>
@@ -909,6 +943,14 @@
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
+            <artifactId>geronimo-servicemix</artifactId>
+            <version>${pom.currentVersion}</version>
+            <properties>
+                <geronimo.assemble>repository</geronimo.assemble>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
             <artifactId>geronimo-system</artifactId>
             <version>${pom.currentVersion}</version>
             <properties>
@@ -967,6 +1009,13 @@
             <properties>
                 <geronimo.assemble>install</geronimo.assemble>
             </properties>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-assembly-plugin</artifactId>
+            <type>plugin</type>
+            <version>${pom.currentVersion}</version>
         </dependency>
     </dependencies>
 </project>

Modified: geronimo/trunk/assemblies/j2ee-server/src/var/config/config.list
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-server/src/var/config/config.list?rev=263817&r1=263816&r2=263817&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-server/src/var/config/config.list (original)
+++ geronimo/trunk/assemblies/j2ee-server/src/var/config/config.list Sat Aug 27 21:19:12 2005
@@ -1,5 +1,2 @@
-org/apache/geronimo/System
-org/apache/geronimo/Server
-org/apache/geronimo/SystemDatabase
-org/apache/geronimo/SystemJMS
-org/apache/geronimo/RuntimeDeployer
+geronimo/cars/j2ee-system-1.0-SNAPSHOT.car
+geronimo/cars/j2ee-server-1.0-SNAPSHOT.car

Modified: geronimo/trunk/assemblies/j2ee-server/src/var/log/server-log4j.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-server/src/var/log/server-log4j.properties?rev=263817&r1=263816&r2=263817&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-server/src/var/log/server-log4j.properties (original)
+++ geronimo/trunk/assemblies/j2ee-server/src/var/log/server-log4j.properties Sat Aug 27 21:19:12 2005
@@ -19,7 +19,7 @@
 log4j.rootCategory=DEBUG, CONSOLE, FILE
 
 log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.Threshold=INFO
+log4j.appender.CONSOLE.Threshold=${org.apache.geronimo.log.ConsoleLogLevel}
 log4j.appender.CONSOLE.Target=System.out
 log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
 log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n
@@ -43,3 +43,6 @@
 # Example: enable trace messages from foo.bar category
 #
 #log4j.category.foo.bar=TRACE#org.apache.geronimo.system.logging.log4j.XLevel
+
+# Suppress warnings that DB is already initialized; remove this if that output is removed from ActiveMQ
+log4j.category.org.activemq.store.jdbc.adapter.DefaultJDBCAdapter=ERROR

Added: geronimo/trunk/assemblies/j2ee-server/src/var/security/keystore
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-server/src/var/security/keystore?rev=263817&view=auto
==============================================================================
Binary file - no diff available.

Propchange: geronimo/trunk/assemblies/j2ee-server/src/var/security/keystore
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: geronimo/trunk/configs/geronimo-gbean-deployer/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/geronimo-gbean-deployer/maven.xml?rev=263817&r1=263816&r2=263817&view=diff
==============================================================================
--- geronimo/trunk/configs/geronimo-gbean-deployer/maven.xml (original)
+++ geronimo/trunk/configs/geronimo-gbean-deployer/maven.xml Sat Aug 27 21:19:12 2005
@@ -18,5 +18,24 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project default="geronimo:install">
-</project>
\ No newline at end of file
+<project default="default"
+         xmlns:ant="jelly:ant"
+         xmlns:define="jelly:define"
+        xmlns:boot="geronimo:gbean-deployer-boot"
+        >
+
+    <goal name="default" prereqs="car:install"/>
+
+    <goal name="car:package" prereqs="car:prepare-plan">
+        <define:taglib uri="geronimo:gbean-deployer-boot">
+            <define:jellybean name="boot" className="org.apache.geronimo.deployment.PluginBootstrap" method="bootstrap"/>
+        </define:taglib>
+
+        <boot:boot
+                localRepo="${maven.repo.local}"
+                plan="${geronimo.packaging.buildFile}"
+                buildDir="${maven.build.dir}"
+                carFile="${maven.build.dir}/${maven.final.name}.car"
+                />
+    </goal>
+</project>

Modified: geronimo/trunk/configs/geronimo-gbean-deployer/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/geronimo-gbean-deployer/project.properties?rev=263817&r1=263816&r2=263817&view=diff
==============================================================================
--- geronimo/trunk/configs/geronimo-gbean-deployer/project.properties (original)
+++ geronimo/trunk/configs/geronimo-gbean-deployer/project.properties Sat Aug 27 21:19:12 2005
@@ -19,7 +19,8 @@
 ## $Rev$ $Date$
 ##
 
-# override deploymentConfig to use bootstrap configuration
-geronimo.packaging.deploymentConfig=geronimo/cars/geronimo-gbean-deployer-0.1.1.car
+maven.multiproject.type=car
 
-geronimo_version=159810
+# override deploymentConfig to use bootstrap configuration
+geronimo.packaging.deploymentConfig=geronimo/cars/geronimo-gbean-deployer-0.2.car
+geronimo.packaging.deployerName=*:name=Deployer,j2eeType=Deployer,*

Modified: geronimo/trunk/configs/geronimo-gbean-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/geronimo-gbean-deployer/project.xml?rev=263817&r1=263816&r2=263817&view=diff
==============================================================================
--- geronimo/trunk/configs/geronimo-gbean-deployer/project.xml (original)
+++ geronimo/trunk/configs/geronimo-gbean-deployer/project.xml Sat Aug 27 21:19:12 2005
@@ -20,10 +20,9 @@
 
 <project>
     <pomVersion>3</pomVersion>
-    <groupId>geronimo</groupId>
+    <extend>../../etc/project.xml</extend>
     <id>geronimo-gbean-deployer</id>
-    <name>Geronimo Configuration for service deployments</name>
-    <currentVersion>0.1.1</currentVersion>
+    <name>Geronimo Configuration for performing service deployments</name>
 
     <dependencies>
         <!-- dependencies referenced in plan -->
@@ -54,27 +53,22 @@
         </dependency>
         <dependency>
             <groupId>xmlbeans</groupId>
-            <artifactId>xbean-apache</artifactId>
-            <version>1.0-DEV</version>
+            <artifactId>xbean</artifactId>
+            <version>${xmlbeans_version}</version>
         </dependency>
-
-        <!-- dependency on packaging plugin to force download -->
-<!--
         <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-packaging-plugin</artifactId>
-            <type>plugin</type>
-            <version>SNAPSHOT</version>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+            <version>${stax_api_version}</version>
         </dependency>
--->
 
-        <!-- dependency on the bootstrap gbean deployer so I can deploy myself-->
+        <!-- for bootstrap -->
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
-            <type>car</type>
-            <version>0.1.1</version>
+            <artifactId>geronimo-deploy-tool</artifactId>
+            <version>${geronimo_version}</version>
         </dependency>
+
     </dependencies>
 </project>
 

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=263817&r1=263816&r2=263817&view=diff
==============================================================================
--- geronimo/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml Sat Aug 27 21:19:12 2005
@@ -23,22 +23,39 @@
     >
 
     <dependency>
-        <uri>geronimo/jars/geronimo-system-${geronimo_version}.jar</uri>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-system</artifactId>
+        <version>${geronimo_version}</version>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-common-${geronimo_version}.jar</uri>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-common</artifactId>
+        <version>${geronimo_version}</version>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-deployment-${geronimo_version}.jar</uri>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-deployment</artifactId>
+        <version>${geronimo_version}</version>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-j2ee-${geronimo_version}.jar</uri>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-j2ee</artifactId>
+        <version>${geronimo_version}</version>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-service-builder-${geronimo_version}.jar</uri>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-service-builder</artifactId>
+        <version>${geronimo_version}</version>
     </dependency>
     <dependency>
-        <uri>xmlbeans/jars/xbean-apache-1.0-DEV.jar</uri>
+        <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 -->

Added: geronimo/trunk/configs/j2ee-server/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-server/maven.xml?rev=263817&view=auto
==============================================================================
--- geronimo/trunk/configs/j2ee-server/maven.xml (added)
+++ geronimo/trunk/configs/j2ee-server/maven.xml Sat Aug 27 21:19:12 2005
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    Copyright 2004 The Apache Software Foundation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev: 155756 $ $Date: 2005-02-28 22:10:07 -0800 (Mon, 28 Feb 2005) $ -->
+
+<project default="default">
+
+    <goal name="default">
+        <attainGoal name="car:install"/>
+    </goal>
+</project>

Propchange: geronimo/trunk/configs/j2ee-server/maven.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/configs/j2ee-server/maven.xml
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Modified: geronimo/trunk/configs/j2ee-server/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-server/project.properties?rev=263817&r1=263816&r2=263817&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-server/project.properties (original)
+++ geronimo/trunk/configs/j2ee-server/project.properties Sat Aug 27 21:19:12 2005
@@ -19,5 +19,14 @@
 ## $Rev: 158417 $ $Date: 2005-03-20 23:25:45 -0800 (Sun, 20 Mar 2005) $
 ##
 
+maven.multiproject.type=car
+
 # just use basic GBean deployer
-geronimo.packaging.deploymentConfig=geronimo/cars/geronimo-gbean-deployer-SNAPSHOT.car
+geronimo.packaging.deploymentConfig=geronimo/cars/geronimo-gbean-deployer-${geronimo_version}.car
+
+PlanHTTPPort=8080
+PlanHTTPSPort=8443
+PlanOpenEJBPort=4201
+PlanServerHostname=localhost
+PlanClientAddresses=127.0.0.1
+PlanRemoteLoginPort=4242

Modified: geronimo/trunk/configs/j2ee-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-server/project.xml?rev=263817&r1=263816&r2=263817&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-server/project.xml (original)
+++ geronimo/trunk/configs/j2ee-server/project.xml Sat Aug 27 21:19:12 2005
@@ -25,31 +25,162 @@
     <name>Server Configuration for the J2EE Server</name>
 
     <dependencies>
-        <!-- dependencies referenced in plan -->
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>j2ee-system</artifactId>
+            <version>${geronimo_version}</version>
             <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${geronimo_version}</version>
+            <type>car</type>
         </dependency>
 
+        <dependency>
+            <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-j2ee</artifactId>
+            <version>${geronimo_spec_j2ee_version}</version>
+        </dependency>
 
-        <!-- dependency on packaging plugin to force download -->
-<!--
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>geronimo-packaging-plugin</artifactId>
-            <type>plugin</type>
-            <version>SNAPSHOT</version>
+            <artifactId>geronimo-activation</artifactId>
+            <version>${geronimo_version}</version>
         </dependency>
--->
-
-        <!-- dependency on the bootstrap gbean deployer to force download -->
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
-            <type>car</type>
-            <version>0.1</version>
+            <artifactId>geronimo-management</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-core</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-naming</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-timer</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-security</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-jmxremoting</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-client</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-servicemix</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-jetty</artifactId>
+            <version>${geronimo_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>concurrent</groupId>
+            <artifactId>concurrent</artifactId>
+            <version>${concurrent_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>tranql</groupId>
+            <artifactId>tranql</artifactId>
+            <version>${tranql_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>openejb</groupId>
+            <artifactId>openejb-core</artifactId>
+            <version>${openejb_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>howl</groupId>
+            <artifactId>howl-logger</artifactId>
+            <version>${howl_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>antlr</groupId>
+            <artifactId>antlr</artifactId>
+            <version>${antlr_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>regexp</groupId>
+            <artifactId>regexp</artifactId>
+            <version>${regexp_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>xstream</groupId>
+            <artifactId>xstream</artifactId>
+            <version>${xstream_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>xpp3</groupId>
+            <artifactId>xpp3</artifactId>
+            <version>${xpp3_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>asm</groupId>
+            <artifactId>asm</artifactId>
+            <version>${asm_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>activemq</groupId>
+            <artifactId>activemq-gbean-management</artifactId>
+            <version>${activemq_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>activeio</groupId>
+            <artifactId>activeio</artifactId>
+            <version>${activeio_version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>jetty</groupId>
+            <artifactId>org.mortbay.jetty</artifactId>
+            <version>${jetty_version}</version>
         </dependency>
     </dependencies>
 </project>

Modified: geronimo/trunk/configs/j2ee-server/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-server/src/plan/plan.xml?rev=263817&r1=263816&r2=263817&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-server/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/j2ee-server/src/plan/plan.xml Sat Aug 27 21:19:12 2005
@@ -30,91 +30,179 @@
     parentId="${pom.groupId}/cars/j2ee-system-${pom.currentVersion}.car"
     >
 
-
     <!--runtime dependencies-->
     <dependency>
-        <uri>geronimo-spec/jars/geronimo-spec-j2ee-${geronimo_spec_j2ee_version}.jar</uri>
+        <groupId>geronimo-spec</groupId>
+        <artifactId>geronimo-spec-j2ee</artifactId>
+        <version>${geronimo_spec_j2ee_version}</version>
     </dependency>
+
     <dependency>
-        <uri>geronimo-spec/jars/geronimo-spec-j2ee-jacc-${geronimo_spec_j2ee_jacc_version}.jar</uri>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-activation</artifactId>
+        <version>${geronimo_version}</version>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-activation-${geronimo_version}.jar</uri>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-management</artifactId>
+        <version>${geronimo_version}</version>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-j2ee-${geronimo_version}.jar</uri>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-j2ee</artifactId>
+        <version>${geronimo_version}</version>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-core-${geronimo_version}.jar</uri>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-core</artifactId>
+        <version>${geronimo_version}</version>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-connector-${geronimo_version}.jar</uri>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-connector</artifactId>
+        <version>${geronimo_version}</version>
     </dependency>
     <dependency>
-        <uri>concurrent/jars/concurrent-${concurrent_version}.jar</uri>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-naming</artifactId>
+        <version>${geronimo_version}</version>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-timer-${geronimo_version}.jar</uri>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-timer</artifactId>
+        <version>${geronimo_version}</version>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-transaction-${geronimo_version}.jar</uri>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-transaction</artifactId>
+        <version>${geronimo_version}</version>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-naming-${geronimo_version}.jar</uri>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-security</artifactId>
+        <version>${geronimo_version}</version>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-security-${geronimo_version}.jar</uri>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-webservices</artifactId>
+        <version>${geronimo_version}</version>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-webservices-${geronimo_version}.jar</uri>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-jmxremoting</artifactId>
+        <version>${geronimo_version}</version>
     </dependency>
     <dependency>
-        <uri>tranql/jars/tranql-${tranql_version}.jar</uri>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-client</artifactId>
+        <version>${geronimo_version}</version>
     </dependency>
     <dependency>
-        <uri>openejb/jars/openejb-core-${openejb_version}.jar</uri>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-axis</artifactId>
+        <version>${geronimo_version}</version>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-jetty-${geronimo_version}.jar</uri>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-servicemix</artifactId>
+        <version>${geronimo_version}</version>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-jmxremoting-${geronimo_version}.jar</uri>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-jetty</artifactId>
+        <version>${geronimo_version}</version>
     </dependency>
+
     <dependency>
-        <uri>howl/jars/howl-logger-${howl_version}.jar</uri>
+        <groupId>concurrent</groupId>
+        <artifactId>concurrent</artifactId>
+        <version>${concurrent_version}</version>
     </dependency>
     <dependency>
-        <uri>antlr/jars/antlr-${antlr_version}.jar</uri>
+        <groupId>tranql</groupId>
+        <artifactId>tranql</artifactId>
+        <version>${tranql_version}</version>
     </dependency>
-
-    <!-- required for rar 1.5 to load realms -->
     <dependency>
-        <uri>regexp/jars/regexp-${regexp_version}.jar</uri>
+        <groupId>openejb</groupId>
+        <artifactId>openejb-core</artifactId>
+        <version>${openejb_version}</version>
     </dependency>
-
-    <!-- for timer serialization implementation -->
     <dependency>
-        <uri>xstream/jars/xstream-${xstream_version}.jar</uri>
+        <groupId>howl</groupId>
+        <artifactId>howl-logger</artifactId>
+        <version>${howl_version}</version>
     </dependency>
     <dependency>
-        <uri>xpp3/jars/xpp3-${xpp3_version}.jar</uri>
+        <groupId>antlr</groupId>
+        <artifactId>antlr</artifactId>
+        <version>${antlr_version}</version>
     </dependency>
-
     <dependency>
-        <uri>geronimo/jars/geronimo-common-${geronimo_version}.jar</uri>
+        <groupId>regexp</groupId>
+        <artifactId>regexp</artifactId>
+        <version>${regexp_version}</version>
     </dependency>
     <dependency>
-        <uri>geronimo/jars/geronimo-client-${geronimo_version}.jar</uri>
+        <groupId>xstream</groupId>
+        <artifactId>xstream</artifactId>
+        <version>${xstream_version}</version>
     </dependency>
-
     <dependency>
-         <uri>geronimo/jars/geronimo-axis-${geronimo_version}.jar</uri>
+        <groupId>xpp3</groupId>
+        <artifactId>xpp3</artifactId>
+        <version>${xpp3_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>asm</groupId>
+        <artifactId>asm</artifactId>
+        <version>${asm_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>activemq</groupId>
+        <artifactId>activemq-gbean-management</artifactId>
+        <version>${activemq_version}</version>
     </dependency>
-
     <dependency>
-         <uri>geronimo/jars/geronimo-webservices-${geronimo_version}.jar</uri>
+        <groupId>activeio</groupId>
+        <artifactId>activeio</artifactId>
+        <version>${activeio_version}</version>
     </dependency>
 
+    <!-- default WAR container using Jetty -->
+    <gbean name="WebContainer" class="org.apache.geronimo.jetty.JettyContainerImpl">
+    </gbean>
+
+    <gbean name="JettyRequestLog" class="org.apache.geronimo.jetty.requestlog.NCSARequestLog">
+        <reference name="JettyContainer"><name>WebContainer</name></reference>
+        <reference name="ServerInfo"><module>${pom.groupId}/cars/j2ee-system-${pom.currentVersion}.car</module><name>ServerInfo</name></reference>
+        <attribute name="filename">var/log/jetty_yyyy_mm_dd.log</attribute>
+        <attribute name="logDateFormat">dd/MMM/yyyy:HH:mm:ss ZZZ</attribute>
+        <attribute name="logTimeZone">GMT</attribute>
+    </gbean>
+
+    <gbean name="JettyWebConnector" class="org.apache.geronimo.jetty.connector.HTTPConnector">
+        <attribute name="port">${PlanHTTPPort}</attribute>
+        <reference name="JettyContainer"><name>WebContainer</name></reference>
+        <attribute name="maxThreads">50</attribute>
+        <attribute name="minThreads">10</attribute>
+    </gbean>
+
+    <gbean name="JettySSLConnector" class="org.apache.geronimo.jetty.connector.HTTPSConnector">
+        <attribute name="port">${PlanHTTPSPort}</attribute>
+        <attribute name="keystoreFileName">var/security/keystore</attribute>
+        <attribute name="keystoreType">JKS</attribute>
+        <attribute name="keystorePassword">secret</attribute>
+        <attribute name="keyPassword">secret</attribute>
+        <attribute name="clientAuthRequired">false</attribute>
+        <attribute name="secureProtocol">TLS</attribute>
+        <attribute name="maxThreads">50</attribute>
+        <attribute name="minThreads">10</attribute>
+        <reference name="JettyContainer"><name>WebContainer</name></reference>
+        <reference name="ServerInfo"><module>${pom.groupId}/cars/j2ee-system-${pom.currentVersion}.car</module><name>ServerInfo</name></reference>
+    </gbean>
+
+    <!-- TODO add in Tomcat support -->
 
     <!-- Default security realm using properties files -->
     <gbean name="properties-login"
@@ -131,11 +219,17 @@
     <gbean name="geronimo-properties-realm"
         class="org.apache.geronimo.security.realm.GenericSecurityRealm">
         <attribute name="realmName">geronimo-properties-realm</attribute>
-        <attribute name="loginModuleConfiguration">
-            LoginModule.1.REQUIRED=geronimo.server:j2eeType=LoginModule,J2EEServer=geronimo,J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,name=properties-login
-        </attribute>
-        <reference name="ServerInfo"><module>org/apache/geronimo/System</module><name>ServerInfo</name></reference>
-    </gbean>
+        <reference name="LoginModuleConfiguration">
+            <name>properties-login</name>
+        </reference>
+        <reference name="ServerInfo"><module>${pom.groupId}/cars/j2ee-system-${pom.currentVersion}.car</module><name>ServerInfo</name></reference>
+    </gbean>
+    <gbean name="properties-login" class="org.apache.geronimo.security.jaas.JaasLoginModuleUse">
+         <attribute name="controlFlag">REQUIRED</attribute>
+         <reference name="LoginModule">
+             <name>properties-login</name>
+         </reference>
+     </gbean>
 
     <gbean name="JMX"
         class="org.apache.geronimo.security.jaas.ServerRealmConfigurationEntry">
@@ -152,7 +246,7 @@
     </gbean>
 
     <gbean name="SecurityService" class="org.apache.geronimo.security.SecurityServiceImpl">
-        <reference name="ServerInfo"><module>org/apache/geronimo/System</module><name>ServerInfo</name></reference>
+        <reference name="ServerInfo"><module>${pom.groupId}/cars/j2ee-system-${pom.currentVersion}.car</module><name>ServerInfo</name></reference>
         <attribute name="policyConfigurationFactory">org.apache.geronimo.security.jacc.GeronimoPolicyConfigurationFactory</attribute>
         <attribute name="policyProvider">org.apache.geronimo.security.jacc.GeronimoPolicy</attribute>
     </gbean>
@@ -164,16 +258,23 @@
         <attribute name="password">secret</attribute>
     </gbean>
 
+    <gbean gbeanName="geronimo.remoting:target=JaasLoginServiceRemotingServer" class="org.apache.geronimo.security.remoting.jmx.JaasLoginServiceRemotingServer">
+        <attribute name="protocol">tcp</attribute>
+        <attribute name="host">${PlanServerHostname}</attribute>
+        <attribute name="port">${PlanRemoteLoginPort}</attribute>
+        <reference name="LoginService"><name>JaasLoginService</name></reference>
+    </gbean>
+
     <gbean name="DefaultThreadPool" class="org.apache.geronimo.pool.ThreadPool">
         <attribute name="keepAliveTime">5000</attribute>
-        <attribute name="poolSize">10</attribute>
+        <attribute name="poolSize">30</attribute>
         <attribute name="poolName">DefaultThreadPool</attribute>
     </gbean>
 
-    <gbean name="ConnectionTracker" class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator">
+    <gbean name="ConnectionTracker" class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean">
     </gbean>
 
-    <gbean name="DefaultWorkManager" class="org.apache.geronimo.connector.work.GeronimoWorkManager">
+    <gbean name="DefaultWorkManager" class="org.apache.geronimo.connector.work.GeronimoWorkManagerGBean">
         <attribute name="syncMaximumPoolSize">10</attribute>
         <attribute name="startMaximumPoolSize">10</attribute>
         <attribute name="scheduledMaximumPoolSize">10</attribute>
@@ -193,7 +294,7 @@
         <attribute name="maxLogFiles">2</attribute>
         <attribute name="minBuffers">4</attribute>
         <attribute name="threadsWaitingForceThreshold">-1</attribute>
-        <reference name="ServerInfo"><module>org/apache/geronimo/System</module><name>ServerInfo</name></reference>
+        <reference name="ServerInfo"><module>${pom.groupId}/cars/j2ee-system-${pom.currentVersion}.car</module><name>ServerInfo</name></reference>
     </gbean>
 
     <gbean name="TransactionManager" class="org.apache.geronimo.transaction.manager.TransactionManagerImplGBean">
@@ -210,36 +311,15 @@
         <reference name="XidImporter"><name>TransactionManager</name></reference>
     </gbean>
 
-
-    <!-- default WAR container using Jetty -->
-    <gbean name="JettyWebContainer" class="org.apache.geronimo.jetty.JettyContainerImpl">
-    </gbean>
-
-    <gbean name="JettyRequestLog" class="org.apache.geronimo.jetty.requestlog.NCSARequestLog">
-        <reference name="JettyContainer"><name>JettyWebContainer</name></reference>
-        <reference name="ServerInfo"><module>org/apache/geronimo/System</module><name>ServerInfo</name></reference>
-        <attribute name="filename">var/log/jetty_yyyy_mm_dd.log</attribute>
-        <attribute name="logDateFormat">dd/MMM/yyyy:HH:mm:ss ZZZ</attribute>
-        <attribute name="logTimeZone">GMT</attribute>
-    </gbean>
-
-    <gbean name="JettyWebConnector" class="org.apache.geronimo.jetty.connector.HTTPConnector">
-        <attribute name="port">8080</attribute>
-        <reference name="JettyContainer"><name>JettyWebContainer</name></reference>
-        <!--        <attribute name="MaxConnections">10</attribute>-->
-        <!--        <attribute name="MaxIdleTime">10</attribute>-->
-    </gbean>
-
     <!-- EJB Protocol -->
     <gbean gbeanName="openejb:type=NetworkService,name=EJB" class="org.openejb.server.StandardServiceStackGBean">
         <attribute name="name">EJB</attribute>
-        <attribute name="port">4201</attribute>
-        <attribute name="address">127.0.0.1</attribute>
-        <attribute name="allowHosts">127.0.0.1</attribute>
-        <attribute name="priority">5</attribute>
-        <attribute name="threads">20</attribute>
+        <attribute name="port">${PlanOpenEJBPort}</attribute>
+        <attribute name="host">${PlanServerHostname}</attribute>
+        <attribute name="allowHosts">${PlanClientAddresses}</attribute>
         <attribute name="logOnSuccess">HOST,NAME,THREADID,USERID</attribute>
         <attribute name="logOnFailure">HOST,NAME</attribute>
+        <reference name="Executor"><name>DefaultThreadPool</name></reference>
         <reference name="Server"><gbean-name>openejb:type=Server,name=EJB</gbean-name></reference>
     </gbean>
     <gbean gbeanName="openejb:type=Server,name=EJB" class="org.openejb.server.ejbd.EjbServerGBean">
@@ -254,20 +334,17 @@
         </references>
     </gbean>
 
-
-    <!-- HTTP/SOAP Protocol is now run through jetty-->
-
     <!-- JSR77 Management Objects -->
     <gbean gbeanName="geronimo.server:j2eeType=J2EEDomain,name=geronimo.server" class="org.apache.geronimo.j2ee.management.impl.J2EEDomainImpl"/>
     <gbean gbeanName="geronimo.server:j2eeType=J2EEServer,name=geronimo" class="org.apache.geronimo.j2ee.management.impl.J2EEServerImpl">
-        <reference name="ServerInfo"><module>org/apache/geronimo/System</module><name>ServerInfo</name></reference>
+        <reference name="ServerInfo"><module>${pom.groupId}/cars/j2ee-system-${pom.currentVersion}.car</module><name>ServerInfo</name></reference>
     </gbean>
 
     <gbean gbeanName="geronimo.server:j2eeType=JVM,J2EEServer=geronimo,name=JVM" class="org.apache.geronimo.j2ee.management.impl.JVMImpl"/>
 
     <!-- JMX Remoting -->
     <gbean name="JMXService" class="org.apache.geronimo.jmxremoting.JMXConnector">
-        <attribute name="URL">service:jmx:rmi://localhost/jndi/rmi:/JMXConnector</attribute>
+        <attribute name="url">service:jmx:rmi://${PlanServerHostname}/jndi/rmi:/JMXConnector</attribute>
         <attribute name="applicationConfigName">JMX</attribute>
     </gbean>
 

Modified: geronimo/trunk/configs/j2ee-system/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-system/maven.xml?rev=263817&r1=263816&r2=263817&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-system/maven.xml (original)
+++ geronimo/trunk/configs/j2ee-system/maven.xml Sat Aug 27 21:19:12 2005
@@ -18,5 +18,9 @@
 
 <!-- $Rev: 155756 $ $Date: 2005-02-28 22:10:07 -0800 (Mon, 28 Feb 2005) $ -->
 
-<project default="geronimo:package">
+<project default="default">
+
+    <goal name="default">
+        <attainGoal name="car:install"/>
+    </goal>
 </project>

Modified: geronimo/trunk/configs/j2ee-system/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-system/project.properties?rev=263817&r1=263816&r2=263817&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-system/project.properties (original)
+++ geronimo/trunk/configs/j2ee-system/project.properties Sat Aug 27 21:19:12 2005
@@ -19,22 +19,24 @@
 ## $Rev: 158417 $ $Date: 2005-03-20 23:25:45 -0800 (Sun, 20 Mar 2005) $
 ##
 
+maven.multiproject.type=car
+
 # just use basic GBean deployer
-geronimo.packaging.deploymentConfig=geronimo/cars/geronimo-gbean-deployer-0.1.car
+geronimo.packaging.deploymentConfig=geronimo/cars/geronimo-gbean-deployer-${geronimo_version}.car
 
 geronimo.packaging.classPath= \
     ../lib/geronimo-spec-qname-${geronimo_spec_qname_version}.jar \
+    ../lib/geronimo-common-${geronimo_version}.jar \
     ../lib/geronimo-kernel-${geronimo_version}.jar \
     ../lib/geronimo-system-${geronimo_version}.jar \
-    ../lib/cglib-full-${cglib_version}.jar \
+    ../lib/cglib-nodep-${cglib_version}.jar \
     ../lib/commons-cli-${commons_cli_version}.jar \
     ../lib/commons-logging-${commons_logging_version}.jar \
     ../lib/log4j-${log4j_version}.jar \
     ../lib/mx4j-${mx4j_version}.jar \
     ../lib/mx4j-remote-${mx4j_version}.jar \
     ../lib/endorsed/xercesImpl-${xerces_version}.jar \
-    ../lib/endorsed/xmlParserAPIs-${xml_parser_apis_version}.jar \
-    ../lib/xbean-apache-${xmlbeans_version}.jar
+    ../lib/endorsed/xmlParserAPIs-${xml_parser_apis_version}.jar
 
 geronimo.packaging.mainClass=org.apache.geronimo.system.main.Daemon
 geronimo.packaging.endorsedDirs=lib/endorsed

Modified: geronimo/trunk/configs/j2ee-system/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/j2ee-system/project.xml?rev=263817&r1=263816&r2=263817&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-system/project.xml (original)
+++ geronimo/trunk/configs/j2ee-system/project.xml Sat Aug 27 21:19:12 2005
@@ -25,47 +25,81 @@
     <name>System Configuration for the J2EE Server</name>
 
     <dependencies>
-        <!-- dependencies referenced in classPath -->
+        <!-- dependencies referenced in the plan -->
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>geronimo-system</artifactId>
+            <artifactId>geronimo-common</artifactId>
             <version>${geronimo_version}</version>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>geronimo-common</artifactId>
+            <artifactId>geronimo-kernel</artifactId>
             <version>${geronimo_version}</version>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
-            <artifactId>geronimo-deployment</artifactId>
+            <artifactId>geronimo-system</artifactId>
             <version>${geronimo_version}</version>
         </dependency>
         <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-j2ee</artifactId>
-            <version>${geronimo_version}</version>
+            <groupId>cglib</groupId>
+            <artifactId>cglib-nodep</artifactId>
+            <version>${cglib_version}</version>
         </dependency>
         <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-service-builder</artifactId>
-            <version>${geronimo_version}</version>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
+            <version>${commons_cli_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>${commons_logging_version}</version>
         </dependency>
         <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean-apache</artifactId>
-            <version>1.0-DEV</version>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>${log4j_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>mx4j</groupId>
+            <artifactId>mx4j</artifactId>
+            <version>${mx4j_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>mx4j</groupId>
+            <artifactId>mx4j-remote</artifactId>
+            <version>${mx4j_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo-spec</groupId>
+            <artifactId>geronimo-spec-qname</artifactId>
+            <version>${geronimo_spec_qname_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <version>${xerces_version}</version>
+        </dependency>
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xmlParserAPIs</artifactId>
+            <version>${xml_parser_apis_version}</version>
         </dependency>
 
-        <!-- dependency on packaging plugin to force download -->
-<!--
+        <!-- dependency on deployer -->
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-packaging-plugin</artifactId>
+            <version>${geronimo_version}</version>
             <type>plugin</type>
-            <version>SNAPSHOT</version>
         </dependency>
--->
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${geronimo_version}</version>
+            <type>car</type>
+        </dependency>
     </dependencies>
 </project>
 

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=263817&r1=263816&r2=263817&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-system/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/j2ee-system/src/plan/plan.xml Sat Aug 27 21:19:12 2005
@@ -34,8 +34,69 @@
     server="geronimo"
     >
 
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-common</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-kernel</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-system</artifactId>
+        <version>${geronimo_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>cglib</groupId>
+        <artifactId>cglib-nodep</artifactId>
+        <version>${cglib_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>commons-cli</groupId>
+        <artifactId>commons-cli</artifactId>
+        <version>${commons_cli_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <version>${commons_logging_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
+        <version>${log4j_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>mx4j</groupId>
+        <artifactId>mx4j</artifactId>
+        <version>${mx4j_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>mx4j</groupId>
+        <artifactId>mx4j-remote</artifactId>
+        <version>${mx4j_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>geronimo-spec</groupId>
+        <artifactId>geronimo-spec-qname</artifactId>
+        <version>${geronimo_spec_qname_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>xerces</groupId>
+        <artifactId>xercesImpl</artifactId>
+        <version>${xerces_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>xerces</groupId>
+        <artifactId>xmlParserAPIs</artifactId>
+        <version>${xml_parser_apis_version}</version>
+    </dependency>
+
     <!-- ServerInfo service -->
-    <gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.ServerInfo"/>
+    <gbean name="ServerInfo" class="org.apache.geronimo.system.serverinfo.BasicServerInfo"/>
 
     <!-- URLFactory service -->
     <gbean name="URLFactory" class="org.apache.geronimo.system.url.GeronimoURLFactory"/>
@@ -46,12 +107,24 @@
         <reference name="ServerInfo"><name>ServerInfo</name></reference>
     </gbean>
 
+    <!-- Configuration Manager service -->
+    <gbean name="ConfigurationManager" class="org.apache.geronimo.kernel.config.ConfigurationManagerImpl">
+        <reference name="Stores"><gbean-name>*:j2eeType=ConfigurationStore,*</gbean-name></reference>
+    </gbean>
+
     <!-- Persistent List of running Configurations service -->
     <gbean name="Default" class="org.apache.geronimo.system.configuration.FileConfigurationList">
         <reference name="ServerInfo"><name>ServerInfo</name></reference>
+        <reference name="ConfigurationManager"><name>ConfigurationManager</name></reference>
         <attribute name="configFile">var/config/config.list</attribute>
     </gbean>
 
+    <!-- User-editable attribute service -->
+    <gbean name="AttributeManager" class="org.apache.geronimo.system.configuration.LocalAttributeManager">
+        <reference name="ServerInfo"><name>ServerInfo</name></reference>
+        <attribute name="configFile">var/config/config.xml</attribute>
+    </gbean>
+
     <!-- Repository -->
     <gbean name="Repository" class="org.apache.geronimo.system.repository.ReadOnlyRepository">
         <attribute name="root">repository/</attribute>
@@ -60,8 +133,8 @@
 
     <!-- Logging service -->
     <gbean name="Logger" class="org.apache.geronimo.system.logging.log4j.Log4jService">
-        <attribute name="configurationFile">var/log/server-log4j.properties</attribute>
-        <attribute name="refreshPeriod">60</attribute>
+        <attribute name="configFileName">var/log/server-log4j.properties</attribute>
+        <attribute name="refreshPeriodSeconds">60</attribute>
         <reference name="ServerInfo"><name>ServerInfo</name></reference>
     </gbean>
 

Added: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap.java?rev=263817&view=auto
==============================================================================
--- geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap.java (added)
+++ geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap.java Sat Aug 27 21:19:12 2005
@@ -0,0 +1,67 @@
+/**
+ *
+ * Copyright 2005 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.deployment;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.util.jar.JarOutputStream;
+
+import org.apache.geronimo.deployment.service.ServiceConfigBuilder;
+import org.apache.geronimo.deployment.xbeans.ConfigurationDocument;
+import org.apache.geronimo.deployment.xbeans.ConfigurationType;
+import org.apache.geronimo.kernel.config.ConfigurationData;
+import org.apache.geronimo.system.configuration.ExecutableConfigurationUtil;
+import org.apache.geronimo.system.repository.ReadOnlyRepository;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class PluginBootstrap {
+    private File localRepo;
+    private File plan;
+    private File buildDir;
+    private File carFile;
+
+    public void setLocalRepo(File localRepo) {
+        this.localRepo = localRepo;
+    }
+
+    public void setPlan(File plan) {
+        this.plan = plan;
+    }
+
+    public void setBuildDir(File buildDir) {
+        this.buildDir = buildDir;
+    }
+
+    public void setCarFile(File carFile) {
+        this.carFile = carFile;
+    }
+
+    public void bootstrap() throws Exception {
+        ConfigurationType config = ConfigurationDocument.Factory.parse(plan).getConfiguration();
+
+        ReadOnlyRepository repository = new ReadOnlyRepository(localRepo);
+        ServiceConfigBuilder builder = new ServiceConfigBuilder(null, repository);
+        ConfigurationData configurationData = builder.buildConfiguration(config, null, buildDir);
+
+        JarOutputStream out = new JarOutputStream(new FileOutputStream(carFile));
+        ExecutableConfigurationUtil.writeConfiguration(configurationData, out);
+        out.flush();
+        out.close();
+    }
+}

Propchange: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/modules/deploy-tool/src/java/org/apache/geronimo/deployment/PluginBootstrap.java
------------------------------------------------------------------------------
    svn:keywords = Rev,Date

Modified: geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java?rev=263817&r1=263816&r2=263817&view=diff
==============================================================================
--- geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java (original)
+++ geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java Sat Aug 27 21:19:12 2005
@@ -26,6 +26,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
+import java.util.Collections;
 import javax.management.MBeanServer;
 import javax.management.MBeanServerFactory;
 import javax.management.ObjectName;
@@ -33,7 +34,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.gbean.GBeanData;
-import org.apache.geronimo.kernel.GBeanNotFoundException;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.KernelFactory;
 import org.apache.geronimo.kernel.config.ConfigurationManager;
@@ -41,7 +41,6 @@
 import org.apache.geronimo.kernel.config.Configuration;
 import org.apache.geronimo.kernel.jmx.JMXUtil;
 import org.apache.geronimo.kernel.log.GeronimoLogging;
-import org.apache.geronimo.kernel.management.State;
 import org.apache.geronimo.system.jmx.MBeanServerKernelBridge;
 import org.apache.geronimo.system.serverinfo.DirectoryUtils;
 import org.apache.geronimo.system.url.GeronimoURLFactory;
@@ -167,6 +166,9 @@
             URI configurationId = (URI) configuration.getAttribute("id");
             ObjectName configName = Configuration.getConfigurationObjectName(configurationId);
             configuration.setName(configName);
+
+            // todo: JNB for now we clear out the dependency list but we really need a way to resolve them
+            configuration.setAttribute("dependencies", Collections.EMPTY_LIST);
 
             // create a mbean server
             MBeanServer mbeanServer = MBeanServerFactory.createMBeanServer("geronimo");

Modified: geronimo/trunk/plugins/geronimo-assembly-plugin/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-assembly-plugin/maven.xml?rev=263817&r1=263816&r2=263817&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-assembly-plugin/maven.xml (original)
+++ geronimo/trunk/plugins/geronimo-assembly-plugin/maven.xml Sat Aug 27 21:19:12 2005
@@ -20,5 +20,8 @@
 <!-- $Rev: 158417 $ $Date: 2005-03-20 23:25:45 -0800 (Sun, 20 Mar 2005) $ -->
 
 <project default="plugin:install">
-    <goal name="default" prereqs="plugin:install"/>
+    <goal name="default">
+        <attainGoal name="plugin:install-now"/>
+        <attainGoal name="plugin:repository-install"/>
+    </goal>
 </project>

Modified: geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml?rev=263817&r1=263816&r2=263817&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml (original)
+++ geronimo/trunk/plugins/geronimo-assembly-plugin/project.xml Sat Aug 27 21:19:12 2005
@@ -23,7 +23,7 @@
     <id>geronimo-assembly-plugin</id>
     <name>Geronimo Assembly Plugin</name>
     <description>A plugin used to assemble a distribution of Geronimo</description>
-    <currentVersion>SNAPSHOT</currentVersion>
+    <currentVersion>1.0-SNAPSHOT</currentVersion>
 
     <dependencies>
         <dependency>

Modified: geronimo/trunk/plugins/geronimo-packaging-plugin/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-packaging-plugin/maven.xml?rev=263817&r1=263816&r2=263817&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-packaging-plugin/maven.xml (original)
+++ geronimo/trunk/plugins/geronimo-packaging-plugin/maven.xml Sat Aug 27 21:19:12 2005
@@ -20,5 +20,8 @@
 <!-- $Rev$ $Date$ -->
 
 <project default="plugin:install">
-    <goal name="default" prereqs="plugin:install"/>
+    <goal name="default">
+        <attainGoal name="plugin:install-now"/>
+        <attainGoal name="plugin:repository-install"/>
+    </goal>
 </project>

Modified: geronimo/trunk/plugins/geronimo-packaging-plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-packaging-plugin/plugin.jelly?rev=263817&r1=263816&r2=263817&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-packaging-plugin/plugin.jelly (original)
+++ geronimo/trunk/plugins/geronimo-packaging-plugin/plugin.jelly Sat Aug 27 21:19:12 2005
@@ -23,22 +23,22 @@
     xmlns:ant="jelly:ant"
     xmlns:velocity="jelly:velocity"
     xmlns:define="jelly:define"
-    xmlns:package="geronimo:packaging"
+    xmlns:car="geronimo:packaging"
     >
     <define:taglib uri="geronimo:packaging">
         <define:jellybean name="package" className="org.apache.geronimo.plugin.packaging.PackageBuilder" method="execute"/>
         <define:jellybean name="jmxDistribute" className="org.apache.geronimo.plugin.packaging.JMXDistributor" method="execute"/>
     </define:taglib>
 
-    <goal name="geronimo" description="Package a Geronimo Configuration" prereqs="geronimo:package"/>
+    <goal name="car" description="Package a Geronimo Configuration" prereqs="car:package"/>
 
-    <goal name="geronimo:prepare-plan" description="Prepare a plan by processing with velocity">
+    <goal name="car:prepare-plan" description="Prepare a plan by processing with velocity">
         <ant:mkdir dir="${geronimo.packaging.buildDir}"/>
         <velocity:merge basedir="${geronimo.packaging.srcDir}" template="${geronimo.packaging.planFile}" name="${geronimo.packaging.buildFile}"/>
     </goal>
 
-    <goal name="geronimo:package" prereqs="geronimo:prepare-plan" description="Package a Geronimo Configuration">
-        <package:package
+    <goal name="car:package" prereqs="car:prepare-plan" description="Package a Geronimo Configuration">
+        <car:package
             repository="${geronimo.packaging.repository}"
             deploymentConfig="${geronimo.packaging.deploymentConfig}"
             deployerName="${geronimo.packaging.deployerName}"
@@ -51,12 +51,12 @@
             />
     </goal>
 
-    <goal name="geronimo:install" prereqs="geronimo:package" description="Install the package in the local repository">
+    <goal name="car:install" prereqs="car:package" description="Install the package in the local repository">
         <artifact:install artifact="${maven.build.dir}/${maven.final.name}.car" type="car" project="${pom}"/>
     </goal>
 
-    <goal name="geronimo:distribute" prereqs="geronimo:package" description="Distribute the package to a server">
-        <package:jmxDistribute
+    <goal name="car:distribute" prereqs="car:package" description="Distribute the package to a server">
+        <car:jmxDistribute
             user="${geronimo.packaging.user}"
             password="${geronimo.packaging.password}"
             url="${geronimo.packaging.url}"

Modified: geronimo/trunk/plugins/geronimo-packaging-plugin/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-packaging-plugin/project.xml?rev=263817&r1=263816&r2=263817&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-packaging-plugin/project.xml (original)
+++ geronimo/trunk/plugins/geronimo-packaging-plugin/project.xml Sat Aug 27 21:19:12 2005
@@ -22,7 +22,7 @@
     <groupId>geronimo</groupId>
     <id>geronimo-packaging-plugin</id>
     <name>Geronimo Packaging Plugin</name>
-    <currentVersion>0.1.2</currentVersion>
+    <currentVersion>1.0-SNAPSHOT</currentVersion>
 
     <dependencies>
         <dependency>

Modified: geronimo/trunk/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java?rev=263817&r1=263816&r2=263817&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java (original)
+++ geronimo/trunk/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java Sat Aug 27 21:19:12 2005
@@ -24,10 +24,11 @@
 import javax.management.ObjectName;
 
 import org.apache.geronimo.gbean.GBeanData;
-import org.apache.geronimo.kernel.KernelRegistry;
-import org.apache.geronimo.kernel.KernelFactory;
 import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.KernelFactory;
+import org.apache.geronimo.kernel.KernelRegistry;
 import org.apache.geronimo.kernel.config.ConfigurationManager;
+import org.apache.geronimo.kernel.config.ConfigurationManagerImpl;
 import org.apache.geronimo.kernel.config.ConfigurationUtil;
 
 /**
@@ -48,20 +49,26 @@
      */
     private static final ObjectName CONFIGSTORE_NAME;
 
+    /**
+     * The name of the GBean that will manage Configurations.
+     */
+    private static final ObjectName CONFIGMANAGER_NAME;
+
     private static final String[] ARG_TYPES = {
-        File.class.getName(),
-        File.class.getName(),
-        File.class.getName(),
-        Boolean.TYPE.getName(),
-        String.class.getName(),
-        String.class.getName(),
-        String.class.getName(),
+            File.class.getName(),
+            File.class.getName(),
+            File.class.getName(),
+            Boolean.TYPE.getName(),
+            String.class.getName(),
+            String.class.getName(),
+            String.class.getName(),
     };
 
     static {
         try {
             REPOSITORY_NAME = new ObjectName(KERNEL_NAME + ":name=Repository");
             CONFIGSTORE_NAME = new ObjectName(KERNEL_NAME + ":name=MavenConfigStore,j2eeType=ConfigurationStore");
+            CONFIGMANAGER_NAME = new ObjectName(KERNEL_NAME + ":name=ConfigurationManager,j2eeType=ConfigurationManager");
         } catch (MalformedObjectNameException e) {
             throw new ExceptionInInitializerError(e.getMessage());
         }
@@ -230,21 +237,25 @@
 
     /**
      * Boot the in-Maven deployment system.
-     * This contains just Repository and ConfigurationStore GBeans that map to
+     * This contains Repository and ConfigurationStore GBeans that map to
      * the local maven installation.
      */
     private void bootDeployerSystem(Kernel kernel) throws Exception {
         ClassLoader cl = PackageBuilder.class.getClassLoader();
         GBeanData repoGBean = new GBeanData(REPOSITORY_NAME, MavenRepository.GBEAN_INFO);
         repoGBean.setAttribute("root", repository);
+        kernel.loadGBean(repoGBean, cl);
+        kernel.startGBean(REPOSITORY_NAME);
 
         GBeanData storeGBean = new GBeanData(CONFIGSTORE_NAME, MavenConfigStore.GBEAN_INFO);
         storeGBean.setReferencePattern("Repository", REPOSITORY_NAME);
-
-        kernel.loadGBean(repoGBean, cl);
-        kernel.startGBean(REPOSITORY_NAME);
         kernel.loadGBean(storeGBean, cl);
         kernel.startGBean(CONFIGSTORE_NAME);
+
+        GBeanData configManagerGBean = new GBeanData(CONFIGMANAGER_NAME, ConfigurationManagerImpl.GBEAN_INFO);
+        configManagerGBean.setReferencePattern("Stores", CONFIGSTORE_NAME);
+        kernel.loadGBean(configManagerGBean, cl);
+        kernel.startGBean(CONFIGMANAGER_NAME);
     }
 
     /**

Modified: geronimo/trunk/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/project.properties?rev=263817&r1=263816&r2=263817&view=diff
==============================================================================
--- geronimo/trunk/project.properties (original)
+++ geronimo/trunk/project.properties Sat Aug 27 21:19:12 2005
@@ -30,27 +30,18 @@
 maven.multiproject.includes=\
 plugins/*/project.xml,\
 specs/*/project.xml,\
-openejb/modules/*/project.xml,\
 applications/*/project.xml,\
 modules/*/project.xml,\
-tmporb/modules/*/project.xml,\
-tranql/*/project.xml,
-#itests/naming/client/project.xml,\
-#itests/naming/common/project.xml,\
-#itests/naming/ejb/project.xml,\
-#itests/naming/war/project.xml
-#activemq/modules/*/project.xml,\
-#activemq/transports/*/project.xml,\
-#activemq/stores/*/project.xml,
-
-#howl/logger/project.xml,\
+configs/*/project.xml,\
+assemblies/*/project.xml,\
+openejb/modules/*/project.xml,\
+tranql/*/project.xml
 
 maven.multiproject.excludes=\
 openejb/modules/connector/project.xml,\
 openejb/modules/webadmin/project.xml,\
 activemq/modules/*/project.xml,\
 sandbox/*/project.xml
-#itests/*/project.xml,\
 
 maven.idea.project.multiproject.includes=${maven.multiproject.includes}
 maven.idea.project.multiproject.excludes=${maven.multiproject.excludes}



Mime
View raw message