December 2009 - hornetq-commits - Jboss List Archives

by do-not-reply＠jboss.org

Author: jmesnil Date: 2009-12-07 09:53:52 -0500 (Mon, 07 Dec 2009) New Revision: 8606 Modified: trunk/build-hornetq.xml trunk/build.xml trunk/pom.xml Log: HORNETQ-186: fill in Javadocs for core API * refactor Ant's javadoc target to generate javadoc only for API and Management * generate HTML version of the source code linked to the javadoc * use apiviz to create class diagrams Modified: trunk/build-hornetq.xml =================================================================== --- trunk/build-hornetq.xml 2009-12-07 14:36:45 UTC (rev 8605) +++ trunk/build-hornetq.xml 2009-12-07 14:53:52 UTC (rev 8606) @@ -215,6 +215,8 @@ <path id="javadoc.classpath"> <path refid="jms.compilation.classpath"/> + <path refid="org.jboss.netty.classpath"/> + <path location="${thirdparty.dir}/org/jboss/apiviz/lib/apiviz.jar" /> <path location="${build.classes.dir}"/> </path> @@ -999,18 +1001,32 @@ <target name="javadoc"> - <javadoc destdir="${build.api.dir}" author="true" version="true" use="true" - windowtitle="HornetQ ${module.version}"> + <javadoc + doclet="org.jboss.apiviz.APIviz" + docletpath="${thirdparty.dir}/org/jboss/apiviz/lib/apiviz.jar" + destdir="${build.api.dir}" + additionalparam="-author -version -use -public -linksource" + windowtitle="HornetQ ${module.version}"> - <packageset dir="${src.main.dir}" defaultexcludes="yes"> - <include name="org/hornetq/**"/> + <packageset dir="${src.main.dir}" defaultexcludes="false"> + <include name="org/hornetq/core/config"/> + <include name="org/hornetq/core/client"/> + <include name="org/hornetq/core/remoting"/> + <include name="org/hornetq/core/management"/> + <include name="org/hornetq/jms"/> + <include name="org/hornetq/jms/client"/> + <include name="org/hornetq/jms/server/management"/> + <include name="org/hornetq/utils"/> </packageset> <classpath refid="javadoc.classpath"/> <doctitle><![CDATA[<h2>HornetQ ${module.version}</h2>]]></doctitle> <bottom><![CDATA[<i>Copyright © 2009 Red Hat Inc. All Rights Reserved.</i>]]></bottom> - <tag name="todo" scope="all" description="To do:"/> - <group title="JMS Facade" packages="org.jboss.jms.*"/> - <group title="HornetQ Core" packages="org.hornetq.*"/> + <group title="HornetQ Core API" packages="org.hornetq.core.client, org.hornetq.core.config, org.hornetq.core.remoting, org.hornetq.utils"/> + <group title="HornetQ Management API" packages="org.hornetq.core.management"/> + <group title="JMS Facade" packages="org.hornetq.jms, org.hornetq.jms.client"/> + <group title="JMS Management API" packages="org.hornetq.jms.server.management"/> + <link href="http://java.sun.com/j2se/1.5.0/docs/api"/> + <link href="http://java.sun.com/javaee/5/docs/api/"/> </javadoc> </target> Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2009-12-07 14:36:45 UTC (rev 8605) +++ trunk/build.xml 2009-12-07 14:53:52 UTC (rev 8606) @@ -107,6 +107,10 @@ <ant antfile="build-hornetq.xml" target="userdoc"/> </target> + <target name="javadoc"> + <ant antfile="build-hornetq.xml" target="javadoc"/> + </target> + <target name="validate-configuration"> <ant antfile="build-hornetq.xml" target="validate-configuration"/> </target> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-07 14:36:45 UTC (rev 8605) +++ trunk/pom.xml 2009-12-07 14:53:52 UTC (rev 8606) @@ -271,6 +271,13 @@ <artifactId>jboss-ejb3-ext-api</artifactId> <version>1.0.0</version> </dependency> + +  + <dependency> + <groupId>org.jboss.apiviz</groupId> + <artifactId>apiviz</artifactId> + <version>1.3.0.GA</version> + </dependency> </dependencies>

15 years, 1 month

1
0
0 / 0

JBoss hornetq SVN: r8605 - trunk/src/main/org/hornetq/integration/transports/netty.

by do-not-reply＠jboss.org

Author: timfox Date: 2009-12-07 09:36:45 -0500 (Mon, 07 Dec 2009) New Revision: 8605 Modified: trunk/src/main/org/hornetq/integration/transports/netty/HornetQFrameDecoder2.java Log: small tweak to frame decoder Modified: trunk/src/main/org/hornetq/integration/transports/netty/HornetQFrameDecoder2.java =================================================================== --- trunk/src/main/org/hornetq/integration/transports/netty/HornetQFrameDecoder2.java 2009-12-07 12:33:07 UTC (rev 8604) +++ trunk/src/main/org/hornetq/integration/transports/netty/HornetQFrameDecoder2.java 2009-12-07 14:36:45 UTC (rev 8605) @@ -47,7 +47,7 @@ { if (previousData.readableBytes() + in.readableBytes() < SIZE_INT) { // XXX Length is unknown. Bet at 512. Tune this value. - append(in, 1500); + append(in, 512); return; }

15 years, 1 month

1
0
0 / 0

JBoss hornetq SVN: r8604 - in trunk/src/main/org/hornetq: core/client and 14 other directories.

by do-not-reply＠jboss.org

Author: jmesnil Date: 2009-12-07 07:33:07 -0500 (Mon, 07 Dec 2009) New Revision: 8604 Modified: trunk/src/main/org/hornetq/core/asyncio/impl/AsynchronousFileImpl.java trunk/src/main/org/hornetq/core/client/ClientSession.java trunk/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java trunk/src/main/org/hornetq/core/journal/impl/AbstractJournalUpdateTask.java trunk/src/main/org/hornetq/core/journal/impl/JournalCompactor.java trunk/src/main/org/hornetq/core/journal/impl/JournalImpl.java trunk/src/main/org/hornetq/core/journal/impl/JournalReaderCallback.java trunk/src/main/org/hornetq/core/journal/impl/JournalTransaction.java trunk/src/main/org/hornetq/core/journal/impl/TimedBuffer.java trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalAddRecord.java trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalAddRecordTX.java trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalDeleteRecord.java trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalDeleteRecordTX.java trunk/src/main/org/hornetq/core/message/impl/MessageImpl.java trunk/src/main/org/hornetq/core/paging/PagingManager.java trunk/src/main/org/hornetq/core/paging/PagingStore.java trunk/src/main/org/hornetq/core/paging/PagingStoreFactory.java trunk/src/main/org/hornetq/core/paging/impl/PagingStoreFactoryNIO.java trunk/src/main/org/hornetq/core/paging/impl/TestSupportPageStore.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateSessionMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/RollbackMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionReceiveContinuationMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendContinuationMessage.java trunk/src/main/org/hornetq/core/replication/ReplicationManager.java trunk/src/main/org/hornetq/core/replication/impl/ReplicatedJournal.java trunk/src/main/org/hornetq/core/replication/impl/ReplicationManagerImpl.java trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java trunk/src/main/org/hornetq/jms/server/JMSServerManager.java trunk/src/main/org/hornetq/ra/HornetQRAXAResource.java trunk/src/main/org/hornetq/utils/Base64.java Log: fixed javadoc warnings Modified: trunk/src/main/org/hornetq/core/asyncio/impl/AsynchronousFileImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/asyncio/impl/AsynchronousFileImpl.java 2009-12-07 11:09:31 UTC (rev 8603) +++ trunk/src/main/org/hornetq/core/asyncio/impl/AsynchronousFileImpl.java 2009-12-07 12:33:07 UTC (rev 8604) @@ -397,9 +397,6 @@ * This needs to be synchronized because of * http://bugs.sun.com/view_bug.do?bug_id=6791815 * http://mail.openjdk.java.net/pipermail/hotspot-runtime-dev/2009-January/0... - * - * @param size - * @return */ public synchronized static ByteBuffer newBuffer(final int size) { Modified: trunk/src/main/org/hornetq/core/client/ClientSession.java =================================================================== --- trunk/src/main/org/hornetq/core/client/ClientSession.java 2009-12-07 11:09:31 UTC (rev 8603) +++ trunk/src/main/org/hornetq/core/client/ClientSession.java 2009-12-07 12:33:07 UTC (rev 8604) @@ -15,7 +15,6 @@ import javax.transaction.xa.XAResource; -import org.hornetq.core.buffers.HornetQBuffer; import org.hornetq.core.exception.HornetQException; import org.hornetq.core.remoting.impl.wireformat.SessionBindingQueryResponseMessage; import org.hornetq.core.remoting.impl.wireformat.SessionQueueQueryResponseMessage; @@ -26,6 +25,7 @@ * @author <a href="mailto:clebert.suconic@jboss.org">Clebert Suconic</a> * @author <a href="mailto:ataylor@redhat.com">Andy Taylor</a> * @author <a href="jmesnil(a)redhat.com">Jeff Mesnil</a> + * */ public interface ClientSession extends XAResource { @@ -159,7 +159,7 @@ * * @param address the queue will be bound to this address * @param queueName the name of the queue - * @param filterString only messages which match this filter will be put in the queue + * @param filter only messages which match this filter will be put in the queue * @throws HornetQException in an exception occurs while creating the queue */ void createTemporaryQueue(SimpleString address, SimpleString queueName, SimpleString filter) throws HornetQException; @@ -169,7 +169,7 @@ * * @param address the queue will be bound to this address * @param queueName the name of the queue - * @param filterString only messages which match this filter will be put in the queue + * @param filter only messages which match this filter will be put in the queue * @throws HornetQException in an exception occurs while creating the queue */ void createTemporaryQueue(String address, String queueName, String filter) throws HornetQException; @@ -218,7 +218,7 @@ * @return a ClientConsumer * @throws HornetQException if an exception occurs while creating the ClientConsumer */ - ClientConsumer createConsumer(SimpleString queueName, SimpleString filterString) throws HornetQException; + ClientConsumer createConsumer(SimpleString queueName, SimpleString filter) throws HornetQException; /** * Create a ClientConsumer to consume messages matching the filter from the queue with the given name. @@ -228,7 +228,7 @@ * @return a ClientConsumer * @throws HornetQException if an exception occurs while creating the ClientConsumer */ - ClientConsumer createConsumer(String queueName, String filterString) throws HornetQException; + ClientConsumer createConsumer(String queueName, String filter) throws HornetQException; /** * Create a ClientConsumer to consume or browse messages from the queue with the given name. @@ -286,7 +286,7 @@ * @return a ClientConsumer * @throws HornetQException if an exception occurs while creating the ClientConsumer */ - ClientConsumer createConsumer(SimpleString queueName, SimpleString filterString, boolean browseOnly) throws HornetQException; + ClientConsumer createConsumer(SimpleString queueName, SimpleString filter, boolean browseOnly) throws HornetQException; /** * Create a ClientConsumer to consume or browse messages matching the filter from the queue with the given name. Modified: trunk/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java 2009-12-07 11:09:31 UTC (rev 8603) +++ trunk/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java 2009-12-07 12:33:07 UTC (rev 8604) @@ -578,8 +578,8 @@ * LargeMessageBuffer will call flowcontrol here, while other handleMessage will also be calling flowControl. * So, this operation needs to be atomic. * - * @parameter discountSlowConsumer When dealing with slowConsumers, we need to discount one credit that was pre-sent when the first receive was called. For largeMessage that is only done at the latest packet - * */ + * @param discountSlowConsumer When dealing with slowConsumers, we need to discount one credit that was pre-sent when the first receive was called. For largeMessage that is only done at the latest packet + */ public void flowControl(final int messageBytes, final boolean discountSlowConsumer) throws HornetQException { if (clientWindowSize >= 0) Modified: trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java 2009-12-07 11:09:31 UTC (rev 8603) +++ trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java 2009-12-07 12:33:07 UTC (rev 8604) @@ -387,9 +387,6 @@ return persistDeliveryCountBeforeDelivery; } - /** - * @param strictJMS the strictJMS to set - */ public void setPersistDeliveryCountBeforeDelivery(final boolean persistDeliveryCountBeforeDelivery) { this.persistDeliveryCountBeforeDelivery = persistDeliveryCountBeforeDelivery; Modified: trunk/src/main/org/hornetq/core/journal/impl/AbstractJournalUpdateTask.java =================================================================== --- trunk/src/main/org/hornetq/core/journal/impl/AbstractJournalUpdateTask.java 2009-12-07 11:09:31 UTC (rev 8603) +++ trunk/src/main/org/hornetq/core/journal/impl/AbstractJournalUpdateTask.java 2009-12-07 12:33:07 UTC (rev 8604) @@ -83,11 +83,6 @@ // Public -------------------------------------------------------- - /** - * @param tmpRenameFile - * @param files - * @param newFiles - */ public static SequentialFile writeControlFile(final SequentialFileFactory fileFactory, final List<JournalFile> files, final List<JournalFile> newFiles, Modified: trunk/src/main/org/hornetq/core/journal/impl/JournalCompactor.java =================================================================== --- trunk/src/main/org/hornetq/core/journal/impl/JournalCompactor.java 2009-12-07 11:09:31 UTC (rev 8603) +++ trunk/src/main/org/hornetq/core/journal/impl/JournalCompactor.java 2009-12-07 12:33:07 UTC (rev 8604) @@ -152,10 +152,6 @@ pendingTransactions.put(transactionID, new PendingTransaction(ids)); } - /** - * @param id - * @param journalTransaction - */ public void addCommandCommit(final JournalTransaction liveTransaction, final JournalFile currentFile) { pendingCommands.add(new CommitCompactCommand(liveTransaction, currentFile)); Modified: trunk/src/main/org/hornetq/core/journal/impl/JournalImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/journal/impl/JournalImpl.java 2009-12-07 11:09:31 UTC (rev 8603) +++ trunk/src/main/org/hornetq/core/journal/impl/JournalImpl.java 2009-12-07 12:33:07 UTC (rev 8604) @@ -1104,10 +1104,10 @@ * * <p> transactionData allows you to store any other supporting user-data related to the transaction</p> * - * <p> This method also uses the same logic applied on {@link JournalImpl#appendCommitRecord(long)} + * <p> This method also uses the same logic applied on {@link JournalImpl#appendCommitRecord(long, boolean)} * * @param txID - * @param transactionData - extra user data for the prepare + * @param transactionData extra user data for the prepare * @throws Exception */ public void appendPrepareRecord(final long txID, @@ -1185,7 +1185,6 @@ * <p> We can't just use a global counter as reclaiming could delete files after the transaction was successfully committed. * That also means not having a whole file on journal-reload doesn't mean we have to invalidate the transaction </p> * - * @see JournalImpl#writeTransaction(byte, long, org.hornetq.core.journal.impl.JournalImpl.JournalTransaction, EncodingSupport) */ public void appendCommitRecord(final long txID, final boolean sync, final IOCompletion callback) throws Exception Modified: trunk/src/main/org/hornetq/core/journal/impl/JournalReaderCallback.java =================================================================== --- trunk/src/main/org/hornetq/core/journal/impl/JournalReaderCallback.java 2009-12-07 11:09:31 UTC (rev 8603) +++ trunk/src/main/org/hornetq/core/journal/impl/JournalReaderCallback.java 2009-12-07 12:33:07 UTC (rev 8604) @@ -61,13 +61,13 @@ /** * @param transactionID * @param extraData - * @param summaryData + * @param numberOfRecords */ void onReadPrepareRecord(long transactionID, byte[] extraData, int numberOfRecords) throws Exception; /** * @param transactionID - * @param summaryData + * @param numberOfRecords */ void onReadCommitRecord(long transactionID, int numberOfRecords) throws Exception; Modified: trunk/src/main/org/hornetq/core/journal/impl/JournalTransaction.java =================================================================== --- trunk/src/main/org/hornetq/core/journal/impl/JournalTransaction.java 2009-12-07 11:09:31 UTC (rev 8603) +++ trunk/src/main/org/hornetq/core/journal/impl/JournalTransaction.java 2009-12-07 12:33:07 UTC (rev 8604) @@ -183,7 +183,7 @@ /** * @param currentFile - * @param bb + * @param data */ public void fillNumberOfRecords(final JournalFile currentFile, final JournalInternalRecord data) { @@ -222,9 +222,6 @@ } } - /** - * @return - */ public TransactionCallback getCallback(final JournalFile file) throws Exception { if (callbackList == null) Modified: trunk/src/main/org/hornetq/core/journal/impl/TimedBuffer.java =================================================================== --- trunk/src/main/org/hornetq/core/journal/impl/TimedBuffer.java 2009-12-07 11:09:31 UTC (rev 8603) +++ trunk/src/main/org/hornetq/core/journal/impl/TimedBuffer.java 2009-12-07 12:33:07 UTC (rev 8604) @@ -188,7 +188,6 @@ /** * Verify if the size fits the buffer * @param sizeChecked - * @return */ public synchronized boolean checkSize(final int sizeChecked) { Modified: trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalAddRecord.java =================================================================== --- trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalAddRecord.java 2009-12-07 11:09:31 UTC (rev 8603) +++ trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalAddRecord.java 2009-12-07 12:33:07 UTC (rev 8604) @@ -39,7 +39,6 @@ * @param id * @param recordType * @param record - * @param size */ public JournalAddRecord(final boolean add, final long id, final byte recordType, final EncodingSupport record) { Modified: trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalAddRecordTX.java =================================================================== --- trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalAddRecordTX.java 2009-12-07 11:09:31 UTC (rev 8603) +++ trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalAddRecordTX.java 2009-12-07 12:33:07 UTC (rev 8604) @@ -41,7 +41,6 @@ * @param id * @param recordType * @param record - * @param size */ public JournalAddRecordTX(final boolean add, final long txID, Modified: trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalDeleteRecord.java =================================================================== --- trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalDeleteRecord.java 2009-12-07 11:09:31 UTC (rev 8603) +++ trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalDeleteRecord.java 2009-12-07 12:33:07 UTC (rev 8604) @@ -30,9 +30,6 @@ /** * @param id - * @param recordType - * @param record - * @param size */ public JournalDeleteRecord(final long id) { Modified: trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalDeleteRecordTX.java =================================================================== --- trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalDeleteRecordTX.java 2009-12-07 11:09:31 UTC (rev 8603) +++ trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalDeleteRecordTX.java 2009-12-07 12:33:07 UTC (rev 8604) @@ -34,10 +34,9 @@ private final EncodingSupport record; /** + * @param txID * @param id - * @param recordType * @param record - * @param size */ public JournalDeleteRecordTX(final long txID, final long id, final EncodingSupport record) { Modified: trunk/src/main/org/hornetq/core/message/impl/MessageImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/message/impl/MessageImpl.java 2009-12-07 11:09:31 UTC (rev 8603) +++ trunk/src/main/org/hornetq/core/message/impl/MessageImpl.java 2009-12-07 12:33:07 UTC (rev 8604) @@ -122,7 +122,7 @@ * @param expiration * @param timestamp * @param priority - * @param body + * @param initialMessageBufferSize */ protected MessageImpl(final byte type, final boolean durable, Modified: trunk/src/main/org/hornetq/core/paging/PagingManager.java =================================================================== --- trunk/src/main/org/hornetq/core/paging/PagingManager.java 2009-12-07 11:09:31 UTC (rev 8603) +++ trunk/src/main/org/hornetq/core/paging/PagingManager.java 2009-12-07 12:33:07 UTC (rev 8604) @@ -68,14 +68,10 @@ */ void removeTransaction(long transactionID); - /** - * @return - */ long getTotalMemory(); /** * @param size - * @return */ long addSize(long size); Modified: trunk/src/main/org/hornetq/core/paging/PagingStore.java =================================================================== --- trunk/src/main/org/hornetq/core/paging/PagingStore.java 2009-12-07 11:09:31 UTC (rev 8603) +++ trunk/src/main/org/hornetq/core/paging/PagingStore.java 2009-12-07 12:33:07 UTC (rev 8604) @@ -56,42 +56,18 @@ Page createPage(final int page) throws Exception; /** - * * @return false if a thread was already started, or if not in page mode * @throws Exception */ boolean startDepaging(); - /** - * - * @param message - * @throws Exception - */ void addSize(ServerMessage message, boolean add); - /** - * - * @param reference - * @throws Exception - */ void addSize(MessageReference reference, boolean add); - /** - * - * @param desired - * @return - */ int getAvailableProducerCredits(int desired); - /** - * - * @param credits - */ void returnProducerCredits(int credits); - /** - * - * @return - */ ServerProducerCreditManager getProducerCreditManager(); } Modified: trunk/src/main/org/hornetq/core/paging/PagingStoreFactory.java =================================================================== --- trunk/src/main/org/hornetq/core/paging/PagingStoreFactory.java 2009-12-07 11:09:31 UTC (rev 8603) +++ trunk/src/main/org/hornetq/core/paging/PagingStoreFactory.java 2009-12-07 12:33:07 UTC (rev 8604) @@ -42,10 +42,6 @@ List<PagingStore> reloadStores(HierarchicalRepository<AddressSettings> addressSettingsRepository) throws Exception; - /** - * @param storeName - * @return - */ SequentialFileFactory newFileFactory(SimpleString destinationName) throws Exception; } Modified: trunk/src/main/org/hornetq/core/paging/impl/PagingStoreFactoryNIO.java =================================================================== --- trunk/src/main/org/hornetq/core/paging/impl/PagingStoreFactoryNIO.java 2009-12-07 11:09:31 UTC (rev 8603) +++ trunk/src/main/org/hornetq/core/paging/impl/PagingStoreFactoryNIO.java 2009-12-07 12:33:07 UTC (rev 8604) @@ -101,10 +101,6 @@ syncNonTransactional); } - /** - * @param storeName - * @return - */ public synchronized SequentialFileFactory newFileFactory(final SimpleString destinationName) throws Exception { Modified: trunk/src/main/org/hornetq/core/paging/impl/TestSupportPageStore.java =================================================================== --- trunk/src/main/org/hornetq/core/paging/impl/TestSupportPageStore.java 2009-12-07 11:09:31 UTC (rev 8603) +++ trunk/src/main/org/hornetq/core/paging/impl/TestSupportPageStore.java 2009-12-07 12:33:07 UTC (rev 8604) @@ -27,7 +27,7 @@ * Remove the first page from the Writing Queue. * The file will still exist until Page.delete is called, * So, case the system is reloaded the same Page will be loaded back if delete is not called. - * @return + * * @throws Exception * * Note: This should still be part of the interface, even though HornetQ only uses through the Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateSessionMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateSessionMessage.java 2009-12-07 11:09:31 UTC (rev 8603) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateSessionMessage.java 2009-12-07 12:33:07 UTC (rev 8604) @@ -208,9 +208,6 @@ return false; } - /** - * @return - */ public int getMinLargeMessageSize() { return minLargeMessageSize; Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/RollbackMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/RollbackMessage.java 2009-12-07 11:09:31 UTC (rev 8603) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/RollbackMessage.java 2009-12-07 12:33:07 UTC (rev 8604) @@ -28,9 +28,6 @@ public class RollbackMessage extends PacketImpl { - /** - * @param type - */ public RollbackMessage() { super(SESS_ROLLBACK); @@ -58,11 +55,11 @@ } /** - * @param considerLastMessageAsDelivered the considerLastMessageAsDelivered to set + * @param isLastMessageAsDelivered the considerLastMessageAsDelivered to set */ - public void setConsiderLastMessageAsDelivered(final boolean isLastMessageAsDelived) + public void setConsiderLastMessageAsDelivered(final boolean isLastMessageAsDelivered) { - considerLastMessageAsDelivered = isLastMessageAsDelived; + considerLastMessageAsDelivered = isLastMessageAsDelivered; } @Override Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionReceiveContinuationMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionReceiveContinuationMessage.java 2009-12-07 11:09:31 UTC (rev 8603) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionReceiveContinuationMessage.java 2009-12-07 12:33:07 UTC (rev 8604) @@ -40,16 +40,13 @@ // Constructors -------------------------------------------------- - /** - * @param type - */ public SessionReceiveContinuationMessage() { super(SESS_RECEIVE_CONTINUATION); } /** - * @param type + * @param consumerID * @param body * @param continues * @param requiresResponse Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendContinuationMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendContinuationMessage.java 2009-12-07 11:09:31 UTC (rev 8603) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendContinuationMessage.java 2009-12-07 12:33:07 UTC (rev 8604) @@ -39,16 +39,12 @@ // Constructors -------------------------------------------------- - /** - * @param type - */ public SessionSendContinuationMessage() { super(SESS_SEND_CONTINUATION); } /** - * @param type * @param body * @param continues * @param requiresResponse Modified: trunk/src/main/org/hornetq/core/replication/ReplicationManager.java =================================================================== --- trunk/src/main/org/hornetq/core/replication/ReplicationManager.java 2009-12-07 11:09:31 UTC (rev 8603) +++ trunk/src/main/org/hornetq/core/replication/ReplicationManager.java 2009-12-07 12:33:07 UTC (rev 8604) @@ -67,7 +67,7 @@ /** - * @param storeName + * @param message * @param pageNumber */ void pageWrite(PagedMessage message, int pageNumber); Modified: trunk/src/main/org/hornetq/core/replication/impl/ReplicatedJournal.java =================================================================== --- trunk/src/main/org/hornetq/core/replication/impl/ReplicatedJournal.java 2009-12-07 11:09:31 UTC (rev 8603) +++ trunk/src/main/org/hornetq/core/replication/impl/ReplicatedJournal.java 2009-12-07 12:33:07 UTC (rev 8604) @@ -437,7 +437,7 @@ * @param committedRecords * @param preparedTransactions * @param transactionFailure - * @return + * * @throws Exception * @see org.hornetq.core.journal.Journal#load(java.util.List, java.util.List, org.hornetq.core.journal.TransactionFailureCallback) */ @@ -450,7 +450,7 @@ /** * @param reloadManager - * @return + * * @throws Exception * @see org.hornetq.core.journal.Journal#load(org.hornetq.core.journal.LoaderCallback) */ Modified: trunk/src/main/org/hornetq/core/replication/impl/ReplicationManagerImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/replication/impl/ReplicationManagerImpl.java 2009-12-07 11:09:31 UTC (rev 8603) +++ trunk/src/main/org/hornetq/core/replication/impl/ReplicationManagerImpl.java 2009-12-07 12:33:07 UTC (rev 8604) @@ -89,9 +89,6 @@ // Constructors -------------------------------------------------- - /** - * @param replicationConnectionManager - */ public ReplicationManagerImpl(final FailoverManager failoverManager, final ExecutorFactory executorFactory) { super(); Modified: trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2009-12-07 11:09:31 UTC (rev 8603) +++ trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2009-12-07 12:33:07 UTC (rev 8604) @@ -907,7 +907,6 @@ /** * This method is protected as it may be used as a hook for creating a custom storage manager (on tests for instance) - * @return */ protected StorageManager createStorageManager() { Modified: trunk/src/main/org/hornetq/jms/server/JMSServerManager.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/JMSServerManager.java 2009-12-07 11:09:31 UTC (rev 8603) +++ trunk/src/main/org/hornetq/jms/server/JMSServerManager.java 2009-12-07 12:33:07 UTC (rev 8604) @@ -226,8 +226,5 @@ void setContext(final Context context); - /** - * @return - */ HornetQServer getHornetQServer(); } Modified: trunk/src/main/org/hornetq/ra/HornetQRAXAResource.java =================================================================== --- trunk/src/main/org/hornetq/ra/HornetQRAXAResource.java 2009-12-07 11:09:31 UTC (rev 8603) +++ trunk/src/main/org/hornetq/ra/HornetQRAXAResource.java 2009-12-07 12:33:07 UTC (rev 8604) @@ -192,7 +192,7 @@ /** * Recover - * @param flags One of TMSTARTRSCAN, TMENDRSCAN, TMNOFLAGS + * @param flag One of TMSTARTRSCAN, TMENDRSCAN, TMNOFLAGS * @return Zero or more XIDs * @exception XAException An error has occurred */ Modified: trunk/src/main/org/hornetq/utils/Base64.java =================================================================== --- trunk/src/main/org/hornetq/utils/Base64.java 2009-12-07 11:09:31 UTC (rev 8603) +++ trunk/src/main/org/hornetq/utils/Base64.java 2009-12-07 12:33:07 UTC (rev 8604) @@ -688,8 +688,7 @@ * @param source The data to convert * @param off Offset in array where conversion should begin * @param len Length of data to convert - * @param options Specified options - * @param options alphabet type is pulled from this (standard, url-safe, ordered) + * @param options options alphabet type is pulled from this (standard, url-safe, ordered) * @see Base64#GZIP * @see Base64#DONT_BREAK_LINES * @since 2.0

15 years, 1 month

1
0
0 / 0

JBoss hornetq SVN: r8603 - trunk/tests/src/org/hornetq/tests/integration/ssl.

by do-not-reply＠jboss.org

Author: jmesnil Date: 2009-12-07 06:09:31 -0500 (Mon, 07 Dec 2009) New Revision: 8603 Removed: trunk/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSL.java Modified: trunk/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java Log: HORNETQ-234: test failure on CoreClientOverSSLTest.testPlainConnectionToSSLEndpoint * refactored test code, it is not need to use external JVM process to test SSL * uncommented testPlainConnectionToSSLEndpoint. it now fails with a CONNECTION_TIMEDOUT Deleted: trunk/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSL.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSL.java 2009-12-07 10:59:41 UTC (rev 8602) +++ trunk/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSL.java 2009-12-07 11:09:31 UTC (rev 8603) @@ -1,98 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat 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. - */ - -package org.hornetq.tests.integration.ssl; - -import java.util.Arrays; - -import org.hornetq.core.client.ClientMessage; -import org.hornetq.core.client.ClientProducer; -import org.hornetq.core.client.ClientSession; -import org.hornetq.core.client.ClientSessionFactory; -import org.hornetq.core.client.impl.ClientSessionFactoryImpl; -import org.hornetq.core.config.TransportConfiguration; -import org.hornetq.core.logging.Logger; -import org.hornetq.integration.transports.netty.TransportConstants; -import org.hornetq.jms.client.HornetQTextMessage; - -/** - * This client will open a connection, send a message to a queue over SSL and - * exit. - * - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> - * - * @version <tt>$Revision$</tt> - */ -public class CoreClientOverSSL -{ - // Constants ----------------------------------------------------- - - private static final Logger log = Logger.getLogger(CoreClientOverSSL.class); - - // Static -------------------------------------------------------- - - public static void main(String[] args) - { - try - { - System.out.println("Starting******"); - - log.debug("args = " + Arrays.asList(args)); - - if (args.length != 3) - { - log.fatal("unexpected number of args (should be 3)"); - System.exit(1); - } - - boolean sslEnabled = Boolean.parseBoolean(args[0]); - String keyStorePath = args[1]; - String keyStorePassword = args[2]; - - TransportConfiguration tc = new TransportConfiguration("org.hornetq.integration.transports.netty.NettyConnectorFactory"); - tc.getParams().put(TransportConstants.SSL_ENABLED_PROP_NAME, sslEnabled); - tc.getParams().put(TransportConstants.KEYSTORE_PATH_PROP_NAME, keyStorePath); - tc.getParams().put(TransportConstants.KEYSTORE_PASSWORD_PROP_NAME, keyStorePassword); - ClientSessionFactory sf = new ClientSessionFactoryImpl(tc); - ClientSession session = sf.createSession(false, true, true); - ClientProducer producer = session.createProducer(CoreClientOverSSLTest.QUEUE); - - ClientMessage message = session.createClientMessage(HornetQTextMessage.TYPE, false, 0, - System.currentTimeMillis(), (byte) 1); - message.getBodyBuffer().writeString(CoreClientOverSSLTest.MESSAGE_TEXT_FROM_CLIENT); - producer.send(message); - - session.close(); - } - catch (Throwable t) - { - log.error(t.getMessage(), t); - System.exit(1); - } - } - - // Attributes ---------------------------------------------------- - - // Constructors -------------------------------------------------- - - // Public -------------------------------------------------------- - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Modified: trunk/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java 2009-12-07 10:59:41 UTC (rev 8602) +++ trunk/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java 2009-12-07 11:09:31 UTC (rev 8603) @@ -17,11 +17,14 @@ import java.util.Map; import org.hornetq.core.client.ClientConsumer; +import org.hornetq.core.client.ClientMessage; +import org.hornetq.core.client.ClientProducer; import org.hornetq.core.client.ClientSession; import org.hornetq.core.client.ClientSessionFactory; import org.hornetq.core.client.impl.ClientSessionFactoryImpl; import org.hornetq.core.config.TransportConfiguration; import org.hornetq.core.config.impl.ConfigurationImpl; +import org.hornetq.core.exception.HornetQException; import org.hornetq.core.logging.Logger; import org.hornetq.core.message.Message; import org.hornetq.core.server.HornetQ; @@ -29,7 +32,8 @@ import org.hornetq.integration.transports.netty.NettyAcceptorFactory; import org.hornetq.integration.transports.netty.NettyConnectorFactory; import org.hornetq.integration.transports.netty.TransportConstants; -import org.hornetq.tests.util.SpawnedVMSupport; +import org.hornetq.jms.client.HornetQTextMessage; +import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.UnitTestCase; import org.hornetq.utils.SimpleString; @@ -57,47 +61,71 @@ private HornetQServer server; - private ClientSession session; - - private ClientConsumer consumer; - // Constructors -------------------------------------------------- // Public -------------------------------------------------------- public void testSSL() throws Exception { - final Process p = SpawnedVMSupport.spawnVM(CoreClientOverSSL.class.getName(), Boolean.TRUE.toString(), TransportConstants.DEFAULT_KEYSTORE_PATH, TransportConstants.DEFAULT_KEYSTORE_PASSWORD); + String text = RandomUtil.randomString(); + + TransportConfiguration tc = new TransportConfiguration(NettyConnectorFactory.class.getName()); + tc.getParams().put(TransportConstants.SSL_ENABLED_PROP_NAME, true); + tc.getParams().put(TransportConstants.KEYSTORE_PATH_PROP_NAME, TransportConstants.DEFAULT_KEYSTORE_PATH); + tc.getParams().put(TransportConstants.KEYSTORE_PASSWORD_PROP_NAME, TransportConstants.DEFAULT_KEYSTORE_PASSWORD); - Message m = consumer.receive(10000); + ClientSessionFactory sf = new ClientSessionFactoryImpl(tc); + ClientSession session = sf.createSession(false, true, true); + session.createQueue(QUEUE, QUEUE, false); + ClientProducer producer = session.createProducer(QUEUE); + + ClientMessage message = createTextMessage(text, session); + producer.send(message); + + ClientConsumer consumer = session.createConsumer(QUEUE); + session.start(); + + Message m = consumer.receive(1000); assertNotNull(m); - assertEquals(MESSAGE_TEXT_FROM_CLIENT, m.getBodyBuffer().readString()); - - log.debug("waiting for the client VM to exit ..."); - SpawnedVMSupport.assertProcessExits(true, 0, p); + assertEquals(text, m.getBodyBuffer().readString()); } public void testSSLWithIncorrectKeyStorePassword() throws Exception { - Process p = SpawnedVMSupport.spawnVM(CoreClientOverSSL.class.getName(), Boolean.TRUE.toString(), TransportConstants.DEFAULT_KEYSTORE_PATH, "invalid pasword"); + TransportConfiguration tc = new TransportConfiguration(NettyConnectorFactory.class.getName()); + tc.getParams().put(TransportConstants.SSL_ENABLED_PROP_NAME, true); + tc.getParams().put(TransportConstants.KEYSTORE_PATH_PROP_NAME, TransportConstants.DEFAULT_KEYSTORE_PATH); + tc.getParams().put(TransportConstants.KEYSTORE_PASSWORD_PROP_NAME, "invalid password"); - Message m = consumer.receive(5000); - assertNull(m); - - log.debug("waiting for the client VM to exit ..."); - SpawnedVMSupport.assertProcessExits(false, 0, p); + ClientSessionFactory sf = new ClientSessionFactoryImpl(tc); + try + { + sf.createSession(false, true, true); + fail(); + } + catch (HornetQException e) + { + assertEquals(HornetQException.NOT_CONNECTED, e.getCode()); + } } // see https://jira.jboss.org/jira/browse/HORNETQ-234 - public void _testPlainConnectionToSSLEndpoint() throws Exception + public void testPlainConnectionToSSLEndpoint() throws Exception { - Process p = SpawnedVMSupport.spawnVM(CoreClientOverSSL.class.getName(), Boolean.FALSE.toString(), TransportConstants.DEFAULT_KEYSTORE_PATH, TransportConstants.DEFAULT_KEYSTORE_PASSWORD); - - Message m = consumer.receive(5000); - assertNull(m); - - log.debug("waiting for the client VM to exit ..."); - SpawnedVMSupport.assertProcessExits(false, 0, p); + TransportConfiguration tc = new TransportConfiguration(NettyConnectorFactory.class.getName()); + tc.getParams().put(TransportConstants.SSL_ENABLED_PROP_NAME, false); + + ClientSessionFactory sf = new ClientSessionFactoryImpl(tc); + sf.setCallTimeout(2000); + try + { + sf.createSession(false, true, true); + fail(); + } + catch (HornetQException e) + { + assertEquals(HornetQException.CONNECTION_TIMEDOUT, e.getCode()); + } } // Package protected --------------------------------------------- @@ -112,20 +140,11 @@ config.getAcceptorConfigurations().add(new TransportConfiguration(NettyAcceptorFactory.class.getName(), params)); server = HornetQ.newHornetQServer(config, false); server.start(); - TransportConfiguration tc = new TransportConfiguration(NettyConnectorFactory.class.getName(), params); - ClientSessionFactory sf = new ClientSessionFactoryImpl(tc); - session = sf.createSession(false, true, true); - session.createQueue(QUEUE, QUEUE, false); - consumer = session.createConsumer(QUEUE); - session.start(); } @Override protected void tearDown() throws Exception { - consumer.close(); - session.close(); - server.stop(); super.tearDown();

15 years, 1 month

1
0
0 / 0

JBoss hornetq SVN: r8602 - trunk/tests/src/org/hornetq/tests/integration/jms/bridge.

by do-not-reply＠jboss.org

Author: timfox Date: 2009-12-07 05:59:41 -0500 (Mon, 07 Dec 2009) New Revision: 8602 Modified: trunk/tests/src/org/hornetq/tests/integration/jms/bridge/JMSBridgeTest.java Log: increased receive timeout on test Modified: trunk/tests/src/org/hornetq/tests/integration/jms/bridge/JMSBridgeTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/bridge/JMSBridgeTest.java 2009-12-06 21:32:50 UTC (rev 8601) +++ trunk/tests/src/org/hornetq/tests/integration/jms/bridge/JMSBridgeTest.java 2009-12-07 10:59:41 UTC (rev 8602) @@ -521,7 +521,7 @@ for (int i = NUM_MESSAGES / 2 ; i < NUM_MESSAGES; i++) { - TextMessage tm = (TextMessage)cons.receive(1000); + TextMessage tm = (TextMessage)cons.receive(10000); assertNotNull(tm);

15 years, 1 month

1
0
0 / 0

JBoss hornetq SVN: r8601 - trunk/tests/src/org/hornetq/tests/integration/journal.

by do-not-reply＠jboss.org

Author: clebert.suconic(a)jboss.com Date: 2009-12-06 16:32:50 -0500 (Sun, 06 Dec 2009) New Revision: 8601 Modified: trunk/tests/src/org/hornetq/tests/integration/journal/ValidateTransactionHealthTest.java Log: tweak: just adding a comment to a test Modified: trunk/tests/src/org/hornetq/tests/integration/journal/ValidateTransactionHealthTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/journal/ValidateTransactionHealthTest.java 2009-12-06 21:22:05 UTC (rev 8600) +++ trunk/tests/src/org/hornetq/tests/integration/journal/ValidateTransactionHealthTest.java 2009-12-06 21:32:50 UTC (rev 8601) @@ -301,6 +301,11 @@ try { Journal journal = appendData(journalType, journalDir, numberOfElements, transactionSize, numberOfThreads); + + // We don't stop the journal on the case of an external process... + // The test is making sure that committed data can be reloaded fine... + // i.e. committs are sync on disk as stated on the transaction. + // The journal shouldn't leave any state impeding reloading the server } catch (Exception e) {

15 years, 1 month

1
0
0 / 0

JBoss hornetq SVN: r8600 - trunk/src/main/org/hornetq/core/journal/impl.

by do-not-reply＠jboss.org

Author: clebert.suconic(a)jboss.com Date: 2009-12-06 16:22:05 -0500 (Sun, 06 Dec 2009) New Revision: 8600 Modified: trunk/src/main/org/hornetq/core/journal/impl/JournalImpl.java Log: HORNETQ-237 - Fix for truncated files during crashes Modified: trunk/src/main/org/hornetq/core/journal/impl/JournalImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/journal/impl/JournalImpl.java 2009-12-06 16:40:55 UTC (rev 8599) +++ trunk/src/main/org/hornetq/core/journal/impl/JournalImpl.java 2009-12-06 21:22:05 UTC (rev 8600) @@ -2923,6 +2923,7 @@ sequentialFile.writeDirect(bb, true); } + long position = sequentialFile.position(); sequentialFile.close(); @@ -2930,7 +2931,6 @@ if (keepOpened) { - if (multiAIO) { sequentialFile.open(); @@ -2939,6 +2939,7 @@ { sequentialFile.open(1, false); } + sequentialFile.position(position); } return new JournalFileImpl(sequentialFile, fileID);

15 years, 1 month

1
0
0 / 0

JBoss hornetq SVN: r8599 - tags.

by do-not-reply＠jboss.org

Author: ataylor Date: 2009-12-06 11:40:55 -0500 (Sun, 06 Dec 2009) New Revision: 8599 Removed: tags/hornetq_2_0_0_CR1/ Log: tag not needed

15 years, 1 month

1
0
0 / 0

JBoss hornetq SVN: r8598 - tags.

by do-not-reply＠jboss.org

Author: ataylor Date: 2009-12-06 11:40:12 -0500 (Sun, 06 Dec 2009) New Revision: 8598 Added: tags/HornetQ_2_0_0_CR1/ Log: tagged JBM 2.0.0.CR1 Copied: tags/HornetQ_2_0_0_CR1 (from rev 8597, tags/hornetq_2_0_0_CR1)

15 years, 1 month

1
0
0 / 0

JBoss hornetq SVN: r8597 - tags.

by do-not-reply＠jboss.org

Author: ataylor Date: 2009-12-06 11:39:08 -0500 (Sun, 06 Dec 2009) New Revision: 8597 Removed: tags/hornetq_2_0_0_CR1_pending/ Log: tag not needed

15 years, 1 month

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

hornetq-commits December 2009