[hornetq-commits] JBoss hornetq SVN: r10522 - in trunk: distribution/hornetq/src/main/assembly and 5 other directories.

Author: ataylor Date: 2011-04-18 03:30:10 -0400 (Mon, 18 Apr 2011) New Revision: 10522 Added: trunk/docs/hornetq-docs.iml trunk/docs/pom.xml trunk/docs/quickstart-guide/HornetQ_QuickStart_Guide-en.iml trunk/docs/user-manual/HornetQ_User_Manual-en.iml Modified: trunk/distribution/hornetq/src/main/assembly/dep.xml trunk/docs/quickstart-guide/pom.xml trunk/docs/user-manual/pom.xml trunk/hornetq-core/hornetq-core.iml trunk/hornetq.ipr trunk/hornetq.iws trunk/pom.xml trunk/tests/integration-tests/integration-tests.iml Log: included user manual and quickstart guide in distro Modified: trunk/distribution/hornetq/src/main/assembly/dep.xml =================================================================== --- trunk/distribution/hornetq/src/main/assembly/dep.xml 2011-04-18 07:12:56 UTC (rev 10521) +++ trunk/distribution/hornetq/src/main/assembly/dep.xml 2011-04-18 07:30:10 UTC (rev 10522) @@ -290,5 +290,14 @@ <directory>src/main/resources/examples</directory> <outputDirectory>examples</outputDirectory> </fileSet> + <!--todo, this is crap, there must be better jdocbook assembly integration--> + <fileSet> + <directory>../../docs/user-manual/target/docbook/publish/en</directory> + <outputDirectory>docs/user-manual</outputDirectory> + </fileSet> + <fileSet> + <directory>../../docs/quickstart-guide/target/docbook/publish/en</directory> + <outputDirectory>docs/quickstart-guide</outputDirectory> + </fileSet> </fileSets> </assembly> Added: trunk/docs/hornetq-docs.iml =================================================================== --- trunk/docs/hornetq-docs.iml (rev 0) +++ trunk/docs/hornetq-docs.iml 2011-04-18 07:30:10 UTC (rev 10522) @@ -0,0 +1,14 @@ +<?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"> + <output url="file://$MODULE_DIR$/target/classes" /> + <output-test url="file://$MODULE_DIR$/target/test-classes" /> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <excludeFolder url="file://$MODULE_DIR$/target" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + </component> +</module> + Copied: trunk/docs/pom.xml (from rev 10516, trunk/distribution/pom.xml) =================================================================== --- trunk/docs/pom.xml (rev 0) +++ trunk/docs/pom.xml 2011-04-18 07:30:10 UTC (rev 10522) @@ -0,0 +1,36 @@ +<!-- + ~ 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> + + <parent> + <groupId>org.hornetq</groupId> + <artifactId>hornetq-pom</artifactId> + <version>2.2.3-SNAPSHOT</version> + </parent> + + <groupId>org.hornetq.docs</groupId> + <artifactId>hornetq-docs</artifactId> + <packaging>pom</packaging> + <name>HornetQ Documentation</name> + + + <modules> + <module>user-manual</module> + <module>quickstart-guide</module> + </modules> + + +</project> Added: trunk/docs/quickstart-guide/HornetQ_QuickStart_Guide-en.iml =================================================================== --- trunk/docs/quickstart-guide/HornetQ_QuickStart_Guide-en.iml (rev 0) +++ trunk/docs/quickstart-guide/HornetQ_QuickStart_Guide-en.iml 2011-04-18 07:30:10 UTC (rev 10522) @@ -0,0 +1,13 @@ +<?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"> + <output url="file://$MODULE_DIR$/target/classes" /> + <output-test url="file://$MODULE_DIR$/target/test-classes" /> + <content url="file://$MODULE_DIR$"> + <excludeFolder url="file://$MODULE_DIR$/target" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + </component> +</module> + Modified: trunk/docs/quickstart-guide/pom.xml =================================================================== --- trunk/docs/quickstart-guide/pom.xml 2011-04-18 07:12:56 UTC (rev 10521) +++ trunk/docs/quickstart-guide/pom.xml 2011-04-18 07:30:10 UTC (rev 10522) @@ -4,7 +4,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.project</groupId> + + <parent> + <groupId>org.hornetq.docs</groupId> + <artifactId>hornetq-docs</artifactId> + <version>2.2.3-SNAPSHOT</version> + </parent> + + <groupId>org.hornetq.docs</groupId> <artifactId>${docname}-${translation}</artifactId> <version>1.0</version> <packaging>jdocbook</packaging> Added: trunk/docs/user-manual/HornetQ_User_Manual-en.iml =================================================================== --- trunk/docs/user-manual/HornetQ_User_Manual-en.iml (rev 0) +++ trunk/docs/user-manual/HornetQ_User_Manual-en.iml 2011-04-18 07:30:10 UTC (rev 10522) @@ -0,0 +1,13 @@ +<?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"> + <output url="file://$MODULE_DIR$/target/classes" /> + <output-test url="file://$MODULE_DIR$/target/test-classes" /> + <content url="file://$MODULE_DIR$"> + <excludeFolder url="file://$MODULE_DIR$/target" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + </component> +</module> + Modified: trunk/docs/user-manual/pom.xml =================================================================== --- trunk/docs/user-manual/pom.xml 2011-04-18 07:12:56 UTC (rev 10521) +++ trunk/docs/user-manual/pom.xml 2011-04-18 07:30:10 UTC (rev 10522) @@ -17,7 +17,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.project</groupId> + + <parent> + <groupId>org.hornetq.docs</groupId> + <artifactId>hornetq-docs</artifactId> + <version>2.2.3-SNAPSHOT</version> + </parent> + + <groupId>org.hornetq.docs</groupId> <artifactId>${docname}-${translation}</artifactId> <version>1.0</version> <packaging>jdocbook</packaging> Modified: trunk/hornetq-core/hornetq-core.iml =================================================================== --- trunk/hornetq-core/hornetq-core.iml 2011-04-18 07:12:56 UTC (rev 10521) +++ trunk/hornetq-core/hornetq-core.iml 2011-04-18 07:30:10 UTC (rev 10522) @@ -9,6 +9,8 @@ <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/invoker" /> + <excludeFolder url="file://$MODULE_DIR$/target/javadoc-bundle-options" /> <excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" /> </content> <orderEntry type="inheritedJdk" /> Modified: trunk/hornetq.ipr =================================================================== --- trunk/hornetq.ipr 2011-04-18 07:12:56 UTC (rev 10521) +++ trunk/hornetq.ipr 2011-04-18 07:30:10 UTC (rev 10522) @@ -381,6 +381,8 @@ </component> <component name="ProjectModuleManager"> <modules> + <module fileurl="file://$PROJECT_DIR$/docs/quickstart-guide/HornetQ_QuickStart_Guide-en.iml" filepath="$PROJECT_DIR$/docs/quickstart-guide/HornetQ_QuickStart_Guide-en.iml" /> + <module fileurl="file://$PROJECT_DIR$/docs/user-manual/HornetQ_User_Manual-en.iml" filepath="$PROJECT_DIR$/docs/user-manual/HornetQ_User_Manual-en.iml" /> <module fileurl="file://$PROJECT_DIR$/tests/concurrent-tests/concurrent-tests.iml" filepath="$PROJECT_DIR$/tests/concurrent-tests/concurrent-tests.iml" /> <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" /> @@ -388,6 +390,7 @@ <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" /> + <module fileurl="file://$PROJECT_DIR$/docs/hornetq-docs.iml" filepath="$PROJECT_DIR$/docs/hornetq-docs.iml" /> <module fileurl="file://$PROJECT_DIR$/examples/hornetq-examples.iml" filepath="$PROJECT_DIR$/examples/hornetq-examples.iml" /> <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" /> Modified: trunk/hornetq.iws =================================================================== --- trunk/hornetq.iws 2011-04-18 07:12:56 UTC (rev 10521) +++ trunk/hornetq.iws 2011-04-18 07:30:10 UTC (rev 10522) @@ -2,12 +2,18 @@ <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-distribution.iml" afterPath="$PROJECT_DIR$/distribution/hornetq-distribution.iml" /> - </list> - <list id="5341122e-b51c-4e90-b798-7086790ef7e8" name="intellij" comment="intellij stuff"> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq.iml" afterPath="$PROJECT_DIR$/hornetq.iml" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/docs/hornetq-docs.iml" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/docs/pom.xml" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/docs/quickstart-guide/HornetQ_QuickStart_Guide-en.iml" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/docs/user-manual/HornetQ_User_Manual-en.iml" /> + <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$/docs/quickstart-guide/pom.xml" afterPath="$PROJECT_DIR$/docs/quickstart-guide/pom.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/docs/user-manual/pom.xml" afterPath="$PROJECT_DIR$/docs/user-manual/pom.xml" /> + <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.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" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tests/integration-tests/integration-tests.iml" afterPath="$PROJECT_DIR$/tests/integration-tests/integration-tests.iml" /> </list> <ignored path=".idea/workspace.xml" /> <ignored path="$USER_HOME_GRAILS$/" /> @@ -84,26 +90,26 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="build-hornetq.xml" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/build-hornetq.xml"> + <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="85" column="44" selection-start="5372" selection-end="5375" vertical-scroll-proportion="-0.6"> + <state line="368" column="40" selection-start="13544" selection-end="14333" vertical-scroll-proportion="-23.08"> <folding /> </state> </provider> </entry> </file> <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/pom.xml"> + <entry file="file://$PROJECT_DIR$/hornetq-core/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="200" column="35" selection-start="7796" selection-end="7801" vertical-scroll-proportion="-27.68"> + <state line="56" column="74" selection-start="1878" selection-end="1878" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="hornetq-distribution.iml" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/distribution/hornetq-distribution.iml"> + <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/distribution/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"> <folding /> @@ -111,64 +117,64 @@ </provider> </entry> </file> - <file leaf-file-name="hornetq.iml" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/hornetq.iml"> + <file leaf-file-name="build-thirdparty.xml" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/build-thirdparty.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="8" column="65" selection-start="662" selection-end="662" vertical-scroll-proportion="0.24390244"> + <state line="59" column="7" selection-start="2534" selection-end="2538" vertical-scroll-proportion="15.84"> <folding /> </state> </provider> </entry> </file> <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/distribution/pom.xml"> + <entry file="file://$PROJECT_DIR$/docs/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="27" column="27" selection-start="925" selection-end="925" vertical-scroll-proportion="0.0"> + <state line="31" column="30" selection-start="1262" selection-end="1262" 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$/distribution/hornetq/pom.xml"> + <file leaf-file-name="build-hornetq.xml" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/build-hornetq.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="13" column="17" selection-start="493" selection-end="493" vertical-scroll-proportion="0.0"> + <state line="1148" column="62" selection-start="54984" selection-end="54990" vertical-scroll-proportion="-14.72"> <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"> + <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/docs/user-manual/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="253" column="36" selection-start="10017" selection-end="10017" vertical-scroll-proportion="-19.84"> + <state line="26" column="46" selection-start="924" selection-end="1113" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="build.sh" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/examples/bin/build.sh"> + <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/docs/quickstart-guide/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="60" selection-start="1016" selection-end="1016" vertical-scroll-proportion="0.0"> + <state line="6" column="3" selection-start="287" selection-end="287" 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$/distribution/jnp-client/pom.xml"> + <entry file="file://$PROJECT_DIR$/distribution/hornetq/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="27" column="70" selection-start="0" selection-end="2876" vertical-scroll-proportion="0.0"> + <state line="38" column="18" selection-start="1244" selection-end="1244" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="dep.xml" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/examples/src/main/assembly/dep.xml"> + <file leaf-file-name="dep.xml" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/distribution/hornetq/src/main/assembly/dep.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="34" column="65" selection-start="1563" selection-end="1563" vertical-scroll-proportion="0.0"> + <state line="299" column="47" selection-start="11729" selection-end="11729" vertical-scroll-proportion="1.3950617"> <folding /> </state> </provider> @@ -187,11 +193,6 @@ <component name="IdeDocumentHistory"> <option name="changedFiles"> <list> - <option value="$PROJECT_DIR$/examples/src/main/resources/bin/build.sh" /> - <option value="$PROJECT_DIR$/examples/src/main/resources/jms/applet/build.sh" /> - <option value="$PROJECT_DIR$/hornetq-ra/pom.xml" /> - <option value="$PROJECT_DIR$/examples/pom.xml" /> - <option value="$PROJECT_DIR$/examples/src/main/assembly/dep.xml" /> <option value="$PROJECT_DIR$/examples/core/embedded-remote/build.sh" /> <option value="$PROJECT_DIR$/distribution/src/main/resources/config/examples/common/config/ant.properties" /> <option value="$PROJECT_DIR$/examples/common/build.xml" /> @@ -199,10 +200,15 @@ <option value="$PROJECT_DIR$/distribution/jboss-mc/pom.xml" /> <option value="$PROJECT_DIR$/distribution/src/main/assembly/dep.xml" /> <option value="$PROJECT_DIR$/distribution/jnp-client/pom.xml" /> + <option value="$PROJECT_DIR$/distribution/pom.xml" /> + <option value="$PROJECT_DIR$/examples/common/src/org/hornetq/common/example/HornetQExample.java" /> + <option value="$PROJECT_DIR$/docs/user-manual/pom.xml" /> <option value="$PROJECT_DIR$/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$/distribution/pom.xml" /> </list> </option> </component> @@ -226,6 +232,16 @@ <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$RootNode" /> </PATH_ELEMENT> </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="" /> + <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$RootNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="HornetQ User Manual-(en)" /> + <option name="myItemType" value="org.jetbrains.idea.maven.navigator.MavenProjectsStructure$ProjectNode" /> + </PATH_ELEMENT> + </PATH> </treeState> </component> <component name="ModuleEditorState"> @@ -1180,7 +1196,7 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="examples" /> + <option name="myItemId" value="native" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -1194,17 +1210,9 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="examples" /> + <option name="myItemId" value="docs" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="tools" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="ant" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -1216,11 +1224,11 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="examples" /> + <option name="myItemId" value="docs" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="bin" /> + <option name="myItemId" value="user-manual" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -1234,9 +1242,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="docs" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="quickstart-guide" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -1251,10 +1263,6 @@ <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> @@ -1335,11 +1343,11 @@ </panes> </component> <component name="PropertiesComponent"> - <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth1" value="289" /> - <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth0" value="227" /> + <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_flatWidth3" value="35" /> - <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth2" value="249" /> + <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" /> @@ -1349,18 +1357,18 @@ <property name="RunManagerConfig.showSettingsBeforeRunnig" value="false" /> <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="201" /> + <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth2" value="200" /> <property name="MemberChooser.sorted" value="false" /> - <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth1" value="244" /> + <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth1" value="242" /> <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder4" value="4" /> - <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth0" value="197" /> - <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth4" value="981" /> - <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth3" value="201" /> + <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth0" value="196" /> + <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth4" value="973" /> + <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth3" value="200" /> <property name="GoToClass.includeJavaFiles" value="false" /> <property name="GoToClass.toSaveIncludeLibraries" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" /> <property name="MemberChooser.showClasses" value="true" /> - <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth4" value="1024" /> + <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth4" value="1017" /> <property name="GoToClass.includeLibraries" value="false" /> <property name="options.splitter.details.proportions" value="0.2" /> <property name="GoToFile.includeJavaFiles" value="false" /> @@ -1381,11 +1389,11 @@ <recent name="org.hornetq.jms.example" /> </key> <key name="CopyFile.RECENT_KEYS"> + <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" /> <recent name="$PROJECT_DIR$/tests/concurrent-tests" /> - <recent name="$PROJECT_DIR$/tests/timing-tests" /> </key> <key name="MoveMembersDialog.RECENTS_KEY"> <recent name="org.hornetq.api.core.client.HornetQClient" /> @@ -1931,25 +1939,25 @@ <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.44855145" 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.37362638" 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.18381618" sideWeight="0.0" order="7" 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.27669904" sideWeight="0.5514485" 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.27669904" sideWeight="0.62637365" 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.5514485" 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.62637365" 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="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="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="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" /> @@ -1971,7 +1979,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="intellij stuff" /> + <option name="LAST_COMMIT_MESSAGE" value="included user manual and quickstart guide in distro" /> <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" /> @@ -1984,11 +1992,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="mavenised stress tests" /> - <MESSAGE value="mavenised timing tests" /> - <MESSAGE value="mavenised concurrent tests" /> - <MESSAGE value="mavenised performance tests" /> - <MESSAGE value="unwanted test" /> <MESSAGE value="removed emma jars" /> <MESSAGE value="removed empty dirs&#10;" /> <MESSAGE value="distribution module part 1" /> @@ -2009,6 +2012,11 @@ <MESSAGE value="moved the actual hornetq distro module" /> <MESSAGE value="tweaks to fix build" /> <MESSAGE value="intellij stuff" /> + <MESSAGE value="fixed examples" /> + <MESSAGE value="moved binaries" /> + <MESSAGE value="added javadoc to core" /> + <MESSAGE value="include javadoc in distro" /> + <MESSAGE value="included user manual and quickstart guide in distro" /> </component> <component name="XDebuggerManager"> <breakpoint-manager /> @@ -2086,110 +2094,114 @@ </buildFile> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/examples/common/config/ant.properties"> + <entry file="file://$PROJECT_DIR$/examples/jms/queue/build.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="1" column="0" selection-start="37" selection-end="37" 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$/examples/common/build.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="16" column="52" selection-start="817" selection-end="817" vertical-scroll-proportion="0.0" /> + <state line="16" column="52" selection-start="817" selection-end="817" vertical-scroll-proportion="0.0"> + <folding /> + </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/hornetq-jms/pom.xml"> + <entry file="file://$PROJECT_DIR$/examples/common/src/org/hornetq/common/example/HornetQExample.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="34" column="23" selection-start="533" selection-end="1184" vertical-scroll-proportion="0.0"> + <state line="164" column="0" selection-start="5470" selection-end="5470" 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-core/src/main/java/org/hornetq/core/remoting/impl/netty/TransportConstants.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="29" column="69" selection-start="0" selection-end="4258" vertical-scroll-proportion="0.0"> + <state line="26" column="31" selection-start="902" selection-end="920" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/examples/pom.xml"> + <entry file="file://$PROJECT_DIR$/hornetq-rest/docbook/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="12" column="17" selection-start="492" selection-end="492" vertical-scroll-proportion="0.0"> + <state line="34" column="76" selection-start="1450" selection-end="1450" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/distribution/jboss-mc/pom.xml"> + <entry file="jar://$MAVEN_REPOSITORY$/org/jboss/maven/plugins/maven-jdocbook-plugin/2.2.1/maven-jdocbook-plugin-2.2.1.jar!/META-INF/maven/plugin.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="29" column="44" selection-start="1002" selection-end="1002" vertical-scroll-proportion="0.0"> + <state line="46" column="8" selection-start="1935" selection-end="1935" vertical-scroll-proportion="0.33292383"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/examples/src/main/assembly/dep.xml"> + <entry file="file://$PROJECT_DIR$/build-thirdparty.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="34" column="65" selection-start="1563" selection-end="1563" vertical-scroll-proportion="0.0"> + <state line="59" column="7" selection-start="2534" selection-end="2538" vertical-scroll-proportion="15.84"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/distribution/jnp-client/pom.xml"> + <entry file="file://$PROJECT_DIR$/build-hornetq.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="27" column="70" selection-start="0" selection-end="2876" vertical-scroll-proportion="0.0"> + <state line="1148" column="62" selection-start="54984" selection-end="54990" vertical-scroll-proportion="-14.72"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/examples/bin/build.sh"> + <entry file="file://$PROJECT_DIR$/distribution/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="60" selection-start="1016" selection-end="1016" 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$/build-hornetq.xml"> + <entry file="file://$PROJECT_DIR$/hornetq-core/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="85" column="44" selection-start="5372" selection-end="5375" vertical-scroll-proportion="-0.6"> + <state line="56" column="74" selection-start="1878" selection-end="1878" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/distribution/hornetq/pom.xml"> + <entry file="file://$PROJECT_DIR$/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="13" column="17" selection-start="493" selection-end="493" vertical-scroll-proportion="0.0"> + <state line="368" column="40" selection-start="13544" selection-end="14333" vertical-scroll-proportion="-23.08"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/distribution/hornetq/src/main/assembly/dep.xml"> + <entry file="file://$PROJECT_DIR$/distribution/hornetq/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="253" column="36" selection-start="10017" selection-end="10017" vertical-scroll-proportion="-19.84"> + <state line="38" column="18" selection-start="1244" selection-end="1244" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/distribution/pom.xml"> + <entry file="file://$PROJECT_DIR$/docs/user-manual/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="27" column="27" selection-start="925" selection-end="925" vertical-scroll-proportion="0.0"> + <state line="26" column="46" selection-start="924" selection-end="1113" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/pom.xml"> + <entry file="file://$PROJECT_DIR$/docs/quickstart-guide/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="200" column="35" selection-start="7796" selection-end="7801" vertical-scroll-proportion="-27.68"> + <state line="6" column="3" selection-start="287" selection-end="287" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/distribution/hornetq-distribution.iml"> + <entry file="file://$PROJECT_DIR$/docs/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="31" column="30" selection-start="1262" selection-end="1262" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/hornetq.iml"> + <entry file="file://$PROJECT_DIR$/distribution/hornetq/src/main/assembly/dep.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="8" column="65" selection-start="662" selection-end="662" vertical-scroll-proportion="0.24390244"> + <state line="299" column="47" selection-start="11729" selection-end="11729" vertical-scroll-proportion="1.3950617"> <folding /> </state> </provider> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-18 07:12:56 UTC (rev 10521) +++ trunk/pom.xml 2011-04-18 07:30:10 UTC (rev 10522) @@ -109,6 +109,7 @@ <module>hornetq-service-sar</module> <module>tests</module> <module>examples</module> + <module>docs</module> <module>distribution</module> </modules> Modified: trunk/tests/integration-tests/integration-tests.iml =================================================================== --- trunk/tests/integration-tests/integration-tests.iml 2011-04-18 07:12:56 UTC (rev 10521) +++ trunk/tests/integration-tests/integration-tests.iml 2011-04-18 07:30:10 UTC (rev 10522) @@ -7,8 +7,11 @@ <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/test-annotations" isTestSource="true" /> <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/apidocs" /> <excludeFolder url="file://$MODULE_DIR$/target/classes" /> + <excludeFolder url="file://$MODULE_DIR$/target/javadoc-bundle-options" /> <excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" /> + <excludeFolder url="file://$MODULE_DIR$/target/site" /> <excludeFolder url="file://$MODULE_DIR$/target/test-classes" /> </content> <orderEntry type="inheritedJdk" />