[jboss-cvs] JBossAS SVN: r89625 - in projects/ejb3/trunk: metrics-deployer and 3 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Jun 1 17:10:46 EDT 2009


Author: ALRubinger
Date: 2009-06-01 17:10:46 -0400 (Mon, 01 Jun 2009)
New Revision: 89625

Added:
   projects/ejb3/trunk/metrics-deployer/src/main/java/org/jboss/ejb3/metrics/spi/
   projects/ejb3/trunk/metrics-deployer/src/main/java/org/jboss/ejb3/metrics/spi/SessionInstanceMetrics.java
   projects/ejb3/trunk/metrics-deployer/src/main/java/org/jboss/ejb3/metrics/spi/StatefulSessionInstanceMetrics.java
Removed:
   projects/ejb3/trunk/metrics-deployer/src/main/java/org/jboss/ejb3/metrics/spi/SessionMetrics.java
   projects/ejb3/trunk/metrics-spi/
   projects/ejb3/trunk/plugin/src/main/resources/jboss-ejb3-metrics-spi.xml
Modified:
   projects/ejb3/trunk/metrics-deployer/pom.xml
   projects/ejb3/trunk/plugin/src/main/resources/installer.xml
   projects/ejb3/trunk/plugin/src/main/resources/package-list.txt
   projects/ejb3/trunk/pom.xml
Log:
[EJBTHREE-1839] Remove the no-longer-necessary jboss-ejb3-metrics-spi (no integration needed in ejb3-core)

Modified: projects/ejb3/trunk/metrics-deployer/pom.xml
===================================================================
--- projects/ejb3/trunk/metrics-deployer/pom.xml	2009-06-01 18:53:07 UTC (rev 89624)
+++ projects/ejb3/trunk/metrics-deployer/pom.xml	2009-06-01 21:10:46 UTC (rev 89625)
@@ -29,7 +29,6 @@
     <!-- Versioning -->
     <version.org.jboss.deployers.jboss_deployers_spi>2.0.7.GA</version.org.jboss.deployers.jboss_deployers_spi>
     <version.org.jboss.ejb3_jboss.ejb3.core>1.1.6</version.org.jboss.ejb3_jboss.ejb3.core>
-    <version.org.jboss.ejb3_jboss.ejb3.metrics.spi>1.0.0-alpha-1</version.org.jboss.ejb3_jboss.ejb3.metrics.spi>
     <version.org.jboss.man_jboss.managed>2.1.0.SP1</version.org.jboss.man_jboss.managed>
     <version.org.jboss.microcontainer_jboss.jmx.mc.int>2.2.0.M2</version.org.jboss.microcontainer_jboss.jmx.mc.int>
   
@@ -47,13 +46,6 @@
       <version>${version.org.jboss.ejb3_jboss.ejb3.core}</version>
     </dependency>
 
-    <dependency>
-      <groupId>org.jboss.ejb3</groupId>
-      <artifactId>jboss-ejb3-metrics-spi</artifactId>
-      <version>${version.org.jboss.ejb3_jboss.ejb3.metrics.spi}</version>
-    </dependency>
-
-
     <!-- 
     Dependencies: External to EJB3 
     -->

Copied: projects/ejb3/trunk/metrics-deployer/src/main/java/org/jboss/ejb3/metrics/spi (from rev 89503, projects/ejb3/trunk/metrics-spi/src/main/java/org/jboss/ejb3/metrics/spi)


Property changes on: projects/ejb3/trunk/metrics-deployer/src/main/java/org/jboss/ejb3/metrics/spi
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: projects/ejb3/trunk/metrics-deployer/src/main/java/org/jboss/ejb3/metrics/spi/SessionInstanceMetrics.java (from rev 89504, projects/ejb3/trunk/metrics-spi/src/main/java/org/jboss/ejb3/metrics/spi/SessionInstanceMetrics.java)
===================================================================
--- projects/ejb3/trunk/metrics-deployer/src/main/java/org/jboss/ejb3/metrics/spi/SessionInstanceMetrics.java	                        (rev 0)
+++ projects/ejb3/trunk/metrics-deployer/src/main/java/org/jboss/ejb3/metrics/spi/SessionInstanceMetrics.java	2009-06-01 21:10:46 UTC (rev 89625)
@@ -0,0 +1,77 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+  *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.metrics.spi;
+
+/**
+ * SessionInstanceMetrics
+ * 
+ * Represents backing instance metrics of any type of 
+ * EJB 3.x Session Bean, typically targeting the underlying 
+ * instance pool or cache
+ *
+ * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
+ * @version $Revision: $
+ */
+public interface SessionInstanceMetrics
+{
+   // --------------------------------------------------------------------------------||
+   // Contracts ----------------------------------------------------------------------||
+   // --------------------------------------------------------------------------------||
+
+   /**
+    * Obtains the current size of the underlying 
+    * pool/cache of bean instances
+    * 
+    * @return
+    */
+   int getCurrentSize();
+
+   /**
+    * Obtains the number of instances created for this EJB
+    * 
+    * @return
+    */
+   int getCreateCount();
+
+   /**
+    * Obtains the number of instances removed for this EJB
+    * 
+    * @return
+    */
+   int getRemoveCount();
+
+   /**
+    * Obtains the number of instances currently available for 
+    * service for this EJB
+    * 
+    * @return
+    */
+   int getAvailableCount();
+
+   /**
+    * Obtains the size of the underlying instance pool/cache
+    * at it highest 
+    * 
+    * @return
+    */
+   int getMaxSize();
+}

Deleted: projects/ejb3/trunk/metrics-deployer/src/main/java/org/jboss/ejb3/metrics/spi/SessionMetrics.java
===================================================================
--- projects/ejb3/trunk/metrics-spi/src/main/java/org/jboss/ejb3/metrics/spi/SessionMetrics.java	2009-05-28 21:36:58 UTC (rev 89503)
+++ projects/ejb3/trunk/metrics-deployer/src/main/java/org/jboss/ejb3/metrics/spi/SessionMetrics.java	2009-06-01 21:10:46 UTC (rev 89625)
@@ -1,118 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
-  *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.metrics.spi;
-
-/**
- * SessionMetrics
- * 
- * Represents metrics of any type of EJB 3.x Session Bean
- *
- * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
- * @version $Revision: $
- */
-public interface SessionMetrics
-{
-   // --------------------------------------------------------------------------------||
-   // Contracts ----------------------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   /**
-    * Obtains the current size of the underlying 
-    * pool/cache of bean instances
-    * 
-    * @return
-    */
-   int getCurrentSize();
-
-   /**
-    * Sets the current size of the underlying 
-    * pool/cache of bean instances
-    * 
-    * @param currentSize
-    * @throws IllegalArgumentException If the count is < 0
-    */
-   void setCurrentSize(int currentSize) throws IllegalArgumentException;
-
-   /**
-    * Obtains the number of instances created for this EJB
-    * 
-    * @return
-    */
-   int getCreateCount();
-
-   /**
-    * Sets the number of instances created for this EJB
-    * 
-    * @param createCount
-    * @throws IllegalArgumentException If the count is < 0
-    */
-   void setCreateCount(int createCount) throws IllegalArgumentException;
-
-   /**
-    * Obtains the number of instances removed for this EJB
-    * 
-    * @return
-    */
-   int getRemoveCount();
-
-   /**
-    * Sets the number of instances removed for this EJB
-    * 
-    * @param removeCount
-    * @throws IllegalArgumentException If the count is < 0
-    */
-   void setRemoveCount(int removeCount) throws IllegalArgumentException;
-
-   /**
-    * Obtains the number of instances currently available for 
-    * service for this EJB
-    * 
-    * @return
-    */
-   int getAvailableCount();
-
-   /**
-    * Sets the number of instances currently available for 
-    * service for this EJB
-    * 
-    * @param availableCount
-    * @throws IllegalArgumentException If the count is < 0
-    */
-   void setAvailableCount(int availableCount) throws IllegalArgumentException;
-
-   /**
-    * Obtains the size of the underlying instance pool/cache
-    * at it highest 
-    * 
-    * @return
-    */
-   int getMaxSize();
-
-   /**
-    * Sets the size of the underlying instance pool/cache
-    * at it highest 
-    * 
-    * @param maxSize
-    * @throws IllegalArgumentException If the count is < 0
-    */
-   void setMaxSize(int maxSize) throws IllegalArgumentException;
-}

Copied: projects/ejb3/trunk/metrics-deployer/src/main/java/org/jboss/ejb3/metrics/spi/StatefulSessionInstanceMetrics.java (from rev 89504, projects/ejb3/trunk/metrics-spi/src/main/java/org/jboss/ejb3/metrics/spi/StatefulSessionInstanceMetrics.java)
===================================================================
--- projects/ejb3/trunk/metrics-deployer/src/main/java/org/jboss/ejb3/metrics/spi/StatefulSessionInstanceMetrics.java	                        (rev 0)
+++ projects/ejb3/trunk/metrics-deployer/src/main/java/org/jboss/ejb3/metrics/spi/StatefulSessionInstanceMetrics.java	2009-06-01 21:10:46 UTC (rev 89625)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+  *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.metrics.spi;
+
+/**
+ * StatefulSessionInstanceMetrics
+ * 
+ * Represents backing instance metrics of EJB3 Stateful Session Beans
+ * targeting the underlying instance cache
+ *
+ * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
+ * @version $Revision: $
+ */
+public interface StatefulSessionInstanceMetrics extends SessionInstanceMetrics
+{
+
+   // --------------------------------------------------------------------------------||
+   // Contracts ----------------------------------------------------------------------||
+   // --------------------------------------------------------------------------------||
+
+   /**
+    * Obtains the current number of instances in the cache
+    * 
+    * @return
+    */
+   int getCacheSize();
+
+   /**
+    * Returns the total size of the cache
+    * 
+    * @return
+    */
+   int getTotalSize();
+
+   /**
+    * Returns the number of instanes passivated
+    * 
+    * @return
+    */
+   int getPassivatedCount();
+}

Modified: projects/ejb3/trunk/plugin/src/main/resources/installer.xml
===================================================================
--- projects/ejb3/trunk/plugin/src/main/resources/installer.xml	2009-06-01 18:53:07 UTC (rev 89624)
+++ projects/ejb3/trunk/plugin/src/main/resources/installer.xml	2009-06-01 21:10:46 UTC (rev 89625)
@@ -45,7 +45,6 @@
         <include>org.jboss.ejb3:jboss-ejb3-metadata:jar</include>
         <include>org.jboss.ejb3:jboss-ejb3-mc-int:jar</include>
         <include>org.jboss.ejb3:jboss-ejb3-metrics-deployer:jar</include>
-        <include>org.jboss.ejb3:jboss-ejb3-metrics-spi:jar</include>
         <include>org.jboss.ejb3:jboss-ejb3-proxy-impl:jar</include>
         <include>org.jboss.ejb3:jboss-ejb3-proxy-spi:jar</include>
         <include>org.jboss.ejb3:jboss-ejb3-proxy-clustered:jar</include>

Deleted: projects/ejb3/trunk/plugin/src/main/resources/jboss-ejb3-metrics-spi.xml
===================================================================
--- projects/ejb3/trunk/plugin/src/main/resources/jboss-ejb3-metrics-spi.xml	2009-06-01 18:53:07 UTC (rev 89624)
+++ projects/ejb3/trunk/plugin/src/main/resources/jboss-ejb3-metrics-spi.xml	2009-06-01 21:10:46 UTC (rev 89625)
@@ -1,14 +0,0 @@
-<!-- 
-   vi:ts=3:sw:expandtab
--->
-<project name="jboss-ejb3-metrics-spi" default="install">
-  <import file="setup.xml"/>
-
-  <target name="install">
-     <copy file="lib/jboss-ejb3-metrics-spi.jar" todir="${jboss.home}/common/lib" verbose="${verbose}"/>
-  </target>
-
-  <target name="uninstall">
-     <delete file="${jboss.home}/common/lib/jboss-ejb3-metrics-spi.jar" verbose="${verbose}"/>
-  </target>
-</project>

Modified: projects/ejb3/trunk/plugin/src/main/resources/package-list.txt
===================================================================
--- projects/ejb3/trunk/plugin/src/main/resources/package-list.txt	2009-06-01 18:53:07 UTC (rev 89624)
+++ projects/ejb3/trunk/plugin/src/main/resources/package-list.txt	2009-06-01 21:10:46 UTC (rev 89625)
@@ -1,5 +1,4 @@
 jboss-ejb3-timerservice-spi.xml
 jboss-ejb3-endpointdeployer.xml
 jboss-ejb3-endpoint.xml
-jboss-ejb3-metrics-spi.xml
 jboss-ejb3-metrics-deployer.xml

Modified: projects/ejb3/trunk/pom.xml
===================================================================
--- projects/ejb3/trunk/pom.xml	2009-06-01 18:53:07 UTC (rev 89624)
+++ projects/ejb3/trunk/pom.xml	2009-06-01 21:10:46 UTC (rev 89625)
@@ -56,7 +56,6 @@
     <!-- <module>locator</module> -->
     <module>metadata</module>
     <module>metrics-deployer</module>
-    <module>metrics-spi</module>
     <module>mc-int</module>
     <module>plugin</module>
     <module>pool</module>




More information about the jboss-cvs-commits mailing list