moved some more classes around

examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedRemoteExample.java

@@ -14,8 +14,8 @@
 
 import java.util.Date;
 
+import org.hornetq.api.core.TransportConfiguration;
 import org.hornetq.api.core.client.*;
-import org.hornetq.api.core.config.TransportConfiguration;
 import org.hornetq.common.example.SpawnedVMSupport;
 import org.hornetq.integration.transports.netty.NettyConnectorFactory;
 

examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedServer.java

@@ -15,7 +15,7 @@
 
 import java.util.HashSet;
 
-import org.hornetq.api.core.config.TransportConfiguration;
+import org.hornetq.api.core.TransportConfiguration;
 import org.hornetq.core.config.Configuration;
 import org.hornetq.core.config.impl.ConfigurationImpl;
 import org.hornetq.core.server.HornetQServer;

examples/core/embedded/src/org/hornetq/core/example/EmbeddedExample.java

@@ -15,8 +15,8 @@
 import java.util.Date;
 import java.util.HashMap;
 
+import org.hornetq.api.core.TransportConfiguration;
 import org.hornetq.api.core.client.*;
-import org.hornetq.api.core.config.TransportConfiguration;
 import org.hornetq.core.config.Configuration;
 import org.hornetq.core.config.impl.ConfigurationImpl;
 import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory;

examples/core/microcontainer/src/org/hornetq/core/example/EmbeddedMicroContainerExample.java

@@ -14,8 +14,8 @@
 
 import java.util.Date;
 
+import org.hornetq.api.core.TransportConfiguration;
 import org.hornetq.api.core.client.*;
-import org.hornetq.api.core.config.TransportConfiguration;
 import org.hornetq.integration.bootstrap.HornetQBootstrapServer;
 import org.hornetq.integration.transports.netty.NettyConnectorFactory;
 

examples/core/perf/src/org/hornetq/core/example/PerfBase.java

@@ -22,9 +22,9 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.logging.Logger;
 
+import org.hornetq.api.core.Message;
+import org.hornetq.api.core.TransportConfiguration;
 import org.hornetq.api.core.client.*;
-import org.hornetq.api.core.config.TransportConfiguration;
-import org.hornetq.api.core.message.Message;
 import org.hornetq.integration.transports.netty.NettyConnectorFactory;
 import org.hornetq.integration.transports.netty.TransportConstants;
 import org.hornetq.utils.TokenBucketLimiter;

examples/jms/applet/src/org/hornetq/jms/example/AppletExample.java

@@ -43,9 +43,9 @@
 import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
 
+import org.hornetq.api.core.TransportConfiguration;
 import org.hornetq.api.core.client.ClientSessionFactory;
 import org.hornetq.api.core.client.HornetQClient;
-import org.hornetq.api.core.config.TransportConfiguration;
 import org.hornetq.api.jms.HornetQJMSClient;
 import org.hornetq.integration.transports.netty.NettyConnectorFactory;
 

examples/jms/embedded/src/org/hornetq/jms/example/EmbeddedExample.java

@@ -25,7 +25,7 @@
 import javax.naming.Context;
 import javax.naming.InitialContext;
 
-import org.hornetq.api.core.config.TransportConfiguration;
+import org.hornetq.api.core.TransportConfiguration;
 import org.hornetq.core.config.Configuration;
 import org.hornetq.core.config.impl.ConfigurationImpl;
 import org.hornetq.core.server.HornetQServer;

examples/jms/instantiate-connection-factory/src/org/hornetq/jms/example/InstantiateConnectionFactoryExample.java

@@ -23,7 +23,7 @@
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-import org.hornetq.api.core.config.TransportConfiguration;
+import org.hornetq.api.core.TransportConfiguration;
 import org.hornetq.api.jms.HornetQJMSClient;
 import org.hornetq.common.example.HornetQExample;
 import org.hornetq.integration.transports.netty.NettyConnectorFactory;

examples/jms/interceptor/src/org/hornetq/jms/example/SimpleInterceptor.java

@@ -14,9 +14,9 @@
 package org.hornetq.jms.example;
 
 import org.hornetq.api.SimpleString;
-import org.hornetq.api.core.exception.HornetQException;
-import org.hornetq.api.core.interceptor.Interceptor;
-import org.hornetq.api.core.message.Message;
+import org.hornetq.api.core.HornetQException;
+import org.hornetq.api.core.Interceptor;
+import org.hornetq.api.core.Message;
 import org.hornetq.core.remoting.Packet;
 import org.hornetq.core.remoting.RemotingConnection;
 import org.hornetq.core.remoting.impl.wireformat.SessionSendMessage;

examples/jms/scheduled-message/src/org/hornetq/jms/example/ScheduledMessageExample.java

@@ -24,7 +24,7 @@
 import javax.jms.TextMessage;
 import javax.naming.InitialContext;
 
-import org.hornetq.api.core.message.Message;
+import org.hornetq.api.core.Message;
 import org.hornetq.common.example.HornetQExample;
 
 /**

examples/jms/send-acknowledgements/src/org/hornetq/jms/example/SendAcknowledgementsExample.java

@@ -20,9 +20,9 @@
 import javax.jms.Session;
 import javax.naming.InitialContext;
 
+import org.hornetq.api.core.Message;
 import org.hornetq.api.core.client.ClientSession;
 import org.hornetq.api.core.client.SendAcknowledgementHandler;
-import org.hornetq.api.core.message.Message;
 import org.hornetq.common.example.HornetQExample;
 import org.hornetq.jms.client.HornetQSession;
 

examples/jms/transaction-failover/src/org/hornetq/jms/example/TransactionFailoverExample.java

@@ -22,7 +22,7 @@
 import javax.jms.TransactionRolledBackException;
 import javax.naming.InitialContext;
 
-import org.hornetq.api.core.message.Message;
+import org.hornetq.api.core.Message;
 import org.hornetq.common.example.HornetQExample;
 
 /**

src/main/org/hornetq/api/SimpleString.java

@@ -30,11 +30,6 @@
  *
  */
 
- // TODO - implement an intern() method like in java.lang.String, since many Strings e.g. addresses, queue names, remote node ids are duplicated heavily
- //in bindings taking up more memory than they should
- //Intern can be called when receiving a sent message at the server (destination)
- //Also when receiving bindings remotely via bridge, the address, queue name and node id can be interned
- //
 public class SimpleString implements CharSequence, Serializable, Comparable<SimpleString>
 {
    private static final long serialVersionUID = 4204223851422244307L;

src/main/org/hornetq/api/core/buffers/HornetQBuffer.java → src/main/org/hornetq/api/core/HornetQBuffer.java

@@ -11,7 +11,7 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.api.core.buffers;
+package org.hornetq.api.core;
 
 import java.nio.ByteBuffer;
 

src/main/org/hornetq/api/core/buffers/HornetQBuffers.java → src/main/org/hornetq/api/core/HornetQBuffers.java

@@ -11,7 +11,7 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.api.core.buffers;
+package org.hornetq.api.core;
 
 import java.nio.ByteBuffer;
 

src/main/org/hornetq/api/core/exception/HornetQException.java → src/main/org/hornetq/api/core/HornetQException.java

@@ -11,7 +11,7 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.api.core.exception;
+package org.hornetq.api.core;
 
 /**
  * 

src/main/org/hornetq/api/core/interceptor/Interceptor.java → src/main/org/hornetq/api/core/Interceptor.java

@@ -11,9 +11,8 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.api.core.interceptor;
+package org.hornetq.api.core;
 
-import org.hornetq.api.core.exception.HornetQException;
 import org.hornetq.core.remoting.Packet;
 import org.hornetq.core.remoting.RemotingConnection;
 

src/main/org/hornetq/api/core/message/Message.java → src/main/org/hornetq/api/core/Message.java

@@ -11,13 +11,12 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.api.core.message;
+package org.hornetq.api.core;
 
 import java.util.Map;
 import java.util.Set;
 
 import org.hornetq.api.SimpleString;
-import org.hornetq.api.core.buffers.HornetQBuffer;
 
 /**
  * A Message is a routable instance that has a payload.

src/main/org/hornetq/api/core/message/PropertyConversionException.java → src/main/org/hornetq/api/core/PropertyConversionException.java

@@ -11,7 +11,7 @@
  * permissions and limitations under the License.
  */
 
-package org.hornetq.api.core.message;
+package org.hornetq.api.core;
 
 /**
  * A PropertyConversionException is thrown by Message methods

src/main/org/hornetq/api/core/config/TransportConfiguration.java → src/main/org/hornetq/api/core/TransportConfiguration.java

@@ -10,13 +10,12 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.hornetq.api.core.config;
+package org.hornetq.api.core;
 
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.hornetq.api.core.buffers.HornetQBuffer;
 import org.hornetq.utils.UUIDGenerator;
 
 /**

src/main/org/hornetq/api/core/buffers/package-info.java

@@ -26,7 +26,7 @@
  * 
  * <h2>Usage</h2>
  * 
- * Always use the static methods declared at {@link  org.hornetq.api.core.buffers.HornetQBuffers} to create the buffers.
+ * Always use the static methods declared at {@link  org.hornetq.api.core.HornetQBuffers} to create the buffers.
 */
 package org.hornetq.api.core.buffers;
 

src/main/org/hornetq/api/core/client/ClientConsumer.java

@@ -13,7 +13,7 @@
 
 package org.hornetq.api.core.client;
 
-import org.hornetq.api.core.exception.HornetQException;
+import org.hornetq.api.core.HornetQException;
 
 /**
  * A ClientConsumer receives messages from HornetQ queues.

src/main/org/hornetq/api/core/client/ClientMessage.java

@@ -16,8 +16,8 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import org.hornetq.api.core.exception.HornetQException;
-import org.hornetq.api.core.message.Message;
+import org.hornetq.api.core.HornetQException;
+import org.hornetq.api.core.Message;
 
 /**
  * 

src/main/org/hornetq/api/core/client/ClientProducer.java

@@ -14,8 +14,8 @@
 package org.hornetq.api.core.client;
 
 import org.hornetq.api.SimpleString;
-import org.hornetq.api.core.exception.HornetQException;
-import org.hornetq.api.core.message.Message;
+import org.hornetq.api.core.HornetQException;
+import org.hornetq.api.core.Message;
 
 /**
  * A ClientProducer is ised to send messages to a specific address. Messages are then routed on the server to any queues

src/main/org/hornetq/api/core/client/ClientSession.java

@@ -18,7 +18,7 @@
 import javax.transaction.xa.XAResource;
 
 import org.hornetq.api.SimpleString;
-import org.hornetq.api.core.exception.HornetQException;
+import org.hornetq.api.core.HornetQException;
 
 /**
  * A ClientSession is a single-thread object required for producing and consuming messages.

src/main/org/hornetq/api/core/client/ClientSessionFactory.java

@@ -16,10 +16,10 @@
 import java.util.List;
 
 import org.hornetq.api.Pair;
+import org.hornetq.api.core.HornetQException;
+import org.hornetq.api.core.Interceptor;
+import org.hornetq.api.core.TransportConfiguration;
 import org.hornetq.api.core.client.loadbalance.ConnectionLoadBalancingPolicy;
-import org.hornetq.api.core.config.TransportConfiguration;
-import org.hornetq.api.core.exception.HornetQException;
-import org.hornetq.api.core.interceptor.Interceptor;
 
 /**
  * A ClientSessionFactory is the entry point to create and configure HornetQ resources to produce and consume messages.
@@ -410,7 +410,7 @@ ClientSession createSession(String username,
     * assign a group ID to the messages they sent.
     * 
     * if <code>true</code>, a random unique group ID is created and set on each message for the property
-    * {@link org.hornetq.api.core.message.Message#HDR_GROUP_ID}.
+    * {@link org.hornetq.api.core.Message#HDR_GROUP_ID}.
     * Default value is {@link HornetQClient#DEFAULT_AUTO_GROUP}.
     * 
     * @return whether producers will automatically assign a group ID to their messages
@@ -426,7 +426,7 @@ ClientSession createSession(String username,
    void setAutoGroup(boolean autoGroup);
 
    /**
-    * Returns the group ID that will be eventually set on each message for the property {@link org.hornetq.api.core.message.Message#HDR_GROUP_ID}.
+    * Returns the group ID that will be eventually set on each message for the property {@link org.hornetq.api.core.Message#HDR_GROUP_ID}.
     * 
     * Default value is is <code>null</code> and no group ID will be set on the messages.
     * 

src/main/org/hornetq/api/core/client/ClientSessionFactoryImpl.java

@@ -29,10 +29,10 @@
 import java.util.concurrent.TimeUnit;
 
 import org.hornetq.api.Pair;
+import org.hornetq.api.core.HornetQException;
+import org.hornetq.api.core.Interceptor;
+import org.hornetq.api.core.TransportConfiguration;
 import org.hornetq.api.core.client.loadbalance.ConnectionLoadBalancingPolicy;
-import org.hornetq.api.core.config.TransportConfiguration;
-import org.hornetq.api.core.exception.HornetQException;
-import org.hornetq.api.core.interceptor.Interceptor;
 import org.hornetq.core.client.impl.ClientSessionFactoryInternal;
 import org.hornetq.core.client.impl.FailoverManager;
 import org.hornetq.core.client.impl.FailoverManagerImpl;

src/main/org/hornetq/api/core/client/HornetQClient.java

@@ -13,8 +13,8 @@
 package org.hornetq.api.core.client;
 
 import org.hornetq.api.Pair;
+import org.hornetq.api.core.TransportConfiguration;
 import org.hornetq.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy;
-import org.hornetq.api.core.config.TransportConfiguration;
 
 import java.util.List;
 

src/main/org/hornetq/api/core/client/SendAcknowledgementHandler.java

@@ -13,7 +13,7 @@
 
 package org.hornetq.api.core.client;
 
-import org.hornetq.api.core.message.Message;
+import org.hornetq.api.core.Message;
 
 /**
  * A SendAcknowledgementHandler notifies a client when an message sent asynchronously has been received by the server.

src/main/org/hornetq/api/core/client/SessionFailureListener.java

@@ -13,7 +13,7 @@
 
 package org.hornetq.api.core.client;
 
-import org.hornetq.api.core.exception.HornetQException;
+import org.hornetq.api.core.HornetQException;
 import org.hornetq.core.remoting.FailureListener;
 
 /**

src/main/org/hornetq/api/core/management/HornetQServerControl.java

@@ -15,7 +15,7 @@
 
 import javax.management.MBeanOperationInfo;
 
-import org.hornetq.api.core.exception.HornetQException;
+import org.hornetq.api.core.HornetQException;
 import org.hornetq.core.config.Configuration;
 
 /**

src/main/org/hornetq/api/core/management/ManagementHelper.java

@@ -19,7 +19,7 @@
 import java.util.Map;
 
 import org.hornetq.api.SimpleString;
-import org.hornetq.api.core.message.Message;
+import org.hornetq.api.core.Message;
 import org.hornetq.core.logging.Logger;
 import org.hornetq.utils.json.JSONArray;
 import org.hornetq.utils.json.JSONObject;

src/main/org/hornetq/api/jms/HornetQJMSClient.java

@@ -13,8 +13,8 @@
 package org.hornetq.api.jms;
 
 import org.hornetq.api.Pair;
+import org.hornetq.api.core.TransportConfiguration;
 import org.hornetq.api.core.client.ClientSessionFactory;
-import org.hornetq.api.core.config.TransportConfiguration;
 import org.hornetq.jms.HornetQConnectionFactory;
 import org.hornetq.jms.HornetQQueue;
 import org.hornetq.jms.HornetQTopic;

src/main/org/hornetq/api/jms/management/JMSManagementHelper.java

@@ -33,7 +33,7 @@ public class JMSManagementHelper
 
    // Static --------------------------------------------------------
 
-   private static org.hornetq.api.core.message.Message getCoreMessage(final Message jmsMessage)
+   private static org.hornetq.api.core.Message getCoreMessage(final Message jmsMessage)
    {
       if (jmsMessage instanceof HornetQMessage == false)
       {

src/main/org/hornetq/api/jms/management/JMSServerControl.java

@@ -17,8 +17,8 @@
 
 import javax.management.MBeanOperationInfo;
 
+import org.hornetq.api.core.TransportConfiguration;
 import org.hornetq.api.core.client.ClientSessionFactory;
-import org.hornetq.api.core.config.TransportConfiguration;
 import org.hornetq.api.core.management.Operation;
 import org.hornetq.api.core.management.Parameter;
 import org.hornetq.spi.core.remoting.ConnectorFactory;

src/main/org/hornetq/core/asyncio/AsynchronousFile.java

@@ -15,7 +15,7 @@
 
 import java.nio.ByteBuffer;
 
-import org.hornetq.api.core.exception.HornetQException;
+import org.hornetq.api.core.HornetQException;
 
 /**
  * 

src/main/org/hornetq/core/asyncio/impl/AsynchronousFileImpl.java

@@ -24,7 +24,7 @@
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import org.hornetq.api.core.exception.HornetQException;
+import org.hornetq.api.core.HornetQException;
 import org.hornetq.core.asyncio.AIOCallback;
 import org.hornetq.core.asyncio.AsynchronousFile;
 import org.hornetq.core.asyncio.BufferCallback;