Author: brett
Date: Fri Jul 27 16:13:16 2007
New Revision: 560419
URL: http://svn.apache.org/viewvc?view=rev&rev=560419
Log:
[MRM-290] Ability to pre-configure the Jetty port in conf/plexus.xml
Submitted by: Olivier Lamy
Modified:
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-plexus-application/src/conf/application.xml
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-plexus-runtime/src/conf/plexus.xml
Modified:
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-plexus-application/src/conf/application.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-standalone/archiva-plexus-application/src/conf/application.xml?view=diff&rev=560419&r1=560418&r2=560419
==============================================================================
---
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-plexus-application/src/conf/application.xml
(original)
+++
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-plexus-application/src/conf/application.xml
Fri Jul 27 16:13:16 2007
@@ -32,7 +32,7 @@
<standardWebappClassloader>true</standardWebappClassloader>
<listeners>
<http-listener>
- <port>8080</port>
+ <port>${jetty.port}</port>
</http-listener>
<!--
<proxy-http-listener>
Modified:
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml?view=diff&rev=560419&r1=560418&r2=560419
==============================================================================
---
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml
(original)
+++
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml
Fri Jul 27 16:13:16 2007
@@ -87,6 +87,11 @@
<artifactId>mail</artifactId>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-contextualizer</artifactId>
+ <version>1.0-alpha-1</version>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -123,6 +128,7 @@
<additionalCoreArtifact>directory-naming:naming-config</additionalCoreArtifact>
<additionalCoreArtifact>javax.mail:mail</additionalCoreArtifact>
<additionalCoreArtifact>javax.activation:activation</additionalCoreArtifact>
+
<additionalCoreArtifact>org.codehaus.plexus:plexus-contextualizer</additionalCoreArtifact>
</additionalCoreArtifacts>
</configuration>
</plugin>
Modified:
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-plexus-runtime/src/conf/plexus.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-standalone/archiva-plexus-runtime/src/conf/plexus.xml?view=diff&rev=560419&r1=560418&r2=560419
==============================================================================
---
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-plexus-runtime/src/conf/plexus.xml
(original)
+++
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-plexus-runtime/src/conf/plexus.xml
Fri Jul 27 16:13:16 2007
@@ -24,6 +24,10 @@
<role>org.codehaus.plexus.naming.Naming</role>
<role-hint>dataSources</role-hint>
</component>
+ <component>
+ <role>org.codehaus.plexus.contextualizer.Contextualizer</role>
+ <role-hint>jettyConfiguration</role-hint>
+ </component>s
</load-on-start>
<components>
<component>
@@ -108,6 +112,16 @@
</resources>
</configuration>
</component>
+ <component>
+ <role>org.codehaus.plexus.contextualizer.Contextualizer</role>
+ <role-hint>jettyConfiguration</role-hint>
+
<implementation>org.codehaus.plexus.contextualizer.DefaultContextualizer</implementation>
+ <configuration>
+ <contextValues>
+ <jetty.port>8080</jetty.port>
+ </contextValues>
+ </configuration>
+ </component>
</components>
</plexus>
