You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ss...@apache.org on 2013/03/18 13:42:17 UTC
[1/2] git commit: added check style configuration to enforce javadoc
comments
added check style configuration to enforce javadoc comments
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/ed4e3c3c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/ed4e3c3c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/ed4e3c3c
Branch: refs/heads/master
Commit: ed4e3c3cf5016a2d3aa5f19033f33d28c8ae860c
Parents: c9174b5
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Mon Mar 18 13:41:41 2013 +0100
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Mon Mar 18 13:41:41 2013 +0100
----------------------------------------------------------------------
build/checkstyle-resources/pom.xml | 55 +++++++++++++++
.../org/apache/marmotta/checkstyle/checkstyle.xml | 45 ++++++++++++
build/pom.xml | 1 +
.../marmotta/client/util/CollectionUtils.java | 5 ++
.../commons/collections/CollectionUtils.java | 6 ++-
.../commons/sesame/filter/AllOfFilter.java | 2 +
.../commons/sesame/filter/AlwaysFalseFilter.java | 2 +
.../commons/sesame/filter/AlwaysTrueFilter.java | 2 +
.../java/org/apache/marmotta/ldpath/LDPath.java | 2 +
.../model/functions/ConcatenateFunction.java | 2 +
.../ldpath/model/functions/FirstFunction.java | 4 +-
.../ldpath/model/selectors/FunctionSelector.java | 4 +-
.../ldpath/model/selectors/UnionSelector.java | 2 +
.../marmotta/ldpath/model/tests/AndTest.java | 2 +
.../model/transformers/BigDecimalTransformer.java | 5 ++
.../model/transformers/BigIntegerTransformer.java | 5 ++
.../model/transformers/DateTimeTransformer.java | 4 +-
.../ldpath/model/transformers/DateTransformer.java | 4 +-
.../model/transformers/FloatTransformer.java | 4 +-
.../model/functions/html/CleanHtmlFunction.java | 2 +
.../ldpath/template/engine/TemplateEngine.java | 4 +-
.../transformers/TemplateDoubleTransformer.java | 2 +
parent/pom.xml | 50 +++++--------
.../marmotta/platform/core/util/CDIUtils.java | 3 +
24 files changed, 179 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ed4e3c3c/build/checkstyle-resources/pom.xml
----------------------------------------------------------------------
diff --git a/build/checkstyle-resources/pom.xml b/build/checkstyle-resources/pom.xml
new file mode 100644
index 0000000..baf8b39
--- /dev/null
+++ b/build/checkstyle-resources/pom.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.marmotta</groupId>
+ <artifactId>marmotta-parent</artifactId>
+ <version>3.0.0-incubating-SNAPSHOT</version>
+ <relativePath>../../parent</relativePath>
+ </parent>
+
+ <groupId>org.apache.marmotta</groupId>
+ <artifactId>checkstyle-resources</artifactId>
+ <name>Marmotta Build Support: Checkstyle Resources</name>
+
+ <!-- skip execution of checkstyle plugin to avoid cyclic dependencies -->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+
+ <executions>
+ <execution>
+ <id>check-compile</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ed4e3c3c/build/checkstyle-resources/src/main/resources/org/apache/marmotta/checkstyle/checkstyle.xml
----------------------------------------------------------------------
diff --git a/build/checkstyle-resources/src/main/resources/org/apache/marmotta/checkstyle/checkstyle.xml b/build/checkstyle-resources/src/main/resources/org/apache/marmotta/checkstyle/checkstyle.xml
new file mode 100644
index 0000000..efd1b82
--- /dev/null
+++ b/build/checkstyle-resources/src/main/resources/org/apache/marmotta/checkstyle/checkstyle.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+<module name="Checker">
+ <property name="severity" value="error" />
+
+ <!-- error-level checks: Javadoc Classes -->
+ <module name="TreeWalker">
+ <property name="severity" value="error" />
+
+ <!-- check for presence of a comment on all class files -->
+ <module name="JavadocType">
+ <property name="scope" value="public" />
+ </module>
+
+ </module>
+
+ <!-- warning-level checks: Javadoc Methods -->
+ <module name="TreeWalker">
+ <property name="severity" value="error" />
+
+
+ <!-- check for the presence of a comment on all public methods -->
+ <module name="JavadocMethod">
+ <property name="scope" value="public" />
+ </module>
+ </module>
+
+</module>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ed4e3c3c/build/pom.xml
----------------------------------------------------------------------
diff --git a/build/pom.xml b/build/pom.xml
index e7bcc1e..96512e8 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -55,6 +55,7 @@
<module>archetypes</module>
<module>plugins</module>
<module>dependency-resource-supplement</module>
+ <module>checkstyle-resources</module>
</modules>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ed4e3c3c/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/util/CollectionUtils.java
----------------------------------------------------------------------
diff --git a/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/util/CollectionUtils.java b/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/util/CollectionUtils.java
index ca0df7a..6d407e9 100644
--- a/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/util/CollectionUtils.java
+++ b/client/marmotta-client-java/src/main/java/org/apache/marmotta/client/util/CollectionUtils.java
@@ -137,6 +137,11 @@ public class CollectionUtils {
}
+ /**
+ * Allows a custom serialization of objects of type T to a string.
+ *
+ * @param <T> the object type to serialize as string
+ */
public interface StringSerializer<T> {
public String serialize(T t);
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ed4e3c3c/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/collections/CollectionUtils.java
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/collections/CollectionUtils.java b/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/collections/CollectionUtils.java
index 3ea7748..7c4fd6f 100644
--- a/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/collections/CollectionUtils.java
+++ b/commons/marmotta-commons/src/main/java/org/apache/marmotta/commons/collections/CollectionUtils.java
@@ -143,7 +143,11 @@ public class CollectionUtils {
return result;
}
-
+ /**
+ * Allows a custom serialization of objects of type T to a string.
+ *
+ * @param <T> the object type to serialize as string
+ */
public interface StringSerializer<T> {
public String serialize(T t);
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ed4e3c3c/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/AllOfFilter.java
----------------------------------------------------------------------
diff --git a/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/AllOfFilter.java b/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/AllOfFilter.java
index 86c6b0e..570981d 100644
--- a/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/AllOfFilter.java
+++ b/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/AllOfFilter.java
@@ -25,6 +25,8 @@ import java.util.Set;
* A filter combining several filters and requiring that all filters match.
* <p/>
* Author: Sebastian Schaffert
+ *
+ * @param <T> the type of object to filter
*/
public class AllOfFilter<T> implements SesameFilter<T> {
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ed4e3c3c/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/AlwaysFalseFilter.java
----------------------------------------------------------------------
diff --git a/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/AlwaysFalseFilter.java b/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/AlwaysFalseFilter.java
index 77d7f95..67e5a7a 100644
--- a/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/AlwaysFalseFilter.java
+++ b/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/AlwaysFalseFilter.java
@@ -21,6 +21,8 @@ package org.apache.marmotta.commons.sesame.filter;
* A filter that always returns false.
* <p/>
* Author: Sebastian Schaffert (sschaffert@apache.org)
+ *
+ * @param <T> the type of object to filter
*/
public class AlwaysFalseFilter<T> implements SesameFilter<T> {
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ed4e3c3c/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/AlwaysTrueFilter.java
----------------------------------------------------------------------
diff --git a/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/AlwaysTrueFilter.java b/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/AlwaysTrueFilter.java
index 36d01c0..9f8520c 100644
--- a/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/AlwaysTrueFilter.java
+++ b/commons/sesame-filter/src/main/java/org/apache/marmotta/commons/sesame/filter/AlwaysTrueFilter.java
@@ -21,6 +21,8 @@ package org.apache.marmotta.commons.sesame.filter;
* A filter that accepts everything.
* <p/>
* Author: Sebastian Schaffert (sschaffert@apache.org)
+ *
+ * @param <T> the type of object to filter
*/
public class AlwaysTrueFilter<T> implements SesameFilter<T> {
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ed4e3c3c/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/LDPath.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/LDPath.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/LDPath.java
index 5738d12..bc46c41 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/LDPath.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/LDPath.java
@@ -44,6 +44,8 @@ import com.google.common.collect.ImmutableSet;
/**
* Main class providing query functionality for the different RDF backends.
+ *
+ * @param <Node> the node type used by the backend
* <p/>
* Author: Sebastian Schaffert
*/
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ed4e3c3c/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/ConcatenateFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/ConcatenateFunction.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/ConcatenateFunction.java
index 2ce6712..81437a6 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/ConcatenateFunction.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/ConcatenateFunction.java
@@ -28,6 +28,8 @@ import org.apache.marmotta.ldpath.model.transformers.StringTransformer;
/**
* A node function concatenating a list of nodes interpreted as strings.
+ *
+ * @param <Node> the node type used by the backend
* <p/>
* Author: Sebastian Schaffert <se...@salzburgresearch.at>
*/
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ed4e3c3c/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/FirstFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/FirstFunction.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/FirstFunction.java
index 7bb79e3..735c13a 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/FirstFunction.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/functions/FirstFunction.java
@@ -26,7 +26,9 @@ import org.apache.marmotta.ldpath.api.functions.SelectorFunction;
/**
* Selects the <code>first</code> node in the argument list.
- *
+ *
+ *
+ * @param <Node> the node type used by the backend
* @author jakob
*
*/
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ed4e3c3c/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/FunctionSelector.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/FunctionSelector.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/FunctionSelector.java
index 27c4f0a..9b85c8a 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/FunctionSelector.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/FunctionSelector.java
@@ -29,7 +29,9 @@ import org.apache.marmotta.ldpath.api.functions.NodeFunction;
import org.apache.marmotta.ldpath.api.selectors.NodeSelector;
/**
- * Add file description here!
+ * Apply a function to the collection of nodes passed as argument of the selector.
+ *
+ * @param <Node> the node type used by the backend
* <p/>
* Author: Sebastian Schaffert <se...@salzburgresearch.at>
*/
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ed4e3c3c/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/UnionSelector.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/UnionSelector.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/UnionSelector.java
index a68cc01..aee30e0 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/UnionSelector.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/selectors/UnionSelector.java
@@ -29,6 +29,8 @@ import org.apache.marmotta.ldpath.api.selectors.NodeSelector;
/**
* Builds the union of two node selectors. Will eliminate duplicates.
+ *
+ * @param <Node> the node type used by the backend
* <p/>
* Author: Sebastian Schaffert <se...@salzburgresearch.at>
*/
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ed4e3c3c/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/AndTest.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/AndTest.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/AndTest.java
index 1cbed77..d2a5f95 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/AndTest.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/tests/AndTest.java
@@ -24,6 +24,8 @@ import org.apache.marmotta.ldpath.api.tests.NodeTest;
* Tests the conjunction of two tests.
* <p/>
* Author: Sebastian Schaffert <se...@salzburgresearch.at>
+ *
+ * @param <T> the type of object to filter
*/
public class AndTest<Node> extends ComplexTest<Node> {
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ed4e3c3c/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/BigDecimalTransformer.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/BigDecimalTransformer.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/BigDecimalTransformer.java
index ed73f0e..543ae9b 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/BigDecimalTransformer.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/BigDecimalTransformer.java
@@ -24,6 +24,11 @@ import java.util.Map;
import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.api.transformers.NodeTransformer;
+/**
+ * A node transformer transforming the node to its big decimal value, if possible.
+ *
+ * @param <Node> the node type used by the backend
+ */
public class BigDecimalTransformer<Node> implements NodeTransformer<BigDecimal,Node> {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ed4e3c3c/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/BigIntegerTransformer.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/BigIntegerTransformer.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/BigIntegerTransformer.java
index 3bb3b5b..f4c95cb 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/BigIntegerTransformer.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/BigIntegerTransformer.java
@@ -24,6 +24,11 @@ import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.api.transformers.NodeTransformer;
+/**
+ * A node transformer transforming the node to its big integer value, if possible.
+ *
+ * @param <Node> the node type used by the backend
+ */
public class BigIntegerTransformer<Node> implements NodeTransformer<BigInteger,Node> {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ed4e3c3c/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/DateTimeTransformer.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/DateTimeTransformer.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/DateTimeTransformer.java
index 77ed68f..8d855ec 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/DateTimeTransformer.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/DateTimeTransformer.java
@@ -25,7 +25,9 @@ import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.api.transformers.NodeTransformer;
/**
- * Add file description here!
+ * Transform literals to datetime objects (i.e. dates with both a date component and a time component) if possible.
+ *
+ * @param <Node> the node type used by the backend
* <p/>
* Author: Sebastian Schaffert <se...@salzburgresearch.at>
*/
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ed4e3c3c/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/DateTransformer.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/DateTransformer.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/DateTransformer.java
index 4a7dd1d..60a1181 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/DateTransformer.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/DateTransformer.java
@@ -24,7 +24,9 @@ import org.apache.marmotta.ldpath.api.backend.RDFBackend;
import org.apache.marmotta.ldpath.api.transformers.NodeTransformer;
/**
- * TODO: is this a duplicate of DateTimeTransformer?
+ * Transform literal nodes into a date representation without time component if possible.
+ *
+ * @param <Node> the node type used by the backend
* <p/>
* Author: Sebastian Schaffert <se...@salzburgresearch.at>
*/
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ed4e3c3c/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/FloatTransformer.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/FloatTransformer.java b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/FloatTransformer.java
index 50e23e6..d2bbab5 100644
--- a/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/FloatTransformer.java
+++ b/libraries/ldpath/ldpath-core/src/main/java/org/apache/marmotta/ldpath/model/transformers/FloatTransformer.java
@@ -23,7 +23,9 @@ import org.apache.marmotta.ldpath.api.transformers.NodeTransformer;
import java.util.Map;
/**
- * Add file description here!
+ * Transform literal nodes into their float value representation.
+ *
+ * @param <Node> the node type used by the backend
* <p/>
* Author: Sebastian Schaffert <se...@salzburgresearch.at>
*/
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ed4e3c3c/libraries/ldpath/ldpath-functions-html/src/main/java/org/apache/marmotta/ldpath/model/functions/html/CleanHtmlFunction.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-html/src/main/java/org/apache/marmotta/ldpath/model/functions/html/CleanHtmlFunction.java b/libraries/ldpath/ldpath-functions-html/src/main/java/org/apache/marmotta/ldpath/model/functions/html/CleanHtmlFunction.java
index 34af679..0cccbb3 100644
--- a/libraries/ldpath/ldpath-functions-html/src/main/java/org/apache/marmotta/ldpath/model/functions/html/CleanHtmlFunction.java
+++ b/libraries/ldpath/ldpath-functions-html/src/main/java/org/apache/marmotta/ldpath/model/functions/html/CleanHtmlFunction.java
@@ -34,6 +34,8 @@ import java.util.List;
/**
* Function to clean up HTML and remove all script and style elements from the content.
+ *
+ * @param <Node> the node type used by the backend
* <p/>
* Author: Sebastian Schaffert
*/
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ed4e3c3c/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/engine/TemplateEngine.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/engine/TemplateEngine.java b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/engine/TemplateEngine.java
index 3e2817a..d99d542 100644
--- a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/engine/TemplateEngine.java
+++ b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/engine/TemplateEngine.java
@@ -35,7 +35,9 @@ import org.apache.marmotta.ldpath.template.model.freemarker.TemplateNodeModel;
import org.apache.marmotta.ldpath.template.model.freemarker.TemplateStackModel;
/**
- * Add file description here!
+ * A FreeMarker based
+ *
+ * @param <Node> the node type used by the backend
* <p/>
* Author: Sebastian Schaffert
*/
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ed4e3c3c/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateDoubleTransformer.java
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateDoubleTransformer.java b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateDoubleTransformer.java
index b73396e..b19f327 100644
--- a/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateDoubleTransformer.java
+++ b/libraries/ldpath/ldpath-template/src/main/java/org/apache/marmotta/ldpath/template/model/transformers/TemplateDoubleTransformer.java
@@ -28,6 +28,8 @@ import java.util.Map;
/**
* Transform a node into the freemarker double type (TemplateDoubleModel).
+ *
+ * @param <Node> the node type used by the backend
* <p/>
* Author: Sebastian Schaffert
*/
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ed4e3c3c/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index ab23082..0459051 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -302,13 +302,28 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.9.1</version>
+ <version>2.10</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.marmotta</groupId>
+ <artifactId>checkstyle-resources</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
<configuration>
- <skip>false</skip>
- <failsOnError>false</failsOnError>
<enableRulesSummary>true</enableRulesSummary>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
+ <failsOnError>false</failsOnError>
+ <configLocation>org/apache/marmotta/checkstyle/checkstyle.xml</configLocation>
</configuration>
+ <executions>
+ <execution>
+ <id>check-compile</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin> <!-- generate JRebel Configuration -->
<groupId>org.zeroturnaround</groupId>
@@ -498,15 +513,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-reactor-plugin</artifactId>
</plugin>
<plugin>
@@ -514,10 +520,6 @@
<artifactId>maven-project-info-reports-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.zeroturnaround</groupId>
<artifactId>jrebel-maven-plugin</artifactId>
</plugin>
@@ -534,20 +536,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <!--
- During release:perform, enable the "sign" profile
- -->
- <releaseProfiles>sign</releaseProfiles>
- </configuration>
- </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ed4e3c3c/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/util/CDIUtils.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/util/CDIUtils.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/util/CDIUtils.java
index 526a8aa..076d630 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/util/CDIUtils.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/util/CDIUtils.java
@@ -21,6 +21,9 @@ import javax.enterprise.inject.Instance;
import javax.inject.Named;
import java.lang.annotation.Annotation;
+/**
+ * Some utilities for working with CDI services
+ */
public abstract class CDIUtils {
public static <T> Instance<T> selectNamed(Instance<T> instance, String name) {