[jboss-cvs] JBossAS SVN: r108815 - in projects/cluster/ha-server-core/trunk: src/main/java/org/jboss/ha/core/framework/server and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: pferraro
Date: 2010-10-22 16:16:45 -0400 (Fri, 22 Oct 2010)
New Revision: 108815

Added:
   projects/cluster/ha-server-core/trunk/src/main/java/org/jboss/ha/core/framework/server/ManagedDistributedState.java
Modified:
   projects/cluster/ha-server-core/trunk/pom.xml
   projects/cluster/ha-server-core/trunk/src/main/java/org/jboss/ha/core/framework/server/HAPartitionImpl.java
Log:
Refactor ManagedDistributedState here from ha-server-cache-spi.
Removes need for ha-server-cache-spi dependency on ha-server-core.

Modified: projects/cluster/ha-server-core/trunk/pom.xml
===================================================================
--- projects/cluster/ha-server-core/trunk/pom.xml	2010-10-22 20:16:31 UTC (rev 108814)
+++ projects/cluster/ha-server-core/trunk/pom.xml	2010-10-22 20:16:45 UTC (rev 108815)
@@ -30,8 +30,7 @@
   </scm>
   
   <properties>
-    <version.jboss.ha.server.api>2.0.0.Alpha6</version.jboss.ha.server.api>
-    <version.jboss.ha.server.cache.spi>3.0.0.Alpha7</version.jboss.ha.server.cache.spi>
+    <version.jboss.ha.server.api>2.0.0.Beta1</version.jboss.ha.server.api>
     <version.jgroups>2.10.1.GA</version.jgroups>
     <version.junit>4.8.2</version.junit>
   </properties>
@@ -44,26 +43,21 @@
       <artifactId>jboss-ha-server-api</artifactId>
       <version>${version.jboss.ha.server.api}</version>
     </dependency>
-    
-    <dependency>
-      <groupId>org.jboss.cluster</groupId>
-      <artifactId>jboss-ha-server-cache-spi</artifactId>
-      <version>${version.jboss.ha.server.cache.spi}</version>
-      <exclusions>
-        <!-- Since we extend jgroups classes, we are particularly sensitive to version -->
-        <exclusion>
-          <groupId>org.jgroups</groupId>
-          <artifactId>jgroups</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
 
+    <!-- Since we extend jgroups classes, we are particularly sensitive to version, -->
+    <!-- so don't just inherit from ha-server-cache-spi -->
     <dependency>
       <groupId>org.jgroups</groupId>
       <artifactId>jgroups</artifactId>
       <version>${version.jgroups}</version>
     </dependency>
     
+    <dependency>
+      <groupId>org.jboss</groupId>
+      <artifactId>jboss-common-core</artifactId>
+      <version>2.2.17.GA</version>
+    </dependency>
+    
     <!-- Test dependencies -->
     
     <dependency>

Modified: projects/cluster/ha-server-core/trunk/src/main/java/org/jboss/ha/core/framework/server/HAPartitionImpl.java
===================================================================
--- projects/cluster/ha-server-core/trunk/src/main/java/org/jboss/ha/core/framework/server/HAPartitionImpl.java	2010-10-22 20:16:31 UTC (rev 108814)
+++ projects/cluster/ha-server-core/trunk/src/main/java/org/jboss/ha/core/framework/server/HAPartitionImpl.java	2010-10-22 20:16:45 UTC (rev 108815)
@@ -36,7 +36,6 @@
 import org.jboss.ha.framework.interfaces.HAPartition;
 import org.jboss.ha.framework.interfaces.SerializableStateTransferResult;
 import org.jboss.ha.framework.interfaces.StateTransferProvider;
-import org.jboss.ha.framework.server.spi.ManagedDistributedState;
 
 /**
  * Extends {@link CoreGroupCommunicationService} to add implemenation of the

Added: projects/cluster/ha-server-core/trunk/src/main/java/org/jboss/ha/core/framework/server/ManagedDistributedState.java
===================================================================
--- projects/cluster/ha-server-core/trunk/src/main/java/org/jboss/ha/core/framework/server/ManagedDistributedState.java	                        (rev 0)
+++ projects/cluster/ha-server-core/trunk/src/main/java/org/jboss/ha/core/framework/server/ManagedDistributedState.java	2010-10-22 20:16:45 UTC (rev 108815)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.ha.core.framework.server;
+
+import org.jboss.ha.framework.interfaces.DistributedState;
+
+/**
+ * DistributedState subinterface that exposes lifecycle methods to
+ * allow its owning HAPartition to control it.
+ * 
+ * @author Brian Stansberry
+ *
+ */
+public interface ManagedDistributedState extends DistributedState
+{
+   /** Create the service */
+   void createService() throws Exception;
+   /** Start the service */
+   void startService() throws Exception;
+   /** Stop the service */
+   void stopService() throws Exception;
+   /** Destroy the service */
+   void destroyService() throws Exception;
+}