Return-Path: 
 <scm-return-24510-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 88611 invoked from network); 23 Jan 2008 16:35:39 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 23 Jan 2008 16:35:39 -0000
Received: (qmail 89821 invoked by uid 500); 23 Jan 2008 16:35:29 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 89774 invoked by uid 500); 23 Jan 2008 16:35:29 -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 89763 invoked by uid 99); 23 Jan 2008 16:35:29 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Jan 2008 08:35:29 -0800
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Jan 2008 16:35:11 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 84D141A9832; Wed, 23 Jan 2008 08:35:02 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r614579 - in /geronimo/samples/trunk: ./ samples/
 samples/dbtester/dbtester-war/ samples/jsp-examples/jsp-examples-jetty/
 samples/jsp-examples/jsp-examples-tomcat/
 samples/ldap-sample-app/ldap-sample-app-jetty/
 samples/ldap-sample-app/ldap-...
Date: Wed, 23 Jan 2008 16:34:57 -0000
To: scm@geronimo.apache.org
From: gawor@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080123163502.84D141A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: gawor
Date: Wed Jan 23 08:34:48 2008
New Revision: 614579

URL: http://svn.apache.org/viewvc?rev=614579&view=rev
Log:
updated samples to match trunk

Modified:
    geronimo/samples/trunk/pom.xml
    geronimo/samples/trunk/samples/dbtester/dbtester-war/pom.xml
    geronimo/samples/trunk/samples/jsp-examples/jsp-examples-jetty/pom.xml
    geronimo/samples/trunk/samples/jsp-examples/jsp-examples-tomcat/pom.xml
    geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml
    geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-realm/pom.xml
    geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml
    geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/ldap-realm.xml
    geronimo/samples/trunk/samples/pom.xml
    geronimo/samples/trunk/samples/servlet-examples/servlet-examples-jetty/pom.xml
    geronimo/samples/trunk/samples/servlet-examples/servlet-examples-tomcat/pom.xml
    geronimo/samples/trunk/samples/timereport/timereport-ear/src/main/resources/TimeReportPool.xml
    geronimo/samples/trunk/samples/timereport/timereport-ear/src/main/resources/TimeReportRealm.xml

Modified: geronimo/samples/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/pom.xml?rev=614579&r1=614578&r2=614579&view=diff
==============================================================================
--- geronimo/samples/trunk/pom.xml (original)
+++ geronimo/samples/trunk/pom.xml Wed Jan 23 08:34:48 2008
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.geronimo.genesis.config</groupId>
         <artifactId>project-config</artifactId>
-        <version>1.1</version>
+        <version>1.3</version>
     </parent>
 
     <groupId>org.apache.geronimo.samples</groupId>

Modified: geronimo/samples/trunk/samples/dbtester/dbtester-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/dbtester/dbtester-war/pom.xml?rev=614579&r1=614578&r2=614579&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/dbtester/dbtester-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/dbtester/dbtester-war/pom.xml Wed Jan 23 08:34:48 2008
@@ -39,7 +39,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-kernel</artifactId>
             <version>${geronimoVersion}</version>
             <scope>provided</scope>
@@ -51,7 +51,7 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-management</artifactId>
             <version>${geronimoVersion}</version>
             <scope>provided</scope>

Modified: geronimo/samples/trunk/samples/jsp-examples/jsp-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/jsp-examples-jetty/pom.xml?rev=614579&r1=614578&r2=614579&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/jsp-examples-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/jsp-examples/jsp-examples-jetty/pom.xml Wed Jan 23 08:34:48 2008
@@ -23,11 +23,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>jsp-examples</artifactId>
         <version>2.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>jsp-examples-jetty</artifactId>
     <name>Geronimo Configs :: JSP Examples Jetty</name>
     <packaging>car</packaging>

Modified: geronimo/samples/trunk/samples/jsp-examples/jsp-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/jsp-examples-tomcat/pom.xml?rev=614579&r1=614578&r2=614579&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/jsp-examples-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/jsp-examples/jsp-examples-tomcat/pom.xml Wed Jan 23 08:34:48 2008
@@ -23,11 +23,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>jsp-examples</artifactId>
         <version>2.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>jsp-examples-tomcat</artifactId>
     <name>Geronimo Configs :: JSP Examples Tomcat</name>
     <packaging>car</packaging>

Modified: geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml?rev=614579&r1=614578&r2=614579&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml Wed Jan 23 08:34:48 2008
@@ -23,11 +23,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>ldap-sample-app</artifactId>
         <version>2.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>ldap-sample-app-jetty</artifactId>
     <name>Geronimo Configs :: LDAP Sample for Jetty</name>
     <packaging>car</packaging>

Modified: geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-realm/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-realm/pom.xml?rev=614579&r1=614578&r2=614579&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-realm/pom.xml (original)
+++ geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-realm/pom.xml Wed Jan 23 08:34:48 2008
@@ -23,11 +23,13 @@
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>ldap-sample-app</artifactId>
         <version>2.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>ldap-sample-app-realm</artifactId>
     <name>Geronimo Configs :: LDAP Sample Security Realm</name>
     <packaging>car</packaging>
@@ -43,7 +45,7 @@
     <dependencies>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -51,7 +53,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>server-security-config</artifactId>
             <version>${version}</version>
             <type>car</type>

Modified: geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml?rev=614579&r1=614578&r2=614579&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml Wed Jan 23 08:34:48 2008
@@ -23,11 +23,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>ldap-sample-app</artifactId>
         <version>2.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>ldap-sample-app-tomcat</artifactId>
     <name>Geronimo Configs :: LDAP Sample for Tomcat</name>
     <packaging>car</packaging>

Modified: geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/ldap-realm.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/ldap-realm.xml?rev=614579&r1=614578&r2=614579&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/ldap-realm.xml (original)
+++ geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/ldap-realm.xml Wed Jan 23 08:34:48 2008
@@ -24,13 +24,6 @@
             <version>1.0</version>
             <type>car</type>
         </moduleId>
-        <dependencies>
-            <dependency>
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>j2ee-security</artifactId>
-                <type>car</type>
-            </dependency>
-        </dependencies>
     </environment>
     <gbean name="LDAP_Sample_Realm" class="org.apache.geronimo.security.realm.GenericSecurityRealm" 
                                     xsi:type="dep:gbeanType" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2" 

Modified: geronimo/samples/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/pom.xml?rev=614579&r1=614578&r2=614579&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/pom.xml (original)
+++ geronimo/samples/trunk/samples/pom.xml Wed Jan 23 08:34:48 2008
@@ -34,6 +34,22 @@
 
     <properties>
        <geronimoVersion>2.1-SNAPSHOT</geronimoVersion>
+
+        <gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${version}/car</gbeanDeployerBootstrap>
+        <gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${version}/car</gbeanDeployer>
+        <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${version}/car</j2eeDeployer>
+        <clientDeployer>org.apache.geronimo.configs/client-deployer/${version}/car</clientDeployer>
+        <connectorDeployer>org.apache.geronimo.configs/connector-deployer/${version}/car</connectorDeployer>
+        <openejbDeployer>org.apache.geronimo.configs/openejb-deployer/${version}/car</openejbDeployer>
+        <openejbcorbaDeployer>org.apache.geronimo.configs/openejb-corba-deployer/${version}/car</openejbcorbaDeployer>
+        <axisDeployer>org.apache.geronimo.configs/axis-deployer/${version}/car</axisDeployer>
+        <cxfDeployer>org.apache.geronimo.configs/cxf-deployer/${version}/car</cxfDeployer>
+        <axis2Deployer>org.apache.geronimo.configs/axis2-deployer/${version}/car</axis2Deployer>
+        <tomcatDeployer>org.apache.geronimo.configs/tomcat6-deployer/${version}/car</tomcatDeployer>
+        <jetty6Deployer>org.apache.geronimo.configs/jetty6-deployer/${version}/car</jetty6Deployer>
+        <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${version}/car</jasperDeployer>
+        <jpaDeployer>org.apache.geronimo.configs/persistence-jpa10-deployer/${version}/car</jpaDeployer>
+
     </properties>
 
     <modules>
@@ -166,6 +182,40 @@
                     </execution>
                 </executions>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <!-- Install as extention to allow 'car' packaging to be
+                used. -->
+                <extensions>true</extensions>
+                <configuration>
+                    <archive>
+                        <!-- Do not include META-INF/maven to avoid long file
+                problems on windows -->
+                        <addMavenDescriptor>false</addMavenDescriptor>
+                    </archive>
+                    <osiApproved>true</osiApproved>
+                    <!--
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                    -->
+                    <commonInstance>
+                        <plugin-artifact>
+                            <geronimo-version>${geronimoVersion}</geronimo-version>
+                            <jvm-version>1.5</jvm-version>
+                            <!--<source-repository>http://www.geronimoplugins.com/repository/geronimo-2.1</source-repository>-->
+                            <source-repository>~/.m2/repository/</source-repository>
+                            <source-repository>http://repo1.maven.org/maven2/</source-repository>
+                            <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
+                            <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
+                        </plugin-artifact>
+                    </commonInstance>
+                </configuration>
+            </plugin>
+
         </plugins>
     </build>
 

Modified: geronimo/samples/trunk/samples/servlet-examples/servlet-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/servlet-examples/servlet-examples-jetty/pom.xml?rev=614579&r1=614578&r2=614579&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/servlet-examples/servlet-examples-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/servlet-examples/servlet-examples-jetty/pom.xml Wed Jan 23 08:34:48 2008
@@ -23,11 +23,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>servlet-examples</artifactId>
         <version>2.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>servlet-examples-jetty</artifactId>
     <name>Geronimo Configs :: Servlet Examples for Jetty</name>
     <packaging>car</packaging>

Modified: geronimo/samples/trunk/samples/servlet-examples/servlet-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/servlet-examples/servlet-examples-tomcat/pom.xml?rev=614579&r1=614578&r2=614579&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/servlet-examples/servlet-examples-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/servlet-examples/servlet-examples-tomcat/pom.xml Wed Jan 23 08:34:48 2008
@@ -23,11 +23,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>servlet-examples</artifactId>
         <version>2.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>servlet-examples-tomcat</artifactId>
     <name>Geronimo Configs :: Servlet Examples for Tomcat</name>
     <packaging>car</packaging>

Modified: geronimo/samples/trunk/samples/timereport/timereport-ear/src/main/resources/TimeReportPool.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/timereport/timereport-ear/src/main/resources/TimeReportPool.xml?rev=614579&r1=614578&r2=614579&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/timereport/timereport-ear/src/main/resources/TimeReportPool.xml (original)
+++ geronimo/samples/trunk/samples/timereport/timereport-ear/src/main/resources/TimeReportPool.xml Wed Jan 23 08:34:48 2008
@@ -28,11 +28,6 @@
         <dep:dependencies>
             <dep:dependency>
                 <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-                <dep:artifactId>j2ee-security</dep:artifactId>
-                <dep:type>car</dep:type>
-            </dep:dependency>
-            <dep:dependency>
-                <dep:groupId>org.apache.geronimo.configs</dep:groupId>
                 <dep:artifactId>system-database</dep:artifactId>
                 <dep:type>car</dep:type>
             </dep:dependency>

Modified: geronimo/samples/trunk/samples/timereport/timereport-ear/src/main/resources/TimeReportRealm.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/timereport/timereport-ear/src/main/resources/TimeReportRealm.xml?rev=614579&r1=614578&r2=614579&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/timereport/timereport-ear/src/main/resources/TimeReportRealm.xml (original)
+++ geronimo/samples/trunk/samples/timereport/timereport-ear/src/main/resources/TimeReportRealm.xml Wed Jan 23 08:34:48 2008
@@ -27,11 +27,6 @@
         </moduleId>
         <dependencies>
             <dependency>
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>j2ee-security</artifactId>
-                <type>car</type>
-            </dependency>
-            <dependency>
                <groupId>org.apache.geronimo.configs</groupId>
 		       <artifactId>system-database</artifactId>
 			   <type>car</type>