[hornetq-commits] JBoss hornetq SVN: r11462 - in branches/HORNETQ-720_Replication: tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/config/impl and 1 other directory.

[do-not-reply at jboss.org]

Author: borges
Date: 2011-10-03 11:46:57 -0400 (Mon, 03 Oct 2011)
New Revision: 11462

Modified:
   branches/HORNETQ-720_Replication/
   branches/HORNETQ-720_Replication/README
   branches/HORNETQ-720_Replication/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/config/impl/ConfigurationValidationTest.java
Log:
merge from trunk


Property changes on: branches/HORNETQ-720_Replication
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:10878-11427
   + /trunk:10878-11461

Modified: branches/HORNETQ-720_Replication/README
===================================================================
--- branches/HORNETQ-720_Replication/README	2011-10-03 15:40:40 UTC (rev 11461)
+++ branches/HORNETQ-720_Replication/README	2011-10-03 15:46:57 UTC (rev 11462)
@@ -15,7 +15,7 @@
 You need Maven 3.X.
 
 Do note that there are some compatibility issues with Maven 3.X still
-unsolved [1].  This is specially true for the 'site' plugin [2].
+unsolved [1]. This is specially true for the 'site' plugin [2].
 
 [1]: <https://cwiki.apache.org/MAVEN/maven-3x-compatibility-notes.html>
 [2]: <https://cwiki.apache.org/MAVEN/maven-3x-and-site-plugin.html>
@@ -37,13 +37,11 @@
 
 * Eclipse
 
-** Use the Maven eclipse plugin to configure the sub-projects
+Maven support has been improved a lot in Eclipse 3.7 "Indigo", you
+really should use it. There are still some Maven plugins used by
+documentation sub-projects which are not supported even in Eclipse 3.7.
 
-$ mvn eclipse:eclipse
-
-** Install the m2Eclipse plugin, and use it to import the root
-   project. Each sub-project will be imported automatically.
-
 The M2Eclipse plugin only works correctly with javacc Maven rules in
-Eclipse 3.7. In Eclipse 3.6 after importing the projects you should use
-"Maven / Update project configuration" to fix up the projects.
+Eclipse 3.7. So in Eclipse 3.6 you need install M2Eclipse yourself, and
+after importing the projects you should use "Maven / Update project
+configuration" to fix up the projects.

Modified: branches/HORNETQ-720_Replication/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/config/impl/ConfigurationValidationTest.java
===================================================================
--- branches/HORNETQ-720_Replication/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/config/impl/ConfigurationValidationTest.java	2011-10-03 15:40:40 UTC (rev 11461)
+++ branches/HORNETQ-720_Replication/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/config/impl/ConfigurationValidationTest.java	2011-10-03 15:46:57 UTC (rev 11462)
@@ -51,7 +51,7 @@
       String xml = "<configuration xmlns='urn:hornetq'>" + "</configuration>";
       Element element = XMLUtil.stringToElement(xml);
       Assert.assertNotNull(element);
-      XMLUtil.validate(element, "hornetq-configuration.xsd");
+      XMLUtil.validate(element, "schema/hornetq-configuration.xsd");
    }
 
    public void testFullConfiguration() throws Exception