Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Migrated to using xbean 2.2-SNAPSHOT 

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@376445 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Hiram R. Chirino 2006-02-09 21:41:59 +00:00
parent 40926586aa
commit 68d245f4bf
55 changed files with 64 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-console/pom.xml
View File

@ -123,7 +123,7 @@
</dependency>
<dependency>
<groupId>xbean</groupId>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
</dependency>

2
activemq-console/project.xml
View File

@ -85,7 +85,7 @@
</dependency>
<dependency>
<groupId>xbean</groupId>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
<version>${xbean_spring_version}</version>
<url>http://www.gbean.org</url>

2
activemq-core/maven.xml
View File

@ -129,7 +129,7 @@
<path refid="maven.dependency.classpath" />
</path>
<taskdef name="xsdGenerate" classname="org.xbean.spring.generator.MappingGeneratorTask">
<taskdef name="xsdGenerate" classname="org.apache.xbean.spring.generator.MappingGeneratorTask">
<classpath refid="test.classpath" />
</taskdef>
<ant:mkdir dir="${basedir}/target/generated"/>

8
activemq-core/pom.xml
View File

@ -187,7 +187,7 @@
</dependency>
<dependency>
<groupId>xbean</groupId>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
</dependency>
@ -243,7 +243,7 @@
<tasks>
<mkdir dir="${basedir}/target/generated"/>
<taskdef name="xsdGenerate" classname="org.xbean.spring.generator.MappingGeneratorTask"/>
<taskdef name="xsdGenerate" classname="org.apache.xbean.spring.generator.MappingGeneratorTask"/>
<xsdGenerate
destFile="${basedir}/target/activemq-${version}.xsd"
namespace="http://activemq.org/config/1.0"
@ -265,9 +265,9 @@
</executions>
<dependencies>
<dependency>
<groupId>xbean</groupId>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
<version>2.0</version>
<version>2.2-SNAPSHOT</version>
</dependency>
</dependencies>
</plugin>

2
activemq-core/project.xml
View File

@ -166,7 +166,7 @@
</dependency>
<!-- for custom XML parsing -->
<dependency>
<groupId>xbean</groupId>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
<version>${xbean_spring_version}</version>
<url>http://www.xbean.org</url>

2
activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java
View File

@ -42,7 +42,7 @@ import org.apache.commons.logging.LogFactory;
import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
/**
* @org.xbean.XBean
* @org.apache.xbean.XBean
*
* @version $Revision: 1.6 $
*/

2
activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java
View File

@ -38,7 +38,7 @@ import org.apache.commons.logging.LogFactory;
/**
* A Flow provides different dispatch policies within the NMR
*
* @org.xbean.XBean
* @org.apache.xbean.XBean
*
* @version $Revision$
*/

2
activemq-core/src/main/java/org/apache/activemq/broker/region/policy/FixedCountSubscriptionRecoveryPolicy.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.filter.MessageEvaluationContext;
* This implementation of {@link SubscriptionRecoveryPolicy} will only keep
* the last message.
*
* @org.xbean.XBean
* @org.apache.xbean.XBean
*
* @version $Revision$
*/

2
activemq-core/src/main/java/org/apache/activemq/broker/region/policy/FixedSizedSubscriptionRecoveryPolicy.java
View File

@ -33,7 +33,7 @@ import java.util.List;
* amount of memory available in RAM for message history which is evicted in
* time order.
*
* @org.xbean.XBean
* @org.apache.xbean.XBean
*
* @version $Revision$
*/

2
activemq-core/src/main/java/org/apache/activemq/broker/region/policy/IndividualDeadLetterStrategy.java
View File

@ -24,7 +24,7 @@ import org.apache.activemq.command.ActiveMQTopic;
* A {@link DeadLetterStrategy} where each destination has its own individual
* DLQ using the subject naming hierarchy.
*
* @org.xbean.XBean
* @org.apache.xbean.XBean
*
* @version $Revision$
*/

2
activemq-core/src/main/java/org/apache/activemq/broker/region/policy/LastImageSubscriptionRecoveryPolicy.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.filter.MessageEvaluationContext;
* This implementation of {@link SubscriptionRecoveryPolicy} will only keep
* the last message.
*
* @org.xbean.XBean
* @org.apache.xbean.XBean
*
* @version $Revision$
*/

2
activemq-core/src/main/java/org/apache/activemq/broker/region/policy/NoSubscriptionRecoveryPolicy.java
View File

@ -24,7 +24,7 @@ import org.apache.activemq.broker.region.Topic;
/**
* This is the default Topic recovery policy which does not recover any messages.
*
* @org.xbean.XBean
* @org.apache.xbean.XBean
*
* @version $Revision$
*/

2
activemq-core/src/main/java/org/apache/activemq/broker/region/policy/PolicyEntry.java
View File

@ -24,7 +24,7 @@ import org.apache.activemq.filter.DestinationMapEntry;
* Represents an entry in a {@link PolicyMap} for assigning policies to a
* specific destination or a hierarchical wildcard area of destinations.
*
* @org.xbean.XBean
* @org.apache.xbean.XBean
*
* @version $Revision: 1.1 $
*/

4
activemq-core/src/main/java/org/apache/activemq/broker/region/policy/PolicyMap.java
View File

@ -26,7 +26,7 @@ import java.util.List;
* destinations or wildcard hierarchies of destinations can be configured using
* different policies.
*
* @org.xbean.XBean
* @org.apache.xbean.XBean
*
* @version $Revision: 1.1 $
*/
@ -45,7 +45,7 @@ public class PolicyMap extends DestinationMap {
/**
* Sets the individual entries on the policy map
*
* @org.xbean.ElementType class="org.apache.activemq.broker.region.policy.PolicyEntry"
* @org.apache.xbean.ElementType class="org.apache.activemq.broker.region.policy.PolicyEntry"
*/
public void setPolicyEntries(List entries) {
super.setEntries(entries);

2
activemq-core/src/main/java/org/apache/activemq/broker/region/policy/QueryBasedSubscriptionRecoveryPolicy.java
View File

@ -42,7 +42,7 @@ import javax.jms.MessageListener;
* This implementation of {@link SubscriptionRecoveryPolicy} will perform a user
* specific query mechanism to load any messages they may have missed.
*
* @org.xbean.XBean
* @org.apache.xbean.XBean
*
* @version $Revision$
*/

2
activemq-core/src/main/java/org/apache/activemq/broker/region/policy/RoundRobinDispatchPolicy.java
View File

@ -29,7 +29,7 @@ import java.util.List;
* Simple dispatch policy that sends a message to every subscription that
* matches the message.
*
* @org.xbean.XBean
* @org.apache.xbean.XBean
*
* @version $Revision$
*/

2
activemq-core/src/main/java/org/apache/activemq/broker/region/policy/SharedDeadLetterStrategy.java
View File

@ -24,7 +24,7 @@ import org.apache.activemq.command.ActiveMQQueue;
* a constant destination.
*
*
* @org.xbean.XBean
* @org.apache.xbean.XBean
*
* @version $Revision$
*/

2
activemq-core/src/main/java/org/apache/activemq/broker/region/policy/SimpleDispatchPolicy.java
View File

@ -29,7 +29,7 @@ import java.util.List;
* Simple dispatch policy that sends a message to every subscription that
* matches the message.
*
* @org.xbean.XBean
* @org.apache.xbean.XBean
*
* @version $Revision$
*/

2
activemq-core/src/main/java/org/apache/activemq/broker/region/policy/StrictOrderDispatchPolicy.java
View File

@ -28,7 +28,7 @@ import java.util.List;
/**
* Dispatch policy that causes every subscription to see messages in the same order.
*
* @org.xbean.XBean
* @org.apache.xbean.XBean
*
* @version $Revision$
*/

2
activemq-core/src/main/java/org/apache/activemq/broker/region/policy/TimedSubscriptionRecoveryPolicy.java
View File

@ -34,7 +34,7 @@ import java.util.List;
* buffer of messages around in memory and use that to recover new
* subscriptions.
*
* @org.xbean.XBean
* @org.apache.xbean.XBean
*
* @version $Revision$
*/

2
activemq-core/src/main/java/org/apache/activemq/memory/UsageManager.java
View File

@ -30,7 +30,7 @@ import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
*
* Main use case is manage memory usage.
*
* @org.xbean.XBean
* @org.apache.xbean.XBean
*
* @version $Revision: 1.3 $
*/

2
activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridge.java
View File

@ -53,7 +53,7 @@ import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
/**
* Forwards messages from the local broker to the remote broker based on demand.
*
* @org.xbean.XBean
* @org.apache.xbean.XBean
*
* @version $Revision$
*/

2
activemq-core/src/main/java/org/apache/activemq/network/ForwardingBridge.java
View File

@ -43,7 +43,7 @@ import org.apache.commons.logging.LogFactory;
/**
* Forwards all messages from the local broker to the remote broker.
*
* @org.xbean.XBean
* @org.apache.xbean.XBean
*
* @version $Revision$
*/

2
activemq-core/src/main/java/org/apache/activemq/network/NetworkConnector.java
View File

@ -35,7 +35,7 @@ import org.apache.commons.logging.LogFactory;
import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
/**
* @org.xbean.XBean
* @org.apache.xbean.XBean
*
* @version $Revision$
*/

2
activemq-core/src/main/java/org/apache/activemq/network/jms/InboundQueueBridge.java
View File

@ -20,7 +20,7 @@ package org.apache.activemq.network.jms;
/**
* Create an Inbound Queue Bridge
*
* @org.xbean.XBean
* @org.apache.xbean.XBean
*
* @version $Revision: 1.1.1.1 $
*/

2
activemq-core/src/main/java/org/apache/activemq/network/jms/InboundTopicBridge.java
View File

@ -20,7 +20,7 @@ package org.apache.activemq.network.jms;
/**
* Create an Inbound Topic Bridge
*
* @org.xbean.XBean
* @org.apache.xbean.XBean
*
* @version $Revision: 1.1.1.1 $
*/

2
activemq-core/src/main/java/org/apache/activemq/network/jms/JmsQueueConnector.java
View File

@ -31,7 +31,7 @@ import javax.naming.NamingException;
/**
* A Bridge to other JMS Queue providers
*
* @org.xbean.XBean
* @org.apache.xbean.XBean
*
* @version $Revision: 1.1.1.1 $
*/

2
activemq-core/src/main/java/org/apache/activemq/network/jms/JmsTopicConnector.java
View File

@ -31,7 +31,7 @@ import org.apache.commons.logging.LogFactory;
/**
* A Bridge to other JMS Topic providers
*
* @org.xbean.XBean
* @org.apache.xbean.XBean
*
* @version $Revision: 1.1.1.1 $
*/

2
activemq-core/src/main/java/org/apache/activemq/network/jms/OutboundQueueBridge.java
View File

@ -20,7 +20,7 @@ package org.apache.activemq.network.jms;
/**
* Create an Outbound Queue Bridge
*
* @org.xbean.XBean
* @org.apache.xbean.XBean
*
* @version $Revision: 1.1.1.1 $
*/

2
activemq-core/src/main/java/org/apache/activemq/network/jms/OutboundTopicBridge.java
View File

@ -20,7 +20,7 @@ package org.apache.activemq.network.jms;
/**
* Create an Outbound Topic Bridge
*
* @org.xbean.XBean
* @org.apache.xbean.XBean
*
* @version $Revision: 1.1.1.1 $
*/

2
activemq-core/src/main/java/org/apache/activemq/network/jms/SimpleJmsMessageConvertor.java
View File

@ -22,7 +22,7 @@ import javax.jms.Message;
/**
* Converts Message from one JMS to another
*
* @org.xbean.XBean
* @org.apache.xbean.XBean
*
* @version $Revision: 1.1.1.1 $
*/

2
activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnector.java
View File

@ -35,7 +35,7 @@ import org.apache.commons.logging.LogFactory;
import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
/**
* @org.xbean.XBean
* @org.apache.xbean.XBean
*
* @version $Revision$
*/

2
activemq-core/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java
View File

@ -21,7 +21,7 @@ import org.springframework.beans.factory.FactoryBean;
/**
* Creates a default persistence model using the Journal and JDBC
*
* @org.xbean.XBean element="journaledJDBC"
* @org.apache.xbean.XBean element="journaledJDBC"
*
* @version $Revision: 1.1 $
*/

2
activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java
View File

@ -52,7 +52,7 @@ import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
* but it will not keep track of local transaction commits so that operations
* performed against the Message store are done as a single uow.
*
* @org.xbean.XBean element="jdbcPersistenceAdapter"
* @org.apache.xbean.XBean element="jdbcPersistenceAdapter"
*
* @version $Revision: 1.9 $
*/

2
activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java
View File

@ -70,7 +70,7 @@ import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
* {@link Journal} and then check pointing asynchronously on a timeout with some
* other long term persistent storage.
*
* @org.xbean.XBean
* @org.apache.xbean.XBean
*
* @version $Revision: 1.17 $
*/

2
activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalPersistenceAdapter.java
View File

@ -70,7 +70,7 @@ import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
* {@link Journal} and then check pointing asynchronously on a timeout with some
* other long term persistent storage.
*
* @org.xbean.XBean
* @org.apache.xbean.XBean
*
* @version $Revision: 1.17 $
*/

2
activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryPersistenceAdapter.java
View File

@ -33,7 +33,7 @@ import org.apache.activemq.store.TransactionStore;
import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
/**
* @org.xbean.XBean
* @org.apache.xbean.XBean
*
* @version $Revision: 1.4 $
*/

4
activemq-core/src/main/java/org/apache/activemq/xbean/BrokerFactoryBean.java
View File

@ -24,8 +24,8 @@ import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.core.io.Resource;
import org.xbean.spring.context.ResourceXmlApplicationContext;
import org.xbean.spring.context.impl.URIEditor;
import org.apache.xbean.spring.context.ResourceXmlApplicationContext;
import org.apache.xbean.spring.context.impl.URIEditor;
import java.beans.PropertyEditorManager;
import java.net.URI;

4
activemq-core/src/main/java/org/apache/activemq/xbean/XBeanBrokerFactory.java
View File

@ -22,8 +22,8 @@ import java.net.URI;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.BrokerFactory.BrokerFactoryHandler;
import org.springframework.beans.BeansException;
import org.xbean.spring.context.ClassPathXmlApplicationContext;
import org.xbean.spring.context.impl.URIEditor;
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.apache.xbean.spring.context.impl.URIEditor;
/**
* @version $Revision$

2
activemq-core/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java
View File

@ -25,7 +25,7 @@ import org.springframework.beans.factory.InitializingBean;
* connectors, network connectors and a bunch of properties which can be used to
* configure the broker as its lazily created.
*
* @org.xbean.XBean element="broker" rootElement="true" description="An ActiveMQ
* @org.apache.xbean.XBean element="broker" rootElement="true" description="An ActiveMQ
* Message Broker which consists of a number of transport
* connectors, network connectors and a persistence adaptor"
*

2
activemq-core/src/test/java/org/apache/activemq/network/jms/TopicBridgeXBeanTest.java
View File

@ -16,8 +16,8 @@
*/
package org.apache.activemq.network.jms;
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.springframework.context.support.AbstractApplicationContext;
import org.xbean.spring.context.ClassPathXmlApplicationContext;
/**
*

2
activemq-ra/maven.xml
View File

@ -42,7 +42,7 @@
<path refid="maven.dependency.classpath" />
</path>
<taskdef name="xsdGenerate" classname="org.xbean.spring.generator.MappingGeneratorTask">
<taskdef name="xsdGenerate" classname="org.apache.xbean.spring.generator.MappingGeneratorTask">
<classpath refid="test.classpath" />
</taskdef>
<xsdGenerate destFile="target/activemq-ra.xsd" namespace="http://activemq.org/ra/config/1.0" classpathref="test.classpath" srcdir="src/main/java" />

2
activemq-ra/project.xml
View File

@ -144,7 +144,7 @@
<!-- for custom XML parsing -->
<dependency>
<groupId>xbean</groupId>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
<version>${xbean_spring_version}</version>
<url>http://www.gbean.org</url>

2
activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQActivationSpec.java
View File

@ -39,7 +39,7 @@ import org.apache.activemq.selector.SelectorParser;
/**
* Configures the inbound JMS consumer specification using ActiveMQ
*
* @org.xbean.XBean
* @org.apache.xbean.XBean
*
* @version $Revision$ $Date$
*/

4
activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java
View File

@ -16,10 +16,10 @@
*/
package org.apache.activemq.ra;
import java.io.Serializable;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.HashMap;
import java.io.Serializable;
import javax.jms.Connection;
import javax.jms.JMSException;
@ -45,7 +45,7 @@ import org.apache.activemq.util.ServiceSupport;
* and deliver messages to those end points using the connection configure in the
* resource adapter. <p/>Must override equals and hashCode (JCA spec 16.4)
*
* @org.xbean.XBean element="resourceAdapter" rootElement="true"
* @org.apache.xbean.XBean element="resourceAdapter" rootElement="true"
* description="The JCA Resource Adaptor for ActiveMQ"
*
* @version $Revision$

2
activemq-systest/pom.xml
View File

@ -70,7 +70,7 @@
</dependency>
<dependency>
<groupId>xbean</groupId>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
</dependency>
<dependency>

2
activemq-web/pom.xml
View File

@ -64,7 +64,7 @@
</dependency>
<dependency>
<groupId>xbean</groupId>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
</dependency>
<dependency>

2
activemq-web/project.xml
View File

@ -60,7 +60,7 @@
<!-- for custom XML parsing -->
<dependency>
<groupId>xbean</groupId>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
<version>${xbean_spring_version}</version>
<url>http://www.gbean.org</url>

2
assembly/maven.xml
View File

@ -210,6 +210,8 @@
<ant:exclude name="**/junit*.properties"/>
<ant:exclude name="**/*~"/>
<ant:exclude name="**/*.bak"/>
<ant:exclude name="**/activemq-data/**"/>
<ant:exclude name="data"/>
</ant:fileset>
</ant:copy>

2
assembly/pom.xml
View File

@ -97,7 +97,7 @@
</dependency>
<dependency>
<groupId>xbean</groupId>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
</dependency>
<dependency>

2
assembly/project.xml
View File

@ -191,7 +191,7 @@
</dependency>
<dependency>
<groupId>xbean</groupId>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
<version>${xbean_spring_version}</version>
<url>http://www.gbean.org</url>

2
assembly/src/main/descriptors/bin.xml
View File

@ -68,7 +68,7 @@
<include>xstream:xstream</include>
<include>xmlpull:xmlpull</include>
<include>activecluster:activecluster</include>
<include>xbean:xbean-spring</include>
<include>org.apache.xbean:xbean-spring</include>
<include>springframework:spring</include>
<include>commons-dbcp:commons-dbcp</include>
<include>commons-pool:commons-pool</include>

2
assembly/src/release/conf/log4j.properties
View File

@ -4,7 +4,7 @@
log4j.rootLogger=INFO, stdout
log4j.logger.org.apache.activemq.spring=WARN
log4j.logger.org.springframework=WARN
log4j.logger.org.xbean.spring=WARN
log4j.logger.org.apache.xbean.spring=WARN
# When debugging or reporting problems to the ActiveMQ team,
# comment out the above lines and uncomment the next.

2
etc/project.properties
View File

@ -95,7 +95,7 @@ xmlbeans_version=1.0-DEV
<!-- used by spring module -->
spring_version=1.2.4
xbean_spring_version=2.1
xbean_spring_version=2.2-SNAPSHOT
<!-- used by store-bdb module -->
berkeleydb_version=1.5.1

4
pom.xml
View File

@ -200,9 +200,9 @@
<!-- =============================== -->
<!-- for custom XML parsing -->
<dependency>
<groupId>xbean</groupId>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
<version>2.1</version>
<version>2.2-SNAPSHOT</version>
</dependency>
<!-- Used to configure the activemq logs -->