Mercurial > hg > release > thermostat-1.0

changeset 1353:f64d18dbc591

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Generate docs for more Services and ExtensionPoints Reviewed-by: jerboaa Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2013-November/008867.html
author Omair Majid <omajid@redhat.com>
date Thu, 21 Nov 2013 13:26:53 -0500
parents 9f451c06cb51
children 21047c9ee50e
files client/cli/pom.xml client/cli/src/main/java/com/redhat/thermostat/client/cli/VMStatPrintDelegate.java config/src/main/java/com/redhat/thermostat/shared/config/CommonPaths.java distribution/tools/MergePluginDocs.java
diffstat 4 files changed, 12 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/client/cli/pom.xml	Thu Nov 21 10:53:18 2013 -0500
+++ b/client/cli/pom.xml	Thu Nov 21 13:26:53 2013 -0500
@@ -77,6 +77,11 @@
     </dependency>
     <dependency>
       <groupId>com.redhat.thermostat</groupId>
+      <artifactId>thermostat-annotations</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.redhat.thermostat</groupId>
       <artifactId>thermostat-common-core</artifactId>
       <version>${project.version}</version>
     </dependency>
--- a/client/cli/src/main/java/com/redhat/thermostat/client/cli/VMStatPrintDelegate.java	Thu Nov 21 10:53:18 2013 -0500
+++ b/client/cli/src/main/java/com/redhat/thermostat/client/cli/VMStatPrintDelegate.java	Thu Nov 21 13:26:53 2013 -0500
@@ -38,6 +38,7 @@
 
 import java.util.List;
 
+import com.redhat.thermostat.annotations.ExtensionPoint;
 import com.redhat.thermostat.common.Ordered;
 import com.redhat.thermostat.storage.core.VmRef;
 import com.redhat.thermostat.storage.model.TimeStampedPojo;
@@ -46,6 +47,7 @@
  * This interface should be implemented by plug-ins that would like to
  * contribute data to the output of the vm-stat command.
  */
+@ExtensionPoint
 public interface VMStatPrintDelegate extends Ordered {
     
     /**
--- a/config/src/main/java/com/redhat/thermostat/shared/config/CommonPaths.java	Thu Nov 21 10:53:18 2013 -0500
+++ b/config/src/main/java/com/redhat/thermostat/shared/config/CommonPaths.java	Thu Nov 21 13:26:53 2013 -0500
@@ -38,6 +38,8 @@
 
 import java.io.File;
 
+import com.redhat.thermostat.annotations.Service;
+
 /**
  * Contains locations to various files and directories used by thermostat
  * components.
@@ -54,6 +56,7 @@
  * The directories are split according to functionality, along the lines of
  * Filesystem Hierarchy Standard (FHS).
  */
+@Service
 public interface CommonPaths {
 
     public File getSystemThermostatHome() throws InvalidConfigurationException;
--- a/distribution/tools/MergePluginDocs.java	Thu Nov 21 10:53:18 2013 -0500
+++ b/distribution/tools/MergePluginDocs.java	Thu Nov 21 13:26:53 2013 -0500
@@ -67,7 +67,9 @@
         corePaths.add(Paths.get("launcher").toAbsolutePath().normalize());
         corePaths.add(Paths.get("client").toAbsolutePath().normalize());
         corePaths.add(Paths.get("common").toAbsolutePath().normalize());
+        corePaths.add(Paths.get("keyring").toAbsolutePath().normalize());
         corePaths.add(Paths.get("storage", "core").toAbsolutePath().normalize());
+        corePaths.add(Paths.get("config").toAbsolutePath().normalize());
 
         String startPath = ".";
         if (args.length > 0) {