[hornetq-commits] JBoss hornetq SVN: r7922 - in trunk: src/main/org/hornetq/core/cluster and 2 other directories.

[do-not-reply at jboss.org]

Author: jmesnil
Date: 2009-08-27 09:54:23 -0400 (Thu, 27 Aug 2009)
New Revision: 7922

Modified:
   trunk/build-hornetq.xml
   trunk/src/main/org/hornetq/core/cluster/DiscoveryGroup.java
   trunk/src/main/org/hornetq/core/config/Configuration.java
   trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java
Log:
cleaned up core client jar dependencies

* DiscoveryGroup and Configuration no longer extends HornetQComponent
* import only management API
* import remoting API + spi & impl subpackages

Modified: trunk/build-hornetq.xml
===================================================================
--- trunk/build-hornetq.xml	2009-08-27 10:45:09 UTC (rev 7921)
+++ trunk/build-hornetq.xml	2009-08-27 13:54:23 UTC (rev 7922)
@@ -661,23 +661,23 @@
             <include name="org/hornetq/core/client/**/*.class"/>
             <include name="org/hornetq/core/filter/**/*.class"/>
             <include name="org/hornetq/core/buffers/**/*.class"/>
+            <include name="org/hornetq/core/config/**/*.class"/>
             <include name="org/hornetq/core/exception/**/*.class"/>
             <include name="org/hornetq/core/logging/**/*.class"/>
-            <include name="org/hornetq/core/remoting/**/*.class"/>
+            <include name="org/hornetq/core/remoting/*.class"/>
+            <include name="org/hornetq/core/remoting/spi/*.class"/>
+            <include name="org/hornetq/core/remoting/impl/**/*.class"/>
             <include name="org/hornetq/utils/**/*.class"/>
             <include name="org/hornetq/core/cluster/**/*.class"/>
-            <include name="org/hornetq/core/config/**/*.class"/>
             <include name="org/hornetq/core/list/**/*.class"/>
             <include name="org/hornetq/core/message/**/*.class"/>
             <include name="org/hornetq/core/version/**/*.class"/>
-            <include name="org/hornetq/core/management/**/*.class"/>           
+            <include name="org/hornetq/core/management/*.class"/>
             <include name="org/hornetq/core/transaction/impl/XidImpl.class"/>
-            
-            <!-- FIXME - why are these classes in the client jar ??? -->
-            <include name="org/hornetq/core/server/HornetQComponent.class"/>
-            <include name="org/hornetq/core/server/JournalType.class"/>
-            <include name="org/hornetq/core/journal/EncodingSupport.class"/>
-            <include name="org/hornetq/core/server/ServerMessage.class"/>            
+         	
+         	<!-- required by SessionSendMessage -->
+            <include name="org/hornetq/core/server/ServerMessage.class"/>
+         	<include name="org/hornetq/core/journal/EncodingSupport.class"/>
          </fileset>
       </jar>
 

Modified: trunk/src/main/org/hornetq/core/cluster/DiscoveryGroup.java
===================================================================
--- trunk/src/main/org/hornetq/core/cluster/DiscoveryGroup.java	2009-08-27 10:45:09 UTC (rev 7921)
+++ trunk/src/main/org/hornetq/core/cluster/DiscoveryGroup.java	2009-08-27 13:54:23 UTC (rev 7922)
@@ -17,7 +17,6 @@
 import java.util.Map;
 
 import org.hornetq.core.management.NotificationService;
-import org.hornetq.core.server.HornetQComponent;
 
 /**
  * A DiscoveryGroup
@@ -28,7 +27,7 @@
  *
  *
  */
-public interface DiscoveryGroup extends HornetQComponent
+public interface DiscoveryGroup
 {
    void setNotificationService(NotificationService notificationService);
 
@@ -36,6 +35,12 @@
 
    Map<String, DiscoveryEntry> getDiscoveryEntryMap();
    
+   void start() throws Exception;
+   
+   void stop() throws Exception;
+   
+   boolean isStarted();
+
    boolean waitForBroadcast(long timeout);
    
    void registerListener(final DiscoveryListener listener);

Modified: trunk/src/main/org/hornetq/core/config/Configuration.java
===================================================================
--- trunk/src/main/org/hornetq/core/config/Configuration.java	2009-08-27 10:45:09 UTC (rev 7921)
+++ trunk/src/main/org/hornetq/core/config/Configuration.java	2009-08-27 13:54:23 UTC (rev 7922)
@@ -24,7 +24,6 @@
 import org.hornetq.core.config.cluster.DiscoveryGroupConfiguration;
 import org.hornetq.core.config.cluster.DivertConfiguration;
 import org.hornetq.core.config.cluster.QueueConfiguration;
-import org.hornetq.core.server.HornetQComponent;
 import org.hornetq.core.server.JournalType;
 import org.hornetq.utils.SimpleString;
 
@@ -35,8 +34,15 @@
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  *
  */
-public interface Configuration extends Serializable, HornetQComponent
+public interface Configuration extends Serializable
 {
+   public void start() throws Exception;
+
+   public void stop() throws Exception;
+
+   public boolean isStarted();
+
+   
    // General attributes -------------------------------------------------------------------
 
    boolean isClustered();

Modified: trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java	2009-08-27 10:45:09 UTC (rev 7921)
+++ trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java	2009-08-27 13:54:23 UTC (rev 7922)
@@ -283,8 +283,9 @@
 
    protected long serverDumpInterval = DEFAULT_SERVER_DUMP_INTERVAL;
 
-   // HornetQComponent implementation ----------------------------------------------
 
+   // Public -------------------------------------------------------------------------
+
    public void start() throws Exception
    {
    }
@@ -298,8 +299,6 @@
       return true;
    }
 
-   // Public -------------------------------------------------------------------------
-
    public boolean isClustered()
    {
       return clustered;