Author: hasan
Date: Wed Jan 13 14:17:55 2010
New Revision: 898761

URL: http://svn.apache.org/viewvc?rev=898761&view=rev
Log:
CLEREZZA-58: minor changes in ontology and ResourceTagger

Modified:
    
incubator/clerezza/issues/CLEREZZA-58/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/GenericResourcePage.java
    
incubator/clerezza/issues/CLEREZZA-58/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ResourceTagger.java
    
incubator/clerezza/issues/CLEREZZA-58/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.ontologies/src/main/resources/org/apache/clerezza/platform/concepts/ontologies/concepts.rdf

Modified: 
incubator/clerezza/issues/CLEREZZA-58/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/GenericResourcePage.java
URL: 
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-58/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/GenericResourcePage.java?rev=898761&r1=898760&r2=898761&view=diff
==============================================================================
--- 
incubator/clerezza/issues/CLEREZZA-58/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/GenericResourcePage.java
 (original)
+++ 
incubator/clerezza/issues/CLEREZZA-58/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/GenericResourcePage.java
 Wed Jan 13 14:17:55 2010
@@ -82,8 +82,7 @@
         * @return GraphNode
         */
        @GET
-       public GraphNode GenericResourcePage(@QueryParam("uri") UriRef uri,
-                       @Context UriInfo uriInfo) {
+       public GraphNode GenericResourcePage(@QueryParam("uri") UriRef uri) {
 
                GraphNode node = new GraphNode(new BNode(), new UnionMGraph(new 
SimpleMGraph(),
                                cgProvider.getContentGraph()));

Modified: 
incubator/clerezza/issues/CLEREZZA-58/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ResourceTagger.java
URL: 
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-58/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ResourceTagger.java?rev=898761&r1=898760&r2=898761&view=diff
==============================================================================
--- 
incubator/clerezza/issues/CLEREZZA-58/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ResourceTagger.java
 (original)
+++ 
incubator/clerezza/issues/CLEREZZA-58/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ResourceTagger.java
 Wed Jan 13 14:17:55 2010
@@ -88,19 +88,18 @@
        @POST
        @Path("set")
        public Response updateConcepts(@FormParam("uri") UriRef uri,
-                       @FormParam("concepts") List<String> concepts,
+                       @FormParam("concepts") List<UriRef> concepts,
                        @Context UriInfo uriInfo) {
 
-               
                if (uri != null) {
                        GraphNode node = new GraphNode(uri, 
cgProvider.getContentGraph());
                        node.deleteProperties(DCTERMS.subject);
                        if(concepts != null) {
-                               for (String subject : concepts) {
-                                       node.addProperty(DCTERMS.subject, new 
UriRef(subject));
+                               for (UriRef concept : concepts) {
+                                       node.addProperty(DCTERMS.subject, 
concept);
                                }
                        }
-               } else if(uri != null){
+               } else {
                        throw new WebApplicationException(Response.status(
                                        Status.BAD_REQUEST).entity("No resource 
uri defined.").build());
                }

Modified: 
incubator/clerezza/issues/CLEREZZA-58/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.ontologies/src/main/resources/org/apache/clerezza/platform/concepts/ontologies/concepts.rdf
URL: 
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-58/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.ontologies/src/main/resources/org/apache/clerezza/platform/concepts/ontologies/concepts.rdf?rev=898761&r1=898760&r2=898761&view=diff
==============================================================================
--- 
incubator/clerezza/issues/CLEREZZA-58/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.ontologies/src/main/resources/org/apache/clerezza/platform/concepts/ontologies/concepts.rdf
 (original)
+++ 
incubator/clerezza/issues/CLEREZZA-58/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.ontologies/src/main/resources/org/apache/clerezza/platform/concepts/ontologies/concepts.rdf
 Wed Jan 13 14:17:55 2010
@@ -162,9 +162,10 @@
 
 <rdf:Property rdf:about="#resource">
        <rdf:type rdf:resource="owl:ObjectProperty"/>
-       <rdfs:label xml:lang="en">Resource</rdfs:label>
-       <skos:definition xml:lang="en">Points to a resource.</skos:definition>
-       <rdfs:domain rdf:resource="#GenericConceptScheme"/>
+       <rdfs:label xml:lang="en">resource</rdfs:label>
+       <skos:definition xml:lang="en">Points to a resource which the subject 
presents.</skos:definition>
+       <rdfs:domain rdf:resource="#GenericResourcePage"/>
+       <rdfs:range rdf:resource="rdfs:Resource"/>
 </rdf:Property>
 
 </rdf:RDF>


Reply via email to