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

Author: ataylor Date: 2011-04-18 08:58:03 -0400 (Mon, 18 Apr 2011) New Revision: 10524 Modified: trunk/distribution/hornetq/hornetq (1).iml trunk/distribution/hornetq/pom.xml trunk/hornetq.iws Log: add validation for core configuration Modified: trunk/distribution/hornetq/hornetq (1).iml =================================================================== --- trunk/distribution/hornetq/hornetq (1).iml 2011-04-18 08:07:41 UTC (rev 10523) +++ trunk/distribution/hornetq/hornetq (1).iml 2011-04-18 12:58:03 UTC (rev 10524) @@ -9,11 +9,12 @@ </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: org.jboss.javaee:jboss-jms-api:1.1.0.GA" level="project" /> <orderEntry type="library" name="Maven: org.jboss.naming:jnpserver:5.0.3.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.logging:jboss-logging-spi:2.1.0.GA" level="project" /> - <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" /> </component> </module> Modified: trunk/distribution/hornetq/pom.xml =================================================================== --- trunk/distribution/hornetq/pom.xml 2011-04-18 08:07:41 UTC (rev 10523) +++ trunk/distribution/hornetq/pom.xml 2011-04-18 12:58:03 UTC (rev 10524) @@ -1,3 +1,16 @@ +<!-- + ~ Copyright 2009 Red Hat, Inc. + ~ Red Hat licenses this file to you under the Apache License, version + ~ 2.0 (the "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + ~ implied. See the License for the specific language governing + ~ permissions and limitations under the License. + --> + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -14,6 +27,14 @@ <packaging>pom</packaging> <name>Actual HornetQ Distribution</name> + <dependencies> + <dependency> + <groupId>org.hornetq</groupId> + <artifactId>hornetq-core</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + <build> <resources> <resource> @@ -23,6 +44,13 @@ </resources> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <plugin> <artifactId>maven-assembly-plugin</artifactId> <version>2.2</version> <configuration> @@ -37,6 +65,78 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>xml-maven-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>validate</goal> + </goals> + </execution> + </executions> + <configuration> + <validationSets> + <validationSet> + <dir>src/main/resources/config/stand-alone/clustered</dir> + <systemId>${build.directory}/${artifactId}-${project.version}-bin/schema/hornetq-configuration.xsd</systemId> + <includes> + <include>hornetq-configuration.xml</include> + </includes> + </validationSet> + <validationSet> + <dir>src/main/resources/config/stand-alone/non-clustered</dir> + <systemId>${build.directory}/${artifactId}-${project.version}-bin/schema/hornetq-configuration.xsd</systemId> + <includes> + <include>hornetq-configuration.xml</include> + </includes> + </validationSet> + <validationSet> + <dir>src/main/resources/config/jboss-as-4/clustered</dir> + <systemId>${build.directory}/${artifactId}-${project.version}-bin/schema/hornetq-configuration.xsd</systemId> + <includes> + <include>hornetq-configuration.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-configuration.xsd</systemId> + <includes> + <include>hornetq-configuration.xml</include> + </includes> + </validationSet> + <validationSet> + <dir>src/main/resources/config/jboss-as-5/clustered</dir> + <systemId>${build.directory}/${artifactId}-${project.version}-bin/schema/hornetq-configuration.xsd</systemId> + <includes> + <include>hornetq-configuration.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-configuration.xsd</systemId> + <includes> + <include>hornetq-configuration.xml</include> + </includes> + </validationSet> + <validationSet> + <dir>src/main/resources/config/jboss-as-6/clustered</dir> + <systemId>${build.directory}/${artifactId}-${project.version}-bin/schema/hornetq-configuration.xsd</systemId> + <includes> + <include>hornetq-configuration.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-configuration.xsd</systemId> + <includes> + <include>hornetq-configuration.xml</include> + </includes> + </validationSet> + </validationSets> + </configuration> + </plugin> + </plugins> </build> Modified: trunk/hornetq.iws =================================================================== --- trunk/hornetq.iws 2011-04-18 08:07:41 UTC (rev 10523) +++ trunk/hornetq.iws 2011-04-18 12:58:03 UTC (rev 10524) @@ -2,17 +2,9 @@ <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$/hornetq.iws" afterPath="$PROJECT_DIR$/hornetq.iws" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tests/concurrent-tests/pom.xml" afterPath="$PROJECT_DIR$/tests/concurrent-tests/pom.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tests/integration-tests/pom.xml" afterPath="$PROJECT_DIR$/tests/integration-tests/pom.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tests/jms-tests/pom.xml" afterPath="$PROJECT_DIR$/tests/jms-tests/pom.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tests/joram-tests/pom.xml" afterPath="$PROJECT_DIR$/tests/joram-tests/pom.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tests/performance-tests/pom.xml" afterPath="$PROJECT_DIR$/tests/performance-tests/pom.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tests/pom.xml" afterPath="$PROJECT_DIR$/tests/pom.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tests/soak-tests/pom.xml" afterPath="$PROJECT_DIR$/tests/soak-tests/pom.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tests/stress-tests/pom.xml" afterPath="$PROJECT_DIR$/tests/stress-tests/pom.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tests/timing-tests/pom.xml" afterPath="$PROJECT_DIR$/tests/timing-tests/pom.xml" /> </list> <ignored path=".idea/workspace.xml" /> <ignored path="$USER_HOME_GRAILS$/" /> @@ -90,24 +82,6 @@ <component name="FileEditorManager"> <leaf> <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="39" column="53" selection-start="1939" selection-end="1939" vertical-scroll-proportion="-10.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$/tests/pom.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="24" selection-start="687" selection-end="986" 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$/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"> @@ -117,63 +91,63 @@ </entry> </file> <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/tests/stress-tests/pom.xml"> + <entry file="file://$PROJECT_DIR$/tests/joram-tests/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="28" column="39" selection-start="1249" selection-end="1249" vertical-scroll-proportion="0.0"> + <state line="28" column="26" selection-start="1234" selection-end="1234" 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$/tests/soak-tests/pom.xml"> + <entry file="file://$PROJECT_DIR$/tests/jms-tests/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="28" column="25" selection-start="1231" selection-end="1231" vertical-scroll-proportion="0.0"> + <state line="129" column="40" selection-start="4633" selection-end="4633" 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$/tests/performance-tests/pom.xml"> + <entry file="file://$PROJECT_DIR$/tests/integration-tests/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="28" column="32" selection-start="1252" selection-end="1252" vertical-scroll-proportion="0.0"> + <state line="15" column="32" selection-start="614" selection-end="614" 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$/tests/joram-tests/pom.xml"> + <entry file="file://$PROJECT_DIR$/tests/concurrent-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"> + <state line="103" column="74" selection-start="3735" selection-end="3735" 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$/tests/jms-tests/pom.xml"> + <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="40" selection-start="4633" selection-end="4633" vertical-scroll-proportion="0.0"> + <state line="129" column="62" selection-start="5718" selection-end="5718" vertical-scroll-proportion="1.5805243"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/tests/integration-tests/pom.xml"> + <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"> - <state line="15" column="32" selection-start="614" selection-end="614" vertical-scroll-proportion="0.0"> + <state line="46" column="129" selection-start="2249" selection-end="2249" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="pom.xml" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/tests/concurrent-tests/pom.xml"> + <file leaf-file-name="hornetq-configuration.xsd" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/hornetq-core/src/main/resources/schema/hornetq-configuration.xsd"> <provider selected="true" editor-type-id="text-editor"> - <state line="144" column="47" selection-start="5063" selection-end="5063" vertical-scroll-proportion="1.1160715"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> @@ -192,11 +166,6 @@ <component name="IdeDocumentHistory"> <option name="changedFiles"> <list> - <option value="$PROJECT_DIR$/docs/user-manual/pom.xml" /> - <option value="$PROJECT_DIR$/hornetq-core/pom.xml" /> - <option value="$PROJECT_DIR$/distribution/hornetq/pom.xml" /> - <option value="$PROJECT_DIR$/docs/quickstart-guide/pom.xml" /> - <option value="$PROJECT_DIR$/docs/pom.xml" /> <option value="$PROJECT_DIR$/distribution/hornetq/src/main/assembly/dep.xml" /> <option value="$PROJECT_DIR$/pom.xml" /> <option value="$PROJECT_DIR$/tests/pom.xml" /> @@ -208,6 +177,11 @@ <option value="$PROJECT_DIR$/tests/jms-tests/pom.xml" /> <option value="$PROJECT_DIR$/tests/integration-tests/pom.xml" /> <option value="$PROJECT_DIR$/tests/concurrent-tests/pom.xml" /> + <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" /> </list> </option> </component> @@ -1203,7 +1177,7 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="unit-tests" /> + <option name="myItemId" value="timing-tests" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -1221,7 +1195,7 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="timing-tests" /> + <option name="myItemId" value="concurrent-tests" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -1235,13 +1209,35 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="tests" /> + <option name="myItemId" value="hornetq-core" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + </PATH> + <PATH> <PATH_ELEMENT> - <option name="myItemId" value="stress-tests" /> + <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="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_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> <PATH> <PATH_ELEMENT> @@ -1253,13 +1249,25 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="tests" /> + <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="soak-tests" /> + <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="schema" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -1271,13 +1279,17 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="tests" /> + <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="performance-tests" /> + <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> @@ -1289,13 +1301,27 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="tests" /> + <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="joram-tests" /> + <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="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> @@ -1307,13 +1333,25 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="tests" /> + <option name="myItemId" value="distribution" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="jms-tests" /> + <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> <PATH> <PATH_ELEMENT> @@ -1325,13 +1363,29 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="tests" /> + <option name="myItemId" value="distribution" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="integration-tests" /> + <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> <PATH> <PATH_ELEMENT> @@ -1343,14 +1397,140 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="tests" /> + <option name="myItemId" value="distribution" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="concurrent-tests" /> + <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="stand-alone" /> + <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="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="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> + <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="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="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> + <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="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> </subPane> </pane> </panes> @@ -1952,7 +2132,7 @@ <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.3936064" 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.17182817" 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" /> @@ -1964,10 +2144,10 @@ <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.27669904" sideWeight="0.60639364" 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.82817185" 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.60639364" 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.82817185" 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" /> @@ -1992,7 +2172,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="included user manual and quickstart guide in distro" /> + <option name="LAST_COMMIT_MESSAGE" value="added better control over running tests" /> <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" /> @@ -2005,7 +2185,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 emma jars" /> <MESSAGE value="removed empty dirs&#10;" /> <MESSAGE value="distribution module part 1" /> <MESSAGE value="distribution module part 2" /> @@ -2030,6 +2209,7 @@ <MESSAGE value="added javadoc to core" /> <MESSAGE value="include javadoc in distro" /> <MESSAGE value="included user manual and quickstart guide in distro" /> + <MESSAGE value="added better control over running tests" /> </component> <component name="XDebuggerManager"> <breakpoint-manager /> @@ -2107,118 +2287,111 @@ </buildFile> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/docs/quickstart-guide/pom.xml"> + <entry file="file://$PROJECT_DIR$/tests/hornetq-tests-pom.iml"> <provider selected="true" editor-type-id="text-editor"> - <state line="6" column="3" selection-start="287" selection-end="287" vertical-scroll-proportion="0.0"> + <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$/docs/pom.xml"> + <entry file="file://$PROJECT_DIR$/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="31" column="30" selection-start="1262" selection-end="1262" vertical-scroll-proportion="0.0"> + <state line="39" column="53" selection-start="1939" selection-end="1939" vertical-scroll-proportion="-10.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/distribution/hornetq/src/main/assembly/dep.xml"> + <entry file="file://$PROJECT_DIR$/tests/stress-tests/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="299" column="47" selection-start="11729" selection-end="11729" vertical-scroll-proportion="0.0"> + <state line="28" column="39" selection-start="1249" selection-end="1249" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/hornetq-rest/examples/pom.xml"> + <entry file="file://$PROJECT_DIR$/tests/soak-tests/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <state line="28" column="25" selection-start="1231" selection-end="1231" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/hornetq-rest/examples/dup-send/pom.xml"> + <entry file="file://$PROJECT_DIR$/tests/performance-tests/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <state line="28" column="32" selection-start="1252" selection-end="1252" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/tests/hornetq-tests-pom.iml"> + <entry file="file://$PROJECT_DIR$/tests/joram-tests/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <state line="28" column="26" selection-start="1234" selection-end="1234" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/pom.xml"> + <entry file="file://$PROJECT_DIR$/tests/jms-tests/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"> + <state line="129" column="40" selection-start="4633" selection-end="4633" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/tests/pom.xml"> + <entry file="file://$PROJECT_DIR$/tests/integration-tests/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="24" selection-start="687" selection-end="986" vertical-scroll-proportion="0.0"> + <state line="15" column="32" selection-start="614" selection-end="614" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/tests/timing-tests/pom.xml"> + <entry file="file://$PROJECT_DIR$/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"> + <state line="25" column="28" selection-start="447" selection-end="687" vertical-scroll-proportion="0.47953963"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/tests/stress-tests/pom.xml"> + <entry file="file://$PROJECT_DIR$/tests/timing-tests/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="28" column="39" selection-start="1249" selection-end="1249" vertical-scroll-proportion="0.0"> + <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/soak-tests/pom.xml"> + <entry file="file://$PROJECT_DIR$/hornetq-core/src/main/resources/schema/hornetq-configuration.xsd"> <provider selected="true" editor-type-id="text-editor"> - <state line="28" column="25" selection-start="1231" selection-end="1231" vertical-scroll-proportion="0.0"> + <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$/tests/performance-tests/pom.xml"> + <entry file="file://$PROJECT_DIR$/tests/concurrent-tests/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="28" column="32" selection-start="1252" selection-end="1252" vertical-scroll-proportion="0.0"> + <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/joram-tests/pom.xml"> + <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="28" column="26" selection-start="1234" selection-end="1234" vertical-scroll-proportion="0.0"> + <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/jms-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="129" column="40" selection-start="4633" selection-end="4633" vertical-scroll-proportion="0.0"> + <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$/tests/integration-tests/pom.xml"> + <entry file="file://$PROJECT_DIR$/distribution/hornetq/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="15" column="32" selection-start="614" selection-end="614" vertical-scroll-proportion="0.0"> + <state line="129" column="62" selection-start="5718" selection-end="5718" vertical-scroll-proportion="1.5805243"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/tests/concurrent-tests/pom.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state line="144" column="47" selection-start="5063" selection-end="5063" vertical-scroll-proportion="1.1160715"> - <folding /> - </state> - </provider> - </entry> </component> <component name="masterDetails"> <states>