keycloak-aplcache

distro fixes

1/23/2014 12:55:03 PM

Bill Burke

Commit: 5d5776d

Tree: b94cbd9

Parents: c77a6df

Changes

distribution/appliance-dist/assembly.xml 4(+4 -0)

distribution/examples-docs-zip/assembly.xml 4(+2 -2)

distribution/examples-docs-zip/pom.xml 2(+0 -2)

Details

distribution/appliance-dist/assembly.xml 4(+4 -0)

diff --git a/distribution/appliance-dist/assembly.xml b/distribution/appliance-dist/assembly.xml
index 8f6e772..fc2cb01 100755
--- a/distribution/appliance-dist/assembly.xml
+++ b/distribution/appliance-dist/assembly.xml
@@ -12,6 +12,10 @@
             <outputDirectory>examples</outputDirectory>
         </fileSet>
         <fileSet>
+            <directory>${project.build.directory}/unpacked/docs</directory>
+            <outputDirectory>docs</outputDirectory>
+        </fileSet>
+        <fileSet>
             <directory>${project.build.directory}/unpacked/wildfly-${wildfly.version}</directory>
             <outputDirectory>keycloak</outputDirectory>
             <excludes>

distribution/examples-docs-zip/assembly.xml 4(+2 -2)

diff --git a/distribution/examples-docs-zip/assembly.xml b/distribution/examples-docs-zip/assembly.xml
index e1b7fa0..8efd9df 100755
--- a/distribution/examples-docs-zip/assembly.xml
+++ b/distribution/examples-docs-zip/assembly.xml
@@ -15,11 +15,11 @@
             <outputDirectory></outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>../target/site/apidocs</directory>
+            <directory>../../target/site/apidocs</directory>
             <outputDirectory>docs/javadocs</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>../docbook/target/docbook/publish/en-US</directory>
+            <directory>../../docbook/target/docbook/publish/en-US</directory>
             <outputDirectory>docs/userguide</outputDirectory>
         </fileSet>
         <fileSet>

distribution/examples-docs-zip/pom.xml 2(+0 -2)

diff --git a/distribution/examples-docs-zip/pom.xml b/distribution/examples-docs-zip/pom.xml
index 912ff9c..b7453b7 100755
--- a/distribution/examples-docs-zip/pom.xml
+++ b/distribution/examples-docs-zip/pom.xml
@@ -53,7 +53,6 @@
 
 
             </plugin>
-            <!--
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <version>2.4</version>
@@ -79,7 +78,6 @@
                     </execution>
                 </executions>
             </plugin>
-            -->
         </plugins>
     </build>