Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

version update

  • Loading branch information...
commit f90219c44cf646c5c7de16afb11a4369afccb402 1 parent 22129dc
Andy Taylor andytaylor authored
2  build-maven.xml
@@ -13,7 +13,7 @@
13 13 -->
14 14
15 15 <project default="upload" name="HornetQ">
16   - <property name="hornetq.version" value="2.2.9.AS7.Final"/>
  16 + <property name="hornetq.version" value="2.2.10.Final"/>
17 17 <property name="build.dir" value="build"/>
18 18 <property name="jars.dir" value="${build.dir}/jars"/>
19 19
19 hornetq.iws
@@ -3,13 +3,10 @@
3 3 <component name="ChangeListManager">
4 4 <list default="true" readonly="true" id="a2aae645-dbcd-4d6e-9c99-efa05d93589a" name="Default" comment="">
5 5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build-maven.xml" afterPath="$PROJECT_DIR$/build-maven.xml" />
  6 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq.iws" afterPath="$PROJECT_DIR$/hornetq.iws" />
6 7 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/config/common/hornetq-version.properties" afterPath="$PROJECT_DIR$/src/config/common/hornetq-version.properties" />
7 8 <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" />
8 9 </list>
9   - <list id="5341122e-b51c-4e90-b798-7086790ef7e8" name="intellij" comment="">
10   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq.ipr" afterPath="$PROJECT_DIR$/hornetq.ipr" />
11   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq.iws" afterPath="$PROJECT_DIR$/hornetq.iws" />
12   - </list>
13 10 <list id="0c941aa6-f00d-4064-a669-5627378e878f" name="recovery" comment="" />
14 11 <ignored path=".idea/workspace.xml" />
15 12 <ignored path="messaging.iws" />
@@ -334,7 +331,7 @@
334 331 <file leaf-file-name="ChannelImpl.java" pinned="false" current="true" current-in-tab="true">
335 332 <entry file="file://$PROJECT_DIR$/src/main/org/hornetq/core/protocol/core/impl/ChannelImpl.java">
336 333 <provider selected="true" editor-type-id="text-editor">
337   - <state line="340" column="112" selection-start="9110" selection-end="9110" vertical-scroll-proportion="4.038058">
  334 + <state line="340" column="112" selection-start="9110" selection-end="9110" vertical-scroll-proportion="1.2777778">
338 335 <folding />
339 336 </state>
340 337 </provider>
@@ -2154,13 +2151,14 @@
2154 2151 <editor active="false" />
2155 2152 <layout>
2156 2153 <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" />
2157   - <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" />
  2154 + <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" />
  2155 + <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" />
2158 2156 <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" />
2159 2157 <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" />
2160 2158 <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" />
2161 2159 <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" />
2162 2160 <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" />
2163   - <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" />
  2161 + <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" />
2164 2162 <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" />
2165 2163 <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" />
2166 2164 <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 @@
2169 2167 <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" />
2170 2168 <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" />
2171 2169 <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" />
2172   - <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" />
2173 2170 <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" />
2174 2171 <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" />
2175 2172 <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 @@
2200 2197 <option name="CHECK_COMMIT_MESSAGE_SPELLING" value="true" />
2201 2198 <option name="DEFAULT_PATCH_EXTENSION" value="patch" />
2202 2199 <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
2203   - <option name="LAST_COMMIT_MESSAGE" value="added jca example showing connecting to remote HQ server and doc updates" />
  2200 + <option name="LAST_COMMIT_MESSAGE" value="version update" />
2204 2201 <option name="MAKE_NEW_CHANGELIST_ACTIVE" value="true" />
2205 2202 <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
2206 2203 <option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
@@ -2213,7 +2210,6 @@
2213 2210 <option name="UPDATE_GROUP_BY_CHANGELIST" value="false" />
2214 2211 <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
2215 2212 <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
2216   - <MESSAGE value="buffer fix" />
2217 2213 <MESSAGE value="added maven target for creating repos files" />
2218 2214 <MESSAGE value="fixed import" />
2219 2215 <MESSAGE value="refactored client api for CLientSessionFactory, ConnectionFactory, HornetQQueue and HornetQTopic" />
@@ -2238,6 +2234,7 @@
2238 2234 <MESSAGE value="p" />
2239 2235 <MESSAGE value="https://jira.jboss.org/browse/HORNETQ-391 - fixed using the correcxt transport params" />
2240 2236 <MESSAGE value="added jca example showing connecting to remote HQ server and doc updates" />
  2237 + <MESSAGE value="version update" />
2241 2238 </component>
2242 2239 <component name="XDebuggerManager">
2243 2240 <breakpoint-manager />
@@ -2929,7 +2926,7 @@
2929 2926 </entry>
2930 2927 <entry file="file://$PROJECT_DIR$/src/main/org/hornetq/core/protocol/core/impl/ChannelImpl.java">
2931 2928 <provider selected="true" editor-type-id="text-editor">
2932   - <state line="340" column="112" selection-start="9110" selection-end="9110" vertical-scroll-proportion="4.038058">
  2929 + <state line="340" column="112" selection-start="9110" selection-end="9110" vertical-scroll-proportion="1.2777778">
2933 2930 <folding />
2934 2931 </state>
2935 2932 </provider>
8 src/config/common/hornetq-version.properties
... ... @@ -1,9 +1,9 @@
1   -hornetq.version.versionName=HQ_2_2_9_FINAL_AS7
  1 +hornetq.version.versionName=HQ_2_2_10_FINAL_AS7
2 2 hornetq.version.majorVersion=2
3 3 hornetq.version.minorVersion=2
4   -hornetq.version.microVersion=9
  4 +hornetq.version.microVersion=10
5 5 hornetq.version.incrementingVersion=122
6   -hornetq.version.versionSuffix=GA
7   -hornetq.version.versionTag=GA
  6 +hornetq.version.versionSuffix=Final
  7 +hornetq.version.versionTag=Final
8 8 hornetq.netty.version=@NETTY.VERSION@
9 9 hornetq.version.compatibleVersionList=121,122
2  src/main/org/hornetq/ra/recovery/RecoveryManager.java
@@ -46,7 +46,7 @@
46 46
47 47 private RecoveryRegistry registry;
48 48
49   - private String resourceRecoveryClassNames = "org.hornetq.integration.jboss.recovery.AS7RecoveryRegistry;org.jboss.as.integration.hornetq.recovery.AS5RecoveryRegistry";
  49 + private String resourceRecoveryClassNames = "org.jboss.as.messaging.jms.AS7RecoveryRegistry;org.jboss.as.integration.hornetq.recovery.AS5RecoveryRegistry";
50 50
51 51 private Map<XARecoveryConfig, HornetQResourceRecovery> configMap = new HashMap<XARecoveryConfig, HornetQResourceRecovery>();
52 52

0 comments on commit f90219c

Please sign in to comment.
Something went wrong with that request. Please try again.