Author: ghenzler
Date: Mon Jan 28 08:00:56 2019
New Revision: 1852327
URL: http://svn.apache.org/viewvc?rev=1852327&view=rev
Log:
FELIX-6012 Fixed javadoc
Modified:
felix/trunk/healthcheck/generalchecks/pom.xml
felix/trunk/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/util/ScriptHelper.java
felix/trunk/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/util/SimpleConstraintChecker.java
Modified: felix/trunk/healthcheck/generalchecks/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/healthcheck/generalchecks/pom.xml?rev=1852327&r1=1852326&r2=1852327&view=diff
==============================================================================
--- felix/trunk/healthcheck/generalchecks/pom.xml (original)
+++ felix/trunk/healthcheck/generalchecks/pom.xml Mon Jan 28 08:00:56 2019
@@ -50,7 +50,6 @@
<build>
<plugins>
-
<plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-maven-plugin</artifactId>
@@ -78,8 +77,26 @@
<artifactId>bnd-baseline-maven-plugin</artifactId>
<version>4.1.0</version>
</plugin>
-
</plugins>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <additionalDependencies>
+ <!-- explicitly require cmpn v7 for javadoc -->
+ <additionalDependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.cmpn</artifactId>
+ <version>7.0.0</version>
+ </additionalDependency>
+ </additionalDependencies>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<dependencies>
Modified:
felix/trunk/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/util/ScriptHelper.java
URL:
http://svn.apache.org/viewvc/felix/trunk/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/util/ScriptHelper.java?rev=1852327&r1=1852326&r2=1852327&view=diff
==============================================================================
---
felix/trunk/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/util/ScriptHelper.java
(original)
+++
felix/trunk/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/util/ScriptHelper.java
Mon Jan 28 08:00:56 2019
@@ -47,7 +47,7 @@ import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
-/** Script Helper to interact with . */
+/** Script Helper to simplify interaction with scripting engines in OSGi
context. Used by ScriptedHealthCheck and can be used by other custom checks
that want to allow to evaluate expressions via a scripting engine. */
public class ScriptHelper {
public String getFileContents(String url) {
Modified:
felix/trunk/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/util/SimpleConstraintChecker.java
URL:
http://svn.apache.org/viewvc/felix/trunk/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/util/SimpleConstraintChecker.java?rev=1852327&r1=1852326&r2=1852327&view=diff
==============================================================================
---
felix/trunk/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/util/SimpleConstraintChecker.java
(original)
+++
felix/trunk/healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/util/SimpleConstraintChecker.java
Mon Jan 28 08:00:56 2019
@@ -38,7 +38,10 @@ public class SimpleConstraintChecker {
public static final String OLDER_THAN = "older_than"; // for unix
timestamps
/** Check value against expression and report to result
- * @param statusForFailedContraint */
+ * @param inputValue the value to check
+ * @param constraint the constraint to check the value against
+ * @return true if constraint is met
+ * */
public boolean check(Object inputValue, String constraint) throws
NumberFormatException {
if(inputValue == null) {
