geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r902335 - in /geronimo/server/trunk/plugins: jetty8/jetty8-deployer/src/main/plan/plan.xml tomcat/tomcat7-deployer/src/main/plan/plan.xml
Date Sat, 23 Jan 2010 02:20:07 GMT
Author: gawor
Date: Sat Jan 23 02:20:07 2010
New Revision: 902335

URL: http://svn.apache.org/viewvc?rev=902335&view=rev
Log:
some environment information i forgot to put back

Modified:
    geronimo/server/trunk/plugins/jetty8/jetty8-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/tomcat/tomcat7-deployer/src/main/plan/plan.xml

Modified: geronimo/server/trunk/plugins/jetty8/jetty8-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/jetty8-deployer/src/main/plan/plan.xml?rev=902335&r1=902334&r2=902335&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/jetty8-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/jetty8/jetty8-deployer/src/main/plan/plan.xml Sat Jan 23
02:20:07 2010
@@ -127,6 +127,18 @@
         <reference name="ResourceEnvironmentSetter">
             <name>ResourceRefBuilder</name>
         </reference>
+        <xml-attribute name="defaultEnvironment">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+                <dependencies>
+                    <dependency>
+                        <groupId>${pom.groupId}</groupId>
+                        <artifactId>jetty8</artifactId>
+                        <version>${version}</version>
+                        <type>car</type>
+                    </dependency>
+                </dependencies>
+            </environment>
+        </xml-attribute>
     </gbean>
 
     <gbean name="StaticContent" class="org.apache.geronimo.jetty8.DefaultServletHolderWrapper">

Modified: geronimo/server/trunk/plugins/tomcat/tomcat7-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat7-deployer/src/main/plan/plan.xml?rev=902335&r1=902334&r2=902335&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat7-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat7-deployer/src/main/plan/plan.xml Sat Jan 23
02:20:07 2010
@@ -80,20 +80,6 @@
                         <type>car</type>
                     </dependency>
                 </dependencies>
-                <hidden-classes/>
-                <non-overridable-classes>
-                    <filter>java.</filter>
-                    <filter>javax.</filter>
-                    <filter>org.apache.geronimo.</filter>
-                    <filter>org.apache.jasper.</filter>
-                    <filter>org.apache.naming.</filter>
-                    <filter>org.apache.catalina.</filter>
-                    <filter>org.apache.tomcat.</filter>
-                    <filter>org.apache.myfaces.</filter>
-                    <filter>org.apache.taglibs.</filter>
-                    <filter>org.xml.</filter>
-                    <filter>org.w3c.</filter>
-                </non-overridable-classes>
             </environment>
         </xml-attribute>
     </gbean>



Mime
View raw message