From bbae3aa6cb3e662cd551a73062b8f0d279b532b6 Mon Sep 17 00:00:00 2001
From: Max Rydahl Andersen <max@jboss.org>
Date: Fri, 22 Jul 2011 12:32:08 +0200
Subject: [PATCH] merge readme.md, fix relative path, set relativepath to avoid
 mvn warning

---
 .gitignore                          |  1 +
 README-development.md               | 12 ------------
 README.md                           | 15 +++++++++++----
 dist/pom.xml                        |  1 +
 dist/src/main/assembly/assembly.xml |  5 +++--
 5 files changed, 16 insertions(+), 18 deletions(-)
 delete mode 100644 README-development.md

diff --git a/.gitignore b/.gitignore
index c92811fd1d..ab9fc8b784 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+*~
 .classpath
 .project
 target
diff --git a/README-development.md b/README-development.md
deleted file mode 100644
index 107d3d9c50..0000000000
--- a/README-development.md
+++ /dev/null
@@ -1,12 +0,0 @@
-JBoss AS Quickstarts 
-====================
-
-Quickstarts (or examples, or samples) for JBoss AS. There are a number of rules for quickstarts:
-
-* Each quickstart should have a unique name, this enables a user to quickly identify each quickstart
-* A quickstart should have a simple build that the user can quickly understand. If using maven it should:
-  1. Not inherit from another POM
-  2. Import the various BOMs from AS7 APIs to get version numbers
-  3. Use the JBoss AS Maven Plugin to deploy the example
-* The quickstart should be importable into JBoss Tools and deployable there
-* The quickstart should be explained in detail in the associated user guide, including how to deploy
diff --git a/README.md b/README.md
index 7b31272816..2f7188bd14 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,18 @@
-JBoss AS Quickstarts
+JBoss AS Quickstarts 
 ====================
 
-This project contains sources for the JBoss AS Quickstarts:
+Quickstarts (or examples, or samples) for JBoss AS. There are a number of rules for quickstarts:
 
-* `quickstarts/` -- sources for the examples discussed in the JBoss AS Documentation
-* `dist/` -- maven script to build a zip of the quickstarts
+* Each quickstart should have a unique name, this enables a user to quickly identify each quickstart
+* A quickstart should have a simple build that the user can quickly understand. If using maven it should:
+  1. Not inherit from another POM
+  2. Import the various BOMs from AS7 APIs to get version numbers
+  3. Use the JBoss AS Maven Plugin to deploy the example
+* The quickstart should be importable into JBoss Tools and deployable there
+* The quickstart should be explained in detail in the associated user guide, including how to deploy
 
 You can find the documentation at <https://docs.jboss.org/author/display/AS7/Documentation>.
 
 If you add a quickstart, don't forget to update `dist/src/main/assembly/README.md`.
+
+The 'dist' folder contains Maven scripts to build a zip of the quickstarts.
diff --git a/dist/pom.xml b/dist/pom.xml
index 4393a162e3..a5bf2eb9c0 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -5,6 +5,7 @@
       <groupId>org.jboss</groupId>
       <artifactId>jboss-parent</artifactId>
       <version>6-beta-2</version>
+      <relativePath/>
    </parent>
    <groupId>org.jboss.as.quickstarts</groupId>
    <artifactId>jboss-as-quickstarts-dist</artifactId>
diff --git a/dist/src/main/assembly/assembly.xml b/dist/src/main/assembly/assembly.xml
index 01d51b36fd..7aec902cf0 100644
--- a/dist/src/main/assembly/assembly.xml
+++ b/dist/src/main/assembly/assembly.xml
@@ -18,14 +18,15 @@
          </includes>
       </fileSet>
       <fileSet>
-         <directory>${project.basedir}/../quickstarts</directory>
+         <directory>${project.basedir}/..</directory>
          <outputDirectory>/</outputDirectory>
          <excludes>
+            <exclude>dist</exclude>
             <exclude>**/target/**</exclude>
             <exclude>**/.project</exclude>
             <exclude>**/.settings/**</exclude>
             <exclude>**/.classpath</exclude>
-            <exclude>**/README-development.md</exclude>
+            <exclude>**/README.md</exclude>
          </excludes>
       </fileSet>
    </fileSets>