From 6c51c6d6f32b9972ed825f1444309212f9d99a21 Mon Sep 17 00:00:00 2001 From: rfeng Date: Tue, 9 Feb 2010 21:20:45 +0000 Subject: Start to clean up the node-api (remove Node.destroy()) git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@908233 13f79535-47bb-0310-9956-ffa450edef68 --- .../tuscany/sca/binding/atom/AbstractProviderConsumerTestCase.java | 2 -- .../org/apache/tuscany/sca/binding/atom/AtomFeedNonCollectionTest.java | 2 -- .../src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java | 1 - .../org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java | 1 - .../org/apache/tuscany/sca/binding/atom/MediaCollectionTestCase.java | 1 - .../src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java | 1 - .../tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java | 1 - .../apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java | 1 - .../apache/tuscany/sca/binding/atom/aggregator/AggregatorTestCase.java | 1 - .../org/apache/tuscany/sca/binding/atom/news/NewsServiceTestCase.java | 1 - 10 files changed, 12 deletions(-) (limited to 'sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org') diff --git a/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AbstractProviderConsumerTestCase.java b/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AbstractProviderConsumerTestCase.java index 19c100483c..77c2562c0f 100644 --- a/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AbstractProviderConsumerTestCase.java +++ b/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AbstractProviderConsumerTestCase.java @@ -45,11 +45,9 @@ public abstract class AbstractProviderConsumerTestCase { protected static void destroyTestEnvironment() throws Exception { if (scaConsumerNode != null) { scaConsumerNode.stop(); - scaConsumerNode.destroy(); } if (scaProviderNode != null) { scaProviderNode.stop(); - scaProviderNode.destroy(); } } } diff --git a/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomFeedNonCollectionTest.java b/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomFeedNonCollectionTest.java index da7683d84a..9c0ad5a26a 100644 --- a/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomFeedNonCollectionTest.java +++ b/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/AtomFeedNonCollectionTest.java @@ -99,11 +99,9 @@ public class AtomFeedNonCollectionTest { public static void destroy() throws Exception { if (scaConsumerNode != null) { scaConsumerNode.stop(); - scaConsumerNode.destroy(); } if (scaProviderNode != null) { scaProviderNode.stop(); - scaProviderNode.destroy(); } } diff --git a/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java b/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java index e93c1aeea6..e6fa67883a 100644 --- a/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java +++ b/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Consumer.java @@ -39,6 +39,5 @@ public class Consumer { testService.testCustomerCollection(); node.stop(); - node.destroy(); } } diff --git a/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java b/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java index b707c71d2b..32b2a286b8 100644 --- a/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java +++ b/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ContentNegotiationTest.java @@ -85,7 +85,6 @@ public class ContentNegotiationTest { //System.out.println(">>>ContentNegotiationTest.destroy"); if (scaProviderNode != null) { scaProviderNode.stop(); - scaProviderNode.destroy(); } } diff --git a/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionTestCase.java b/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionTestCase.java index 2870002c66..6d4a173d30 100644 --- a/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionTestCase.java +++ b/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/MediaCollectionTestCase.java @@ -90,7 +90,6 @@ public class MediaCollectionTestCase { System.out.println(">>>MediaCollectionTestCase.destroy"); if (scaProviderNode != null) { scaProviderNode.stop(); - scaProviderNode.destroy(); } } diff --git a/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java b/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java index f802d3891f..e2759235b0 100644 --- a/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java +++ b/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/Provider.java @@ -45,6 +45,5 @@ public class Provider { } node.stop(); - node.destroy(); } } diff --git a/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java b/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java index 534c2c901f..6dbb15f6b9 100644 --- a/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java +++ b/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderEntryEntityTagsTestCase.java @@ -81,7 +81,6 @@ public class ProviderEntryEntityTagsTestCase { //System.out.println(">>>ProviderEntryEntityTagsTestCase.destroy"); if (scaProviderNode != null) { scaProviderNode.stop(); - scaProviderNode.destroy(); } } diff --git a/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java b/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java index b091045b8c..34131f6195 100644 --- a/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java +++ b/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java @@ -87,7 +87,6 @@ public class ProviderFeedEntityTagsTestCase { //System.out.println(">>>ProviderFeedEntityTagsTestCase.destroy"); if (scaProviderNode != null) { scaProviderNode.stop(); - scaProviderNode.destroy(); } } diff --git a/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorTestCase.java b/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorTestCase.java index 98e4e0ee48..45d4c94768 100644 --- a/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorTestCase.java +++ b/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorTestCase.java @@ -60,7 +60,6 @@ public class AggregatorTestCase { public static void destroy() throws Exception { if(node != null) { node.stop(); - node.destroy(); } } diff --git a/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsServiceTestCase.java b/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsServiceTestCase.java index 5b9e0848a0..b19f477912 100644 --- a/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsServiceTestCase.java +++ b/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsServiceTestCase.java @@ -54,7 +54,6 @@ public class NewsServiceTestCase { public static void destroy() throws Exception { if(node != null) { node.stop(); - node.destroy(); } } -- cgit v1.2.3