[hornetq-commits] JBoss hornetq SVN: r9853 - in branches/Branch_New_Paging: src/main/org/hornetq/core/paging and 9 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Mon Nov 8 13:03:30 EST 2010
Author: clebert.suconic at jboss.com
Date: 2010-11-08 13:03:29 -0500 (Mon, 08 Nov 2010)
New Revision: 9853
Modified:
branches/Branch_New_Paging/hornetq.ipr
branches/Branch_New_Paging/hornetq.iws
branches/Branch_New_Paging/src/main/org/hornetq/core/paging/PagingStoreFactory.java
branches/Branch_New_Paging/src/main/org/hornetq/core/paging/impl/PagingManagerImpl.java
branches/Branch_New_Paging/src/main/org/hornetq/core/paging/impl/PagingStoreFactoryNIO.java
branches/Branch_New_Paging/src/main/org/hornetq/core/postoffice/AddressManager.java
branches/Branch_New_Paging/src/main/org/hornetq/core/postoffice/Bindings.java
branches/Branch_New_Paging/src/main/org/hornetq/core/postoffice/BindingsFactory.java
branches/Branch_New_Paging/src/main/org/hornetq/core/postoffice/PostOffice.java
branches/Branch_New_Paging/src/main/org/hornetq/core/postoffice/impl/BindingsImpl.java
branches/Branch_New_Paging/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java
branches/Branch_New_Paging/src/main/org/hornetq/core/postoffice/impl/SimpleAddressManager.java
branches/Branch_New_Paging/src/main/org/hornetq/core/postoffice/impl/WildcardAddressManager.java
branches/Branch_New_Paging/src/main/org/hornetq/core/server/ServerSession.java
branches/Branch_New_Paging/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java
branches/Branch_New_Paging/tests/src/org/hornetq/tests/integration/client/PagingTest.java
branches/Branch_New_Paging/tests/src/org/hornetq/tests/integration/paging/PageCrashTest.java
branches/Branch_New_Paging/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingStoreImplTest.java
branches/Branch_New_Paging/tests/src/org/hornetq/tests/unit/core/postoffice/impl/BindingsImplTest.java
Log:
minor changes
Modified: branches/Branch_New_Paging/hornetq.ipr
===================================================================
--- branches/Branch_New_Paging/hornetq.ipr 2010-11-08 14:22:13 UTC (rev 9852)
+++ branches/Branch_New_Paging/hornetq.ipr 2010-11-08 18:03:29 UTC (rev 9853)
@@ -631,7 +631,7 @@
<module fileurl="file://$PROJECT_DIR$/tests/hornetq-tests.iml" filepath="$PROJECT_DIR$/tests/hornetq-tests.iml" />
</modules>
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/classes" />
</component>
<component name="ResourceManagerContainer">
Modified: branches/Branch_New_Paging/hornetq.iws
===================================================================
--- branches/Branch_New_Paging/hornetq.iws 2010-11-08 14:22:13 UTC (rev 9852)
+++ branches/Branch_New_Paging/hornetq.iws 2010-11-08 18:03:29 UTC (rev 9853)
@@ -2,48 +2,14 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" readonly="true" id="a2aae645-dbcd-4d6e-9c99-efa05d93589a" name="Default" comment="">
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/javaee/jca-remote/server/ra.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/javaee/jca-remote/src/org/hornetq/javaee/example/server" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/javaee/jca-remote/server0/hornetq-configuration.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/javaee/jca-remote/readme.html" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/javaee/jca-remote/src/org/hornetq/javaee/example/server/MDBQueue.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/javaee/jca-remote/server0/hornetq-jms.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/docs/user-manual/en/appserver-integration.xml" afterPath="$PROJECT_DIR$/docs/user-manual/en/appserver-integration.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/javaee/jca-remote/config/META-INF/application.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/javaee/jca-remote" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/javaee/jca-remote/build.sh" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/javaee/jca-remote/src/org/hornetq/javaee/example/MDBRemoteServerClientExample.java" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/javaee/jca-remote/src/org/hornetq/javaee" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/javaee/jca-remote/build.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/javaee/jca-remote/server" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/javaee/jca-remote/src" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/examples/javaee/common/build.xml" afterPath="$PROJECT_DIR$/examples/javaee/common/build.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/javaee/jca-remote/config/ant.properties" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/javaee/jca-remote/src/org" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/javaee/jca-remote/build.bat" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/javaee/jca-remote/server0/hornetq-users.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/javaee/jca-remote/server/hornetq-configuration.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/javaee/jca-remote/server/hornetq-jms.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/docs/user-manual/en/examples.xml" afterPath="$PROJECT_DIR$/docs/user-manual/en/examples.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/javaee/jca-remote/server/jms-ds.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/javaee/jca-remote/config/META-INF" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/javaee/jca-remote/server0/client-jndi.properties" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/javaee/jca-remote/src/org/hornetq/javaee/example" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/javaee/jca-remote/src/org/hornetq" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/javaee/jca-remote/server0" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/javaee/jca-remote/server0/hornetq-beans.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/javaee/jca-remote/config/client.jndi.properties" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/javaee/jca-remote/config" />
- </list>
- <list id="5341122e-b51c-4e90-b798-7086790ef7e8" name="intellij" comment="">
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq.iml" afterPath="$PROJECT_DIR$/hornetq.iml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/examples/javaee/hornetq-javaee-examples.iml" afterPath="$PROJECT_DIR$/examples/javaee/hornetq-javaee-examples.iml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq.iws" afterPath="$PROJECT_DIR$/hornetq.iws" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/examples/jms/hornetq-jms-examples.iml" afterPath="$PROJECT_DIR$/examples/jms/hornetq-jms-examples.iml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq.ipr" afterPath="$PROJECT_DIR$/hornetq.ipr" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq.iws" afterPath="$PROJECT_DIR$/hornetq.iws" />
</list>
- <ignored path=".idea/workspace.xml" />
+ <list id="5341122e-b51c-4e90-b798-7086790ef7e8" name="intellij" comment="" />
+ <ignored path="$USER_HOME_GRAILS$/" />
<ignored path="messaging.iws" />
+ <ignored path=".idea/workspace.xml" />
+ <ignored path="$USER_HOME_GRIFFON$/" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -138,7 +104,7 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/src/main/org/hornetq/integration/jboss/security/JBossASSecurityManager.java" line="145" class="org.hornetq.integration.jboss.security.JBossASSecurityManager" package="org.hornetq.integration.jboss.security">
+ <breakpoint url="file://$PROJECT_DIR$/src/main/org/hornetq/integration/jboss/security/JBossASSecurityManager.java" line="145" class="org.hornetq.integration.jboss.security.JBossASSecurityManager$1" package="org.hornetq.integration.jboss.security">
<option name="ENABLED" value="true" />
<option name="LOG_ENABLED" value="false" />
<option name="LOG_EXPRESSION_ENABLED" value="false" />
@@ -242,7 +208,7 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/tests/src/org/hornetq/tests/integration/ra/HornetQMessageHandlerTest.java" line="234" class="org.hornetq.tests.integration.ra.HornetQMessageHandlerTest.DummyMessageEndpoint" package="org.hornetq.tests.integration.ra">
+ <breakpoint url="file://$PROJECT_DIR$/tests/src/org/hornetq/tests/integration/ra/HornetQMessageHandlerTest.java" line="234" class="org.hornetq.tests.integration.ra.HornetQMessageHandlerTest" package="org.hornetq.tests.integration.ra">
<option name="ENABLED" value="true" />
<option name="LOG_ENABLED" value="false" />
<option name="LOG_EXPRESSION_ENABLED" value="false" />
@@ -323,100 +289,24 @@
<component name="FileColors" enabled="true" enabledForTabs="true" />
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="MDBRemoteServerClientExample.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/examples/javaee/jca-remote/src/org/hornetq/javaee/example/MDBRemoteServerClientExample.java">
+ <file leaf-file-name="PageCursorTest.java" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/tests/src/org/hornetq/tests/integration/paging/PageCursorTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="95" column="17" selection-start="3054" selection-end="3226" vertical-scroll-proportion="0.0">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="readme.html" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/examples/javaee/jca-remote/readme.html">
- <provider selected="true" editor-type-id="text-editor">
- <state line="46" column="44" selection-start="2573" selection-end="3415" vertical-scroll-proportion="-16.304348">
+ <state line="459" column="11" selection-start="14538" selection-end="14538" vertical-scroll-proportion="0.80944353">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="appserver-integration.xml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/docs/user-manual/en/appserver-integration.xml">
+ <file leaf-file-name="SpringBindingRegistry.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/org/hornetq/integration/spring/SpringBindingRegistry.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="836" column="101" selection-start="48141" selection-end="48141" vertical-scroll-proportion="-15.04">
+ <state line="3" column="47" selection-start="140" selection-end="140" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="examples.xml" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/docs/user-manual/en/examples.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state line="534" column="124" selection-start="33920" selection-end="33920" vertical-scroll-proportion="0.4304762">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="ra.xml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/examples/javaee/jca-remote/server/ra.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state line="61" column="27" selection-start="2184" selection-end="3025" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="hornetq-configuration.xml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/examples/javaee/jca-remote/server0/hornetq-configuration.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state line="46" column="49" selection-start="1976" selection-end="1976" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="MDBQueue.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/examples/javaee/jca-remote/src/org/hornetq/javaee/example/server/MDBQueue.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="46" column="25" selection-start="1849" selection-end="1865" vertical-scroll-proportion="0.0">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="StatelessSenderService.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/examples/javaee/jca-config/src/org/hornetq/javaee/example/server2/StatelessSenderService.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="23" column="17" selection-start="806" selection-end="806" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="StatelessSender.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/examples/javaee/jca-config/src/org/hornetq/javaee/example/server2/StatelessSender.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="50" column="59" selection-start="1556" selection-end="1609" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="MDB_BMTClientExample.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/examples/javaee/mdb-bmt/src/org/hornetq/javaee/example/MDB_BMTClientExample.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="71" column="32" selection-start="2239" selection-end="2468" vertical-scroll-proportion="0.0">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
</leaf>
</component>
<component name="FindManager">
@@ -424,10 +314,13 @@
<setting name="OPEN_NEW_TAB" value="true" />
</FindUsagesManager>
</component>
+ <component name="Git.Settings">
+ <option name="GIT_EXECUTABLE" value="git" />
+ <option name="CHECKOUT_INCLUDE_TAGS" value="false" />
+ </component>
<component name="IdeDocumentHistory">
<option name="changedFiles">
<list>
- <option value="$PROJECT_DIR$/examples/javaee/jca-config/build.xml" />
<option value="$PROJECT_DIR$/examples/javaee/jca-remote/config/jndi.properties" />
<option value="$PROJECT_DIR$/examples/javaee/jca-remote/server0/hornetq-beans.xml" />
<option value="$PROJECT_DIR$/examples/javaee/jca-remote/server/hornetq-configuration.xml" />
@@ -443,6 +336,7 @@
<option value="$PROJECT_DIR$/examples/javaee/jca-remote/readme.html" />
<option value="$PROJECT_DIR$/docs/user-manual/en/appserver-integration.xml" />
<option value="$PROJECT_DIR$/docs/user-manual/en/examples.xml" />
+ <option value="$PROJECT_DIR$/tests/src/org/hornetq/tests/integration/paging/PageCursorTest.java" />
</list>
</option>
</component>
@@ -1355,7 +1249,7 @@
<option name="STATE" value="0" />
</component>
<component name="ProjectView">
- <navigator currentView="ProjectPane" proportions="" version="1" splitterProportion="0.5">
+ <navigator currentView="PackagesPane" proportions="" version="1" splitterProportion="0.5">
<flattenPackages />
<showMembers />
<showModules />
@@ -1367,7 +1261,6 @@
<sortByType />
</navigator>
<panes>
- <pane id="PackagesPane" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -1382,7 +1275,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="javaee" />
+ <option name="myItemId" value="trunk" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -1392,35 +1285,13 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="javaee" />
+ <option name="myItemId" value="trunk" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="mdb-bmt" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="hornetq" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="javaee" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="mdb-bmt" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="example" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -1428,33 +1299,15 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="javaee" />
+ <option name="myItemId" value="trunk" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="jca-remote" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="hornetq" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="javaee" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="jca-remote" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="example" />
+ <option name="myItemId" value="main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -1464,43 +1317,21 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="javaee" />
+ <option name="myItemId" value="trunk" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="jca-remote" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="example" />
+ <option name="myItemId" value="main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="server" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
<option name="myItemId" value="hornetq" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="javaee" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="jca-remote" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="server0" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -1508,186 +1339,94 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="javaee" />
+ <option name="myItemId" value="core" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="jca-remote" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="server" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
+ </subPane>
+ </pane>
+ <pane id="Scope" />
+ <pane id="Favorites" />
+ <pane id="PackagesPane">
+ <subPane>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="hornetq" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="javaee" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <option name="myItemId" value="hornetq-tests" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="jca-remote" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="config" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="hornetq" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="javaee" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <option name="myItemId" value="hornetq-tests" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="jca-config" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <option name="myItemId" value="org.hornetq.tests" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="hornetq" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="javaee" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <option name="myItemId" value="hornetq-tests" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="common" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <option name="myItemId" value="org.hornetq.tests" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
- </PATH>
- <PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="hornetq" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ <option name="myItemId" value="integration" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="hornetq-jms-examples" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="jms" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="hornetq" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="hornetq-jms-examples" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ <option name="myItemId" value="hornetq-tests" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="jms" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <option name="myItemId" value="org.hornetq.tests" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="queue" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <option name="myItemId" value="integration" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
- </PATH>
- <PATH>
<PATH_ELEMENT>
- <option name="myItemId" value="hornetq" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ <option name="myItemId" value="paging" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="hornetq-jms-examples" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="jms" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="queue" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="example" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="hornetq" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="hornetq-jms-examples" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="common" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="hornetq" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="hornetq-jms-examples" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="common" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="example" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="hornetq" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="hornetq-jms-examples" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="common" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="config" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
</subPane>
</pane>
- <pane id="Scope" />
- <pane id="Favorites" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth1" value="287" />
<property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth0" value="225" />
- <property name="project.structure.last.edited" value="Modules" />
+ <property name="project.structure.last.edited" value="Project" />
<property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth3" value="35" />
<property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth2" value="246" />
<property name="project.structure.proportion" value="0.15" />
@@ -1741,34 +1480,7 @@
<recent name="org.hornetq.api.core.client.HornetQClient" />
</key>
</component>
- <component name="RunManager" selected="Remote.server">
- <configuration default="false" name="DiscoveryTest.testSimpleBroadcastSpecificNIC" type="JUnit" factoryName="JUnit" temporary="true">
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="emma">
- <pattern>
- <option name="PATTERN" value="org.hornetq.tests.integration.discovery.*" />
- <option name="ENABLED" value="true" />
- </pattern>
- </extension>
- <module name="hornetq-tests" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" value="" />
- <option name="PACKAGE_NAME" value="org.hornetq.tests.integration.discovery" />
- <option name="MAIN_CLASS_NAME" value="org.hornetq.tests.integration.discovery.DiscoveryTest" />
- <option name="METHOD_NAME" value="testSimpleBroadcastSpecificNIC" />
- <option name="TEST_OBJECT" value="method" />
- <option name="VM_PARAMETERS" value="-Djava.util.logging.config.file=./src/config/trunk/clustered/logging.properties -Djava.library.path=native/bin" />
- <option name="PARAMETERS" value="" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
- <option name="ENV_VARIABLES" />
- <option name="PASS_PARENT_ENVS" value="true" />
- <option name="TEST_SEARCH_SCOPE">
- <value defaultName="moduleWithDependencies" />
- </option>
- <envs />
- <RunnerSettings RunnerId="Run" />
- <ConfigurationWrapper RunnerId="Run" />
- <method />
- </configuration>
+ <component name="RunManager" selected="JUnit.PageCursorTest">
<configuration default="false" name="QueueExample" type="Application" factoryName="Application" temporary="true">
<extension name="coverage" enabled="false" merge="false" runner="emma">
<pattern>
@@ -1776,6 +1488,7 @@
<option name="ENABLED" value="true" />
</pattern>
</extension>
+ <extension name="snapshooter" />
<option name="MAIN_CLASS_NAME" value="org.hornetq.jms.example.QueueExample" />
<option name="VM_PARAMETERS" />
<option name="PROGRAM_PARAMETERS" />
@@ -1798,6 +1511,7 @@
<option name="ENABLED" value="true" />
</pattern>
</extension>
+ <extension name="snapshooter" />
<module name="hornetq-tests" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" value="" />
@@ -1831,6 +1545,7 @@
<option name="ENABLED" value="true" />
</pattern>
</extension>
+ <extension name="snapshooter" />
<module name="hornetq-tests" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" value="" />
@@ -1858,6 +1573,7 @@
<option name="ENABLED" value="true" />
</pattern>
</extension>
+ <extension name="snapshooter" />
<module name="hornetq-tests" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" value="" />
@@ -1878,11 +1594,40 @@
<ConfigurationWrapper RunnerId="Run" />
<method />
</configuration>
+ <configuration default="false" name="PageCursorTest" type="JUnit" factoryName="JUnit" temporary="true">
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="emma">
+ <pattern>
+ <option name="PATTERN" value="org.hornetq.tests.integration.paging.*" />
+ <option name="ENABLED" value="true" />
+ </pattern>
+ </extension>
+ <extension name="snapshooter" />
+ <module name="hornetq-tests" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" value="" />
+ <option name="PACKAGE_NAME" value="org.hornetq.tests.integration.paging" />
+ <option name="MAIN_CLASS_NAME" value="org.hornetq.tests.integration.paging.PageCursorTest" />
+ <option name="METHOD_NAME" value="" />
+ <option name="TEST_OBJECT" value="class" />
+ <option name="VM_PARAMETERS" value="-Djava.util.logging.config.file=./src/config/trunk/clustered/logging.properties -Djava.library.path=native/bin" />
+ <option name="PARAMETERS" value="" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
+ <option name="ENV_VARIABLES" />
+ <option name="PASS_PARENT_ENVS" value="true" />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="moduleWithDependencies" />
+ </option>
+ <envs />
+ <RunnerSettings RunnerId="Run" />
+ <ConfigurationWrapper RunnerId="Run" />
+ <method />
+ </configuration>
<configuration default="true" type="PHPUnitRunConfigurationType" factoryName="PHPUnit">
<method>
<option name="AntTarget" enabled="false" />
<option name="BuildArtifacts" enabled="false" />
<option name="Maven.BeforeRunTask" enabled="false" />
+ <option name="ValidateXdebugSetup" enabled="true" />
</method>
</configuration>
<configuration default="true" type="Remote" factoryName="Remote">
@@ -1917,6 +1662,7 @@
</configuration>
<configuration default="true" type="Application" factoryName="Application">
<extension name="coverage" enabled="false" merge="false" runner="emma" />
+ <extension name="snapshooter" />
<option name="MAIN_CLASS_NAME" />
<option name="VM_PARAMETERS" />
<option name="PROGRAM_PARAMETERS" />
@@ -1937,6 +1683,7 @@
</configuration>
<configuration default="true" type="JUnit" factoryName="JUnit">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="emma" />
+ <extension name="snapshooter" />
<module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" value="" />
@@ -1967,6 +1714,7 @@
<option name="ENABLED" value="true" />
</pattern>
</extension>
+ <extension name="snapshooter" />
<module name="hornetq-tests" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
@@ -2000,6 +1748,7 @@
<option name="ENABLED" value="true" />
</pattern>
</extension>
+ <extension name="snapshooter" />
<module name="hornetq-tests" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" value="" />
@@ -2027,6 +1776,7 @@
<option name="ENABLED" value="true" />
</pattern>
</extension>
+ <extension name="snapshooter" />
<module name="hornetq-tests" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" value="" />
@@ -2064,13 +1814,7 @@
<option name="TRANSPORT" value="0" />
<option name="LOCAL" value="false" />
</RunnerSettings>
- <RunnerSettings RunnerId="Debug">
- <option name="DEBUG_PORT" value="5005" />
- <option name="TRANSPORT" value="0" />
- <option name="LOCAL" value="false" />
- </RunnerSettings>
<ConfigurationWrapper RunnerId="Debug" />
- <ConfigurationWrapper RunnerId="Debug" />
<method />
</configuration>
<configuration default="false" name="EnqueueDurable" type="Application" factoryName="Application">
@@ -2080,6 +1824,7 @@
<option name="ENABLED" value="true" />
</pattern>
</extension>
+ <extension name="snapshooter" />
<option name="MAIN_CLASS_NAME" value="org.hornetq.test.EnqueueDurable" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="127.0.0.1" />
@@ -2096,11 +1841,11 @@
<method />
</configuration>
<list size="10">
- <item index="0" class="java.lang.String" itemvalue="JUnit.DiscoveryTest.testSimpleBroadcastSpecificNIC" />
- <item index="1" class="java.lang.String" itemvalue="Application.QueueExample" />
- <item index="2" class="java.lang.String" itemvalue="JUnit.HornetQMessageHandlerTest.testSelectorNotChanged" />
- <item index="3" class="java.lang.String" itemvalue="JUnit.HornetQMessageHandlerTest.testSelectorChanged" />
- <item index="4" class="java.lang.String" itemvalue="JUnit.HornetQMessageHandlerTest" />
+ <item index="0" class="java.lang.String" itemvalue="Application.QueueExample" />
+ <item index="1" class="java.lang.String" itemvalue="JUnit.HornetQMessageHandlerTest.testSelectorNotChanged" />
+ <item index="2" class="java.lang.String" itemvalue="JUnit.HornetQMessageHandlerTest.testSelectorChanged" />
+ <item index="3" class="java.lang.String" itemvalue="JUnit.HornetQMessageHandlerTest" />
+ <item index="4" class="java.lang.String" itemvalue="JUnit.PageCursorTest" />
<item index="5" class="java.lang.String" itemvalue="JUnit.LargeMessageTest" />
<item index="6" class="java.lang.String" itemvalue="JUnit.NettyFailoverTest.test" />
<item index="7" class="java.lang.String" itemvalue="JUnit.GroupingFailoverReplicationTest.test" />
@@ -2123,6 +1868,7 @@
<option name="UPDATE_LOCK_ON_DEMAND" value="false" />
<option name="IGNORE_SPACES_IN_MERGE" value="false" />
<option name="DETECT_NESTED_COPIES" value="false" />
+ <option name="CHECK_NESTED_FOR_QUICK_MERGE" value="false" />
<option name="IGNORE_SPACES_IN_ANNOTATE" value="true" />
<option name="SHOW_MERGE_SOURCES_IN_ANNOTATE" value="true" />
<configuration useDefault="false">$PROJECT_DIR$/../../.subversion</configuration>
@@ -2183,26 +1929,28 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="-3" y="25" width="1926" height="1033" extended-state="6" />
+ <frame x="0" y="22" width="1440" height="742" extended-state="0" />
<editor active="false" />
<layout>
- <window_info id="Changes" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.34723788" sideWeight="0.0" order="7" side_tool="false" content_ui="tabs" />
+ <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.34615386" sideWeight="0.0" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.48703495" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17925592" sideWeight="0.0" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+ <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17587373" sideWeight="0.0" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.16344294" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
- <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24959914" sideWeight="0.7006937" order="1" side_tool="false" content_ui="tabs" />
+ <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24946082" sideWeight="0.64456236" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.17263496" sideWeight="0.64487034" order="0" side_tool="false" content_ui="tabs" />
+ <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+ <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.22142343" sideWeight="0.82758623" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.20599613" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.48703495" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Dataflow to this" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+ <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.16312997" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
</layout>
@@ -2860,118 +2608,84 @@
</buildFile>
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/examples/javaee/jca-remote/server0/client-jndi.properties">
+ <entry file="file://$PROJECT_DIR$/examples/javaee/jca-config/src/org/hornetq/javaee/example/server2/MDBQueueB.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="14" column="43" selection-start="722" selection-end="722" vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="36" column="13" selection-start="1596" selection-end="1596" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/examples/javaee/jca-remote/server0/hornetq-jms.xml">
+ <entry file="file://$PROJECT_DIR$/examples/javaee/jca-config/src/org/hornetq/javaee/example/server/MDBQueueA.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="17" column="29" selection-start="891" selection-end="908" vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="36" column="13" selection-start="1593" selection-end="1593" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/examples/javaee/jca-config/src/org/hornetq/javaee/example/server2/MDBQueueB.java">
+ <entry file="file://$PROJECT_DIR$/examples/javaee/jca-config/readme.html">
<provider selected="true" editor-type-id="text-editor">
- <state line="36" column="13" selection-start="1596" selection-end="1596" vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="149" column="19" selection-start="9467" selection-end="9815" vertical-scroll-proportion="-16.956522" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/examples/javaee/jca-config/src/org/hornetq/javaee/example/server/MDBQueueA.java">
+ <entry file="file://$PROJECT_DIR$/examples/javaee/jca-remote/server/jms-ds.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="36" column="13" selection-start="1593" selection-end="1593" vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="34" column="31" selection-start="960" selection-end="1628" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/examples/javaee/jca-config/readme.html">
+ <entry file="file://$PROJECT_DIR$/examples/javaee/jca-remote/src/org/hornetq/javaee/example/MDBRemoteServerClientExample.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="149" column="19" selection-start="9467" selection-end="9815" vertical-scroll-proportion="-16.956522">
- <folding />
- </state>
+ <state line="95" column="17" selection-start="3054" selection-end="3226" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/examples/javaee/jca-remote/server/jms-ds.xml">
+ <entry file="file://$PROJECT_DIR$/examples/javaee/jca-remote/readme.html">
<provider selected="true" editor-type-id="text-editor">
- <state line="34" column="31" selection-start="960" selection-end="1628" vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="46" column="44" selection-start="2573" selection-end="3415" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/examples/javaee/jca-remote/server0/hornetq-configuration.xml">
+ <entry file="file://$PROJECT_DIR$/docs/user-manual/en/appserver-integration.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="46" column="49" selection-start="1976" selection-end="1976" vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="836" column="101" selection-start="47514" selection-end="47514" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/examples/javaee/jca-config/src/org/hornetq/javaee/example/server2/StatelessSenderService.java">
+ <entry file="file://$PROJECT_DIR$/examples/javaee/jca-remote/server/ra.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="23" column="17" selection-start="806" selection-end="806" vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="61" column="27" selection-start="2184" selection-end="3025" vertical-scroll-proportion="0.026258206" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/examples/javaee/jca-config/src/org/hornetq/javaee/example/server2/StatelessSender.java">
+ <entry file="file://$PROJECT_DIR$/examples/javaee/jca-remote/server0/hornetq-configuration.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="50" column="59" selection-start="1556" selection-end="1609" vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="46" column="49" selection-start="1976" selection-end="1976" vertical-scroll-proportion="0.5536105" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/examples/javaee/mdb-bmt/src/org/hornetq/javaee/example/MDB_BMTClientExample.java">
+ <entry file="file://$PROJECT_DIR$/examples/javaee/jca-remote/src/org/hornetq/javaee/example/server/MDBQueue.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="71" column="32" selection-start="2239" selection-end="2468" vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="46" column="25" selection-start="1849" selection-end="1865" vertical-scroll-proportion="0.026258206" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/examples/javaee/jca-remote/server/ra.xml">
+ <entry file="file://$PROJECT_DIR$/examples/javaee/jca-config/src/org/hornetq/javaee/example/server2/StatelessSenderService.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="61" column="27" selection-start="2184" selection-end="3025" vertical-scroll-proportion="0.0">
- <folding />
- </state>
+ <state line="23" column="17" selection-start="806" selection-end="806" vertical-scroll-proportion="0.60393876" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/examples/javaee/jca-remote/src/org/hornetq/javaee/example/MDBRemoteServerClientExample.java">
+ <entry file="file://$PROJECT_DIR$/examples/javaee/jca-config/src/org/hornetq/javaee/example/server2/StatelessSender.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="95" column="17" selection-start="3054" selection-end="3226" vertical-scroll-proportion="0.0">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
+ <state line="50" column="59" selection-start="1556" selection-end="1609" vertical-scroll-proportion="0.026258206" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/examples/javaee/jca-remote/src/org/hornetq/javaee/example/server/MDBQueue.java">
+ <entry file="file://$PROJECT_DIR$/examples/javaee/mdb-bmt/src/org/hornetq/javaee/example/MDB_BMTClientExample.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="46" column="25" selection-start="1849" selection-end="1865" vertical-scroll-proportion="0.0">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
+ <state line="71" column="32" selection-start="2239" selection-end="2468" vertical-scroll-proportion="0.76367617" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/examples/javaee/jca-remote/readme.html">
+ <entry file="file://$PROJECT_DIR$/docs/user-manual/en/examples.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="46" column="44" selection-start="2573" selection-end="3415" vertical-scroll-proportion="-16.304348">
- <folding />
- </state>
+ <state line="534" column="124" selection-start="34000" selection-end="34000" vertical-scroll-proportion="0.51487416" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/docs/user-manual/en/appserver-integration.xml">
+ <entry file="file://$PROJECT_DIR$/src/main/org/hornetq/integration/spring/SpringBindingRegistry.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="836" column="101" selection-start="48141" selection-end="48141" vertical-scroll-proportion="-15.04">
- <folding />
- </state>
+ <state line="3" column="47" selection-start="140" selection-end="140" vertical-scroll-proportion="0.0" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/docs/user-manual/en/examples.xml">
+ <entry file="file://$PROJECT_DIR$/tests/src/org/hornetq/tests/integration/paging/PageCursorTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="534" column="124" selection-start="33920" selection-end="33920" vertical-scroll-proportion="0.4304762">
+ <state line="459" column="11" selection-start="14538" selection-end="14538" vertical-scroll-proportion="0.80944353">
<folding />
</state>
</provider>
Modified: branches/Branch_New_Paging/src/main/org/hornetq/core/paging/PagingStoreFactory.java
===================================================================
--- branches/Branch_New_Paging/src/main/org/hornetq/core/paging/PagingStoreFactory.java 2010-11-08 14:22:13 UTC (rev 9852)
+++ branches/Branch_New_Paging/src/main/org/hornetq/core/paging/PagingStoreFactory.java 2010-11-08 18:03:29 UTC (rev 9853)
@@ -30,7 +30,7 @@
*/
public interface PagingStoreFactory
{
- PagingStore newStore(SimpleString address, AddressSettings addressSettings) throws Exception;
+ PagingStore newStore(SimpleString address, AddressSettings addressSettings);
void stop() throws InterruptedException;
Modified: branches/Branch_New_Paging/src/main/org/hornetq/core/paging/impl/PagingManagerImpl.java
===================================================================
--- branches/Branch_New_Paging/src/main/org/hornetq/core/paging/impl/PagingManagerImpl.java 2010-11-08 14:22:13 UTC (rev 9852)
+++ branches/Branch_New_Paging/src/main/org/hornetq/core/paging/impl/PagingManagerImpl.java 2010-11-08 18:03:29 UTC (rev 9853)
@@ -244,7 +244,7 @@
// Private -------------------------------------------------------
- protected PagingStore newStore(final SimpleString address) throws Exception
+ protected PagingStore newStore(final SimpleString address)
{
return pagingStoreFactory.newStore(address,
addressSettingsRepository.getMatch(address.toString()));
Modified: branches/Branch_New_Paging/src/main/org/hornetq/core/paging/impl/PagingStoreFactoryNIO.java
===================================================================
--- branches/Branch_New_Paging/src/main/org/hornetq/core/paging/impl/PagingStoreFactoryNIO.java 2010-11-08 14:22:13 UTC (rev 9852)
+++ branches/Branch_New_Paging/src/main/org/hornetq/core/paging/impl/PagingStoreFactoryNIO.java 2010-11-08 18:03:29 UTC (rev 9853)
@@ -87,7 +87,7 @@
{
}
- public synchronized PagingStore newStore(final SimpleString address, final AddressSettings settings) throws Exception
+ public synchronized PagingStore newStore(final SimpleString address, final AddressSettings settings)
{
return new PagingStoreImpl(address,
Modified: branches/Branch_New_Paging/src/main/org/hornetq/core/postoffice/AddressManager.java
===================================================================
--- branches/Branch_New_Paging/src/main/org/hornetq/core/postoffice/AddressManager.java 2010-11-08 14:22:13 UTC (rev 9852)
+++ branches/Branch_New_Paging/src/main/org/hornetq/core/postoffice/AddressManager.java 2010-11-08 18:03:29 UTC (rev 9853)
@@ -25,13 +25,13 @@
*/
public interface AddressManager
{
- boolean addBinding(Binding binding);
+ boolean addBinding(Binding binding) throws Exception;
- Binding removeBinding(SimpleString uniqueName);
+ Binding removeBinding(SimpleString uniqueName) throws Exception;
- Bindings getBindingsForRoutingAddress(SimpleString address);
+ Bindings getBindingsForRoutingAddress(SimpleString address) throws Exception;
- Bindings getMatchingBindings(SimpleString address);
+ Bindings getMatchingBindings(SimpleString address) throws Exception;
void clear();
Modified: branches/Branch_New_Paging/src/main/org/hornetq/core/postoffice/Bindings.java
===================================================================
--- branches/Branch_New_Paging/src/main/org/hornetq/core/postoffice/Bindings.java 2010-11-08 14:22:13 UTC (rev 9852)
+++ branches/Branch_New_Paging/src/main/org/hornetq/core/postoffice/Bindings.java 2010-11-08 18:03:29 UTC (rev 9853)
@@ -15,6 +15,7 @@
import java.util.Collection;
+import org.hornetq.core.paging.PagingStore;
import org.hornetq.core.server.Queue;
import org.hornetq.core.server.RoutingContext;
import org.hornetq.core.server.ServerMessage;
@@ -41,4 +42,6 @@
boolean redistribute(ServerMessage message, Queue originatingQueue, RoutingContext context) throws Exception;
void route(ServerMessage message, RoutingContext context) throws Exception;
+
+ PagingStore getPagingStore();
}
Modified: branches/Branch_New_Paging/src/main/org/hornetq/core/postoffice/BindingsFactory.java
===================================================================
--- branches/Branch_New_Paging/src/main/org/hornetq/core/postoffice/BindingsFactory.java 2010-11-08 14:22:13 UTC (rev 9852)
+++ branches/Branch_New_Paging/src/main/org/hornetq/core/postoffice/BindingsFactory.java 2010-11-08 18:03:29 UTC (rev 9853)
@@ -12,6 +12,8 @@
*/
package org.hornetq.core.postoffice;
+import org.hornetq.api.core.SimpleString;
+
/**
* A factory for creating bindings
*
@@ -19,5 +21,5 @@
*/
public interface BindingsFactory
{
- Bindings createBindings();
+ Bindings createBindings(SimpleString address) throws Exception;
}
Modified: branches/Branch_New_Paging/src/main/org/hornetq/core/postoffice/PostOffice.java
===================================================================
--- branches/Branch_New_Paging/src/main/org/hornetq/core/postoffice/PostOffice.java 2010-11-08 14:22:13 UTC (rev 9852)
+++ branches/Branch_New_Paging/src/main/org/hornetq/core/postoffice/PostOffice.java 2010-11-08 18:03:29 UTC (rev 9853)
@@ -47,7 +47,7 @@
Binding getBinding(SimpleString uniqueName);
- Bindings getMatchingBindings(SimpleString address);
+ Bindings getMatchingBindings(SimpleString address) throws Exception;
void route(ServerMessage message, boolean direct) throws Exception;
Modified: branches/Branch_New_Paging/src/main/org/hornetq/core/postoffice/impl/BindingsImpl.java
===================================================================
--- branches/Branch_New_Paging/src/main/org/hornetq/core/postoffice/impl/BindingsImpl.java 2010-11-08 14:22:13 UTC (rev 9852)
+++ branches/Branch_New_Paging/src/main/org/hornetq/core/postoffice/impl/BindingsImpl.java 2010-11-08 18:03:29 UTC (rev 9853)
@@ -27,6 +27,7 @@
import org.hornetq.core.filter.Filter;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.message.impl.MessageImpl;
+import org.hornetq.core.paging.PagingStore;
import org.hornetq.core.postoffice.Binding;
import org.hornetq.core.postoffice.Bindings;
import org.hornetq.core.server.Queue;
@@ -60,10 +61,13 @@
private volatile boolean routeWhenNoConsumers;
private final GroupingHandler groupingHandler;
+
+ private final PagingStore pageStore;
- public BindingsImpl(final GroupingHandler groupingHandler)
+ public BindingsImpl(final GroupingHandler groupingHandler, final PagingStore pageStore)
{
this.groupingHandler = groupingHandler;
+ this.pageStore = pageStore;
}
public void setRouteWhenNoConsumers(final boolean routeWhenNoConsumers)
@@ -218,7 +222,22 @@
return false;
}
}
+
+ public PagingStore getPagingStore()
+ {
+ return pageStore;
+ }
+ public void paged(final ServerMessage message)
+ {
+
+ }
+
+ public boolean page(final ServerMessage message) throws Exception
+ {
+ return pageStore.page(message);
+ }
+
public void route(final ServerMessage message, final RoutingContext context) throws Exception
{
boolean routed = false;
Modified: branches/Branch_New_Paging/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java
===================================================================
--- branches/Branch_New_Paging/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java 2010-11-08 14:22:13 UTC (rev 9852)
+++ branches/Branch_New_Paging/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java 2010-11-08 18:03:29 UTC (rev 9853)
@@ -508,13 +508,13 @@
return binding;
}
- public Bindings getBindingsForAddress(final SimpleString address)
+ public Bindings getBindingsForAddress(final SimpleString address) throws Exception
{
Bindings bindings = addressManager.getBindingsForRoutingAddress(address);
if (bindings == null)
{
- bindings = createBindings();
+ bindings = createBindings(address);
}
return bindings;
@@ -525,7 +525,7 @@
return addressManager.getBinding(name);
}
- public Bindings getMatchingBindings(final SimpleString address)
+ public Bindings getMatchingBindings(final SimpleString address) throws Exception
{
return addressManager.getMatchingBindings(address);
}
@@ -606,47 +606,13 @@
cache.addToCache(duplicateIDBytes, context.getTransaction());
}
- if (context.getTransaction() == null)
- {
- if (message.page())
- {
- return;
- }
- }
- else
- {
- Transaction tx = context.getTransaction();
-
- boolean depage = tx.getProperty(TransactionPropertyIndexes.IS_DEPAGE) != null;
-
- // if the TX paged at least one message on a given address, all the other message on the same address should also go towards
- // paging cache now
- boolean alreadyPaging = false;
-
- if (tx.isPaging())
- {
- alreadyPaging = getPageOperation(tx).isPaging(message.getAddress());
- }
-
- if (!depage && message.storeIsPaging() || alreadyPaging)
- {
- tx.setPaging(true);
- getPageOperation(tx).addMessageToPage(message);
- if (startedTx)
- {
- tx.commit();
- }
-
- return;
- }
- }
-
Bindings bindings = addressManager.getBindingsForRoutingAddress(address);
if (bindings != null)
{
bindings.route(message, context);
}
+
if (context.getQueueCount() == 0)
{
// Send to DLA if appropriate
@@ -1014,27 +980,6 @@
return message;
}
- private final PageMessageOperation getPageOperation(final Transaction tx)
- {
- // you could have races on the case two sessions using the same XID
- // so this whole operation needs to be atomic per TX
- synchronized (tx)
- {
- PageMessageOperation oper = (PageMessageOperation)tx.getProperty(TransactionPropertyIndexes.PAGE_MESSAGES_OPERATION);
-
- if (oper == null)
- {
- oper = new PageMessageOperation();
-
- tx.putProperty(TransactionPropertyIndexes.PAGE_MESSAGES_OPERATION, oper);
-
- tx.addOperation(oper);
- }
-
- return oper;
- }
- }
-
private class Reaper implements Runnable
{
private volatile boolean closed = false;
@@ -1114,184 +1059,6 @@
}
}
- private class PageMessageOperation implements TransactionOperation
- {
- private final HashMap<SimpleString, Pair<PagingStore, List<ServerMessage>>> pagingData = new HashMap<SimpleString, Pair<PagingStore, List<ServerMessage>>>();
-
- private Transaction subTX = null;
-
- void addMessageToPage(final ServerMessage message)
- {
- Pair<PagingStore, List<ServerMessage>> pagePair = pagingData.get(message.getAddress());
- if (pagePair == null)
- {
- pagePair = new Pair<PagingStore, List<ServerMessage>>(message.getPagingStore(),
- new ArrayList<ServerMessage>());
- pagingData.put(message.getAddress(), pagePair);
- }
-
- pagePair.b.add(message);
- }
-
- boolean isPaging(final SimpleString address)
- {
- return pagingData.get(address) != null;
- }
-
- public void afterCommit(final Transaction tx)
- {
- // If part of the transaction goes to the queue, and part goes to paging, we can't let depage start for the
- // transaction until all the messages were added to the queue
- // or else we could deliver the messages out of order
-
- PageTransactionInfo pageTransaction = (PageTransactionInfo)tx.getProperty(TransactionPropertyIndexes.PAGE_TRANSACTION);
-
- if (pageTransaction != null)
- {
- pageTransaction.commit();
- }
-
- if (subTX != null)
- {
- subTX.afterCommit();
- }
- }
-
- public void afterPrepare(final Transaction tx)
- {
- if (subTX != null)
- {
- subTX.afterPrepare();
- }
- }
-
- public void afterRollback(final Transaction tx)
- {
- PageTransactionInfo pageTransaction = (PageTransactionInfo)tx.getProperty(TransactionPropertyIndexes.PAGE_TRANSACTION);
-
- if (tx.getState() == State.PREPARED && pageTransaction != null)
- {
- pageTransaction.rollback();
- }
-
- if (subTX != null)
- {
- subTX.afterRollback();
- }
- }
-
- public void beforeCommit(final Transaction tx) throws Exception
- {
- if (tx.getState() != Transaction.State.PREPARED)
- {
- pageMessages(tx);
- }
-
- if (subTX != null)
- {
- subTX.beforeCommit();
- }
-
- }
-
- public void beforePrepare(final Transaction tx) throws Exception
- {
- pageMessages(tx);
-
- if (subTX != null)
- {
- subTX.beforePrepare();
- }
- }
-
- public void beforeRollback(final Transaction tx) throws Exception
- {
- if (subTX != null)
- {
- subTX.beforeRollback();
- }
- }
-
- private void pageMessages(final Transaction tx) throws Exception
- {
- if (!pagingData.isEmpty())
- {
- PageTransactionInfo pageTransaction = (PageTransactionInfo)tx.getProperty(TransactionPropertyIndexes.PAGE_TRANSACTION);
-
- if (pageTransaction == null)
- {
- pageTransaction = new PageTransactionInfoImpl(tx.getID());
-
- tx.putProperty(TransactionPropertyIndexes.PAGE_TRANSACTION, pageTransaction);
-
- // To avoid a race condition where depage happens before the transaction is completed, we need to inform
- // the pager about this transaction is being processed
- pagingManager.addTransaction(pageTransaction);
- }
-
- boolean pagingPersistent = false;
-
- ArrayList<ServerMessage> nonPagedMessages = null;
-
- for (Pair<PagingStore, List<ServerMessage>> pair : pagingData.values())
- {
-
- if (!pair.a.page(pair.b, tx.getID()))
- {
- if (nonPagedMessages == null)
- {
- nonPagedMessages = new ArrayList<ServerMessage>();
- }
- nonPagedMessages.addAll(pair.b);
- }
-
- for (ServerMessage msg : pair.b)
- {
- if (msg.isDurable())
- {
- pageTransaction.increment();
- pagingPersistent = true;
- }
- }
- }
-
- if (nonPagedMessages != null)
- {
- for (ServerMessage message : nonPagedMessages)
- {
- // This could happen when the PageStore left the pageState
- // we create a copy of the transaction so that messages are routed with the same tx ID.
- // but we can not use directly the tx as it has already its own set of TransactionOperations
- if (subTX == null)
- {
- subTX = tx.copy();
- }
-
- route(message, subTX, false);
-
- if (subTX.isContainsPersistent())
- {
- // The route wouldn't be able to update the persistent flag on the main TX
- // If we don't do this we would eventually miss a commit record
- tx.setContainsPersistent();
- }
- }
- }
-
- if (pagingPersistent)
- {
- tx.setContainsPersistent();
- for (Pair<PagingStore, List<ServerMessage>> pair : pagingData.values())
- {
- pair.a.sync();
- }
-
- pageTransaction.store(storageManager, pagingManager, tx);
- }
- }
- }
- }
-
private class AddOperation implements TransactionOperation
{
private final List<MessageReference> refs;
@@ -1343,8 +1110,8 @@
}
}
- public Bindings createBindings()
+ public Bindings createBindings(final SimpleString address) throws Exception
{
- return new BindingsImpl(server.getGroupingHandler());
+ return new BindingsImpl(server.getGroupingHandler(), pagingManager.getPageStore(address));
}
}
Modified: branches/Branch_New_Paging/src/main/org/hornetq/core/postoffice/impl/SimpleAddressManager.java
===================================================================
--- branches/Branch_New_Paging/src/main/org/hornetq/core/postoffice/impl/SimpleAddressManager.java 2010-11-08 14:22:13 UTC (rev 9852)
+++ branches/Branch_New_Paging/src/main/org/hornetq/core/postoffice/impl/SimpleAddressManager.java 2010-11-08 18:03:29 UTC (rev 9853)
@@ -46,7 +46,7 @@
this.bindingsFactory = bindingsFactory;
}
- public boolean addBinding(final Binding binding)
+ public boolean addBinding(final Binding binding) throws Exception
{
if (nameMap.putIfAbsent(binding.getUniqueName(), binding) != null)
{
@@ -56,7 +56,7 @@
return addMappingInternal(binding.getAddress(), binding);
}
- public Binding removeBinding(final SimpleString uniqueName)
+ public Binding removeBinding(final SimpleString uniqueName) throws Exception
{
Binding binding = nameMap.remove(uniqueName);
@@ -70,7 +70,7 @@
return binding;
}
- public Bindings getBindingsForRoutingAddress(final SimpleString address)
+ public Bindings getBindingsForRoutingAddress(final SimpleString address) throws Exception
{
return mappings.get(address);
}
@@ -85,11 +85,11 @@
return nameMap;
}
- public Bindings getMatchingBindings(final SimpleString address)
+ public Bindings getMatchingBindings(final SimpleString address) throws Exception
{
Address add = new AddressImpl(address);
- Bindings bindings = bindingsFactory.createBindings();
+ Bindings bindings = bindingsFactory.createBindings(address);
for (Binding binding : nameMap.values())
{
@@ -149,7 +149,7 @@
return theBinding;
}
- protected boolean addMappingInternal(final SimpleString address, final Binding binding)
+ protected boolean addMappingInternal(final SimpleString address, final Binding binding) throws Exception
{
Bindings bindings = mappings.get(address);
@@ -157,7 +157,7 @@
if (bindings == null)
{
- bindings = bindingsFactory.createBindings();
+ bindings = bindingsFactory.createBindings(address);
prevBindings = mappings.putIfAbsent(address, bindings);
Modified: branches/Branch_New_Paging/src/main/org/hornetq/core/postoffice/impl/WildcardAddressManager.java
===================================================================
--- branches/Branch_New_Paging/src/main/org/hornetq/core/postoffice/impl/WildcardAddressManager.java 2010-11-08 14:22:13 UTC (rev 9852)
+++ branches/Branch_New_Paging/src/main/org/hornetq/core/postoffice/impl/WildcardAddressManager.java 2010-11-08 18:03:29 UTC (rev 9853)
@@ -57,7 +57,7 @@
}
@Override
- public Bindings getBindingsForRoutingAddress(final SimpleString address)
+ public Bindings getBindingsForRoutingAddress(final SimpleString address) throws Exception
{
Bindings bindings = super.getBindingsForRoutingAddress(address);
@@ -93,7 +93,7 @@
* @return true if the address was a new mapping
*/
@Override
- public boolean addBinding(final Binding binding)
+ public boolean addBinding(final Binding binding) throws Exception
{
boolean exists = super.addBinding(binding);
if (!exists)
@@ -129,7 +129,7 @@
* @return true if this was the last mapping for a specific address
*/
@Override
- public Binding removeBinding(final SimpleString uniqueName)
+ public Binding removeBinding(final SimpleString uniqueName) throws Exception
{
Binding binding = super.removeBinding(uniqueName);
if (binding != null)
@@ -239,7 +239,7 @@
}
}
- private synchronized void removeAndUpdateAddressMap(final Address address)
+ private synchronized void removeAndUpdateAddressMap(final Address address) throws Exception
{
// we only remove if there are no bindings left
Bindings bindings = super.getBindingsForRoutingAddress(address.getAddress());
Modified: branches/Branch_New_Paging/src/main/org/hornetq/core/server/ServerSession.java
===================================================================
--- branches/Branch_New_Paging/src/main/org/hornetq/core/server/ServerSession.java 2010-11-08 14:22:13 UTC (rev 9852)
+++ branches/Branch_New_Paging/src/main/org/hornetq/core/server/ServerSession.java 2010-11-08 18:03:29 UTC (rev 9853)
@@ -91,7 +91,7 @@
QueueQueryResult executeQueueQuery(SimpleString name) throws Exception;
- BindingQueryResult executeBindingQuery(SimpleString address);
+ BindingQueryResult executeBindingQuery(SimpleString address) throws Exception;
void closeConsumer(long consumerID) throws Exception;
Modified: branches/Branch_New_Paging/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java
===================================================================
--- branches/Branch_New_Paging/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java 2010-11-08 14:22:13 UTC (rev 9852)
+++ branches/Branch_New_Paging/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java 2010-11-08 18:03:29 UTC (rev 9853)
@@ -471,7 +471,7 @@
return response;
}
- public BindingQueryResult executeBindingQuery(final SimpleString address)
+ public BindingQueryResult executeBindingQuery(final SimpleString address) throws Exception
{
if (address == null)
{
Modified: branches/Branch_New_Paging/tests/src/org/hornetq/tests/integration/client/PagingTest.java
===================================================================
--- branches/Branch_New_Paging/tests/src/org/hornetq/tests/integration/client/PagingTest.java 2010-11-08 14:22:13 UTC (rev 9852)
+++ branches/Branch_New_Paging/tests/src/org/hornetq/tests/integration/client/PagingTest.java 2010-11-08 18:03:29 UTC (rev 9853)
@@ -1062,7 +1062,7 @@
super(directory, executorFactory, syncNonTransactional);
}
- public synchronized PagingStore newStore(final SimpleString address, final AddressSettings settings) throws Exception
+ public synchronized PagingStore newStore(final SimpleString address, final AddressSettings settings)
{
return new HackPagingStore(address,
Modified: branches/Branch_New_Paging/tests/src/org/hornetq/tests/integration/paging/PageCrashTest.java
===================================================================
--- branches/Branch_New_Paging/tests/src/org/hornetq/tests/integration/paging/PageCrashTest.java 2010-11-08 14:22:13 UTC (rev 9852)
+++ branches/Branch_New_Paging/tests/src/org/hornetq/tests/integration/paging/PageCrashTest.java 2010-11-08 18:03:29 UTC (rev 9853)
@@ -287,13 +287,21 @@
// Public --------------------------------------------------------
@Override
- public synchronized PagingStore newStore(final SimpleString destinationName, final AddressSettings settings) throws Exception
+ public synchronized PagingStore newStore(final SimpleString destinationName, final AddressSettings settings)
{
- Field factoryField = PagingStoreFactoryNIO.class.getDeclaredField("executorFactory");
- factoryField.setAccessible(true);
-
- OrderedExecutorFactory factory = (org.hornetq.utils.OrderedExecutorFactory)factoryField.get(this);
- return new FailingPagingStore(destinationName, settings, factory, syncNonTransactional);
+ try
+ {
+ Field factoryField = PagingStoreFactoryNIO.class.getDeclaredField("executorFactory");
+ factoryField.setAccessible(true);
+
+ OrderedExecutorFactory factory = (org.hornetq.utils.OrderedExecutorFactory)factoryField.get(this);
+ return new FailingPagingStore(destinationName, settings, factory, syncNonTransactional);
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();// >> junit report
+ return null;
+ }
}
// Package protected ---------------------------------------------
Modified: branches/Branch_New_Paging/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingStoreImplTest.java
===================================================================
--- branches/Branch_New_Paging/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingStoreImplTest.java 2010-11-08 14:22:13 UTC (rev 9852)
+++ branches/Branch_New_Paging/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingStoreImplTest.java 2010-11-08 18:03:29 UTC (rev 9853)
@@ -1588,7 +1588,7 @@
/* (non-Javadoc)
* @see org.hornetq.core.paging.PagingStoreFactory#newStore(org.hornetq.utils.SimpleString, org.hornetq.core.settings.impl.AddressSettings)
*/
- public PagingStore newStore(final SimpleString destinationName, final AddressSettings addressSettings) throws Exception
+ public PagingStore newStore(final SimpleString destinationName, final AddressSettings addressSettings)
{
return null;
}
Modified: branches/Branch_New_Paging/tests/src/org/hornetq/tests/unit/core/postoffice/impl/BindingsImplTest.java
===================================================================
--- branches/Branch_New_Paging/tests/src/org/hornetq/tests/unit/core/postoffice/impl/BindingsImplTest.java 2010-11-08 14:22:13 UTC (rev 9852)
+++ branches/Branch_New_Paging/tests/src/org/hornetq/tests/unit/core/postoffice/impl/BindingsImplTest.java 2010-11-08 18:03:29 UTC (rev 9853)
@@ -86,7 +86,7 @@
{
final FakeBinding fake = new FakeBinding(new SimpleString("a"));
- final BindingsImpl bind = new BindingsImpl(null);
+ final BindingsImpl bind = new BindingsImpl(null, null);
bind.addBinding(fake);
bind.addBinding(new FakeBinding(new SimpleString("a")));
bind.addBinding(new FakeBinding(new SimpleString("a")));
More information about the hornetq-commits
mailing list