Return-Path: 
 <scm-return-21363-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 27161 invoked from network); 21 Aug 2007 20:21:40 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 21 Aug 2007 20:21:40 -0000
Received: (qmail 44358 invoked by uid 500); 21 Aug 2007 20:21:37 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 44324 invoked by uid 500); 21 Aug 2007 20:21:37 -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 44313 invoked by uid 99); 21 Aug 2007 20:21:37 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Aug 2007 13:21:37 -0700
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; Tue, 21 Aug 2007 20:21:39 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 713EC1A981A; Tue, 21 Aug 2007 13:21:19 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r568254 - in /geronimo/plugins/debugviews/trunk:
 debugviews-tomcat/ debugviews-tomcat/pom.xml
 debugviews-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
 debugviews-tomcat/src/plan/plan.xml pom.xml
Date: Tue, 21 Aug 2007 20:21:17 -0000
To: scm@geronimo.apache.org
From: pmcmahan@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20070821202119.713EC1A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: pmcmahan
Date: Tue Aug 21 13:21:16 2007
New Revision: 568254

URL: http://svn.apache.org/viewvc?rev=568254&view=rev
Log:
GERONIMO-3413 debugviews configuration for tomcat

Added:
    geronimo/plugins/debugviews/trunk/debugviews-tomcat/
      - copied from r568246, geronimo/plugins/debugviews/trunk/debugviews-jetty/
Modified:
    geronimo/plugins/debugviews/trunk/debugviews-tomcat/pom.xml
    geronimo/plugins/debugviews/trunk/debugviews-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/plugins/debugviews/trunk/debugviews-tomcat/src/plan/plan.xml
    geronimo/plugins/debugviews/trunk/pom.xml

Modified: geronimo/plugins/debugviews/trunk/debugviews-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/debugviews/trunk/debugviews-tomcat/pom.xml?rev=568254&r1=568246&r2=568254&view=diff
==============================================================================
--- geronimo/plugins/debugviews/trunk/debugviews-tomcat/pom.xml (original)
+++ geronimo/plugins/debugviews/trunk/debugviews-tomcat/pom.xml Tue Aug 21 13:21:16 2007
@@ -30,8 +30,8 @@
     </parent>
 
     <groupId>org.apache.geronimo.plugins</groupId>
-    <artifactId>debugviews-jetty</artifactId>
-    <name>Geronimo Debug Views :: Configuration for Jetty</name>
+    <artifactId>debugviews-tomcat</artifactId>
+    <name>Geronimo Debug Views :: Configuration for Tomcat</name>
     <packaging>car</packaging>
 
     <dependencies>
@@ -58,7 +58,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>dojo-jetty6</artifactId>
+            <artifactId>dojo-tomcat</artifactId>
             <type>car</type>
         </dependency>
 
@@ -105,7 +105,7 @@
                     <deploymentConfigs>
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
+                        <deploymentConfig>${tomcatDeployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>

Modified: geronimo/plugins/debugviews/trunk/debugviews-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/debugviews/trunk/debugviews-tomcat/src/main/resources/META-INF/geronimo-plugin.xml?rev=568254&r1=568246&r2=568254&view=diff
==============================================================================
--- geronimo/plugins/debugviews/trunk/debugviews-tomcat/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/plugins/debugviews/trunk/debugviews-tomcat/src/main/resources/META-INF/geronimo-plugin.xml Tue Aug 21 13:21:16 2007
@@ -19,11 +19,11 @@
 <!-- $Rev$ $Date$ -->
 
 <geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
-    <name>Debug Views -- Jetty</name>
-    <module-id>org.apache.geronimo.plugins/debugviews-jetty/1.0-SNAPSHOT/car</module-id>
+    <name>Debug Views -- Tomcat</name>
+    <module-id>org.apache.geronimo.plugins/debugviews-tomcat/1.0-SNAPSHOT/car</module-id>
     <category>Application</category>
     <description>
-       Geronimo Debug Views for Jetty
+       Geronimo Debug Views for Tomcat
     </description>
 
     <url>http://geronimo.apache.org/</url>
@@ -32,11 +32,11 @@
     <geronimo-version>2.1-SNAPSHOT</geronimo-version>
 
     <prerequisite>
-        <id>org.apache.geronimo.configs/jetty6/2.1-SNAPSHOT/car</id>
+        <id>org.apache.geronimo.configs/tomcat6/2.1-SNAPSHOT/car</id>
         <resource-type>Web Container</resource-type>
         <description>
-            This version of the plugin works with the Geronimo/Jetty distribution.
-            It is not intended to run in the Geronimo/Tomcat distribution.
+            This version of the plugin works with the Geronimo/Tomcat distribution.
+            It is not intended to run in the Geronimo/Jetty distribution.
             There is a separate version of this application that works with Tomcat.
             Please install the version appropriate to your Geronimo distribution.
         </description>
@@ -50,7 +50,7 @@
         </description>
     </prerequisite>
     <prerequisite>
-        <id>org.apache.geronimo.configs/dojo-jetty6//car</id>
+        <id>org.apache.geronimo.configs/dojo-tomcat//car</id>
         <resource-type>Web Resources</resource-type>
         <description>
             The dojo configuration must be present in order for this

Modified: geronimo/plugins/debugviews/trunk/debugviews-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/debugviews/trunk/debugviews-tomcat/src/plan/plan.xml?rev=568254&r1=568246&r2=568254&view=diff
==============================================================================
--- geronimo/plugins/debugviews/trunk/debugviews-tomcat/src/plan/plan.xml (original)
+++ geronimo/plugins/debugviews/trunk/debugviews-tomcat/src/plan/plan.xml Tue Aug 21 13:21:16 2007
@@ -16,7 +16,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2">
     
     <!-- This is where the files are accessed from. (aka - portletContext) -->
     <context-root>/DebugViews</context-root>
@@ -29,6 +29,7 @@
             </role>
         </role-mappings>
     </security>
+    <cross-context/>
     
     <gbean name="JMXViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Debug Views/JMX Viewer</attribute>

Modified: geronimo/plugins/debugviews/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/debugviews/trunk/pom.xml?rev=568254&r1=568253&r2=568254&view=diff
==============================================================================
--- geronimo/plugins/debugviews/trunk/pom.xml (original)
+++ geronimo/plugins/debugviews/trunk/pom.xml Tue Aug 21 13:21:16 2007
@@ -127,6 +127,13 @@
             </dependency>
 
             <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>dojo-tomcat</artifactId>
+                <version>${geronimoVersion}</version>
+                <type>car</type>
+            </dependency>
+
+            <dependency>
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>console-core</artifactId>
                 <version>${consoleVersion}</version>