You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2008/06/07 07:20:08 UTC
svn commit: r664283 [1/2] - in /incubator/tuscany/java/sca: demos/bigbank/
demos/bigbank/src/main/java/bigbank/account/feed/ distribution/bundle/
itest/osgi-tuscany/tuscany-extensions/ modules/
modules/binding-atom-abdera/ modules/binding-atom-abdera/s...
Author: jsdelfino
Date: Fri Jun 6 22:20:05 2008
New Revision: 664283
URL: http://svn.apache.org/viewvc?rev=664283&view=rev
Log:
Renamed implementation-data-api to data-api.
Added:
incubator/tuscany/java/sca/modules/data-api/
incubator/tuscany/java/sca/modules/data-api/DISCLAIMER
- copied, changed from r664103, incubator/tuscany/java/sca/modules/implementation-data-api/DISCLAIMER
incubator/tuscany/java/sca/modules/data-api/LICENSE
- copied, changed from r664103, incubator/tuscany/java/sca/modules/implementation-data-api/LICENSE
incubator/tuscany/java/sca/modules/data-api/NOTICE
- copied, changed from r664103, incubator/tuscany/java/sca/modules/implementation-data-api/NOTICE
incubator/tuscany/java/sca/modules/data-api/pom.xml
- copied, changed from r664103, incubator/tuscany/java/sca/modules/implementation-data-api/pom.xml
incubator/tuscany/java/sca/modules/data-api/src/
incubator/tuscany/java/sca/modules/data-api/src/main/
incubator/tuscany/java/sca/modules/data-api/src/main/java/
incubator/tuscany/java/sca/modules/data-api/src/main/java/org/
incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/
incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/
incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/
incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/data/
incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/
incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java
- copied, changed from r664103, incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Collection.java
incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Entry.java
- copied, changed from r664103, incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Entry.java
incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Item.java
- copied, changed from r664103, incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Item.java
incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/ItemCollection.java
- copied, changed from r664103, incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java
incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/LocalItemCollection.java
- copied, changed from r664103, incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/LocalItemCollection.java
incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/NotFoundException.java
- copied, changed from r664103, incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/NotFoundException.java
incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/
incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/
incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/
incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Collection.java
- copied, changed from r664103, incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java
incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Entry.java
- copied, changed from r664103, incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/LocalItemCollection.java
incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Item.java
- copied, changed from r664103, incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/LocalItemCollection.java
incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java
- copied, changed from r664103, incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java
incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/LocalItemCollection.java
- copied, changed from r664103, incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/LocalItemCollection.java
incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/NotFoundException.java
- copied, changed from r664103, incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java
Removed:
incubator/tuscany/java/sca/modules/implementation-data-api/DISCLAIMER
incubator/tuscany/java/sca/modules/implementation-data-api/LICENSE
incubator/tuscany/java/sca/modules/implementation-data-api/NOTICE
incubator/tuscany/java/sca/modules/implementation-data-api/pom.xml
incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Collection.java
incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Entry.java
incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Item.java
incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java
incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/LocalItemCollection.java
incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/NotFoundException.java
Modified:
incubator/tuscany/java/sca/demos/bigbank/pom.xml
incubator/tuscany/java/sca/demos/bigbank/src/main/java/bigbank/account/feed/AccountFeedImpl.java
incubator/tuscany/java/sca/distribution/bundle/pom.xml
incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-extensions/pom.xml
incubator/tuscany/java/sca/modules/binding-atom-abdera/pom.xml
incubator/tuscany/java/sca/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java
incubator/tuscany/java/sca/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
incubator/tuscany/java/sca/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java
incubator/tuscany/java/sca/modules/binding-feed/pom.xml
incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java
incubator/tuscany/java/sca/modules/binding-http/pom.xml
incubator/tuscany/java/sca/modules/binding-rss-rome/pom.xml
incubator/tuscany/java/sca/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingListenerServlet.java
incubator/tuscany/java/sca/modules/binding-rss/pom.xml
incubator/tuscany/java/sca/modules/domain-manager/pom.xml
incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java
incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java
incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.java
incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java
incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionServiceImpl.java
incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java
incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeServiceImpl.java
incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java
incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileCollectionImpl.java
incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeConfigurationServiceImpl.java
incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java
incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java
incubator/tuscany/java/sca/modules/domain-manager/src/test/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerTestCase.java
incubator/tuscany/java/sca/modules/domain-manager/src/test/resources/contributions/assets/META-INF/sca-contribution.xml
incubator/tuscany/java/sca/modules/implementation-data-xml/pom.xml
incubator/tuscany/java/sca/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/DATACollection.java
incubator/tuscany/java/sca/modules/implementation-data-xml/src/test/java/org/apache/tuscany/sca/implementation/data/companyFeed/CompanyFeed.java
incubator/tuscany/java/sca/modules/implementation-node-runtime/pom.xml
incubator/tuscany/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeProcessCollectionImpl.java
incubator/tuscany/java/sca/modules/implementation-resource/pom.xml
incubator/tuscany/java/sca/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java
incubator/tuscany/java/sca/modules/implementation-widget/pom.xml
incubator/tuscany/java/sca/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java
incubator/tuscany/java/sca/modules/pom.xml
incubator/tuscany/java/sca/samples/domain-management/pom.xml
incubator/tuscany/java/sca/samples/domain-management/src/test/java/services/Cart.java
incubator/tuscany/java/sca/samples/domain-management/src/test/java/services/ShoppingCartClientImpl.java
incubator/tuscany/java/sca/samples/domain-management/src/test/java/services/ShoppingCartImpl.java
incubator/tuscany/java/sca/samples/store/pom.xml
incubator/tuscany/java/sca/samples/store/src/main/java/services/Cart.java
incubator/tuscany/java/sca/samples/store/src/main/java/services/ShoppingCartImpl.java
incubator/tuscany/java/sca/tutorial/assets/pom.xml
incubator/tuscany/java/sca/tutorial/assets/services/Cart.java
incubator/tuscany/java/sca/tutorial/assets/services/ShoppingCartImpl.java
incubator/tuscany/java/sca/tutorial/assets/services/db/ShoppingCartTableImpl.java
incubator/tuscany/java/sca/tutorial/store-client/client/ShopperImpl.java
incubator/tuscany/java/sca/tutorial/store-client/pom.xml
incubator/tuscany/java/sca/tutorial/store-client/services/Cart.java
incubator/tuscany/java/sca/tutorial/store-test/pom.xml
Modified: incubator/tuscany/java/sca/demos/bigbank/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/bigbank/pom.xml?rev=664283&r1=664282&r2=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/demos/bigbank/pom.xml (original)
+++ incubator/tuscany/java/sca/demos/bigbank/pom.xml Fri Jun 6 22:20:05 2008
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-data-api</artifactId>
+ <artifactId>tuscany-data-api</artifactId>
<version>2.0-incubating-SNAPSHOT</version>
</dependency>
Modified: incubator/tuscany/java/sca/demos/bigbank/src/main/java/bigbank/account/feed/AccountFeedImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/bigbank/src/main/java/bigbank/account/feed/AccountFeedImpl.java?rev=664283&r1=664282&r2=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/demos/bigbank/src/main/java/bigbank/account/feed/AccountFeedImpl.java (original)
+++ incubator/tuscany/java/sca/demos/bigbank/src/main/java/bigbank/account/feed/AccountFeedImpl.java Fri Jun 6 22:20:05 2008
@@ -18,9 +18,9 @@
*/
package bigbank.account.feed;
-import org.apache.tuscany.sca.implementation.data.collection.Collection;
-import org.apache.tuscany.sca.implementation.data.collection.Entry;
-import org.apache.tuscany.sca.implementation.data.collection.NotFoundException;
+import org.apache.tuscany.sca.data.collection.Collection;
+import org.apache.tuscany.sca.data.collection.Entry;
+import org.apache.tuscany.sca.data.collection.NotFoundException;
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Service;
Modified: incubator/tuscany/java/sca/distribution/bundle/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/bundle/pom.xml?rev=664283&r1=664282&r2=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/distribution/bundle/pom.xml (original)
+++ incubator/tuscany/java/sca/distribution/bundle/pom.xml Fri Jun 6 22:20:05 2008
@@ -315,7 +315,7 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>tuscany-implementation-data-api</artifactId>
+ <artifactId>tuscany-data-api</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
Modified: incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-extensions/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-extensions/pom.xml?rev=664283&r1=664282&r2=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-extensions/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/osgi-tuscany/tuscany-extensions/pom.xml Fri Jun 6 22:20:05 2008
@@ -194,7 +194,7 @@
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-data-api</artifactId>
+ <artifactId>tuscany-data-api</artifactId>
<version>2.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
Modified: incubator/tuscany/java/sca/modules/binding-atom-abdera/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-atom-abdera/pom.xml?rev=664283&r1=664282&r2=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-atom-abdera/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/binding-atom-abdera/pom.xml Fri Jun 6 22:20:05 2008
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-data-api</artifactId>
+ <artifactId>tuscany-data-api</artifactId>
<version>2.0-incubating-SNAPSHOT</version>
</dependency>
Modified: incubator/tuscany/java/sca/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java?rev=664283&r1=664282&r2=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java (original)
+++ incubator/tuscany/java/sca/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingInvoker.java Fri Jun 6 22:20:05 2008
@@ -38,7 +38,7 @@
import org.apache.commons.httpclient.methods.PutMethod;
import org.apache.commons.httpclient.methods.StringRequestEntity;
import org.apache.tuscany.sca.binding.atom.collection.NotFoundException;
-import org.apache.tuscany.sca.implementation.data.collection.Entry;
+import org.apache.tuscany.sca.data.collection.Entry;
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.invocation.Invoker;
import org.apache.tuscany.sca.invocation.Message;
Modified: incubator/tuscany/java/sca/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java?rev=664283&r1=664282&r2=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java (original)
+++ incubator/tuscany/java/sca/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java Fri Jun 6 22:20:05 2008
@@ -46,8 +46,8 @@
import org.apache.abdera.parser.ParseException;
import org.apache.abdera.parser.Parser;
import org.apache.commons.codec.binary.Base64;
+import org.apache.tuscany.sca.data.collection.Entry;
import org.apache.tuscany.sca.databinding.Mediator;
-import org.apache.tuscany.sca.implementation.data.collection.Entry;
import org.apache.tuscany.sca.interfacedef.DataType;
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
Modified: incubator/tuscany/java/sca/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java?rev=664283&r1=664282&r2=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java (original)
+++ incubator/tuscany/java/sca/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingUtil.java Fri Jun 6 22:20:05 2008
@@ -24,9 +24,9 @@
import org.apache.abdera.factory.Factory;
import org.apache.abdera.model.Content;
import org.apache.abdera.model.Link;
+import org.apache.tuscany.sca.data.collection.Entry;
+import org.apache.tuscany.sca.data.collection.Item;
import org.apache.tuscany.sca.databinding.Mediator;
-import org.apache.tuscany.sca.implementation.data.collection.Entry;
-import org.apache.tuscany.sca.implementation.data.collection.Item;
import org.apache.tuscany.sca.interfacedef.DataType;
/**
Modified: incubator/tuscany/java/sca/modules/binding-feed/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-feed/pom.xml?rev=664283&r1=664282&r2=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-feed/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/binding-feed/pom.xml Fri Jun 6 22:20:05 2008
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-data-api</artifactId>
+ <artifactId>tuscany-data-api</artifactId>
<version>2.0-incubating-SNAPSHOT</version>
</dependency>
Modified: incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java?rev=664283&r1=664282&r2=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java (original)
+++ incubator/tuscany/java/sca/modules/binding-feed/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java Fri Jun 6 22:20:05 2008
@@ -36,8 +36,8 @@
import javax.xml.namespace.QName;
import org.apache.commons.codec.binary.Base64;
+import org.apache.tuscany.sca.data.collection.Item;
import org.apache.tuscany.sca.databinding.Mediator;
-import org.apache.tuscany.sca.implementation.data.collection.Item;
import org.apache.tuscany.sca.interfacedef.DataType;
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
@@ -226,13 +226,13 @@
if (responseMessage.isFault()) {
throw new ServletException((Throwable)responseMessage.getBody());
}
- org.apache.tuscany.sca.implementation.data.collection.Entry<Object, Object>[] collection =
- (org.apache.tuscany.sca.implementation.data.collection.Entry<Object, Object>[])responseMessage.getBody();
+ org.apache.tuscany.sca.data.collection.Entry<Object, Object>[] collection =
+ (org.apache.tuscany.sca.data.collection.Entry<Object, Object>[])responseMessage.getBody();
if (collection != null) {
// Create the feed
feed = new Feed();
feed.setTitle("Feed");
- for (org.apache.tuscany.sca.implementation.data.collection.Entry<Object, Object> entry: collection) {
+ for (org.apache.tuscany.sca.data.collection.Entry<Object, Object> entry: collection) {
Entry feedEntry = createFeedEntry(entry);
feed.getEntries().add(feedEntry);
}
@@ -275,7 +275,7 @@
// The service implementation only returns a data item, create an entry
// from it
- feedEntry = createFeedEntry(new org.apache.tuscany.sca.implementation.data.collection.Entry<Object, Object>(id, responseMessage.getBody()));
+ feedEntry = createFeedEntry(new org.apache.tuscany.sca.data.collection.Entry<Object, Object>(id, responseMessage.getBody()));
}
// Write the Atom entry
@@ -328,13 +328,13 @@
if (responseMessage.isFault()) {
throw new ServletException((Throwable)responseMessage.getBody());
}
- org.apache.tuscany.sca.implementation.data.collection.Entry<Object, Object>[] collection =
- (org.apache.tuscany.sca.implementation.data.collection.Entry<Object, Object>[])responseMessage.getBody();
+ org.apache.tuscany.sca.data.collection.Entry<Object, Object>[] collection =
+ (org.apache.tuscany.sca.data.collection.Entry<Object, Object>[])responseMessage.getBody();
if (collection != null) {
// Create the feed
feed = new Feed();
feed.setTitle("Feed");
- for (org.apache.tuscany.sca.implementation.data.collection.Entry<Object, Object> entry: collection) {
+ for (org.apache.tuscany.sca.data.collection.Entry<Object, Object> entry: collection) {
Entry feedEntry = createFeedEntry(entry);
feed.getEntries().add(feedEntry);
}
@@ -368,7 +368,7 @@
* @param entry
* @return
*/
- private Entry createFeedEntry(org.apache.tuscany.sca.implementation.data.collection.Entry<Object, Object> entry) {
+ private Entry createFeedEntry(org.apache.tuscany.sca.data.collection.Entry<Object, Object> entry) {
Object key = entry.getKey();
Object data = entry.getData();
if (data instanceof Item) {
@@ -444,7 +444,7 @@
* @param feedEntry
* @return
*/
- private org.apache.tuscany.sca.implementation.data.collection.Entry<Object, Object> createEntry(Entry feedEntry) {
+ private org.apache.tuscany.sca.data.collection.Entry<Object, Object> createEntry(Entry feedEntry) {
if (feedEntry != null) {
if (itemClassType.getPhysical() == Item.class) {
String key = feedEntry.getId();
@@ -473,7 +473,7 @@
item.setDate(feedEntry.getCreated());
- return new org.apache.tuscany.sca.implementation.data.collection.Entry<Object, Object>(key, item);
+ return new org.apache.tuscany.sca.data.collection.Entry<Object, Object>(key, item);
} else {
String key = feedEntry.getId();
@@ -487,7 +487,7 @@
String value = content.getValue();
Object data = mediator.mediate(value, itemXMLType, itemClassType, null);
- return new org.apache.tuscany.sca.implementation.data.collection.Entry<Object, Object>(key, data);
+ return new org.apache.tuscany.sca.data.collection.Entry<Object, Object>(key, data);
}
} else {
return null;
@@ -540,7 +540,7 @@
// The service implementation does not support feed entries, pass the data item to it
Message requestMessage = messageFactory.createMessage();
- org.apache.tuscany.sca.implementation.data.collection.Entry<Object, Object> entry = createEntry(feedEntry);
+ org.apache.tuscany.sca.data.collection.Entry<Object, Object> entry = createEntry(feedEntry);
requestMessage.setBody(new Object[] {entry.getKey(), entry.getData()});
Message responseMessage = postInvoker.invoke(requestMessage);
if (responseMessage.isFault()) {
@@ -654,7 +654,7 @@
// The service implementation does not support feed entries, pass the data item to it
Message requestMessage = messageFactory.createMessage();
- org.apache.tuscany.sca.implementation.data.collection.Entry<Object, Object> entry = createEntry(feedEntry);
+ org.apache.tuscany.sca.data.collection.Entry<Object, Object> entry = createEntry(feedEntry);
requestMessage.setBody(new Object[] {entry.getKey(), entry.getData()});
Message responseMessage = putInvoker.invoke(requestMessage);
if (responseMessage.isFault()) {
Modified: incubator/tuscany/java/sca/modules/binding-http/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-http/pom.xml?rev=664283&r1=664282&r2=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-http/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/binding-http/pom.xml Fri Jun 6 22:20:05 2008
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-data-api</artifactId>
+ <artifactId>tuscany-data-api</artifactId>
<version>2.0-incubating-SNAPSHOT</version>
</dependency>
Modified: incubator/tuscany/java/sca/modules/binding-rss-rome/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-rss-rome/pom.xml?rev=664283&r1=664282&r2=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-rss-rome/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/binding-rss-rome/pom.xml Fri Jun 6 22:20:05 2008
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-data-api</artifactId>
+ <artifactId>tuscany-data-api</artifactId>
<version>2.0-incubating-SNAPSHOT</version>
</dependency>
Modified: incubator/tuscany/java/sca/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingListenerServlet.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingListenerServlet.java?rev=664283&r1=664282&r2=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingListenerServlet.java (original)
+++ incubator/tuscany/java/sca/modules/binding-rss-rome/src/main/java/org/apache/tuscany/sca/binding/rss/provider/RSSBindingListenerServlet.java Fri Jun 6 22:20:05 2008
@@ -36,8 +36,8 @@
import javax.xml.namespace.QName;
import org.apache.commons.codec.binary.Base64;
+import org.apache.tuscany.sca.data.collection.Item;
import org.apache.tuscany.sca.databinding.Mediator;
-import org.apache.tuscany.sca.implementation.data.collection.Item;
import org.apache.tuscany.sca.interfacedef.DataType;
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
@@ -161,14 +161,14 @@
if (responseMessage.isFault()) {
throw new ServletException((Throwable)responseMessage.getBody());
}
- org.apache.tuscany.sca.implementation.data.collection.Entry<Object, Object>[] collection =
- (org.apache.tuscany.sca.implementation.data.collection.Entry<Object, Object>[])responseMessage.getBody();
+ org.apache.tuscany.sca.data.collection.Entry<Object, Object>[] collection =
+ (org.apache.tuscany.sca.data.collection.Entry<Object, Object>[])responseMessage.getBody();
if (collection != null) {
// Create the feed
feed = new SyndFeedImpl();
feed.setTitle("Feed");
- for (org.apache.tuscany.sca.implementation.data.collection.Entry<Object, Object> entry: collection) {
+ for (org.apache.tuscany.sca.data.collection.Entry<Object, Object> entry: collection) {
SyndEntry feedEntry = createFeedEntry(entry);
feed.getEntries().add(feedEntry);
}
@@ -200,7 +200,7 @@
* @param entry
* @return
*/
- private SyndEntry createFeedEntry(org.apache.tuscany.sca.implementation.data.collection.Entry<Object, Object> entry) {
+ private SyndEntry createFeedEntry(org.apache.tuscany.sca.data.collection.Entry<Object, Object> entry) {
Object key = entry.getKey();
Object data = entry.getData();
if (data instanceof Item) {
@@ -276,7 +276,7 @@
* @param feedEntry
* @return
*/
- private org.apache.tuscany.sca.implementation.data.collection.Entry<Object, Object> createEntry(SyndEntry feedEntry) {
+ private org.apache.tuscany.sca.data.collection.Entry<Object, Object> createEntry(SyndEntry feedEntry) {
if (feedEntry != null) {
if (itemClassType.getPhysical() == Item.class) {
String key = feedEntry.getUri();
@@ -305,7 +305,7 @@
item.setDate(feedEntry.getPublishedDate());
- return new org.apache.tuscany.sca.implementation.data.collection.Entry<Object, Object>(key, item);
+ return new org.apache.tuscany.sca.data.collection.Entry<Object, Object>(key, item);
} else {
String key = feedEntry.getUri();
@@ -319,7 +319,7 @@
String value = content.getValue();
Object data = mediator.mediate(value, itemXMLType, itemClassType, null);
- return new org.apache.tuscany.sca.implementation.data.collection.Entry<Object, Object>(key, data);
+ return new org.apache.tuscany.sca.data.collection.Entry<Object, Object>(key, data);
}
} else {
return null;
Modified: incubator/tuscany/java/sca/modules/binding-rss/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-rss/pom.xml?rev=664283&r1=664282&r2=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-rss/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/binding-rss/pom.xml Fri Jun 6 22:20:05 2008
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-data-api</artifactId>
+ <artifactId>tuscany-data-api</artifactId>
<version>2.0-incubating-SNAPSHOT</version>
</dependency>
Copied: incubator/tuscany/java/sca/modules/data-api/DISCLAIMER (from r664103, incubator/tuscany/java/sca/modules/implementation-data-api/DISCLAIMER)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/data-api/DISCLAIMER?p2=incubator/tuscany/java/sca/modules/data-api/DISCLAIMER&p1=incubator/tuscany/java/sca/modules/implementation-data-api/DISCLAIMER&r1=664103&r2=664283&rev=664283&view=diff
==============================================================================
(empty)
Copied: incubator/tuscany/java/sca/modules/data-api/LICENSE (from r664103, incubator/tuscany/java/sca/modules/implementation-data-api/LICENSE)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/data-api/LICENSE?p2=incubator/tuscany/java/sca/modules/data-api/LICENSE&p1=incubator/tuscany/java/sca/modules/implementation-data-api/LICENSE&r1=664103&r2=664283&rev=664283&view=diff
==============================================================================
(empty)
Copied: incubator/tuscany/java/sca/modules/data-api/NOTICE (from r664103, incubator/tuscany/java/sca/modules/implementation-data-api/NOTICE)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/data-api/NOTICE?p2=incubator/tuscany/java/sca/modules/data-api/NOTICE&p1=incubator/tuscany/java/sca/modules/implementation-data-api/NOTICE&r1=664103&r2=664283&rev=664283&view=diff
==============================================================================
(empty)
Copied: incubator/tuscany/java/sca/modules/data-api/pom.xml (from r664103, incubator/tuscany/java/sca/modules/implementation-data-api/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/data-api/pom.xml?p2=incubator/tuscany/java/sca/modules/data-api/pom.xml&p1=incubator/tuscany/java/sca/modules/implementation-data-api/pom.xml&r1=664103&r2=664283&rev=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-data-api/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/data-api/pom.xml Fri Jun 6 22:20:05 2008
@@ -25,8 +25,8 @@
<version>2.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>tuscany-implementation-data-api</artifactId>
- <name>Apache Tuscany SCA Data Implementation API</name>
+ <artifactId>tuscany-data-api</artifactId>
+ <name>Apache Tuscany SCA Data API</name>
<dependencies>
<dependency>
@@ -46,9 +46,9 @@
<configuration>
<instructions>
<Bundle-Version>${tuscany.version}</Bundle-Version>
- <Bundle-SymbolicName>org.apache.tuscany.sca.implementation.data.api</Bundle-SymbolicName>
+ <Bundle-SymbolicName>org.apache.tuscany.sca.data.api</Bundle-SymbolicName>
<Bundle-Description>${pom.name}</Bundle-Description>
- <Export-Package>org.apache.tuscany.sca.implementation.data*</Export-Package>
+ <Export-Package>org.apache.tuscany.sca.data*</Export-Package>
</instructions>
</configuration>
</plugin>
Copied: incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java (from r664103, incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Collection.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java?p2=incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java&p1=incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Collection.java&r1=664103&r2=664283&rev=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Collection.java (original)
+++ incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Collection.java Fri Jun 6 22:20:05 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.sca.implementation.data.collection;
+package org.apache.tuscany.sca.data.collection;
import org.osoa.sca.annotations.Remotable;
Copied: incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Entry.java (from r664103, incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Entry.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Entry.java?p2=incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Entry.java&p1=incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Entry.java&r1=664103&r2=664283&rev=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Entry.java (original)
+++ incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Entry.java Fri Jun 6 22:20:05 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.sca.implementation.data.collection;
+package org.apache.tuscany.sca.data.collection;
/**
Copied: incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Item.java (from r664103, incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Item.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Item.java?p2=incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Item.java&p1=incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Item.java&r1=664103&r2=664283&rev=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Item.java (original)
+++ incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/Item.java Fri Jun 6 22:20:05 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.sca.implementation.data.collection;
+package org.apache.tuscany.sca.data.collection;
import java.util.Date;
Copied: incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/ItemCollection.java (from r664103, incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/ItemCollection.java?p2=incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/ItemCollection.java&p1=incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java&r1=664103&r2=664283&rev=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java (original)
+++ incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/ItemCollection.java Fri Jun 6 22:20:05 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.sca.implementation.data.collection;
+package org.apache.tuscany.sca.data.collection;
import org.osoa.sca.annotations.Remotable;
Copied: incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/LocalItemCollection.java (from r664103, incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/LocalItemCollection.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/LocalItemCollection.java?p2=incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/LocalItemCollection.java&p1=incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/LocalItemCollection.java&r1=664103&r2=664283&rev=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/LocalItemCollection.java (original)
+++ incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/LocalItemCollection.java Fri Jun 6 22:20:05 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.sca.implementation.data.collection;
+package org.apache.tuscany.sca.data.collection;
/**
Copied: incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/NotFoundException.java (from r664103, incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/NotFoundException.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/NotFoundException.java?p2=incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/NotFoundException.java&p1=incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/NotFoundException.java&r1=664103&r2=664283&rev=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/NotFoundException.java (original)
+++ incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/data/collection/NotFoundException.java Fri Jun 6 22:20:05 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.tuscany.sca.implementation.data.collection;
+package org.apache.tuscany.sca.data.collection;
/**
* Indicates that an item could not be found in a collection.
Copied: incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Collection.java (from r664103, incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Collection.java?p2=incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Collection.java&p1=incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java&r1=664103&r2=664283&rev=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java (original)
+++ incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Collection.java Fri Jun 6 22:20:05 2008
@@ -26,5 +26,6 @@
* @version $Rev$ $Date$
*/
@Remotable
-public interface ItemCollection extends Collection<String, Item> {
+@Deprecated
+public interface Collection <K, D> extends org.apache.tuscany.sca.data.collection.Collection<K, D> {
}
Copied: incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Entry.java (from r664103, incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/LocalItemCollection.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Entry.java?p2=incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Entry.java&p1=incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/LocalItemCollection.java&r1=664103&r2=664283&rev=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/LocalItemCollection.java (original)
+++ incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Entry.java Fri Jun 6 22:20:05 2008
@@ -20,9 +20,10 @@
/**
- * Provides access to a collection of data items.
+ * Represents a key/data pair in a data collection.
*
* @version $Rev$ $Date$
*/
-public interface LocalItemCollection extends Collection<String, Item> {
+@Deprecated
+public class Entry <K, D> extends org.apache.tuscany.sca.data.collection.Entry<K, D> {
}
Copied: incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Item.java (from r664103, incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/LocalItemCollection.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Item.java?p2=incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Item.java&p1=incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/LocalItemCollection.java&r1=664103&r2=664283&rev=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/LocalItemCollection.java (original)
+++ incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/Item.java Fri Jun 6 22:20:05 2008
@@ -19,10 +19,12 @@
package org.apache.tuscany.sca.implementation.data.collection;
+
/**
- * Provides access to a collection of data items.
+ * Represents a data item.
*
* @version $Rev$ $Date$
*/
-public interface LocalItemCollection extends Collection<String, Item> {
+@Deprecated
+public class Item extends org.apache.tuscany.sca.data.collection.Item {
}
Copied: incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java (from r664103, incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java?p2=incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java&p1=incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java&r1=664103&r2=664283&rev=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java (original)
+++ incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java Fri Jun 6 22:20:05 2008
@@ -26,5 +26,6 @@
* @version $Rev$ $Date$
*/
@Remotable
+@Deprecated
public interface ItemCollection extends Collection<String, Item> {
}
Copied: incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/LocalItemCollection.java (from r664103, incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/LocalItemCollection.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/LocalItemCollection.java?p2=incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/LocalItemCollection.java&p1=incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/LocalItemCollection.java&r1=664103&r2=664283&rev=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/LocalItemCollection.java (original)
+++ incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/LocalItemCollection.java Fri Jun 6 22:20:05 2008
@@ -24,5 +24,6 @@
*
* @version $Rev$ $Date$
*/
+@Deprecated
public interface LocalItemCollection extends Collection<String, Item> {
}
Copied: incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/NotFoundException.java (from r664103, incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/NotFoundException.java?p2=incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/NotFoundException.java&p1=incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java&r1=664103&r2=664283&rev=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/ItemCollection.java (original)
+++ incubator/tuscany/java/sca/modules/data-api/src/main/java/org/apache/tuscany/sca/implementation/data/collection/NotFoundException.java Fri Jun 6 22:20:05 2008
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.sca.implementation.data.collection;
-import org.osoa.sca.annotations.Remotable;
+package org.apache.tuscany.sca.implementation.data.collection;
/**
- * Provides access to a collection of data items.
+ * Indicates that an item could not be found in a collection.
*
* @version $Rev$ $Date$
*/
-@Remotable
-public interface ItemCollection extends Collection<String, Item> {
+@Deprecated
+public class NotFoundException extends org.apache.tuscany.sca.data.collection.NotFoundException {
+ private static final long serialVersionUID = 2812975065056330240L;
}
Modified: incubator/tuscany/java/sca/modules/domain-manager/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-manager/pom.xml?rev=664283&r1=664282&r2=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-manager/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/domain-manager/pom.xml Fri Jun 6 22:20:05 2008
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-data-api</artifactId>
+ <artifactId>tuscany-data-api</artifactId>
<version>2.0-incubating-SNAPSHOT</version>
</dependency>
Modified: incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java?rev=664283&r1=664282&r2=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java (original)
+++ incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java Fri Jun 6 22:20:05 2008
@@ -29,11 +29,11 @@
import javax.xml.namespace.QName;
-import org.apache.tuscany.sca.implementation.data.collection.Entry;
-import org.apache.tuscany.sca.implementation.data.collection.Item;
-import org.apache.tuscany.sca.implementation.data.collection.ItemCollection;
-import org.apache.tuscany.sca.implementation.data.collection.LocalItemCollection;
-import org.apache.tuscany.sca.implementation.data.collection.NotFoundException;
+import org.apache.tuscany.sca.data.collection.Entry;
+import org.apache.tuscany.sca.data.collection.Item;
+import org.apache.tuscany.sca.data.collection.ItemCollection;
+import org.apache.tuscany.sca.data.collection.LocalItemCollection;
+import org.apache.tuscany.sca.data.collection.NotFoundException;
import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Scope;
Modified: incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java?rev=664283&r1=664282&r2=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java Fri Jun 6 22:20:05 2008
@@ -69,10 +69,10 @@
import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.implementation.data.collection.Entry;
-import org.apache.tuscany.sca.implementation.data.collection.Item;
-import org.apache.tuscany.sca.implementation.data.collection.LocalItemCollection;
-import org.apache.tuscany.sca.implementation.data.collection.NotFoundException;
+import org.apache.tuscany.sca.data.collection.Entry;
+import org.apache.tuscany.sca.data.collection.Item;
+import org.apache.tuscany.sca.data.collection.LocalItemCollection;
+import org.apache.tuscany.sca.data.collection.NotFoundException;
import org.apache.tuscany.sca.implementation.node.NodeImplementation;
import org.apache.tuscany.sca.implementation.node.builder.impl.NodeCompositeBuilderImpl;
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
Modified: incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.java?rev=664283&r1=664282&r2=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeGeneratorServiceImpl.java Fri Jun 6 22:20:05 2008
@@ -61,10 +61,10 @@
import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.core.UtilityExtensionPoint;
+import org.apache.tuscany.sca.data.collection.Item;
+import org.apache.tuscany.sca.data.collection.LocalItemCollection;
+import org.apache.tuscany.sca.data.collection.NotFoundException;
import org.apache.tuscany.sca.domain.manager.impl.CompositeGeneratorServiceImpl.Cache.ContributionCache;
-import org.apache.tuscany.sca.implementation.data.collection.Item;
-import org.apache.tuscany.sca.implementation.data.collection.LocalItemCollection;
-import org.apache.tuscany.sca.implementation.data.collection.NotFoundException;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.MonitorFactory;
import org.apache.tuscany.sca.workspace.processor.impl.ContributionContentProcessor;
Modified: incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java?rev=664283&r1=664282&r2=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java (original)
+++ incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java Fri Jun 6 22:20:05 2008
@@ -63,12 +63,12 @@
import org.apache.tuscany.sca.contribution.service.ContributionReadException;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.core.UtilityExtensionPoint;
+import org.apache.tuscany.sca.data.collection.Entry;
+import org.apache.tuscany.sca.data.collection.Item;
+import org.apache.tuscany.sca.data.collection.ItemCollection;
+import org.apache.tuscany.sca.data.collection.LocalItemCollection;
+import org.apache.tuscany.sca.data.collection.NotFoundException;
import org.apache.tuscany.sca.domain.manager.impl.ContributionCollectionImpl.Cache.ContributionCache;
-import org.apache.tuscany.sca.implementation.data.collection.Entry;
-import org.apache.tuscany.sca.implementation.data.collection.Item;
-import org.apache.tuscany.sca.implementation.data.collection.ItemCollection;
-import org.apache.tuscany.sca.implementation.data.collection.LocalItemCollection;
-import org.apache.tuscany.sca.implementation.data.collection.NotFoundException;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.MonitorFactory;
import org.apache.tuscany.sca.monitor.Problem;
Modified: incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionServiceImpl.java?rev=664283&r1=664282&r2=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionServiceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionServiceImpl.java Fri Jun 6 22:20:05 2008
@@ -29,9 +29,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.tuscany.sca.implementation.data.collection.Item;
-import org.apache.tuscany.sca.implementation.data.collection.LocalItemCollection;
-import org.apache.tuscany.sca.implementation.data.collection.NotFoundException;
+import org.apache.tuscany.sca.data.collection.Item;
+import org.apache.tuscany.sca.data.collection.LocalItemCollection;
+import org.apache.tuscany.sca.data.collection.NotFoundException;
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Scope;
import org.osoa.sca.annotations.Service;
Modified: incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java?rev=664283&r1=664282&r2=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java (original)
+++ incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java Fri Jun 6 22:20:05 2008
@@ -60,12 +60,12 @@
import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.core.UtilityExtensionPoint;
+import org.apache.tuscany.sca.data.collection.Entry;
+import org.apache.tuscany.sca.data.collection.Item;
+import org.apache.tuscany.sca.data.collection.ItemCollection;
+import org.apache.tuscany.sca.data.collection.LocalItemCollection;
+import org.apache.tuscany.sca.data.collection.NotFoundException;
import org.apache.tuscany.sca.domain.manager.impl.DeployableCompositeCollectionImpl.Cache.ContributionCache;
-import org.apache.tuscany.sca.implementation.data.collection.Entry;
-import org.apache.tuscany.sca.implementation.data.collection.Item;
-import org.apache.tuscany.sca.implementation.data.collection.ItemCollection;
-import org.apache.tuscany.sca.implementation.data.collection.LocalItemCollection;
-import org.apache.tuscany.sca.implementation.data.collection.NotFoundException;
import org.apache.tuscany.sca.implementation.node.NodeImplementation;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.MonitorFactory;
Modified: incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeServiceImpl.java?rev=664283&r1=664282&r2=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeServiceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeServiceImpl.java Fri Jun 6 22:20:05 2008
@@ -36,9 +36,9 @@
import javax.xml.parsers.ParserConfigurationException;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.implementation.data.collection.Item;
-import org.apache.tuscany.sca.implementation.data.collection.LocalItemCollection;
-import org.apache.tuscany.sca.implementation.data.collection.NotFoundException;
+import org.apache.tuscany.sca.data.collection.Item;
+import org.apache.tuscany.sca.data.collection.LocalItemCollection;
+import org.apache.tuscany.sca.data.collection.NotFoundException;
import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Scope;
Modified: incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java?rev=664283&r1=664282&r2=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java (original)
+++ incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java Fri Jun 6 22:20:05 2008
@@ -65,11 +65,11 @@
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.implementation.data.collection.Entry;
-import org.apache.tuscany.sca.implementation.data.collection.Item;
-import org.apache.tuscany.sca.implementation.data.collection.ItemCollection;
-import org.apache.tuscany.sca.implementation.data.collection.LocalItemCollection;
-import org.apache.tuscany.sca.implementation.data.collection.NotFoundException;
+import org.apache.tuscany.sca.data.collection.Entry;
+import org.apache.tuscany.sca.data.collection.Item;
+import org.apache.tuscany.sca.data.collection.ItemCollection;
+import org.apache.tuscany.sca.data.collection.LocalItemCollection;
+import org.apache.tuscany.sca.data.collection.NotFoundException;
import org.apache.xml.serialize.OutputFormat;
import org.apache.xml.serialize.XMLSerializer;
import org.osoa.sca.ServiceRuntimeException;
Modified: incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileCollectionImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileCollectionImpl.java?rev=664283&r1=664282&r2=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileCollectionImpl.java (original)
+++ incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileCollectionImpl.java Fri Jun 6 22:20:05 2008
@@ -25,10 +25,10 @@
import java.util.List;
import java.util.logging.Logger;
-import org.apache.tuscany.sca.implementation.data.collection.Entry;
-import org.apache.tuscany.sca.implementation.data.collection.Item;
-import org.apache.tuscany.sca.implementation.data.collection.ItemCollection;
-import org.apache.tuscany.sca.implementation.data.collection.NotFoundException;
+import org.apache.tuscany.sca.data.collection.Entry;
+import org.apache.tuscany.sca.data.collection.Item;
+import org.apache.tuscany.sca.data.collection.ItemCollection;
+import org.apache.tuscany.sca.data.collection.NotFoundException;
import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Property;
import org.osoa.sca.annotations.Reference;
Modified: incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeConfigurationServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeConfigurationServiceImpl.java?rev=664283&r1=664282&r2=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeConfigurationServiceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeConfigurationServiceImpl.java Fri Jun 6 22:20:05 2008
@@ -32,9 +32,9 @@
import javax.servlet.http.HttpServletResponse;
import javax.xml.namespace.QName;
-import org.apache.tuscany.sca.implementation.data.collection.Entry;
-import org.apache.tuscany.sca.implementation.data.collection.Item;
-import org.apache.tuscany.sca.implementation.data.collection.LocalItemCollection;
+import org.apache.tuscany.sca.data.collection.Entry;
+import org.apache.tuscany.sca.data.collection.Item;
+import org.apache.tuscany.sca.data.collection.LocalItemCollection;
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Scope;
import org.osoa.sca.annotations.Service;
Modified: incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java?rev=664283&r1=664282&r2=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java (original)
+++ incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java Fri Jun 6 22:20:05 2008
@@ -34,11 +34,11 @@
import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.core.assembly.CompositeActivator;
-import org.apache.tuscany.sca.implementation.data.collection.Entry;
-import org.apache.tuscany.sca.implementation.data.collection.Item;
-import org.apache.tuscany.sca.implementation.data.collection.ItemCollection;
-import org.apache.tuscany.sca.implementation.data.collection.LocalItemCollection;
-import org.apache.tuscany.sca.implementation.data.collection.NotFoundException;
+import org.apache.tuscany.sca.data.collection.Entry;
+import org.apache.tuscany.sca.data.collection.Item;
+import org.apache.tuscany.sca.data.collection.ItemCollection;
+import org.apache.tuscany.sca.data.collection.LocalItemCollection;
+import org.apache.tuscany.sca.data.collection.NotFoundException;
import org.osoa.sca.ServiceRuntimeException;
import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Reference;
Modified: incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java?rev=664283&r1=664282&r2=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java Fri Jun 6 22:20:05 2008
@@ -40,10 +40,10 @@
import javax.xml.namespace.QName;
import javax.xml.parsers.ParserConfigurationException;
-import org.apache.tuscany.sca.implementation.data.collection.Entry;
-import org.apache.tuscany.sca.implementation.data.collection.Item;
-import org.apache.tuscany.sca.implementation.data.collection.LocalItemCollection;
-import org.apache.tuscany.sca.implementation.data.collection.NotFoundException;
+import org.apache.tuscany.sca.data.collection.Entry;
+import org.apache.tuscany.sca.data.collection.Item;
+import org.apache.tuscany.sca.data.collection.LocalItemCollection;
+import org.apache.tuscany.sca.data.collection.NotFoundException;
import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Scope;
Modified: incubator/tuscany/java/sca/modules/domain-manager/src/test/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-manager/src/test/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerTestCase.java?rev=664283&r1=664282&r2=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-manager/src/test/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/domain-manager/src/test/java/org/apache/tuscany/sca/domain/manager/impl/DomainManagerTestCase.java Fri Jun 6 22:20:05 2008
@@ -27,9 +27,9 @@
import junit.framework.TestCase;
-import org.apache.tuscany.sca.implementation.data.collection.Entry;
-import org.apache.tuscany.sca.implementation.data.collection.Item;
-import org.apache.tuscany.sca.implementation.data.collection.NotFoundException;
+import org.apache.tuscany.sca.data.collection.Entry;
+import org.apache.tuscany.sca.data.collection.Item;
+import org.apache.tuscany.sca.data.collection.NotFoundException;
/**
* Test case for the workspace admin services.
Modified: incubator/tuscany/java/sca/modules/domain-manager/src/test/resources/contributions/assets/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-manager/src/test/resources/contributions/assets/META-INF/sca-contribution.xml?rev=664283&r1=664282&r2=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-manager/src/test/resources/contributions/assets/META-INF/sca-contribution.xml (original)
+++ incubator/tuscany/java/sca/modules/domain-manager/src/test/resources/contributions/assets/META-INF/sca-contribution.xml Fri Jun 6 22:20:05 2008
@@ -22,6 +22,6 @@
<export.java package="services"/>
<export.java package="services.merger"/>
<export.java package="services.db"/>
- <import.java package="org.apache.tuscany.sca.implementation.data.collection"/>
+ <import.java package="org.apache.tuscany.sca.data.collection"/>
<import.java package="org.apache.derby.*"/>
</contribution>
\ No newline at end of file
Modified: incubator/tuscany/java/sca/modules/implementation-data-xml/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-data-xml/pom.xml?rev=664283&r1=664282&r2=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-data-xml/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/implementation-data-xml/pom.xml Fri Jun 6 22:20:05 2008
@@ -130,7 +130,7 @@
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-data-api</artifactId>
+ <artifactId>tuscany-data-api</artifactId>
<version>2.0-incubating-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
Modified: incubator/tuscany/java/sca/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/DATACollection.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/DATACollection.java?rev=664283&r1=664282&r2=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/DATACollection.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/DATACollection.java Fri Jun 6 22:20:05 2008
@@ -20,7 +20,8 @@
package org.apache.tuscany.sca.implementation.data;
import javax.xml.stream.XMLStreamReader;
-import org.apache.tuscany.sca.implementation.data.collection.Collection;
+
+import org.apache.tuscany.sca.data.collection.Collection;
public interface DATACollection extends Collection<String, XMLStreamReader> {
Modified: incubator/tuscany/java/sca/modules/implementation-data-xml/src/test/java/org/apache/tuscany/sca/implementation/data/companyFeed/CompanyFeed.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-data-xml/src/test/java/org/apache/tuscany/sca/implementation/data/companyFeed/CompanyFeed.java?rev=664283&r1=664282&r2=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-data-xml/src/test/java/org/apache/tuscany/sca/implementation/data/companyFeed/CompanyFeed.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-data-xml/src/test/java/org/apache/tuscany/sca/implementation/data/companyFeed/CompanyFeed.java Fri Jun 6 22:20:05 2008
@@ -19,10 +19,10 @@
package org.apache.tuscany.sca.implementation.data.companyFeed;
+import org.apache.tuscany.sca.data.collection.Collection;
+import org.apache.tuscany.sca.data.collection.Entry;
+import org.apache.tuscany.sca.data.collection.NotFoundException;
import org.apache.tuscany.sca.implementation.data.DATA;
-import org.apache.tuscany.sca.implementation.data.collection.Collection;
-import org.apache.tuscany.sca.implementation.data.collection.Entry;
-import org.apache.tuscany.sca.implementation.data.collection.NotFoundException;
import org.osoa.sca.annotations.Reference;
import commonj.sdo.DataObject;
Modified: incubator/tuscany/java/sca/modules/implementation-node-runtime/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-node-runtime/pom.xml?rev=664283&r1=664282&r2=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-node-runtime/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/implementation-node-runtime/pom.xml Fri Jun 6 22:20:05 2008
@@ -62,7 +62,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-data-api</artifactId>
+ <artifactId>tuscany-data-api</artifactId>
<version>2.0-incubating-SNAPSHOT</version>
</dependency>
Modified: incubator/tuscany/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeProcessCollectionImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeProcessCollectionImpl.java?rev=664283&r1=664282&r2=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeProcessCollectionImpl.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeProcessCollectionImpl.java Fri Jun 6 22:20:05 2008
@@ -27,11 +27,11 @@
import java.util.Properties;
import java.util.logging.Logger;
-import org.apache.tuscany.sca.implementation.data.collection.Entry;
-import org.apache.tuscany.sca.implementation.data.collection.Item;
-import org.apache.tuscany.sca.implementation.data.collection.ItemCollection;
-import org.apache.tuscany.sca.implementation.data.collection.LocalItemCollection;
-import org.apache.tuscany.sca.implementation.data.collection.NotFoundException;
+import org.apache.tuscany.sca.data.collection.Entry;
+import org.apache.tuscany.sca.data.collection.Item;
+import org.apache.tuscany.sca.data.collection.ItemCollection;
+import org.apache.tuscany.sca.data.collection.LocalItemCollection;
+import org.apache.tuscany.sca.data.collection.NotFoundException;
import org.apache.tuscany.sca.node.launcher.NodeLauncher;
import org.osoa.sca.ServiceRuntimeException;
import org.osoa.sca.annotations.Init;
Modified: incubator/tuscany/java/sca/modules/implementation-resource/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-resource/pom.xml?rev=664283&r1=664282&r2=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-resource/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/implementation-resource/pom.xml Fri Jun 6 22:20:05 2008
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-data-api</artifactId>
+ <artifactId>tuscany-data-api</artifactId>
<version>2.0-incubating-SNAPSHOT</version>
</dependency>
Modified: incubator/tuscany/java/sca/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java?rev=664283&r1=664282&r2=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/implementation/resource/Resource.java Fri Jun 6 22:20:05 2008
@@ -21,7 +21,7 @@
import java.io.InputStream;
-import org.apache.tuscany.sca.implementation.data.collection.Collection;
+import org.apache.tuscany.sca.data.collection.Collection;
/**
* The service interface of resource implementations. This is not an API for application
Modified: incubator/tuscany/java/sca/modules/implementation-widget/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-widget/pom.xml?rev=664283&r1=664282&r2=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-widget/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/implementation-widget/pom.xml Fri Jun 6 22:20:05 2008
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-data-api</artifactId>
+ <artifactId>tuscany-data-api</artifactId>
<version>2.0-incubating-SNAPSHOT</version>
</dependency>
Modified: incubator/tuscany/java/sca/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java?rev=664283&r1=664282&r2=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/Widget.java Fri Jun 6 22:20:05 2008
@@ -21,7 +21,7 @@
import java.io.InputStream;
-import org.apache.tuscany.sca.implementation.data.collection.Collection;
+import org.apache.tuscany.sca.data.collection.Collection;
/**
* The service interface of widget implementations. This is not an API for application
Modified: incubator/tuscany/java/sca/modules/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/pom.xml?rev=664283&r1=664282&r2=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/pom.xml Fri Jun 6 22:20:05 2008
@@ -81,6 +81,7 @@
<module>core-databinding</module>
<module>core-spi</module>
<module>core-spring</module>
+ <module>data-api</module>
<module>databinding</module>
<module>databinding-axiom</module>
<module>databinding-jaxb</module>
@@ -121,7 +122,6 @@
<module>implementation-bpel</module>
<module>implementation-bpel-ode</module>
<module>implementation-das</module>
- <module>implementation-data-api</module>
<module>implementation-data-xml</module>
<module>implementation-ejb</module>
<module>implementation-ejb-xml</module>
Modified: incubator/tuscany/java/sca/samples/domain-management/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/domain-management/pom.xml?rev=664283&r1=664282&r2=664283&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/domain-management/pom.xml (original)
+++ incubator/tuscany/java/sca/samples/domain-management/pom.xml Fri Jun 6 22:20:05 2008
@@ -171,7 +171,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-data-api</artifactId>
+ <artifactId>tuscany-data-api</artifactId>
<version>2.0-incubating-SNAPSHOT</version>
<scope>test</scope>
</dependency>