activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject svn commit: r813525 - in /activemq/trunk: ./ activemq-core/ activemq-core/src/main/resources/ activemq-core/src/main/resources/META-INF/ activemq-core/src/main/resources/META-INF/services/org/apache/xbean/ activemq-core/src/test/resources/
Date Thu, 10 Sep 2009 17:47:44 GMT
Author: gtully
Date: Thu Sep 10 17:47:43 2009
New Revision: 813525

URL: http://svn.apache.org/viewvc?rev=813525&view=rev
Log:
resolve https://issues.apache.org/activemq/browse/AMQ-2342 - update to xbean 3.7-SNAPSHOT
pending 3.6 release - auto generation of xsd is back - seems to work ok for broker definitions
in spring contexts etc.

Added:
    activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean-bean-ref.xml   (with
props)
Removed:
    activemq/trunk/activemq-core/src/main/resources/META-INF/services/org/apache/xbean/
    activemq/trunk/activemq-core/src/main/resources/META-INF/spring.handlers
    activemq/trunk/activemq-core/src/main/resources/activemq.xsd
    activemq/trunk/activemq-core/src/main/resources/activemq.xsd.html
    activemq/trunk/activemq-core/src/main/resources/activemq.xsd.wiki
Modified:
    activemq/trunk/activemq-core/pom.xml
    activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean-local.xml
    activemq/trunk/pom.xml

Modified: activemq/trunk/activemq-core/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/pom.xml?rev=813525&r1=813524&r2=813525&view=diff
==============================================================================
--- activemq/trunk/activemq-core/pom.xml (original)
+++ activemq/trunk/activemq-core/pom.xml Thu Sep 10 17:47:43 2009
@@ -531,7 +531,7 @@
                 <echo>Running the XSDDoc task</echo>
                 <taskdef name="xsddoc" classname="net.sf.xframe.xsddoc.Task" />
                 <mkdir dir="${basedir}/target/site/xsddoc" />
-                <xsddoc file="${basedir}/src/main/resources/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 2007 (c) the &lt;a href='http://www.apache.org/'&gt;Apache
Software Foundation&lt;/a&gt;" verbose="false" />
+                <xsddoc file="${basedir}/target/xbean/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 2007 (c) the &lt;a href='http://www.apache.org/'&gt;Apache
Software Foundation&lt;/a&gt;" verbose="false" />
                 <!--
                         css="${basedir}/../etc/css/stylesheet.css"
                 -->
@@ -582,18 +582,18 @@
         </executions>
       </plugin>
 
-      <!-- Disable for now cause it's generating an invalid xsd file and this breaks our
spring compatibility.
-           we are going to manually maintain the xsd for now until we can improve the xsd
generation from xbean
       <plugin>
         <groupId>org.apache.xbean</groupId>
         <artifactId>maven-xbean-plugin</artifactId>
         <version>${xbean-version}</version>
         <executions>
           <execution>
+          <phase>process-classes</phase>
             <configuration>
               <namespace>http://activemq.apache.org/schema/core</namespace>
               <schema>target/xbean/activemq.xsd</schema>
               <generateSpringSchemasFile>false</generateSpringSchemasFile>
+              <excludedClasses>org.apache.activemq.broker.jmx.AnnotatedMBean,org.apache.activemq.broker.jmx.DestinationViewMBean</excludedClasses>
             </configuration>
             <goals>
               <goal>mapping</goal>
@@ -601,40 +601,35 @@
           </execution>
         </executions>
       </plugin>
-      -->
 
       <!--  lets ensure that the XSD gets deployed  -->
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
+        <artifactId>maven-resources-plugin</artifactId>
         <executions>
           <execution>
-            <id>attach-artifacts</id>
-            <phase>package</phase>
+            <id>copy-resources</id>
+            <phase>validate</phase>
             <goals>
-              <goal>attach-artifact</goal>
+              <goal>copy-resources</goal>
             </goals>
             <configuration>
-              <artifacts>
-                <artifact>
-                  <file>${basedir}/src/main/resources/activemq.xsd</file>
-                  <type>xsd</type>
-                </artifact>
-                <artifact>
-                  <file>${basedir}/src/main/resources/activemq.xsd.html</file>
-                  <type>xsd.html</type>
-                </artifact>
-              </artifacts>
-            </configuration>
+              <outputDirectory>${basedir}/target/classes</outputDirectory>
+              <resources>          
+                <resource>
+                  <directory>target/xbean</directory>
+                </resource>
+              </resources>              
+            </configuration>            
           </execution>
         </executions>
       </plugin>
+
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>cobertura-maven-plugin</artifactId>
         <version>2.0</version>
         <configuration>
-		  <check>
+	  <check>
             <branchRate>50</branchRate>
             <lineRate>50</lineRate>
             <haltOnFailure>true</haltOnFailure>

Added: activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean-bean-ref.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean-bean-ref.xml?rev=813525&view=auto
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean-bean-ref.xml (added)
+++ activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean-bean-ref.xml Thu
Sep 10 17:47:43 2009
@@ -0,0 +1,101 @@
+<?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.
+-->
+
+<!-- START SNIPPET: spring -->
+<beans 
+  xmlns="http://www.springframework.org/schema/beans" 
+  xmlns:amq="http://activemq.apache.org/schema/core"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd

+  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
+  
+  <bean id="store" class="org.apache.activemq.store.kahadb.KahaDBStore" >
+      <property name="directory" value="target/amqdata/kahadb" />
+      <property name="journalMaxFileLength" value="1000000" />
+      <property name="checkpointInterval" value="5000" />
+      <property name="cleanupInterval" value="5000" />
+
+      <property name="indexWriteBatchSize" value="100" />
+      <property name="enableIndexWriteAsync" value="true" />
+
+    </bean>
+
+    <amq:broker poor="false"
+          persistent="true"
+          advisorySupport="false"
+          dataDirectory="target/amqdata"
+          deleteAllMessagesOnStartup="true"
+          useJmx="true"
+          brokerName="localhost"
+          monitorConnectionSplits="false"
+          splitSystemUsageForProducersConsumers="false"
+          start="true"
+          persistenceAdapter="#store">
+          
+    <amq:transportConnectors>
+      <amq:transportConnector uri="tcp://localhost:0" />
+    </amq:transportConnectors>
+  </amq:broker>
+
+   <!--  ActiveMQ destinations to use  -->
+  <amq:queue id="destination"  physicalName="org.apache.activemq.spring.Test.spring.embedded"/>
+
+  <!-- JMS ConnectionFactory to use, configuring the embedded broker using XML -->
+  <amq:connectionFactory id="jmsFactory" brokerURL="vm://localhost"/>
+  
+
+  <!-- Spring JMS Template -->
+  <bean id="myJmsTemplate" class="org.springframework.jms.core.JmsTemplate">
+    <property name="connectionFactory">
+      <!-- lets wrap in a pool to avoid creating a connection per send -->
+      <bean class="org.springframework.jms.connection.SingleConnectionFactory">
+        <property name="targetConnectionFactory">
+          <ref local="jmsFactory" />
+        </property>
+      </bean>
+    </property>
+  </bean>
+
+  <bean id="consumerJmsTemplate" class="org.springframework.jms.core.JmsTemplate">
+    <property name="connectionFactory" ref="jmsFactory"/>
+  </bean>
+
+  <!-- a sample POJO which uses a Spring JmsTemplate -->
+  <bean id="producer" class="org.apache.activemq.spring.SpringProducer">
+    <property name="template">
+      <ref bean="myJmsTemplate"></ref>
+    </property>
+
+    <property name="destination">
+      <ref bean="destination" />
+    </property>
+
+    <property name="messageCount">
+      <value>10</value>
+    </property>
+  </bean>
+
+  <!-- a sample POJO consumer -->
+  <bean id="consumer" class="org.apache.activemq.spring.SpringConsumer">
+    <property name="template" ref="consumerJmsTemplate"/>
+    <property name="destination" ref="destination"/>
+  </bean>
+
+</beans>
+
+<!-- END SNIPPET: spring -->

Propchange: activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean-bean-ref.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean-bean-ref.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean-bean-ref.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean-local.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean-local.xml?rev=813525&r1=813524&r2=813525&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean-local.xml (original)
+++ activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean-local.xml Thu Sep
10 17:47:43 2009
@@ -22,7 +22,7 @@
   xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd

-  http://activemq.apache.org/schema/core file:./src/main/resources/activemq.xsd">
+  http://activemq.apache.org/schema/core classpath:activemq.xsd">
   
   <!--  lets create an embedded ActiveMQ Broker -->
   <amq:broker useJmx="false" persistent="false">

Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=813525&r1=813524&r2=813525&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Thu Sep 10 17:47:43 2009
@@ -77,7 +77,7 @@
     <xmlbeans-version>2.0.0-beta1</xmlbeans-version>
     <xmlpull-version>1.1.3.4d_b4_min</xmlpull-version>
     <xstream-version>1.3.1</xstream-version>
-    <xbean-version>3.4</xbean-version>
+    <xbean-version>3.7-SNAPSHOT</xbean-version>
     <felix-version>1.0.0</felix-version>
     <commons-net-version>2.0</commons-net-version>
     <ftpserver-version>1.0.0</ftpserver-version>
@@ -158,6 +158,14 @@
     </pluginRepository>
   </pluginRepositories>
 
+  <!-- here till xbean 3.6 release is in central -->
+  <repositories>
+    <repository>
+      <id>snapshots-group</id>
+      <url>http://repository.apache.org/content/groups/snapshots/</url>
+    </repository>
+  </repositories>
+
   <dependencyManagement>
     <dependencies>
       <!-- =============================== -->



Mime
View raw message