activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r359567 [7/13] - in /incubator/activemq/trunk/activemq-core: ./ src/gram/java/org/activemq/openwire/tool/ src/gram/script/ src/main/grammar/ src/main/java/org/activemq/ src/main/java/org/activemq/advisory/ src/main/java/org/activemq/broker/...
Date Wed, 28 Dec 2005 17:28:57 GMT
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/RemoveSubscriptionInfoMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**
@@ -63,7 +63,7 @@
         super.unmarshal(wireFormat, o, dataIn, bs);
 
         RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o;
-        info.setConnectionId((org.activemq.command.ConnectionId) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setConnectionId((org.apache.activemq.command.ConnectionId) unmarsalCachedObject(wireFormat, dataIn, bs));
         info.setSubcriptionName(readString(dataIn, bs));
         info.setClientId(readString(dataIn, bs));
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ResponseMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ResponseMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ResponseMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ResponseMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionIdMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionIdMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionIdMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionIdMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**
@@ -35,7 +35,7 @@
  *
  * @version $Revision$
  */
-public class SessionIdMarshaller extends org.activemq.openwire.DataStreamMarshaller {
+public class SessionIdMarshaller extends org.apache.activemq.openwire.DataStreamMarshaller {
 
     /**
      * Return the type of Data Structure we marshal

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionInfoMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionInfoMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionInfoMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SessionInfoMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**
@@ -63,7 +63,7 @@
         super.unmarshal(wireFormat, o, dataIn, bs);
 
         SessionInfo info = (SessionInfo)o;
-        info.setSessionId((org.activemq.command.SessionId) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setSessionId((org.apache.activemq.command.SessionId) unmarsalCachedObject(wireFormat, dataIn, bs));
 
     }
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ShutdownInfoMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ShutdownInfoMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ShutdownInfoMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/ShutdownInfoMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/SubscriptionInfoMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**
@@ -35,7 +35,7 @@
  *
  * @version $Revision$
  */
-public class SubscriptionInfoMarshaller extends org.activemq.openwire.DataStreamMarshaller {
+public class SubscriptionInfoMarshaller extends org.apache.activemq.openwire.DataStreamMarshaller {
 
     /**
      * Return the type of Data Structure we marshal
@@ -64,7 +64,7 @@
 
         SubscriptionInfo info = (SubscriptionInfo)o;
         info.setClientId(readString(dataIn, bs));
-        info.setDestination((org.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setDestination((org.apache.activemq.command.ActiveMQDestination) unmarsalCachedObject(wireFormat, dataIn, bs));
         info.setSelector(readString(dataIn, bs));
         info.setSubcriptionName(readString(dataIn, bs));
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionIdMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionIdMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionIdMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionIdMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**
@@ -35,7 +35,7 @@
  *
  * @version $Revision$
  */
-public abstract class TransactionIdMarshaller extends org.activemq.openwire.DataStreamMarshaller {
+public abstract class TransactionIdMarshaller extends org.apache.activemq.openwire.DataStreamMarshaller {
 
     /**
      * Un-marshal an object instance from the data input stream

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionInfoMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionInfoMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionInfoMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/TransactionInfoMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**
@@ -63,8 +63,8 @@
         super.unmarshal(wireFormat, o, dataIn, bs);
 
         TransactionInfo info = (TransactionInfo)o;
-        info.setConnectionId((org.activemq.command.ConnectionId) unmarsalCachedObject(wireFormat, dataIn, bs));
-        info.setTransactionId((org.activemq.command.TransactionId) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setConnectionId((org.apache.activemq.command.ConnectionId) unmarsalCachedObject(wireFormat, dataIn, bs));
+        info.setTransactionId((org.apache.activemq.command.TransactionId) unmarsalCachedObject(wireFormat, dataIn, bs));
         info.setType(dataIn.readByte());
 
     }

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/WireFormatInfoMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/WireFormatInfoMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/WireFormatInfoMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/WireFormatInfoMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**
@@ -35,7 +35,7 @@
  *
  * @version $Revision$
  */
-public class WireFormatInfoMarshaller extends org.activemq.openwire.DataStreamMarshaller {
+public class WireFormatInfoMarshaller extends org.apache.activemq.openwire.DataStreamMarshaller {
 
     /**
      * Return the type of Data Structure we marshal

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/XATransactionIdMarshaller.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/XATransactionIdMarshaller.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/XATransactionIdMarshaller.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/openwire/v1/XATransactionIdMarshaller.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.openwire.v1;
+package org.apache.activemq.openwire.v1;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.command.*;
+import org.apache.activemq.openwire.*;
 
 
 /**

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/ConnectionKey.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/ConnectionKey.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/ConnectionKey.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/ConnectionKey.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.pool;
+package org.apache.activemq.pool;
 
 /**
  * A cache key for the connection details

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/ConnectionPool.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/ConnectionPool.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/ConnectionPool.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/ConnectionPool.java Wed Dec 28 09:24:02 2005
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.pool;
+package org.apache.activemq.pool;
 
 import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
 
-import org.activemq.ActiveMQConnection;
-import org.activemq.util.JMSExceptionSupport;
+import org.apache.activemq.ActiveMQConnection;
+import org.apache.activemq.util.JMSExceptionSupport;
 
 import javax.jms.JMSException;
 import javax.jms.Session;

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledConnection.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledConnection.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledConnection.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledConnection.java Wed Dec 28 09:24:02 2005
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.pool;
+package org.apache.activemq.pool;
 
-import org.activemq.ActiveMQConnection;
-import org.activemq.ActiveMQSession;
-import org.activemq.AlreadyClosedException;
+import org.apache.activemq.ActiveMQConnection;
+import org.apache.activemq.ActiveMQSession;
+import org.apache.activemq.AlreadyClosedException;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionConsumer;

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledConnectionFactory.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledConnectionFactory.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledConnectionFactory.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledConnectionFactory.java Wed Dec 28 09:24:02 2005
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.pool;
+package org.apache.activemq.pool;
 
-import org.activemq.ActiveMQConnection;
-import org.activemq.ActiveMQConnectionFactory;
-import org.activemq.Service;
-import org.activemq.util.IOExceptionSupport;
-import org.activemq.util.ServiceStopper;
+import org.apache.activemq.ActiveMQConnection;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.Service;
+import org.apache.activemq.util.IOExceptionSupport;
+import org.apache.activemq.util.ServiceStopper;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -89,7 +89,7 @@
     }
 
     /**
-     * @see org.activemq.service.Service#start()
+     * @see org.apache.activemq.service.Service#start()
      */
     public void start() {
         try {

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledProducer.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledProducer.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledProducer.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledProducer.java Wed Dec 28 09:24:02 2005
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.pool;
+package org.apache.activemq.pool;
 
-import org.activemq.ActiveMQMessageProducer;
+import org.apache.activemq.ActiveMQMessageProducer;
 
 import javax.jms.Destination;
 import javax.jms.JMSException;

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledQueueSender.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledQueueSender.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledQueueSender.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledQueueSender.java Wed Dec 28 09:24:02 2005
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.pool;
+package org.apache.activemq.pool;
 
-import org.activemq.ActiveMQQueueSender;
+import org.apache.activemq.ActiveMQQueueSender;
 
 import javax.jms.Destination;
 import javax.jms.JMSException;

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledSession.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledSession.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledSession.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledSession.java Wed Dec 28 09:24:02 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.pool;
+package org.apache.activemq.pool;
 
-import org.activemq.ActiveMQMessageProducer;
-import org.activemq.ActiveMQQueueSender;
-import org.activemq.ActiveMQSession;
-import org.activemq.ActiveMQTopicPublisher;
-import org.activemq.AlreadyClosedException;
-import org.activemq.util.JMSExceptionSupport;
+import org.apache.activemq.ActiveMQMessageProducer;
+import org.apache.activemq.ActiveMQQueueSender;
+import org.apache.activemq.ActiveMQSession;
+import org.apache.activemq.ActiveMQTopicPublisher;
+import org.apache.activemq.AlreadyClosedException;
+import org.apache.activemq.util.JMSExceptionSupport;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.commons.pool.ObjectPool;

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledTopicPublisher.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledTopicPublisher.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledTopicPublisher.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/PooledTopicPublisher.java Wed Dec 28 09:24:02 2005
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.pool;
+package org.apache.activemq.pool;
 
-import org.activemq.ActiveMQTopicPublisher;
+import org.apache.activemq.ActiveMQTopicPublisher;
 
 import javax.jms.Destination;
 import javax.jms.JMSException;

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/SessionKey.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/SessionKey.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/SessionKey.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/SessionKey.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.pool;
+package org.apache.activemq.pool;
 
 /**
  * A cache key for the session details

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/SessionPool.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/SessionPool.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/SessionPool.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/pool/SessionPool.java Wed Dec 28 09:24:02 2005
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.pool;
+package org.apache.activemq.pool;
 
-import org.activemq.ActiveMQConnection;
-import org.activemq.ActiveMQSession;
-import org.activemq.AlreadyClosedException;
-import org.activemq.util.JMSExceptionSupport;
+import org.apache.activemq.ActiveMQConnection;
+import org.apache.activemq.ActiveMQSession;
+import org.apache.activemq.AlreadyClosedException;
+import org.apache.activemq.util.JMSExceptionSupport;
 import org.apache.commons.pool.ObjectPool;
 import org.apache.commons.pool.PoolableObjectFactory;
 import org.apache.commons.pool.impl.GenericObjectPool;

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnection.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnection.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnection.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnection.java Wed Dec 28 09:24:02 2005
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.proxy;
+package org.apache.activemq.proxy;
 
 import java.io.IOException;
 
-import org.activemq.Service;
-import org.activemq.command.Command;
-import org.activemq.command.ShutdownInfo;
-import org.activemq.transport.Transport;
-import org.activemq.transport.TransportListener;
-import org.activemq.util.IOExceptionSupport;
-import org.activemq.util.ServiceStopper;
+import org.apache.activemq.Service;
+import org.apache.activemq.command.Command;
+import org.apache.activemq.command.ShutdownInfo;
+import org.apache.activemq.transport.Transport;
+import org.apache.activemq.transport.TransportListener;
+import org.apache.activemq.util.IOExceptionSupport;
+import org.apache.activemq.util.ServiceStopper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnector.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnector.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnector.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnector.java Wed Dec 28 09:24:02 2005
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.proxy;
+package org.apache.activemq.proxy;
 
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 
-import org.activemq.Service;
-import org.activemq.transport.CompositeTransport;
-import org.activemq.transport.Transport;
-import org.activemq.transport.TransportAcceptListener;
-import org.activemq.transport.TransportFactory;
-import org.activemq.transport.TransportServer;
+import org.apache.activemq.Service;
+import org.apache.activemq.transport.CompositeTransport;
+import org.apache.activemq.transport.Transport;
+import org.apache.activemq.transport.TransportAcceptListener;
+import org.apache.activemq.transport.TransportFactory;
+import org.apache.activemq.transport.TransportServer;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/JaasAuthenticationBroker.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/JaasAuthenticationBroker.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/JaasAuthenticationBroker.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/JaasAuthenticationBroker.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.security;
+package org.apache.activemq.security;
 
 import java.util.Iterator;
 import java.util.Set;
@@ -22,10 +22,10 @@
 import javax.security.auth.Subject;
 import javax.security.auth.login.LoginContext;
 
-import org.activemq.broker.Broker;
-import org.activemq.broker.BrokerFilter;
-import org.activemq.broker.ConnectionContext;
-import org.activemq.command.ConnectionInfo;
+import org.apache.activemq.broker.Broker;
+import org.apache.activemq.broker.BrokerFilter;
+import org.apache.activemq.broker.ConnectionContext;
+import org.apache.activemq.command.ConnectionInfo;
 
 import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/JassCredentialCallback.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/JassCredentialCallback.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/JassCredentialCallback.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/JassCredentialCallback.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.security;
+package org.apache.activemq.security;
 
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/SecurityAdminMBean.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/SecurityAdminMBean.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/SecurityAdminMBean.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/SecurityAdminMBean.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.security;
+package org.apache.activemq.security;
 
 /**
  * An MBean for adding and removing users, roles

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/SecurityContext.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/SecurityContext.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/SecurityContext.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/SecurityContext.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.security;
+package org.apache.activemq.security;
 
 import java.util.HashSet;
 import java.util.Set;

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/SimpleAuthenticationBroker.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/SimpleAuthenticationBroker.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/SimpleAuthenticationBroker.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/SimpleAuthenticationBroker.java Wed Dec 28 09:24:02 2005
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.security;
+package org.apache.activemq.security;
 
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
-import org.activemq.broker.Broker;
-import org.activemq.broker.BrokerFilter;
-import org.activemq.broker.ConnectionContext;
-import org.activemq.command.ConnectionInfo;
+import org.apache.activemq.broker.Broker;
+import org.apache.activemq.broker.BrokerFilter;
+import org.apache.activemq.broker.ConnectionContext;
+import org.apache.activemq.command.ConnectionInfo;
 
 import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/SimpleAuthorizationBroker.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/SimpleAuthorizationBroker.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/SimpleAuthorizationBroker.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/SimpleAuthorizationBroker.java Wed Dec 28 09:24:02 2005
@@ -14,22 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.security;
+package org.apache.activemq.security;
 
-import org.activemq.broker.Broker;
-import org.activemq.broker.BrokerFilter;
-import org.activemq.broker.ConnectionContext;
-import org.activemq.broker.region.Destination;
-import org.activemq.command.ActiveMQDestination;
-import org.activemq.command.ActiveMQQueue;
-import org.activemq.command.ActiveMQTempDestination;
-import org.activemq.command.ActiveMQTopic;
-import org.activemq.command.ConsumerInfo;
-import org.activemq.command.Message;
-import org.activemq.command.ProducerInfo;
-import org.activemq.filter.BooleanExpression;
-import org.activemq.filter.DestinationMap;
-import org.activemq.filter.MessageEvaluationContext;
+import org.apache.activemq.broker.Broker;
+import org.apache.activemq.broker.BrokerFilter;
+import org.apache.activemq.broker.ConnectionContext;
+import org.apache.activemq.broker.region.Destination;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.activemq.command.ActiveMQTempDestination;
+import org.apache.activemq.command.ActiveMQTopic;
+import org.apache.activemq.command.ConsumerInfo;
+import org.apache.activemq.command.Message;
+import org.apache.activemq.command.ProducerInfo;
+import org.apache.activemq.filter.BooleanExpression;
+import org.apache.activemq.filter.DestinationMap;
+import org.apache.activemq.filter.MessageEvaluationContext;
 
 import javax.jms.JMSException;
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/selector/ParseException.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/selector/ParseException.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/selector/ParseException.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/selector/ParseException.java Wed Dec 28 09:24:02 2005
@@ -1,5 +1,5 @@
 /* Generated By:JavaCC: Do not edit this line. ParseException.java Version 2.1 */
-package org.activemq.selector;
+package org.apache.activemq.selector;
 
 /**
  * This exception is thrown when parse errors are encountered.

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/selector/SelectorParser.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/selector/SelectorParser.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/selector/SelectorParser.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/selector/SelectorParser.java Wed Dec 28 09:24:02 2005
@@ -1,12 +1,12 @@
 /* Generated By:JavaCC: Do not edit this line. SelectorParser.java */
-package org.activemq.selector;
+package org.apache.activemq.selector;
 
 import java.io.*;
 import java.util.*;
 
 import javax.jms.InvalidSelectorException;
 
-import org.activemq.filter.*;
+import org.apache.activemq.filter.*;
 
 /** 
  * JMS Selector Parser generated by JavaCC
@@ -518,478 +518,592 @@
 
   final private boolean jj_2_1(int xla) {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
-    try { return !jj_3_1(); }
-    catch(LookaheadSuccess ls) { return true; }
+    return !jj_3_1();
   }
 
   final private boolean jj_2_2(int xla) {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
-    try { return !jj_3_2(); }
-    catch(LookaheadSuccess ls) { return true; }
+    return !jj_3_2();
   }
 
   final private boolean jj_2_3(int xla) {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
-    try { return !jj_3_3(); }
-    catch(LookaheadSuccess ls) { return true; }
+    return !jj_3_3();
   }
 
   final private boolean jj_2_4(int xla) {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
-    try { return !jj_3_4(); }
-    catch(LookaheadSuccess ls) { return true; }
+    return !jj_3_4();
   }
 
   final private boolean jj_2_5(int xla) {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
-    try { return !jj_3_5(); }
-    catch(LookaheadSuccess ls) { return true; }
+    return !jj_3_5();
   }
 
   final private boolean jj_2_6(int xla) {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
-    try { return !jj_3_6(); }
-    catch(LookaheadSuccess ls) { return true; }
+    return !jj_3_6();
   }
 
-  final private boolean jj_3R_51() {
+  final private boolean jj_3R_53() {
     if (jj_scan_token(32)) return true;
-    if (jj_3R_43()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_45()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_27() {
+  final private boolean jj_3R_29() {
     if (jj_scan_token(ID)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_61() {
+  final private boolean jj_3R_63() {
     if (jj_scan_token(35)) return true;
-    if (jj_3R_21()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_23()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_48() {
+  final private boolean jj_3R_50() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_56()) {
+    if (jj_3R_58()) {
     jj_scanpos = xsp;
-    if (jj_3R_57()) return true;
-    }
+    if (jj_3R_59()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_38() {
+  final private boolean jj_3R_40() {
     if (jj_scan_token(OR)) return true;
-    if (jj_3R_37()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_39()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_50() {
+  final private boolean jj_3R_52() {
     if (jj_scan_token(31)) return true;
-    if (jj_3R_43()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_45()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_25() {
+  final private boolean jj_3R_27() {
     if (jj_scan_token(34)) return true;
-    if (jj_3R_28()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_30()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     if (jj_scan_token(36)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_24() {
-    if (jj_3R_27()) return true;
+  final private boolean jj_3R_26() {
+    if (jj_3R_29()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_49() {
+  final private boolean jj_3R_51() {
     if (jj_scan_token(30)) return true;
-    if (jj_3R_43()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_45()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_44() {
+  final private boolean jj_3R_46() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_49()) {
-    jj_scanpos = xsp;
-    if (jj_3R_50()) {
-    jj_scanpos = xsp;
     if (jj_3R_51()) {
     jj_scanpos = xsp;
     if (jj_3R_52()) {
     jj_scanpos = xsp;
     if (jj_3R_53()) {
     jj_scanpos = xsp;
+    if (jj_3R_54()) {
+    jj_scanpos = xsp;
+    if (jj_3R_55()) {
+    jj_scanpos = xsp;
     if (jj_3_2()) {
     jj_scanpos = xsp;
-    if (jj_3R_54()) {
+    if (jj_3R_56()) {
     jj_scanpos = xsp;
     if (jj_3_3()) {
     jj_scanpos = xsp;
-    if (jj_3R_55()) {
+    if (jj_3R_57()) {
     jj_scanpos = xsp;
     if (jj_3_4()) return true;
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
-    }
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_23() {
-    if (jj_3R_26()) return true;
+  final private boolean jj_3R_25() {
+    if (jj_3R_28()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_43() {
-    if (jj_3R_9()) return true;
+  final private boolean jj_3R_45() {
+    if (jj_3R_11()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_48()) { jj_scanpos = xsp; break; }
+      if (jj_3R_50()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
-  final private boolean jj_3R_28() {
-    if (jj_3R_37()) return true;
+  final private boolean jj_3R_30() {
+    if (jj_3R_39()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_38()) { jj_scanpos = xsp; break; }
+      if (jj_3R_40()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
-  final private boolean jj_3R_22() {
+  final private boolean jj_3R_24() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_23()) {
+    if (jj_3R_25()) {
     jj_scanpos = xsp;
-    if (jj_3R_24()) {
+    if (jj_3R_26()) {
     jj_scanpos = xsp;
-    if (jj_3R_25()) return true;
-    }
-    }
+    if (jj_3R_27()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_17() {
-    if (jj_3R_22()) return true;
+  final private boolean jj_3R_19() {
+    if (jj_3R_24()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_21() {
+  final private boolean jj_3R_23() {
     if (jj_scan_token(STRING_LITERAL)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_60() {
+  final private boolean jj_3R_62() {
     if (jj_scan_token(35)) return true;
-    if (jj_3R_21()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_23()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_16() {
+  final private boolean jj_3R_18() {
     if (jj_scan_token(XQUERY)) return true;
-    if (jj_3R_21()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_23()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_41() {
-    if (jj_3R_43()) return true;
+  final private boolean jj_3R_43() {
+    if (jj_3R_45()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_44()) { jj_scanpos = xsp; break; }
+      if (jj_3R_46()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
-  final private boolean jj_3R_59() {
+  final private boolean jj_3R_61() {
     if (jj_scan_token(ESCAPE)) return true;
-    if (jj_3R_21()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_23()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
   final private boolean jj_3_4() {
     if (jj_scan_token(NOT)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     if (jj_scan_token(IN)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     if (jj_scan_token(34)) return true;
-    if (jj_3R_21()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_23()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_61()) { jj_scanpos = xsp; break; }
+      if (jj_3R_63()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     if (jj_scan_token(36)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
   final private boolean jj_3_6() {
     if (jj_scan_token(37)) return true;
-    if (jj_3R_10()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_12()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_15() {
+  final private boolean jj_3R_17() {
     if (jj_scan_token(XPATH)) return true;
-    if (jj_3R_21()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_23()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_14() {
-    if (jj_scan_token(NOT)) return true;
-    if (jj_3R_10()) return true;
+  final private boolean jj_3R_38() {
+    if (jj_scan_token(NULL)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_36() {
-    if (jj_scan_token(NULL)) return true;
+  final private boolean jj_3R_16() {
+    if (jj_scan_token(NOT)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_12()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_12() {
+  final private boolean jj_3R_14() {
     if (jj_scan_token(37)) return true;
-    if (jj_3R_10()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_12()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_55() {
+  final private boolean jj_3R_57() {
     if (jj_scan_token(IN)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     if (jj_scan_token(34)) return true;
-    if (jj_3R_21()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_23()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_60()) { jj_scanpos = xsp; break; }
+      if (jj_3R_62()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     if (jj_scan_token(36)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_47() {
+  final private boolean jj_3R_49() {
     if (jj_scan_token(IS)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     if (jj_scan_token(NOT)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     if (jj_scan_token(NULL)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_13() {
+  final private boolean jj_3R_15() {
     if (jj_scan_token(38)) return true;
-    if (jj_3R_10()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_12()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_35() {
+  final private boolean jj_3R_37() {
     if (jj_scan_token(FALSE)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
   final private boolean jj_3_1() {
     if (jj_scan_token(IS)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     if (jj_scan_token(NULL)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_10() {
+  final private boolean jj_3R_12() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_12()) {
-    jj_scanpos = xsp;
-    if (jj_3R_13()) {
-    jj_scanpos = xsp;
     if (jj_3R_14()) {
     jj_scanpos = xsp;
     if (jj_3R_15()) {
     jj_scanpos = xsp;
     if (jj_3R_16()) {
     jj_scanpos = xsp;
-    if (jj_3R_17()) return true;
-    }
-    }
-    }
-    }
-    }
+    if (jj_3R_17()) {
+    jj_scanpos = xsp;
+    if (jj_3R_18()) {
+    jj_scanpos = xsp;
+    if (jj_3R_19()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_34() {
+  final private boolean jj_3R_36() {
     if (jj_scan_token(TRUE)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_46() {
+  final private boolean jj_3R_48() {
     if (jj_scan_token(29)) return true;
-    if (jj_3R_41()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_43()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
   final private boolean jj_3_3() {
     if (jj_scan_token(NOT)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     if (jj_scan_token(BETWEEN)) return true;
-    if (jj_3R_43()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_45()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     if (jj_scan_token(AND)) return true;
-    if (jj_3R_43()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_45()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_45() {
+  final private boolean jj_3R_47() {
     if (jj_scan_token(28)) return true;
-    if (jj_3R_41()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_43()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_42() {
+  final private boolean jj_3R_44() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_45()) {
+    if (jj_3R_47()) {
     jj_scanpos = xsp;
-    if (jj_3R_46()) {
+    if (jj_3R_48()) {
     jj_scanpos = xsp;
     if (jj_3_1()) {
     jj_scanpos = xsp;
-    if (jj_3R_47()) return true;
-    }
-    }
-    }
+    if (jj_3R_49()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_33() {
+  final private boolean jj_3R_35() {
     if (jj_scan_token(FLOATING_POINT_LITERAL)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_54() {
+  final private boolean jj_3R_56() {
     if (jj_scan_token(BETWEEN)) return true;
-    if (jj_3R_43()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_45()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     if (jj_scan_token(AND)) return true;
-    if (jj_3R_43()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_45()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_58() {
+  final private boolean jj_3R_60() {
     if (jj_scan_token(ESCAPE)) return true;
-    if (jj_3R_21()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_23()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_32() {
+  final private boolean jj_3R_34() {
     if (jj_scan_token(OCTAL_LITERAL)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_20() {
+  final private boolean jj_3R_22() {
     if (jj_scan_token(41)) return true;
-    if (jj_3R_10()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_12()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_39() {
-    if (jj_3R_41()) return true;
+  final private boolean jj_3R_41() {
+    if (jj_3R_43()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_42()) { jj_scanpos = xsp; break; }
+      if (jj_3R_44()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
   final private boolean jj_3_2() {
     if (jj_scan_token(NOT)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     if (jj_scan_token(LIKE)) return true;
-    if (jj_3R_21()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_23()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_59()) jj_scanpos = xsp;
+    if (jj_3R_61()) jj_scanpos = xsp;
+    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_53() {
+  final private boolean jj_3R_55() {
     if (jj_scan_token(LIKE)) return true;
-    if (jj_3R_21()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_23()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_58()) jj_scanpos = xsp;
+    if (jj_3R_60()) jj_scanpos = xsp;
+    else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_31() {
+  final private boolean jj_3R_33() {
     if (jj_scan_token(HEX_LITERAL)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_19() {
+  final private boolean jj_3R_21() {
     if (jj_scan_token(40)) return true;
-    if (jj_3R_10()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_12()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_18() {
-    if (jj_scan_token(39)) return true;
-    if (jj_3R_10()) return true;
-    return false;
-  }
-
-  final private boolean jj_3R_11() {
+  final private boolean jj_3R_13() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_18()) {
+    if (jj_3R_20()) {
     jj_scanpos = xsp;
-    if (jj_3R_19()) {
+    if (jj_3R_21()) {
     jj_scanpos = xsp;
-    if (jj_3R_20()) return true;
-    }
-    }
+    if (jj_3R_22()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_40() {
+  final private boolean jj_3R_20() {
+    if (jj_scan_token(39)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_12()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  final private boolean jj_3R_42() {
     if (jj_scan_token(AND)) return true;
-    if (jj_3R_39()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_41()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_30() {
+  final private boolean jj_3R_32() {
     if (jj_scan_token(DECIMAL_LITERAL)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_9() {
-    if (jj_3R_10()) return true;
+  final private boolean jj_3R_11() {
+    if (jj_3R_12()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_11()) { jj_scanpos = xsp; break; }
+      if (jj_3R_13()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
 
-  final private boolean jj_3R_29() {
-    if (jj_3R_21()) return true;
+  final private boolean jj_3R_10() {
+    if (jj_scan_token(38)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_57() {
+  final private boolean jj_3R_31() {
+    if (jj_3R_23()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  final private boolean jj_3R_9() {
+    if (jj_scan_token(37)) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    return false;
+  }
+
+  final private boolean jj_3R_59() {
     if (jj_scan_token(38)) return true;
-    if (jj_3R_9()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_11()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_37() {
-    if (jj_3R_39()) return true;
+  final private boolean jj_3R_39() {
+    if (jj_3R_41()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_40()) { jj_scanpos = xsp; break; }
+      if (jj_3R_42()) { jj_scanpos = xsp; break; }
+      if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     }
     return false;
   }
@@ -997,21 +1111,19 @@
   final private boolean jj_3_5() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(37)) {
+    if (jj_3R_9()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(38)) return true;
-    }
-    if (jj_3R_9()) return true;
+    if (jj_3R_10()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_11()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_26() {
+  final private boolean jj_3R_28() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_29()) {
-    jj_scanpos = xsp;
-    if (jj_3R_30()) {
-    jj_scanpos = xsp;
     if (jj_3R_31()) {
     jj_scanpos = xsp;
     if (jj_3R_32()) {
@@ -1022,26 +1134,35 @@
     jj_scanpos = xsp;
     if (jj_3R_35()) {
     jj_scanpos = xsp;
-    if (jj_3R_36()) return true;
-    }
-    }
-    }
-    }
-    }
-    }
-    }
+    if (jj_3R_36()) {
+    jj_scanpos = xsp;
+    if (jj_3R_37()) {
+    jj_scanpos = xsp;
+    if (jj_3R_38()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_52() {
+  final private boolean jj_3R_54() {
     if (jj_scan_token(33)) return true;
-    if (jj_3R_43()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_45()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
-  final private boolean jj_3R_56() {
+  final private boolean jj_3R_58() {
     if (jj_scan_token(37)) return true;
-    if (jj_3R_9()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+    if (jj_3R_11()) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
     return false;
   }
 
@@ -1106,8 +1227,6 @@
     throw generateParseException();
   }
 
-  static private final class LookaheadSuccess extends java.lang.Error { }
-  final private LookaheadSuccess jj_ls = new LookaheadSuccess();
   final private boolean jj_scan_token(int kind) {
     if (jj_scanpos == jj_lastpos) {
       jj_la--;
@@ -1119,9 +1238,7 @@
     } else {
       jj_scanpos = jj_scanpos.next;
     }
-    if (jj_scanpos.kind != kind) return true;
-    if (jj_la == 0 && jj_scanpos == jj_lastpos) throw jj_ls;
-    return false;
+    return (jj_scanpos.kind != kind);
   }
 
   final public Token getNextToken() {
@@ -1147,7 +1264,7 @@
       return (jj_ntk = jj_nt.kind);
   }
 
-  public ParseException generateParseException() {
+  final public ParseException generateParseException() {
     Token errortok = token.next;
     int line = errortok.beginLine, column = errortok.beginColumn;
     String mess = (errortok.kind == 0) ? tokenImage[0] : errortok.image;

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/selector/SelectorParserConstants.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/selector/SelectorParserConstants.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/selector/SelectorParserConstants.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/selector/SelectorParserConstants.java Wed Dec 28 09:24:02 2005
@@ -1,5 +1,5 @@
 /* Generated By:JavaCC: Do not edit this line. SelectorParserConstants.java */
-package org.activemq.selector;
+package org.apache.activemq.selector;
 
 public interface SelectorParserConstants {
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/selector/SelectorParserTokenManager.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/selector/SelectorParserTokenManager.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/selector/SelectorParserTokenManager.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/selector/SelectorParserTokenManager.java Wed Dec 28 09:24:02 2005
@@ -1,9 +1,9 @@
 /* Generated By:JavaCC: Do not edit this line. SelectorParserTokenManager.java */
-package org.activemq.selector;
+package org.apache.activemq.selector;
 import java.io.*;
 import java.util.*;
 import javax.jms.InvalidSelectorException;
-import org.activemq.filter.*;
+import org.apache.activemq.filter.*;
 
 public class SelectorParserTokenManager implements SelectorParserConstants
 {
@@ -904,7 +904,7 @@
 static final long[] jjtoSpecial = {
    0x3eL, 
 };
-protected SimpleCharStream input_stream;
+private SimpleCharStream input_stream;
 private final int[] jjrounds = new int[43];
 private final int[] jjstateSet = new int[86];
 protected char curChar;
@@ -946,7 +946,7 @@
       curLexState = lexState;
 }
 
-protected Token jjFillToken()
+private final Token jjFillToken()
 {
    Token t = Token.newToken(jjmatchedKind);
    t.kind = jjmatchedKind;
@@ -966,7 +966,7 @@
 int jjmatchedPos;
 int jjmatchedKind;
 
-public Token getNextToken() 
+public final Token getNextToken() 
 {
   int kind;
   Token specialToken = null;

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/selector/SimpleCharStream.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/selector/SimpleCharStream.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/selector/SimpleCharStream.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/selector/SimpleCharStream.java Wed Dec 28 09:24:02 2005
@@ -1,5 +1,5 @@
 /* Generated By:JavaCC: Do not edit this line. SimpleCharStream.java Version 2.1 */
-package org.activemq.selector;
+package org.apache.activemq.selector;
 
 /**
  * An implementation of interface CharStream, where the stream is assumed to

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/selector/Token.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/selector/Token.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/selector/Token.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/selector/Token.java Wed Dec 28 09:24:02 2005
@@ -1,5 +1,5 @@
 /* Generated By:JavaCC: Do not edit this line. Token.java Version 2.1 */
-package org.activemq.selector;
+package org.apache.activemq.selector;
 
 /**
  * Describes the input token stream.

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/selector/TokenMgrError.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/selector/TokenMgrError.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/selector/TokenMgrError.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/selector/TokenMgrError.java Wed Dec 28 09:24:02 2005
@@ -1,5 +1,5 @@
 /* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 2.1 */
-package org.activemq.selector;
+package org.apache.activemq.selector;
 
 public class TokenMgrError extends Error
 {

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/CommandVisitor.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/CommandVisitor.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/CommandVisitor.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/CommandVisitor.java Wed Dec 28 09:24:02 2005
@@ -14,27 +14,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.state;
+package org.apache.activemq.state;
 
-import org.activemq.command.BrokerInfo;
-import org.activemq.command.ConnectionId;
-import org.activemq.command.ConnectionInfo;
-import org.activemq.command.ConsumerId;
-import org.activemq.command.ConsumerInfo;
-import org.activemq.command.DestinationInfo;
-import org.activemq.command.FlushCommand;
-import org.activemq.command.KeepAliveInfo;
-import org.activemq.command.Message;
-import org.activemq.command.MessageAck;
-import org.activemq.command.ProducerId;
-import org.activemq.command.ProducerInfo;
-import org.activemq.command.RemoveSubscriptionInfo;
-import org.activemq.command.Response;
-import org.activemq.command.SessionId;
-import org.activemq.command.SessionInfo;
-import org.activemq.command.ShutdownInfo;
-import org.activemq.command.TransactionInfo;
-import org.activemq.command.WireFormatInfo;
+import org.apache.activemq.command.BrokerInfo;
+import org.apache.activemq.command.ConnectionId;
+import org.apache.activemq.command.ConnectionInfo;
+import org.apache.activemq.command.ConsumerId;
+import org.apache.activemq.command.ConsumerInfo;
+import org.apache.activemq.command.DestinationInfo;
+import org.apache.activemq.command.FlushCommand;
+import org.apache.activemq.command.KeepAliveInfo;
+import org.apache.activemq.command.Message;
+import org.apache.activemq.command.MessageAck;
+import org.apache.activemq.command.ProducerId;
+import org.apache.activemq.command.ProducerInfo;
+import org.apache.activemq.command.RemoveSubscriptionInfo;
+import org.apache.activemq.command.Response;
+import org.apache.activemq.command.SessionId;
+import org.apache.activemq.command.SessionInfo;
+import org.apache.activemq.command.ShutdownInfo;
+import org.apache.activemq.command.TransactionInfo;
+import org.apache.activemq.command.WireFormatInfo;
 
 public interface CommandVisitor {
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/ConnectionState.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/ConnectionState.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/ConnectionState.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/ConnectionState.java Wed Dec 28 09:24:02 2005
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.activemq.state;
+package org.apache.activemq.state;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -23,10 +23,10 @@
 import java.util.List;
 import java.util.Set;
 
-import org.activemq.command.ActiveMQDestination;
-import org.activemq.command.ConnectionInfo;
-import org.activemq.command.SessionId;
-import org.activemq.command.SessionInfo;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.ConnectionInfo;
+import org.apache.activemq.command.SessionId;
+import org.apache.activemq.command.SessionInfo;
 
 import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/ConnectionStateTracker.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/ConnectionStateTracker.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/ConnectionStateTracker.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/ConnectionStateTracker.java Wed Dec 28 09:24:02 2005
@@ -14,33 +14,33 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.state;
+package org.apache.activemq.state;
 
 import java.io.IOException;
 import java.util.Iterator;
 
-import org.activemq.command.BrokerInfo;
-import org.activemq.command.Command;
-import org.activemq.command.ConnectionId;
-import org.activemq.command.ConnectionInfo;
-import org.activemq.command.ConsumerId;
-import org.activemq.command.ConsumerInfo;
-import org.activemq.command.DestinationInfo;
-import org.activemq.command.FlushCommand;
-import org.activemq.command.KeepAliveInfo;
-import org.activemq.command.Message;
-import org.activemq.command.MessageAck;
-import org.activemq.command.ProducerId;
-import org.activemq.command.ProducerInfo;
-import org.activemq.command.RemoveSubscriptionInfo;
-import org.activemq.command.Response;
-import org.activemq.command.SessionId;
-import org.activemq.command.SessionInfo;
-import org.activemq.command.ShutdownInfo;
-import org.activemq.command.TransactionInfo;
-import org.activemq.command.WireFormatInfo;
-import org.activemq.transport.Transport;
-import org.activemq.util.IOExceptionSupport;
+import org.apache.activemq.command.BrokerInfo;
+import org.apache.activemq.command.Command;
+import org.apache.activemq.command.ConnectionId;
+import org.apache.activemq.command.ConnectionInfo;
+import org.apache.activemq.command.ConsumerId;
+import org.apache.activemq.command.ConsumerInfo;
+import org.apache.activemq.command.DestinationInfo;
+import org.apache.activemq.command.FlushCommand;
+import org.apache.activemq.command.KeepAliveInfo;
+import org.apache.activemq.command.Message;
+import org.apache.activemq.command.MessageAck;
+import org.apache.activemq.command.ProducerId;
+import org.apache.activemq.command.ProducerInfo;
+import org.apache.activemq.command.RemoveSubscriptionInfo;
+import org.apache.activemq.command.Response;
+import org.apache.activemq.command.SessionId;
+import org.apache.activemq.command.SessionInfo;
+import org.apache.activemq.command.ShutdownInfo;
+import org.apache.activemq.command.TransactionInfo;
+import org.apache.activemq.command.WireFormatInfo;
+import org.apache.activemq.transport.Transport;
+import org.apache.activemq.util.IOExceptionSupport;
 
 import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/ConsumerState.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/ConsumerState.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/ConsumerState.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/ConsumerState.java Wed Dec 28 09:24:02 2005
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.activemq.state;
+package org.apache.activemq.state;
 
-import org.activemq.command.ConsumerInfo;
+import org.apache.activemq.command.ConsumerInfo;
 
 public class ConsumerState {        
     final ConsumerInfo info;

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/ProducerState.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/ProducerState.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/ProducerState.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/ProducerState.java Wed Dec 28 09:24:02 2005
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.activemq.state;
+package org.apache.activemq.state;
 
-import org.activemq.command.ProducerInfo;
+import org.apache.activemq.command.ProducerInfo;
 
 public class ProducerState {        
     final ProducerInfo info;  

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/SessionState.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/SessionState.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/SessionState.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/SessionState.java Wed Dec 28 09:24:02 2005
@@ -15,16 +15,16 @@
  * limitations under the License.
  */
 
-package org.activemq.state;
+package org.apache.activemq.state;
 
 import java.util.Collection;
 import java.util.Set;
 
-import org.activemq.command.ConsumerId;
-import org.activemq.command.ConsumerInfo;
-import org.activemq.command.ProducerId;
-import org.activemq.command.ProducerInfo;
-import org.activemq.command.SessionInfo;
+import org.apache.activemq.command.ConsumerId;
+import org.apache.activemq.command.ConsumerInfo;
+import org.apache.activemq.command.ProducerId;
+import org.apache.activemq.command.ProducerInfo;
+import org.apache.activemq.command.SessionInfo;
 
 import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
 

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/DefaultPersistenceAdapterFactory.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/DefaultPersistenceAdapterFactory.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/DefaultPersistenceAdapterFactory.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/DefaultPersistenceAdapterFactory.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/DefaultPersistenceAdapterFactory.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/DefaultPersistenceAdapterFactory.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/DefaultPersistenceAdapterFactory.java Wed Dec 28 09:24:02 2005
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.store;
+package org.apache.activemq.store;
 
 import java.io.File;
 import java.io.IOException;
 
 import org.activeio.journal.Journal;
 import org.activeio.journal.active.JournalImpl;
-import org.activemq.memory.UsageManager;
-import org.activemq.store.jdbc.JDBCPersistenceAdapter;
-import org.activemq.store.journal.JournalPersistenceAdapter;
-import org.activemq.store.journal.QuickJournalPersistenceAdapter;
-import org.activemq.thread.TaskRunnerFactory;
+import org.apache.activemq.memory.UsageManager;
+import org.apache.activemq.store.jdbc.JDBCPersistenceAdapter;
+import org.apache.activemq.store.journal.JournalPersistenceAdapter;
+import org.apache.activemq.store.journal.QuickJournalPersistenceAdapter;
+import org.apache.activemq.thread.TaskRunnerFactory;
 import org.apache.derby.jdbc.EmbeddedDataSource;
 
 import javax.sql.DataSource;

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/MessageRecoveryListener.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/MessageRecoveryListener.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/MessageRecoveryListener.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/MessageRecoveryListener.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/MessageRecoveryListener.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/MessageRecoveryListener.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/MessageRecoveryListener.java Wed Dec 28 09:24:02 2005
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.store;
+package org.apache.activemq.store;
 
-import org.activemq.command.Message;
+import org.apache.activemq.command.Message;
 
 /**
  * @version $Revision: 1.4 $

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/MessageStore.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/MessageStore.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/MessageStore.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/MessageStore.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/MessageStore.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/MessageStore.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/MessageStore.java Wed Dec 28 09:24:02 2005
@@ -14,19 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.store;
+package org.apache.activemq.store;
 
 import java.io.IOException;
 
 import org.activeio.Service;
-import org.activemq.broker.ConnectionContext;
-import org.activemq.command.ActiveMQDestination;
-import org.activemq.command.Message;
-import org.activemq.command.MessageAck;
-import org.activemq.command.MessageId;
+import org.apache.activemq.broker.ConnectionContext;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.Message;
+import org.apache.activemq.command.MessageAck;
+import org.apache.activemq.command.MessageId;
 
 /**
- * Represents a message store which is used by the persistent {@link org.activemq.service.MessageContainer}
+ * Represents a message store which is used by the persistent {@link org.apache.activemq.service.MessageContainer}
  * implementations
  *
  * @version $Revision: 1.5 $

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/PersistenceAdapter.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/PersistenceAdapter.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/PersistenceAdapter.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/PersistenceAdapter.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/PersistenceAdapter.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/PersistenceAdapter.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/PersistenceAdapter.java Wed Dec 28 09:24:02 2005
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.store;
+package org.apache.activemq.store;
 
-import org.activemq.Service;
-import org.activemq.broker.ConnectionContext;
-import org.activemq.command.ActiveMQQueue;
-import org.activemq.command.ActiveMQTopic;
+import org.apache.activemq.Service;
+import org.apache.activemq.broker.ConnectionContext;
+import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.activemq.command.ActiveMQTopic;
 
 import java.io.IOException;
 import java.util.Set;
@@ -32,7 +32,7 @@
 public interface PersistenceAdapter extends Service {
 
     /**
-     * Returns a set of all the {@link org.activemq.command.ActiveMQDestination}
+     * Returns a set of all the {@link org.apache.activemq.command.ActiveMQDestination}
      * objects that the persistence store is aware exist.
      *
      * @return

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/PersistenceAdapterFactory.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/PersistenceAdapterFactory.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/PersistenceAdapterFactory.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/PersistenceAdapterFactory.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/PersistenceAdapterFactory.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/PersistenceAdapterFactory.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/PersistenceAdapterFactory.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.store;
+package org.apache.activemq.store;
 
 import java.io.IOException;
 



Mime
View raw message