Return-Path: X-Original-To: apmail-clerezza-commits-archive@www.apache.org Delivered-To: apmail-clerezza-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7BAF010887 for ; Sun, 8 Dec 2013 13:14:04 +0000 (UTC) Received: (qmail 66258 invoked by uid 500); 8 Dec 2013 13:14:02 -0000 Delivered-To: apmail-clerezza-commits-archive@clerezza.apache.org Received: (qmail 66227 invoked by uid 500); 8 Dec 2013 13:13:59 -0000 Mailing-List: contact commits-help@clerezza.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@clerezza.apache.org Delivered-To: mailing list commits@clerezza.apache.org Received: (qmail 66214 invoked by uid 99); 8 Dec 2013 13:13:57 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 08 Dec 2013 13:13:57 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 08 Dec 2013 13:13:54 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5B8202388993; Sun, 8 Dec 2013 13:13:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1549028 - in /clerezza/trunk: rdf.core/src/main/java/org/apache/clerezza/rdf/core/ rdf.core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/ rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/ Date: Sun, 08 Dec 2013 13:13:33 -0000 To: commits@clerezza.apache.org From: misl@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131208131333.5B8202388993@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: misl Date: Sun Dec 8 13:13:32 2013 New Revision: 1549028 URL: http://svn.apache.org/r1549028 Log: CLEREZZA-850: reverted changes Modified: clerezza/trunk/rdf.core/src/main/java/org/apache/clerezza/rdf/core/Resource.java clerezza/trunk/rdf.core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/Expression.java clerezza/trunk/rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/HashMapSolutionMapping.java Modified: clerezza/trunk/rdf.core/src/main/java/org/apache/clerezza/rdf/core/Resource.java URL: http://svn.apache.org/viewvc/clerezza/trunk/rdf.core/src/main/java/org/apache/clerezza/rdf/core/Resource.java?rev=1549028&r1=1549027&r2=1549028&view=diff ============================================================================== --- clerezza/trunk/rdf.core/src/main/java/org/apache/clerezza/rdf/core/Resource.java (original) +++ clerezza/trunk/rdf.core/src/main/java/org/apache/clerezza/rdf/core/Resource.java Sun Dec 8 13:13:32 2013 @@ -18,7 +18,6 @@ */ package org.apache.clerezza.rdf.core; -import java.io.Serializable; /** * Some entity. It could be a web resource such as a web page, or it could @@ -27,6 +26,6 @@ import java.io.Serializable; * * @author reto */ -public interface Resource extends Serializable { +public interface Resource { } Modified: clerezza/trunk/rdf.core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/Expression.java URL: http://svn.apache.org/viewvc/clerezza/trunk/rdf.core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/Expression.java?rev=1549028&r1=1549027&r2=1549028&view=diff ============================================================================== --- clerezza/trunk/rdf.core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/Expression.java (original) +++ clerezza/trunk/rdf.core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/Expression.java Sun Dec 8 13:13:32 2013 @@ -18,7 +18,6 @@ */ package org.apache.clerezza.rdf.core.sparql.query; -import java.io.Serializable; /** * This interface models logical, relational, and numeric expression. @@ -38,5 +37,5 @@ import java.io.Serializable; * * @author hasan */ -public interface Expression extends Serializable { +public interface Expression { } Modified: clerezza/trunk/rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/HashMapSolutionMapping.java URL: http://svn.apache.org/viewvc/clerezza/trunk/rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/HashMapSolutionMapping.java?rev=1549028&r1=1549027&r2=1549028&view=diff ============================================================================== --- clerezza/trunk/rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/HashMapSolutionMapping.java (original) +++ clerezza/trunk/rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/HashMapSolutionMapping.java Sun Dec 8 13:13:32 2013 @@ -18,24 +18,26 @@ */ package org.apache.clerezza.rdf.jena.sparql; -import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.query.QuerySolution; -import com.hp.hpl.jena.rdf.model.RDFNode; import java.util.HashMap; import java.util.Iterator; + import org.apache.clerezza.rdf.core.BNode; import org.apache.clerezza.rdf.core.Resource; import org.apache.clerezza.rdf.core.sparql.SolutionMapping; import org.apache.clerezza.rdf.core.sparql.query.Variable; import org.apache.clerezza.rdf.jena.commons.Jena2TriaUtil; +import com.hp.hpl.jena.graph.Node; +import com.hp.hpl.jena.query.QuerySolution; +import com.hp.hpl.jena.rdf.model.RDFNode; + /** * * @author rbn */ class HashMapSolutionMapping extends HashMap implements SolutionMapping { - transient Jena2TriaUtil convertor = new Jena2TriaUtil(new HashMap()); + Jena2TriaUtil convertor = new Jena2TriaUtil(new HashMap()); public HashMapSolutionMapping(QuerySolution querySolution) { final Iterator varNames = querySolution.varNames();