summaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorwjaniszewski <wjaniszewski@13f79535-47bb-0310-9956-ffa450edef68>2008-08-06 17:06:39 +0000
committerwjaniszewski <wjaniszewski@13f79535-47bb-0310-9956-ffa450edef68>2008-08-06 17:06:39 +0000
commit70589e54de3f16a711c47a971676b65f0a6c5ed1 (patch)
tree99bfd6ba785a87b5baa0088b405be0f88d2deb4e /java
parent7bab9ed0b8e12bb0262f7f64967530bc84124a86 (diff)
renaming due to JIRA TUSCANY-2468, JSE CORBA host tests enabled back to see what happen (JIRA TUSCANY-2526)
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@683329 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
-rw-r--r--java/sca/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/CorbaRuntimeModuleActivator.java (renamed from java/sca/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jdk/CorbaRuntimeModuleActivator.java)2
-rw-r--r--java/sca/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/DefaultCorbaHost.java (renamed from java/sca/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jdk/DefaultCorbaHost.java)2
-rw-r--r--java/sca/modules/host-corba-jse/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator2
-rw-r--r--java/sca/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java (renamed from java/sca/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCaseFIXME.java)6
4 files changed, 7 insertions, 5 deletions
diff --git a/java/sca/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jdk/CorbaRuntimeModuleActivator.java b/java/sca/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/CorbaRuntimeModuleActivator.java
index 1bf86ccec9..4194e733a4 100644
--- a/java/sca/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jdk/CorbaRuntimeModuleActivator.java
+++ b/java/sca/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/CorbaRuntimeModuleActivator.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.sca.host.corba.jdk;
+package org.apache.tuscany.sca.host.corba.jse;
import java.util.logging.Logger;
diff --git a/java/sca/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jdk/DefaultCorbaHost.java b/java/sca/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/DefaultCorbaHost.java
index fc7889f5e9..14ef2eb908 100644
--- a/java/sca/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jdk/DefaultCorbaHost.java
+++ b/java/sca/modules/host-corba-jse/src/main/java/org/apache/tuscany/sca/host/corba/jse/DefaultCorbaHost.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.tuscany.sca.host.corba.jdk;
+package org.apache.tuscany.sca.host.corba.jse;
import java.util.Map;
import java.util.Properties;
diff --git a/java/sca/modules/host-corba-jse/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/java/sca/modules/host-corba-jse/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 7bd1cf7d40..a96baed33e 100644
--- a/java/sca/modules/host-corba-jse/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/java/sca/modules/host-corba-jse/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-org.apache.tuscany.sca.host.corba.jdk.CorbaRuntimeModuleActivator \ No newline at end of file
+org.apache.tuscany.sca.host.corba.jse.CorbaRuntimeModuleActivator \ No newline at end of file
diff --git a/java/sca/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCaseFIXME.java b/java/sca/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java
index e4548ce021..6b98f1c949 100644
--- a/java/sca/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCaseFIXME.java
+++ b/java/sca/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java
@@ -30,7 +30,7 @@ import java.net.SocketException;
import org.apache.tuscany.sca.host.corba.CorbaHost;
import org.apache.tuscany.sca.host.corba.CorbaHostException;
import org.apache.tuscany.sca.host.corba.CorbaHostUtils;
-import org.apache.tuscany.sca.host.corba.jdk.DefaultCorbaHost;
+import org.apache.tuscany.sca.host.corba.jse.DefaultCorbaHost;
import org.apache.tuscany.sca.host.corba.naming.TransientNameServer;
import org.apache.tuscany.sca.host.corba.naming.TransientNameService;
import org.apache.tuscany.sca.host.corba.testing.general.TestInterface;
@@ -44,7 +44,7 @@ import org.junit.Test;
/**
* General tests
*/
-public class DefaultCorbaHostTestCaseFIXME {
+public class DefaultCorbaHostTestCase {
private static final String LOCALHOST = "localhost";
private static final int DEFAULT_PORT = 11100; // 1050;
@@ -257,6 +257,7 @@ public class DefaultCorbaHostTestCaseFIXME {
host.createLocalNameServer(testPort);
host.createLocalNameServer(testPort);
host.createLocalNameServer(testPort);
+ Thread.sleep(1000);
// make test connection to name server
Socket socket = new Socket("localhost", testPort);
socket.close();
@@ -267,6 +268,7 @@ public class DefaultCorbaHostTestCaseFIXME {
socket = new Socket("localhost", testPort);
socket.close();
host.releaseLocalNameServer(testPort);
+ Thread.sleep(1000);
} catch (Exception e) {
e.printStackTrace();
fail();