Return-Path: 
 <scm-return-8576-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 89867 invoked from network); 16 Nov 2005 02:42:58 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 16 Nov 2005 02:42:58 -0000
Received: (qmail 31705 invoked by uid 500); 16 Nov 2005 02:42:57 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 31557 invoked by uid 500); 16 Nov 2005 02:42:57 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 31542 invoked by uid 99); 16 Nov 2005 02:42:57 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Nov 2005 18:42:57 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Tue, 15 Nov 2005 18:44:31 -0800
Received: (qmail 89795 invoked by uid 65534); 16 Nov 2005 02:42:36 -0000
Message-ID: <20051116024236.89793.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r344852 [2/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/...
Date: Wed, 16 Nov 2005 02:42:32 -0000
To: scm@geronimo.apache.org
From: djencks@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Modified: geronimo/trunk/configs/uddi-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/uddi-jetty/src/plan/plan.xml?rev=344852&r1=344851&r2=344852&view=diff
==============================================================================
--- geronimo/trunk/configs/uddi-jetty/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/uddi-jetty/src/plan/plan.xml Tue Nov 15 18:42:23 2005
@@ -16,63 +16,17 @@
     limitations under the License.
 -->
 
-<!-- $Rev: 47568 $ $Date: 2004-09-30 01:21:54 -0700 (Thu, 30 Sep 2004) $ -->
+<!-- $Rev: 160900 $ $Date: 2005-04-11 08:09:38 -0700 (Mon, 11 Apr 2005) $ -->
 
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0"
+<web-app
+    xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0"
                configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
-               parentId="${pom.groupId}/cars/j2ee-server-${pom.currentVersion}.car"
-          >
-    <resourceadapter>
-        <outbound-resourceadapter>
-            <connection-definition>
-                <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
-                <connectiondefinition-instance>
-                    <name>SystemDatasource</name>
-                    <config-property-setting name="UserName"></config-property-setting>
-                    <config-property-setting name="Password"></config-property-setting>
-                    <config-property-setting name="DatabaseName">SystemDatabase</config-property-setting>
-                    <config-property-setting name="CreateDatabase">true</config-property-setting>
-                    <connectionmanager>
-                        <xa-transaction>
-                            <transaction-caching/>
-                        </xa-transaction>
-                        <single-pool>
-                            <max-size>100</max-size>
-                            <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
-                            <match-one/>
-                        </single-pool>
-                    </connectionmanager>
-                </connectiondefinition-instance>
-            </connection-definition>
-        </outbound-resourceadapter>
-    </resourceadapter>
+    >
 
-    <gbean name="DerbySystem" class="org.apache.geronimo.derby.DerbySystemGBean">
-        <reference name="ServerInfo"><moduleType>J2EEModule</moduleType><module>geronimo/cars/j2ee-system-${pom.currentVersion}.car</module><name>ServerInfo</name></reference>
-        <attribute name="derbySystemHome">var/derby</attribute>
-    </gbean>
-    <gbean name="DerbyNetwork" class="org.apache.geronimo.derby.DerbyNetworkGBean">
-        <!--TODO remove moduleType when gbeans get the moduleType of the plan they are in -->
-        <reference name="derbySystem"><moduleType>J2EEModule</moduleType><name>DerbySystem</name></reference>
-        <attribute name="host">localhost</attribute>
-        <attribute name="port">1527</attribute>
-    </gbean>
-
-    <gbean name="TransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledTransactionalTimer">
-        <attribute name="repeatCount">5</attribute>
-        <reference name="TransactionContextManager"><moduleType>J2EEModule</moduleType><module>geronimo/cars/j2ee-server-${pom.currentVersion}.car</module><name>TransactionContextManager</name></reference>
-        <reference name="ManagedConnectionFactoryWrapper"><moduleType>JCAResource</moduleType><name>SystemDatasource</name></reference>
-        <reference name="ThreadPool"><moduleType>J2EEModule</moduleType><module>geronimo/cars/j2ee-server-${pom.currentVersion}.car</module><name>DefaultThreadPool</name></reference>
-        <!--TODO remove moduleType when gbeans get the moduleType of the plan they are in -->
-        <reference name="DerbySystem"><moduleType>J2EEModule</moduleType><name>DerbySystem</name></reference>
-    </gbean>
-
-    <gbean name="NonTransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledNonTransactionalTimer">
-        <reference name="TransactionContextManager"><moduleType>J2EEModule</moduleType><module>geronimo/cars/j2ee-server-${pom.currentVersion}.car</module><name>TransactionContextManager</name></reference>
-        <reference name="ManagedConnectionFactoryWrapper"><moduleType>JCAResource</moduleType><name>SystemDatasource</name></reference>
-        <reference name="ThreadPool"><moduleType>J2EEModule</moduleType><module>geronimo/cars/j2ee-server-${pom.currentVersion}.car</module><name>DefaultThreadPool</name></reference>
-        <!--TODO remove moduleType when gbeans get the moduleType of the plan they are in -->
-        <reference name="DerbySystem"><moduleType>J2EEModule</moduleType><name>DerbySystem</name></reference>
-    </gbean>
-
-</connector>
+    <context-root>/juddi</context-root>
+    <context-priority-classloader>false</context-priority-classloader>
+    <resource-ref>
+        <ref-name>jdbc/juddiDB</ref-name>
+        <resource-link>SystemDatasource</resource-link>
+    </resource-ref>
+</web-app>

Modified: geronimo/trunk/configs/welcome-jetty/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/welcome-jetty/project.properties?rev=344852&r1=344851&r2=344852&view=diff
==============================================================================
--- geronimo/trunk/configs/welcome-jetty/project.properties (original)
+++ geronimo/trunk/configs/welcome-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-welcome-${geronimo_version}.war
 

Modified: geronimo/trunk/configs/welcome-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/welcome-jetty/project.xml?rev=344852&r1=344851&r2=344852&view=diff
==============================================================================
--- geronimo/trunk/configs/welcome-jetty/project.xml (original)
+++ geronimo/trunk/configs/welcome-jetty/project.xml Tue Nov 15 18:42:23 2005
@@ -31,7 +31,12 @@
             <artifactId>j2ee-server</artifactId>
             <version>${geronimo_version}</version>
             <type>car</type>
+<!--            <properties>
+                 <geronimo.import>true</geronimo.import>
+            </properties>
+-->
         </dependency>
+
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-system</artifactId>

Modified: geronimo/trunk/configs/welcome-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/configs/welcome-jetty/src/plan/plan.xml?rev=344852&r1=344851&r2=344852&view=diff
==============================================================================
--- geronimo/trunk/configs/welcome-jetty/src/plan/plan.xml (original)
+++ geronimo/trunk/configs/welcome-jetty/src/plan/plan.xml Tue Nov 15 18:42:23 2005
@@ -16,63 +16,12 @@
     limitations under the License.
 -->
 
-<!-- $Rev: 47568 $ $Date: 2004-09-30 01:21:54 -0700 (Thu, 30 Sep 2004) $ -->
+<!-- $Rev: 160900 $ $Date: 2005-04-11 08:09:38 -0700 (Mon, 11 Apr 2005) $ -->
 
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0"
-               configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
-               parentId="${pom.groupId}/cars/j2ee-server-${pom.currentVersion}.car"
-          >
-    <resourceadapter>
-        <outbound-resourceadapter>
-            <connection-definition>
-                <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
-                <connectiondefinition-instance>
-                    <name>SystemDatasource</name>
-                    <config-property-setting name="UserName"></config-property-setting>
-                    <config-property-setting name="Password"></config-property-setting>
-                    <config-property-setting name="DatabaseName">SystemDatabase</config-property-setting>
-                    <config-property-setting name="CreateDatabase">true</config-property-setting>
-                    <connectionmanager>
-                        <xa-transaction>
-                            <transaction-caching/>
-                        </xa-transaction>
-                        <single-pool>
-                            <max-size>100</max-size>
-                            <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
-                            <match-one/>
-                        </single-pool>
-                    </connectionmanager>
-                </connectiondefinition-instance>
-            </connection-definition>
-        </outbound-resourceadapter>
-    </resourceadapter>
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0"
+      configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
+    >
 
-    <gbean name="DerbySystem" class="org.apache.geronimo.derby.DerbySystemGBean">
-        <reference name="ServerInfo"><moduleType>J2EEModule</moduleType><module>geronimo/cars/j2ee-system-${pom.currentVersion}.car</module><name>ServerInfo</name></reference>
-        <attribute name="derbySystemHome">var/derby</attribute>
-    </gbean>
-    <gbean name="DerbyNetwork" class="org.apache.geronimo.derby.DerbyNetworkGBean">
-        <!--TODO remove moduleType when gbeans get the moduleType of the plan they are in -->
-        <reference name="derbySystem"><moduleType>J2EEModule</moduleType><name>DerbySystem</name></reference>
-        <attribute name="host">localhost</attribute>
-        <attribute name="port">1527</attribute>
-    </gbean>
-
-    <gbean name="TransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledTransactionalTimer">
-        <attribute name="repeatCount">5</attribute>
-        <reference name="TransactionContextManager"><moduleType>J2EEModule</moduleType><module>geronimo/cars/j2ee-server-${pom.currentVersion}.car</module><name>TransactionContextManager</name></reference>
-        <reference name="ManagedConnectionFactoryWrapper"><moduleType>JCAResource</moduleType><name>SystemDatasource</name></reference>
-        <reference name="ThreadPool"><moduleType>J2EEModule</moduleType><module>geronimo/cars/j2ee-server-${pom.currentVersion}.car</module><name>DefaultThreadPool</name></reference>
-        <!--TODO remove moduleType when gbeans get the moduleType of the plan they are in -->
-        <reference name="DerbySystem"><moduleType>J2EEModule</moduleType><name>DerbySystem</name></reference>
-    </gbean>
-
-    <gbean name="NonTransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledNonTransactionalTimer">
-        <reference name="TransactionContextManager"><moduleType>J2EEModule</moduleType><module>geronimo/cars/j2ee-server-${pom.currentVersion}.car</module><name>TransactionContextManager</name></reference>
-        <reference name="ManagedConnectionFactoryWrapper"><moduleType>JCAResource</moduleType><name>SystemDatasource</name></reference>
-        <reference name="ThreadPool"><moduleType>J2EEModule</moduleType><module>geronimo/cars/j2ee-server-${pom.currentVersion}.car</module><name>DefaultThreadPool</name></reference>
-        <!--TODO remove moduleType when gbeans get the moduleType of the plan they are in -->
-        <reference name="DerbySystem"><moduleType>J2EEModule</moduleType><name>DerbySystem</name></reference>
-    </gbean>
-
-</connector>
+    <context-root>/</context-root>
+    <context-priority-classloader>false</context-priority-classloader>
+</web-app>