You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/05/22 11:35:35 UTC
svn commit: r1341374 - in /camel/trunk/components:
camel-ahc/src/test/java/org/apache/camel/component/ahc/BaseAhcTest.java
camel-jetty/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java
Author: davsclaus
Date: Tue May 22 09:35:34 2012
New Revision: 1341374
URL: http://svn.apache.org/viewvc?rev=1341374&view=rev
Log:
The port finder dont need to store in file anymore.
Modified:
camel/trunk/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/BaseAhcTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java
Modified: camel/trunk/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/BaseAhcTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/BaseAhcTest.java?rev=1341374&r1=1341373&r2=1341374&view=diff
==============================================================================
--- camel/trunk/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/BaseAhcTest.java (original)
+++ camel/trunk/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/BaseAhcTest.java Tue May 22 09:35:34 2012
@@ -16,13 +16,10 @@
*/
package org.apache.camel.component.ahc;
-import java.io.File;
-import java.io.FileOutputStream;
import java.util.Properties;
import org.apache.camel.CamelContext;
import org.apache.camel.component.properties.PropertiesComponent;
-import org.apache.camel.converter.IOConverter;
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
@@ -32,7 +29,6 @@ import org.apache.camel.util.jsse.KeySto
import org.apache.camel.util.jsse.SSLContextParameters;
import org.apache.camel.util.jsse.SSLContextServerParameters;
import org.apache.camel.util.jsse.TrustManagersParameters;
-import org.junit.AfterClass;
import org.junit.BeforeClass;
public abstract class BaseAhcTest extends CamelTestSupport {
@@ -43,34 +39,7 @@ public abstract class BaseAhcTest extend
@BeforeClass
public static void initPort() throws Exception {
- File file = new File("./target/ahcport.txt");
- file = file.getAbsoluteFile();
-
- if (!file.exists()) {
- // start from somewhere in the 24xxx range
- port = AvailablePortFinder.getNextAvailable(24000);
- } else {
- // read port number from file
- String s = IOConverter.toString(file, null);
- port = Integer.parseInt(s);
- // use next port
- port++;
- }
-
- }
-
- @AfterClass
- public static void savePort() throws Exception {
- File file = new File("./target/ahcport.txt");
- file = file.getAbsoluteFile();
-
- // save to file, do not append
- FileOutputStream fos = new FileOutputStream(file, false);
- try {
- fos.write(String.valueOf(port).getBytes());
- } finally {
- fos.close();
- }
+ port = AvailablePortFinder.getNextAvailable(24000);
}
@Override
@@ -168,7 +137,7 @@ public abstract class BaseAhcTest extend
return "ahc:" + getProtocol() + "://localhost:{{port}}/foo";
}
- protected int getNextPort() {
+ protected synchronized int getNextPort() {
port = AvailablePortFinder.getNextAvailable(port + 1);
return port;
}
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java?rev=1341374&r1=1341373&r2=1341374&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java Tue May 22 09:35:34 2012
@@ -16,17 +16,13 @@
*/
package org.apache.camel.component.jetty;
-import java.io.File;
-import java.io.FileOutputStream;
import java.util.Properties;
import org.apache.camel.CamelContext;
import org.apache.camel.component.properties.PropertiesComponent;
-import org.apache.camel.converter.IOConverter;
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.AfterClass;
import org.junit.BeforeClass;
/**
@@ -37,34 +33,8 @@ public abstract class BaseJettyTest exte
@BeforeClass
public static void initPort() throws Exception {
- File file = new File("./target/jettyport.txt");
- file = file.getAbsoluteFile();
-
- if (!file.exists()) {
- // start from somewhere in the 23xxx range
- port = AvailablePortFinder.getNextAvailable(23000);
- } else {
- // read port number from file
- String s = IOConverter.toString(file, null);
- port = Integer.parseInt(s);
- // use next port
- port++;
- }
-
- }
-
- @AfterClass
- public static void savePort() throws Exception {
- File file = new File("./target/jettyport.txt");
- file = file.getAbsoluteFile();
-
- // save to file, do not append
- FileOutputStream fos = new FileOutputStream(file, false);
- try {
- fos.write(String.valueOf(port).getBytes());
- } finally {
- fos.close();
- }
+ // start from somewhere in the 23xxx range
+ port = AvailablePortFinder.getNextAvailable(23000);
}
@Override