activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r516048 [14/14] - in /activemq/trunk: activemq-book/src/docbkx/ activemq-core/src/main/java/org/apache/activemq/ activemq-core/src/main/java/org/apache/activemq/blob/ activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/ ac...
Date Thu, 08 Mar 2007 14:20:38 GMT
Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/simple-auth-broker.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/simple-auth-broker.xml?view=diff&rev=516048&r1=516047&r2=516048
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/simple-auth-broker.xml (original)
+++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/simple-auth-broker.xml Thu Mar  8 06:20:29 2007
@@ -1,59 +1,59 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-  
-  http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-<!-- this file can only be parsed using the xbean-spring library -->
-<!-- START SNIPPET: example -->
-<beans>
-  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
-
-  <broker useJmx="false" persistent="false" xmlns="http://activemq.org/config/1.0" populateJMSXUserID="true">
-
-    <plugins>
-		<simpleAuthenticationPlugin>
-			<users>
-				<authenticationUser username="system" password="manager"
-					groups="users,admins"/>
-				<authenticationUser username="user" password="password"
-					groups="users"/>
-				<authenticationUser username="guest" password="password" groups="guests"/>
-			</users>
-		</simpleAuthenticationPlugin>
-
-
-      <!--  lets configure a destination based authorization mechanism -->
-      <authorizationPlugin>
-        <map>
-          <authorizationMap>
-            <authorizationEntries>
-              <authorizationEntry queue=">" read="admins" write="admins" admin="admins" />
-              <authorizationEntry queue="USERS.>" read="users" write="users" admin="users" />
-              <authorizationEntry queue="GUEST.>" read="guests" write="guests,users" admin="guests,users" />
-              
-              <authorizationEntry topic=">" read="admins" write="admins" admin="admins" />
-              <authorizationEntry topic="USERS.>" read="users" write="users" admin="users" />
-              <authorizationEntry topic="GUEST.>" read="guests" write="guests,users" admin="guests,users" />
-              
-              <authorizationEntry topic="ActiveMQ.Advisory.>" read="guests,users" write="guests,users" admin="guests,users"/>
-            </authorizationEntries>
-          </authorizationMap>
-        </map>
-      </authorizationPlugin>
-    </plugins>
-  </broker>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- this file can only be parsed using the xbean-spring library -->
+<!-- START SNIPPET: example -->
+<beans>
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
+  <broker useJmx="false" persistent="false" xmlns="http://activemq.org/config/1.0" populateJMSXUserID="true">
+
+    <plugins>
+		<simpleAuthenticationPlugin>
+			<users>
+				<authenticationUser username="system" password="manager"
+					groups="users,admins"/>
+				<authenticationUser username="user" password="password"
+					groups="users"/>
+				<authenticationUser username="guest" password="password" groups="guests"/>
+			</users>
+		</simpleAuthenticationPlugin>
+
+
+      <!--  lets configure a destination based authorization mechanism -->
+      <authorizationPlugin>
+        <map>
+          <authorizationMap>
+            <authorizationEntries>
+              <authorizationEntry queue=">" read="admins" write="admins" admin="admins" />
+              <authorizationEntry queue="USERS.>" read="users" write="users" admin="users" />
+              <authorizationEntry queue="GUEST.>" read="guests" write="guests,users" admin="guests,users" />
+              
+              <authorizationEntry topic=">" read="admins" write="admins" admin="admins" />
+              <authorizationEntry topic="USERS.>" read="users" write="users" admin="users" />
+              <authorizationEntry topic="GUEST.>" read="guests" write="guests,users" admin="guests,users" />
+              
+              <authorizationEntry topic="ActiveMQ.Advisory.>" read="guests,users" write="guests,users" admin="guests,users"/>
+            </authorizationEntries>
+          </authorizationMap>
+        </map>
+      </authorizationPlugin>
+    </plugins>
+  </broker>
+
 </beans>

Propchange: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/security/simple-auth-broker.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/trunk/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAMessageStore.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/trunk/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAPersistenceAdapter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: activemq/trunk/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAReferenceStore.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAReferenceStore.java?view=diff&rev=516048&r1=516047&r2=516048
==============================================================================
--- activemq/trunk/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAReferenceStore.java (original)
+++ activemq/trunk/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAReferenceStore.java Thu Mar  8 06:20:29 2007
@@ -1,217 +1,217 @@
-/**
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.store.jpa;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicLong;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-
-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;
-import org.apache.activemq.memory.UsageManager;
-import org.apache.activemq.store.MessageRecoveryListener;
-import org.apache.activemq.store.ReferenceStore;
-import org.apache.activemq.store.jpa.model.StoredMessageReference;
-import org.apache.activemq.util.IOExceptionSupport;
-import org.apache.activemq.wireformat.WireFormat;
-
-public class JPAReferenceStore implements ReferenceStore {
-	
-	protected final JPAPersistenceAdapter adapter;
-	protected final WireFormat wireFormat;
-	protected final ActiveMQDestination destination;
-	protected final String destinationName;
-    protected AtomicLong lastMessageId = new AtomicLong(-1);
-    
-	public JPAReferenceStore(JPAPersistenceAdapter adapter, ActiveMQDestination destination) {
-		this.adapter = adapter;
-		this.destination = destination;
-		this.destinationName = destination.getQualifiedName();
-		this.wireFormat = this.adapter.getWireFormat();
-	}
-	
-	public ActiveMQDestination getDestination() {
-		return destination;
-	}
-
-	public void addMessage(ConnectionContext context, Message message) throws IOException {
-		throw new RuntimeException("Use addMessageReference instead");
-	}
-	
-	public Message getMessage(MessageId identity) throws IOException {
-		throw new RuntimeException("Use addMessageReference instead");
-	}
-	
-	public void addMessageReference(ConnectionContext context, MessageId messageId, ReferenceData data) throws IOException {
-		EntityManager manager = adapter.beginEntityManager(context);
-		try {
-			
-			StoredMessageReference sm = new StoredMessageReference();
-			sm.setDestination(destinationName);
-			sm.setId(messageId.getBrokerSequenceId());
-			sm.setMessageId(messageId.toString());
-			sm.setExiration(data.getExpiration());
-			sm.setFileId(data.getFileId());
-			sm.setOffset(data.getOffset());
-		
-			manager.persist(sm);
-			
-		} catch (Throwable e) {
-			adapter.rollbackEntityManager(context,manager);
-			throw IOExceptionSupport.create(e);
-		}
-		adapter.commitEntityManager(context,manager);		
-	}
-
-	public ReferenceData getMessageReference(MessageId identity) throws IOException {
-		ReferenceData rc=null;
-		EntityManager manager = adapter.beginEntityManager(null);
-		try {
-			StoredMessageReference message=null;
-			if( identity.getBrokerSequenceId()!= 0 ) {
-				message = manager.find(StoredMessageReference.class, identity.getBrokerSequenceId());			
-			} else {
-				Query query = manager.createQuery("select m from StoredMessageReference m where m.messageId=?1");
-				query.setParameter(1, identity.toString());
-				message = (StoredMessageReference) query.getSingleResult();
-			}
-			if( message !=null ) {
-				rc = new ReferenceData();
-				rc.setExpiration(message.getExiration());
-				rc.setFileId(message.getFileId());
-				rc.setOffset(message.getOffset());
-			}
-		} catch (Throwable e) {
-			adapter.rollbackEntityManager(null,manager);
-			throw IOExceptionSupport.create(e);
-		}
-		adapter.commitEntityManager(null,manager);
-		return rc;
-	}
-
-	public int getMessageCount() throws IOException {
-		Long rc;
-		EntityManager manager = adapter.beginEntityManager(null);
-		try {
-			Query query = manager.createQuery("select count(m) from StoredMessageReference m");
-			rc = (Long) query.getSingleResult();
-		} catch (Throwable e) {
-			adapter.rollbackEntityManager(null,manager);
-			throw IOExceptionSupport.create(e);
-		}
-		adapter.commitEntityManager(null,manager);
-		return rc.intValue();
-	}
-
-	public void recover(MessageRecoveryListener container) throws Exception {
-		EntityManager manager = adapter.beginEntityManager(null);
-		try {
-			Query query = manager.createQuery("select m from StoredMessageReference m where m.destination=?1 order by m.id asc");
-			query.setParameter(1, destinationName);
-			for (StoredMessageReference m : (List<StoredMessageReference>)query.getResultList()) {
-				MessageId id = new MessageId(m.getMessageId());
-				id.setBrokerSequenceId(m.getId());
-				container.recoverMessageReference(id);
-	        }
-		} catch (Throwable e) {
-			adapter.rollbackEntityManager(null,manager);
-			throw IOExceptionSupport.create(e);
-		}
-		adapter.commitEntityManager(null,manager);
-	}
-
-	public void recoverNextMessages(int maxReturned, MessageRecoveryListener listener) throws Exception {
-		
-		EntityManager manager = adapter.beginEntityManager(null);
-		try {
-			
-			Query query = manager.createQuery("select m from StoredMessageReference m where m.destination=?1 and m.id>?2 order by m.id asc");
-			query.setParameter(1, destinationName);
-			query.setParameter(2, lastMessageId.get());
-			query.setMaxResults(maxReturned);
-			int count = 0;
-			for (StoredMessageReference m : (List<StoredMessageReference>)query.getResultList()) {
-				MessageId id = new MessageId(m.getMessageId());
-				id.setBrokerSequenceId(m.getId());				
-				listener.recoverMessageReference(id);
-				lastMessageId.set(m.getId());
-				count++;
-				if( count >= maxReturned ) { 
-					return;
-				}
-	        }
-
-		} catch (Throwable e) {
-			adapter.rollbackEntityManager(null,manager);
-			throw IOExceptionSupport.create(e);
-		}
-		adapter.commitEntityManager(null,manager);
-	}
-
-	public void removeAllMessages(ConnectionContext context) throws IOException {
-		EntityManager manager = adapter.beginEntityManager(context);
-		try {
-			Query query = manager.createQuery("delete from StoredMessageReference m where m.destination=?1");
-			query.setParameter(1, destinationName);
-			query.executeUpdate();
-		} catch (Throwable e) {
-			adapter.rollbackEntityManager(context,manager);
-			throw IOExceptionSupport.create(e);
-		}
-		adapter.commitEntityManager(context,manager);
-	}
-
-	public void removeMessage(ConnectionContext context, MessageAck ack) throws IOException {
-		EntityManager manager = adapter.beginEntityManager(context);
-		try {
-			Query query = manager.createQuery("delete from StoredMessageReference m where m.id=?1");
-			query.setParameter(1, ack.getLastMessageId().getBrokerSequenceId());
-			query.executeUpdate();
-		} catch (Throwable e) {
-			adapter.rollbackEntityManager(context,manager);
-			throw IOExceptionSupport.create(e);
-		}
-		adapter.commitEntityManager(context,manager);
-	}
-
-	public void resetBatching() {
-        lastMessageId.set(-1);
-	}
-
-	public void setUsageManager(UsageManager usageManager) {
-	}
-
-	public void start() throws Exception {
-	}
-
-	public void stop() throws Exception {
-	}
-
-    public void setBatch(MessageId startAfter){        
-    }
-
-    public boolean supportsExternalBatchControl(){
-        return false;
-    }
-}
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.store.jpa;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicLong;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+
+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;
+import org.apache.activemq.memory.UsageManager;
+import org.apache.activemq.store.MessageRecoveryListener;
+import org.apache.activemq.store.ReferenceStore;
+import org.apache.activemq.store.jpa.model.StoredMessageReference;
+import org.apache.activemq.util.IOExceptionSupport;
+import org.apache.activemq.wireformat.WireFormat;
+
+public class JPAReferenceStore implements ReferenceStore {
+	
+	protected final JPAPersistenceAdapter adapter;
+	protected final WireFormat wireFormat;
+	protected final ActiveMQDestination destination;
+	protected final String destinationName;
+    protected AtomicLong lastMessageId = new AtomicLong(-1);
+    
+	public JPAReferenceStore(JPAPersistenceAdapter adapter, ActiveMQDestination destination) {
+		this.adapter = adapter;
+		this.destination = destination;
+		this.destinationName = destination.getQualifiedName();
+		this.wireFormat = this.adapter.getWireFormat();
+	}
+	
+	public ActiveMQDestination getDestination() {
+		return destination;
+	}
+
+	public void addMessage(ConnectionContext context, Message message) throws IOException {
+		throw new RuntimeException("Use addMessageReference instead");
+	}
+	
+	public Message getMessage(MessageId identity) throws IOException {
+		throw new RuntimeException("Use addMessageReference instead");
+	}
+	
+	public void addMessageReference(ConnectionContext context, MessageId messageId, ReferenceData data) throws IOException {
+		EntityManager manager = adapter.beginEntityManager(context);
+		try {
+			
+			StoredMessageReference sm = new StoredMessageReference();
+			sm.setDestination(destinationName);
+			sm.setId(messageId.getBrokerSequenceId());
+			sm.setMessageId(messageId.toString());
+			sm.setExiration(data.getExpiration());
+			sm.setFileId(data.getFileId());
+			sm.setOffset(data.getOffset());
+		
+			manager.persist(sm);
+			
+		} catch (Throwable e) {
+			adapter.rollbackEntityManager(context,manager);
+			throw IOExceptionSupport.create(e);
+		}
+		adapter.commitEntityManager(context,manager);		
+	}
+
+	public ReferenceData getMessageReference(MessageId identity) throws IOException {
+		ReferenceData rc=null;
+		EntityManager manager = adapter.beginEntityManager(null);
+		try {
+			StoredMessageReference message=null;
+			if( identity.getBrokerSequenceId()!= 0 ) {
+				message = manager.find(StoredMessageReference.class, identity.getBrokerSequenceId());			
+			} else {
+				Query query = manager.createQuery("select m from StoredMessageReference m where m.messageId=?1");
+				query.setParameter(1, identity.toString());
+				message = (StoredMessageReference) query.getSingleResult();
+			}
+			if( message !=null ) {
+				rc = new ReferenceData();
+				rc.setExpiration(message.getExiration());
+				rc.setFileId(message.getFileId());
+				rc.setOffset(message.getOffset());
+			}
+		} catch (Throwable e) {
+			adapter.rollbackEntityManager(null,manager);
+			throw IOExceptionSupport.create(e);
+		}
+		adapter.commitEntityManager(null,manager);
+		return rc;
+	}
+
+	public int getMessageCount() throws IOException {
+		Long rc;
+		EntityManager manager = adapter.beginEntityManager(null);
+		try {
+			Query query = manager.createQuery("select count(m) from StoredMessageReference m");
+			rc = (Long) query.getSingleResult();
+		} catch (Throwable e) {
+			adapter.rollbackEntityManager(null,manager);
+			throw IOExceptionSupport.create(e);
+		}
+		adapter.commitEntityManager(null,manager);
+		return rc.intValue();
+	}
+
+	public void recover(MessageRecoveryListener container) throws Exception {
+		EntityManager manager = adapter.beginEntityManager(null);
+		try {
+			Query query = manager.createQuery("select m from StoredMessageReference m where m.destination=?1 order by m.id asc");
+			query.setParameter(1, destinationName);
+			for (StoredMessageReference m : (List<StoredMessageReference>)query.getResultList()) {
+				MessageId id = new MessageId(m.getMessageId());
+				id.setBrokerSequenceId(m.getId());
+				container.recoverMessageReference(id);
+	        }
+		} catch (Throwable e) {
+			adapter.rollbackEntityManager(null,manager);
+			throw IOExceptionSupport.create(e);
+		}
+		adapter.commitEntityManager(null,manager);
+	}
+
+	public void recoverNextMessages(int maxReturned, MessageRecoveryListener listener) throws Exception {
+		
+		EntityManager manager = adapter.beginEntityManager(null);
+		try {
+			
+			Query query = manager.createQuery("select m from StoredMessageReference m where m.destination=?1 and m.id>?2 order by m.id asc");
+			query.setParameter(1, destinationName);
+			query.setParameter(2, lastMessageId.get());
+			query.setMaxResults(maxReturned);
+			int count = 0;
+			for (StoredMessageReference m : (List<StoredMessageReference>)query.getResultList()) {
+				MessageId id = new MessageId(m.getMessageId());
+				id.setBrokerSequenceId(m.getId());				
+				listener.recoverMessageReference(id);
+				lastMessageId.set(m.getId());
+				count++;
+				if( count >= maxReturned ) { 
+					return;
+				}
+	        }
+
+		} catch (Throwable e) {
+			adapter.rollbackEntityManager(null,manager);
+			throw IOExceptionSupport.create(e);
+		}
+		adapter.commitEntityManager(null,manager);
+	}
+
+	public void removeAllMessages(ConnectionContext context) throws IOException {
+		EntityManager manager = adapter.beginEntityManager(context);
+		try {
+			Query query = manager.createQuery("delete from StoredMessageReference m where m.destination=?1");
+			query.setParameter(1, destinationName);
+			query.executeUpdate();
+		} catch (Throwable e) {
+			adapter.rollbackEntityManager(context,manager);
+			throw IOExceptionSupport.create(e);
+		}
+		adapter.commitEntityManager(context,manager);
+	}
+
+	public void removeMessage(ConnectionContext context, MessageAck ack) throws IOException {
+		EntityManager manager = adapter.beginEntityManager(context);
+		try {
+			Query query = manager.createQuery("delete from StoredMessageReference m where m.id=?1");
+			query.setParameter(1, ack.getLastMessageId().getBrokerSequenceId());
+			query.executeUpdate();
+		} catch (Throwable e) {
+			adapter.rollbackEntityManager(context,manager);
+			throw IOExceptionSupport.create(e);
+		}
+		adapter.commitEntityManager(context,manager);
+	}
+
+	public void resetBatching() {
+        lastMessageId.set(-1);
+	}
+
+	public void setUsageManager(UsageManager usageManager) {
+	}
+
+	public void start() throws Exception {
+	}
+
+	public void stop() throws Exception {
+	}
+
+    public void setBatch(MessageId startAfter){        
+    }
+
+    public boolean supportsExternalBatchControl(){
+        return false;
+    }
+}

Propchange: activemq/trunk/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAReferenceStore.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: activemq/trunk/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAReferenceStoreAdapter.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAReferenceStoreAdapter.java?view=diff&rev=516048&r1=516047&r2=516048
==============================================================================
--- activemq/trunk/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAReferenceStoreAdapter.java (original)
+++ activemq/trunk/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAReferenceStoreAdapter.java Thu Mar  8 06:20:29 2007
@@ -1,131 +1,131 @@
-/**
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.store.jpa;
-
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-
-import org.apache.activemq.command.ActiveMQDestination;
-import org.apache.activemq.command.ActiveMQQueue;
-import org.apache.activemq.command.ActiveMQTopic;
-import org.apache.activemq.store.MessageStore;
-import org.apache.activemq.store.ReferenceStore;
-import org.apache.activemq.store.ReferenceStoreAdapter;
-import org.apache.activemq.store.TopicMessageStore;
-import org.apache.activemq.store.TopicReferenceStore;
-import org.apache.activemq.util.IOExceptionSupport;
-
-/**
- * An implementation of {@link ReferenceStoreAdapter} that uses JPA to
- * store it's message references.
- * 
- * @org.apache.xbean.XBean element="jpaReferenceStoreAdapter"
- * 
- * @version $Revision: 1.17 $
- */
-public class JPAReferenceStoreAdapter extends JPAPersistenceAdapter implements ReferenceStoreAdapter {
-
-	@Override
-	public MessageStore createQueueMessageStore(ActiveMQQueue destination) throws IOException {
-		throw new RuntimeException("Use createQueueReferenceStore instead.");
-	}
-	
-	@Override
-	public TopicMessageStore createTopicMessageStore(ActiveMQTopic destination) throws IOException {
-		throw new RuntimeException("Use createTopicReferenceStore instead.");
-	}
-	
-	public ReferenceStore createQueueReferenceStore(ActiveMQQueue destination) throws IOException {
-		JPAReferenceStore rc =  new JPAReferenceStore(this, destination);
-        return rc;
-	}
-
-	public TopicReferenceStore createTopicReferenceStore(ActiveMQTopic destination) throws IOException {
-		JPATopicReferenceStore rc =  new JPATopicReferenceStore(this, destination);
-        return rc;
-	}
-	
-
-	public void deleteAllMessages() throws IOException {
-		EntityManager manager = beginEntityManager(null);
-		try {
-			Query query = manager.createQuery("delete from StoredMessageReference m");
-			query.executeUpdate();
-			query = manager.createQuery("delete from StoredSubscription ss");
-			query.executeUpdate();
-		} catch (Throwable e) {
-			rollbackEntityManager(null,manager);
-			throw IOExceptionSupport.create(e);
-		}
-		commitEntityManager(null,manager);		
-	}
-
-	public Set<ActiveMQDestination> getDestinations() {
-		HashSet<ActiveMQDestination> rc = new HashSet<ActiveMQDestination>();
-		
-		EntityManager manager = beginEntityManager(null);
-		try {
-			Query query = manager.createQuery("select distinct m.destination from StoredMessageReference m");
-			for (String dest : (List<String>)query.getResultList()) {
-				rc.add(ActiveMQDestination.createDestination(dest,ActiveMQDestination.QUEUE_TYPE));
-	        }
-		} catch (RuntimeException e) {
-			rollbackEntityManager(null,manager);
-			throw e;
-		}
-		commitEntityManager(null,manager);		
-		return rc;
-	}
-
-	public long getLastMessageBrokerSequenceId() throws IOException {
-		long rc=0;
-		EntityManager manager = beginEntityManager(null);
-		try {
-			Query query = manager.createQuery("select max(m.id) from StoredMessageReference m");
-			Long t = (Long) query.getSingleResult();
-			if( t != null ) {
-				rc = t;
-			}
-		} catch (Throwable e) {
-			rollbackEntityManager(null,manager);
-			throw IOExceptionSupport.create(e);
-		}
-		commitEntityManager(null,manager);		
-		return rc;
-	}	
-
-	public Set<Integer> getReferenceFileIdsInUse() throws IOException {
-		HashSet<Integer> rc=null;
-		EntityManager manager = beginEntityManager(null);
-		try {
-			Query query = manager.createQuery("select distinct m.fileId from StoredMessageReference m");
-			rc=new HashSet<Integer>((List<Integer>)query.getResultList());
-		} catch (Throwable e) {
-			rollbackEntityManager(null,manager);
-			throw IOExceptionSupport.create(e);
-		}
-		commitEntityManager(null,manager);
-		return rc;
-	}
-
-}
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.store.jpa;
+
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.activemq.command.ActiveMQTopic;
+import org.apache.activemq.store.MessageStore;
+import org.apache.activemq.store.ReferenceStore;
+import org.apache.activemq.store.ReferenceStoreAdapter;
+import org.apache.activemq.store.TopicMessageStore;
+import org.apache.activemq.store.TopicReferenceStore;
+import org.apache.activemq.util.IOExceptionSupport;
+
+/**
+ * An implementation of {@link ReferenceStoreAdapter} that uses JPA to
+ * store it's message references.
+ * 
+ * @org.apache.xbean.XBean element="jpaReferenceStoreAdapter"
+ * 
+ * @version $Revision: 1.17 $
+ */
+public class JPAReferenceStoreAdapter extends JPAPersistenceAdapter implements ReferenceStoreAdapter {
+
+	@Override
+	public MessageStore createQueueMessageStore(ActiveMQQueue destination) throws IOException {
+		throw new RuntimeException("Use createQueueReferenceStore instead.");
+	}
+	
+	@Override
+	public TopicMessageStore createTopicMessageStore(ActiveMQTopic destination) throws IOException {
+		throw new RuntimeException("Use createTopicReferenceStore instead.");
+	}
+	
+	public ReferenceStore createQueueReferenceStore(ActiveMQQueue destination) throws IOException {
+		JPAReferenceStore rc =  new JPAReferenceStore(this, destination);
+        return rc;
+	}
+
+	public TopicReferenceStore createTopicReferenceStore(ActiveMQTopic destination) throws IOException {
+		JPATopicReferenceStore rc =  new JPATopicReferenceStore(this, destination);
+        return rc;
+	}
+	
+
+	public void deleteAllMessages() throws IOException {
+		EntityManager manager = beginEntityManager(null);
+		try {
+			Query query = manager.createQuery("delete from StoredMessageReference m");
+			query.executeUpdate();
+			query = manager.createQuery("delete from StoredSubscription ss");
+			query.executeUpdate();
+		} catch (Throwable e) {
+			rollbackEntityManager(null,manager);
+			throw IOExceptionSupport.create(e);
+		}
+		commitEntityManager(null,manager);		
+	}
+
+	public Set<ActiveMQDestination> getDestinations() {
+		HashSet<ActiveMQDestination> rc = new HashSet<ActiveMQDestination>();
+		
+		EntityManager manager = beginEntityManager(null);
+		try {
+			Query query = manager.createQuery("select distinct m.destination from StoredMessageReference m");
+			for (String dest : (List<String>)query.getResultList()) {
+				rc.add(ActiveMQDestination.createDestination(dest,ActiveMQDestination.QUEUE_TYPE));
+	        }
+		} catch (RuntimeException e) {
+			rollbackEntityManager(null,manager);
+			throw e;
+		}
+		commitEntityManager(null,manager);		
+		return rc;
+	}
+
+	public long getLastMessageBrokerSequenceId() throws IOException {
+		long rc=0;
+		EntityManager manager = beginEntityManager(null);
+		try {
+			Query query = manager.createQuery("select max(m.id) from StoredMessageReference m");
+			Long t = (Long) query.getSingleResult();
+			if( t != null ) {
+				rc = t;
+			}
+		} catch (Throwable e) {
+			rollbackEntityManager(null,manager);
+			throw IOExceptionSupport.create(e);
+		}
+		commitEntityManager(null,manager);		
+		return rc;
+	}	
+
+	public Set<Integer> getReferenceFileIdsInUse() throws IOException {
+		HashSet<Integer> rc=null;
+		EntityManager manager = beginEntityManager(null);
+		try {
+			Query query = manager.createQuery("select distinct m.fileId from StoredMessageReference m");
+			rc=new HashSet<Integer>((List<Integer>)query.getResultList());
+		} catch (Throwable e) {
+			rollbackEntityManager(null,manager);
+			throw IOExceptionSupport.create(e);
+		}
+		commitEntityManager(null,manager);
+		return rc;
+	}
+
+}

Propchange: activemq/trunk/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPAReferenceStoreAdapter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/trunk/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPATopicMessageStore.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/trunk/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/JPATopicReferenceStore.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/trunk/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/model/StoredMessage.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/trunk/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/model/StoredMessageReference.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/trunk/activemq-jpa-store/src/main/java/org/apache/activemq/store/jpa/model/StoredSubscription.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/trunk/activemq-jpa-store/src/main/resources/META-INF/DISCLAIMER.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/trunk/activemq-jpa-store/src/main/resources/META-INF/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/trunk/activemq-jpa-store/src/main/resources/META-INF/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/trunk/activemq-jpa-store/src/main/resources/META-INF/persistence.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/trunk/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/JPARecoveryBrokerTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: activemq/trunk/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/JPAStoreLoadTester.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/JPAStoreLoadTester.java?view=diff&rev=516048&r1=516047&r2=516048
==============================================================================
--- activemq/trunk/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/JPAStoreLoadTester.java (original)
+++ activemq/trunk/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/JPAStoreLoadTester.java Thu Mar  8 06:20:29 2007
@@ -1,48 +1,48 @@
-/**
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.broker.store;
-
-import junit.framework.Test;
-
-import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.xbean.BrokerFactoryBean;
-import org.springframework.core.io.ClassPathResource;
-
-/**
- * 
- * @version $Revision$
- */
-public class JPAStoreLoadTester extends LoadTester  {
-
-    protected BrokerService createBroker() throws Exception {
-        BrokerFactoryBean brokerFactory=new BrokerFactoryBean(new ClassPathResource("org/apache/activemq/broker/store/jpabroker.xml"));
-        brokerFactory.afterPropertiesSet();
-        BrokerService broker =  brokerFactory.getBroker();
-        broker.setDeleteAllMessagesOnStartup(true);
-        return broker;
-    }
-    
-    public static Test suite() {
-        return suite(JPAStoreLoadTester.class);
-    }
-    
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
-    }
-    
-}
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.broker.store;
+
+import junit.framework.Test;
+
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.xbean.BrokerFactoryBean;
+import org.springframework.core.io.ClassPathResource;
+
+/**
+ * 
+ * @version $Revision$
+ */
+public class JPAStoreLoadTester extends LoadTester  {
+
+    protected BrokerService createBroker() throws Exception {
+        BrokerFactoryBean brokerFactory=new BrokerFactoryBean(new ClassPathResource("org/apache/activemq/broker/store/jpabroker.xml"));
+        brokerFactory.afterPropertiesSet();
+        BrokerService broker =  brokerFactory.getBroker();
+        broker.setDeleteAllMessagesOnStartup(true);
+        return broker;
+    }
+    
+    public static Test suite() {
+        return suite(JPAStoreLoadTester.class);
+    }
+    
+    public static void main(String[] args) {
+        junit.textui.TestRunner.run(suite());
+    }
+    
+}

Propchange: activemq/trunk/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/JPAStoreLoadTester.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: activemq/trunk/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/QuickJPAStoreLoadTester.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/QuickJPAStoreLoadTester.java?view=diff&rev=516048&r1=516047&r2=516048
==============================================================================
--- activemq/trunk/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/QuickJPAStoreLoadTester.java (original)
+++ activemq/trunk/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/QuickJPAStoreLoadTester.java Thu Mar  8 06:20:29 2007
@@ -1,48 +1,48 @@
-/**
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.broker.store;
-
-import junit.framework.Test;
-
-import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.xbean.BrokerFactoryBean;
-import org.springframework.core.io.ClassPathResource;
-
-/**
- * 
- * @version $Revision$
- */
-public class QuickJPAStoreLoadTester extends LoadTester  {
-
-    protected BrokerService createBroker() throws Exception {
-        BrokerFactoryBean brokerFactory=new BrokerFactoryBean(new ClassPathResource("org/apache/activemq/broker/store/quickjpabroker.xml"));
-        brokerFactory.afterPropertiesSet();
-        BrokerService broker =  brokerFactory.getBroker();
-        broker.setDeleteAllMessagesOnStartup(true);
-        return broker;
-    }
-    
-    public static Test suite() {
-        return suite(QuickJPAStoreLoadTester.class);
-    }
-    
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
-    }
-    
-}
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.broker.store;
+
+import junit.framework.Test;
+
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.xbean.BrokerFactoryBean;
+import org.springframework.core.io.ClassPathResource;
+
+/**
+ * 
+ * @version $Revision$
+ */
+public class QuickJPAStoreLoadTester extends LoadTester  {
+
+    protected BrokerService createBroker() throws Exception {
+        BrokerFactoryBean brokerFactory=new BrokerFactoryBean(new ClassPathResource("org/apache/activemq/broker/store/quickjpabroker.xml"));
+        brokerFactory.afterPropertiesSet();
+        BrokerService broker =  brokerFactory.getBroker();
+        broker.setDeleteAllMessagesOnStartup(true);
+        return broker;
+    }
+    
+    public static Test suite() {
+        return suite(QuickJPAStoreLoadTester.class);
+    }
+    
+    public static void main(String[] args) {
+        junit.textui.TestRunner.run(suite());
+    }
+    
+}

Propchange: activemq/trunk/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/QuickJPAStoreLoadTester.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: activemq/trunk/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/QuickJPAStoreRecoveryBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/QuickJPAStoreRecoveryBrokerTest.java?view=diff&rev=516048&r1=516047&r2=516048
==============================================================================
--- activemq/trunk/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/QuickJPAStoreRecoveryBrokerTest.java (original)
+++ activemq/trunk/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/QuickJPAStoreRecoveryBrokerTest.java Thu Mar  8 06:20:29 2007
@@ -1,77 +1,77 @@
-/**
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.broker.store;
-
-import java.util.Properties;
-import junit.framework.Test;
-import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.broker.RecoveryBrokerTest;
-import org.apache.activemq.store.amq.AMQPersistenceAdapter;
-import org.apache.activemq.store.jpa.JPAReferenceStoreAdapter;
-
-/**
- * Used to verify that recovery works correctly against 
- * 
- * @version $Revision$
- */
-public class QuickJPAStoreRecoveryBrokerTest extends RecoveryBrokerTest {
-
-    protected BrokerService createBroker() throws Exception {
-        BrokerService service = new BrokerService();
-        service.setDeleteAllMessagesOnStartup(true);
-        AMQPersistenceAdapter pa = new AMQPersistenceAdapter();
-        
-        JPAReferenceStoreAdapter rfa = new JPAReferenceStoreAdapter();
-        Properties props = new Properties();
-        props.setProperty("openjpa.ConnectionDriverName", "org.apache.derby.jdbc.EmbeddedDriver");
-        props.setProperty("openjpa.ConnectionURL", "jdbc:derby:activemq-data/derby;create=true");
-        props.setProperty("openjpa.jdbc.SynchronizeMappings", "buildSchema");
-        props.setProperty("openjpa.Log", "DefaultLevel=WARN,SQL=TRACE");
-        rfa.setEntityManagerProperties(props);
-        pa.setReferenceStoreAdapter(rfa);        
-        
-        service.setPersistenceAdapter(pa);
-        return service;
-    }
-    
-    protected BrokerService createRestartedBroker() throws Exception {
-        BrokerService service = new BrokerService();
-        AMQPersistenceAdapter pa = new AMQPersistenceAdapter();
-
-        JPAReferenceStoreAdapter rfa = new JPAReferenceStoreAdapter();
-        Properties props = new Properties();
-        props.setProperty("openjpa.ConnectionDriverName", "org.apache.derby.jdbc.EmbeddedDriver");
-        props.setProperty("openjpa.ConnectionURL", "jdbc:derby:activemq-data/derby;create=true");
-        props.setProperty("openjpa.jdbc.SynchronizeMappings", "buildSchema");
-        props.setProperty("openjpa.Log", "DefaultLevel=WARN,SQL=TRACE");
-        rfa.setEntityManagerProperties(props);
-        pa.setReferenceStoreAdapter(rfa);        
-
-        service.setPersistenceAdapter(pa);
-        return service;
-    }
-    
-    public static Test suite() {
-        return suite(QuickJPAStoreRecoveryBrokerTest.class);
-    }
-    
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
-    }
-
-}
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.broker.store;
+
+import java.util.Properties;
+import junit.framework.Test;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.RecoveryBrokerTest;
+import org.apache.activemq.store.amq.AMQPersistenceAdapter;
+import org.apache.activemq.store.jpa.JPAReferenceStoreAdapter;
+
+/**
+ * Used to verify that recovery works correctly against 
+ * 
+ * @version $Revision$
+ */
+public class QuickJPAStoreRecoveryBrokerTest extends RecoveryBrokerTest {
+
+    protected BrokerService createBroker() throws Exception {
+        BrokerService service = new BrokerService();
+        service.setDeleteAllMessagesOnStartup(true);
+        AMQPersistenceAdapter pa = new AMQPersistenceAdapter();
+        
+        JPAReferenceStoreAdapter rfa = new JPAReferenceStoreAdapter();
+        Properties props = new Properties();
+        props.setProperty("openjpa.ConnectionDriverName", "org.apache.derby.jdbc.EmbeddedDriver");
+        props.setProperty("openjpa.ConnectionURL", "jdbc:derby:activemq-data/derby;create=true");
+        props.setProperty("openjpa.jdbc.SynchronizeMappings", "buildSchema");
+        props.setProperty("openjpa.Log", "DefaultLevel=WARN,SQL=TRACE");
+        rfa.setEntityManagerProperties(props);
+        pa.setReferenceStoreAdapter(rfa);        
+        
+        service.setPersistenceAdapter(pa);
+        return service;
+    }
+    
+    protected BrokerService createRestartedBroker() throws Exception {
+        BrokerService service = new BrokerService();
+        AMQPersistenceAdapter pa = new AMQPersistenceAdapter();
+
+        JPAReferenceStoreAdapter rfa = new JPAReferenceStoreAdapter();
+        Properties props = new Properties();
+        props.setProperty("openjpa.ConnectionDriverName", "org.apache.derby.jdbc.EmbeddedDriver");
+        props.setProperty("openjpa.ConnectionURL", "jdbc:derby:activemq-data/derby;create=true");
+        props.setProperty("openjpa.jdbc.SynchronizeMappings", "buildSchema");
+        props.setProperty("openjpa.Log", "DefaultLevel=WARN,SQL=TRACE");
+        rfa.setEntityManagerProperties(props);
+        pa.setReferenceStoreAdapter(rfa);        
+
+        service.setPersistenceAdapter(pa);
+        return service;
+    }
+    
+    public static Test suite() {
+        return suite(QuickJPAStoreRecoveryBrokerTest.class);
+    }
+    
+    public static void main(String[] args) {
+        junit.textui.TestRunner.run(suite());
+    }
+
+}

Propchange: activemq/trunk/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/QuickJPAStoreRecoveryBrokerTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: activemq/trunk/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/QuickJPAStoreXARecoveryBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/QuickJPAStoreXARecoveryBrokerTest.java?view=diff&rev=516048&r1=516047&r2=516048
==============================================================================
--- activemq/trunk/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/QuickJPAStoreXARecoveryBrokerTest.java (original)
+++ activemq/trunk/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/QuickJPAStoreXARecoveryBrokerTest.java Thu Mar  8 06:20:29 2007
@@ -1,77 +1,77 @@
-/**
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.broker.store;
-
-import java.util.Properties;
-import junit.framework.Test;
-import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.broker.XARecoveryBrokerTest;
-import org.apache.activemq.store.amq.AMQPersistenceAdapter;
-import org.apache.activemq.store.jpa.JPAReferenceStoreAdapter;
-
-/**
- * Used to verify that recovery works correctly against 
- * 
- * @version $Revision$
- */
-public class QuickJPAStoreXARecoveryBrokerTest extends XARecoveryBrokerTest {
-
-    public static Test suite() {
-        return suite(QuickJPAStoreXARecoveryBrokerTest.class);
-    }
-    
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
-    }
-
-    protected BrokerService createBroker() throws Exception {
-        BrokerService service = new BrokerService();
-        service.setDeleteAllMessagesOnStartup(true);
-        AMQPersistenceAdapter pa = new AMQPersistenceAdapter();
-        
-        JPAReferenceStoreAdapter rfa = new JPAReferenceStoreAdapter();
-        Properties props = new Properties();
-        props.setProperty("openjpa.ConnectionDriverName", "org.apache.derby.jdbc.EmbeddedDriver");
-        props.setProperty("openjpa.ConnectionURL", "jdbc:derby:activemq-data/derby;create=true");
-        props.setProperty("openjpa.jdbc.SynchronizeMappings", "buildSchema");
-        props.setProperty("openjpa.Log", "DefaultLevel=WARN,SQL=TRACE");
-        rfa.setEntityManagerProperties(props);
-        pa.setReferenceStoreAdapter(rfa);        
-        
-        service.setPersistenceAdapter(pa);
-        return service;
-    }
-    
-    protected BrokerService createRestartedBroker() throws Exception {
-        BrokerService service = new BrokerService();
-        AMQPersistenceAdapter pa = new AMQPersistenceAdapter();
-        
-        JPAReferenceStoreAdapter rfa = new JPAReferenceStoreAdapter();
-        Properties props = new Properties();
-        props.setProperty("openjpa.ConnectionDriverName", "org.apache.derby.jdbc.EmbeddedDriver");
-        props.setProperty("openjpa.ConnectionURL", "jdbc:derby:activemq-data/derby;create=true");
-        props.setProperty("openjpa.jdbc.SynchronizeMappings", "buildSchema");
-        props.setProperty("openjpa.Log", "DefaultLevel=WARN,SQL=TRACE");
-        rfa.setEntityManagerProperties(props);
-        pa.setReferenceStoreAdapter(rfa);        
-        
-        service.setPersistenceAdapter(pa);
-        return service;
-    }
-    
-}
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.broker.store;
+
+import java.util.Properties;
+import junit.framework.Test;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.XARecoveryBrokerTest;
+import org.apache.activemq.store.amq.AMQPersistenceAdapter;
+import org.apache.activemq.store.jpa.JPAReferenceStoreAdapter;
+
+/**
+ * Used to verify that recovery works correctly against 
+ * 
+ * @version $Revision$
+ */
+public class QuickJPAStoreXARecoveryBrokerTest extends XARecoveryBrokerTest {
+
+    public static Test suite() {
+        return suite(QuickJPAStoreXARecoveryBrokerTest.class);
+    }
+    
+    public static void main(String[] args) {
+        junit.textui.TestRunner.run(suite());
+    }
+
+    protected BrokerService createBroker() throws Exception {
+        BrokerService service = new BrokerService();
+        service.setDeleteAllMessagesOnStartup(true);
+        AMQPersistenceAdapter pa = new AMQPersistenceAdapter();
+        
+        JPAReferenceStoreAdapter rfa = new JPAReferenceStoreAdapter();
+        Properties props = new Properties();
+        props.setProperty("openjpa.ConnectionDriverName", "org.apache.derby.jdbc.EmbeddedDriver");
+        props.setProperty("openjpa.ConnectionURL", "jdbc:derby:activemq-data/derby;create=true");
+        props.setProperty("openjpa.jdbc.SynchronizeMappings", "buildSchema");
+        props.setProperty("openjpa.Log", "DefaultLevel=WARN,SQL=TRACE");
+        rfa.setEntityManagerProperties(props);
+        pa.setReferenceStoreAdapter(rfa);        
+        
+        service.setPersistenceAdapter(pa);
+        return service;
+    }
+    
+    protected BrokerService createRestartedBroker() throws Exception {
+        BrokerService service = new BrokerService();
+        AMQPersistenceAdapter pa = new AMQPersistenceAdapter();
+        
+        JPAReferenceStoreAdapter rfa = new JPAReferenceStoreAdapter();
+        Properties props = new Properties();
+        props.setProperty("openjpa.ConnectionDriverName", "org.apache.derby.jdbc.EmbeddedDriver");
+        props.setProperty("openjpa.ConnectionURL", "jdbc:derby:activemq-data/derby;create=true");
+        props.setProperty("openjpa.jdbc.SynchronizeMappings", "buildSchema");
+        props.setProperty("openjpa.Log", "DefaultLevel=WARN,SQL=TRACE");
+        rfa.setEntityManagerProperties(props);
+        pa.setReferenceStoreAdapter(rfa);        
+        
+        service.setPersistenceAdapter(pa);
+        return service;
+    }
+    
+}

Propchange: activemq/trunk/activemq-jpa-store/src/test/java/org/apache/activemq/broker/store/QuickJPAStoreXARecoveryBrokerTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: activemq/trunk/activemq-jpa-store/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-jpa-store/src/test/resources/log4j.properties?view=diff&rev=516048&r1=516047&r2=516048
==============================================================================
--- activemq/trunk/activemq-jpa-store/src/test/resources/log4j.properties (original)
+++ activemq/trunk/activemq-jpa-store/src/test/resources/log4j.properties Thu Mar  8 06:20:29 2007
@@ -1,35 +1,35 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements.  See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License.  You may obtain a copy of the License at
-## 
-## http://www.apache.org/licenses/LICENSE-2.0
-## 
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-#
-# The logging properties used during tests..
-#
-log4j.rootLogger=INFO, out
-
-log4j.logger.org.apache.activemq.spring=WARN
-
-# CONSOLE appender not used by default
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-
-# File appender
-log4j.appender.out=org.apache.log4j.FileAppender
-log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-log4j.appender.out.file=target/activemq-test.log
-log4j.appender.out.append=true
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements.  See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License.  You may obtain a copy of the License at
+## 
+## http://www.apache.org/licenses/LICENSE-2.0
+## 
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+
+#
+# The logging properties used during tests..
+#
+log4j.rootLogger=INFO, out
+
+log4j.logger.org.apache.activemq.spring=WARN
+
+# CONSOLE appender not used by default
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+
+# File appender
+log4j.appender.out=org.apache.log4j.FileAppender
+log4j.appender.out.layout=org.apache.log4j.PatternLayout
+log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+log4j.appender.out.file=target/activemq-test.log
+log4j.appender.out.append=true

Propchange: activemq/trunk/activemq-jpa-store/src/test/resources/log4j.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: activemq/trunk/activemq-jpa-store/src/test/resources/org/apache/activemq/broker/store/jpabroker.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-jpa-store/src/test/resources/org/apache/activemq/broker/store/jpabroker.xml?view=diff&rev=516048&r1=516047&r2=516048
==============================================================================
--- activemq/trunk/activemq-jpa-store/src/test/resources/org/apache/activemq/broker/store/jpabroker.xml (original)
+++ activemq/trunk/activemq-jpa-store/src/test/resources/org/apache/activemq/broker/store/jpabroker.xml Thu Mar  8 06:20:29 2007
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-   
-    http://www.apache.org/licenses/LICENSE-2.0
-   
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<beans>
-  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
-
-  <broker 
-  		brokerName="broker" 
-  		persistent="false" useJmx="false" 
-  		deleteAllMessagesOnStartup="true" 
-        xmlns="http://activemq.org/config/1.0" persistenceAdapter="#jpa">
-        
-     <transportConnectors>
-      <transportConnector uri="tcp://localhost:0"/>
-    </transportConnectors>
-
-  </broker>
-  
-  <bean class="org.apache.activemq.store.jpa.JPAPersistenceAdapter" id="jpa">
-  	<property name="entityManagerProperties">
-     	<props>
-			<prop key="openjpa.ConnectionDriverName">org.apache.derby.jdbc.EmbeddedDriver</prop>
-	        <prop key="openjpa.ConnectionURL">jdbc:derby:activemq-data/derby;create=true</prop>
-	        <prop key="openjpa.jdbc.SynchronizeMappings">buildSchema</prop>
-		 	<prop key="openjpa.Log=DefaultLevel">WARN,SQL=TRACE</prop>
-     	</props>
-	</property>  	
-  </bean>
-
-</beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+   
+    http://www.apache.org/licenses/LICENSE-2.0
+   
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<beans>
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
+  <broker 
+  		brokerName="broker" 
+  		persistent="false" useJmx="false" 
+  		deleteAllMessagesOnStartup="true" 
+        xmlns="http://activemq.org/config/1.0" persistenceAdapter="#jpa">
+        
+     <transportConnectors>
+      <transportConnector uri="tcp://localhost:0"/>
+    </transportConnectors>
+
+  </broker>
+  
+  <bean class="org.apache.activemq.store.jpa.JPAPersistenceAdapter" id="jpa">
+  	<property name="entityManagerProperties">
+     	<props>
+			<prop key="openjpa.ConnectionDriverName">org.apache.derby.jdbc.EmbeddedDriver</prop>
+	        <prop key="openjpa.ConnectionURL">jdbc:derby:activemq-data/derby;create=true</prop>
+	        <prop key="openjpa.jdbc.SynchronizeMappings">buildSchema</prop>
+		 	<prop key="openjpa.Log=DefaultLevel">WARN,SQL=TRACE</prop>
+     	</props>
+	</property>  	
+  </bean>
+
+</beans>

Propchange: activemq/trunk/activemq-jpa-store/src/test/resources/org/apache/activemq/broker/store/jpabroker.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: activemq/trunk/activemq-jpa-store/src/test/resources/org/apache/activemq/broker/store/quickjpabroker.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-jpa-store/src/test/resources/org/apache/activemq/broker/store/quickjpabroker.xml?view=diff&rev=516048&r1=516047&r2=516048
==============================================================================
--- activemq/trunk/activemq-jpa-store/src/test/resources/org/apache/activemq/broker/store/quickjpabroker.xml (original)
+++ activemq/trunk/activemq-jpa-store/src/test/resources/org/apache/activemq/broker/store/quickjpabroker.xml Thu Mar  8 06:20:29 2007
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-   
-    http://www.apache.org/licenses/LICENSE-2.0
-   
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<beans>
-  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
-
-  <broker 
-  		brokerName="broker" 
-  		persistent="false" useJmx="false" 
-  		deleteAllMessagesOnStartup="true" 
-        xmlns="http://activemq.org/config/1.0">
-        
-    <transportConnectors>
-      <transportConnector uri="tcp://localhost:0"/>
-    </transportConnectors>
-
-    <persistenceAdapter>
-      <amqPersistenceAdapter referenceStoreAdapter="#jpa"/> 
-    </persistenceAdapter>
-  </broker>
-  
-  <bean class="org.apache.activemq.store.jpa.JPAReferenceStoreAdapter" id="jpa">
-  	<property name="entityManagerProperties">
-     	<props>
-			<prop key="openjpa.ConnectionDriverName">org.apache.derby.jdbc.EmbeddedDriver</prop>
-	        <prop key="openjpa.ConnectionURL">jdbc:derby:activemq-data/derby;create=true</prop>
-	        <prop key="openjpa.jdbc.SynchronizeMappings">buildSchema</prop>
-		 	<prop key="openjpa.Log=DefaultLevel">WARN,SQL=TRACE</prop>
-     	</props>
-	</property>  	
-  </bean>
-  
-
-</beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+   
+    http://www.apache.org/licenses/LICENSE-2.0
+   
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<beans>
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
+  <broker 
+  		brokerName="broker" 
+  		persistent="false" useJmx="false" 
+  		deleteAllMessagesOnStartup="true" 
+        xmlns="http://activemq.org/config/1.0">
+        
+    <transportConnectors>
+      <transportConnector uri="tcp://localhost:0"/>
+    </transportConnectors>
+
+    <persistenceAdapter>
+      <amqPersistenceAdapter referenceStoreAdapter="#jpa"/> 
+    </persistenceAdapter>
+  </broker>
+  
+  <bean class="org.apache.activemq.store.jpa.JPAReferenceStoreAdapter" id="jpa">
+  	<property name="entityManagerProperties">
+     	<props>
+			<prop key="openjpa.ConnectionDriverName">org.apache.derby.jdbc.EmbeddedDriver</prop>
+	        <prop key="openjpa.ConnectionURL">jdbc:derby:activemq-data/derby;create=true</prop>
+	        <prop key="openjpa.jdbc.SynchronizeMappings">buildSchema</prop>
+		 	<prop key="openjpa.Log=DefaultLevel">WARN,SQL=TRACE</prop>
+     	</props>
+	</property>  	
+  </bean>
+  
+
+</beans>

Propchange: activemq/trunk/activemq-jpa-store/src/test/resources/org/apache/activemq/broker/store/quickjpabroker.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: activemq/trunk/assembly/src/release/bin/activemq-admin.bat
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/bin/activemq-admin.bat?view=diff&rev=516048&r1=516047&r2=516048
==============================================================================
--- activemq/trunk/assembly/src/release/bin/activemq-admin.bat (original)
+++ activemq/trunk/assembly/src/release/bin/activemq-admin.bat Thu Mar  8 06:20:29 2007
@@ -1,120 +1,120 @@
-@echo off
-
-REM ------------------------------------------------------------------------
-REM Licensed to the Apache Software Foundation (ASF) under one or more
-REM contributor license agreements.  See the NOTICE file distributed with
-REM this work for additional information regarding copyright ownership.
-REM The ASF licenses this file to You under the Apache License, Version 2.0
-REM (the "License"); you may not use this file except in compliance with
-REM the License.  You may obtain a copy of the License at
-REM
-REM http://www.apache.org/licenses/LICENSE-2.0
-REM
-REM Unless required by applicable law or agreed to in writing, software
-REM distributed under the License is distributed on an "AS IS" BASIS,
-REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-REM See the License for the specific language governing permissions and
-REM limitations under the License.
-REM ------------------------------------------------------------------------
-
-if exist "%HOME%\activemqrc_pre.bat" call "%HOME%\activemqrc_pre.bat"
-
-if "%OS%"=="Windows_NT" @setlocal
-
-rem %~dp0 is expanded pathname of the current script under NT
-set DEFAULT_ACTIVEMQ_HOME=%~dp0..
-
-if "%ACTIVEMQ_HOME%"=="" set ACTIVEMQ_HOME=%DEFAULT_ACTIVEMQ_HOME%
-set DEFAULT_ACTIVEMQ_HOME=
-
-rem Slurp the command line arguments. This loop allows for an unlimited number
-rem of arguments (up to the command line limit, anyway).
-
-set ACTIVEMQ_CMD_LINE_ARGS=%1
-if ""%1""=="""" goto doneStart
-shift
-:setupArgs
-if ""%1""=="""" goto doneStart
-set ACTIVEMQ_CMD_LINE_ARGS=%ACTIVEMQ_CMD_LINE_ARGS% %1
-shift
-goto setupArgs
-
-rem This label provides a place for the argument list loop to break out 
-rem and for NT handling to skip to.
-
-:doneStart
-rem find ACTIVEMQ_HOME if it does not exist due to either an invalid value passed
-rem by the user or the %0 problem on Windows 9x
-if exist "%ACTIVEMQ_HOME%\README.txt" goto checkJava
-
-rem check for activemq in Program Files on system drive
-if not exist "%SystemDrive%\Program Files\activemq" goto checkSystemDrive
-set ACTIVEMQ_HOME=%SystemDrive%\Program Files\activemq
-goto checkJava
-
-:checkSystemDrive
-rem check for activemq in root directory of system drive
-if not exist %SystemDrive%\activemq\README.txt goto checkCDrive
-set ACTIVEMQ_HOME=%SystemDrive%\activemq
-goto checkJava
-
-:checkCDrive
-rem check for activemq in C:\activemq for Win9X users
-if not exist C:\activemq\README.txt goto noAntHome
-set ACTIVEMQ_HOME=C:\activemq
-goto checkJava
-
-:noAntHome
-echo ACTIVEMQ_HOME is set incorrectly or activemq could not be located. Please set ACTIVEMQ_HOME.
-goto end
-
-:checkJava
-set _JAVACMD=%JAVACMD%
-
-set JAVA_EXT_DIRS=%JAVA_HOME%\lib\ext;%ACTIVEMQ_HOME%;%ACTIVEMQ_HOME%\lib;%ACTIVEMQ_HOME%\lib\optional
-
-if "%JAVA_HOME%" == "" goto noJavaHome
-if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
-if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java.exe
-goto runAnt
-
-:noJavaHome
-if "%_JAVACMD%" == "" set _JAVACMD=java.exe
-echo.
-echo Warning: JAVA_HOME environment variable is not set.
-echo.
-
-:runAnt
-if "%ACTIVEMQ_BASE%" == "" set ACTIVEMQ_BASE=%ACTIVEMQ_HOME%
-if "%ACTIVEMQ_OPTS%" == "" set ACTIVEMQ_OPTS=-Xmx512M -Dorg.apache.activemq.UseDedicatedTaskRunner=true -Dderby.system.home="%ACTIVEMQ_BASE%\data" -Dderby.storage.fileSyncTransactionLog=true
-
-if "%SUNJMX%" == "" set SUNJMX=-Dcom.sun.management.jmxremote
-REM set SUNJMX=-Dcom.sun.management.jmxremote.port=1616 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false
-
-if "%SSL_OPTS%" == "" set SSL_OPTS=-Djavax.net.ssl.keyStorePassword=password -Djavax.net.ssl.trustStorePassword=password -Djavax.net.ssl.keyStore="%ACTIVEMQ_BASE%/conf/broker.ks" -Djavax.net.ssl.trustStore="%ACTIVEMQ_BASE%/conf/broker.ts"
-
-if "%ACTIVEMQ_CMD_LINE_ARGS%" == "" set ACTIVEMQ_CMD_LINE_ARGS=--help
-
-REM Uncomment to enable YourKit profiling
-REM SET ACTIVEMQ_DEBUG_OPTS="-Xrunyjpagent"
-
-REM Uncomment to enable remote debugging
-REM SET ACTIVEMQ_DEBUG_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005
-
-REM Setup ActiveMQ Classpath. Default is the conf directory.
-set ACTIVEMQ_CLASSPATH=%ACTIVEMQ_HOME%/conf;%ACTIVEMQ_CLASSPATH%
-
-"%_JAVACMD%" %ACTIVEMQ_DEBUG_OPTS% %ACTIVEMQ_OPTS% -Djava.ext.dirs="%JAVA_EXT_DIRS%" -Dactivemq.classpath="%ACTIVEMQ_CLASSPATH%" -jar "%ACTIVEMQ_HOME%/bin/run.jar" %ACTIVEMQ_CMD_LINE_ARGS%
-
-goto end
-
-:end
-set _JAVACMD=
-set ACTIVEMQ_CMD_LINE_ARGS=
-
-if "%OS%"=="Windows_NT" @endlocal
-
-:mainEnd
-if exist "%HOME%\activemqrc_post.bat" call "%HOME%\activemqrc_post.bat"
-
-
+@echo off
+
+REM ------------------------------------------------------------------------
+REM Licensed to the Apache Software Foundation (ASF) under one or more
+REM contributor license agreements.  See the NOTICE file distributed with
+REM this work for additional information regarding copyright ownership.
+REM The ASF licenses this file to You under the Apache License, Version 2.0
+REM (the "License"); you may not use this file except in compliance with
+REM the License.  You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing, software
+REM distributed under the License is distributed on an "AS IS" BASIS,
+REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM See the License for the specific language governing permissions and
+REM limitations under the License.
+REM ------------------------------------------------------------------------
+
+if exist "%HOME%\activemqrc_pre.bat" call "%HOME%\activemqrc_pre.bat"
+
+if "%OS%"=="Windows_NT" @setlocal
+
+rem %~dp0 is expanded pathname of the current script under NT
+set DEFAULT_ACTIVEMQ_HOME=%~dp0..
+
+if "%ACTIVEMQ_HOME%"=="" set ACTIVEMQ_HOME=%DEFAULT_ACTIVEMQ_HOME%
+set DEFAULT_ACTIVEMQ_HOME=
+
+rem Slurp the command line arguments. This loop allows for an unlimited number
+rem of arguments (up to the command line limit, anyway).
+
+set ACTIVEMQ_CMD_LINE_ARGS=%1
+if ""%1""=="""" goto doneStart
+shift
+:setupArgs
+if ""%1""=="""" goto doneStart
+set ACTIVEMQ_CMD_LINE_ARGS=%ACTIVEMQ_CMD_LINE_ARGS% %1
+shift
+goto setupArgs
+
+rem This label provides a place for the argument list loop to break out 
+rem and for NT handling to skip to.
+
+:doneStart
+rem find ACTIVEMQ_HOME if it does not exist due to either an invalid value passed
+rem by the user or the %0 problem on Windows 9x
+if exist "%ACTIVEMQ_HOME%\README.txt" goto checkJava
+
+rem check for activemq in Program Files on system drive
+if not exist "%SystemDrive%\Program Files\activemq" goto checkSystemDrive
+set ACTIVEMQ_HOME=%SystemDrive%\Program Files\activemq
+goto checkJava
+
+:checkSystemDrive
+rem check for activemq in root directory of system drive
+if not exist %SystemDrive%\activemq\README.txt goto checkCDrive
+set ACTIVEMQ_HOME=%SystemDrive%\activemq
+goto checkJava
+
+:checkCDrive
+rem check for activemq in C:\activemq for Win9X users
+if not exist C:\activemq\README.txt goto noAntHome
+set ACTIVEMQ_HOME=C:\activemq
+goto checkJava
+
+:noAntHome
+echo ACTIVEMQ_HOME is set incorrectly or activemq could not be located. Please set ACTIVEMQ_HOME.
+goto end
+
+:checkJava
+set _JAVACMD=%JAVACMD%
+
+set JAVA_EXT_DIRS=%JAVA_HOME%\lib\ext;%ACTIVEMQ_HOME%;%ACTIVEMQ_HOME%\lib;%ACTIVEMQ_HOME%\lib\optional
+
+if "%JAVA_HOME%" == "" goto noJavaHome
+if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
+if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java.exe
+goto runAnt
+
+:noJavaHome
+if "%_JAVACMD%" == "" set _JAVACMD=java.exe
+echo.
+echo Warning: JAVA_HOME environment variable is not set.
+echo.
+
+:runAnt
+if "%ACTIVEMQ_BASE%" == "" set ACTIVEMQ_BASE=%ACTIVEMQ_HOME%
+if "%ACTIVEMQ_OPTS%" == "" set ACTIVEMQ_OPTS=-Xmx512M -Dorg.apache.activemq.UseDedicatedTaskRunner=true -Dderby.system.home="%ACTIVEMQ_BASE%\data" -Dderby.storage.fileSyncTransactionLog=true
+
+if "%SUNJMX%" == "" set SUNJMX=-Dcom.sun.management.jmxremote
+REM set SUNJMX=-Dcom.sun.management.jmxremote.port=1616 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false
+
+if "%SSL_OPTS%" == "" set SSL_OPTS=-Djavax.net.ssl.keyStorePassword=password -Djavax.net.ssl.trustStorePassword=password -Djavax.net.ssl.keyStore="%ACTIVEMQ_BASE%/conf/broker.ks" -Djavax.net.ssl.trustStore="%ACTIVEMQ_BASE%/conf/broker.ts"
+
+if "%ACTIVEMQ_CMD_LINE_ARGS%" == "" set ACTIVEMQ_CMD_LINE_ARGS=--help
+
+REM Uncomment to enable YourKit profiling
+REM SET ACTIVEMQ_DEBUG_OPTS="-Xrunyjpagent"
+
+REM Uncomment to enable remote debugging
+REM SET ACTIVEMQ_DEBUG_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005
+
+REM Setup ActiveMQ Classpath. Default is the conf directory.
+set ACTIVEMQ_CLASSPATH=%ACTIVEMQ_HOME%/conf;%ACTIVEMQ_CLASSPATH%
+
+"%_JAVACMD%" %ACTIVEMQ_DEBUG_OPTS% %ACTIVEMQ_OPTS% -Djava.ext.dirs="%JAVA_EXT_DIRS%" -Dactivemq.classpath="%ACTIVEMQ_CLASSPATH%" -jar "%ACTIVEMQ_HOME%/bin/run.jar" %ACTIVEMQ_CMD_LINE_ARGS%
+
+goto end
+
+:end
+set _JAVACMD=
+set ACTIVEMQ_CMD_LINE_ARGS=
+
+if "%OS%"=="Windows_NT" @endlocal
+
+:mainEnd
+if exist "%HOME%\activemqrc_post.bat" call "%HOME%\activemqrc_post.bat"
+
+

Propchange: activemq/trunk/assembly/src/release/bin/activemq-admin.bat
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Thu Mar  8 06:20:29 2007
@@ -1 +1 @@
-CRLF
+native

Propchange: activemq/trunk/assembly/src/release/example/ruby/catstomp.rb
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/trunk/assembly/src/release/example/ruby/stompcat.rb
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message