You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ol...@apache.org on 2008/08/31 14:27:11 UTC
svn commit: r690685 - in /continuum/trunk: ./
continuum-core/src/main/java/org/apache/maven/continuum/project/builder/
continuum-core/src/main/java/org/apache/maven/continuum/utils/
continuum-core/src/test/java/org/apache/maven/continuum/project/builde...
Author: olamy
Date: Sun Aug 31 05:27:10 2008
New Revision: 690685
URL: http://svn.apache.org/viewvc?rev=690685&view=rev
Log:
[CONTINUUM-1252] fix empty file in jetty bundle.
svn merge -c 690684 https://svn.apache.org/repos/asf/continuum/branches/continuum-1.2.x
Modified:
continuum/trunk/ (props changed)
continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java (props changed)
continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/ContinuumUtils.java (props changed)
continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilderTest.java (props changed)
continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/utils/ContinuumUtilsTest.java (props changed)
continuum/trunk/continuum-jetty/src/main/conf/continuum.xml
continuum/trunk/continuum-jetty/src/main/conf/jetty.xml
Propchange: continuum/trunk/
------------------------------------------------------------------------------
svn:mergeinfo = /continuum/branches/continuum-1.2.x:690684
Propchange: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java
('svn:mergeinfo' removed)
Propchange: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/ContinuumUtils.java
('svn:mergeinfo' removed)
Propchange: continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilderTest.java
('svn:mergeinfo' removed)
Propchange: continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/utils/ContinuumUtilsTest.java
('svn:mergeinfo' removed)
Modified: continuum/trunk/continuum-jetty/src/main/conf/continuum.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-jetty/src/main/conf/continuum.xml?rev=690685&r1=690684&r2=690685&view=diff
==============================================================================
--- continuum/trunk/continuum-jetty/src/main/conf/continuum.xml (original)
+++ continuum/trunk/continuum-jetty/src/main/conf/continuum.xml Sun Aug 31 05:27:10 2008
@@ -18,4 +18,4 @@
under the License.
-->
-<configuration />
+<continuum-configuration />
Modified: continuum/trunk/continuum-jetty/src/main/conf/jetty.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-jetty/src/main/conf/jetty.xml?rev=690685&r1=690684&r2=690685&view=diff
==============================================================================
--- continuum/trunk/continuum-jetty/src/main/conf/jetty.xml (original)
+++ continuum/trunk/continuum-jetty/src/main/conf/jetty.xml Sun Aug 31 05:27:10 2008
@@ -274,7 +274,7 @@
<!-- continuum configuration -->
- <!-- START SNIPPET: mail -->
+ <!-- START SNIPPET: mail -->
<New id="validation_mail" class="org.mortbay.jetty.plus.naming.Resource">
<Arg>mail/Session</Arg>
<Arg>