diff options
Diffstat (limited to '')
-rw-r--r-- | branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Aggregator.java (renamed from branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/data/collection/Aggregator.java) | 4 | ||||
-rw-r--r-- | branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorImpl.java (renamed from branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/data/collection/AggregatorImpl.java) | 2 | ||||
-rw-r--r-- | branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorTestCase.java (renamed from branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/data/collection/AggregatorTestCase.java) | 7 | ||||
-rw-r--r-- | branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Sort.java (renamed from branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/data/collection/Sort.java) | 2 | ||||
-rw-r--r-- | branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/SortImpl.java (renamed from branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/data/collection/SortImpl.java) | 2 |
5 files changed, 11 insertions, 6 deletions
diff --git a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/data/collection/Aggregator.java b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Aggregator.java index c07cf0091e..213ae53527 100644 --- a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/data/collection/Aggregator.java +++ b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Aggregator.java @@ -17,8 +17,10 @@ * under the License. */ -package org.apache.tuscany.sca.data.collection; +package org.apache.tuscany.sca.binding.atom.aggregator; +import org.apache.tuscany.sca.data.collection.Collection; +import org.apache.tuscany.sca.data.collection.Item; import org.osoa.sca.annotations.Remotable; @Remotable diff --git a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/data/collection/AggregatorImpl.java b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorImpl.java index 4e61db9a63..4037babd13 100644 --- a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/data/collection/AggregatorImpl.java +++ b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorImpl.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.tuscany.sca.data.collection; +package org.apache.tuscany.sca.binding.atom.aggregator; import java.util.ArrayList; import java.util.List; diff --git a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/data/collection/AggregatorTestCase.java b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorTestCase.java index 49f1207f31..547bfe058a 100644 --- a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/data/collection/AggregatorTestCase.java +++ b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/AggregatorTestCase.java @@ -17,10 +17,12 @@ * under the License. */ -package org.apache.tuscany.sca.data.collection; +package org.apache.tuscany.sca.binding.atom.aggregator; import java.net.Socket; +import org.apache.tuscany.sca.data.collection.Entry; +import org.apache.tuscany.sca.data.collection.Item; import org.apache.tuscany.sca.host.embedded.SCADomain; import org.junit.AfterClass; import org.junit.Assert; @@ -35,7 +37,7 @@ public class AggregatorTestCase { @BeforeClass public static void init() throws Exception { - domain = SCADomain.newInstance("org/apache/tuscany/sca/data/collection/FeedAggregator.composite"); + domain = SCADomain.newInstance("org/apache/tuscany/sca/binding/atom/aggregator/FeedAggregator.composite"); Assert.assertNotNull(domain); aggregatorService = domain.getService(Aggregator.class, "AtomAggregator"); Assert.assertNotNull(aggregatorService); @@ -54,6 +56,7 @@ public class AggregatorTestCase { } @Ignore("TUSCANY-2939") + //@Test public void testAggregator() throws Exception { Entry<String, Item>[] entries = aggregatorService.getAll(); diff --git a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/data/collection/Sort.java b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Sort.java index b4f4ebe640..8b22dd3efa 100644 --- a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/data/collection/Sort.java +++ b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/Sort.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.sca.data.collection;
+package org.apache.tuscany.sca.binding.atom.aggregator;
import java.util.List;
diff --git a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/data/collection/SortImpl.java b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/SortImpl.java index 7e270211bc..8745683f6e 100644 --- a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/data/collection/SortImpl.java +++ b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/aggregator/SortImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.sca.data.collection;
+package org.apache.tuscany.sca.binding.atom.aggregator;
import java.util.Arrays;
import java.util.Comparator;
|