[hornetq-commits] JBoss hornetq SVN: r10525 - in trunk: distribution/hornetq and 1 other directories.

Author: ataylor Date: 2011-04-18 09:37:03 -0400 (Mon, 18 Apr 2011) New Revision: 10525 Modified: trunk/distribution/hornetq/pom.xml trunk/distribution/hornetq/src/main/assembly/dep.xml trunk/hornetq.iws Log: added validation for jms config Modified: trunk/distribution/hornetq/pom.xml =================================================================== --- trunk/distribution/hornetq/pom.xml 2011-04-18 12:58:03 UTC (rev 10524) +++ trunk/distribution/hornetq/pom.xml 2011-04-18 13:37:03 UTC (rev 10525) @@ -133,6 +133,62 @@ <include>hornetq-configuration.xml</include> </includes> </validationSet> + <validationSet> + <dir>src/main/resources/config/stand-alone/clustered</dir> + <systemId>${build.directory}/${artifactId}-${project.version}-bin/schema/hornetq-jms.xsd</systemId> + <includes> + <include>hornetq-jms.xml</include> + </includes> + </validationSet> + <validationSet> + <dir>src/main/resources/config/stand-alone/non-clustered</dir> + <systemId>${build.directory}/${artifactId}-${project.version}-bin/schema/hornetq-jms.xsd</systemId> + <includes> + <include>hornetq-jms.xml</include> + </includes> + </validationSet> + <validationSet> + <dir>src/main/resources/config/jboss-as-4/clustered</dir> + <systemId>${build.directory}/${artifactId}-${project.version}-bin/schema/hornetq-jms.xsd</systemId> + <includes> + <include>hornetq-jms.xml</include> + </includes> + </validationSet> + <validationSet> + <dir>src/main/resources/config/jboss-as-4/non-clustered</dir> + <systemId>${build.directory}/${artifactId}-${project.version}-bin/schema/hornetq-jms.xsd</systemId> + <includes> + <include>hornetq-jms.xml</include> + </includes> + </validationSet> + <validationSet> + <dir>src/main/resources/config/jboss-as-5/clustered</dir> + <systemId>${build.directory}/${artifactId}-${project.version}-bin/schema/hornetq-jms.xsd</systemId> + <includes> + <include>hornetq-jms.xml</include> + </includes> + </validationSet> + <validationSet> + <dir>src/main/resources/config/jboss-as-5/non-clustered</dir> + <systemId>${build.directory}/${artifactId}-${project.version}-bin/schema/hornetq-jms.xsd</systemId> + <includes> + <include>hornetq-jms.xml</include> + </includes> + </validationSet> + <validationSet> + <dir>src/main/resources/config/jboss-as-6/clustered</dir> + <systemId>${build.directory}/${artifactId}-${project.version}-bin/schema/hornetq-jms.xsd</systemId> + <includes> + <include>hornetq-jms.xml</include> + </includes> + </validationSet> + <validationSet> + <dir>src/main/resources/config/jboss-as-6/non-clustered</dir> + <systemId>${build.directory}/${artifactId}-${project.version}-bin/schema/hornetq-jms.xsd</systemId> + <includes> + <include>hornetq-jms.xml</include> + </includes> + </validationSet> </validationSets> </configuration> </plugin> Modified: trunk/distribution/hornetq/src/main/assembly/dep.xml =================================================================== --- trunk/distribution/hornetq/src/main/assembly/dep.xml 2011-04-18 12:58:03 UTC (rev 10524) +++ trunk/distribution/hornetq/src/main/assembly/dep.xml 2011-04-18 13:37:03 UTC (rev 10525) @@ -101,6 +101,22 @@ <moduleSet> <useAllReactorProjects>true</useAllReactorProjects> <includes> + <include>org.hornetq:hornetq-jms</include> + </includes> + <binaries> + <includeDependencies>false</includeDependencies> + <outputDirectory></outputDirectory> + <unpack>true</unpack> + <unpackOptions> + <includes> + <include>**/*.xsd</include> + </includes> + </unpackOptions> + </binaries> + </moduleSet> + <moduleSet> + <useAllReactorProjects>true</useAllReactorProjects> + <includes> <include>org.hornetq:hornetq-jms-client</include> </includes> <binaries> Modified: trunk/hornetq.iws =================================================================== --- trunk/hornetq.iws 2011-04-18 12:58:03 UTC (rev 10524) +++ trunk/hornetq.iws 2011-04-18 13:37:03 UTC (rev 10525) @@ -2,8 +2,8 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" readonly="true" id="a2aae645-dbcd-4d6e-9c99-efa05d93589a" name="Default" comment=""> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/distribution/hornetq/hornetq (1).iml" afterPath="$PROJECT_DIR$/distribution/hornetq/hornetq (1).iml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/distribution/hornetq/pom.xml" afterPath="$PROJECT_DIR$/distribution/hornetq/pom.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/distribution/hornetq/src/main/assembly/dep.xml" afterPath="$PROJECT_DIR$/distribution/hornetq/src/main/assembly/dep.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq.iws" afterPath="$PROJECT_DIR$/hornetq.iws" /> </list> <ignored path=".idea/workspace.xml" /> @@ -129,12 +129,21 @@ <file leaf-file-name="pom.xml" pinned="false" current="true" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/distribution/hornetq/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="129" column="62" selection-start="5718" selection-end="5718" vertical-scroll-proportion="1.5805243"> + <state line="186" column="109" selection-start="9015" selection-end="9030" vertical-scroll-proportion="0.65868264"> <folding /> </state> </provider> </entry> </file> + <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="103" column="44" selection-start="4228" selection-end="4228" vertical-scroll-proportion="0.0"> + <folding /> + </state> + </provider> + </entry> + </file> <file leaf-file-name="hornetq-configuration.xml" pinned="false" current="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/distribution/hornetq/src/main/resources/config/jboss-as-6/non-clustered/hornetq-configuration.xml"> <provider selected="true" editor-type-id="text-editor"> @@ -166,7 +175,6 @@ <component name="IdeDocumentHistory"> <option name="changedFiles"> <list> - <option value="$PROJECT_DIR$/distribution/hornetq/src/main/assembly/dep.xml" /> <option value="$PROJECT_DIR$/pom.xml" /> <option value="$PROJECT_DIR$/tests/pom.xml" /> <option value="$PROJECT_DIR$/tests/timing-tests/pom.xml" /> @@ -180,8 +188,9 @@ <option value="$PROJECT_DIR$/distribution/hornetq/src/main/resources/config/stand-alone/clustered/hornetq-configuration.xml" /> <option value="$PROJECT_DIR$/distribution/hornetq/src/main/resources/catalog.xml" /> <option value="$PROJECT_DIR$/distribution/hornetq/src/main/resources/config/stand-alone/clustered/hornetq-jms.xml" /> - <option value="$PROJECT_DIR$/distribution/hornetq/pom.xml" /> <option value="$PROJECT_DIR$/distribution/hornetq/src/main/resources/config/jboss-as-6/non-clustered/hornetq-configuration.xml" /> + <option value="$PROJECT_DIR$/distribution/hornetq/src/main/assembly/dep.xml" /> + <option value="$PROJECT_DIR$/distribution/hornetq/pom.xml" /> </list> </option> </component> @@ -1129,7 +1138,6 @@ </navigator> <panes> <pane id="Favorites" /> - <pane id="Scope" /> <pane id="PackagesPane" /> <pane id="ProjectPane"> <subPane> @@ -1138,16 +1146,10 @@ <option name="myItemId" value="hornetq" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> - </PATH> - <PATH> <PATH_ELEMENT> - <option name="myItemId" value="hornetq" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + <option name="myItemId" value="External Libraries" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="hornetq2" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -1155,12 +1157,12 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="hornetq2" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <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="tests" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemId" value="&lt; 1.6 &gt;" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" /> </PATH_ELEMENT> </PATH> <PATH> @@ -1169,15 +1171,15 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="hornetq2" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <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="tests" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemId" value="&lt; 1.6 &gt;" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="timing-tests" /> + <option name="myItemId" value="rt.jar" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -1187,31 +1189,21 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="hornetq2" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <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="tests" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemId" value="&lt; 1.6 &gt;" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="concurrent-tests" /> + <option name="myItemId" value="rt.jar" /> <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="hornetq2" /> + <option name="myItemId" value="javax" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="hornetq-core" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -1219,23 +1211,23 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="hornetq2" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <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="hornetq-core" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemId" value="&lt; 1.6 &gt;" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="src" /> + <option name="myItemId" value="rt.jar" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="main" /> + <option name="myItemId" value="javax" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="resources" /> + <option name="myItemId" value="naming" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -1248,26 +1240,20 @@ <option name="myItemId" value="hornetq2" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + </PATH> + <PATH> <PATH_ELEMENT> - <option name="myItemId" value="hornetq-core" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemId" value="hornetq" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="src" /> + <option name="myItemId" value="hornetq2" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="main" /> + <option name="myItemId" value="tests" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="resources" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="schema" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -1279,17 +1265,13 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="hornetq-core" /> + <option name="myItemId" value="tests" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="src" /> + <option name="myItemId" value="timing-tests" /> <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> @@ -1301,9 +1283,13 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="distribution" /> + <option name="myItemId" value="tests" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="concurrent-tests" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -1315,13 +1301,9 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="distribution" /> + <option name="myItemId" value="hornetq-core" /> <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> @@ -1333,14 +1315,10 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="distribution" /> + <option name="myItemId" value="hornetq-core" /> <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> @@ -1363,14 +1341,10 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="distribution" /> + <option name="myItemId" value="hornetq-core" /> <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> @@ -1383,7 +1357,7 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="config" /> + <option name="myItemId" value="schema" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -1397,14 +1371,10 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="distribution" /> + <option name="myItemId" value="hornetq-core" /> <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> @@ -1412,16 +1382,18 @@ <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="resources" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemId" value="hornetq" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="config" /> + <option name="myItemId" value="hornetq2" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="stand-alone" /> + <option name="myItemId" value="distribution" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -1442,30 +1414,6 @@ <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="resources" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="config" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-as-6" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="non-clustered" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -1492,18 +1440,6 @@ <option name="myItemId" value="main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="resources" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="config" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-as-6" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -1530,24 +1466,29 @@ <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="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="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder1" value="1" /> + <property name="project.structure.proportion" value="0.15" /> + <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth2" value="247" /> <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" /> @@ -1569,12 +1510,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="MemberChooser.copyJavadoc" value="false" /> + <property name="project.structure.side.proportion" value="0.2" /> <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder0" value="0" /> - <property name="dynamic.classpath" value="false" /> + <property name="MemberChooser.copyJavadoc" value="false" /> <property name="options.searchVisible" value="true" /> + <property name="dynamic.classpath" value="false" /> </component> <component name="RecentsManager"> <key name="CopyClassDialog.RECENTS_KEY"> @@ -1739,14 +1680,6 @@ <ConfigurationWrapper RunnerId="Run" /> <method /> </configuration> - <configuration default="true" type="PHPUnitRunConfigurationType" factoryName="PHPUnit"> - <method> - <option name="AntTarget" enabled="false" /> - <option name="BuildArtifacts" enabled="false" /> - <option name="Maven.BeforeRunTask" enabled="false" /> - <option name="ValidateXdebugSetup" enabled="true" /> - </method> - </configuration> <configuration default="true" type="MavenRunConfiguration" factoryName="Maven"> <MavenSettings> <option name="myGeneralSettings"> @@ -1794,6 +1727,14 @@ <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" /> @@ -1852,6 +1793,18 @@ <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="" /> @@ -1878,18 +1831,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="false" name="EnqueueDurable" type="Application" factoryName="Application"> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="emma"> <pattern> @@ -2132,27 +2073,27 @@ <frame x="0" y="24" width="1920" height="1152" 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.17182817" sideWeight="0.0" 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.11888112" 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="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.5174825" sideWeight="0.5" order="1" 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="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="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.0987055" sideWeight="0.82817185" order="0" 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.0987055" sideWeight="0.8811189" 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="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.24325782" sideWeight="0.82817185" 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.24325782" sideWeight="0.8811189" order="0" 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="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="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="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.5174825" sideWeight="0.5" order="1" 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="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> @@ -2172,7 +2113,7 @@ <option name="SHOW_ONLY_CHANGED_IN_SELECTION_DIFF" value="true" /> <option name="CHECK_COMMIT_MESSAGE_SPELLING" value="true" /> <option name="FORCE_NON_EMPTY_COMMENT" value="false" /> - <option name="LAST_COMMIT_MESSAGE" value="added better control over running tests" /> + <option name="LAST_COMMIT_MESSAGE" value="added validation for jms config" /> <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" /> @@ -2185,8 +2126,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="removed empty dirs&#10;" /> - <MESSAGE value="distribution module part 1" /> <MESSAGE value="distribution module part 2" /> <MESSAGE value="removed empty dirs" /> <MESSAGE value="added schemas to distro" /> @@ -2210,6 +2149,8 @@ <MESSAGE value="include javadoc in distro" /> <MESSAGE value="included user manual and quickstart guide in distro" /> <MESSAGE value="added better control over running tests" /> + <MESSAGE value="add validation for core configuration" /> + <MESSAGE value="added validation for jms config" /> </component> <component name="XDebuggerManager"> <breakpoint-manager /> @@ -2287,13 +2228,6 @@ </buildFile> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/tests/hornetq-tests-pom.iml"> - <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/pom.xml"> <provider selected="true" editor-type-id="text-editor"> <state line="39" column="53" selection-start="1939" selection-end="1939" vertical-scroll-proportion="-10.0"> @@ -2322,6 +2256,27 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/tests/pom.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="25" column="28" selection-start="447" selection-end="687" vertical-scroll-proportion="0.47953963"> + <folding /> + </state> + </provider> + </entry> + <entry file="jar://$USER_HOME$/devtools/apache-maven-2.2.1/lib/maven-2.2.1-uber.jar!/org/apache/maven/project/pom-4.0.0.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="52" column="15" selection-start="1587" selection-end="1587" vertical-scroll-proportion="0.33248082"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/tests/timing-tests/pom.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="28" column="27" selection-start="1237" selection-end="1237" vertical-scroll-proportion="0.0"> + <folding /> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/tests/joram-tests/pom.xml"> <provider selected="true" editor-type-id="text-editor"> <state line="28" column="26" selection-start="1234" selection-end="1234" vertical-scroll-proportion="0.0"> @@ -2343,16 +2298,16 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/tests/pom.xml"> + <entry file="file://$PROJECT_DIR$/tests/concurrent-tests/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="25" column="28" selection-start="447" selection-end="687" vertical-scroll-proportion="0.47953963"> + <state line="103" column="74" selection-start="3735" selection-end="3735" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/tests/timing-tests/pom.xml"> + <entry file="file://$PROJECT_DIR$/distribution/hornetq/src/main/resources/config/jboss-as-6/non-clustered/hornetq-configuration.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="28" column="27" selection-start="1237" selection-end="1237" vertical-scroll-proportion="0.0"> + <state line="46" column="129" selection-start="2249" selection-end="2249" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> @@ -2364,30 +2319,23 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/tests/concurrent-tests/pom.xml"> + <entry file="jar://$USER_HOME$/devtools/jdk1.6.0_21/src.zip!/javax/naming/InitialContext.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="103" column="74" selection-start="3735" selection-end="3735" vertical-scroll-proportion="0.0"> + <state line="94" column="85" selection-start="4440" selection-end="4440" vertical-scroll-proportion="0.14371258"> <folding /> </state> </provider> </entry> - <entry file="jar://$USER_HOME$/devtools/apache-maven-2.2.1/lib/maven-2.2.1-uber.jar!/org/apache/maven/project/pom-4.0.0.xml"> + <entry file="file://$PROJECT_DIR$/distribution/hornetq/src/main/assembly/dep.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="52" column="15" selection-start="1587" selection-end="1587" vertical-scroll-proportion="0.33248082"> + <state line="103" column="44" selection-start="4228" selection-end="4228" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/distribution/hornetq/src/main/resources/config/jboss-as-6/non-clustered/hornetq-configuration.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state line="46" column="129" selection-start="2249" selection-end="2249" vertical-scroll-proportion="0.0"> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/distribution/hornetq/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="129" column="62" selection-start="5718" selection-end="5718" vertical-scroll-proportion="1.5805243"> + <state line="186" column="109" selection-start="9015" selection-end="9030" vertical-scroll-proportion="0.65868264"> <folding /> </state> </provider>