From 6626c9e3a05c34f4a14be352a126ad5dc4192d18 Mon Sep 17 00:00:00 2001 From: jsdelfino Date: Tue, 16 Sep 2008 17:16:37 +0000 Subject: Started to fix module dependencies, OSGi manifest generation and a few references to obsolete classes to get a clean build. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@695979 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/tuscany/sca/binding/gdata/collection/Collection.java | 6 +++--- .../tuscany/sca/binding/gdata/collection/MediaCollection.java | 2 +- .../sca/binding/gdata/calendarconsumer/CalendarConsumerImpl.java | 6 +++--- .../sca/binding/gdata/calendarconsumer/CalendarConsumerTest.java | 2 +- .../sca/binding/gdata/consumerprovider/CustomerCollectionImpl.java | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) (limited to 'branches/sca-equinox/modules/binding-gdata-runtime/src') diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java b/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java index 2679071ea8..3ee3b64e4d 100644 --- a/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java +++ b/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/Collection.java @@ -18,12 +18,12 @@ */ package org.apache.tuscany.sca.binding.gdata.collection; +import org.apache.tuscany.sca.data.collection.NotFoundException; +import org.osoa.sca.annotations.Remotable; + import com.google.gdata.data.BaseEntry; import com.google.gdata.data.BaseFeed; -import org.apache.tuscany.sca.implementation.data.collection.NotFoundException; -import org.osoa.sca.annotations.Remotable; - /** * Provides access to a collection of resources using Atom. * diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java b/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java index b9252d097a..cd17f48249 100644 --- a/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java +++ b/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/collection/MediaCollection.java @@ -23,7 +23,7 @@ import java.io.InputStream; import org.osoa.sca.annotations.Remotable; -import org.apache.tuscany.sca.implementation.data.collection.NotFoundException; +import org.apache.tuscany.sca.data.collection.NotFoundException; /** * Provides access to a collection of resources using Atom. diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumerImpl.java b/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumerImpl.java index 8da6977c2c..d52215b7ea 100644 --- a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumerImpl.java +++ b/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumerImpl.java @@ -37,15 +37,15 @@ public class CalendarConsumerImpl { return resourceCollection.post(entry); } - public BaseEntry get(String id) throws org.apache.tuscany.sca.implementation.data.collection.NotFoundException { + public BaseEntry get(String id) throws org.apache.tuscany.sca.data.collection.NotFoundException { return resourceCollection.get(id); } - public BaseEntry put(String id, BaseEntry entry) throws org.apache.tuscany.sca.implementation.data.collection.NotFoundException { + public BaseEntry put(String id, BaseEntry entry) throws org.apache.tuscany.sca.data.collection.NotFoundException { return resourceCollection.put(id, entry); } - public void delete(String id) throws org.apache.tuscany.sca.implementation.data.collection.NotFoundException { + public void delete(String id) throws org.apache.tuscany.sca.data.collection.NotFoundException { resourceCollection.delete(id); } diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumerTest.java b/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumerTest.java index 361b9b122d..211ae51ba2 100644 --- a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumerTest.java +++ b/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/calendarconsumer/CalendarConsumerTest.java @@ -28,7 +28,7 @@ import com.google.gdata.data.extensions.When; import java.util.logging.Level; import java.util.logging.Logger; import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.apache.tuscany.sca.implementation.data.collection.NotFoundException; +import org.apache.tuscany.sca.data.collection.NotFoundException; import org.junit.Test; import org.junit.BeforeClass; diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/consumerprovider/CustomerCollectionImpl.java b/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/consumerprovider/CustomerCollectionImpl.java index 8233d01dd9..b58bdb408f 100644 --- a/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/consumerprovider/CustomerCollectionImpl.java +++ b/branches/sca-equinox/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/consumerprovider/CustomerCollectionImpl.java @@ -31,7 +31,7 @@ import java.util.Map; import java.util.TimeZone; import java.util.UUID; import org.apache.tuscany.sca.binding.gdata.collection.Collection; -import org.apache.tuscany.sca.implementation.data.collection.NotFoundException; +import org.apache.tuscany.sca.data.collection.NotFoundException; import org.osoa.sca.annotations.Scope; @Scope("COMPOSITE") -- cgit v1.2.3