[MRM-290] Ability to pre-configure the Jetty port in conf/plexus.xml

Submitted by: Olivier Lamy

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@560419 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-web/archiva-standalone/archiva-plexus-application/src/conf/application.xml b/archiva-web/archiva-standalone/archiva-plexus-application/src/conf/application.xml
index 37fcd4e36dc3a4665261c641a284d4aaf1e83245..1095bb1026742d4cd9ba92af8f2f5fa7787e5194 100644 (file)
--- a/archiva-web/archiva-standalone/archiva-plexus-application/src/conf/application.xml
+++ b/archiva-web/archiva-standalone/archiva-plexus-application/src/conf/application.xml
@@ -32,7 +32,7 @@
             <standardWebappClassloader>true</standardWebappClassloader>
             <listeners>
               <http-listener>
-                <port>8080</port>
+                <port>${jetty.port}</port>
               </http-listener>
               <!--
               <proxy-http-listener>

diff --git a/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml b/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml
index 6be84f68166b4358487c227e5d030eb4c431d6f3..5fc606ef850a3be50bf4ff5184f86b5b583387f7 100644 (file)
--- a/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml
+++ b/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml
@@ -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>

diff --git a/archiva-web/archiva-standalone/archiva-plexus-runtime/src/conf/plexus.xml b/archiva-web/archiva-standalone/archiva-plexus-runtime/src/conf/plexus.xml
index 87a99722b5f7ca6b6de084cebc1deb46d36f8fc0..c09af7a82bbd8c4a80d33ff8ac10a1d9044c7809 100644 (file)
--- a/archiva-web/archiva-standalone/archiva-plexus-runtime/src/conf/plexus.xml
+++ b/archiva-web/archiva-standalone/archiva-plexus-runtime/src/conf/plexus.xml
@@ -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>