From do-not-reply at jboss.org Mon Jan 23 07:02:39 2012 Content-Type: multipart/mixed; boundary="===============1927936759370530913==" MIME-Version: 1.0 From: do-not-reply at jboss.org To: hornetq-commits at lists.jboss.org Subject: [hornetq-commits] JBoss hornetq SVN: r12046 - in trunk: hornetq-core/src/main/java/org/hornetq/core/deployers and 10 other directories. Date: Mon, 23 Jan 2012 07:02:39 -0500 Message-ID: <201201231202.q0NC2d7Z031424@svn01.web.mwc.hst.phx2.redhat.com> --===============1927936759370530913== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: borges Date: 2012-01-23 07:02:38 -0500 (Mon, 23 Jan 2012) New Revision: 12046 Modified: trunk/hornetq-commons/src/main/java/org/hornetq/utils/TypedProperties.ja= va trunk/hornetq-core/src/main/java/org/hornetq/core/deployers/DeploymentMa= nager.java trunk/hornetq-core/src/main/java/org/hornetq/core/deployers/impl/Address= SettingsDeployer.java trunk/hornetq-core/src/main/java/org/hornetq/core/deployers/impl/Securit= yDeployer.java trunk/hornetq-core/src/main/java/org/hornetq/core/paging/PagingStore.java trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/PageCach= e.java trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/impl/Liv= ePageCacheImpl.java trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/impl/Pag= ePositionImpl.java trunk/hornetq-core/src/main/java/org/hornetq/core/paging/impl/PagingStor= eImpl.java trunk/hornetq-core/src/main/java/org/hornetq/core/server/cluster/Cluster= Manager.java trunk/hornetq-core/src/main/java/org/hornetq/core/transaction/Transactio= nOperationAbstract.java trunk/hornetq-core/src/test/java/org/hornetq/tests/util/UnitTestCase.java trunk/hornetq-jms/src/main/java/org/hornetq/jms/client/HornetQQueue.java trunk/hornetq-jms/src/main/java/org/hornetq/jms/client/HornetQTemporaryQ= ueue.java trunk/hornetq-jms/src/main/java/org/hornetq/jms/persistence/config/Persi= stedConnectionFactory.java Log: Non-public API javadoc fixes. Modified: trunk/hornetq-commons/src/main/java/org/hornetq/utils/TypedProper= ties.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hornetq-commons/src/main/java/org/hornetq/utils/TypedProperties.j= ava 2012-01-23 12:01:43 UTC (rev 12045) +++ trunk/hornetq-commons/src/main/java/org/hornetq/utils/TypedProperties.j= ava 2012-01-23 12:02:38 UTC (rev 12046) @@ -28,8 +28,8 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import java.util.Set; import java.util.Map.Entry; +import java.util.Set; = import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.PropertyConversionException; @@ -37,17 +37,14 @@ import org.hornetq.core.logging.Logger; = /** - * = * Property Value Conversion. *

- * This implementation follows section 3.5.4 of the Java Message Servic= e - * specification (Version 1.1 April 12, 2002). + * This implementation follows section 3.5.4 of the Java Message Servic= e specification + * (Version 1.1 April 12, 2002). *

* TODO - should have typed property getters and do conversions herein - * = * @author Tim Fox * @author Clebert Suconic<= /a> - * @see Java Message Service specification (Version 1.1 April 12, 20= 02), section 3.5.4. */ public class TypedProperties { @@ -138,7 +135,7 @@ checkCreateProperties(); doPutValue(key, value =3D=3D null ? new NullValue() : new StringValu= e(value)); } - = + public void putNullValue(final SimpleString key) { checkCreateProperties(); Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/deployers/Deplo= ymentManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hornetq-core/src/main/java/org/hornetq/core/deployers/DeploymentM= anager.java 2012-01-23 12:01:43 UTC (rev 12045) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/deployers/DeploymentM= anager.java 2012-01-23 12:02:38 UTC (rev 12046) @@ -24,17 +24,15 @@ { /** * registers a deployable object which will handle the deployment of UR= L's - * * @param deployer The deployable object - * @throws Exception . + * @throws Exception */ void registerDeployer(Deployer deployer) throws Exception; = /** * unregisters a deployable object which will handle the deployment of = URL's - * * @param deployer The deployable object - * @throws Exception . + * @throws Exception */ void unregisterDeployer(Deployer deployer) throws Exception; } Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/deployers/impl/= AddressSettingsDeployer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hornetq-core/src/main/java/org/hornetq/core/deployers/impl/Addres= sSettingsDeployer.java 2012-01-23 12:01:43 UTC (rev 12045) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/deployers/impl/Addres= sSettingsDeployer.java 2012-01-23 12:02:38 UTC (rev 12046) @@ -58,7 +58,7 @@ /** * deploy an element * @param node the element to deploy - * @throws Exception . + * @throws Exception */ @Override public void deploy(final Node node) throws Exception @@ -78,7 +78,7 @@ /** * Undeploys an element. * @param node the element to undeploy - * @throws Exception . + * @throws Exception */ @Override public void undeploy(final Node node) throws Exception Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/deployers/impl/= SecurityDeployer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hornetq-core/src/main/java/org/hornetq/core/deployers/impl/Securi= tyDeployer.java 2012-01-23 12:01:43 UTC (rev 12045) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/deployers/impl/Securi= tyDeployer.java 2012-01-23 12:02:38 UTC (rev 12046) @@ -79,9 +79,8 @@ = /** * deploy an element - * * @param node the element to deploy - * @throws Exception . + * @throws Exception */ @Override public void deploy(final Node node) throws Exception @@ -92,9 +91,8 @@ = /** * undeploys an element - * * @param node the element to undeploy - * @throws Exception . + * @throws Exception */ @Override public void undeploy(final Node node) throws Exception Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/paging/PagingSt= ore.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hornetq-core/src/main/java/org/hornetq/core/paging/PagingStore.ja= va 2012-01-23 12:01:43 UTC (rev 12045) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/paging/PagingStore.ja= va 2012-01-23 12:02:38 UTC (rev 12046) @@ -122,7 +122,8 @@ boolean lock(long timeout); = /** - * Call this method using the same thread used by the last call of {@li= nk PagingStore#lock()}. + * Call this method using the same thread used by the last call of {@li= nk PagingStore#lock(long)} + * . */ void unlock(); = Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/P= ageCache.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/PageCac= he.java 2012-01-23 12:01:43 UTC (rev 12045) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/PageCac= he.java 2012-01-23 12:02:38 UTC (rev 12046) @@ -27,23 +27,22 @@ public interface PageCache extends SoftValueHashMap.ValueCache { Page getPage(); - = + long getPageId(); = int getNumberOfMessages(); - = + void setMessages(PagedMessage[] messages); - = + PagedMessage[] getMessages(); - = + /** - * If this cache is still being updated - * @return + * @return whether this cache is still being updated */ boolean isLive(); = /** - * = + * * @param messageNumber The order of the message on the page * @return */ @@ -59,7 +58,7 @@ * You have to call this method within the same thread you called lock */ void unlock(); - = + void close(); = } Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/i= mpl/LivePageCacheImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/impl/Li= vePageCacheImpl.java 2012-01-23 12:01:43 UTC (rev 12045) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/impl/Li= vePageCacheImpl.java 2012-01-23 12:02:38 UTC (rev 12046) @@ -71,17 +71,13 @@ return page.getPageId(); } = - /* (non-Javadoc) - * @see org.hornetq.core.paging.cursor.PageCache#getNumberOfMessages() - */ + @Override public synchronized int getNumberOfMessages() { return messages.size(); } = - /* (non-Javadoc) - * @see org.hornetq.core.paging.cursor.PageCache#setMessages(org.hornet= q.core.server.ServerMessage[]) - */ + @Override public synchronized void setMessages(PagedMessage[] messages) { // This method shouldn't be called on liveCache, but we will provide= the implementation for it anyway @@ -91,9 +87,7 @@ } } = - /* (non-Javadoc) - * @see org.hornetq.core.paging.cursor.PageCache#getMessage(int) - */ + @Override public synchronized PagedMessage getMessage(int messageNumber) { if (messageNumber < messages.size()) Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/i= mpl/PagePositionImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/impl/Pa= gePositionImpl.java 2012-01-23 12:01:43 UTC (rev 12045) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/impl/Pa= gePositionImpl.java 2012-01-23 12:02:38 UTC (rev 12046) @@ -40,10 +40,6 @@ this.messageNr =3D messageNr; } = - /** - * @param pageNr - * @param messageNr - */ public PagePositionImpl() { = Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/paging/impl/Pag= ingStoreImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hornetq-core/src/main/java/org/hornetq/core/paging/impl/PagingSto= reImpl.java 2012-01-23 12:01:43 UTC (rev 12045) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/paging/impl/PagingSto= reImpl.java 2012-01-23 12:02:38 UTC (rev 12046) @@ -693,17 +693,6 @@ = } = - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - /** - * Depage one page-file, read it and send it to the pagingManager / pos= toffice - * @return - * @throws Exception - */ private final Queue onMemoryFreedRunnables =3D new Concurr= entLinkedQueue(); = private class MemoryFreedRunnablesExecutor implements Runnable Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/server/cluster/= ClusterManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hornetq-core/src/main/java/org/hornetq/core/server/cluster/Cluste= rManager.java 2012-01-23 12:01:43 UTC (rev 12045) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/server/cluster/Cluste= rManager.java 2012-01-23 12:02:38 UTC (rev 12046) @@ -36,7 +36,7 @@ = /** * Return the default ClusterConnection to be used case it's not define= d by the acceptor - * @return + * @return default connection */ ClusterConnection getDefaultConnection(); = @@ -60,7 +60,7 @@ void destroyBridge(String name) throws Exception; = /** - * @return + * @return description */ String describe(); } Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/transaction/Tra= nsactionOperationAbstract.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hornetq-core/src/main/java/org/hornetq/core/transaction/Transacti= onOperationAbstract.java 2012-01-23 12:01:43 UTC (rev 12045) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/transaction/Transacti= onOperationAbstract.java 2012-01-23 12:02:38 UTC (rev 12046) @@ -65,17 +65,15 @@ public void afterRollback(Transaction tx) { } - = - /* (non-Javadoc) - * @see org.hornetq.core.transaction.TransactionOperation#getRelatedMes= sageReferences() - */ + + @Override public List getRelatedMessageReferences() { return Collections.emptyList(); } - = = = + // Package protected --------------------------------------------- = // Protected ----------------------------------------------------- Modified: trunk/hornetq-core/src/test/java/org/hornetq/tests/util/UnitTestC= ase.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hornetq-core/src/test/java/org/hornetq/tests/util/UnitTestCase.ja= va 2012-01-23 12:01:43 UTC (rev 12045) +++ trunk/hornetq-core/src/test/java/org/hornetq/tests/util/UnitTestCase.ja= va 2012-01-23 12:02:38 UTC (rev 12046) @@ -98,10 +98,9 @@ * Helper base class for our unit tests. *

* See {@code org.hornetq.tests.util.ServiceTestBase} for a test case with= server set-up. - * @see Service + * @see ServiceTestBase * @author Tim Fox * @author Clebert - * */ public abstract class UnitTestCase extends TestCase { Modified: trunk/hornetq-jms/src/main/java/org/hornetq/jms/client/HornetQQue= ue.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hornetq-jms/src/main/java/org/hornetq/jms/client/HornetQQueue.jav= a 2012-01-23 12:01:43 UTC (rev 12045) +++ trunk/hornetq-jms/src/main/java/org/hornetq/jms/client/HornetQQueue.jav= a 2012-01-23 12:02:38 UTC (rev 12046) @@ -41,7 +41,7 @@ = public static SimpleString createAddressFromName(final String name) { - return new SimpleString(HornetQQueue.JMS_QUEUE_ADDRESS_PREFIX + name= ); + return new SimpleString(HornetQDestination.JMS_QUEUE_ADDRESS_PREFIX = + name); } = // Attributes ---------------------------------------------------- @@ -50,7 +50,7 @@ = public HornetQQueue(final String name) { - super(HornetQQueue.JMS_QUEUE_ADDRESS_PREFIX + name, name, false, tru= e, null); + super(HornetQDestination.JMS_QUEUE_ADDRESS_PREFIX + name, name, fals= e, true, null); } = = @@ -59,7 +59,6 @@ * @param address * @param name * @param temporary - * @param queue * @param session */ public HornetQQueue(String address, String name, boolean temporary, Hor= netQSession session) Modified: trunk/hornetq-jms/src/main/java/org/hornetq/jms/client/HornetQTem= poraryQueue.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hornetq-jms/src/main/java/org/hornetq/jms/client/HornetQTemporary= Queue.java 2012-01-23 12:01:43 UTC (rev 12045) +++ trunk/hornetq-jms/src/main/java/org/hornetq/jms/client/HornetQTemporary= Queue.java 2012-01-23 12:02:38 UTC (rev 12046) @@ -46,8 +46,6 @@ /** * @param address * @param name - * @param temporary - * @param queue * @param session */ public HornetQTemporaryQueue(String address, String name, HornetQSessio= n session) Modified: trunk/hornetq-jms/src/main/java/org/hornetq/jms/persistence/confi= g/PersistedConnectionFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hornetq-jms/src/main/java/org/hornetq/jms/persistence/config/Pers= istedConnectionFactory.java 2012-01-23 12:01:43 UTC (rev 12045) +++ trunk/hornetq-jms/src/main/java/org/hornetq/jms/persistence/config/Pers= istedConnectionFactory.java 2012-01-23 12:02:38 UTC (rev 12046) @@ -42,7 +42,6 @@ } = /** - * @param id * @param config */ public PersistedConnectionFactory(final ConnectionFactoryConfiguration = config) --===============1927936759370530913==--