From continuum-commits-return-48-apmail-maven-continuum-commits-archive=maven.apache.org@maven.apache.org Tue Apr 19 15:48:14 2005
Return-Path: <continuum-commits-return-48-apmail-maven-continuum-commits-archive=maven.apache.org@maven.apache.org>
Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org
Received: (qmail 3651 invoked from network); 19 Apr 2005 15:48:14 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 19 Apr 2005 15:48:14 -0000
Received: (qmail 87896 invoked by uid 500); 19 Apr 2005 15:47:57 -0000
Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org
Received: (qmail 87872 invoked by uid 500); 19 Apr 2005 15:47:57 -0000
Mailing-List: contact continuum-commits-help@maven.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:continuum-commits-help@maven.apache.org>
List-Unsubscribe: <mailto:continuum-commits-unsubscribe@maven.apache.org>
List-Post: <mailto:continuum-commits@maven.apache.org>
List-Id: <continuum-commits.maven.apache.org>
Reply-To: continuum-dev@maven.apache.org
Delivered-To: mailing list continuum-commits@maven.apache.org
Received: (qmail 87811 invoked by uid 99); 19 Apr 2005 15:47:56 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Tue, 19 Apr 2005 08:47:54 -0700
Received: (qmail 3537 invoked by uid 65534); 19 Apr 2005 15:47:52 -0000
Message-ID: <20050419154752.3536.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Mailer: svnmailer-1.0.0-dev
Date: Tue, 19 Apr 2005 15:47:52 -0000
Subject: 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
To: continuum-commits@maven.apache.org
From: trygvis@apache.org
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

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

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

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=3Ddiff&r1=3D161908&r2=
=3D161909
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- 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>
=20
-    <!-- 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.SimpleServerSocke=
tConnectionFactory</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.continuum.network.ConnectionConsumer</rol=
e>
-          <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.SimpleServerSocke=
tConnectionFactory</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.continuum.network.ConnectionConsumer</rol=
e>
-          <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/appli=
cation.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-plexus-a=
pplication/src/conf/application.xml?view=3Ddiff&r1=3D161908&r2=3D161909
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- 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>
=20
@@ -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>
=20
@@ -129,6 +129,36 @@
     </component>
=20
     <component>
+      <role>org.apache.maven.continuum.network.ConnectionFactory</role>
+      <role-hint>simple-socket-trigger-server</role-hint>
+      <implementation>org.apache.maven.continuum.network.SimpleServerSocke=
tConnectionFactory</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.continuum.network.ConnectionConsumer</rol=
e>
+          <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.SimpleServerSocke=
tConnectionFactory</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.continuum.network.ConnectionConsumer</rol=
e>
+          <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.ModelloJPoxContinuu=
mStore</implementation>
       <requirements>
@@ -229,6 +259,7 @@
       </configuration>
     </component>
=20
+    <!-- TODO: Move to continuum-web? -->
     <!-- forms -->
     <component>
       <role>org.codehaus.plexus.i18n.I18N</role>