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 2014/08/01 19:10:40 UTC
[01/11] git commit: CLEREZZA-929: Support different text encodings
for Csv and Tsv
Repository: clerezza
Updated Branches:
refs/heads/release-201407 2bd303dd7 -> 5ccda698b
CLEREZZA-929: Support different text encodings for Csv and Tsv
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/0250a90b
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/0250a90b
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/0250a90b
Branch: refs/heads/release-201407
Commit: 0250a90bc9dce6268e61ed0f64158ff9b17b2244
Parents: 55a6e4b
Author: Minto van der Sluis <mi...@apache.org>
Authored: Mon Jul 28 11:59:46 2014 +0200
Committer: Minto van der Sluis <mi...@apache.org>
Committed: Mon Jul 28 11:59:46 2014 +0200
----------------------------------------------------------------------
jaxrs.rdf.providers/pom.xml | 2 +-
.../ResultSetCsvMessageBodyWriter.java | 60 +++++++++++++++++---
.../ResultSetTsvMessageBodyWriter.java | 58 ++++++++++++++++---
3 files changed, 102 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/0250a90b/jaxrs.rdf.providers/pom.xml
----------------------------------------------------------------------
diff --git a/jaxrs.rdf.providers/pom.xml b/jaxrs.rdf.providers/pom.xml
index 400dab4..0f8940a 100644
--- a/jaxrs.rdf.providers/pom.xml
+++ b/jaxrs.rdf.providers/pom.xml
@@ -30,7 +30,7 @@
<groupId>org.apache.clerezza</groupId>
<artifactId>jaxrs.rdf.providers</artifactId>
<packaging>bundle</packaging>
- <version>0.15-SNAPSHOT</version>
+ <version>0.16-SNAPSHOT</version>
<name>Clerezza - JAX-RS MessageBodyProviders for RDF</name>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/0250a90b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetCsvMessageBodyWriter.java
----------------------------------------------------------------------
diff --git a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetCsvMessageBodyWriter.java b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetCsvMessageBodyWriter.java
index 0739e69..848ace0 100644
--- a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetCsvMessageBodyWriter.java
+++ b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetCsvMessageBodyWriter.java
@@ -63,18 +63,22 @@ public class ResultSetCsvMessageBodyWriter implements MessageBodyWriter<ResultSe
private static final Logger logger = LoggerFactory
.getLogger( ResultSetCsvMessageBodyWriter.class );
- private static final String UTF_8 = "UTF-8";
- private static byte[] separator;
- static {
+ private String textEncoding = "UTF-8";
+ private byte[] separator;
+
+ public ResultSetCsvMessageBodyWriter() {
try {
- separator = ",".getBytes( UTF_8 );
+ buildSeparatorConformEncoding( textEncoding );
} catch( UnsupportedEncodingException e ) {
logger.error( "Developer error", e );
}
-
}
-
+
+ // --------------------------------------------------------------------------
+ // Implementing MessageBodyWriter
+ // --------------------------------------------------------------------------
+
@Override
public boolean isWriteable( Class<?> type, Type genericType, Annotation[] annotations,
MediaType mediaType ) {
@@ -99,6 +103,44 @@ public class ResultSetCsvMessageBodyWriter implements MessageBodyWriter<ResultSe
}
}
+ // --------------------------------------------------------------------------
+ // Public interface
+ // --------------------------------------------------------------------------
+
+ /**
+ * Sets the text encoding for the resource. This setting must only used
+ * if the resource response represents text.
+ *
+ * @param textEncoding
+ * character encoding of text body
+ * @throws UnsupportedEncodingException when the given encoding is not supported.
+ */
+ public void setTextEncoding(String textEncoding) throws UnsupportedEncodingException {
+ buildSeparatorConformEncoding( textEncoding );
+ this.textEncoding = textEncoding;
+ }
+
+ /**
+ * @return text encoding for resource
+ */
+ protected String getTextEncoding() {
+ return textEncoding;
+ }
+
+ // --------------------------------------------------------------------------
+ // Private methods
+ // --------------------------------------------------------------------------
+
+ /**
+ * Builds the column separator according to the given text encoding.
+ *
+ * @param encoding the text encoding to be used.
+ * @throws UnsupportedEncodingException when the given encoding is not supported.
+ */
+ private void buildSeparatorConformEncoding( String encoding ) throws UnsupportedEncodingException {
+ separator = ",".getBytes( encoding );
+ }
+
/**
* Write resultset header to the given output stream.
*
@@ -117,7 +159,7 @@ public class ResultSetCsvMessageBodyWriter implements MessageBodyWriter<ResultSe
writeEscaped( outputStream, header );
first = false;
}
- outputStream.write( "\n".getBytes( UTF_8 ) );
+ outputStream.write( "\n".getBytes( textEncoding ) );
}
/**
@@ -144,7 +186,7 @@ public class ResultSetCsvMessageBodyWriter implements MessageBodyWriter<ResultSe
}
first = false;
}
- outputStream.write( "\n".getBytes( UTF_8 ) );
+ outputStream.write( "\n".getBytes( textEncoding ) );
}
/**
@@ -186,6 +228,6 @@ public class ResultSetCsvMessageBodyWriter implements MessageBodyWriter<ResultSe
builder.append( '"' );
line = builder.toString();
}
- outputStream.write( line.getBytes( UTF_8 ) );
+ outputStream.write( line.getBytes( textEncoding ) );
}
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/0250a90b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetTsvMessageBodyWriter.java
----------------------------------------------------------------------
diff --git a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetTsvMessageBodyWriter.java b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetTsvMessageBodyWriter.java
index c051b43..bf9dcd4 100644
--- a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetTsvMessageBodyWriter.java
+++ b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetTsvMessageBodyWriter.java
@@ -63,17 +63,21 @@ public class ResultSetTsvMessageBodyWriter implements MessageBodyWriter<ResultSe
private static final Logger logger = LoggerFactory
.getLogger( ResultSetTsvMessageBodyWriter.class );
- private static final String UTF_8 = "UTF-8";
- private static byte[] separator;
- static {
+ private String textEncoding = "UTF-8";
+ private byte[] separator;
+
+ public ResultSetTsvMessageBodyWriter() {
try {
- separator = "\t".getBytes( UTF_8 );
+ buildSeparatorConformEncoding( textEncoding );
} catch( UnsupportedEncodingException e ) {
logger.error( "Developer error", e );
}
-
}
+
+ // --------------------------------------------------------------------------
+ // Implementing MessageBodyWriter
+ // --------------------------------------------------------------------------
@Override
public boolean isWriteable( Class<?> type, Type genericType, Annotation[] annotations,
@@ -99,6 +103,44 @@ public class ResultSetTsvMessageBodyWriter implements MessageBodyWriter<ResultSe
}
}
+ // --------------------------------------------------------------------------
+ // Public interface
+ // --------------------------------------------------------------------------
+
+ /**
+ * Sets the text encoding for the resource. This setting must only used
+ * if the resource response represents text.
+ *
+ * @param textEncoding
+ * character encoding of text body
+ * @throws UnsupportedEncodingException when the given encoding is not supported.
+ */
+ public void setTextEncoding(String textEncoding) throws UnsupportedEncodingException {
+ buildSeparatorConformEncoding( textEncoding );
+ this.textEncoding = textEncoding;
+ }
+
+ /**
+ * @return text encoding for resource
+ */
+ protected String getTextEncoding() {
+ return textEncoding;
+ }
+
+ // --------------------------------------------------------------------------
+ // Private methods
+ // --------------------------------------------------------------------------
+
+ /**
+ * Builds the column separator according to the given text encoding.
+ *
+ * @param encoding the text encoding to be used.
+ * @throws UnsupportedEncodingException when the given encoding is not supported.
+ */
+ private void buildSeparatorConformEncoding( String encoding ) throws UnsupportedEncodingException {
+ separator = ",".getBytes( encoding );
+ }
+
/**
* Write resultset header to the given output stream.
*
@@ -117,7 +159,7 @@ public class ResultSetTsvMessageBodyWriter implements MessageBodyWriter<ResultSe
writeEscaped( outputStream, header );
first = false;
}
- outputStream.write( "\n".getBytes( UTF_8 ) );
+ outputStream.write( "\n".getBytes( textEncoding ) );
}
/**
@@ -144,7 +186,7 @@ public class ResultSetTsvMessageBodyWriter implements MessageBodyWriter<ResultSe
}
first = false;
}
- outputStream.write( "\n".getBytes( UTF_8 ) );
+ outputStream.write( "\n".getBytes( textEncoding ) );
}
/**
@@ -191,7 +233,7 @@ public class ResultSetTsvMessageBodyWriter implements MessageBodyWriter<ResultSe
if( text.contains( "\t" ) ) {
line = text.replaceAll( "\t", "\\t" );
}
- outputStream.write( line.getBytes( UTF_8 ) );
+ outputStream.write( line.getBytes( textEncoding ) );
}
private String escapedDQuotes( String text ) {
[11/11] git commit: CLEREZZA-926: this well be readded when undoing
commit deleting all modules not in release
Posted by re...@apache.org.
CLEREZZA-926: this well be readded when undoing commit deleting all modules not in release
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/5ccda698
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/5ccda698
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/5ccda698
Branch: refs/heads/release-201407
Commit: 5ccda698b22e9d75db21c335b183b1c66fa6f275
Parents: 9652f6a
Author: Reto Gmür <re...@apache.org>
Authored: Fri Aug 1 19:10:32 2014 +0200
Committer: Reto Gmür <re...@apache.org>
Committed: Fri Aug 1 19:10:32 2014 +0200
----------------------------------------------------------------------
platform.launcher.storageless.parent/pom.xml | 905 ----------------------
1 file changed, 905 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/5ccda698/platform.launcher.storageless.parent/pom.xml
----------------------------------------------------------------------
diff --git a/platform.launcher.storageless.parent/pom.xml b/platform.launcher.storageless.parent/pom.xml
deleted file mode 100644
index c50bd8b..0000000
--- a/platform.launcher.storageless.parent/pom.xml
+++ /dev/null
@@ -1,905 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
---><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>clerezza</artifactId>
- <groupId>org.apache.clerezza</groupId>
- <version>0.5-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
- </parent>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.launcher.storageless.parent</artifactId>
- <version>0.9-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>Clerezza - Platform Launcher Storageless Parent POM</name>
- <description>A parent for Platform launchers, containing the platform bundlessca as runtime dependencies.
- </description>
- <modules>
- <module>platform.launcher.storageless</module>
- </modules>
-
- <dependencyManagement>
- <dependencies>
- <!-- Apache Stanbol Dependencies -->
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.frameworkfragment</artifactId>
- <version>${stanbol.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.web.resources</artifactId>
- <version>${stanbol.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.security.core</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.authentication.basic</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.security.fexilwebconsole</artifactId>
- <version>${stanbol.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.security.usermanagement</artifactId>
- <version>${stanbol.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.ldpath.clerezza</artifactId>
- <version>${stanbol.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.ldpathtemplate</artifactId>
- <version>${stanbol.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.web.viewable</artifactId>
- <version>${stanbol.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.web.rdfviewable.writer</artifactId>
- <version>${stanbol.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.web.base</artifactId>
- <version>${stanbol.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.freemarker</artifactId>
- <version>${stanbol.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.indexedgraph</artifactId>
- <version>${stanbol.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.jsonld</artifactId>
- <version>${stanbol.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.frameworkfragment</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!--
- Clerezza Dependencies
- -->
- <dependency>
- <groupId>org.wymiwyg</groupId>
- <artifactId>wymiwyg-commons-core</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza.ext</groupId>
- <artifactId>org.apache.jena</artifactId>
- <scope>runtime</scope>
- <version>0.7-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza.ext</groupId>
- <artifactId>com.ibm.icu</artifactId>
- <scope>runtime</scope>
- <version>0.6-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza.ext</groupId>
- <artifactId>org.ops4j.pax.swissbox.tinybundles</artifactId>
- <scope>runtime</scope>
- <version>0.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza.ext</groupId>
- <artifactId>javax.mail</artifactId>
- <scope>runtime</scope>
- <version>0.5-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza.ext</groupId>
- <artifactId>org.json.simple</artifactId>
- <scope>runtime</scope>
- <version>0.4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- </dependency>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-compiler</artifactId>
- </dependency>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-actors</artifactId>
- </dependency>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-reflect</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza.scala</groupId>
- <artifactId>script-engine</artifactId>
- <scope>runtime</scope>
- <version>0.3-SNAPSHOT</version>
- </dependency>
- <!-- <dependency>
- <groupId>com.sun.script.jruby</groupId>
- <artifactId>jruby-engine</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza.ext</groupId>
- <artifactId>org.jruby</artifactId>
- <scope>runtime</scope>
- </dependency> -->
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm-all</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore-osgi</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.jsslutils</groupId>
- <artifactId>jsslutils</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <scope>runtime</scope>
- </dependency>
- <!-- these are now embeded as most recent version is not OSGi bundle
- <dependency>
- <groupId>net.rootdev</groupId>
- <artifactId>java-rdfa</artifactId>
- </dependency>
- <dependency>
- <groupId>net.rootdev</groupId>
- <artifactId>java-rdfa-htmlparser</artifactId>
- </dependency> -->
- <dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.sshd</groupId>
- <artifactId>sshd-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.sshd</groupId>
- <artifactId>sshd-pam</artifactId>
- </dependency>
- <!--
- Clerezza Bundles
- -->
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform</artifactId>
- <scope>runtime</scope>
- <version>0.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.logging.core</artifactId>
- <scope>runtime</scope>
- <version>0.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.logging.initializer</artifactId>
- <scope>runtime</scope>
- <version>0.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.logging.ontologies</artifactId>
- <scope>runtime</scope>
- <version>0.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.enrichment</artifactId>
- <scope>runtime</scope>
- <version>0.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.graphnodeprovider</artifactId>
- <scope>runtime</scope>
- <version>0.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.usermanager</artifactId>
- <scope>runtime</scope>
- <version>0.14-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.usermanager.webinterface</artifactId>
- <scope>runtime</scope>
- <version>0.14-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>utils.customproperty</artifactId>
- <scope>runtime</scope>
- <version>0.5-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.accountcontrolpanel.core</artifactId>
- <scope>runtime</scope>
- <version>0.3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.accountcontrolpanel.ontologies</artifactId>
- <scope>runtime</scope>
- <version>0.3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wink</groupId>
- <artifactId>wink-osgi</artifactId>
- <version>1.3.0</version>
- <!-- this has to start early, because of the MediaType requiring RuntimeImpl in
- static initializer -->
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.utils</artifactId>
- <scope>runtime</scope>
- <version>0.14-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.core</artifactId>
- <scope>runtime</scope>
- <version>0.14-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.enrichment</artifactId>
- <scope>runtime</scope>
- <version>0.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.jena.facade</artifactId>
- <scope>runtime</scope>
- <version>0.14-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.jena.commons</artifactId>
- <scope>runtime</scope>
- <version>0.7-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.jena.storage</artifactId>
- <scope>runtime</scope>
- <version>0.7-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.file.storage</artifactId>
- <scope>runtime</scope>
- <version>0.4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.jena.sparql</artifactId>
- <scope>runtime</scope>
- <version>0.7-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.jena.parser</artifactId>
- <scope>runtime</scope>
- <version>0.12-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.jena.serializer</artifactId>
- <scope>runtime</scope>
- <version>0.11-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.rdfa</artifactId>
- <scope>runtime</scope>
- <version>0.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.rdfjson</artifactId>
- <scope>runtime</scope>
- <version>0.4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.ontologies</artifactId>
- <scope>runtime</scope>
- <version>0.12-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.storage.web</artifactId>
- <version>0.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.content</artifactId>
- <scope>runtime</scope>
- <version>0.14-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.content.default404</artifactId>
- <scope>runtime</scope>
- <version>0.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.content.fsadaptor</artifactId>
- <scope>runtime</scope>
- <version>0.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.content.imagemetadata</artifactId>
- <scope>runtime</scope>
- <version>0.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.content.representations.core</artifactId>
- <scope>runtime</scope>
- <version>0.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.content.representations.ontologies</artifactId>
- <scope>runtime</scope>
- <version>0.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.graphprovider.content</artifactId>
- <scope>runtime</scope>
- <version>0.7-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.dashboard.ontologies</artifactId>
- <scope>runtime</scope>
- <version>0.3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.dashboard.core</artifactId>
- <scope>runtime</scope>
- <version>0.3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.globalmenu.api</artifactId>
- <scope>runtime</scope>
- <version>0.3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.dashboard.webinterface</artifactId>
- <scope>runtime</scope>
- <version>0.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.shellcustomizer</artifactId>
- <version>0.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>shell</artifactId>
- <scope>runtime</scope>
- <version>0.3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>shell.felixshellcommand</artifactId>
- <scope>runtime</scope>
- <version>0.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>bundledevtool</artifactId>
- <scope>runtime</scope>
- <version>0.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>sshshell</artifactId>
- <scope>runtime</scope>
- <version>0.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>web.fileserver</artifactId>
- <scope>runtime</scope>
- <version>0.10-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>jaxrs.rdf.providers</artifactId>
- <scope>runtime</scope>
- <version>0.16-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>jaxrs.stanbol.fragments</artifactId>
- <scope>runtime</scope>
- <version>0.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.web.core</artifactId>
- <scope>runtime</scope>
- <version>0.4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.web.ontologies</artifactId>
- <scope>runtime</scope>
- <version>0.4-SNAPSHOT</version>
- </dependency>
- <!--<dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.security</artifactId>
- <scope>runtime</scope>
- </dependency> -->
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.security.conditions</artifactId>
- <scope>runtime</scope>
- <version>0.6-SNAPSHOT</version>
- </dependency>
- <!-- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.security.foafssl.core</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.security.foafssl.test</artifactId>
- <scope>runtime</scope>
- </dependency>
- -->
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.security.foafssl.ontologies</artifactId>
- <version>0.2-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>ssl.keygen.base</artifactId>
- <version>0.6-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
- <!--<dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.security.auth.basic</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.security.auth.cookie</artifactId>
- <scope>runtime</scope>
- </dependency> -->
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.web.resources</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.security.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.authentication.basic</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.security.fexilwebconsole</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.security.usermanagement</artifactId>
- </dependency>
- <dependency> <!-- LD Path -->
- <groupId>at.newmedialab.ldpath</groupId>
- <artifactId>ldpath-api</artifactId>
- <version>0.9.5</version>
- </dependency>
- <dependency>
- <groupId>at.newmedialab.ldpath</groupId>
- <artifactId>ldpath-core-bundle</artifactId>
- <version>0.9.5</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.ldpath.clerezza</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.ldpathtemplate</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.web.viewable</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.web.rdfviewable.writer</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.web.base</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.freemarker</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.indexedgraph</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.jsonld</artifactId>
- </dependency>
- <dependency> <!-- used also for all the other JSON parsing/writing in Stanbol -->
- <groupId>org.codehaus.jettison</groupId>
- <artifactId>jettison</artifactId>
- <version>1.3.1</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.typehandlerspace</artifactId>
- <scope>runtime</scope>
- <version>0.9-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.typehandlerspace.wink</artifactId>
- <scope>runtime</scope>
- <version>0.9-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.typepriority</artifactId>
- <scope>runtime</scope>
- <version>0.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.mail</artifactId>
- <scope>runtime</scope>
- <version>0.5-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>templating</artifactId>
- <scope>runtime</scope>
- <version>0.9-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>templating.seedsnipe</artifactId>
- <scope>runtime</scope>
- <version>0.9-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>jaxrs.utils</artifactId>
- <scope>runtime</scope>
- <version>0.9-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>jaxrs.extensions</artifactId>
- <scope>runtime</scope>
- <version>0.6-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>osgi.services</artifactId>
- <scope>runtime</scope>
- <version>0.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.typerendering.core</artifactId>
- <scope>runtime</scope>
- <version>0.3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.typerendering.gui</artifactId>
- <scope>runtime</scope>
- <version>0.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.typerendering.ontologies</artifactId>
- <scope>runtime</scope>
- <version>0.3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.typerendering.seedsnipe</artifactId>
- <scope>runtime</scope>
- <version>0.7-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.scripting</artifactId>
- <scope>runtime</scope>
- <version>0.5-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.scripting.scriptmanager</artifactId>
- <scope>runtime</scope>
- <version>0.5-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.xhtml2html</artifactId>
- <scope>runtime</scope>
- <version>0.6-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>web.resources.jquery</artifactId>
- <scope>runtime</scope>
- <version>0.6-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>web.resources.yui</artifactId>
- <scope>runtime</scope>
- <version>0.5-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>utils.imageprocessing</artifactId>
- <scope>runtime</scope>
- <version>0.8-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>web.resources.scripts</artifactId>
- <scope>runtime</scope>
- <version>0.4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.style.default</artifactId>
- <scope>runtime</scope>
- <version>0.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.typerendering.scala</artifactId>
- <scope>runtime</scope>
- <version>0.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.typerendering.scalaserverpages</artifactId>
- <scope>runtime</scope>
- <version>0.4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.scala.utils</artifactId>
- <scope>runtime</scope>
- <version>0.4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.config</artifactId>
- <scope>runtime</scope>
- <version>0.4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.config.gui</artifactId>
- <scope>runtime</scope>
- <version>0.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.documentation</artifactId>
- <scope>runtime</scope>
- <version>0.4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.documentation.viewer</artifactId>
- <scope>runtime</scope>
- <version>0.4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.language.ontologies</artifactId>
- <scope>runtime</scope>
- <version>0.3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.language.core</artifactId>
- <scope>runtime</scope>
- <version>0.3-SNAPSHOT</version>
- </dependency>
-<!--
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.style.classic.webguiexamples</artifactId>
- <scope>runtime</scope>
- </dependency>wr
--->
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.concepts.core</artifactId>
- <scope>runtime</scope>
- <version>0.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.concepts.ontologies</artifactId>
- <scope>runtime</scope>
- <version>0.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>platform.users.core</artifactId>
- <scope>runtime</scope>
- <version>0.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>utils</artifactId>
- <scope>runtime</scope>
- <version>0.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.metadata</artifactId>
- <scope>runtime</scope>
- <version>0.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>permissiondescriptions</artifactId>
- <scope>runtime</scope>
- <version>0.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk16</artifactId>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- <build>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.apache.maven.plugins
- </groupId>
- <artifactId>
- maven-dependency-plugin
- </artifactId>
- <versionRange>
- [2.1,)
- </versionRange>
- <goals>
- <goal>
- unpack-dependencies
- </goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore/>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-</project>
[09/11] git commit: CLEREZZA-935: Temporarily disabled typerendering
Posted by re...@apache.org.
CLEREZZA-935: Temporarily disabled typerendering
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/317dfc0b
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/317dfc0b
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/317dfc0b
Branch: refs/heads/release-201407
Commit: 317dfc0b070040bf3339c99962d56f535f2e5d09
Parents: 9bd5d80
Author: Minto van der Sluis <mi...@apache.org>
Authored: Thu Jul 31 14:33:01 2014 +0200
Committer: Minto van der Sluis <mi...@apache.org>
Committed: Thu Jul 31 14:33:01 2014 +0200
----------------------------------------------------------------------
provisioning/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/317dfc0b/provisioning/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/pom.xml b/provisioning/pom.xml
index 437048f..64be6f9 100644
--- a/provisioning/pom.xml
+++ b/provisioning/pom.xml
@@ -57,7 +57,7 @@
<module>platform.tools</module>
<module>shell</module>
<module>security</module>
- <module>launchers</module>
+ <!--module>launchers</module-->
</modules>
</project>
[04/11] git commit: CLEREZZA-931: Version bump since 0.3 has already
been released
Posted by re...@apache.org.
CLEREZZA-931: Version bump since 0.3 has already been released
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/0864432d
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/0864432d
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/0864432d
Branch: refs/heads/release-201407
Commit: 0864432def4fb9b7cb01baec86fb06aca72e7fbb
Parents: 5d0239f
Author: Minto van der Sluis <mi...@apache.org>
Authored: Wed Jul 30 11:31:31 2014 +0200
Committer: Minto van der Sluis <mi...@apache.org>
Committed: Wed Jul 30 11:31:31 2014 +0200
----------------------------------------------------------------------
rdf.virtuoso.storage/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/0864432d/rdf.virtuoso.storage/pom.xml
----------------------------------------------------------------------
diff --git a/rdf.virtuoso.storage/pom.xml b/rdf.virtuoso.storage/pom.xml
index b7c8dc2..cbc7f7e 100644
--- a/rdf.virtuoso.storage/pom.xml
+++ b/rdf.virtuoso.storage/pom.xml
@@ -30,7 +30,7 @@
<name>Clerezza - SCB Virtuoso storage provider</name>
<description>A virtuoso based storage provider</description>
<packaging>bundle</packaging>
- <version>0.3-SNAPSHOT</version>
+ <version>0.4-SNAPSHOT</version>
<dependencies>
<!-- CLEREZZA -->
[10/11] git commit: CLEREZZA-926: merged down master
Posted by re...@apache.org.
CLEREZZA-926: merged down master
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/9652f6a5
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/9652f6a5
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/9652f6a5
Branch: refs/heads/release-201407
Commit: 9652f6a5d9bcd6dd07d3035b1decc54611651868
Parents: 2bd303d 317dfc0
Author: Reto Gmür <re...@apache.org>
Authored: Fri Aug 1 19:09:45 2014 +0200
Committer: Reto Gmür <re...@apache.org>
Committed: Fri Aug 1 19:09:45 2014 +0200
----------------------------------------------------------------------
.../ResultSetCsvMessageBodyWriter.java | 60 +-
.../ResultSetTsvMessageBodyWriter.java | 58 +-
platform.launcher.storageless.parent/pom.xml | 905 +++++++++++++++++++
provisioning/pom.xml | 4 +-
.../rdf/virtuoso/storage/access/DataAccess.java | 35 +-
.../access/VirtuosoWeightedProvider.java | 33 +-
6 files changed, 1051 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9652f6a5/provisioning/pom.xml
----------------------------------------------------------------------
[07/11] git commit: CLEREZZA-931: Use released versions of own
dependencies
Posted by re...@apache.org.
CLEREZZA-931: Use released versions of own dependencies
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/09a00242
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/09a00242
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/09a00242
Branch: refs/heads/release-201407
Commit: 09a00242839c08218a4e474dbfd2d7bc24d49f3f
Parents: 80e95cd
Author: Minto van der Sluis <mi...@apache.org>
Authored: Thu Jul 31 08:48:29 2014 +0200
Committer: Minto van der Sluis <mi...@apache.org>
Committed: Thu Jul 31 08:48:29 2014 +0200
----------------------------------------------------------------------
rdf.virtuoso.storage/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/09a00242/rdf.virtuoso.storage/pom.xml
----------------------------------------------------------------------
diff --git a/rdf.virtuoso.storage/pom.xml b/rdf.virtuoso.storage/pom.xml
index cbc7f7e..0e1f06d 100644
--- a/rdf.virtuoso.storage/pom.xml
+++ b/rdf.virtuoso.storage/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.core</artifactId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
<scope>provided</scope>
</dependency>
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>ext.virtuoso.jdbc</artifactId>
- <version>0.3-SNAPSHOT</version>
+ <version>0.3</version>
<scope>provided</scope>
</dependency>
[03/11] git commit: CLEREZZA-931: Properly read integer properties
Posted by re...@apache.org.
CLEREZZA-931: Properly read integer properties
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/5d0239fd
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/5d0239fd
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/5d0239fd
Branch: refs/heads/release-201407
Commit: 5d0239fdc98407257b6ec805ca99aa923953a22f
Parents: 95fb6ea
Author: Minto van der Sluis <mi...@apache.org>
Authored: Wed Jul 30 11:18:52 2014 +0200
Committer: Minto van der Sluis <mi...@apache.org>
Committed: Wed Jul 30 11:18:52 2014 +0200
----------------------------------------------------------------------
.../access/VirtuosoWeightedProvider.java | 33 ++++++++++++++------
1 file changed, 23 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/5d0239fd/rdf.virtuoso.storage/src/main/java/org/apache/clerezza/rdf/virtuoso/storage/access/VirtuosoWeightedProvider.java
----------------------------------------------------------------------
diff --git a/rdf.virtuoso.storage/src/main/java/org/apache/clerezza/rdf/virtuoso/storage/access/VirtuosoWeightedProvider.java b/rdf.virtuoso.storage/src/main/java/org/apache/clerezza/rdf/virtuoso/storage/access/VirtuosoWeightedProvider.java
index 82ba243..5fc1bf7 100644
--- a/rdf.virtuoso.storage/src/main/java/org/apache/clerezza/rdf/virtuoso/storage/access/VirtuosoWeightedProvider.java
+++ b/rdf.virtuoso.storage/src/main/java/org/apache/clerezza/rdf/virtuoso/storage/access/VirtuosoWeightedProvider.java
@@ -21,6 +21,7 @@ package org.apache.clerezza.rdf.virtuoso.storage.access;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.Writer;
+import java.math.BigDecimal;
import java.math.BigInteger;
import java.security.AccessController;
import java.security.PrivilegedAction;
@@ -31,6 +32,7 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.Collections;
+import java.util.Dictionary;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -183,7 +185,7 @@ public class VirtuosoWeightedProvider implements WeightedTcProvider, QueryableTc
* No component context given and connection was not set.
*/
@Activate
- public void activate(ComponentContext cCtx) {
+ public void activate(ComponentContext cCtx) throws ConfigurationException {
logger.trace("activate(ComponentContext {})", cCtx);
logger.info("Activating VirtuosoWeightedProvider...");
@@ -226,21 +228,14 @@ public class VirtuosoWeightedProvider implements WeightedTcProvider, QueryableTc
}));
}
- // FIXME The following should not be needed...
- try {
- this.weight = (Integer) cCtx.getProperties().get(WEIGHT);
- } catch (NumberFormatException nfe) {
- logger.warn(nfe.toString());
- logger.warn("Setting weight to defaults");
- this.weight = DEFAULT_WEIGHT;
- }
+ weight = readIntegerProperty( cCtx.getProperties(), WEIGHT, DEFAULT_WEIGHT );
/**
* Initialize connection properties
*/
// We take the configuration of the SCR component
Object phost = cCtx.getProperties().get(HOST);
- Object pport = Integer.valueOf((String)cCtx.getProperties().get(PORT));
+ Object pport = readIntegerProperty( cCtx.getProperties(), PORT, null );
Object puser = cCtx.getProperties().get(USER);
Object ppwd = cCtx.getProperties().get(PASSWORD);
@@ -272,6 +267,7 @@ public class VirtuosoWeightedProvider implements WeightedTcProvider, QueryableTc
user = (String) puser;
pwd = (String) ppwd;
+ logger.info("Connecting to Virtuoso on '{}' with username '{}'", host + ":" + port, user);
initConnectionPoolDataSource();
// Prepare SPARQL data access
this.sparqlDataAccess = createDataAccess();
@@ -322,6 +318,23 @@ public class VirtuosoWeightedProvider implements WeightedTcProvider, QueryableTc
.append(":").append(portNumber).append("/charset=UTF-8/log_enable=2")
.toString();
}
+
+ private Integer readIntegerProperty( Dictionary<?, ?> properties, String key, Integer defaultValue ) throws ConfigurationException {
+ // Start if with default.
+ Integer value = defaultValue;
+
+ Object propertyValue = properties.get( key );
+ if(propertyValue instanceof Number){
+ value = ((Number)propertyValue).intValue();
+ } else if(propertyValue != null){
+ try {
+ value = new BigDecimal(propertyValue.toString()).intValueExact();
+ } catch (RuntimeException e) {
+ throw new ConfigurationException( key, "Unable to parse integer!", e);
+ }
+ }
+ return value;
+ }
private Set<UriRef> readRememberedGraphs() {
logger.trace(" readRememberedGraphs()");
[02/11] git commit: CLEREZZA-929: Upgrade jaxrs.rdf.providers
0.15-SNAPSHOT --> 0.16-SNAPSHOT
Posted by re...@apache.org.
CLEREZZA-929: Upgrade jaxrs.rdf.providers 0.15-SNAPSHOT --> 0.16-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/95fb6ea6
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/95fb6ea6
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/95fb6ea6
Branch: refs/heads/release-201407
Commit: 95fb6ea6a2d36541bbe846505212915f00df675a
Parents: 0250a90
Author: Minto van der Sluis <mi...@apache.org>
Authored: Mon Jul 28 14:55:58 2014 +0200
Committer: Minto van der Sluis <mi...@apache.org>
Committed: Mon Jul 28 14:55:58 2014 +0200
----------------------------------------------------------------------
platform.launcher.storageless.parent/pom.xml | 2 +-
platform.typepriority/pom.xml | 2 +-
provisioning/rdf.web/pom.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/95fb6ea6/platform.launcher.storageless.parent/pom.xml
----------------------------------------------------------------------
diff --git a/platform.launcher.storageless.parent/pom.xml b/platform.launcher.storageless.parent/pom.xml
index 6dbc63f..c50bd8b 100644
--- a/platform.launcher.storageless.parent/pom.xml
+++ b/platform.launcher.storageless.parent/pom.xml
@@ -497,7 +497,7 @@
<groupId>org.apache.clerezza</groupId>
<artifactId>jaxrs.rdf.providers</artifactId>
<scope>runtime</scope>
- <version>0.15-SNAPSHOT</version>
+ <version>0.16-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/95fb6ea6/platform.typepriority/pom.xml
----------------------------------------------------------------------
diff --git a/platform.typepriority/pom.xml b/platform.typepriority/pom.xml
index d9d6235..6368387 100644
--- a/platform.typepriority/pom.xml
+++ b/platform.typepriority/pom.xml
@@ -74,7 +74,7 @@
<groupId>org.apache.clerezza</groupId>
<artifactId>jaxrs.rdf.providers</artifactId>
<scope>test</scope>
- <version>0.15-SNAPSHOT</version>
+ <version>0.16-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/95fb6ea6/provisioning/rdf.web/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/rdf.web/pom.xml b/provisioning/rdf.web/pom.xml
index c9f287f..6387ee4 100644
--- a/provisioning/rdf.web/pom.xml
+++ b/provisioning/rdf.web/pom.xml
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>jaxrs.rdf.providers</artifactId>
- <version>0.15-SNAPSHOT</version>
+ <version>0.16-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
[05/11] git commit: CLEREZZA-932: Add null check + initialize map
Posted by re...@apache.org.
CLEREZZA-932: Add null check + initialize map
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/981bfd20
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/981bfd20
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/981bfd20
Branch: refs/heads/release-201407
Commit: 981bfd20c96d51c59810d5fe28f59e98221185db
Parents: 0864432
Author: Minto van der Sluis <mi...@apache.org>
Authored: Wed Jul 30 11:36:27 2014 +0200
Committer: Minto van der Sluis <mi...@apache.org>
Committed: Wed Jul 30 11:36:27 2014 +0200
----------------------------------------------------------------------
.../rdf/virtuoso/storage/access/DataAccess.java | 32 +++++++++++---------
1 file changed, 17 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/981bfd20/rdf.virtuoso.storage/src/main/java/org/apache/clerezza/rdf/virtuoso/storage/access/DataAccess.java
----------------------------------------------------------------------
diff --git a/rdf.virtuoso.storage/src/main/java/org/apache/clerezza/rdf/virtuoso/storage/access/DataAccess.java b/rdf.virtuoso.storage/src/main/java/org/apache/clerezza/rdf/virtuoso/storage/access/DataAccess.java
index b1c441c..e0c891d 100644
--- a/rdf.virtuoso.storage/src/main/java/org/apache/clerezza/rdf/virtuoso/storage/access/DataAccess.java
+++ b/rdf.virtuoso.storage/src/main/java/org/apache/clerezza/rdf/virtuoso/storage/access/DataAccess.java
@@ -29,6 +29,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -166,18 +167,20 @@ public class DataAccess {
private void close(Object... resources) {
for (Object o : resources) {
- try {
- if (o instanceof ResultSet ) {
- ((ResultSet) o).close();
- } else if (o instanceof Statement) {
- ((Statement) o).close();
- }else if (o instanceof Connection) {
- ((Connection) o).close();
- }else{
- throw new SQLException("XXX Unsupported resource: " + o.toString());
+ if ( o != null ) {
+ try {
+ if (o instanceof ResultSet ) {
+ ((ResultSet) o).close();
+ } else if (o instanceof Statement) {
+ ((Statement) o).close();
+ }else if (o instanceof Connection) {
+ ((Connection) o).close();
+ }else{
+ throw new SQLException("XXX Unsupported resource: " + o.toString());
+ }
+ } catch (SQLException e) {
+ logger.error("Cannot close resource of type {}", o.getClass());
}
- } catch (SQLException e) {
- logger.error("Cannot close resource of type {}", o.getClass());
}
}
}
@@ -1046,7 +1049,7 @@ public class DataAccess {
*/
private class RSSolutionMapping implements SolutionMapping {
- private Map<Variable, Resource> map;
+ private Map<Variable, Resource> map = new HashMap<Variable, Resource>();
@Override
public int size() {
@@ -1075,8 +1078,7 @@ public class DataAccess {
@Override
public Resource put(Variable key, Resource value) {
- // TODO Auto-generated method stub
- return null;
+ return map.put( key, value );
}
@Override
@@ -1113,6 +1115,6 @@ public class DataAccess {
public Resource get(String name) {
return map.get(new Variable(name));
}
- }
+ }
}
[08/11] git commit: CLEREZZ-935: Temporarily disabled typerendering
Posted by re...@apache.org.
CLEREZZ-935: Temporarily disabled typerendering
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/9bd5d805
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/9bd5d805
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/9bd5d805
Branch: refs/heads/release-201407
Commit: 9bd5d8051ae6df3b211f0671e3ec4900ca0aa12b
Parents: 09a0024
Author: Minto van der Sluis <mi...@apache.org>
Authored: Thu Jul 31 14:07:49 2014 +0200
Committer: Minto van der Sluis <mi...@apache.org>
Committed: Thu Jul 31 14:07:49 2014 +0200
----------------------------------------------------------------------
provisioning/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/9bd5d805/provisioning/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/pom.xml b/provisioning/pom.xml
index a835482..437048f 100644
--- a/provisioning/pom.xml
+++ b/provisioning/pom.xml
@@ -51,7 +51,7 @@
<module>rdf.virtuoso</module>
<module>platform.graphnodeprovider</module>
<module>typehandlerspace</module>
- <module>typerendering</module>
+ <!--module>typerendering</module -->
<module>rdf.web</module>
<module>platform.content</module>
<module>platform.tools</module>
[06/11] git commit: CLEREZZA-933: Added null check
Posted by re...@apache.org.
CLEREZZA-933: Added null check
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/80e95cd8
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/80e95cd8
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/80e95cd8
Branch: refs/heads/release-201407
Commit: 80e95cd83ec41ff3a57f5d95935d9f7d2622b402
Parents: 981bfd2
Author: Minto van der Sluis <mi...@apache.org>
Authored: Wed Jul 30 16:31:55 2014 +0200
Committer: Minto van der Sluis <mi...@apache.org>
Committed: Wed Jul 30 16:31:55 2014 +0200
----------------------------------------------------------------------
.../apache/clerezza/rdf/virtuoso/storage/access/DataAccess.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/80e95cd8/rdf.virtuoso.storage/src/main/java/org/apache/clerezza/rdf/virtuoso/storage/access/DataAccess.java
----------------------------------------------------------------------
diff --git a/rdf.virtuoso.storage/src/main/java/org/apache/clerezza/rdf/virtuoso/storage/access/DataAccess.java b/rdf.virtuoso.storage/src/main/java/org/apache/clerezza/rdf/virtuoso/storage/access/DataAccess.java
index e0c891d..56fd298 100644
--- a/rdf.virtuoso.storage/src/main/java/org/apache/clerezza/rdf/virtuoso/storage/access/DataAccess.java
+++ b/rdf.virtuoso.storage/src/main/java/org/apache/clerezza/rdf/virtuoso/storage/access/DataAccess.java
@@ -909,6 +909,9 @@ public class DataAccess {
}
private Resource objectToResource(Object o){
+ if ( o == null ) {
+ return null;
+ }
return buildObject(o);
}