Author: reto
Date: Thu Dec 17 14:09:24 2009
New Revision: 891714
URL: http://svn.apache.org/viewvc?rev=891714&view=rev
Log:
merged down default
Modified:
incubator/clerezza/issues/CLEREZZA-35/org.apache.clerezza.rdf.core/
(props changed)
incubator/clerezza/issues/CLEREZZA-35/org.apache.clerezza.rdf.core/pom.xml
incubator/clerezza/issues/CLEREZZA-35/org.apache.clerezza.rdf.core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleStringQuerySerializer.java
incubator/clerezza/issues/CLEREZZA-35/org.apache.clerezza.rdf.core/src/site/resources/documentation/scb-triaxrs-tutorial/pom.xml
incubator/clerezza/issues/CLEREZZA-35/org.apache.clerezza.rdf.core/src/site/resources/documentation/tutorial1/pom.xml
incubator/clerezza/issues/CLEREZZA-35/org.apache.clerezza.rdf.core/src/test/java/org/apache/clerezza/rdf/core/sparql/QuerySerializerTest.java
Propchange: incubator/clerezza/issues/CLEREZZA-35/org.apache.clerezza.rdf.core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 17 14:09:24 2009
@@ -1 +1,3 @@
/incubator/clerezza/issues/CLEREZZA-15/org.apache.clerezza.rdf.core:890278-890753
+/incubator/clerezza/issues/CLEREZZA-33/org.apache.clerezza.rdf.core:890770-890809
+/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.core:890756-891713
Modified:
incubator/clerezza/issues/CLEREZZA-35/org.apache.clerezza.rdf.core/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-35/org.apache.clerezza.rdf.core/pom.xml?rev=891714&r1=891713&r2=891714&view=diff
==============================================================================
--- incubator/clerezza/issues/CLEREZZA-35/org.apache.clerezza.rdf.core/pom.xml
(original)
+++ incubator/clerezza/issues/CLEREZZA-35/org.apache.clerezza.rdf.core/pom.xml
Thu Dec 17 14:09:24 2009
@@ -3,12 +3,12 @@
<parent>
<artifactId>org.apache.clerezza.parent</artifactId>
<groupId>org.apache.clerezza</groupId>
- <version>0.2-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.rdf.core</artifactId>
<packaging>bundle</packaging>
- <version>0.12-SNAPSHOT</version>
+ <version>0.12-incubating-SNAPSHOT</version>
<name>Clerezza - SCB Core</name>
<description>Interfaces and utilities to access RDF Graphs</description>
<dependencies>
Modified:
incubator/clerezza/issues/CLEREZZA-35/org.apache.clerezza.rdf.core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleStringQuerySerializer.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-35/org.apache.clerezza.rdf.core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleStringQuerySerializer.java?rev=891714&r1=891713&r2=891714&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-35/org.apache.clerezza.rdf.core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleStringQuerySerializer.java
(original)
+++
incubator/clerezza/issues/CLEREZZA-35/org.apache.clerezza.rdf.core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleStringQuerySerializer.java
Thu Dec 17 14:09:24 2009
@@ -224,8 +224,13 @@
s.append(name).append("(");
for (Expression e : expr) {
appendExpression(s, e);
+ s.append(",");
+ }
+ if (expr.isEmpty()) {
+ s.append(")");
+ } else {
+ s.setCharAt(s.length()-1, ')');
}
- s.append(")");
}
private void appendLiteralExpression(StringBuffer s, LiteralExpression
le) {
Modified:
incubator/clerezza/issues/CLEREZZA-35/org.apache.clerezza.rdf.core/src/site/resources/documentation/scb-triaxrs-tutorial/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-35/org.apache.clerezza.rdf.core/src/site/resources/documentation/scb-triaxrs-tutorial/pom.xml?rev=891714&r1=891713&r2=891714&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-35/org.apache.clerezza.rdf.core/src/site/resources/documentation/scb-triaxrs-tutorial/pom.xml
(original)
+++
incubator/clerezza/issues/CLEREZZA-35/org.apache.clerezza.rdf.core/src/site/resources/documentation/scb-triaxrs-tutorial/pom.xml
Thu Dec 17 14:09:24 2009
@@ -5,12 +5,12 @@
<groupId>org.example.clerezza</groupId>
<artifactId>combined.tutorial</artifactId>
<packaging>bundle</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubating-SNAPSHOT</version>
<name>SCB Jaxrs Tutorial</name>
<parent>
<artifactId>org.apache.clerezza.parent</artifactId>
<groupId>org.apache.clerezza</groupId>
- <version>0.11-SNAPSHOT</version>
+ <version>0.11-incubating-SNAPSHOT</version>
</parent>
<repositories>
<repository>
Modified:
incubator/clerezza/issues/CLEREZZA-35/org.apache.clerezza.rdf.core/src/site/resources/documentation/tutorial1/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-35/org.apache.clerezza.rdf.core/src/site/resources/documentation/tutorial1/pom.xml?rev=891714&r1=891713&r2=891714&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-35/org.apache.clerezza.rdf.core/src/site/resources/documentation/tutorial1/pom.xml
(original)
+++
incubator/clerezza/issues/CLEREZZA-35/org.apache.clerezza.rdf.core/src/site/resources/documentation/tutorial1/pom.xml
Thu Dec 17 14:09:24 2009
@@ -5,7 +5,7 @@
<groupId>org.example.clerezza.scb</groupId>
<artifactId>tutorial1</artifactId>
<packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-incubating-SNAPSHOT</version>
<name>tutorial1</name>
<url>http://maven.apache.org</url>
<dependencies>
@@ -18,29 +18,29 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.rdf.core</artifactId>
- <version>0.7-SNAPSHOT</version>
+ <version>0.7-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.rdf.utils</artifactId>
- <version>0.7-SNAPSHOT</version>
+ <version>0.7-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.rdf.ontologies</artifactId>
- <version>0.5-SNAPSHOT</version>
+ <version>0.5-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.rdf.jena.parser</artifactId>
- <version>0.5-SNAPSHOT</version>
+ <version>0.5-incubating-SNAPSHOT</version>
<!-- <scope>runtime</scope> -->
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.rdf.jena.serializer</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.4-incubating-SNAPSHOT</version>
<!-- <scope>runtime</scope> -->
</dependency>
<dependency>
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.rdf.simple.storage</artifactId>
- <version>0.2-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
<!-- <scope>runtime</scope> -->
</dependency>
Modified:
incubator/clerezza/issues/CLEREZZA-35/org.apache.clerezza.rdf.core/src/test/java/org/apache/clerezza/rdf/core/sparql/QuerySerializerTest.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-35/org.apache.clerezza.rdf.core/src/test/java/org/apache/clerezza/rdf/core/sparql/QuerySerializerTest.java?rev=891714&r1=891713&r2=891714&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-35/org.apache.clerezza.rdf.core/src/test/java/org/apache/clerezza/rdf/core/sparql/QuerySerializerTest.java
(original)
+++
incubator/clerezza/issues/CLEREZZA-35/org.apache.clerezza.rdf.core/src/test/java/org/apache/clerezza/rdf/core/sparql/QuerySerializerTest.java
Thu Dec 17 14:09:24 2009
@@ -18,13 +18,17 @@
*/
package org.apache.clerezza.rdf.core.sparql;
+import java.util.ArrayList;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
import org.junit.Assert;
import org.junit.Test;
import org.apache.clerezza.rdf.core.LiteralFactory;
import org.apache.clerezza.rdf.core.UriRef;
import org.apache.clerezza.rdf.core.sparql.query.BinaryOperation;
+import org.apache.clerezza.rdf.core.sparql.query.BuiltInCall;
+import org.apache.clerezza.rdf.core.sparql.query.Expression;
import org.apache.clerezza.rdf.core.sparql.query.LiteralExpression;
import org.apache.clerezza.rdf.core.sparql.query.ResourceOrVariable;
import org.apache.clerezza.rdf.core.sparql.query.TriplePattern;
@@ -244,4 +248,35 @@
Assert.assertTrue(selectQuery.toString()
.replaceAll("( |\n)+", "
").trim().equals(queryString));
}
+
+ @Test
+ public void testRegex() {
+
+ final String queryString = "SELECT ?p WHERE { " +
+ "<http://localhost/testitem> ?p ?x . " +
+ "FILTER
REGEX(?x,\".*uni.*\"^^<http://www.w3.org/2001/XMLSchema#string>) }";
+
+ Variable p = new Variable("p");
+ SimpleSelectQuery selectQuery = new SimpleSelectQuery();
+ selectQuery.addSelection(p);
+
+ Variable x = new Variable("x");
+ Set<TriplePattern> triplePatterns = new
HashSet<TriplePattern>();
+ triplePatterns.add(new SimpleTriplePattern(
+ new UriRef("http://localhost/testitem";), p, x));
+
+ SimpleBasicGraphPattern bgp = new
SimpleBasicGraphPattern(triplePatterns);
+ SimpleGroupGraphPattern queryPattern = new
SimpleGroupGraphPattern();
+ queryPattern.addGraphPattern(bgp);
+
+ List<Expression> arguments = new ArrayList<Expression>();
+ arguments.add(x);
+ arguments.add(new
LiteralExpression(LiteralFactory.getInstance().
+ createTypedLiteral(".*uni.*")));
+ BuiltInCall constraint = new BuiltInCall("REGEX", arguments);
+ queryPattern.addConstraint(constraint);
+ selectQuery.setQueryPattern(queryPattern);
+ Assert.assertTrue(selectQuery.toString()
+ .replaceAll("( |\n)+", "
").trim().equals(queryString));
+ }
}
