servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r787622 - in /servicemix/smx3/trunk: core/servicemix-core/src/test/java/org/apache/servicemix/jbi/container/JBIContainerTest.java pom.xml
Date Tue, 23 Jun 2009 10:09:17 GMT
Author: gertv
Date: Tue Jun 23 10:09:17 2009
New Revision: 787622

URL: http://svn.apache.org/viewvc?rev=787622&view=rev
Log:
A few post-release modifications and removing a wrong unit test

Modified:
    servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/container/JBIContainerTest.java
    servicemix/smx3/trunk/pom.xml

Modified: servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/container/JBIContainerTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/container/JBIContainerTest.java?rev=787622&r1=787621&r2=787622&view=diff
==============================================================================
--- servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/container/JBIContainerTest.java
(original)
+++ servicemix/smx3/trunk/core/servicemix-core/src/test/java/org/apache/servicemix/jbi/container/JBIContainerTest.java
Tue Jun 23 10:09:17 2009
@@ -19,12 +19,10 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.jbi.JBIException;
-import javax.xml.namespace.QName;
 
 import junit.framework.TestCase;
 
 import org.apache.servicemix.jbi.framework.Registry;
-import org.apache.servicemix.tck.ReceiverComponent;
 
 /**
  * Test cases for {@link JBIContainer}
@@ -68,35 +66,4 @@
                    System.currentTimeMillis() - start < SHUTDOWN_DELAY);
     }
     
-    public void testForceShutdownWithPendingSyncExchanges() throws Exception {
-        final JBIContainer container = new JBIContainer();
-        container.setForceShutdown(FORCE_SHUTDOWN_DELAY);
-        container.init();
-        container.start();
-
-        ActivationSpec spec = new ActivationSpec("receiver", new ReceiverComponent() {
-            public void stop() throws JBIException {
-                try {
-                    // this component will now wait before shutting down
-                    // (i.e. simulate component waiting for pending exchanges or a process
to end)
-                    Thread.sleep(SHUTDOWN_DELAY);
-                } catch (InterruptedException e) {
-                    // TODO Auto-generated catch block
-                    e.printStackTrace();
-                }
-                super.stop();
-            }
-        });
-        spec.setService(new QName("urn:test", "receiver"));
-        container.activateComponent(spec);
-        
-        long start = System.currentTimeMillis();
-        
-        // now let's shutdown the container and await the termination
-        container.shutDown();
-        long delay = System.currentTimeMillis() - start;
-        assertTrue("Should have taken less than " + delay  + "ms (estimated ca. " + FORCE_SHUTDOWN_DELAY
+ "ms)",
-                   delay < SHUTDOWN_DELAY);
-    }
-    
 }

Modified: servicemix/smx3/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx3/trunk/pom.xml?rev=787622&r1=787621&r2=787622&view=diff
==============================================================================
--- servicemix/smx3/trunk/pom.xml (original)
+++ servicemix/smx3/trunk/pom.xml Tue Jun 23 10:09:17 2009
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix</groupId>
         <artifactId>servicemix-pom</artifactId>
-        <version>3-SNAPSHOT</version>
+        <version>3</version>
     </parent>
 
     <groupId>org.apache.servicemix</groupId>
@@ -91,7 +91,7 @@
         <jencks-version>2.1</jencks-version>
         <jetty-version>6.1.14</jetty-version>
         <geronimo-version>2.0.2</geronimo-version>
-        <servicemix-version>3.3.1-SNAPSHOT</servicemix-version>
+        <servicemix-version>3.3.2-SNAPSHOT</servicemix-version>
         <wsdl4j-version>1.6.2</wsdl4j-version>
         <commons-beanutils-version>1.7.0</commons-beanutils-version>
         <commons-fileupload-version>1.1.1</commons-fileupload-version>
@@ -106,7 +106,7 @@
         <jaxb.xjc.version>2.1.6</jaxb.xjc.version>
         <derby-version>10.2.2.0</derby-version>
         <saxon-version>8.9</saxon-version>
-        <previous.releases>3.1.2,3.2,3.2.1</previous.releases>
+        <previous.releases>3.1.2,3.2,3.2.1,3.2.2,3.2.3,3.3,3.3.1</previous.releases>
     </properties>
 
     <!-- TODO: remove after the release of the new ServiceMix parent POM -->



Mime
View raw message