You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2009/10/13 15:03:29 UTC
svn commit: r824733 - in /geronimo/server/branches/2.2:
plugins/jetty7/pom.xml plugins/pom.xml pom.xml
Author: dwoods
Date: Tue Oct 13 13:03:29 2009
New Revision: 824733
URL: http://svn.apache.org/viewvc?rev=824733&view=rev
Log:
amq and jetty7 have been released and are on the mirror repos, so remove the staging repos. also, stop building the old jetty6 modules.
Modified:
geronimo/server/branches/2.2/plugins/jetty7/pom.xml
geronimo/server/branches/2.2/plugins/pom.xml
geronimo/server/branches/2.2/pom.xml
Modified: geronimo/server/branches/2.2/plugins/jetty7/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/jetty7/pom.xml?rev=824733&r1=824732&r2=824733&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/jetty7/pom.xml (original)
+++ geronimo/server/branches/2.2/plugins/jetty7/pom.xml Tue Oct 13 13:03:29 2009
@@ -115,19 +115,4 @@
<module>jetty7-clustering-wadi</module>
</modules>
- <repositories>
- <repository>
- <id>jetty.oss.sonatype.org</id>
- <name>Jetty Repository</name>
- <layout>default</layout>
- <url>http://oss.sonatype.org/content/repositories/jetty/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories>
-
</project>
Modified: geronimo/server/branches/2.2/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/pom.xml?rev=824733&r1=824732&r2=824733&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/pom.xml (original)
+++ geronimo/server/branches/2.2/plugins/pom.xml Tue Oct 13 13:03:29 2009
@@ -93,30 +93,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/branches/2.2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/pom.xml?rev=824733&r1=824732&r2=824733&view=diff
==============================================================================
--- geronimo/server/branches/2.2/pom.xml (original)
+++ geronimo/server/branches/2.2/pom.xml Tue Oct 13 13:03:29 2009
@@ -83,8 +83,6 @@
<springVersion>2.5.6</springVersion>
<openjpaVersion>1.2.1</openjpaVersion>
<xbeanVersion>3.6</xbeanVersion>
- <!-- switch using -Pee6 -->
- <!--<jetty>jetty6</jetty>-->
<jetty>jetty7</jetty>
<connectorSuffix />
@@ -2061,7 +2059,7 @@
<id>morememory</id>
<options>
<option>-Xmx512m</option>
- <option>-XX:MaxPermSize=128m</option>
+ <option>-XX:MaxPermSize=256m</option>
</options>
</optionSet>
@@ -2114,36 +2112,6 @@
</site>
</distributionManagement>
- <!--
- Temporary staging repos go here
- -->
- <repositories>
- <repository>
- <id>amq-staging</id>
- <url>https://repository.apache.org/content/repositories/releases/</url>
- <releases>
- <checksumPolicy>fail</checksumPolicy>
- <enabled>true</enabled>
- <updatePolicy>always</updatePolicy>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>jetty-staging</id>
- <url>http://oss.sonatype.org/content/repositories/jetty-with-staging/</url>
- <releases>
- <checksumPolicy>fail</checksumPolicy>
- <enabled>true</enabled>
- <updatePolicy>always</updatePolicy>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-
<pluginRepositories>
<!-- required for clean build unless you want to bootstrap the car-maven-plugin -->
<pluginRepository>