You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by de...@apache.org on 2009/10/13 16:40:28 UTC

svn commit: r824790 - in /activemq/trunk: activemq-core/src/test/java/org/apache/activemq/perf/SimpleTopicTest.java pom.xml

Author: dejanb
Date: Tue Oct 13 14:40:27 2009
New Revision: 824790

URL: http://svn.apache.org/viewvc?rev=824790&view=rev
Log:
using javadoc 2.5 plugin, with some extra options, since 2.6 doesn't work well with site plugin

Modified:
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/SimpleTopicTest.java
    activemq/trunk/pom.xml

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/SimpleTopicTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/SimpleTopicTest.java?rev=824790&r1=824789&r2=824790&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/SimpleTopicTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/perf/SimpleTopicTest.java Tue Oct 13 14:40:27 2009
@@ -61,9 +61,9 @@
      * @see junit.framework.TestCase#setUp()
      */
     protected void setUp() throws Exception {
-        if (broker == null) {
-            broker = createBroker(bindAddress);
-        }
+        //if (broker == null) {
+        //    broker = createBroker(bindAddress);
+        //}
         factory = createConnectionFactory(clientURI);
         Connection con = factory.createConnection();
         Session session = con.createSession(false, Session.AUTO_ACKNOWLEDGE);

Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=824790&r1=824789&r2=824790&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Tue Oct 13 14:40:27 2009
@@ -1072,9 +1072,6 @@
   </build>
   <reporting>
     <plugins>
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-      </plugin>
       <!--
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
@@ -1106,6 +1103,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.5</version>
         <configuration>
           <links>
             <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
@@ -1123,6 +1121,7 @@
           <linksource>true</linksource>
           <maxmemory>900m</maxmemory>
           <source>1.5</source>
+          <additionalJOption>-J-Xmx256m</additionalJOption>
         </configuration>
       </plugin>
       <plugin>