You are viewing a plain text version of this content. The canonical link for it is here.
Posted to photark-commits@incubator.apache.org by lr...@apache.org on 2011/01/23 07:19:12 UTC
svn commit: r1062339 - in /incubator/photark/branches/photark-rest:
photark-flickr/src/test/java/org/apache/photark/album/flickr/
photark-jcr/src/main/java/org/apache/photark/services/jcr/
photark-jcr/src/test/java/org/apache/photark/services/jcr/ phot...
Author: lresende
Date: Sun Jan 23 07:19:11 2011
New Revision: 1062339
URL: http://svn.apache.org/viewvc?rev=1062339&view=rev
Log:
Fixing compilation issues due to corrupted refactoring of RemoteSubscription
Added:
incubator/photark/branches/photark-rest/photark-flickr/src/test/java/org/apache/photark/album/flickr/FlickrPhotoStreamProviderTestCase.java (contents, props changed)
- copied, changed from r1035534, incubator/photark/branches/photark-rest/photark-flickr/src/test/java/org/apache/photark/album/flickr/FlickrAlbumProviderTestCase.java
incubator/photark/branches/photark-rest/photark/src/main/java/org/apache/photark/subscription/
incubator/photark/branches/photark-rest/photark/src/main/java/org/apache/photark/subscription/SubscriptionConfig.java (contents, props changed)
- copied, changed from r1035534, incubator/photark/branches/photark-rest/photark/src/main/java/org/apache/photark/RemoteAlbum.java
Removed:
incubator/photark/branches/photark-rest/photark-flickr/src/test/java/org/apache/photark/album/flickr/FlickrAlbumProviderTestCase.java
incubator/photark/branches/photark-rest/photark/src/main/java/org/apache/photark/RemoteAlbum.java
Modified:
incubator/photark/branches/photark-rest/photark-jcr/src/main/java/org/apache/photark/services/jcr/JCRSubscriptionCollection.java
incubator/photark/branches/photark-rest/photark-jcr/src/test/java/org/apache/photark/services/jcr/JCRSubscriptionCollectionTestCase.java
incubator/photark/branches/photark-rest/photark/src/main/java/org/apache/photark/services/SubscriptionCollection.java
Copied: incubator/photark/branches/photark-rest/photark-flickr/src/test/java/org/apache/photark/album/flickr/FlickrPhotoStreamProviderTestCase.java (from r1035534, incubator/photark/branches/photark-rest/photark-flickr/src/test/java/org/apache/photark/album/flickr/FlickrAlbumProviderTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/photark/branches/photark-rest/photark-flickr/src/test/java/org/apache/photark/album/flickr/FlickrPhotoStreamProviderTestCase.java?p2=incubator/photark/branches/photark-rest/photark-flickr/src/test/java/org/apache/photark/album/flickr/FlickrPhotoStreamProviderTestCase.java&p1=incubator/photark/branches/photark-rest/photark-flickr/src/test/java/org/apache/photark/album/flickr/FlickrAlbumProviderTestCase.java&r1=1035534&r2=1062339&rev=1062339&view=diff
==============================================================================
--- incubator/photark/branches/photark-rest/photark-flickr/src/test/java/org/apache/photark/album/flickr/FlickrAlbumProviderTestCase.java (original)
+++ incubator/photark/branches/photark-rest/photark-flickr/src/test/java/org/apache/photark/album/flickr/FlickrPhotoStreamProviderTestCase.java Sun Jan 23 07:19:11 2011
@@ -26,18 +26,18 @@ import org.apache.photark.subscription.S
import org.junit.BeforeClass;
import org.junit.Test;
-public class FlickrAlbumProviderTestCase {
+public class FlickrPhotoStreamProviderTestCase {
private static final String SUBSCRIPTION_URL = "http://api.flickr.com/services/feeds/photos_public.gne?id=24662369@N07&lang=en-us&format=atom";
- private static FlickrPhotoStreamProvider flickrAlbumProvider;
+ private static FlickrPhotoStreamProvider flickrPhotoStreamProvider;
@BeforeClass
public static void BeforeClass() {
- flickrAlbumProvider = new FlickrPhotoStreamProvider();
+ flickrPhotoStreamProvider = new FlickrPhotoStreamProvider();
}
@Test
public void testDiscoverAlbums() throws Exception {
- List<Image> images = flickrAlbumProvider.getImages(createAlbumConfig());
+ List<Image> images = flickrPhotoStreamProvider.getImages(createSubcriptionConfig());
for(Image image : images) {
System.out.println(">>>>>>>>>>>>>");
@@ -47,11 +47,11 @@ public class FlickrAlbumProviderTestCase
}
}
- private static SubscriptionConfig createAlbumConfig() {
+ private static SubscriptionConfig createSubcriptionConfig() {
SubscriptionConfig album = new SubscriptionConfig();
album.setId("24662369");
album.setName("NASA Goddard");
- album.setType(flickrAlbumProvider.getProviderType());
+ album.setType(flickrPhotoStreamProvider.getProviderType());
album.setUrl(SUBSCRIPTION_URL);
return album;
Propchange: incubator/photark/branches/photark-rest/photark-flickr/src/test/java/org/apache/photark/album/flickr/FlickrPhotoStreamProviderTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/photark/branches/photark-rest/photark-flickr/src/test/java/org/apache/photark/album/flickr/FlickrPhotoStreamProviderTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/photark/branches/photark-rest/photark-jcr/src/main/java/org/apache/photark/services/jcr/JCRSubscriptionCollection.java
URL: http://svn.apache.org/viewvc/incubator/photark/branches/photark-rest/photark-jcr/src/main/java/org/apache/photark/services/jcr/JCRSubscriptionCollection.java?rev=1062339&r1=1062338&r2=1062339&view=diff
==============================================================================
--- incubator/photark/branches/photark-rest/photark-jcr/src/main/java/org/apache/photark/services/jcr/JCRSubscriptionCollection.java (original)
+++ incubator/photark/branches/photark-rest/photark-jcr/src/main/java/org/apache/photark/services/jcr/JCRSubscriptionCollection.java Sun Jan 23 07:19:11 2011
@@ -30,8 +30,8 @@ import javax.jcr.NodeIterator;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import org.apache.photark.RemoteAlbum;
import org.apache.photark.services.SubscriptionCollection;
+import org.apache.photark.subscription.SubscriptionConfig;
import org.apache.tuscany.sca.data.collection.Entry;
import org.apache.tuscany.sca.data.collection.NotFoundException;
import org.oasisopen.sca.annotation.Destroy;
@@ -53,7 +53,7 @@ public class JCRSubscriptionCollection i
private JCRRepositoryManager repositoryManager;
- private Map<String, RemoteAlbum> subscriptions = new HashMap<String, RemoteAlbum>();
+ private Map<String, SubscriptionConfig> subscriptions = new HashMap<String, SubscriptionConfig>();
public JCRSubscriptionCollection() {
@@ -76,7 +76,7 @@ public class JCRSubscriptionCollection i
continue;
}
- RemoteAlbum subscription = fromNode(subscriptionNode);
+ SubscriptionConfig subscription = fromNode(subscriptionNode);
if (!subscriptions.containsKey(subscription.getTitle())) {
subscriptions.put(subscription.getTitle(),subscription);
}
@@ -93,17 +93,17 @@ public class JCRSubscriptionCollection i
}
- public Entry<String, RemoteAlbum>[] getAll() {
- Entry<String, RemoteAlbum>[] entries = new Entry[subscriptions.size()];
+ public Entry<String, SubscriptionConfig>[] getAll() {
+ Entry<String, SubscriptionConfig>[] entries = new Entry[subscriptions.size()];
int i = 0;
- for (Map.Entry<String, RemoteAlbum> e: subscriptions.entrySet()) {
- entries[i++] = new Entry<String, RemoteAlbum>(e.getKey(), e.getValue());
+ for (Map.Entry<String, SubscriptionConfig> e: subscriptions.entrySet()) {
+ entries[i++] = new Entry<String, SubscriptionConfig>(e.getKey(), e.getValue());
}
return entries;
}
- public RemoteAlbum get(String key) throws NotFoundException {
- RemoteAlbum subscription = subscriptions.get(key);
+ public SubscriptionConfig get(String key) throws NotFoundException {
+ SubscriptionConfig subscription = subscriptions.get(key);
if (subscription == null) {
throw new NotFoundException(key);
} else {
@@ -112,7 +112,7 @@ public class JCRSubscriptionCollection i
}
- public String post(String key, RemoteAlbum subscription) {
+ public String post(String key, SubscriptionConfig subscription) {
if (subscription.getTitle() == null && subscription.getTitle().length() == 0) {
key = "subscription-" + UUID.randomUUID().toString();
subscription.setTitle(key);
@@ -141,7 +141,7 @@ public class JCRSubscriptionCollection i
return key;
}
- public void put(String key, RemoteAlbum subscription) throws NotFoundException {
+ public void put(String key, SubscriptionConfig subscription) throws NotFoundException {
try {
Session session = repositoryManager.getSession();
Node rootNode = getSubscriptionRootNode(session);
@@ -183,7 +183,7 @@ public class JCRSubscriptionCollection i
}
}
- public Entry<String, RemoteAlbum>[] query(String query) {
+ public Entry<String, SubscriptionConfig>[] query(String query) {
throw new UnsupportedOperationException("Not implemented");
}
@@ -210,13 +210,13 @@ public class JCRSubscriptionCollection i
return rootNode;
}
- private RemoteAlbum fromNode(Node subscriptionNode) {
- RemoteAlbum subscription = null;
+ private SubscriptionConfig fromNode(Node subscriptionNode) {
+ SubscriptionConfig subscription = null;
try {
- subscription = new RemoteAlbum();
+ subscription = new SubscriptionConfig();
subscription.setTitle(subscriptionNode.getProperty("title").getValue().toString());
subscription.setType(subscriptionNode.getProperty("type").getValue().toString());
- subscription.setRemoteLocation(subscriptionNode.getProperty("url").getValue().toString());
+ subscription.setUrl(subscriptionNode.getProperty("url").getValue().toString());
} catch(Exception e) {
logger.log(Level.WARNING, "Can't read subscription node :" + e.getMessage(), e);
}
@@ -224,11 +224,11 @@ public class JCRSubscriptionCollection i
return subscription;
}
- private void fromSubscription(Node subscriptionNode, RemoteAlbum subscription) {
+ private void fromSubscription(Node subscriptionNode, SubscriptionConfig subscription) {
try {
subscriptionNode.setProperty("title", subscription.getTitle());
subscriptionNode.setProperty("type", subscription.getType());
- subscriptionNode.setProperty("url", subscription.getRemoteLocation());
+ subscriptionNode.setProperty("url", subscription.getUrl());
} catch(Exception e) {
logger.log(Level.WARNING, "Can't save subscription node :" + e.getMessage(), e);
}
Modified: incubator/photark/branches/photark-rest/photark-jcr/src/test/java/org/apache/photark/services/jcr/JCRSubscriptionCollectionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/photark/branches/photark-rest/photark-jcr/src/test/java/org/apache/photark/services/jcr/JCRSubscriptionCollectionTestCase.java?rev=1062339&r1=1062338&r2=1062339&view=diff
==============================================================================
--- incubator/photark/branches/photark-rest/photark-jcr/src/test/java/org/apache/photark/services/jcr/JCRSubscriptionCollectionTestCase.java (original)
+++ incubator/photark/branches/photark-rest/photark-jcr/src/test/java/org/apache/photark/services/jcr/JCRSubscriptionCollectionTestCase.java Sun Jan 23 07:19:11 2011
@@ -21,8 +21,8 @@ package org.apache.photark.services.jcr;
import junit.framework.Assert;
-import org.apache.photark.RemoteAlbum;
import org.apache.photark.services.SubscriptionCollection;
+import org.apache.photark.subscription.SubscriptionConfig;
import org.apache.tuscany.sca.data.collection.NotFoundException;
import org.apache.tuscany.sca.node.Contribution;
import org.apache.tuscany.sca.node.ContributionLocationHelper;
@@ -56,10 +56,10 @@ public class JCRSubscriptionCollectionTe
@Test
public void testAddSubscription() throws Exception {
- RemoteAlbum subscription = new RemoteAlbum();
+ SubscriptionConfig subscription = new SubscriptionConfig();
subscription.setTitle("Test 01");
subscription.setType("flickr");
- subscription.setRemoteLocation("http://api.flickr.com/services/feeds/photos_public.gne?id=24662369@N07&lang=en-us&format=atom");
+ subscription.setUrl("http://api.flickr.com/services/feeds/photos_public.gne?id=24662369@N07&lang=en-us&format=atom");
subscriptions.post(subscription.getTitle(), subscription);
@@ -68,10 +68,10 @@ public class JCRSubscriptionCollectionTe
@Test
public void testUpdateSubscription() throws Exception {
- RemoteAlbum subscription = new RemoteAlbum();
+ SubscriptionConfig subscription = new SubscriptionConfig();
subscription.setTitle("Test 02");
subscription.setType("flickr");
- subscription.setRemoteLocation("http://localhost/xxx");
+ subscription.setUrl("http://localhost/xxx");
try {
subscriptions.get(subscription.getTitle());
@@ -81,11 +81,11 @@ public class JCRSubscriptionCollectionTe
subscriptions.post(subscription.getTitle(), subscription);
- subscription.setRemoteLocation("http://api.flickr.com/services/feeds/photos_public.gne?id=24662369@N07&lang=en-us&format=atom");
+ subscription.setUrl("http://api.flickr.com/services/feeds/photos_public.gne?id=24662369@N07&lang=en-us&format=atom");
subscriptions.post(subscription.getTitle(), subscription);
- RemoteAlbum subscritionRead = subscriptions.get(subscription.getTitle());
+ SubscriptionConfig subscritionRead = subscriptions.get(subscription.getTitle());
Assert.assertEquals(subscription.getTitle(), subscritionRead.getTitle());
}
Modified: incubator/photark/branches/photark-rest/photark/src/main/java/org/apache/photark/services/SubscriptionCollection.java
URL: http://svn.apache.org/viewvc/incubator/photark/branches/photark-rest/photark/src/main/java/org/apache/photark/services/SubscriptionCollection.java?rev=1062339&r1=1062338&r2=1062339&view=diff
==============================================================================
--- incubator/photark/branches/photark-rest/photark/src/main/java/org/apache/photark/services/SubscriptionCollection.java (original)
+++ incubator/photark/branches/photark-rest/photark/src/main/java/org/apache/photark/services/SubscriptionCollection.java Sun Jan 23 07:19:11 2011
@@ -19,9 +19,9 @@
package org.apache.photark.services;
-import org.apache.photark.RemoteAlbum;
+import org.apache.photark.subscription.SubscriptionConfig;
import org.apache.tuscany.sca.data.collection.Collection;
-public interface SubscriptionCollection extends Collection<String, RemoteAlbum>{
+public interface SubscriptionCollection extends Collection<String, SubscriptionConfig>{
}
Copied: incubator/photark/branches/photark-rest/photark/src/main/java/org/apache/photark/subscription/SubscriptionConfig.java (from r1035534, incubator/photark/branches/photark-rest/photark/src/main/java/org/apache/photark/RemoteAlbum.java)
URL: http://svn.apache.org/viewvc/incubator/photark/branches/photark-rest/photark/src/main/java/org/apache/photark/subscription/SubscriptionConfig.java?p2=incubator/photark/branches/photark-rest/photark/src/main/java/org/apache/photark/subscription/SubscriptionConfig.java&p1=incubator/photark/branches/photark-rest/photark/src/main/java/org/apache/photark/RemoteAlbum.java&r1=1035534&r2=1062339&rev=1062339&view=diff
==============================================================================
--- incubator/photark/branches/photark-rest/photark/src/main/java/org/apache/photark/RemoteAlbum.java (original)
+++ incubator/photark/branches/photark-rest/photark/src/main/java/org/apache/photark/subscription/SubscriptionConfig.java Sun Jan 23 07:19:11 2011
@@ -17,7 +17,9 @@
* under the License.
*/
-package org.apache.photark;
+package org.apache.photark.subscription;
+
+import org.apache.photark.Album;
/**
* Model representing a subscription where images are loded from
@@ -25,13 +27,32 @@ package org.apache.photark;
*
* @version $Rev$ $Date$
*/
-public class RemoteAlbum extends Album {
+public class SubscriptionConfig extends Album {
private static final long serialVersionUID = 1839829824832424269L;
+ private String id;
private String title;
private String type;
- private String remoteLocation;
+ private String url;
+ private String username;
+ private String password;
+
+ /**
+ * Get subscription ID
+ * @return
+ */
+ public String getId() {
+ return id;
+ }
+
+ /**
+ * Set subscription ID
+ * @param id
+ */
+ public void setId(String id) {
+ this.id = id;
+ }
/**
* Get subscription title
@@ -74,8 +95,8 @@ public class RemoteAlbum extends Album {
*
* @return the subscription url
*/
- public String getRemoteLocation() {
- return remoteLocation;
+ public String getUrl() {
+ return url;
}
/**
@@ -83,13 +104,45 @@ public class RemoteAlbum extends Album {
*
* @param url the subscription url
*/
- public void setRemoteLocation(String url) {
- this.remoteLocation = url;
+ public void setUrl(String url) {
+ this.url = url;
+ }
+
+ /**
+ * Get subscription username for authentication/authorization
+ * @return
+ */
+ public String getUsername() {
+ return username;
+ }
+
+ /**
+ * Set subscription username for authentication/authorization
+ * @param username
+ */
+ public void setUsername(String username) {
+ this.username = username;
+ }
+
+ /**
+ * Get subscription password for authentication/authorization
+ * @return
+ */
+ public String getPassword() {
+ return password;
+ }
+
+ /**
+ * Set subscription password for authentication/authorization
+ * @param password
+ */
+ public void setPassword(String password) {
+ this.password = password;
}
@Override
public String toString() {
- return "Subscription [title=" + title + ", type=" + type + ", remoteLocation=" + remoteLocation + "]";
+ return "Subscription [title=" + title + ", type=" + type + ", remoteLocation=" + url + "]";
}
Propchange: incubator/photark/branches/photark-rest/photark/src/main/java/org/apache/photark/subscription/SubscriptionConfig.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/photark/branches/photark-rest/photark/src/main/java/org/apache/photark/subscription/SubscriptionConfig.java
------------------------------------------------------------------------------
svn:keywords = Rev Date