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 2009/09/13 22:34:22 UTC
svn commit: r814408 - in /incubator/photark/trunk: assets/src/main/java/org/
assets/src/main/java/org/apache/ assets/src/main/java/org/apache/photark/
assets/src/main/java/org/apache/photark/services/
assets/src/main/java/org/apache/photark/services/al...
Author: lresende
Date: Sun Sep 13 22:34:21 2009
New Revision: 814408
URL: http://svn.apache.org/viewvc?rev=814408&view=rev
Log:
Refactoring to use org.apache.photark package + minor cleanups on xml files
Added:
incubator/photark/trunk/assets/src/main/java/org/
incubator/photark/trunk/assets/src/main/java/org/apache/
incubator/photark/trunk/assets/src/main/java/org/apache/photark/
incubator/photark/trunk/assets/src/main/java/org/apache/photark/services/
incubator/photark/trunk/assets/src/main/java/org/apache/photark/services/album/
incubator/photark/trunk/assets/src/main/java/org/apache/photark/services/album/Album.java (contents, props changed)
- copied, changed from r814407, incubator/photark/trunk/assets/src/main/java/services/Album.java
incubator/photark/trunk/assets/src/main/java/org/apache/photark/services/album/AlbumAgregator.java (contents, props changed)
- copied, changed from r814407, incubator/photark/trunk/assets/src/main/java/services/AlbumAgregator.java
incubator/photark/trunk/assets/src/main/java/org/apache/photark/services/album/filesystem/
incubator/photark/trunk/assets/src/main/java/org/apache/photark/services/album/filesystem/AlbumImpl.java (contents, props changed)
- copied, changed from r814407, incubator/photark/trunk/assets/src/main/java/services/filesystem/AlbumImpl.java
incubator/photark/trunk/assets/src/main/java/org/apache/photark/services/album/jcr/
incubator/photark/trunk/assets/src/main/java/org/apache/photark/services/album/jcr/AlbumImpl.java (contents, props changed)
- copied, changed from r814407, incubator/photark/trunk/assets/src/main/java/services/jcr/AlbumImpl.java
Removed:
incubator/photark/trunk/assets/src/main/java/services/
Modified:
incubator/photark/trunk/assets/src/main/resources/META-INF/sca-contribution.xml
incubator/photark/trunk/photark-webapp/src/main/webapp/META-INF/sca-contribution.xml
incubator/photark/trunk/photark/src/main/resources/META-INF/sca-contribution.xml
incubator/photark/trunk/photark/src/main/resources/photo-gallery-jcr.composite
incubator/photark/trunk/photark/src/main/resources/photo-gallery.composite
Copied: incubator/photark/trunk/assets/src/main/java/org/apache/photark/services/album/Album.java (from r814407, incubator/photark/trunk/assets/src/main/java/services/Album.java)
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/assets/src/main/java/org/apache/photark/services/album/Album.java?p2=incubator/photark/trunk/assets/src/main/java/org/apache/photark/services/album/Album.java&p1=incubator/photark/trunk/assets/src/main/java/services/Album.java&r1=814407&r2=814408&rev=814408&view=diff
==============================================================================
--- incubator/photark/trunk/assets/src/main/java/services/Album.java (original)
+++ incubator/photark/trunk/assets/src/main/java/org/apache/photark/services/album/Album.java Sun Sep 13 22:34:21 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package services;
+package org.apache.photark.services.album;
import org.osoa.sca.annotations.Remotable;
Propchange: incubator/photark/trunk/assets/src/main/java/org/apache/photark/services/album/Album.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/photark/trunk/assets/src/main/java/org/apache/photark/services/album/Album.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/photark/trunk/assets/src/main/java/org/apache/photark/services/album/AlbumAgregator.java (from r814407, incubator/photark/trunk/assets/src/main/java/services/AlbumAgregator.java)
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/assets/src/main/java/org/apache/photark/services/album/AlbumAgregator.java?p2=incubator/photark/trunk/assets/src/main/java/org/apache/photark/services/album/AlbumAgregator.java&p1=incubator/photark/trunk/assets/src/main/java/services/AlbumAgregator.java&r1=814407&r2=814408&rev=814408&view=diff
==============================================================================
--- incubator/photark/trunk/assets/src/main/java/services/AlbumAgregator.java (original)
+++ incubator/photark/trunk/assets/src/main/java/org/apache/photark/services/album/AlbumAgregator.java Sun Sep 13 22:34:21 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package services;
+package org.apache.photark.services.album;
import java.util.ArrayList;
import java.util.List;
Propchange: incubator/photark/trunk/assets/src/main/java/org/apache/photark/services/album/AlbumAgregator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/photark/trunk/assets/src/main/java/org/apache/photark/services/album/AlbumAgregator.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/photark/trunk/assets/src/main/java/org/apache/photark/services/album/filesystem/AlbumImpl.java (from r814407, incubator/photark/trunk/assets/src/main/java/services/filesystem/AlbumImpl.java)
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/assets/src/main/java/org/apache/photark/services/album/filesystem/AlbumImpl.java?p2=incubator/photark/trunk/assets/src/main/java/org/apache/photark/services/album/filesystem/AlbumImpl.java&p1=incubator/photark/trunk/assets/src/main/java/services/filesystem/AlbumImpl.java&r1=814407&r2=814408&rev=814408&view=diff
==============================================================================
--- incubator/photark/trunk/assets/src/main/java/services/filesystem/AlbumImpl.java (original)
+++ incubator/photark/trunk/assets/src/main/java/org/apache/photark/services/album/filesystem/AlbumImpl.java Sun Sep 13 22:34:21 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package services.filesystem;
+package org.apache.photark.services.album.filesystem;
import java.io.File;
import java.io.FilenameFilter;
@@ -25,10 +25,10 @@
import java.util.ArrayList;
import java.util.List;
+import org.apache.photark.services.album.Album;
import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Property;
-import services.Album;
public class AlbumImpl implements Album {
private String gallery;
Propchange: incubator/photark/trunk/assets/src/main/java/org/apache/photark/services/album/filesystem/AlbumImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/photark/trunk/assets/src/main/java/org/apache/photark/services/album/filesystem/AlbumImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/photark/trunk/assets/src/main/java/org/apache/photark/services/album/filesystem/AlbumImpl.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: incubator/photark/trunk/assets/src/main/java/org/apache/photark/services/album/jcr/AlbumImpl.java (from r814407, incubator/photark/trunk/assets/src/main/java/services/jcr/AlbumImpl.java)
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/assets/src/main/java/org/apache/photark/services/album/jcr/AlbumImpl.java?p2=incubator/photark/trunk/assets/src/main/java/org/apache/photark/services/album/jcr/AlbumImpl.java&p1=incubator/photark/trunk/assets/src/main/java/services/jcr/AlbumImpl.java&r1=814407&r2=814408&rev=814408&view=diff
==============================================================================
--- incubator/photark/trunk/assets/src/main/java/services/jcr/AlbumImpl.java (original)
+++ incubator/photark/trunk/assets/src/main/java/org/apache/photark/services/album/jcr/AlbumImpl.java Sun Sep 13 22:34:21 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package services.jcr;
+package org.apache.photark.services.album.jcr;
import java.io.File;
import java.io.FilenameFilter;
@@ -33,10 +33,10 @@
import javax.jcr.SimpleCredentials;
import org.apache.jackrabbit.core.TransientRepository;
+import org.apache.photark.services.album.Album;
import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Property;
-import services.Album;
public class AlbumImpl implements Album {
private String gallery;
Propchange: incubator/photark/trunk/assets/src/main/java/org/apache/photark/services/album/jcr/AlbumImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/photark/trunk/assets/src/main/java/org/apache/photark/services/album/jcr/AlbumImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/photark/trunk/assets/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/assets/src/main/resources/META-INF/sca-contribution.xml?rev=814408&r1=814407&r2=814408&view=diff
==============================================================================
--- incubator/photark/trunk/assets/src/main/resources/META-INF/sca-contribution.xml (original)
+++ incubator/photark/trunk/assets/src/main/resources/META-INF/sca-contribution.xml Sun Sep 13 22:34:21 2009
@@ -18,7 +18,7 @@
* under the License.
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
- <export.java package="services"/>
- <export.java package="services.filesystem"/>
- <export.java package="services.jcr"/>
+ <export.java package="org.apache.photark.services.album"/>
+ <export.java package="org.apache.photark.services.album.filesystem"/>
+ <export.java package="org.apache.photark.services.album.jcr"/>
</contribution>
\ No newline at end of file
Modified: incubator/photark/trunk/photark-webapp/src/main/webapp/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-webapp/src/main/webapp/META-INF/sca-contribution.xml?rev=814408&r1=814407&r2=814408&view=diff
==============================================================================
--- incubator/photark/trunk/photark-webapp/src/main/webapp/META-INF/sca-contribution.xml (original)
+++ incubator/photark/trunk/photark-webapp/src/main/webapp/META-INF/sca-contribution.xml Sun Sep 13 22:34:21 2009
@@ -18,10 +18,9 @@
* under the License.
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://photark"
- xmlns:p="http://photo-gallery">
- <import.java package="services"/>
- <import.java package="services.filesystem"/>
- <import.java package="services.jcr"/>
- <deployable composite="p:photo-gallery"/>
+ xmlns:photark="http://org.apache.photoark">
+ <import.java package="org.apache.photark.services.album"/>
+ <import.java package="org.apache.photark.services.album.filesystem"/>
+ <import.java package="org.apache.photark.services.album.jcr"/>
+ <deployable composite="photark:photo-gallery"/>
</contribution>
Modified: incubator/photark/trunk/photark/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark/src/main/resources/META-INF/sca-contribution.xml?rev=814408&r1=814407&r2=814408&view=diff
==============================================================================
--- incubator/photark/trunk/photark/src/main/resources/META-INF/sca-contribution.xml (original)
+++ incubator/photark/trunk/photark/src/main/resources/META-INF/sca-contribution.xml Sun Sep 13 22:34:21 2009
@@ -17,8 +17,9 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
- <import.java package="services"/>
- <import.java package="services.filesystem"/>
- <import.java package="services.jcr"/>
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ xmlns:photark="http://org.apache.photoark">
+ <import.java package="org.apache.photark.services.album"/>
+ <import.java package="org.apache.photark.services.album.filesystem"/>
+ <import.java package="org.apache.photark.services.album.jcr"/>
</contribution>
\ No newline at end of file
Modified: incubator/photark/trunk/photark/src/main/resources/photo-gallery-jcr.composite
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark/src/main/resources/photo-gallery-jcr.composite?rev=814408&r1=814407&r2=814408&view=diff
==============================================================================
--- incubator/photark/trunk/photark/src/main/resources/photo-gallery-jcr.composite (original)
+++ incubator/photark/trunk/photark/src/main/resources/photo-gallery-jcr.composite Sun Sep 13 22:34:21 2009
@@ -18,30 +18,31 @@
* under the License.
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://photo-gallery"
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+ xmlns:photark="http://org.apache.photoark"
+ targetNamespace="http://org.apache.photoark"
name="photo-gallery">
<component name="Gallery">
- <t:implementation.widget location="gallery.html"/>
+ <tuscany:implementation.widget location="gallery.html"/>
<service name="Widget">
- <t:binding.http uri="/gallery"/>
+ <tuscany:binding.http uri="/gallery"/>
</service>
<reference name="album" target="Album">
- <t:binding.jsonrpc/>
+ <tuscany:binding.jsonrpc/>
</reference>
</component>
<component name="Album">
- <implementation.java class="services.jcr.AlbumImpl"/>
+ <implementation.java class="org.apache.photark.services.album.jcr.AlbumImpl"/>
<property name="gallery">gallery</property>
<property name="album">boston</property>
<service name="Album">
- <t:binding.jsonrpc/>
+ <tuscany:binding.jsonrpc/>
</service>
</component>
<component name="GalleryPictures">
- <t:implementation.resource location="gallery"></t:implementation.resource>
+ <tuscany:implementation.resource location="gallery"/>
</component>
</composite>
Modified: incubator/photark/trunk/photark/src/main/resources/photo-gallery.composite
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark/src/main/resources/photo-gallery.composite?rev=814408&r1=814407&r2=814408&view=diff
==============================================================================
--- incubator/photark/trunk/photark/src/main/resources/photo-gallery.composite (original)
+++ incubator/photark/trunk/photark/src/main/resources/photo-gallery.composite Sun Sep 13 22:34:21 2009
@@ -18,42 +18,43 @@
* under the License.
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://photo-gallery"
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+ xmlns:photark="http://org.apache.photoark"
+ targetNamespace="http://org.apache.photoark"
name="photo-gallery">
<component name="Gallery">
- <t:implementation.widget location="gallery.html"/>
+ <tuscany:implementation.widget location="gallery.html"/>
<service name="Widget">
- <t:binding.http uri="/gallery"/>
+ <tuscany:binding.http uri="/gallery"/>
</service>
<reference name="album" target="AlbumAgregator/Album">
- <t:binding.jsonrpc/>
+ <tuscany:binding.jsonrpc/>
</reference>
</component>
<component name="AlbumAgregator">
- <implementation.java class="services.AlbumAgregator"/>
+ <implementation.java class="org.apache.photark.services.album.AlbumAgregator"/>
<service name="Album">
- <t:binding.jsonrpc/>
+ <tuscany:binding.jsonrpc/>
</service>
<reference name="album" target="Album"/>
<reference name="albumFeed">
- <t:binding.atom uri="http://api.flickr.com/services/feeds/photoset.gne?set=72157601530865813&nsid=36437931@N00&lang=en-us"/>
+ <tuscany:binding.atom uri="http://api.flickr.com/services/feeds/photoset.gne?set=72157601530865813&nsid=36437931@N00&lang=en-us"/>
</reference>
<reference name="albumPicassa">
- <t:binding.gdata uri="http://picasaweb.google.com/data/feed/api/user/haibotuscany/album/flowers" serviceType="lh2" username="haibotuscany@gmail.com" password="gsocgsocgsoc"/>
+ <tuscany:binding.gdata uri="http://picasaweb.google.com/data/feed/api/user/haibotuscany/album/flowers" serviceType="lh2" username="haibotuscany@gmail.com" password="gsocgsocgsoc"/>
</reference>
</component>
<component name="Album">
- <implementation.java class="services.filesystem.AlbumImpl"/>
+ <implementation.java class="org.apache.photark.services.album.filesystem.AlbumImpl"/>
<property name="gallery">gallery</property>
<property name="album">boston</property>
</component>
<component name="GalleryPictures">
- <t:implementation.resource location="gallery"></t:implementation.resource>
+ <tuscany:implementation.resource location="gallery"/>
</component>
</composite>