[hornetq-commits] JBoss hornetq SVN: r12023 - in branches/Branch_2_2_AS7: src/config/common and 1 other directories.

Author: ataylor Date: 2012-01-13 07:47:54 -0500 (Fri, 13 Jan 2012) New Revision: 12023 Modified: branches/Branch_2_2_AS7/build-maven.xml branches/Branch_2_2_AS7/hornetq.iws branches/Branch_2_2_AS7/src/config/common/hornetq-version.properties branches/Branch_2_2_AS7/src/main/org/hornetq/ra/recovery/RecoveryManager.java Log: version update Modified: branches/Branch_2_2_AS7/build-maven.xml =================================================================== --- branches/Branch_2_2_AS7/build-maven.xml 2012-01-13 11:27:57 UTC (rev 12022) +++ branches/Branch_2_2_AS7/build-maven.xml 2012-01-13 12:47:54 UTC (rev 12023) @@ -13,7 +13,7 @@ --> <project default="upload" name="HornetQ"> - <property name="hornetq.version" value="2.2.9.AS7.Final"/> + <property name="hornetq.version" value="2.2.10.Final"/> <property name="build.dir" value="build"/> <property name="jars.dir" value="${build.dir}/jars"/> Modified: branches/Branch_2_2_AS7/hornetq.iws =================================================================== --- branches/Branch_2_2_AS7/hornetq.iws 2012-01-13 11:27:57 UTC (rev 12022) +++ branches/Branch_2_2_AS7/hornetq.iws 2012-01-13 12:47:54 UTC (rev 12023) @@ -3,13 +3,10 @@ <component name="ChangeListManager"> <list default="true" readonly="true" id="a2aae645-dbcd-4d6e-9c99-efa05d93589a" name="Default" comment=""> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build-maven.xml" afterPath="$PROJECT_DIR$/build-maven.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq.iws" afterPath="$PROJECT_DIR$/hornetq.iws" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/config/common/hornetq-version.properties" afterPath="$PROJECT_DIR$/src/config/common/hornetq-version.properties" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/hornetq/ra/recovery/RecoveryManager.java" afterPath="$PROJECT_DIR$/src/main/org/hornetq/ra/recovery/RecoveryManager.java" /> </list> - <list id="5341122e-b51c-4e90-b798-7086790ef7e8" name="intellij" comment=""> - <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> <list id="0c941aa6-f00d-4064-a669-5627378e878f" name="recovery" comment="" /> <ignored path=".idea/workspace.xml" /> <ignored path="messaging.iws" /> @@ -334,7 +331,7 @@ <file leaf-file-name="ChannelImpl.java" pinned="false" current="true" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/src/main/org/hornetq/core/protocol/core/impl/ChannelImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="340" column="112" selection-start="9110" selection-end="9110" vertical-scroll-proportion="4.038058"> + <state line="340" column="112" selection-start="9110" selection-end="9110" vertical-scroll-proportion="1.2777778"> <folding /> </state> </provider> @@ -2154,13 +2151,14 @@ <editor active="false" /> <layout> <window_info id="simpleUML" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> - <window_info id="Changes" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.1942231" 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="Changes" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3436255" 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="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="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="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="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.17185822" sideWeight="0.8057769" order="0" 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.17185822" sideWeight="0.6563745" order="0" 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="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="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" /> @@ -2169,7 +2167,6 @@ <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="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.4860558" 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="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="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="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" /> @@ -2200,7 +2197,7 @@ <option name="CHECK_COMMIT_MESSAGE_SPELLING" value="true" /> <option name="DEFAULT_PATCH_EXTENSION" value="patch" /> <option name="FORCE_NON_EMPTY_COMMENT" value="false" /> - <option name="LAST_COMMIT_MESSAGE" value="added jca example showing connecting to remote HQ server and doc updates" /> + <option name="LAST_COMMIT_MESSAGE" value="version update" /> <option name="MAKE_NEW_CHANGELIST_ACTIVE" value="true" /> <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" /> <option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" /> @@ -2213,7 +2210,6 @@ <option name="UPDATE_GROUP_BY_CHANGELIST" value="false" /> <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" /> <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" /> - <MESSAGE value="buffer fix" /> <MESSAGE value="added maven target for creating repos files" /> <MESSAGE value="fixed import" /> <MESSAGE value="refactored client api for CLientSessionFactory, ConnectionFactory, HornetQQueue and HornetQTopic" /> @@ -2238,6 +2234,7 @@ <MESSAGE value="p" /> <MESSAGE value="https://jira.jboss.org/browse/HORNETQ-391 - fixed using the correcxt transport params" /> <MESSAGE value="added jca example showing connecting to remote HQ server and doc updates" /> + <MESSAGE value="version update" /> </component> <component name="XDebuggerManager"> <breakpoint-manager /> @@ -2929,7 +2926,7 @@ </entry> <entry file="file://$PROJECT_DIR$/src/main/org/hornetq/core/protocol/core/impl/ChannelImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="340" column="112" selection-start="9110" selection-end="9110" vertical-scroll-proportion="4.038058"> + <state line="340" column="112" selection-start="9110" selection-end="9110" vertical-scroll-proportion="1.2777778"> <folding /> </state> </provider> Modified: branches/Branch_2_2_AS7/src/config/common/hornetq-version.properties =================================================================== --- branches/Branch_2_2_AS7/src/config/common/hornetq-version.properties 2012-01-13 11:27:57 UTC (rev 12022) +++ branches/Branch_2_2_AS7/src/config/common/hornetq-version.properties 2012-01-13 12:47:54 UTC (rev 12023) @@ -1,9 +1,9 @@ -hornetq.version.versionName=HQ_2_2_9_FINAL_AS7 +hornetq.version.versionName=HQ_2_2_10_FINAL_AS7 hornetq.version.majorVersion=2 hornetq.version.minorVersion=2 -hornetq.version.microVersion=9 +hornetq.version.microVersion=10 hornetq.version.incrementingVersion=122 -hornetq.version.versionSuffix=GA -hornetq.version.versionTag=GA +hornetq.version.versionSuffix=Final +hornetq.version.versionTag=Final hornetq.netty.version=(a)NETTY.VERSION@ hornetq.version.compatibleVersionList=121,122 Modified: branches/Branch_2_2_AS7/src/main/org/hornetq/ra/recovery/RecoveryManager.java =================================================================== --- branches/Branch_2_2_AS7/src/main/org/hornetq/ra/recovery/RecoveryManager.java 2012-01-13 11:27:57 UTC (rev 12022) +++ branches/Branch_2_2_AS7/src/main/org/hornetq/ra/recovery/RecoveryManager.java 2012-01-13 12:47:54 UTC (rev 12023) @@ -46,7 +46,7 @@ private RecoveryRegistry registry; - private String resourceRecoveryClassNames = "org.hornetq.integration.jboss.recovery.AS7RecoveryRegistry;org.jboss.as.integration.hornetq.recovery.AS5RecoveryRegistry"; + private String resourceRecoveryClassNames = "org.jboss.as.messaging.jms.AS7RecoveryRegistry;org.jboss.as.integration.hornetq.recovery.AS5RecoveryRegistry"; private Map<XARecoveryConfig, HornetQResourceRecovery> configMap = new HashMap<XARecoveryConfig, HornetQResourceRecovery>();