Refactoring the model classes to be on the org.apache.photark models
git-svn-id: https://svn.apache.org/repos/asf/incubator/photark/trunk@905086 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/photark-jcr/src/main/java/org/apache/photark/services/album/jcr/AlbumImpl.java b/photark-jcr/src/main/java/org/apache/photark/services/album/jcr/AlbumImpl.java
index 35cc2af..b82b232 100644
--- a/photark-jcr/src/main/java/org/apache/photark/services/album/jcr/AlbumImpl.java
+++ b/photark-jcr/src/main/java/org/apache/photark/services/album/jcr/AlbumImpl.java
@@ -32,9 +32,9 @@
import javax.jcr.RepositoryException;
import javax.jcr.Session;
+import org.apache.photark.Picture;
import org.apache.photark.services.album.Album;
import org.apache.photark.services.album.ImageFilter;
-import org.apache.photark.services.album.model.Picture;
import org.apache.photark.services.gallery.jcr.JCRSession;
import org.oasisopen.sca.annotation.Init;
import org.oasisopen.sca.annotation.Property;
diff --git a/photark-jcr/src/main/java/org/apache/photark/upload/PhotoUploadServlet.java b/photark-jcr/src/main/java/org/apache/photark/upload/PhotoUploadServlet.java
index b567d06..173ad12 100644
--- a/photark-jcr/src/main/java/org/apache/photark/upload/PhotoUploadServlet.java
+++ b/photark-jcr/src/main/java/org/apache/photark/upload/PhotoUploadServlet.java
@@ -38,9 +38,9 @@
import org.apache.commons.fileupload.FileUploadException;
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.fileupload.servlet.ServletFileUpload;
+import org.apache.photark.Picture;
import org.apache.photark.services.album.Album;
import org.apache.photark.services.album.jcr.AlbumImpl;
-import org.apache.photark.services.album.model.Picture;
public class PhotoUploadServlet extends HttpServlet
{
diff --git a/photark/src/main/java/org/apache/photark/services/album/model/Picture.java b/photark/src/main/java/org/apache/photark/Picture.java
similarity index 84%
rename from photark/src/main/java/org/apache/photark/services/album/model/Picture.java
rename to photark/src/main/java/org/apache/photark/Picture.java
index 7dde4fa..af2cf7e 100644
--- a/photark/src/main/java/org/apache/photark/services/album/model/Picture.java
+++ b/photark/src/main/java/org/apache/photark/Picture.java
@@ -17,13 +17,20 @@
* under the License.
*/
-package org.apache.photark.services.album.model;
+package org.apache.photark;
import java.util.Date;
+import java.util.List;
+import java.util.Properties;
+/**
+ * Model representing an album image
+ */
public class Picture {
private String name;
+ private String description;
private Date creationDate;
+ private List<Properties> imageProperties;
public Picture(String name, Date createDate){
this.name = name;
diff --git a/photark/src/main/java/org/apache/photark/services/album/Album.java b/photark/src/main/java/org/apache/photark/services/album/Album.java
index a0e43ca..ef4178c 100644
--- a/photark/src/main/java/org/apache/photark/services/album/Album.java
+++ b/photark/src/main/java/org/apache/photark/services/album/Album.java
@@ -19,7 +19,7 @@
package org.apache.photark.services.album;
-import org.apache.photark.services.album.model.Picture;
+import org.apache.photark.Picture;
import org.oasisopen.sca.annotation.Remotable;
@Remotable
diff --git a/photark/src/main/java/org/apache/photark/services/album/AlbumAgregator.java b/photark/src/main/java/org/apache/photark/services/album/AlbumAgregator.java
index b448556..0e4a9db 100644
--- a/photark/src/main/java/org/apache/photark/services/album/AlbumAgregator.java
+++ b/photark/src/main/java/org/apache/photark/services/album/AlbumAgregator.java
@@ -22,7 +22,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.photark.services.album.model.Picture;
+import org.apache.photark.Picture;
import org.oasisopen.sca.annotation.Init;
import org.oasisopen.sca.annotation.Reference;
diff --git a/photark/src/main/java/org/apache/photark/services/album/filesystem/AlbumImpl.java b/photark/src/main/java/org/apache/photark/services/album/filesystem/AlbumImpl.java
index 6b9995d..78339bc 100644
--- a/photark/src/main/java/org/apache/photark/services/album/filesystem/AlbumImpl.java
+++ b/photark/src/main/java/org/apache/photark/services/album/filesystem/AlbumImpl.java
@@ -23,9 +23,9 @@
import java.util.ArrayList;
import java.util.List;
+import org.apache.photark.Picture;
import org.apache.photark.services.album.Album;
import org.apache.photark.services.album.ImageFilter;
-import org.apache.photark.services.album.model.Picture;
import org.oasisopen.sca.annotation.Init;
import org.oasisopen.sca.annotation.Property;
diff --git a/photark/src/main/java/org/apache/photark/services/gallery/AbsGalleryImpl.java b/photark/src/main/java/org/apache/photark/services/gallery/AbsGalleryImpl.java
index d756383..54ce713 100644
--- a/photark/src/main/java/org/apache/photark/services/gallery/AbsGalleryImpl.java
+++ b/photark/src/main/java/org/apache/photark/services/gallery/AbsGalleryImpl.java
@@ -22,8 +22,8 @@
import java.util.ArrayList;
import java.util.List;
+import org.apache.photark.Picture;
import org.apache.photark.services.album.Album;
-import org.apache.photark.services.album.model.Picture;
import org.oasisopen.sca.annotation.Property;
public abstract class AbsGalleryImpl implements Gallery {
