[infinispan-commits] Infinispan SVN: r388 - in trunk/jopr-plugin: src/main/java/org/infinispan/jopr/infinispan and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2009-06-02 09:09:53 -0400 (Tue, 02 Jun 2009)
New Revision: 388

Modified:
   trunk/jopr-plugin/pom.xml
   trunk/jopr-plugin/src/main/java/org/infinispan/jopr/infinispan/CacheComponent.java
   trunk/jopr-plugin/src/main/java/org/infinispan/jopr/infinispan/CacheDiscovery.java
   trunk/jopr-plugin/src/main/java/org/infinispan/jopr/infinispan/ConnectionHelper.java
   trunk/jopr-plugin/src/main/java/org/infinispan/jopr/infinispan/InfinispanComponent.java
   trunk/jopr-plugin/src/main/java/org/infinispan/jopr/infinispan/InfinispanDiscovery.java
Log:
Added JOPR plugin

Modified: trunk/jopr-plugin/pom.xml
===================================================================
--- trunk/jopr-plugin/pom.xml	2009-06-02 12:47:26 UTC (rev 387)
+++ trunk/jopr-plugin/pom.xml	2009-06-02 13:09:53 UTC (rev 388)
@@ -7,10 +7,10 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.rhq</groupId>
-      <artifactId>rhq-plugins-parent</artifactId>
-      <version>1.2.0.GA</version>
-      <!-- TODO adjust RHQ version in the future -->
+      <groupId>org.infinispan</groupId>
+      <artifactId>infinispan-parent</artifactId>
+      <version>4.0.0-SNAPSHOT</version>
+      <relativePath>../parent/pom.xml</relativePath>
    </parent>
 
    <groupId>org.infinispan</groupId>
@@ -209,10 +209,23 @@
       </dependency>
 
       <dependency>
+         <groupId>mc4j</groupId>
+         <artifactId>org-mc4j-ems</artifactId>
+         <version>1.2.6</version>
+         <scope>provided</scope>
+      </dependency>
+
+      <dependency>
+         <groupId>org.hyperic</groupId>
+         <artifactId>sigar</artifactId>
+         <version>1.6.0.14</version>
+         <scope>provided</scope>
+      </dependency>
+
+      <dependency>
          <groupId>org.infinispan</groupId>
          <artifactId>infinispan-core</artifactId>
          <version>4.0.0-SNAPSHOT</version>
-         <scope>test</scope>
       </dependency>
    </dependencies>
 </project>

Modified: trunk/jopr-plugin/src/main/java/org/infinispan/jopr/infinispan/CacheComponent.java
===================================================================
--- trunk/jopr-plugin/src/main/java/org/infinispan/jopr/infinispan/CacheComponent.java	2009-06-02 12:47:26 UTC (rev 387)
+++ trunk/jopr-plugin/src/main/java/org/infinispan/jopr/infinispan/CacheComponent.java	2009-06-02 13:09:53 UTC (rev 388)
@@ -21,8 +21,8 @@
  */
 package org.infinispan.jopr.infinispan;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
 import org.mc4j.ems.connection.EmsConnection;
 import org.mc4j.ems.connection.bean.EmsBean;
 import org.mc4j.ems.connection.bean.attribute.EmsAttribute;

Modified: trunk/jopr-plugin/src/main/java/org/infinispan/jopr/infinispan/CacheDiscovery.java
===================================================================
--- trunk/jopr-plugin/src/main/java/org/infinispan/jopr/infinispan/CacheDiscovery.java	2009-06-02 12:47:26 UTC (rev 387)
+++ trunk/jopr-plugin/src/main/java/org/infinispan/jopr/infinispan/CacheDiscovery.java	2009-06-02 13:09:53 UTC (rev 388)
@@ -21,8 +21,8 @@
  */
 package org.infinispan.jopr.infinispan;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
 import org.mc4j.ems.connection.EmsConnection;
 import org.mc4j.ems.connection.bean.EmsBean;
 import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;

Modified: trunk/jopr-plugin/src/main/java/org/infinispan/jopr/infinispan/ConnectionHelper.java
===================================================================
--- trunk/jopr-plugin/src/main/java/org/infinispan/jopr/infinispan/ConnectionHelper.java	2009-06-02 12:47:26 UTC (rev 387)
+++ trunk/jopr-plugin/src/main/java/org/infinispan/jopr/infinispan/ConnectionHelper.java	2009-06-02 13:09:53 UTC (rev 388)
@@ -18,8 +18,8 @@
  */
 package org.infinispan.jopr.infinispan;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
 import org.mc4j.ems.connection.ConnectionFactory;
 import org.mc4j.ems.connection.EmsConnection;
 import org.mc4j.ems.connection.settings.ConnectionSettings;

Modified: trunk/jopr-plugin/src/main/java/org/infinispan/jopr/infinispan/InfinispanComponent.java
===================================================================
--- trunk/jopr-plugin/src/main/java/org/infinispan/jopr/infinispan/InfinispanComponent.java	2009-06-02 12:47:26 UTC (rev 387)
+++ trunk/jopr-plugin/src/main/java/org/infinispan/jopr/infinispan/InfinispanComponent.java	2009-06-02 13:09:53 UTC (rev 388)
@@ -21,8 +21,6 @@
  */
 package org.infinispan.jopr.infinispan;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.mc4j.ems.connection.EmsConnection;
 import org.mc4j.ems.connection.bean.EmsBean;
 import org.rhq.core.domain.measurement.AvailabilityType;
@@ -42,8 +40,6 @@
  * @author Heiko W. Rupp
  */
 public class InfinispanComponent implements ResourceComponent, MeasurementFacet {
-   private final Log log = LogFactory.getLog(this.getClass());
-
    private ResourceContext context;
    private ConnectionHelper helper;
 

Modified: trunk/jopr-plugin/src/main/java/org/infinispan/jopr/infinispan/InfinispanDiscovery.java
===================================================================
--- trunk/jopr-plugin/src/main/java/org/infinispan/jopr/infinispan/InfinispanDiscovery.java	2009-06-02 12:47:26 UTC (rev 387)
+++ trunk/jopr-plugin/src/main/java/org/infinispan/jopr/infinispan/InfinispanDiscovery.java	2009-06-02 13:09:53 UTC (rev 388)
@@ -21,8 +21,8 @@
  */
 package org.infinispan.jopr.infinispan;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.infinispan.util.logging.Log;
+import org.infinispan.util.logging.LogFactory;
 import org.mc4j.ems.connection.EmsConnection;
 import org.mc4j.ems.connection.bean.EmsBean;
 import org.rhq.core.domain.configuration.Configuration;