JBoss hornetq SVN: r9285 - trunk/src/main/org/hornetq/core/journal/impl.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2010-05-28 20:11:49 -0400 (Fri, 28 May 2010)
New Revision: 9285
Modified:
trunk/src/main/org/hornetq/core/journal/impl/JournalImpl.java
Log:
https://jira.jboss.org/browse/HORNETQ-399 - cleanup files shouldn't be reused after freed
Modified: trunk/src/main/org/hornetq/core/journal/impl/JournalImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/journal/impl/JournalImpl.java 2010-05-28 16:20:26 UTC (rev 9284)
+++ trunk/src/main/org/hornetq/core/journal/impl/JournalImpl.java 2010-05-29 00:11:49 UTC (rev 9285)
@@ -1453,7 +1453,6 @@
try
{
JournalImpl.trace("Starting compacting operation on journal");
- JournalImpl.log.debug("Starting compacting operation on journal");
// We need to guarantee that the journal is frozen for this short time
// We don't freeze the journal as we compact, only for the short time where we replace records
@@ -1593,7 +1592,7 @@
renameFiles(dataFilesToProcess, newDatafiles);
deleteControlFile(controlFile);
- JournalImpl.log.debug("Finished compacting on journal");
+ JournalImpl.trace("Finished compacting on journal");
}
finally
@@ -2638,6 +2637,13 @@
*/
private void addFreeFile(final JournalFile file) throws Exception
{
+ if (file.getFile().size() != this.getFileSize())
+ {
+ // This will happen during cleanup
+ log.debug("Deleting " + file + ".. as it doesn't have the standard size", new Exception ("trace"));
+ file.getFile().delete();
+ }
+ else
// FIXME - size() involves a scan!!!
if (freeFiles.size() + dataFiles.size() + 1 + openedFiles.size() < minFiles)
{
14 years, 7 months
JBoss hornetq SVN: r9284 - tags.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2010-05-28 12:20:26 -0400 (Fri, 28 May 2010)
New Revision: 9284
Added:
tags/HornetQ_2_1_0_CR1/
Removed:
tags/HornetQ_2_1_0_CR1_pending/
Log:
final tag
Copied: tags/HornetQ_2_1_0_CR1 (from rev 9283, tags/HornetQ_2_1_0_CR1_pending)
14 years, 7 months
JBoss hornetq SVN: r9283 - tags.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2010-05-28 11:45:17 -0400 (Fri, 28 May 2010)
New Revision: 9283
Added:
tags/HornetQ_2_1_0_CR1_pending/
Log:
retaging version
Copied: tags/HornetQ_2_1_0_CR1_pending (from rev 9282, trunk)
14 years, 7 months
JBoss hornetq SVN: r9282 - trunk/docs/user-manual/zh.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2010-05-28 11:39:38 -0400 (Fri, 28 May 2010)
New Revision: 9282
Modified:
trunk/docs/user-manual/zh/master.xml
Log:
Version change
Modified: trunk/docs/user-manual/zh/master.xml
===================================================================
--- trunk/docs/user-manual/zh/master.xml 2010-05-28 15:30:03 UTC (rev 9281)
+++ trunk/docs/user-manual/zh/master.xml 2010-05-28 15:39:38 UTC (rev 9282)
@@ -70,7 +70,7 @@
]>
<book lang="en">
<bookinfo>
- <title>HornetQ 2.0用户手册</title>
+ <title>HornetQ 2.1用户手册</title>
<subtitle>Putting the buzz in messaging</subtitle>
</bookinfo>
14 years, 7 months
JBoss hornetq SVN: r9281 - in trunk/docs: user-manual/en and 1 other directory.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2010-05-28 11:30:03 -0400 (Fri, 28 May 2010)
New Revision: 9281
Modified:
trunk/docs/README.html
trunk/docs/user-manual/en/master.xml
Log:
Version and date change
Modified: trunk/docs/README.html
===================================================================
--- trunk/docs/README.html 2010-05-28 15:09:15 UTC (rev 9280)
+++ trunk/docs/README.html 2010-05-28 15:30:03 UTC (rev 9281)
@@ -11,7 +11,7 @@
<br>
-<h2>25th May 2010</h2>
+<h2>28th May 2010</h2>
These are the release notes for HornetQ 2.1.0 CR1<br><br>
Modified: trunk/docs/user-manual/en/master.xml
===================================================================
--- trunk/docs/user-manual/en/master.xml 2010-05-28 15:09:15 UTC (rev 9280)
+++ trunk/docs/user-manual/en/master.xml 2010-05-28 15:30:03 UTC (rev 9281)
@@ -70,7 +70,7 @@
]>
<book lang="en">
<bookinfo>
- <title>HornetQ 2.0 User Manual</title>
+ <title>HornetQ 2.1 User Manual</title>
<subtitle>Putting the buzz in messaging</subtitle>
</bookinfo>
14 years, 7 months
JBoss hornetq SVN: r9280 - tags.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2010-05-28 11:09:15 -0400 (Fri, 28 May 2010)
New Revision: 9280
Removed:
tags/Hornetq_2_1_0_CR1/
Log:
Retagging the release - fixing version IDs on docs
14 years, 7 months
JBoss hornetq SVN: r9279 - tags.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2010-05-28 10:43:48 -0400 (Fri, 28 May 2010)
New Revision: 9279
Added:
tags/Hornetq_2_1_0_CR1/
Removed:
tags/Hornetq_2_1_0_CR1_pending/
Log:
Final tag on 2.1.0.CR1
Copied: tags/Hornetq_2_1_0_CR1 (from rev 9278, tags/Hornetq_2_1_0_CR1_pending)
14 years, 7 months
JBoss hornetq SVN: r9278 - tags.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2010-05-28 04:59:47 -0400 (Fri, 28 May 2010)
New Revision: 9278
Removed:
tags/hornetq_2_1_0_CR1_pending/
Log:
not needed
14 years, 7 months
JBoss hornetq SVN: r9277 - tags.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2010-05-28 04:08:04 -0400 (Fri, 28 May 2010)
New Revision: 9277
Added:
tags/Hornetq_2_1_0_CR1_pending/
Log:
created pending tag for hornetq 2.1.0.CR1
Copied: tags/Hornetq_2_1_0_CR1_pending (from rev 9276, trunk)
14 years, 7 months
JBoss hornetq SVN: r9276 - in trunk: lib/docbook-support and 1 other directory.
by do-not-reply＠jboss.org
Author: gaohoward
Date: 2010-05-28 02:38:30 -0400 (Fri, 28 May 2010)
New Revision: 9276
Modified:
trunk/docs/user-manual/en/appserver-integration.xml
trunk/docs/user-manual/en/configuration-index.xml
trunk/lib/docbook-support/support.xml
Log:
some formatting and add back the tmp fo cleanup ant task.
Modified: trunk/docs/user-manual/en/appserver-integration.xml
===================================================================
--- trunk/docs/user-manual/en/appserver-integration.xml 2010-05-28 02:46:51 UTC (rev 9275)
+++ trunk/docs/user-manual/en/appserver-integration.xml 2010-05-28 06:38:30 UTC (rev 9276)
@@ -500,6 +500,16 @@
<entry>the batch size (in bytes) between acknowledgements when using
DUPS_OK_ACKNOWLEDGE mode</entry>
</row>
+ </tbody>
+ </tgroup>
+ </table>
+ <para>Continued..</para>
+ <informaltable frame="topbot">
+ <tgroup cols="3">
+ <colspec colname="c1" colnum="1"/>
+ <colspec colname="c2" colnum="2"/>
+ <colspec colname="c3" colnum="3"/>
+ <tbody>
<row>
<entry>
<link linkend="configuration.connection-factory.transaction-batch-size">TransactionBatchSize</link>
@@ -647,7 +657,7 @@
</row>
</tbody>
</tgroup>
- </table>
+ </informaltable>
</section>
<section>
<title>Adapter Outbound Configuration</title>
Modified: trunk/docs/user-manual/en/configuration-index.xml
===================================================================
--- trunk/docs/user-manual/en/configuration-index.xml 2010-05-28 02:46:51 UTC (rev 9275)
+++ trunk/docs/user-manual/en/configuration-index.xml 2010-05-28 06:38:30 UTC (rev 9276)
@@ -92,6 +92,19 @@
<entry>true means that the journal directory will be created</entry>
<entry>true</entry>
</row>
+ </tbody>
+ </tgroup>
+ </table>
+ <para></para>
+ <para></para>
+ <para>Continued..</para>
+ <informaltable frame="topbot">
+ <tgroup cols="4">
+ <colspec colname="c1" colnum="1"/>
+ <colspec colname="c2" colnum="2"/>
+ <colspec colname="c3" colnum="3"/>
+ <colspec colname="c4" colnum="4"/>
+ <tbody>
<row>
<entry><link linkend="using-server.configuration"
>file-deployment-enabled</link></entry>
@@ -961,7 +974,7 @@
</row>
</tbody>
</tgroup>
- </table>
+ </informaltable>
</section>
<section>
<title>hornetq-jms.xml</title>
@@ -991,6 +1004,19 @@
<entry>a list of connection factories to create and add to JNDI</entry>
<entry/>
</row>
+ </tbody>
+ </tgroup>
+ </table>
+ <para></para>
+ <para></para>
+ <para>Continued..</para>
+ <informaltable frame="topbot">
+ <tgroup cols="4">
+ <colspec colname="c1" colnum="1"/>
+ <colspec colname="c2" colnum="2"/>
+ <colspec colname="c3" colnum="3"/>
+ <colspec colname="c4" colnum="4"/>
+ <tbody>
<row>
<entry id="configuration.connection-factory.auto-group">
<link linkend="message-grouping.jmsconfigure">connection-factory.auto-group</link>
@@ -1312,7 +1338,7 @@
</row>
</tbody>
</tgroup>
- </table>
+ </informaltable>
</section>
</section>
</chapter>
Modified: trunk/lib/docbook-support/support.xml
===================================================================
--- trunk/lib/docbook-support/support.xml 2010-05-28 02:46:51 UTC (rev 9275)
+++ trunk/lib/docbook-support/support.xml 2010-05-28 06:38:30 UTC (rev 9276)
@@ -144,6 +144,8 @@
outfile="${build.dir}/${lang}/pdf/${pdf.name}" />
<!-- Delete temporary files. -->
+ <delete file="${build.dir}/${lang}/pdf/docbook_fop.tmp"/>
+ <delete dir="${build.dir}/${lang}/pdf/images"/>
</target>
<target name="lang.dochtml">
@@ -204,6 +206,7 @@
<!-- Copy images and CSS for HTML documentation, language specific. -->
<copy todir="${build.dir}/${lang}/shared/images">
<fileset dir="${basedir}/${lang}/images">
+
<include name="**/*.png"/>
<include name="**/*.gif"/>
</fileset>
14 years, 7 months