Index: BUILD.txt
===================================================================
--- BUILD.txt	(Revision 5834)
+++ BUILD.txt	(Revision 5835)
@@ -13,3 +13,9 @@
 
 For just building without running junit tests:
 $ mvn clean package -DskipTests=true
+
+Some tests have been disabled by default (*TestLive.java) because they
+are not reliable enough for continuous integration testing. To run the
+full set of tests, do:
+$ mvn clean install -Plivetests
+
Index: karaf/integration/src/test/java/org/apache/james/karaf/features/MailetContainerLiveTest.java
===================================================================
--- karaf/integration/src/test/java/org/apache/james/karaf/features/MailetContainerLiveTest.java	(Revision 5834)
+++ karaf/integration/src/test/java/org/apache/james/karaf/features/MailetContainerLiveTest.java	(Revision 5835)
@@ -1,21 +0,0 @@
-package org.apache.james.karaf.features;
-
-import org.apache.james.mailetcontainer.api.MailProcessor;
-import org.apache.james.mailetcontainer.api.jmx.MailSpoolerMBean;
-import org.apache.mailet.MailetContext;
-import org.junit.Test;
-
-public class MailetContainerLiveTest extends KarafLiveTestSupport {
-
-    @Test
-    public void testInstallMailetContainerFeature() throws Exception {
-        addJamesFeaturesRepository();
-        String mailetContainerFeature = "james-server-mailet-container-camel";
-        features.installFeature(mailetContainerFeature);
-        assertInstalled(mailetContainerFeature);
-        assertBundlesAreActive();
-        assertOSGiServiceStartsIn(MailetContext.class, WAIT_30_SECONDS);
-        assertOSGiServiceStartsIn(MailProcessor.class, WAIT_30_SECONDS);
-        assertOSGiServiceStartsIn(MailSpoolerMBean.class, WAIT_30_SECONDS);
-    }
-}
Index: karaf/integration/src/test/java/org/apache/james/karaf/features/CommonsConfigurationLiveTest.java
===================================================================
--- karaf/integration/src/test/java/org/apache/james/karaf/features/CommonsConfigurationLiveTest.java	(Revision 5834)
+++ karaf/integration/src/test/java/org/apache/james/karaf/features/CommonsConfigurationLiveTest.java	(Revision 5835)
@@ -1,14 +0,0 @@
-package org.apache.james.karaf.features;
-
-import org.junit.Test;
-
-public class CommonsConfigurationLiveTest extends KarafLiveTestSupport {
-
-    @Test
-    public void testInstallCommonsConfigurationFeature() throws Exception {
-        addJamesFeaturesRepository();
-        features.installFeature("commons-configuration");
-        assertInstalled("commons-configuration");
-        assertBundlesAreActive();
-    }
-}
Index: karaf/integration/src/test/java/org/apache/james/karaf/features/DnsServiceLiveTest.java
===================================================================
--- karaf/integration/src/test/java/org/apache/james/karaf/features/DnsServiceLiveTest.java	(Revision 5834)
+++ karaf/integration/src/test/java/org/apache/james/karaf/features/DnsServiceLiveTest.java	(Revision 5835)
@@ -1,16 +0,0 @@
-package org.apache.james.karaf.features;
-
-import org.apache.james.dnsservice.api.DNSService;
-import org.junit.Test;
-
-public class DnsServiceLiveTest extends KarafLiveTestSupport {
-
-    @Test
-    public void testInstallJamesDnsServiceDnsJava() throws Exception {
-        addJamesFeaturesRepository();
-        features.installFeature("james-server-dnsservice-dnsjava");
-        assertInstalled("james-server-dnsservice-dnsjava");
-        assertBundlesAreActive();
-        assertOSGiServiceStartsIn(DNSService.class, WAIT_30_SECONDS);
-    }
-}
Index: karaf/integration/src/test/java/org/apache/james/karaf/features/Mime4jLiveTest.java
===================================================================
--- karaf/integration/src/test/java/org/apache/james/karaf/features/Mime4jLiveTest.java	(Revision 5834)
+++ karaf/integration/src/test/java/org/apache/james/karaf/features/Mime4jLiveTest.java	(Revision 5835)
@@ -1,14 +0,0 @@
-package org.apache.james.karaf.features;
-
-import org.junit.Test;
-
-public class Mime4jLiveTest extends KarafLiveTestSupport{
-
-    @Test
-    public void testInstallApacheMime4jFeature() throws Exception {
-        addJamesFeaturesRepository();
-        features.installFeature("apache-james-mime4j");
-        assertInstalled("apache-james-mime4j");
-        assertBundlesAreActive();
-    }
-}
Index: karaf/integration/src/test/java/org/apache/james/karaf/features/FetchMailLiveTest.java
===================================================================
--- karaf/integration/src/test/java/org/apache/james/karaf/features/FetchMailLiveTest.java	(Revision 5834)
+++ karaf/integration/src/test/java/org/apache/james/karaf/features/FetchMailLiveTest.java	(Revision 5835)
@@ -1,15 +0,0 @@
-package org.apache.james.karaf.features;
-
-import org.apache.james.fetchmail.FetchScheduler;
-import org.junit.Test;
-
-public class FetchMailLiveTest extends KarafLiveTestSupport {
-    @Test
-    public void testInstallJamesFetchMailFeature() throws Exception {
-        addJamesFeaturesRepository();
-        features.installFeature("james-server-fetchmail");
-        assertInstalled("james-server-fetchmail");
-        assertBundlesAreActive();
-        assertOSGiServiceStartsIn(FetchScheduler.class, WAIT_30_SECONDS);
-    }
-}
Index: karaf/integration/src/test/java/org/apache/james/karaf/features/DnsServiceTestLive.java
===================================================================
--- karaf/integration/src/test/java/org/apache/james/karaf/features/DnsServiceTestLive.java	(Revision 0)
+++ karaf/integration/src/test/java/org/apache/james/karaf/features/DnsServiceTestLive.java	(Revision 5835)
@@ -0,0 +1,16 @@
+package org.apache.james.karaf.features;
+
+import org.apache.james.dnsservice.api.DNSService;
+import org.junit.Test;
+
+public class DnsServiceTestLive extends KarafLiveTestSupport {
+
+    @Test
+    public void testInstallJamesDnsServiceDnsJava() throws Exception {
+        addJamesFeaturesRepository();
+        features.installFeature("james-server-dnsservice-dnsjava");
+        assertInstalled("james-server-dnsservice-dnsjava");
+        assertBundlesAreActive();
+        assertOSGiServiceStartsIn(DNSService.class, WAIT_30_SECONDS);
+    }
+}
Index: karaf/integration/src/test/java/org/apache/james/karaf/features/Mime4jTestLive.java
===================================================================
--- karaf/integration/src/test/java/org/apache/james/karaf/features/Mime4jTestLive.java	(Revision 0)
+++ karaf/integration/src/test/java/org/apache/james/karaf/features/Mime4jTestLive.java	(Revision 5835)
@@ -0,0 +1,14 @@
+package org.apache.james.karaf.features;
+
+import org.junit.Test;
+
+public class Mime4jTestLive extends KarafLiveTestSupport{
+
+    @Test
+    public void testInstallApacheMime4jFeature() throws Exception {
+        addJamesFeaturesRepository();
+        features.installFeature("apache-james-mime4j");
+        assertInstalled("apache-james-mime4j");
+        assertBundlesAreActive();
+    }
+}
Index: karaf/integration/src/test/java/org/apache/james/karaf/features/FetchMailTestLive.java
===================================================================
--- karaf/integration/src/test/java/org/apache/james/karaf/features/FetchMailTestLive.java	(Revision 0)
+++ karaf/integration/src/test/java/org/apache/james/karaf/features/FetchMailTestLive.java	(Revision 5835)
@@ -0,0 +1,15 @@
+package org.apache.james.karaf.features;
+
+import org.apache.james.fetchmail.FetchScheduler;
+import org.junit.Test;
+
+public class FetchMailTestLive extends KarafLiveTestSupport {
+    @Test
+    public void testInstallJamesFetchMailFeature() throws Exception {
+        addJamesFeaturesRepository();
+        features.installFeature("james-server-fetchmail");
+        assertInstalled("james-server-fetchmail");
+        assertBundlesAreActive();
+        assertOSGiServiceStartsIn(FetchScheduler.class, WAIT_30_SECONDS);
+    }
+}
Index: karaf/integration/src/test/java/org/apache/james/karaf/features/MailetContainerTestLive.java
===================================================================
--- karaf/integration/src/test/java/org/apache/james/karaf/features/MailetContainerTestLive.java	(Revision 0)
+++ karaf/integration/src/test/java/org/apache/james/karaf/features/MailetContainerTestLive.java	(Revision 5835)
@@ -0,0 +1,21 @@
+package org.apache.james.karaf.features;
+
+import org.apache.james.mailetcontainer.api.MailProcessor;
+import org.apache.james.mailetcontainer.api.jmx.MailSpoolerMBean;
+import org.apache.mailet.MailetContext;
+import org.junit.Test;
+
+public class MailetContainerTestLive extends KarafLiveTestSupport {
+
+    @Test
+    public void testInstallMailetContainerFeature() throws Exception {
+        addJamesFeaturesRepository();
+        String mailetContainerFeature = "james-server-mailet-container-camel";
+        features.installFeature(mailetContainerFeature);
+        assertInstalled(mailetContainerFeature);
+        assertBundlesAreActive();
+        assertOSGiServiceStartsIn(MailetContext.class, WAIT_30_SECONDS);
+        assertOSGiServiceStartsIn(MailProcessor.class, WAIT_30_SECONDS);
+        assertOSGiServiceStartsIn(MailSpoolerMBean.class, WAIT_30_SECONDS);
+    }
+}
Index: karaf/integration/src/test/java/org/apache/james/karaf/features/CommonsConfigurationTestLive.java
===================================================================
--- karaf/integration/src/test/java/org/apache/james/karaf/features/CommonsConfigurationTestLive.java	(Revision 0)
+++ karaf/integration/src/test/java/org/apache/james/karaf/features/CommonsConfigurationTestLive.java	(Revision 5835)
@@ -0,0 +1,14 @@
+package org.apache.james.karaf.features;
+
+import org.junit.Test;
+
+public class CommonsConfigurationTestLive extends KarafLiveTestSupport {
+
+    @Test
+    public void testInstallCommonsConfigurationFeature() throws Exception {
+        addJamesFeaturesRepository();
+        features.installFeature("commons-configuration");
+        assertInstalled("commons-configuration");
+        assertBundlesAreActive();
+    }
+}

Eigenschaftsänderungen: karaf/integration
___________________________________________________________________
Geändert: svn:ignore
   - target

   + target
.pom.xml.swp


Index: pom.xml
===================================================================
--- pom.xml	(Revision 5834)
+++ pom.xml	(Revision 5835)
@@ -1529,5 +1529,23 @@
                 <javax.mail.artifactId>mail</javax.mail.artifactId>
             </properties>
         </profile>
+        <profile>
+            <!-- run live tests, ie. ones that do not run stably enough in
+            a CI environment (for example, karaf integration tests accessing external network
+            resources) -->
+            <id>livetests</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <includes>
+                                <include>**/*TestLive.java</include>
+                            </includes>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 </project>

Eigenschaftsänderungen: .
___________________________________________________________________
Geändert: svn:ignore
   - target

   + target
.BUILD.txt.swp
.README.txt.swp
.README.crypto.swp