You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by tr...@apache.org on 2005/04/19 17:47:52 UTC

svn commit: r161909 - maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml maven/continuum/trunk/continuum-plexus-application/src/conf/application.xml

Author: trygvis
Date: Tue Apr 19 08:47:52 2005
New Revision: 161909

URL: http://svn.apache.org/viewcvs?view=rev&rev=161909
Log:
o Moving the configuration of the socket listeners to the application configuration.

Modified:
    maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml
    maven/continuum/trunk/continuum-plexus-application/src/conf/application.xml

Modified: maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml?view=diff&r1=161908&r2=161909
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml Tue Apr 19 08:47:52 2005
@@ -119,38 +119,6 @@
       </configuration>
     </component>
 
-    <!-- Connection factory  -->
-
-    <component>
-      <role>org.apache.maven.continuum.network.ConnectionFactory</role>
-      <role-hint>simple-socket-trigger-server</role-hint>
-      <implementation>org.apache.maven.continuum.network.SimpleServerSocketConnectionFactory</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.continuum.network.ConnectionConsumer</role>
-          <role-hint>simple-socket-trigger</role-hint>
-        </requirement>
-      </requirements>
-      <configuration>
-        <port>6770</port>
-      </configuration>
-    </component>
-
-    <component>
-      <role>org.apache.maven.continuum.network.ConnectionFactory</role>
-      <role-hint>url-registrar-server</role-hint>
-      <implementation>org.apache.maven.continuum.network.SimpleServerSocketConnectionFactory</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.continuum.network.ConnectionConsumer</role>
-          <role-hint>url-registrar</role-hint>
-        </requirement>
-      </requirements>
-      <configuration>
-        <port>6771</port>
-      </configuration>
-    </component>
-
     <!-- ConnectionConsumer -->
     <component>
       <role>org.apache.maven.continuum.network.ConnectionConsumer</role>

Modified: maven/continuum/trunk/continuum-plexus-application/src/conf/application.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-plexus-application/src/conf/application.xml?view=diff&r1=161908&r2=161909
==============================================================================
--- maven/continuum/trunk/continuum-plexus-application/src/conf/application.xml (original)
+++ maven/continuum/trunk/continuum-plexus-application/src/conf/application.xml Tue Apr 19 08:47:52 2005
@@ -74,9 +74,9 @@
         </requirement>
       </requirements>
       <configuration>
-        <fromMailbox></fromMailbox>
-        <fromName></fromName>
-        <timestampFormat>EEE, d MMM yyyy HH:mm:ss Z</timestampFormat>
+        <from-mailbox>@mail.override.from.mailbox@</from-mailbox>
+        <from-name>@mail.override.from.name@</from-name>
+        <timestamp-format>EEE, d MMM yyyy HH:mm:ss Z</timestamp-format>
       </configuration>
     </component>
 
@@ -89,7 +89,7 @@
         this address instead the address specified in the project
         configuration
         -->
-        <toOverride></toOverride>
+        <to-override>@mail.override.to.address@</to-override>
       </configuration>
     </component>
 
@@ -129,6 +129,36 @@
     </component>
 
     <component>
+      <role>org.apache.maven.continuum.network.ConnectionFactory</role>
+      <role-hint>simple-socket-trigger-server</role-hint>
+      <implementation>org.apache.maven.continuum.network.SimpleServerSocketConnectionFactory</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.continuum.network.ConnectionConsumer</role>
+          <role-hint>simple-socket-trigger</role-hint>
+        </requirement>
+      </requirements>
+      <configuration>
+        <port>6770</port>
+      </configuration>
+    </component>
+
+    <component>
+      <role>org.apache.maven.continuum.network.ConnectionFactory</role>
+      <role-hint>url-registrar-server</role-hint>
+      <implementation>org.apache.maven.continuum.network.SimpleServerSocketConnectionFactory</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.continuum.network.ConnectionConsumer</role>
+          <role-hint>url-registrar</role-hint>
+        </requirement>
+      </requirements>
+      <configuration>
+        <port>6771</port>
+      </configuration>
+    </component>
+
+    <component>
       <role>org.apache.maven.continuum.store.ContinuumStore</role>
       <implementation>org.apache.maven.continuum.store.ModelloJPoxContinuumStore</implementation>
       <requirements>
@@ -229,6 +259,7 @@
       </configuration>
     </component>
 
+    <!-- TODO: Move to continuum-web? -->
     <!-- forms -->
     <component>
       <role>org.codehaus.plexus.i18n.I18N</role>