geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r818085 - in /geronimo/server/trunk: plugins/jetty/ plugins/pom.xml pom.xml
Date Wed, 23 Sep 2009 12:56:17 GMT
Author: dwoods
Date: Wed Sep 23 12:56:17 2009
New Revision: 818085

URL: http://svn.apache.org/viewvc?rev=818085&view=rev
Log:
some pom cleanup and remove old jetty6 plugin files

Removed:
    geronimo/server/trunk/plugins/jetty/
Modified:
    geronimo/server/trunk/plugins/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pom.xml?rev=818085&r1=818084&r2=818085&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pom.xml (original)
+++ geronimo/server/trunk/plugins/pom.xml Wed Sep 23 12:56:17 2009
@@ -94,29 +94,10 @@
         <module>concurrent</module>
         <module>classloaders</module>
         <module>procrun</module>
-        <!--<module>jetty</module>-->
         <module>jetty7</module>
         <module>tomcat</module>
     </modules>
 
-    <!--<profiles>-->
-        <!--<profile>-->
-            <!--<id>default</id>-->
-            <!--<activation>-->
-                <!--<activeByDefault>true</activeByDefault>-->
-            <!--</activation>-->
-            <!--<modules>-->
-                <!--<module>jetty</module>-->
-                <!--<module>tomcat</module>-->
-            <!--</modules>-->
-        <!--</profile>-->
-
-        <!--<profile>-->
-            <!--<id>ee6</id>-->
-            <!-- put jetty7 etc here -->
-        <!--</profile>-->
-    <!--</profiles>-->
-    
     <build>
         <plugins>
             <plugin>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=818085&r1=818084&r2=818085&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Wed Sep 23 12:56:17 2009
@@ -320,31 +320,19 @@
                 <groupId>org.apache.geronimo.components</groupId>
                 <artifactId>geronimo-jaspi</artifactId>
                 <version>1.0</version>
-                <!--<exclusions>-->
-                <!--<exclusion>-->
-                <!--<groupId>javax.xml.bind</groupId>-->
-                <!--<artifactId>jaxb-api</artifactId>-->
-                <!--</exclusion>-->
-                <!--</exclusions>-->
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.components</groupId>
                 <artifactId>geronimo-jaspi</artifactId>
                 <version>1.0</version>
                 <classifier>tests</classifier>
-                <!--<exclusions>-->
-                <!--<exclusion>-->
-                <!--<groupId>javax.xml.bind</groupId>-->
-                <!--<artifactId>jaxb-api</artifactId>-->
-                <!--</exclusion>-->
-                <!--</exclusions>-->
             </dependency>
 
             <dependency>
                 <groupId>org.apache.openjpa</groupId>
                 <artifactId>openjpa</artifactId>
                 <version>${openjpaVersion}</version>
-                <!-- already listed as provided in openjpa 1.1.0 -->
+                <!-- already listed as provided in openjpa 1.2.x -->
                 <exclusions>
                     <exclusion>
                         <groupId>org.apache.openjpa</groupId>
@@ -1249,64 +1237,6 @@
                 <version>${openejbVersion}</version>
             </dependency>
 
-
-            <!--<dependency>-->
-            <!--<groupId>org.apache.tomcat</groupId>-->
-            <!--<artifactId>jasper</artifactId>-->
-            <!--<version>${tomcatPatchedVersion}</version>-->
-            <!--<exclusions>-->
-            <!--<exclusion>-->
-            <!--<groupId>$[tomcatGroupId}</groupId>-->
-            <!--<artifactId>servlet-api</artifactId>-->
-            <!--</exclusion>-->
-            <!--<exclusion>-->
-            <!--<groupId>$[tomcatGroupId}</groupId>-->
-            <!--<artifactId>juli</artifactId>-->
-            <!--</exclusion>-->
-            <!--<exclusion>-->
-            <!--<groupId>$[tomcatGroupId}</groupId>-->
-            <!--<artifactId>jsp-api</artifactId>-->
-            <!--</exclusion>-->
-            <!--<exclusion>-->
-            <!--<groupId>$[tomcatGroupId}</groupId>-->
-            <!--<artifactId>el-api</artifactId>-->
-            <!--</exclusion>-->
-            <!--<exclusion>-->
-            <!--<groupId>$[tomcatGroupId}</groupId>-->
-            <!--<artifactId>catalina</artifactId>-->
-            <!--</exclusion>-->
-            <!--<exclusion>-->
-            <!--<groupId>$[tomcatGroupId}</groupId>-->
-            <!--<artifactId>annotations-api</artifactId>-->
-            <!--</exclusion>-->
-            <!--</exclusions>-->
-            <!--</dependency>-->
-            <!--<dependency>-->
-            <!--<groupId>org.apache.tomcat</groupId>-->
-            <!--<artifactId>jasper-el</artifactId>-->
-            <!--<version>${tomcatPatchedVersion}</version>-->
-            <!--<exclusions>-->
-            <!--<exclusion>-->
-            <!--<groupId>org.apache.tomcat</groupId>-->
-            <!--<artifactId>el-api</artifactId>-->
-            <!--</exclusion>-->
-            <!--</exclusions>-->
-            <!--</dependency>-->
-
-            <!--<dependency>-->
-            <!--<groupId>org.apache.tomcat</groupId>-->
-            <!--<artifactId>jasper-jdt</artifactId>-->
-            <!--<version>${tomcatVersion}</version>-->
-            <!--</dependency>-->
-
-            <!--<dependency>-->
-            <!-- used in wadi.  How does this differ from o.a.t.extras:juli, which is
a larger jar? -->
-            <!--<groupId>org.apache.tomcat</groupId>-->
-            <!--<artifactId>juli</artifactId>-->
-            <!--<version>${tomcatVersion}</version>-->
-            <!--</dependency>-->
-
-
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-stax-api_1.0_spec</artifactId>
@@ -2405,28 +2335,6 @@
             </build>
         </profile>
 
-        <profile>
-            <id>ee6</id>
-            <properties>
-                <!--<jetty>jetty6</jetty>-->
-                <!--<jetty>jetty7</jetty>-->
-
-                <!--<connectorSuffix></connectorSuffix>-->
-                <connectorSuffix>-1_6</connectorSuffix>
-                <connectorSpec>geronimo-j2ee-connector_1.6_spec</connectorSpec>
-                <servletSpec>geronimo-servlet_3.0_spec</servletSpec>
-                <!--<txmanagerVersion>2.1.1</txmanagerVersion>-->
-                <txmanagerVersion>2.2-SNAPSHOT</txmanagerVersion>
-            </properties>
-            <modules>
-                <module>testsupport</module>
-                <module>framework</module>
-                <module>plugins</module>
-                <module>plugingroups</module>
-                <module>assemblies</module>
-            </modules>
-        </profile>
-
     </profiles>
 
 </project>



Mime
View raw message