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 2010/06/12 05:54:09 UTC
svn commit: r953941 - in /incubator/photark/trunk: ./
photark-appengine-webapp/war/META-INF/ photark-filesystem/src/main/resources/
photark-jcr/src/main/java/org/apache/photark/jcr/services/
photark-jcr/src/main/resources/META-INF/ photark-webapp/ phot...
Author: lresende
Date: Sat Jun 12 05:54:09 2010
New Revision: 953941
URL: http://svn.apache.org/viewvc?rev=953941&view=rev
Log:
Moving to Tuscany 2.0-M5
Modified:
incubator/photark/trunk/photark-appengine-webapp/war/META-INF/photo-gallery.composite
incubator/photark/trunk/photark-appengine-webapp/war/META-INF/sca-contribution.xml
incubator/photark/trunk/photark-filesystem/src/main/resources/sca-contribution.xml
incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/jcr/services/JCRImageUploadServiceImpl.java
incubator/photark/trunk/photark-jcr/src/main/resources/META-INF/sca-contribution.xml
incubator/photark/trunk/photark-webapp/pom.xml
incubator/photark/trunk/photark-webapp/src/main/webapp/META-INF/sca-contribution.xml
incubator/photark/trunk/photark-webapp/src/main/webapp/WEB-INF/web.composite
incubator/photark/trunk/photark/src/main/resources/META-INF/sca-contribution.xml
incubator/photark/trunk/pom.xml
Modified: incubator/photark/trunk/photark-appengine-webapp/war/META-INF/photo-gallery.composite
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-appengine-webapp/war/META-INF/photo-gallery.composite?rev=953941&r1=953940&r2=953941&view=diff
==============================================================================
--- incubator/photark/trunk/photark-appengine-webapp/war/META-INF/photo-gallery.composite (original)
+++ incubator/photark/trunk/photark-appengine-webapp/war/META-INF/photo-gallery.composite Sat Jun 12 05:54:09 2010
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
targetNamespace="http://org.apache.photoark"
name="photo-gallery">
Modified: incubator/photark/trunk/photark-appengine-webapp/war/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-appengine-webapp/war/META-INF/sca-contribution.xml?rev=953941&r1=953940&r2=953941&view=diff
==============================================================================
--- incubator/photark/trunk/photark-appengine-webapp/war/META-INF/sca-contribution.xml (original)
+++ incubator/photark/trunk/photark-appengine-webapp/war/META-INF/sca-contribution.xml Sat Jun 12 05:54:09 2010
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:photark="http://org.apache.photoark">
<deployable composite="photark:photo-gallery"/>
Modified: incubator/photark/trunk/photark-filesystem/src/main/resources/sca-contribution.xml
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-filesystem/src/main/resources/sca-contribution.xml?rev=953941&r1=953940&r2=953941&view=diff
==============================================================================
--- incubator/photark/trunk/photark-filesystem/src/main/resources/sca-contribution.xml (original)
+++ incubator/photark/trunk/photark-filesystem/src/main/resources/sca-contribution.xml Sat Jun 12 05:54:09 2010
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:photark="http://org.apache.photoark">
<export.java package="org.apache.photark.filesystem.services"/>
</contribution>
Modified: incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/jcr/services/JCRImageUploadServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/jcr/services/JCRImageUploadServiceImpl.java?rev=953941&r1=953940&r2=953941&view=diff
==============================================================================
--- incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/jcr/services/JCRImageUploadServiceImpl.java (original)
+++ incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/jcr/services/JCRImageUploadServiceImpl.java Sat Jun 12 05:54:09 2010
@@ -106,7 +106,7 @@ public class JCRImageUploadServiceImpl e
@SuppressWarnings("unchecked")
@Override
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
- response.setContentType("text/html");
+ response.setContentType("text/html;charset=UTF-8");
boolean isMultipartContent = ServletFileUpload.isMultipartContent(request);
if (!isMultipartContent) {
Modified: incubator/photark/trunk/photark-jcr/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-jcr/src/main/resources/META-INF/sca-contribution.xml?rev=953941&r1=953940&r2=953941&view=diff
==============================================================================
--- incubator/photark/trunk/photark-jcr/src/main/resources/META-INF/sca-contribution.xml (original)
+++ incubator/photark/trunk/photark-jcr/src/main/resources/META-INF/sca-contribution.xml Sat Jun 12 05:54:09 2010
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:photark="http://org.apache.photoark">
<export.java package="org.apache.photark.jcr.services"/>
</contribution>
Modified: incubator/photark/trunk/photark-webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-webapp/pom.xml?rev=953941&r1=953940&r2=953941&view=diff
==============================================================================
--- incubator/photark/trunk/photark-webapp/pom.xml (original)
+++ incubator/photark/trunk/photark-webapp/pom.xml Sat Jun 12 05:54:09 2010
@@ -153,13 +153,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.5.3</version>
+ <version>1.5.11</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.5.3</version>
+ <version>1.5.11</version>
</dependency>
<dependency>
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=953941&r1=953940&r2=953941&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 Sat Jun 12 05:54:09 2010
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:photark="http://org.apache.photoark">
<deployable composite="photark:photo-gallery-jcr"/>
Modified: incubator/photark/trunk/photark-webapp/src/main/webapp/WEB-INF/web.composite
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-webapp/src/main/webapp/WEB-INF/web.composite?rev=953941&r1=953940&r2=953941&view=diff
==============================================================================
--- incubator/photark/trunk/photark-webapp/src/main/webapp/WEB-INF/web.composite (original)
+++ incubator/photark/trunk/photark-webapp/src/main/webapp/WEB-INF/web.composite Sat Jun 12 05:54:09 2010
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
targetNamespace="http://org.apache.photoark"
name="photo-gallery-jcr">
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=953941&r1=953940&r2=953941&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 Sat Jun 12 05:54:09 2010
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:photark="http://org.apache.photoark">
<export.java package="org.apache.photark.services.album"/>
<export.java package="org.apache.photark.services.gallery"/>
Modified: incubator/photark/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/pom.xml?rev=953941&r1=953940&r2=953941&view=diff
==============================================================================
--- incubator/photark/trunk/pom.xml (original)
+++ incubator/photark/trunk/pom.xml Sat Jun 12 05:54:09 2010
@@ -89,7 +89,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <tuscany.version>2.0-M4</tuscany.version>
+ <tuscany.version>2.0-M5</tuscany.version>
</properties>