[hornetq-commits] JBoss hornetq SVN: r10806 - in trunk: hornetq-bootstrap and 13 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Wed Jun 15 06:29:46 EDT 2011


Author: ataylor
Date: 2011-06-15 06:29:45 -0400 (Wed, 15 Jun 2011)
New Revision: 10806

Added:
   trunk/hornetq-journal/hornetq-journal.iml
Modified:
   trunk/hornetq-bootstrap/hornetq-bootstrap.iml
   trunk/hornetq-commons/hornetq-commons.iml
   trunk/hornetq-core-client/hornetq-core-client.iml
   trunk/hornetq-core/hornetq-core.iml
   trunk/hornetq-jboss-as-integration/hornetq-jboss-as-integration.iml
   trunk/hornetq-jms-client/hornetq-jms-client.iml
   trunk/hornetq-jms/hornetq-jms.iml
   trunk/hornetq-ra/hornetq-ra-jar/hornetq-ra.iml
   trunk/hornetq-rest/hornetq-rest-all.iml
   trunk/hornetq-rest/hornetq-rest/hornetq-rest.iml
   trunk/hornetq-service-sar/hornetq-service-sar.iml
   trunk/hornetq-spring-integration/hornetq-spring-integration.iml
   trunk/hornetq-twitter-integration/hornetq-twitter-integration.iml
   trunk/hornetq.ipr
   trunk/hornetq.iws
Log:
intellij proj update

Modified: trunk/hornetq-bootstrap/hornetq-bootstrap.iml
===================================================================
--- trunk/hornetq-bootstrap/hornetq-bootstrap.iml	2011-06-15 10:28:04 UTC (rev 10805)
+++ trunk/hornetq-bootstrap/hornetq-bootstrap.iml	2011-06-15 10:29:45 UTC (rev 10806)
@@ -12,7 +12,10 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="hornetq-core" />
+    <orderEntry type="module" module-name="hornetq-commons" />
     <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.16" level="project" />
+    <orderEntry type="module" module-name="hornetq-journal" />
     <orderEntry type="library" name="Maven: org.jboss.microcontainer:jboss-kernel:2.0.6.GA" level="project" />
     <orderEntry type="library" name="Maven: org.jboss.microcontainer:jboss-dependency:2.0.6.GA" level="project" />
     <orderEntry type="library" name="Maven: org.jboss:jbossxb:2.0.1.GA" level="project" />

Modified: trunk/hornetq-commons/hornetq-commons.iml
===================================================================
--- trunk/hornetq-commons/hornetq-commons.iml	2011-06-15 10:28:04 UTC (rev 10805)
+++ trunk/hornetq-commons/hornetq-commons.iml	2011-06-15 10:29:45 UTC (rev 10806)
@@ -3,15 +3,17 @@
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="hornetq-core" />
     <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" />
-    <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.16" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.2" level="project" />
   </component>
 </module>
 

Modified: trunk/hornetq-core/hornetq-core.iml
===================================================================
--- trunk/hornetq-core/hornetq-core.iml	2011-06-15 10:28:04 UTC (rev 10805)
+++ trunk/hornetq-core/hornetq-core.iml	2011-06-15 10:29:45 UTC (rev 10806)
@@ -7,13 +7,13 @@
       <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/javacc" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/target/apidocs" />
-      <excludeFolder url="file://$MODULE_DIR$/target/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="hornetq-commons" />
     <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.16" level="project" />
+    <orderEntry type="module" module-name="hornetq-journal" />
   </component>
 </module>
 

Modified: trunk/hornetq-core-client/hornetq-core-client.iml
===================================================================
--- trunk/hornetq-core-client/hornetq-core-client.iml	2011-06-15 10:28:04 UTC (rev 10805)
+++ trunk/hornetq-core-client/hornetq-core-client.iml	2011-06-15 10:29:45 UTC (rev 10806)
@@ -9,7 +9,10 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="hornetq-core" />
+    <orderEntry type="module" module-name="hornetq-commons" />
     <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.16" level="project" />
+    <orderEntry type="module" module-name="hornetq-journal" />
   </component>
 </module>
 

Modified: trunk/hornetq-jboss-as-integration/hornetq-jboss-as-integration.iml
===================================================================
--- trunk/hornetq-jboss-as-integration/hornetq-jboss-as-integration.iml	2011-06-15 10:28:04 UTC (rev 10805)
+++ trunk/hornetq-jboss-as-integration/hornetq-jboss-as-integration.iml	2011-06-15 10:29:45 UTC (rev 10806)
@@ -10,14 +10,18 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="hornetq-core" />
+    <orderEntry type="module" module-name="hornetq-commons" />
     <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.16" level="project" />
+    <orderEntry type="module" module-name="hornetq-journal" />
     <orderEntry type="library" name="Maven: org.jboss.security:jboss-security-spi:2.0.3.SP1" level="project" />
     <orderEntry type="library" name="Maven: org.jboss.security:jbosssx:2.0.3.SP1" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.GA" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:1.0.0.Final" level="project" />
     <orderEntry type="library" name="Maven: org.jboss.integration:jboss-transaction-spi:5.1.0.GA" level="project" />
     <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging-spi:2.1.0.GA" level="project" />
     <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jca-api:1.5.0.GA" level="project" />
     <orderEntry type="library" name="Maven: org.jboss:jboss-common-core:2.2.14.GA" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.20070913080910" level="project" />
     <orderEntry type="library" name="Maven: jboss.jbossts:jbossjts:4.6.1.GA" level="project" />
   </component>
 </module>

Modified: trunk/hornetq-jms/hornetq-jms.iml
===================================================================
--- trunk/hornetq-jms/hornetq-jms.iml	2011-06-15 10:28:04 UTC (rev 10805)
+++ trunk/hornetq-jms/hornetq-jms.iml	2011-06-15 10:29:45 UTC (rev 10806)
@@ -11,9 +11,12 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="hornetq-core" />
+    <orderEntry type="module" module-name="hornetq-commons" />
     <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jms-api:1.1.0.GA" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.GA" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.16" level="project" />
+    <orderEntry type="module" module-name="hornetq-journal" />
+    <orderEntry type="library" name="Maven: org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec:1.0.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:1.0.0.Final" level="project" />
     <orderEntry type="library" name="Maven: jboss.jbossts:jbossjts:4.6.1.GA" level="project" />
   </component>
 </module>

Modified: trunk/hornetq-jms-client/hornetq-jms-client.iml
===================================================================
--- trunk/hornetq-jms-client/hornetq-jms-client.iml	2011-06-15 10:28:04 UTC (rev 10805)
+++ trunk/hornetq-jms-client/hornetq-jms-client.iml	2011-06-15 10:29:45 UTC (rev 10806)
@@ -10,9 +10,12 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="hornetq-jms" />
     <orderEntry type="module" module-name="hornetq-core" />
+    <orderEntry type="module" module-name="hornetq-commons" />
     <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jms-api:1.1.0.GA" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.GA" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.16" level="project" />
+    <orderEntry type="module" module-name="hornetq-journal" />
+    <orderEntry type="library" name="Maven: org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec:1.0.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:1.0.0.Final" level="project" />
     <orderEntry type="library" name="Maven: jboss.jbossts:jbossjts:4.6.1.GA" level="project" />
   </component>
 </module>

Added: trunk/hornetq-journal/hornetq-journal.iml
===================================================================
--- trunk/hornetq-journal/hornetq-journal.iml	                        (rev 0)
+++ trunk/hornetq-journal/hornetq-journal.iml	2011-06-15 10:29:45 UTC (rev 10806)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" />
+    <orderEntry type="module" module-name="hornetq-commons" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.16" level="project" />
+  </component>
+</module>
+

Modified: trunk/hornetq-ra/hornetq-ra-jar/hornetq-ra.iml
===================================================================
--- trunk/hornetq-ra/hornetq-ra-jar/hornetq-ra.iml	2011-06-15 10:28:04 UTC (rev 10805)
+++ trunk/hornetq-ra/hornetq-ra-jar/hornetq-ra.iml	2011-06-15 10:29:45 UTC (rev 10806)
@@ -10,10 +10,13 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="hornetq-core" scope="PROVIDED" />
+    <orderEntry type="module" module-name="hornetq-commons" scope="PROVIDED" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: log4j:log4j:1.2.16" level="project" />
+    <orderEntry type="module" module-name="hornetq-journal" scope="PROVIDED" />
     <orderEntry type="module" module-name="hornetq-jms" scope="PROVIDED" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.javaee:jboss-jms-api:1.1.0.GA" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.GA" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec:1.0.0.Final" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:1.0.0.Final" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: jboss.jbossts:jbossjts:4.6.1.GA" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.javaee:jboss-jca-api:1.5.0.GA" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss:jboss-common-core:2.2.14.GA" level="project" />

Modified: trunk/hornetq-rest/hornetq-rest/hornetq-rest.iml
===================================================================
--- trunk/hornetq-rest/hornetq-rest/hornetq-rest.iml	2011-06-15 10:28:04 UTC (rev 10805)
+++ trunk/hornetq-rest/hornetq-rest/hornetq-rest.iml	2011-06-15 10:29:45 UTC (rev 10806)
@@ -12,7 +12,12 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.hornetq:hornetq-core:2.2.3-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.hornetq:hornetq-jms:2.2.3-SNAPSHOT" level="project" />
+    <orderEntry type="module" module-name="hornetq-core" scope="PROVIDED" />
+    <orderEntry type="module" module-name="hornetq-commons" scope="PROVIDED" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: log4j:log4j:1.2.16" level="project" />
+    <orderEntry type="module" module-name="hornetq-journal" scope="PROVIDED" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.resteasy:resteasy-jaxrs:2.1.0.GA" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.resteasy:jaxrs-api:2.1.0.GA" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.scannotation:scannotation:1.0.2" level="project" />
@@ -29,11 +34,10 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.6.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.codehaus.jackson:jackson-jaxrs:1.6.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.codehaus.jackson:jackson-xc:1.6.3" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.hornetq:hornetq-jms:2.2.3-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.javaee:jboss-jms-api:1.1.0.GA" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.GA" level="project" />
+    <orderEntry type="module" module-name="hornetq-jms" scope="PROVIDED" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec:1.0.0.Beta1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:1.0.0.Final" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: jboss.jbossts:jbossjts:4.6.1.GA" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec:1.0.0.Beta1" level="project" />
     <orderEntry type="library" name="Maven: junit:junit:4.1" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.jboss.resteasy:tjws:2.1.0.GA" level="project" />

Modified: trunk/hornetq-rest/hornetq-rest-all.iml
===================================================================
--- trunk/hornetq-rest/hornetq-rest-all.iml	2011-06-15 10:28:04 UTC (rev 10805)
+++ trunk/hornetq-rest/hornetq-rest-all.iml	2011-06-15 10:29:45 UTC (rev 10806)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <exclude-output />

Modified: trunk/hornetq-service-sar/hornetq-service-sar.iml
===================================================================
--- trunk/hornetq-service-sar/hornetq-service-sar.iml	2011-06-15 10:28:04 UTC (rev 10805)
+++ trunk/hornetq-service-sar/hornetq-service-sar.iml	2011-06-15 10:29:45 UTC (rev 10806)
@@ -10,10 +10,13 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="hornetq-core" />
+    <orderEntry type="module" module-name="hornetq-commons" />
     <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.16" level="project" />
+    <orderEntry type="module" module-name="hornetq-journal" />
     <orderEntry type="module" module-name="hornetq-jms" />
-    <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jms-api:1.1.0.GA" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.GA" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec:1.0.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:1.0.0.Final" level="project" />
     <orderEntry type="library" name="Maven: jboss.jbossts:jbossjts:4.6.1.GA" level="project" />
     <orderEntry type="module" module-name="hornetq-jboss-as-integration" />
     <orderEntry type="library" name="Maven: org.jboss.security:jboss-security-spi:2.0.3.SP1" level="project" />
@@ -22,6 +25,7 @@
     <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging-spi:2.1.0.GA" level="project" />
     <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jca-api:1.5.0.GA" level="project" />
     <orderEntry type="library" name="Maven: org.jboss:jboss-common-core:2.2.14.GA" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.20070913080910" level="project" />
   </component>
 </module>
 

Modified: trunk/hornetq-spring-integration/hornetq-spring-integration.iml
===================================================================
--- trunk/hornetq-spring-integration/hornetq-spring-integration.iml	2011-06-15 10:28:04 UTC (rev 10805)
+++ trunk/hornetq-spring-integration/hornetq-spring-integration.iml	2011-06-15 10:29:45 UTC (rev 10806)
@@ -10,10 +10,13 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="hornetq-core" />
+    <orderEntry type="module" module-name="hornetq-commons" />
     <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.16" level="project" />
+    <orderEntry type="module" module-name="hornetq-journal" />
     <orderEntry type="module" module-name="hornetq-jms" />
-    <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jms-api:1.1.0.GA" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.GA" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec:1.0.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:1.0.0.Final" level="project" />
     <orderEntry type="library" name="Maven: jboss.jbossts:jbossjts:4.6.1.GA" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-core:3.0.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-asm:3.0.3.RELEASE" level="project" />

Modified: trunk/hornetq-twitter-integration/hornetq-twitter-integration.iml
===================================================================
--- trunk/hornetq-twitter-integration/hornetq-twitter-integration.iml	2011-06-15 10:28:04 UTC (rev 10805)
+++ trunk/hornetq-twitter-integration/hornetq-twitter-integration.iml	2011-06-15 10:29:45 UTC (rev 10806)
@@ -10,7 +10,10 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="hornetq-core" />
+    <orderEntry type="module" module-name="hornetq-commons" />
     <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.16" level="project" />
+    <orderEntry type="module" module-name="hornetq-journal" />
     <orderEntry type="library" name="Maven: org.twitter4j:twitter4j-core:2.1.2" level="project" />
   </component>
 </module>

Modified: trunk/hornetq.ipr
===================================================================
--- trunk/hornetq.ipr	2011-06-15 10:28:04 UTC (rev 10805)
+++ trunk/hornetq.ipr	2011-06-15 10:29:45 UTC (rev 10806)
@@ -392,6 +392,7 @@
       <module fileurl="file://$PROJECT_DIR$/hornetq.iml" filepath="$PROJECT_DIR$/hornetq.iml" />
       <module fileurl="file://$PROJECT_DIR$/distribution/hornetq/hornetq (1).iml" filepath="$PROJECT_DIR$/distribution/hornetq/hornetq (1).iml" />
       <module fileurl="file://$PROJECT_DIR$/hornetq-bootstrap/hornetq-bootstrap.iml" filepath="$PROJECT_DIR$/hornetq-bootstrap/hornetq-bootstrap.iml" />
+      <module fileurl="file://$PROJECT_DIR$/hornetq-commons/hornetq-commons.iml" filepath="$PROJECT_DIR$/hornetq-commons/hornetq-commons.iml" />
       <module fileurl="file://$PROJECT_DIR$/hornetq-core/hornetq-core.iml" filepath="$PROJECT_DIR$/hornetq-core/hornetq-core.iml" />
       <module fileurl="file://$PROJECT_DIR$/hornetq-core-client/hornetq-core-client.iml" filepath="$PROJECT_DIR$/hornetq-core-client/hornetq-core-client.iml" />
       <module fileurl="file://$PROJECT_DIR$/distribution/hornetq-distribution.iml" filepath="$PROJECT_DIR$/distribution/hornetq-distribution.iml" />
@@ -400,7 +401,7 @@
       <module fileurl="file://$PROJECT_DIR$/hornetq-jboss-as-integration/hornetq-jboss-as-integration.iml" filepath="$PROJECT_DIR$/hornetq-jboss-as-integration/hornetq-jboss-as-integration.iml" />
       <module fileurl="file://$PROJECT_DIR$/hornetq-jms/hornetq-jms.iml" filepath="$PROJECT_DIR$/hornetq-jms/hornetq-jms.iml" />
       <module fileurl="file://$PROJECT_DIR$/hornetq-jms-client/hornetq-jms-client.iml" filepath="$PROJECT_DIR$/hornetq-jms-client/hornetq-jms-client.iml" />
-      <module fileurl="file://$PROJECT_DIR$/hornetq-logging/hornetq-logging.iml" filepath="$PROJECT_DIR$/hornetq-logging/hornetq-logging.iml" />
+      <module fileurl="file://$PROJECT_DIR$/hornetq-journal/hornetq-journal.iml" filepath="$PROJECT_DIR$/hornetq-journal/hornetq-journal.iml" />
       <module fileurl="file://$PROJECT_DIR$/hornetq-ra/hornetq-ra-jar/hornetq-ra.iml" filepath="$PROJECT_DIR$/hornetq-ra/hornetq-ra-jar/hornetq-ra.iml" />
       <module fileurl="file://$PROJECT_DIR$/hornetq-ra/hornetq-ra-rar/hornetq-rar.iml" filepath="$PROJECT_DIR$/hornetq-ra/hornetq-ra-rar/hornetq-rar.iml" />
       <module fileurl="file://$PROJECT_DIR$/hornetq-ra/hornetq-rar-pom.iml" filepath="$PROJECT_DIR$/hornetq-ra/hornetq-rar-pom.iml" />
@@ -411,7 +412,6 @@
       <module fileurl="file://$PROJECT_DIR$/tests/hornetq-tests-pom.iml" filepath="$PROJECT_DIR$/tests/hornetq-tests-pom.iml" />
       <module fileurl="file://$PROJECT_DIR$/hornetq-twitter-integration/hornetq-twitter-integration.iml" filepath="$PROJECT_DIR$/hornetq-twitter-integration/hornetq-twitter-integration.iml" />
       <module fileurl="file://$PROJECT_DIR$/tests/integration-tests/integration-tests.iml" filepath="$PROJECT_DIR$/tests/integration-tests/integration-tests.iml" />
-      <module fileurl="file://$PROJECT_DIR$/distribution/jboss-mc/jboss-mc.iml" filepath="$PROJECT_DIR$/distribution/jboss-mc/jboss-mc.iml" />
       <module fileurl="file://$PROJECT_DIR$/tests/jms-tests/jms-tests.iml" filepath="$PROJECT_DIR$/tests/jms-tests/jms-tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/distribution/jnp-client/jnp-client.iml" filepath="$PROJECT_DIR$/distribution/jnp-client/jnp-client.iml" />
       <module fileurl="file://$PROJECT_DIR$/tests/joram-tests/joram-tests.iml" filepath="$PROJECT_DIR$/tests/joram-tests/joram-tests.iml" />
@@ -693,6 +693,17 @@
         <root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" />
       </SOURCES>
     </library>
+    <library name="Maven: log4j:log4j:1.2.16">
+      <CLASSES>
+        <root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.16/log4j-1.2.16.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.16/log4j-1.2.16-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.16/log4j-1.2.16-sources.jar!/" />
+      </SOURCES>
+    </library>
     <library name="Maven: net.jcip:jcip-annotations:1.0">
       <CLASSES>
         <root url="jar://$MAVEN_REPOSITORY$/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0.jar!/" />
@@ -792,6 +803,17 @@
         <root url="jar://$MAVEN_REPOSITORY$/org/jboss/javaee/jboss-jms-api/1.1.0.GA/jboss-jms-api-1.1.0.GA-sources.jar!/" />
       </SOURCES>
     </library>
+    <library name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.20070913080910">
+      <CLASSES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/jboss/javaee/jboss-transaction-api/1.0.1.20070913080910/jboss-transaction-api-1.0.1.20070913080910.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$MAVEN_REPOSITORY$/org/jboss/javaee/jboss-transaction-api/1.0.1.20070913080910/jboss-transaction-api-1.0.1.20070913080910-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/jboss/javaee/jboss-transaction-api/1.0.1.20070913080910/jboss-transaction-api-1.0.1.20070913080910-sources.jar!/" />
+      </SOURCES>
+    </library>
     <library name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.GA">
       <CLASSES>
         <root url="jar://$MAVEN_REPOSITORY$/org/jboss/javaee/jboss-transaction-api/1.0.1.GA/jboss-transaction-api-1.0.1.GA.jar!/" />
@@ -946,6 +968,28 @@
         <root url="jar://$MAVEN_REPOSITORY$/org/jboss/spec/javax/jms/jboss-jms-api_1.1_spec/1.0.0.Beta1/jboss-jms-api_1.1_spec-1.0.0.Beta1-sources.jar!/" />
       </SOURCES>
     </library>
+    <library name="Maven: org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec:1.0.0.Final">
+      <CLASSES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/jboss/spec/javax/jms/jboss-jms-api_1.1_spec/1.0.0.Final/jboss-jms-api_1.1_spec-1.0.0.Final.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$MAVEN_REPOSITORY$/org/jboss/spec/javax/jms/jboss-jms-api_1.1_spec/1.0.0.Final/jboss-jms-api_1.1_spec-1.0.0.Final-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/jboss/spec/javax/jms/jboss-jms-api_1.1_spec/1.0.0.Final/jboss-jms-api_1.1_spec-1.0.0.Final-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:1.0.0.Final">
+      <CLASSES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/jboss/spec/javax/transaction/jboss-transaction-api_1.1_spec/1.0.0.Final/jboss-transaction-api_1.1_spec-1.0.0.Final.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$MAVEN_REPOSITORY$/org/jboss/spec/javax/transaction/jboss-transaction-api_1.1_spec/1.0.0.Final/jboss-transaction-api_1.1_spec-1.0.0.Final-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/jboss/spec/javax/transaction/jboss-transaction-api_1.1_spec/1.0.0.Final/jboss-transaction-api_1.1_spec-1.0.0.Final-sources.jar!/" />
+      </SOURCES>
+    </library>
     <library name="Maven: org.jboss:jboss-common-core:2.2.14.GA">
       <CLASSES>
         <root url="jar://$MAVEN_REPOSITORY$/org/jboss/jboss-common-core/2.2.14.GA/jboss-common-core-2.2.14.GA.jar!/" />

Modified: trunk/hornetq.iws
===================================================================
--- trunk/hornetq.iws	2011-06-15 10:28:04 UTC (rev 10805)
+++ trunk/hornetq.iws	2011-06-15 10:29:45 UTC (rev 10806)
@@ -1,29 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" readonly="true" id="a2aae645-dbcd-4d6e-9c99-efa05d93589a" name="Default" comment="">
+    <list readonly="true" id="a2aae645-dbcd-4d6e-9c99-efa05d93589a" name="Default" comment="" />
+    <list default="true" id="79260711-ec34-4afa-9678-e2f3090f876b" name="intellij" comment="">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/hornetq-journal/hornetq-journal.iml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-bootstrap/hornetq-bootstrap.iml" afterPath="$PROJECT_DIR$/hornetq-bootstrap/hornetq-bootstrap.iml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-bootstrap/pom.xml" afterPath="$PROJECT_DIR$/hornetq-bootstrap/pom.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-core-client/pom.xml" afterPath="$PROJECT_DIR$/hornetq-core-client/pom.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-core/pom.xml" afterPath="$PROJECT_DIR$/hornetq-core/pom.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-commons/hornetq-commons.iml" afterPath="$PROJECT_DIR$/hornetq-commons/hornetq-commons.iml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-core-client/hornetq-core-client.iml" afterPath="$PROJECT_DIR$/hornetq-core-client/hornetq-core-client.iml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-core/hornetq-core.iml" afterPath="$PROJECT_DIR$/hornetq-core/hornetq-core.iml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-jboss-as-integration/hornetq-jboss-as-integration.iml" afterPath="$PROJECT_DIR$/hornetq-jboss-as-integration/hornetq-jboss-as-integration.iml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-jboss-as-integration/pom.xml" afterPath="$PROJECT_DIR$/hornetq-jboss-as-integration/pom.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-jms-client/pom.xml" afterPath="$PROJECT_DIR$/hornetq-jms-client/pom.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-jms/pom.xml" afterPath="$PROJECT_DIR$/hornetq-jms/pom.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-logging/pom.xml" afterPath="$PROJECT_DIR$/hornetq-logging/pom.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-ra/hornetq-ra-jar/pom.xml" afterPath="$PROJECT_DIR$/hornetq-ra/hornetq-ra-jar/pom.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-ra/hornetq-ra-rar/hornetq-rar.iml" afterPath="$PROJECT_DIR$/hornetq-ra/hornetq-ra-rar/hornetq-rar.iml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-ra/hornetq-ra-rar/pom.xml" afterPath="$PROJECT_DIR$/hornetq-ra/hornetq-ra-rar/pom.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-ra/hornetq-rar-pom.iml" afterPath="$PROJECT_DIR$/hornetq-ra/hornetq-rar-pom.iml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-ra/pom.xml" afterPath="$PROJECT_DIR$/hornetq-ra/pom.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-jms-client/hornetq-jms-client.iml" afterPath="$PROJECT_DIR$/hornetq-jms-client/hornetq-jms-client.iml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-jms/hornetq-jms.iml" afterPath="$PROJECT_DIR$/hornetq-jms/hornetq-jms.iml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-ra/hornetq-ra-jar/hornetq-ra.iml" afterPath="$PROJECT_DIR$/hornetq-ra/hornetq-ra-jar/hornetq-ra.iml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-rest/hornetq-rest-all.iml" afterPath="$PROJECT_DIR$/hornetq-rest/hornetq-rest-all.iml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-rest/hornetq-rest/hornetq-rest.iml" afterPath="$PROJECT_DIR$/hornetq-rest/hornetq-rest/hornetq-rest.iml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-service-sar/pom.xml" afterPath="$PROJECT_DIR$/hornetq-service-sar/pom.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-spring-integration/pom.xml" afterPath="$PROJECT_DIR$/hornetq-spring-integration/pom.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-twitter-integration/pom.xml" afterPath="$PROJECT_DIR$/hornetq-twitter-integration/pom.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq.iml" afterPath="$PROJECT_DIR$/hornetq.iml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-service-sar/hornetq-service-sar.iml" afterPath="$PROJECT_DIR$/hornetq-service-sar/hornetq-service-sar.iml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-spring-integration/hornetq-spring-integration.iml" afterPath="$PROJECT_DIR$/hornetq-spring-integration/hornetq-spring-integration.iml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq-twitter-integration/hornetq-twitter-integration.iml" afterPath="$PROJECT_DIR$/hornetq-twitter-integration/hornetq-twitter-integration.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" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
     </list>
     <ignored path=".idea/workspace.xml" />
     <ignored path="$USER_HOME_GRAILS$/" />
@@ -46,7 +41,7 @@
   </component>
   <component name="DebuggerManager">
     <line_breakpoints>
-      <breakpoint url="file://$PROJECT_DIR$/tests/integration-tests/src/test/java/org/hornetq/tests/util/JMSClusteredTestBase.java" line="15" class="Class at JMSClusteredTestBase.java:15" package="">
+      <breakpoint url="file://$PROJECT_DIR$/tests/integration-tests/src/test/java/org/hornetq/tests/util/JMSClusteredTestBase.java" line="15" class="JMSClusteredTestBase.java" package="">
         <option name="ENABLED" value="true" />
         <option name="LOG_ENABLED" value="false" />
         <option name="LOG_EXPRESSION_ENABLED" value="false" />
@@ -101,54 +96,54 @@
   <component name="FileEditorManager">
     <leaf>
       <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/hornetq-bootstrap/pom.xml">
+        <entry file="file://$PROJECT_DIR$/hornetq-ra/pom.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="32" column="19" selection-start="1177" selection-end="1177" vertical-scroll-proportion="0.0">
+            <state line="18" column="12" selection-start="433" selection-end="433" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
       <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/hornetq-jboss-as-integration/pom.xml">
+        <entry file="file://$PROJECT_DIR$/distribution/jnp-client/pom.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="42" column="0" selection-start="1464" selection-end="1464" vertical-scroll-proportion="0.0">
+            <state line="81" column="30" selection-start="2841" selection-end="2841" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/hornetq-ra/hornetq-ra-jar/pom.xml">
+      <file leaf-file-name="pom.xml" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/distribution/pom.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="33" column="0" selection-start="1181" selection-end="1181" vertical-scroll-proportion="0.0">
+            <state line="32" column="22" selection-start="1014" selection-end="1014" vertical-scroll-proportion="1.0105263">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/hornetq-ra/hornetq-ra-rar/pom.xml">
+      <file leaf-file-name="dep.xml" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/distribution/hornetq/src/main/assembly/dep.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="63" column="24" selection-start="2411" selection-end="2411" vertical-scroll-proportion="0.0">
+            <state line="225" column="51" selection-start="9010" selection-end="9010" vertical-scroll-proportion="-17.8">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="pom.xml" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/hornetq-ra/pom.xml">
+      <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/distribution/jboss-mc/pom.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="18" column="12" selection-start="423" selection-end="423" vertical-scroll-proportion="0.35620052">
+            <state line="11" column="15" selection-start="421" selection-end="429" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
       <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/hornetq-service-sar/pom.xml">
+        <entry file="file://$PROJECT_DIR$/distribution/hornetq/pom.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="32" column="0" selection-start="1172" selection-end="1172" vertical-scroll-proportion="0.0">
+            <state line="13" column="5" selection-start="642" selection-end="643" vertical-scroll-proportion="-0.6">
               <folding />
             </state>
           </provider>
@@ -157,7 +152,7 @@
       <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/hornetq-spring-integration/pom.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="55" column="18" selection-start="2126" selection-end="2126" vertical-scroll-proportion="0.0">
+            <state line="55" column="18" selection-start="2092" selection-end="2092" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
@@ -166,7 +161,7 @@
       <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/hornetq-twitter-integration/pom.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="25" column="19" selection-start="930" selection-end="930" vertical-scroll-proportion="0.0">
+            <state line="25" column="19" selection-start="896" selection-end="896" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
@@ -175,7 +170,7 @@
       <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pom.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="477" column="51" selection-start="17347" selection-end="17347" vertical-scroll-proportion="0.0">
+            <state line="477" column="51" selection-start="17291" selection-end="17291" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
@@ -203,9 +198,6 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/docs/pom.xml" />
-        <option value="$PROJECT_DIR$/distribution/pom.xml" />
-        <option value="$PROJECT_DIR$/pom.xml" />
         <option value="$PROJECT_DIR$/hornetq-core-client/pom.xml" />
         <option value="$PROJECT_DIR$/hornetq-jms-client/pom.xml" />
         <option value="$PROJECT_DIR$/hornetq-ra/hornetq-ra-rar/pom.xml" />
@@ -219,6 +211,9 @@
         <option value="$PROJECT_DIR$/hornetq-bootstrap/pom.xml" />
         <option value="$PROJECT_DIR$/hornetq-jboss-as-integration/pom.xml" />
         <option value="$PROJECT_DIR$/hornetq-ra/pom.xml" />
+        <option value="$PROJECT_DIR$/distribution/microcontainer/pom.xml" />
+        <option value="$PROJECT_DIR$/distribution/hornetq/src/main/assembly/dep.xml" />
+        <option value="$PROJECT_DIR$/distribution/pom.xml" />
       </list>
     </option>
   </component>
@@ -1165,8 +1160,6 @@
       <sortByType />
     </navigator>
     <panes>
-      <pane id="Scope" />
-      <pane id="Favorites" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -1174,6 +1167,10 @@
               <option name="myItemId" value="hornetq" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="External Libraries" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
+            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -1181,7 +1178,15 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="hornetq2" />
+              <option name="myItemId" value="External Libraries" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Maven: org.jboss.microcontainer:jboss-kernel:2.0.6.GA" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="jboss-kernel-2.0.6.GA.jar" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -1191,13 +1196,25 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="hornetq2" />
+              <option name="myItemId" value="External Libraries" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Maven: org.jboss.microcontainer:jboss-kernel:2.0.6.GA" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="jboss-kernel-2.0.6.GA.jar" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="hornetq-ra" />
+              <option name="myItemId" value="org" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="jboss" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -1205,36 +1222,320 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="hornetq2" />
+              <option name="myItemId" value="External Libraries" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Maven: org.jboss.microcontainer:jboss-kernel:2.0.6.GA" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="jboss-kernel-2.0.6.GA.jar" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="hornetq-ra" />
+              <option name="myItemId" value="org" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="hornetq-ra-rar" />
+              <option name="myItemId" value="jboss" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="kernel" />
+              <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="External Libraries" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Maven: org.jboss.microcontainer:jboss-kernel:2.0.6.GA" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="jboss-kernel-2.0.6.GA.jar" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="org" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="jboss" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="kernel" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="plugins" />
+              <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="External Libraries" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Maven: org.jboss.microcontainer:jboss-kernel:2.0.6.GA" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="jboss-kernel-2.0.6.GA.jar" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="org" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="jboss" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="kernel" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="plugins" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="bootstrap" />
+              <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="External Libraries" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Maven: org.jboss.microcontainer:jboss-kernel:2.0.6.GA" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="jboss-kernel-2.0.6.GA.jar" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="org" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="jboss" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="kernel" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="plugins" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="bootstrap" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="basic" />
+              <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" />
+              <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" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="distribution" />
+              <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" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="distribution" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="jnp-client" />
+              <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" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="distribution" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="jboss-mc" />
+              <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" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="distribution" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="jboss-mc" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="target" />
+              <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" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="distribution" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="hornetq" />
+              <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" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="distribution" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="hornetq" />
+              <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="main" />
+              <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" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="distribution" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="hornetq" />
+              <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="main" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="assembly" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
         </subPane>
       </pane>
       <pane id="PackagesPane" />
+      <pane id="Favorites" />
+      <pane id="Scope" />
     </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="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth0" value="225" />
     <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth3" value="35" />
+    <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth2" value="247" />
+    <property name="project.structure.proportion" value="0.15" />
     <property name="OverrideImplement.combined" value="true" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth2" value="247" />
+    <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder1" value="1" />
     <property name="options.splitter.main.proportions" value="0.3" />
-    <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder1" value="1" />
     <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder0" value="0" />
+    <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder3" value="3" />
     <property name="RunManagerConfig.showSettingsBeforeRunnig" value="false" />
-    <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder3" value="3" />
     <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder2" value="2" />
     <property name="recentsLimit" value="5" />
     <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth2" value="200" />
@@ -1256,12 +1557,12 @@
     <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder3" value="3" />
     <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder4" value="4" />
     <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder1" value="1" />
+    <property name="project.structure.side.proportion" value="0.2" />
     <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder2" value="2" />
-    <property name="project.structure.side.proportion" value="0.2" />
+    <property name="MemberChooser.copyJavadoc" value="false" />
     <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder0" value="0" />
-    <property name="MemberChooser.copyJavadoc" value="false" />
+    <property name="dynamic.classpath" value="false" />
     <property name="options.searchVisible" value="true" />
-    <property name="dynamic.classpath" value="false" />
   </component>
   <component name="RecentsManager">
     <key name="CopyClassDialog.RECENTS_KEY">
@@ -1269,11 +1570,11 @@
       <recent name="org.hornetq.jms.example" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/distribution/microcontainer" />
       <recent name="$PROJECT_DIR$/docs/rest-manual/en" />
       <recent name="$PROJECT_DIR$/docs" />
       <recent name="$PROJECT_DIR$/distribution/hornetq" />
       <recent name="$PROJECT_DIR$/examples/src/main/assembly" />
-      <recent name="$PROJECT_DIR$/tests/performance-tests" />
     </key>
     <key name="MoveMembersDialog.RECENTS_KEY">
       <recent name="org.hornetq.api.core.client.HornetQClient" />
@@ -1432,14 +1733,14 @@
           <MavenGeneralSettings>
             <option name="checksumPolicy" value="FAIL" />
             <option name="failureBehavior" value="FAST" />
+            <option name="localRepository" value="" />
             <option name="mavenHome" value="" />
-            <option name="mavenSettingsFile" value="" />
             <option name="nonRecursive" value="false" />
-            <option name="overriddenLocalRepository" value="" />
             <option name="pluginUpdatePolicy" value="DO_NOT_UPDATE" />
             <option name="printErrorStackTraces" value="false" />
             <option name="snapshotUpdatePolicy" value="ALWAYS_UPDATE" />
             <option name="usePluginRegistry" value="false" />
+            <option name="userSettingsFile" value="" />
             <option name="workOffline" value="false" />
           </MavenGeneralSettings>
         </option>
@@ -1473,14 +1774,6 @@
         <option name="Maven.BeforeRunTask" enabled="false" />
       </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">
       <option name="USE_SOCKET_TRANSPORT" value="true" />
       <option name="SERVER_MODE" value="false" />
@@ -1493,14 +1786,6 @@
         <option name="Maven.BeforeRunTask" enabled="false" />
       </method>
     </configuration>
-    <configuration default="true" type="FlexUnitRunConfigurationType" factoryName="FlexUnit" adl_options="" air_descriptor_path="" air_program_params="" air_publisher_id="" air_root_dir_path="" air_run_mode="AppDescriptor" browser_family="FIREFOX" class_name="" debugger_sdk="Module SDK" html_or_swf_file_path="" launcher_type="OSDefault" main_class_name="" method_name="" module_name="" output_log_level="" package_name="" player_path="/usr/bin/flashplayer" port="0" run_mode="HtmlOrSwfFile" run_trusted="false" scope="Class" socket_policy_port="0" url_to_launch="http://">
-      <method>
-        <option name="AntTarget" enabled="false" />
-        <option name="BuildArtifacts" enabled="false" />
-        <option name="Make" enabled="true" />
-        <option name="Maven.BeforeRunTask" enabled="false" />
-      </method>
-    </configuration>
     <configuration default="true" type="Applet" factoryName="Applet">
       <module name="" />
       <option name="MAIN_CLASS_NAME" />
@@ -1539,18 +1824,6 @@
         <option name="Maven.BeforeRunTask" enabled="false" />
       </method>
     </configuration>
-    <configuration default="true" type="PhpUnitRemoteRunConfigurationType" factoryName="PHPUnit on Server">
-      <method>
-        <option name="AntTarget" enabled="false" />
-        <option name="BuildArtifacts" enabled="false" />
-        <option name="FtpUpload" enabled="false">
-          <server_id />
-          <server_name />
-        </option>
-        <option name="Maven.BeforeRunTask" enabled="false" />
-        <option name="ValidateXdebugSetup" enabled="true" />
-      </method>
-    </configuration>
     <configuration default="true" type="JUnit" factoryName="JUnit">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="emma" />
       <module name="" />
@@ -1748,6 +2021,8 @@
   <component name="SvnConfiguration" maxAnnotateRevisions="500">
     <option name="USER" value="" />
     <option name="PASSWORD" value="" />
+    <option name="mySSHConnectionTimeout" value="30000" />
+    <option name="mySSHReadTimeout" value="30000" />
     <option name="LAST_MERGED_REVISION" />
     <option name="MERGE_DRY_RUN" value="false" />
     <option name="MERGE_DIFF_USE_ANCESTRY" value="true" />
@@ -1816,30 +2091,30 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="0" y="24" width="1920" height="1152" extended-state="0" />
+    <frame x="0" y="25" width="1920" height="1150" 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.1958042" 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.22398414" 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.48007968" 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="4" 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="2" 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.16749257" 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="5" 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.12687312" sideWeight="0.0" order="7" side_tool="false" content_ui="tabs" />
-      <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="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="true" weight="0.09816613" sideWeight="0.8041958" 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="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="true" weight="0.0993022" sideWeight="0.5199203" 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="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24217907" sideWeight="0.8041958" 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.24208266" sideWeight="0.5199203" 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.16749257" 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.23609756" 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.12687312" sideWeight="0.0" order="7" 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="Ant Build" 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="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.22200198" 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="IntelliHeap" active="false" anchor="bottom" auto_hide="true" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" 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.22398414" sideWeight="0.5" order="7" 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="5" side_tool="false" content_ui="tabs" />
+      <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="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="1" 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="3" 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>
@@ -1847,6 +2122,15 @@
   <component name="VcsManagerConfiguration">
     <option name="OFFER_MOVE_TO_ANOTHER_CHANGELIST_ON_PARTIAL_COMMIT" value="true" />
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
+    <option name="CHECK_NEW_TODO" value="true" />
+    <option name="myTodoPanelSettings">
+      <value>
+        <are-packages-shown value="false" />
+        <are-modules-shown value="false" />
+        <flatten-packages value="false" />
+        <is-autoscroll-to-source value="false" />
+      </value>
+    </option>
     <option name="PERFORM_UPDATE_IN_BACKGROUND" value="true" />
     <option name="PERFORM_COMMIT_IN_BACKGROUND" value="true" />
     <option name="PERFORM_EDIT_IN_BACKGROUND" value="true" />
@@ -1858,8 +2142,9 @@
     <option name="CHANGED_ON_SERVER_INTERVAL" value="60" />
     <option name="SHOW_ONLY_CHANGED_IN_SELECTION_DIFF" value="true" />
     <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="tidied up poms" />
+    <option name="LAST_COMMIT_MESSAGE" value="fixed release by adding mc deps jar" />
     <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" />
@@ -1872,7 +2157,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="intellij project files&#10;" />
     <MESSAGE value="moved examples back&#10;" />
     <MESSAGE value="cleaned up examples build" />
     <MESSAGE value="added dependency for jnpserver and jms api" />
@@ -1897,6 +2181,7 @@
     <MESSAGE value="dont deploy tests and docs and distribution" />
     <MESSAGE value="added correct snapshot repos" />
     <MESSAGE value="tidied up poms" />
+    <MESSAGE value="fixed release by adding mc deps jar" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
@@ -1974,92 +2259,112 @@
     </buildFile>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/distribution/pom.xml">
+    <entry file="file://$PROJECT_DIR$/hornetq-bootstrap/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="49" column="3" selection-start="1401" selection-end="1401" vertical-scroll-proportion="0.0" />
+        <state line="32" column="19" selection-start="1143" selection-end="1143" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/tests/concurrent-tests/pom.xml">
+    <entry file="file://$PROJECT_DIR$/hornetq-jboss-as-integration/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="132" column="14" selection-start="4661" selection-end="4661" vertical-scroll-proportion="0.0" />
+        <state line="42" column="0" selection-start="1474" selection-end="1474" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/hornetq-core-client/pom.xml">
+    <entry file="file://$PROJECT_DIR$/hornetq-ra/hornetq-ra-jar/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="24" column="10" selection-start="767" selection-end="767" vertical-scroll-proportion="0.0" />
+        <state line="33" column="0" selection-start="1166" selection-end="1166" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/hornetq-jms-client/pom.xml">
+    <entry file="file://$PROJECT_DIR$/hornetq-ra/hornetq-ra-rar/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="23" column="10" selection-start="763" selection-end="763" vertical-scroll-proportion="0.0" />
+        <state line="63" column="24" selection-start="2396" selection-end="2396" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/hornetq-jms/pom.xml">
+    <entry file="file://$PROJECT_DIR$/hornetq-service-sar/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="27" column="19" selection-start="968" selection-end="968" vertical-scroll-proportion="0.0" />
+        <state line="32" column="0" selection-start="1138" selection-end="1138" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/hornetq-logging/pom.xml">
+    <entry file="file://$PROJECT_DIR$/hornetq-spring-integration/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="25" column="0" selection-start="841" selection-end="841" vertical-scroll-proportion="0.0" />
+        <state line="55" column="18" selection-start="2092" selection-end="2092" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/hornetq-ra/hornetq-ra-jar/pom.xml">
+    <entry file="file://$PROJECT_DIR$/hornetq-twitter-integration/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="33" column="0" selection-start="1181" selection-end="1181" vertical-scroll-proportion="0.0" />
+        <state line="25" column="19" selection-start="896" selection-end="896" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/hornetq-service-sar/pom.xml">
+    <entry file="file://$PROJECT_DIR$/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="32" column="0" selection-start="1172" selection-end="1172" vertical-scroll-proportion="0.0" />
+        <state line="477" column="51" selection-start="17291" selection-end="17291" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/hornetq-spring-integration/pom.xml">
+    <entry file="file://$PROJECT_DIR$/hornetq-core/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="55" column="18" selection-start="2126" selection-end="2126" vertical-scroll-proportion="0.0" />
+        <state line="8" column="43" selection-start="248" selection-end="394" vertical-scroll-proportion="0.0" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/hornetq-twitter-integration/pom.xml">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/jboss/microcontainer/jboss-kernel/2.0.6.GA/jboss-kernel-2.0.6.GA.jar!/org/jboss/kernel/plugins/bootstrap/basic/BasicBootstrap.class">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="25" column="19" selection-start="930" selection-end="930" vertical-scroll-proportion="0.0" />
+        <state line="10" column="157" selection-start="421" selection-end="421" vertical-scroll-proportion="0.26642984">
+          <folding />
+        </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
+    <entry file="file://$PROJECT_DIR$/hornetq-ra/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="477" column="51" selection-start="17347" selection-end="17347" vertical-scroll-proportion="0.0">
+        <state line="18" column="12" selection-start="433" selection-end="433" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/hornetq-core/pom.xml">
+    <entry file="file://$PROJECT_DIR$/distribution/jnp-client/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="8" column="43" selection-start="248" selection-end="394" vertical-scroll-proportion="0.0">
+        <state line="81" column="30" selection-start="2841" selection-end="2841" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/hornetq-bootstrap/pom.xml">
+    <entry file="file://$PROJECT_DIR$/distribution/hornetq/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="32" column="19" selection-start="1177" selection-end="1177" vertical-scroll-proportion="0.0">
+        <state line="13" column="5" selection-start="642" selection-end="643" vertical-scroll-proportion="-0.6">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/hornetq-jboss-as-integration/pom.xml">
+    <entry file="file://$PROJECT_DIR$/distribution/jboss-mc/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="42" column="0" selection-start="1464" selection-end="1464" vertical-scroll-proportion="0.0">
+        <state line="11" column="15" selection-start="421" selection-end="429" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/hornetq-ra/hornetq-ra-rar/pom.xml">
+    <entry file="file://$PROJECT_DIR$/distribution/hornetq/src/main/assembly/dep.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="63" column="24" selection-start="2411" selection-end="2411" vertical-scroll-proportion="0.0" />
+        <state line="225" column="51" selection-start="9010" selection-end="9010" vertical-scroll-proportion="-17.8">
+          <folding />
+        </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/hornetq-ra/pom.xml">
+    <entry file="file://$PROJECT_DIR$/distribution/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="18" column="12" selection-start="423" selection-end="423" vertical-scroll-proportion="0.35620052">
+        <state line="32" column="22" selection-start="1014" selection-end="1014" vertical-scroll-proportion="1.0105263">
           <folding />
         </state>
       </provider>



More information about the hornetq-commits mailing list