activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1406852 - in /activemq/trunk: activemq-broker/ activemq-broker/src/main/java/org/apache/activemq/network/jms/ activemq-broker/src/main/java/org/apache/activemq/security/ activemq-broker/src/main/java/org/apache/activemq/spring/ activemq-br...
Date Wed, 07 Nov 2012 22:53:43 GMT
Author: chirino
Date: Wed Nov  7 22:53:41 2012
New Revision: 1406852

URL: http://svn.apache.org/viewvc?rev=1406852&view=rev
Log:
Removed all un-needed dependencies from the activemq-broker pom.  Moved the remaining spring support classes into activemq-spring.

Added:
    activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/jms/JndiLookupFactory.java
      - copied, changed from r1406814, activemq/trunk/activemq-jdbc-store/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java
    activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/jms/SimpleJmsQueueConnector.java
      - copied, changed from r1406814, activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/jms/JmsQueueConnector.java
    activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/jms/SimpleJmsTopicConnector.java
      - copied, changed from r1406814, activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/jms/JmsTopicConnector.java
    activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/security/SimpleCachedLDAPAuthorizationMap.java
      - copied, changed from r1406814, activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/security/CachedLDAPAuthorizationMap.java
    activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/network/
    activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/network/jms/
    activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/network/jms/JmsQueueConnector.java
      - copied, changed from r1406814, activemq/trunk/activemq-jdbc-store/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java
    activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/network/jms/JmsTopicConnector.java
      - copied, changed from r1406814, activemq/trunk/activemq-jdbc-store/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java
    activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/network/jms/JndiTemplateLookupFactory.java
      - copied, changed from r1406814, activemq/trunk/activemq-jdbc-store/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java
    activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/security/
    activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/security/CachedLDAPAuthorizationMap.java
    activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/spring/SpringBrokerContext.java
      - copied, changed from r1406814, activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/spring/SpringBrokerContext.java
    activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/spring/SpringSslContext.java
      - copied, changed from r1406814, activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/spring/SpringSslContext.java
    activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/spring/Utils.java
      - copied, changed from r1406814, activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/spring/Utils.java
    activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/store/
    activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java
      - copied, changed from r1406814, activemq/trunk/activemq-jdbc-store/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java
    activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/xbean/BrokerFactoryBean.java
      - copied, changed from r1406814, activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/xbean/BrokerFactoryBean.java
    activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/xbean/XBeanBrokerFactory.java
      - copied, changed from r1406814, activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/xbean/XBeanBrokerFactory.java
    activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java
      - copied, changed from r1406814, activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java
    activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/xbean/package.html
      - copied, changed from r1406814, activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/xbean/package.html
Removed:
    activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/jms/JmsQueueConnector.java
    activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/jms/JmsTopicConnector.java
    activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/security/CachedLDAPAuthorizationMap.java
    activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/spring/SpringBrokerContext.java
    activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/spring/SpringSslContext.java
    activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/spring/Utils.java
    activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/xbean/BrokerFactoryBean.java
    activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/xbean/XBeanBrokerFactory.java
    activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java
    activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/xbean/package.html
    activemq/trunk/activemq-jdbc-store/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java
Modified:
    activemq/trunk/activemq-broker/pom.xml
    activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/jms/JmsConnector.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/jms/QueueBridgeStandaloneReconnectTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/jms/QueueOutboundBridgeReconnectTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/jms/TopicBridgeStandaloneReconnectTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/jms/TopicOutboundBridgeReconnectTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/AbstractCachedLDAPAuthorizationMapLegacyTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/AbstractCachedLDAPAuthorizationModuleTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleLegacyOpenLDAPTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleLegacyTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleOpenLDAPTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleTest.java
    activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/jms/queue-config.xml
    activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/jms/topic-config.xml
    activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/jms/topic-spring.xml
    activemq/trunk/activemq-spring/pom.xml

Modified: activemq/trunk/activemq-broker/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/pom.xml?rev=1406852&r1=1406851&r2=1406852&view=diff
==============================================================================
--- activemq/trunk/activemq-broker/pom.xml (original)
+++ activemq/trunk/activemq-broker/pom.xml Wed Nov  7 22:53:41 2012
@@ -39,30 +39,12 @@
     <!-- Required Dependencies -->
     <!-- =============================== -->
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jms_1.1_spec</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>activeio-core</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.activemq.protobuf</groupId>
-      <artifactId>activemq-protobuf</artifactId>
-      <optional>false</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.fusesource.mqtt-client</groupId>
-      <artifactId>mqtt-client</artifactId>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-client</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-client</artifactId>
+      <artifactId>activemq-openwire-legacy</artifactId>
     </dependency>
 
     <!-- =============================== -->
@@ -80,67 +62,17 @@
       <artifactId>activemq-jaas</artifactId>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-annotation_1.0_spec</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jacc_1.1_spec</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>com.thoughtworks.xstream</groupId>
-      <artifactId>xstream</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-        <groupId>org.codehaus.jettison</groupId>
-        <artifactId>jettison</artifactId>
-        <optional>true</optional>
-    </dependency>
+    <!--<dependency>-->
+      <!--<groupId>org.springframework</groupId>-->
+      <!--<artifactId>spring-context</artifactId>-->
+    <!--</dependency>-->
 
-    <!-- for XML parsing -->
-    <dependency>
-      <groupId>org.apache.xbean</groupId>
-      <artifactId>xbean-spring</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-      <optional>true</optional>
-    </dependency>
+    <!-- to support XPath based Selectors -->
     <dependency>
       <groupId>xalan</groupId>
       <artifactId>xalan</artifactId>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>commons-net</groupId>
-      <artifactId>commons-net</artifactId>
-    </dependency>
-
-    <!-- not really a dependency at all - just added optionally to get the generator working -->
-    <dependency>
-      <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-openwire-generator</artifactId>
-      <optional>true</optional>
-    </dependency>
 
     <!-- =============================== -->
     <!-- Testing Dependencies            -->
@@ -151,122 +83,10 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-all</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-jms</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.jmdns</groupId>
-      <artifactId>jmdns</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.jasypt</groupId>
-      <artifactId>jasypt</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jasypt</groupId>
-      <artifactId>jasypt-spring3</artifactId>
-      <version>${jasypt-version}</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty-util</artifactId>
-      <version>6.1.26</version>
-      <scope>test</scope>
-    </dependency>
-    
-    <!-- database testing -->
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-primitives</groupId>
-      <artifactId>commons-primitives</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>axion</groupId>
-      <artifactId>axion</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>regexp</groupId>
-      <artifactId>regexp</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <!--  Joram JMS conformance tests -->
-    <dependency>
-      <groupId>org.fusesource.joram-jms-tests</groupId>
-      <artifactId>joram-jms-tests</artifactId>
-      <version>1.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <!-- using it for Jetty's JNDI context to work /w Joram tests. -->
-      <groupId>org.eclipse.jetty.aggregate</groupId>
-      <artifactId>jetty-all-server</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <!--  LDAP tests -->
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-core-integ</artifactId>
-      <version>${directory-version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-server-integ</artifactId>
-      <version>${directory-version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jmock</groupId>
-      <artifactId>jmock-junit4</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jmock</groupId>
-      <artifactId>jmock-legacy</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.ftpserver</groupId>
-      <artifactId>ftpserver-core</artifactId>
-      <version>${ftpserver-version}</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <reporting>
@@ -354,52 +174,6 @@
   </reporting>
 
   <build>
-    <resources>
-      <resource>
-        <directory>${project.basedir}/src/main/resources</directory>
-        <includes>
-          <include>**/*</include>
-        </includes>
-      </resource>
-      <resource>
-        <directory>${project.basedir}/src/main/filtered-resources</directory>
-        <filtering>true</filtering>
-        <includes>
-          <include>**/*</include>
-        </includes>
-      </resource>
-    </resources>
-
-    <pluginManagement>
-      <plugins>
-        <!--This plugin's configuration is used to store Eclipse m2e settings only.
-            It has no influence on the Maven build itself.-->
-        <plugin>
-          <groupId>org.eclipse.m2e</groupId>
-          <artifactId>lifecycle-mapping</artifactId>
-          <version>1.0.0</version>
-          <configuration>
-            <lifecycleMappingMetadata>
-              <pluginExecutions>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.apache.activemq.protobuf</groupId>
-                    <artifactId>activemq-protobuf</artifactId>
-                    <versionRange>[0.0.0,)</versionRange>
-                    <goals>
-                      <goal>compile</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore />
-                  </action>
-                </pluginExecution>
-              </pluginExecutions>
-            </lifecycleMappingMetadata>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
     <plugins>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -430,18 +204,6 @@
            </includes>
         </configuration>
       </plugin>
-
-      <plugin>
-        <groupId>org.apache.activemq.protobuf</groupId>
-        <artifactId>activemq-protobuf</artifactId>
-         <executions>
-          <execution>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-clean-plugin</artifactId>
@@ -453,52 +215,6 @@
           </filesets>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-          <id>package</id>
-          <phase>package</phase>
-          <configuration>
-            <tasks>
-              <echo>Deleting unwanted resources from the test-jar</echo>
-              <delete dir="${project.build.directory}/test-classes" verbose="true">
-                <include name="*.*" />
-              </delete>
-            </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>site</id>
-            <phase>site</phase>
-            <configuration>
-              <tasks>
-                <echo>Running the XSDDoc task</echo>
-                <taskdef name="xsddoc" classname="net.sf.xframe.xsddoc.Task" />
-                <mkdir dir="${basedir}/target/site/xsddoc" />
-                <xsddoc file="${basedir}/target/classes/activemq.xsd" out="${basedir}/target/site/xsddoc" doctitle="Apache ActiveMQ XML Schema Reference" header="&lt;a href='http://activemq.apache.org/'&gt;Apache ActiveMQ&lt;/a&gt;" footer="Copyright 2005-2012 (c) the &lt;a href='http://www.apache.org/'&gt;Apache Software Foundation&lt;/a&gt;" verbose="false" />
-                <!--
-                        css="${basedir}/../etc/css/stylesheet.css"
-                -->
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-        <dependencies>
-          <dependency>
-            <groupId>xsddoc</groupId>
-            <artifactId>maven-xsddoc-plugin</artifactId>
-            <version>1.0</version>
-          </dependency>
-        </dependencies>
-      </plugin>
       <!-- generate the attached tests jar -->
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
@@ -510,19 +226,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>cobertura-maven-plugin</artifactId>
-        <configuration>
-      <check>
-            <branchRate>50</branchRate>
-            <lineRate>50</lineRate>
-            <haltOnFailure>true</haltOnFailure>
-            <totalBranchRate>50</totalBranchRate>
-            <totalLineRate>50</totalLineRate>
-          </check>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
   <profiles>

Modified: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/jms/JmsConnector.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/jms/JmsConnector.java?rev=1406852&r1=1406851&r2=1406852&view=diff
==============================================================================
--- activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/jms/JmsConnector.java (original)
+++ activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/jms/JmsConnector.java Wed Nov  7 22:53:41 2012
@@ -38,7 +38,6 @@ import org.apache.activemq.util.LRUCache
 import org.apache.activemq.util.ThreadPoolUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.jndi.JndiTemplate;
 
 /**
  * This bridge joins the gap between foreign JMS providers and ActiveMQ As some
@@ -51,8 +50,8 @@ public abstract class JmsConnector imple
     private static final Logger LOG = LoggerFactory.getLogger(JmsConnector.class);
 
     protected boolean preferJndiDestinationLookup = false;
-    protected JndiTemplate jndiLocalTemplate;
-    protected JndiTemplate jndiOutboundTemplate;
+    protected JndiLookupFactory jndiLocalTemplate;
+    protected JndiLookupFactory jndiOutboundTemplate;
     protected JmsMesageConvertor inboundMessageConvertor;
     protected JmsMesageConvertor outboundMessageConvertor;
     protected AtomicBoolean initialized = new AtomicBoolean(false);
@@ -104,10 +103,10 @@ public abstract class JmsConnector imple
         boolean result = initialized.compareAndSet(false, true);
         if (result) {
             if (jndiLocalTemplate == null) {
-                jndiLocalTemplate = new JndiTemplate();
+                jndiLocalTemplate = new JndiLookupFactory();
             }
             if (jndiOutboundTemplate == null) {
-                jndiOutboundTemplate = new JndiTemplate();
+                jndiOutboundTemplate = new JndiLookupFactory();
             }
             if (inboundMessageConvertor == null) {
                 inboundMessageConvertor = new SimpleJmsMessageConvertor();
@@ -210,28 +209,28 @@ public abstract class JmsConnector imple
     /**
      * @return Returns the jndiTemplate.
      */
-    public JndiTemplate getJndiLocalTemplate() {
+    public JndiLookupFactory getJndiLocalTemplate() {
         return jndiLocalTemplate;
     }
 
     /**
      * @param jndiTemplate The jndiTemplate to set.
      */
-    public void setJndiLocalTemplate(JndiTemplate jndiTemplate) {
+    public void setJndiLocalTemplate(JndiLookupFactory jndiTemplate) {
         this.jndiLocalTemplate = jndiTemplate;
     }
 
     /**
      * @return Returns the jndiOutboundTemplate.
      */
-    public JndiTemplate getJndiOutboundTemplate() {
+    public JndiLookupFactory getJndiOutboundTemplate() {
         return jndiOutboundTemplate;
     }
 
     /**
      * @param jndiOutboundTemplate The jndiOutboundTemplate to set.
      */
-    public void setJndiOutboundTemplate(JndiTemplate jndiOutboundTemplate) {
+    public void setJndiOutboundTemplate(JndiLookupFactory jndiOutboundTemplate) {
         this.jndiOutboundTemplate = jndiOutboundTemplate;
     }
 

Copied: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/jms/JndiLookupFactory.java (from r1406814, activemq/trunk/activemq-jdbc-store/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/jms/JndiLookupFactory.java?p2=activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/jms/JndiLookupFactory.java&p1=activemq/trunk/activemq-jdbc-store/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java&r1=1406814&r2=1406852&rev=1406852&view=diff
==============================================================================
--- activemq/trunk/activemq-jdbc-store/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java (original)
+++ activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/jms/JndiLookupFactory.java Wed Nov  7 22:53:41 2012
@@ -14,35 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.store;
+package org.apache.activemq.network.jms;
 
-import org.apache.activemq.store.journal.JournalPersistenceAdapterFactory;
-import org.springframework.beans.factory.FactoryBean;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
 
 /**
- * Creates a default persistence model using the Journal and JDBC
- * 
- * @org.apache.xbean.XBean element="journaledJDBC"
- * 
- * 
+ * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-public class PersistenceAdapterFactoryBean extends JournalPersistenceAdapterFactory implements FactoryBean {
+public class JndiLookupFactory {
 
-    private PersistenceAdapter persistenceAdaptor;
-
-    public Object getObject() throws Exception {
-        if (persistenceAdaptor == null) {
-            persistenceAdaptor = createPersistenceAdapter();
+    public <T> T lookup(String name, Class<T> clazz) throws NamingException  {
+        InitialContext ctx = new InitialContext();
+        try {
+            return clazz.cast(ctx.lookup(name));
+        } finally {
+            ctx.close();
         }
-        return persistenceAdaptor;
-    }
-
-    public Class getObjectType() {
-        return PersistenceAdapter.class;
     }
-
-    public boolean isSingleton() {
-        return false;
-    }
-
 }

Copied: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/jms/SimpleJmsQueueConnector.java (from r1406814, activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/jms/JmsQueueConnector.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/jms/SimpleJmsQueueConnector.java?p2=activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/jms/SimpleJmsQueueConnector.java&p1=activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/jms/JmsQueueConnector.java&r1=1406814&r2=1406852&rev=1406852&view=diff
==============================================================================
--- activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/jms/JmsQueueConnector.java (original)
+++ activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/jms/SimpleJmsQueueConnector.java Wed Nov  7 22:53:41 2012
@@ -31,12 +31,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * A Bridge to other JMS Queue providers
- *
- * @org.apache.xbean.XBean
  */
-public class JmsQueueConnector extends JmsConnector {
-    private static final Logger LOG = LoggerFactory.getLogger(JmsQueueConnector.class);
+public class SimpleJmsQueueConnector extends JmsConnector {
+    private static final Logger LOG = LoggerFactory.getLogger(SimpleJmsQueueConnector.class);
     private String outboundQueueConnectionFactoryName;
     private String localConnectionFactoryName;
     private QueueConnectionFactory outboundQueueConnectionFactory;

Copied: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/jms/SimpleJmsTopicConnector.java (from r1406814, activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/jms/JmsTopicConnector.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/jms/SimpleJmsTopicConnector.java?p2=activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/jms/SimpleJmsTopicConnector.java&p1=activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/jms/JmsTopicConnector.java&r1=1406814&r2=1406852&rev=1406852&view=diff
==============================================================================
--- activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/jms/JmsTopicConnector.java (original)
+++ activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/network/jms/SimpleJmsTopicConnector.java Wed Nov  7 22:53:41 2012
@@ -32,11 +32,9 @@ import org.slf4j.LoggerFactory;
 
 /**
  * A Bridge to other JMS Topic providers
- *
- * @org.apache.xbean.XBean
  */
-public class JmsTopicConnector extends JmsConnector {
-    private static final Logger LOG = LoggerFactory.getLogger(JmsTopicConnector.class);
+public class SimpleJmsTopicConnector extends JmsConnector {
+    private static final Logger LOG = LoggerFactory.getLogger(SimpleJmsTopicConnector.class);
     private String outboundTopicConnectionFactoryName;
     private String localConnectionFactoryName;
     private TopicConnectionFactory outboundTopicConnectionFactory;

Copied: activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/security/SimpleCachedLDAPAuthorizationMap.java (from r1406814, activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/security/CachedLDAPAuthorizationMap.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/security/SimpleCachedLDAPAuthorizationMap.java?p2=activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/security/SimpleCachedLDAPAuthorizationMap.java&p1=activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/security/CachedLDAPAuthorizationMap.java&r1=1406814&r2=1406852&rev=1406852&view=diff
==============================================================================
--- activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/security/CachedLDAPAuthorizationMap.java (original)
+++ activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/security/SimpleCachedLDAPAuthorizationMap.java Wed Nov  7 22:53:41 2012
@@ -24,30 +24,19 @@ import org.apache.activemq.jaas.GroupPri
 import org.apache.activemq.jaas.UserPrincipal;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.InitializingBean;
 
-import javax.naming.Binding;
-import javax.naming.Context;
-import javax.naming.InvalidNameException;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
+import javax.naming.*;
 import javax.naming.directory.*;
 import javax.naming.event.*;
 import javax.naming.ldap.LdapName;
 import javax.naming.ldap.Rdn;
-
 import java.util.*;
 
 /**
- * A {@link DefaultAuthorizationMap} implementation which uses LDAP to initialize and update authorization
- * policy.
- *
- * @org.apache.xbean.XBean
  */
-public class CachedLDAPAuthorizationMap extends DefaultAuthorizationMap implements InitializingBean, DisposableBean {
+public class SimpleCachedLDAPAuthorizationMap extends DefaultAuthorizationMap {
 
-    private static final Logger LOG = LoggerFactory.getLogger(CachedLDAPAuthorizationMap.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SimpleCachedLDAPAuthorizationMap.class);
 
     // Configuration Options
     private String initialContextFactory = "com.sun.jndi.ldap.LdapCtxFactory";
@@ -876,21 +865,18 @@ public class CachedLDAPAuthorizationMap 
         context = null;
         LOG.error("Caught unexpected exception.", namingExceptionEvent.getException());
     }
-    
+
     // Init / Destroy
-    
-    @Override
     public void afterPropertiesSet() throws Exception {
         query();
     }
-    
-    @Override
+
     public void destroy() throws Exception {
         if (eventContext != null) {
             eventContext.close();
             eventContext = null;
         }
-        
+
         if (context != null) {
             context.close();
             context = null;
@@ -1112,7 +1098,7 @@ public class CachedLDAPAuthorizationMap 
 
         @Override
         public void namingExceptionThrown(NamingExceptionEvent evt) {
-            CachedLDAPAuthorizationMap.this.namingExceptionThrown(evt);
+            SimpleCachedLDAPAuthorizationMap.this.namingExceptionThrown(evt);
         }
 
         @Override
@@ -1120,7 +1106,7 @@ public class CachedLDAPAuthorizationMap 
             // This test is a hack to work around the fact that Apache DS 2.0 seems to trigger notifications
             // for the entire sub-tree even when one-level is the selected search scope.
             if (permissionType != null) {
-                CachedLDAPAuthorizationMap.this.objectAdded(evt, destinationType, permissionType);
+                SimpleCachedLDAPAuthorizationMap.this.objectAdded(evt, destinationType, permissionType);
             }
         }
 
@@ -1129,13 +1115,13 @@ public class CachedLDAPAuthorizationMap 
             // This test is a hack to work around the fact that Apache DS 2.0 seems to trigger notifications
             // for the entire sub-tree even when one-level is the selected search scope.
             if (permissionType != null) {
-                CachedLDAPAuthorizationMap.this.objectRemoved(evt, destinationType, permissionType);
+                SimpleCachedLDAPAuthorizationMap.this.objectRemoved(evt, destinationType, permissionType);
             }
         }
 
         @Override
         public void objectRenamed(NamingEvent evt) {
-            CachedLDAPAuthorizationMap.this.objectRenamed(evt, destinationType, permissionType);
+            SimpleCachedLDAPAuthorizationMap.this.objectRenamed(evt, destinationType, permissionType);
         }
 
         @Override
@@ -1143,7 +1129,7 @@ public class CachedLDAPAuthorizationMap 
             // This test is a hack to work around the fact that Apache DS 2.0 seems to trigger notifications
             // for the entire sub-tree even when one-level is the selected search scope.
             if (permissionType != null) {
-                CachedLDAPAuthorizationMap.this.objectChanged(evt, destinationType, permissionType);
+                SimpleCachedLDAPAuthorizationMap.this.objectChanged(evt, destinationType, permissionType);
             }
         }
     }

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/jms/QueueBridgeStandaloneReconnectTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/jms/QueueBridgeStandaloneReconnectTest.java?rev=1406852&r1=1406851&r2=1406852&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/jms/QueueBridgeStandaloneReconnectTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/jms/QueueBridgeStandaloneReconnectTest.java Wed Nov  7 22:53:41 2012
@@ -36,7 +36,7 @@ public class QueueBridgeStandaloneReconn
 
     private static final Logger LOG = LoggerFactory.getLogger(QueueBridgeStandaloneReconnectTest.class);
 
-    private JmsQueueConnector jmsQueueConnector;
+    private SimpleJmsQueueConnector jmsQueueConnector;
 
     private BrokerService localBroker;
     private BrokerService foreignBroker;
@@ -206,7 +206,7 @@ public class QueueBridgeStandaloneReconn
         outbound = new ActiveMQQueue("RECONNECT.TEST.OUT.QUEUE");
         inbound = new ActiveMQQueue("RECONNECT.TEST.IN.QUEUE");
 
-        jmsQueueConnector = new JmsQueueConnector();
+        jmsQueueConnector = new SimpleJmsQueueConnector();
 
         // Wire the bridges.
         jmsQueueConnector.setOutboundQueueBridges(

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/jms/QueueOutboundBridgeReconnectTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/jms/QueueOutboundBridgeReconnectTest.java?rev=1406852&r1=1406851&r2=1406852&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/jms/QueueOutboundBridgeReconnectTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/jms/QueueOutboundBridgeReconnectTest.java Wed Nov  7 22:53:41 2012
@@ -279,7 +279,7 @@ public class QueueOutboundBridgeReconnec
         broker.addConnector("tcp://localhost:61616");
         broker.addConnector("vm://broker1");
 
-        JmsQueueConnector jmsQueueConnector = new JmsQueueConnector();
+        SimpleJmsQueueConnector jmsQueueConnector = new SimpleJmsQueueConnector();
         jmsQueueConnector.setOutboundQueueBridges(
             new OutboundQueueBridge[] {new OutboundQueueBridge("RECONNECT.TEST.QUEUE")});
         jmsQueueConnector.setOutboundQueueConnectionFactory(

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/jms/TopicBridgeStandaloneReconnectTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/jms/TopicBridgeStandaloneReconnectTest.java?rev=1406852&r1=1406851&r2=1406852&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/jms/TopicBridgeStandaloneReconnectTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/jms/TopicBridgeStandaloneReconnectTest.java Wed Nov  7 22:53:41 2012
@@ -36,7 +36,7 @@ public class TopicBridgeStandaloneReconn
 
     private static final Logger LOG = LoggerFactory.getLogger(TopicBridgeStandaloneReconnectTest.class);
 
-    private JmsTopicConnector jmsTopicConnector;
+    private SimpleJmsTopicConnector jmsTopicConnector;
 
     private BrokerService localBroker;
     private BrokerService foreignBroker;
@@ -203,7 +203,7 @@ public class TopicBridgeStandaloneReconn
         outbound = new ActiveMQTopic("RECONNECT.TEST.OUT.TOPIC");
         inbound = new ActiveMQTopic("RECONNECT.TEST.IN.TOPIC");
 
-        jmsTopicConnector = new JmsTopicConnector();
+        jmsTopicConnector = new SimpleJmsTopicConnector();
 
         // Wire the bridges.
         jmsTopicConnector.setOutboundTopicBridges(

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/jms/TopicOutboundBridgeReconnectTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/jms/TopicOutboundBridgeReconnectTest.java?rev=1406852&r1=1406851&r2=1406852&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/jms/TopicOutboundBridgeReconnectTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/jms/TopicOutboundBridgeReconnectTest.java Wed Nov  7 22:53:41 2012
@@ -268,7 +268,7 @@ public class TopicOutboundBridgeReconnec
         broker.addConnector("tcp://localhost:61616");
         broker.addConnector("vm://broker1");
 
-        JmsTopicConnector jmsTopicConnector = new JmsTopicConnector();
+        SimpleJmsTopicConnector jmsTopicConnector = new SimpleJmsTopicConnector();
         jmsTopicConnector.setOutboundTopicBridges(
             new OutboundTopicBridge[] {new OutboundTopicBridge("RECONNECT.TEST.TOPIC")});
         jmsTopicConnector.setOutboundTopicConnectionFactory(

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/AbstractCachedLDAPAuthorizationMapLegacyTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/AbstractCachedLDAPAuthorizationMapLegacyTest.java?rev=1406852&r1=1406851&r2=1406852&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/AbstractCachedLDAPAuthorizationMapLegacyTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/AbstractCachedLDAPAuthorizationMapLegacyTest.java Wed Nov  7 22:53:41 2012
@@ -57,7 +57,7 @@ public abstract class AbstractCachedLDAP
     static final GroupPrincipal ADMINS = new GroupPrincipal("admins");
     
     protected LdapConnection connection;
-    protected CachedLDAPAuthorizationMap map;
+    protected SimpleCachedLDAPAuthorizationMap map;
     
     @Before
     public void setup() throws Exception {
@@ -334,8 +334,8 @@ public abstract class AbstractCachedLDAP
         assertEquals("set size: " + failedACLs, 2, failedACLs.size());
     }
     
-    protected CachedLDAPAuthorizationMap createMap() {
-        return new CachedLDAPAuthorizationMap();
+    protected SimpleCachedLDAPAuthorizationMap createMap() {
+        return new SimpleCachedLDAPAuthorizationMap();
     }
     
     protected abstract InputStream getAddLdif();

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/AbstractCachedLDAPAuthorizationModuleTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/AbstractCachedLDAPAuthorizationModuleTest.java?rev=1406852&r1=1406851&r2=1406852&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/AbstractCachedLDAPAuthorizationModuleTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/AbstractCachedLDAPAuthorizationModuleTest.java Wed Nov  7 22:53:41 2012
@@ -54,8 +54,8 @@ public abstract class AbstractCachedLDAP
     protected abstract String getMemberAttributeValueForModifyRequest();
 
     @Override
-    protected CachedLDAPAuthorizationMap createMap() {
-        CachedLDAPAuthorizationMap map = super.createMap();
+    protected SimpleCachedLDAPAuthorizationMap createMap() {
+        SimpleCachedLDAPAuthorizationMap map = super.createMap();
         map.setLegacyGroupMapping(false);
         return map;
     }

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleLegacyOpenLDAPTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleLegacyOpenLDAPTest.java?rev=1406852&r1=1406851&r2=1406852&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleLegacyOpenLDAPTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleLegacyOpenLDAPTest.java Wed Nov  7 22:53:41 2012
@@ -28,7 +28,7 @@ import org.junit.Ignore;
 import org.junit.Test;
 
 /**
- * Test of the {@link CachedLDAPAuthorizationMap} that tests against a basic OpenLDAP instance.
+ * Test of the {@link SimpleCachedLDAPAuthorizationMap} that tests against a basic OpenLDAP instance.
  * Disabled by default because it requires external setup to provide the OpenLDAP instance.
  * 
  * To enable, you need an OpenLDAP with a minimum of the following in the slapd.conf file: 
@@ -64,8 +64,8 @@ public class CachedLDAPAuthorizationModu
         // Subtree rename not implemented by OpenLDAP.
     }
     
-    protected CachedLDAPAuthorizationMap createMap() {
-        CachedLDAPAuthorizationMap newMap = super.createMap();
+    protected SimpleCachedLDAPAuthorizationMap createMap() {
+        SimpleCachedLDAPAuthorizationMap newMap = super.createMap();
         newMap.setConnectionURL("ldap://" + LDAP_HOST + ":" + String.valueOf(LDAP_PORT));
         newMap.setConnectionUsername(LDAP_USER);
         newMap.setConnectionPassword(LDAP_PASS);

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleLegacyTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleLegacyTest.java?rev=1406852&r1=1406851&r2=1406852&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleLegacyTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleLegacyTest.java Wed Nov  7 22:53:41 2012
@@ -38,8 +38,8 @@ import java.io.InputStream;
 public class CachedLDAPAuthorizationModuleLegacyTest extends AbstractCachedLDAPAuthorizationMapLegacyTest {
 
     @Override
-    protected CachedLDAPAuthorizationMap createMap() {
-        CachedLDAPAuthorizationMap map = super.createMap();
+    protected SimpleCachedLDAPAuthorizationMap createMap() {
+        SimpleCachedLDAPAuthorizationMap map = super.createMap();
         map.setConnectionURL("ldap://localhost:" + getLdapServer().getPort());
         return map;
     }

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleOpenLDAPTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleOpenLDAPTest.java?rev=1406852&r1=1406851&r2=1406852&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleOpenLDAPTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleOpenLDAPTest.java Wed Nov  7 22:53:41 2012
@@ -28,7 +28,7 @@ import java.io.IOException;
 import java.io.InputStream;
 
 /**
- * Test of the {@link CachedLDAPAuthorizationMap} that tests against a basic OpenLDAP instance.
+ * Test of the {@link SimpleCachedLDAPAuthorizationMap} that tests against a basic OpenLDAP instance.
  * Disabled by default because it requires external setup to provide the OpenLDAP instance.
  * 
  * To enable, you need an OpenLDAP with a minimum of the following in the slapd.conf file: 
@@ -64,8 +64,8 @@ public class CachedLDAPAuthorizationModu
     }
     
     @Override
-    protected CachedLDAPAuthorizationMap createMap() {
-        CachedLDAPAuthorizationMap newMap = super.createMap();
+    protected SimpleCachedLDAPAuthorizationMap createMap() {
+        SimpleCachedLDAPAuthorizationMap newMap = super.createMap();
         newMap.setConnectionURL("ldap://" + LDAP_HOST + ":" + String.valueOf(LDAP_PORT));
         newMap.setConnectionUsername(LDAP_USER);
         newMap.setConnectionPassword(LDAP_PASS);

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleTest.java?rev=1406852&r1=1406851&r2=1406852&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/security/CachedLDAPAuthorizationModuleTest.java Wed Nov  7 22:53:41 2012
@@ -36,8 +36,8 @@ import java.io.InputStream;
 public class CachedLDAPAuthorizationModuleTest extends AbstractCachedLDAPAuthorizationModuleTest {
 
     @Override
-    protected CachedLDAPAuthorizationMap createMap() {
-        CachedLDAPAuthorizationMap map = super.createMap();
+    protected SimpleCachedLDAPAuthorizationMap createMap() {
+        SimpleCachedLDAPAuthorizationMap map = super.createMap();
         map.setConnectionURL("ldap://localhost:" + getLdapServer().getPort());
         return map;
     }

Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/jms/queue-config.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/jms/queue-config.xml?rev=1406852&r1=1406851&r2=1406852&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/jms/queue-config.xml (original)
+++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/jms/queue-config.xml Wed Nov  7 22:53:41 2012
@@ -65,7 +65,7 @@
   
   <!--JmsQueueConnector - the Jms bridge -->
   <bean id="jmsConnector"
-  	class="org.apache.activemq.network.jms.JmsQueueConnector">
+  	class="org.apache.activemq.network.jms.SimpleJmsQueueConnector">
   	<property name = "outboundQueueConnectionFactory" ref = "remoteFactory"/>
   	
   	<property name = "inboundQueueBridges">

Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/jms/topic-config.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/jms/topic-config.xml?rev=1406852&r1=1406851&r2=1406852&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/jms/topic-config.xml (original)
+++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/jms/topic-config.xml Wed Nov  7 22:53:41 2012
@@ -65,7 +65,7 @@
   
   <!--JmsTopicConnector - the Jms bridge -->
   <bean id="jmsConnector"
-  	class="org.apache.activemq.network.jms.JmsTopicConnector">
+  	class="org.apache.activemq.network.jms.SimpleJmsTopicConnector">
   	<property name = "outboundTopicConnectionFactory" ref = "remoteFactory"/>
   	
   	<property name = "inboundTopicBridges">

Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/jms/topic-spring.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/jms/topic-spring.xml?rev=1406852&r1=1406851&r2=1406852&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/jms/topic-spring.xml (original)
+++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/jms/topic-spring.xml Wed Nov  7 22:53:41 2012
@@ -65,7 +65,7 @@
   
   <!--JmsTopicConnector - the Jms bridge -->
   <bean id="jmsConnector"
-  	class="org.apache.activemq.network.jms.JmsTopicConnector">
+  	class="org.apache.activemq.network.jms.SimpleJmsTopicConnector">
   	<property name = "outboundTopicConnectionFactory" ref = "remoteFactory"/>
   	
   	<property name = "inboundTopicBridges">

Modified: activemq/trunk/activemq-spring/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/pom.xml?rev=1406852&r1=1406851&r2=1406852&view=diff
==============================================================================
--- activemq/trunk/activemq-spring/pom.xml (original)
+++ activemq/trunk/activemq-spring/pom.xml Wed Nov  7 22:53:41 2012
@@ -38,6 +38,9 @@
       *
     </activemq.osgi.import.pkg>
     <activemq.osgi.export>
+      org.apache.activemq.store*;version=${project.version};-noimport:=;-split-package:=merge-last,
+      org.apache.activemq.security*;version=${project.version};-noimport:=;-split-package:=merge-last,
+      org.apache.activemq.network*;version=${project.version};-noimport:=;-split-package:=merge-last,
       org.apache.activemq.spring*;version=${project.version};-noimport:=;-split-package:=merge-last,
       org.apache.activemq.pool*;version=${project.version};-noimport:=;-split-package:=merge-last,
       org.apache.activemq.xbean*;version=${project.version};-noimport:=true;-split-package:=merge-last,
@@ -55,6 +58,11 @@
       <artifactId>slf4j-api</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.apache.xbean</groupId>
+      <artifactId>xbean-spring</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-broker</artifactId>
     </dependency>
@@ -135,11 +143,6 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-    	<groupId>org.apache.xbean</groupId>
-    	<artifactId>xbean-spring</artifactId>
-    	<scope>test</scope>
-    </dependency>
-    <dependency>
     	<groupId>log4j</groupId>
     	<artifactId>log4j</artifactId>
     	<scope>test</scope>

Copied: activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/network/jms/JmsQueueConnector.java (from r1406814, activemq/trunk/activemq-jdbc-store/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/network/jms/JmsQueueConnector.java?p2=activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/network/jms/JmsQueueConnector.java&p1=activemq/trunk/activemq-jdbc-store/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java&r1=1406814&r2=1406852&rev=1406852&view=diff
==============================================================================
--- activemq/trunk/activemq-jdbc-store/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java (original)
+++ activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/network/jms/JmsQueueConnector.java Wed Nov  7 22:53:41 2012
@@ -14,35 +14,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.store;
+package org.apache.activemq.network.jms;
 
-import org.apache.activemq.store.journal.JournalPersistenceAdapterFactory;
-import org.springframework.beans.factory.FactoryBean;
+import org.springframework.jndi.JndiTemplate;
 
 /**
- * Creates a default persistence model using the Journal and JDBC
- * 
- * @org.apache.xbean.XBean element="journaledJDBC"
- * 
- * 
+ * A Bridge to other JMS Queue providers
+ *
+ * @org.apache.xbean.XBean
+ * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-public class PersistenceAdapterFactoryBean extends JournalPersistenceAdapterFactory implements FactoryBean {
-
-    private PersistenceAdapter persistenceAdaptor;
-
-    public Object getObject() throws Exception {
-        if (persistenceAdaptor == null) {
-            persistenceAdaptor = createPersistenceAdapter();
-        }
-        return persistenceAdaptor;
-    }
-
-    public Class getObjectType() {
-        return PersistenceAdapter.class;
+public class JmsQueueConnector extends SimpleJmsQueueConnector {
+    public void setJndiLocalTemplate(JndiTemplate template) {
+        super.setJndiLocalTemplate(new JndiTemplateLookupFactory(template));
     }
 
-    public boolean isSingleton() {
-        return false;
+    public void setJndiOutboundTemplate(JndiTemplate template) {
+        super.setJndiOutboundTemplate(new JndiTemplateLookupFactory(template));
     }
 
 }

Copied: activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/network/jms/JmsTopicConnector.java (from r1406814, activemq/trunk/activemq-jdbc-store/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/network/jms/JmsTopicConnector.java?p2=activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/network/jms/JmsTopicConnector.java&p1=activemq/trunk/activemq-jdbc-store/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java&r1=1406814&r2=1406852&rev=1406852&view=diff
==============================================================================
--- activemq/trunk/activemq-jdbc-store/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java (original)
+++ activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/network/jms/JmsTopicConnector.java Wed Nov  7 22:53:41 2012
@@ -14,35 +14,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.store;
+package org.apache.activemq.network.jms;
 
-import org.apache.activemq.store.journal.JournalPersistenceAdapterFactory;
-import org.springframework.beans.factory.FactoryBean;
+import org.springframework.jndi.JndiTemplate;
 
 /**
- * Creates a default persistence model using the Journal and JDBC
- * 
- * @org.apache.xbean.XBean element="journaledJDBC"
- * 
- * 
+ * A Bridge to other JMS Topic providers
+ *
+ * @org.apache.xbean.XBean
+ * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
  */
-public class PersistenceAdapterFactoryBean extends JournalPersistenceAdapterFactory implements FactoryBean {
+public class JmsTopicConnector extends SimpleJmsTopicConnector {
 
-    private PersistenceAdapter persistenceAdaptor;
-
-    public Object getObject() throws Exception {
-        if (persistenceAdaptor == null) {
-            persistenceAdaptor = createPersistenceAdapter();
-        }
-        return persistenceAdaptor;
-    }
-
-    public Class getObjectType() {
-        return PersistenceAdapter.class;
+    public void setJndiLocalTemplate(JndiTemplate template) {
+        super.setJndiLocalTemplate(new JndiTemplateLookupFactory(template));
     }
 
-    public boolean isSingleton() {
-        return false;
+    public void setJndiOutboundTemplate(JndiTemplate template) {
+        super.setJndiOutboundTemplate(new JndiTemplateLookupFactory(template));
     }
-
 }

Copied: activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/network/jms/JndiTemplateLookupFactory.java (from r1406814, activemq/trunk/activemq-jdbc-store/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/network/jms/JndiTemplateLookupFactory.java?p2=activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/network/jms/JndiTemplateLookupFactory.java&p1=activemq/trunk/activemq-jdbc-store/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java&r1=1406814&r2=1406852&rev=1406852&view=diff
==============================================================================
--- activemq/trunk/activemq-jdbc-store/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java (original)
+++ activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/network/jms/JndiTemplateLookupFactory.java Wed Nov  7 22:53:41 2012
@@ -14,35 +14,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.store;
+package org.apache.activemq.network.jms;
 
-import org.apache.activemq.store.journal.JournalPersistenceAdapterFactory;
-import org.springframework.beans.factory.FactoryBean;
+import org.springframework.jndi.JndiTemplate;
 
-/**
- * Creates a default persistence model using the Journal and JDBC
- * 
- * @org.apache.xbean.XBean element="journaledJDBC"
- * 
- * 
- */
-public class PersistenceAdapterFactoryBean extends JournalPersistenceAdapterFactory implements FactoryBean {
-
-    private PersistenceAdapter persistenceAdaptor;
+import javax.naming.NamingException;
 
-    public Object getObject() throws Exception {
-        if (persistenceAdaptor == null) {
-            persistenceAdaptor = createPersistenceAdapter();
-        }
-        return persistenceAdaptor;
-    }
+/**
+* @author <a href="http://hiramchirino.com">Hiram Chirino</a>
+*/
+public class JndiTemplateLookupFactory extends JndiLookupFactory {
+    private final JndiTemplate template;
 
-    public Class getObjectType() {
-        return PersistenceAdapter.class;
+    public JndiTemplateLookupFactory(JndiTemplate template) {
+        this.template = template;
     }
 
-    public boolean isSingleton() {
-        return false;
+    @Override
+    public <T> T lookup(String name, Class<T> clazz) throws NamingException {
+        return template.lookup(name, clazz);
     }
-
 }

Added: activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/security/CachedLDAPAuthorizationMap.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/security/CachedLDAPAuthorizationMap.java?rev=1406852&view=auto
==============================================================================
--- activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/security/CachedLDAPAuthorizationMap.java (added)
+++ activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/security/CachedLDAPAuthorizationMap.java Wed Nov  7 22:53:41 2012
@@ -0,0 +1,26 @@
+package org.apache.activemq.security;
+
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.InitializingBean;
+
+/**
+ * A {@link DefaultAuthorizationMap} implementation which uses LDAP to initialize and update authorization
+ * policy.
+ *
+ * @org.apache.xbean.XBean
+ *
+ * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
+ */
+public class CachedLDAPAuthorizationMap extends SimpleCachedLDAPAuthorizationMap implements InitializingBean, DisposableBean {
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        super.afterPropertiesSet();
+    }
+
+    @Override
+    public void destroy() throws Exception {
+        super.destroy();
+    }
+
+}

Copied: activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/spring/SpringBrokerContext.java (from r1406814, activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/spring/SpringBrokerContext.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/spring/SpringBrokerContext.java?p2=activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/spring/SpringBrokerContext.java&p1=activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/spring/SpringBrokerContext.java&r1=1406814&r2=1406852&rev=1406852&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/spring/SpringSslContext.java (from r1406814, activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/spring/SpringSslContext.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/spring/SpringSslContext.java?p2=activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/spring/SpringSslContext.java&p1=activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/spring/SpringSslContext.java&r1=1406814&r2=1406852&rev=1406852&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/spring/Utils.java (from r1406814, activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/spring/Utils.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/spring/Utils.java?p2=activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/spring/Utils.java&p1=activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/spring/Utils.java&r1=1406814&r2=1406852&rev=1406852&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java (from r1406814, activemq/trunk/activemq-jdbc-store/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java?p2=activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java&p1=activemq/trunk/activemq-jdbc-store/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java&r1=1406814&r2=1406852&rev=1406852&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/xbean/BrokerFactoryBean.java (from r1406814, activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/xbean/BrokerFactoryBean.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/xbean/BrokerFactoryBean.java?p2=activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/xbean/BrokerFactoryBean.java&p1=activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/xbean/BrokerFactoryBean.java&r1=1406814&r2=1406852&rev=1406852&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/xbean/XBeanBrokerFactory.java (from r1406814, activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/xbean/XBeanBrokerFactory.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/xbean/XBeanBrokerFactory.java?p2=activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/xbean/XBeanBrokerFactory.java&p1=activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/xbean/XBeanBrokerFactory.java&r1=1406814&r2=1406852&rev=1406852&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java (from r1406814, activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java?p2=activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java&p1=activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/xbean/XBeanBrokerService.java&r1=1406814&r2=1406852&rev=1406852&view=diff
==============================================================================
    (empty)

Copied: activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/xbean/package.html (from r1406814, activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/xbean/package.html)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/xbean/package.html?p2=activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/xbean/package.html&p1=activemq/trunk/activemq-broker/src/main/java/org/apache/activemq/xbean/package.html&r1=1406814&r2=1406852&rev=1406852&view=diff
==============================================================================
    (empty)



Mime
View raw message