You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2009/12/23 15:43:07 UTC
svn commit: r893533 - in /incubator/clerezza: issues/CLEREZZA-51/
trunk/org.apache.clerezza.parent/
trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.imagemetadata/
trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.ontologies...
Author: reto
Date: Wed Dec 23 14:43:06 2009
New Revision: 893533
URL: http://svn.apache.org/viewvc?rev=893533&view=rev
Log:
CLEREZZA-51: closing
Added:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.imagemetadata/ (props changed)
- copied from r893434, incubator/clerezza/issues/CLEREZZA-51/org.apache.clerezza.platform.content.imagemetadata/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.ontologies/src/main/resources/org/apache/clerezza/rdf/ontologies/exif.rdf
- copied unchanged from r893434, incubator/clerezza/issues/CLEREZZA-51/org.apache.clerezza.rdf.ontologies/src/main/resources/org/apache/clerezza/rdf/ontologies/exif.rdf
Removed:
incubator/clerezza/issues/CLEREZZA-51/
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.ontologies/ (props changed)
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/ (props changed)
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/src/main/java/org/apache/clerezza/utils/imagemagick/ImageMagickProvider.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/src/test/java/org/apache/clerezza/utils/imagemagick/ImageMagickUtilsTest.java
incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml
Propchange: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.imagemetadata/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Dec 23 14:43:06 2009
@@ -0,0 +1 @@
+target
Propchange: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.ontologies/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 23 14:43:06 2009
@@ -1 +1,2 @@
/incubator/clerezza/issues/CLEREZZA-24/org.apache.clerezza.rdf.ontologies:890300-890330
+/incubator/clerezza/issues/CLEREZZA-51/org.apache.clerezza.rdf.ontologies:893214-893434
Propchange: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 23 14:43:06 2009
@@ -1 +1,2 @@
/incubator/clerezza/issues/CLEREZZA-42/org.apache.clerezza.utils.imagemagick:891740-891799
+/incubator/clerezza/issues/CLEREZZA-51/org.apache.clerezza.utils.imagemagick:893180-893434
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/src/main/java/org/apache/clerezza/utils/imagemagick/ImageMagickProvider.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/src/main/java/org/apache/clerezza/utils/imagemagick/ImageMagickProvider.java?rev=893533&r1=893532&r2=893533&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/src/main/java/org/apache/clerezza/utils/imagemagick/ImageMagickProvider.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/src/main/java/org/apache/clerezza/utils/imagemagick/ImageMagickProvider.java Wed Dec 23 14:43:06 2009
@@ -54,6 +54,7 @@
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
+import org.apache.felix.scr.annotations.Services;
/**
* This class implements interfaces that execute system calls to imageMagick.
@@ -77,7 +78,11 @@
@Property(name="minor_release_number", intValue=10, description="Specifies ImageMagick minor revision number (Syntax: release.version.majorRevision-minorRevision)."),
@Property(name="service.ranking", value="100")
})
-@Service(ImageProcessor.class)
+@Services({
+ @Service(ImageProcessor.class),
+ @Service(MetaDataProcessor.class)
+ })
+
public class ImageMagickProvider extends ImageProcessor implements MetaDataProcessor {
private String convert = "convert";
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/src/test/java/org/apache/clerezza/utils/imagemagick/ImageMagickUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/src/test/java/org/apache/clerezza/utils/imagemagick/ImageMagickUtilsTest.java?rev=893533&r1=893532&r2=893533&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/src/test/java/org/apache/clerezza/utils/imagemagick/ImageMagickUtilsTest.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/src/test/java/org/apache/clerezza/utils/imagemagick/ImageMagickUtilsTest.java Wed Dec 23 14:43:06 2009
@@ -133,6 +133,5 @@
(NonLiteral) it.next().getObject(),
new UriRef("http://www.w3.org/1999/02/22-rdf-syntax-ns#_1"),
new PlainLiteralImpl(".Joe O'Shaughnessy"))));
-
}
}
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml?rev=893533&r1=893532&r2=893533&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml Wed Dec 23 14:43:06 2009
@@ -39,7 +39,7 @@
<module>org.apache.clerezza.maven-ontologies-plugin</module>
<module>org.apache.clerezza.maven-pladoc-plugin</module>
<module>org.apache.clerezza.platform.config</module>
- <module>org.apache.clerezza.platform.content.imagemetadada</module>
+ <module>org.apache.clerezza.platform.content.imagemetadata</module>
<module>org.apache.clerezza.platform.content.representations</module>
<module>org.apache.clerezza.platform.documentation</module>
<module>org.apache.clerezza.platform.graphprovider.content</module>