Return-Path: 
 <scm-return-13443-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 65629 invoked from network); 12 Jul 2006 19:15:02 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 12 Jul 2006 19:15:02 -0000
Received: (qmail 5553 invoked by uid 500); 12 Jul 2006 19:15:01 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 5522 invoked by uid 500); 12 Jul 2006 19:15:01 -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 5511 invoked by uid 99); 12 Jul 2006 19:15:01 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Jul 2006 12:15:01 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Jul 2006 12:15:00 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 165521A981A; Wed, 12 Jul 2006 12:14:40 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r421379 - in
 /geronimo/sandbox/svkmerge/m2migration/applications/console: ./
 console-framework/pom.xml console-framework/project.xml
 console-standard/pom.xml console-standard/project.xml
Date: Wed, 12 Jul 2006 19:14:39 -0000
To: scm@geronimo.apache.org
From: jdillon@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060712191440.165521A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: jdillon
Date: Wed Jul 12 12:14:38 2006
New Revision: 421379

URL: http://svn.apache.org/viewvc?rev=421379&view=rev
Log:
Merge #421176 for GERONIMO-1887

Modified:
    geronimo/sandbox/svkmerge/m2migration/applications/console/   (props changed)
    geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/pom.xml
    geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/project.xml
    geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/pom.xml
    geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/project.xml

Propchange: geronimo/sandbox/svkmerge/m2migration/applications/console/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Wed Jul 12 12:14:38 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/applications/console:421368

Modified: geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/pom.xml?rev=421379&r1=421378&r2=421379&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/pom.xml Wed Jul 12 12:14:38 2006
@@ -48,11 +48,6 @@
     
     <dependencies>
         <dependency>
-            <groupId>castor</groupId>
-            <artifactId>castor</artifactId>
-        </dependency>
-        
-        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_2.4_spec</artifactId>
             <scope>provided</scope>
@@ -72,6 +67,11 @@
         <dependency>
             <groupId>org.apache.pluto</groupId>
             <artifactId>pluto-descriptors</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>castor</groupId>
+            <artifactId>castor</artifactId>
         </dependency>
         
         <!-- Required for JSPC compilation -->

Modified: geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/project.xml?rev=421379&r1=421378&r2=421379&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/project.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/console/console-framework/project.xml Wed Jul 12 12:14:38 2006
@@ -26,19 +26,11 @@
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
             <version>${commons_logging_version}</version>
-            <properties>
-                <lib>true</lib>
-                <server>true</server>
-                <deploy>true</deploy>
-            </properties>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
-            <properties>
-                <repository>true</repository>
-            </properties>
         </dependency>
         <dependency>
             <groupId>portlet-api</groupId>
@@ -49,7 +41,7 @@
             <groupId>org.apache.pluto</groupId>
             <artifactId>pluto</artifactId>
             <version>${pluto_version}</version>
-         </dependency>
+        </dependency>
         <dependency>
             <groupId>org.apache.pluto</groupId>
             <artifactId>pluto-portal</artifactId>
@@ -57,7 +49,7 @@
             <properties>
                 <war.bundle>true</war.bundle>
             </properties>
-         </dependency>
+        </dependency>
         <dependency>
             <groupId>org.apache.pluto</groupId>
             <artifactId>pluto-descriptors</artifactId>
@@ -65,7 +57,7 @@
             <properties>
                 <war.bundle>true</war.bundle>
             </properties>
-         </dependency>
+        </dependency>
         <dependency>
             <groupId>castor</groupId>
             <artifactId>castor</artifactId>
@@ -74,7 +66,6 @@
                 <war.bundle>true</war.bundle>
             </properties>
         </dependency>
-                
         <dependency>
             <groupId>tomcat</groupId>
             <artifactId>jasper-runtime</artifactId>

Modified: geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/pom.xml?rev=421379&r1=421378&r2=421379&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/pom.xml Wed Jul 12 12:14:38 2006
@@ -90,11 +90,6 @@
         </dependency>
         
         <dependency>
-            <groupId>castor</groupId>
-            <artifactId>castor</artifactId>
-        </dependency>
-        
-        <dependency>
             <groupId>commons-digester</groupId>
             <artifactId>commons-digester</artifactId>
         </dependency>

Modified: geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/project.xml?rev=421379&r1=421378&r2=421379&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/project.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/console/console-standard/project.xml Wed Jul 12 12:14:38 2006
@@ -8,14 +8,6 @@
 
     <dependencies>
         <dependency>
-            <groupId>jetty</groupId>
-            <artifactId>org.mortbay.jetty</artifactId>
-            <version>${jetty_version}</version>
-            <properties>
-                <repository>true</repository>
-            </properties>
-        </dependency>
-        <dependency>
              <groupId>geronimo</groupId>
              <artifactId>geronimo-core</artifactId>
              <version>${pom.currentVersion}</version>
@@ -130,11 +122,6 @@
             <artifactId>geronimo-security-builder</artifactId>
             <version>${pom.currentVersion}</version>
         </dependency>
-<!--        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-</artifactId>
-            <version>${pom.currentVersion}</version>
-        </dependency>-->
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-security</artifactId>
@@ -186,14 +173,6 @@
             <artifactId>pluto</artifactId>
             <version>${pluto_version}</version>
         </dependency>
-        <dependency>
-            <groupId>castor</groupId>
-            <artifactId>castor</artifactId>
-            <version>${castor_version}</version>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
 
         <!-- JMS dependencies -->
          <dependency>
@@ -237,26 +216,17 @@
             <groupId>ant</groupId>
             <artifactId>ant</artifactId>
             <version>${ant_version}</version>
-<!--            <properties>
-                <repository>true</repository>
-            </properties> -->
         </dependency>
         <dependency>
             <groupId>commons-el</groupId>
             <artifactId>commons-el</artifactId>
             <version>${commons_el_version}</version>
             <url>http://jakarta.apache.org/commons/el/</url>
-            <properties>
-                <repository>true</repository>
-            </properties>
         </dependency>                       
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee_1.4_spec</artifactId>
             <version>${geronimo_spec_j2ee_version}</version>
-            <properties>
-                <repository>true</repository>
-            </properties>
         </dependency>
         <dependency>
             <groupId>taglibs</groupId>