[teiid-commits] teiid SVN: r3804 - in trunk: build and 3 other directories.

[teiid-commits at lists.jboss.org]

Author: rareddy
Date: 2012-01-20 14:38:25 -0500 (Fri, 20 Jan 2012)
New Revision: 3804

Removed:
   trunk/build/assembly/docs.xml
Modified:
   trunk/build/assembly/jboss-as7/dist.xml
   trunk/build/kits/jboss-as7/modules/org/jboss/teiid/main/module.xml
   trunk/build/pom.xml
   trunk/pom.xml
Log:
TEIID-1875: Migrated the Teiid DocBook formated documents to JBoss Confluence

Deleted: trunk/build/assembly/docs.xml
===================================================================
--- trunk/build/assembly/docs.xml	2012-01-18 20:04:59 UTC (rev 3803)
+++ trunk/build/assembly/docs.xml	2012-01-20 19:38:25 UTC (rev 3804)
@@ -1,42 +0,0 @@
-<!--This script builds a JAR for a Teiid Embedded Server Installation -->
-<assembly>
-  
-  <id>docs</id>
-  
-  <formats>
-    <format>dir</format>
-  </formats>
-  
-  <includeBaseDirectory>false</includeBaseDirectory>
-
-    <moduleSets>
-        <moduleSet>
-            <includeSubModules>true</includeSubModules>
-            <useAllReactorProjects>true</useAllReactorProjects>
-
-            <includes>
-                <include>org.jboss.teiid.documentation:admin-guide</include>
-                <include>org.jboss.teiid.documentation:reference</include>
-                <include>org.jboss.teiid.documentation:developer-guide</include>
-                <include>org.jboss.teiid.documentation:quick-start-example</include>
-                <include>org.jboss.teiid.documentation:client-developers-guide</include>
-                <include>org.jboss.teiid.documentation:caching-guide</include>
-            </includes>
-    
-            <sources>
-                <includeModuleDirectory>true</includeModuleDirectory>
-                <excludeSubModuleDirectories>false</excludeSubModuleDirectories>
-                <useDefaultExcludes>true</useDefaultExcludes>
-                <fileSets>
-                    <fileSet>
-                        <directory>./target/docbook/publish</directory>
-                        <outputDirectory></outputDirectory>
-                        <useDefaultExcludes>true</useDefaultExcludes>
-                    </fileSet>
-                </fileSets>
-            </sources>
-    
-        </moduleSet>
-    </moduleSets>
-
-</assembly>
\ No newline at end of file

Modified: trunk/build/assembly/jboss-as7/dist.xml
===================================================================
--- trunk/build/assembly/jboss-as7/dist.xml	2012-01-18 20:04:59 UTC (rev 3803)
+++ trunk/build/assembly/jboss-as7/dist.xml	2012-01-20 19:38:25 UTC (rev 3804)
@@ -41,43 +41,19 @@
         <fileMode>0644</fileMode>
         <directoryMode>0755</directoryMode>        
     </fileSet>
+    
+    <fileSet>
+        <directory>../jboss-integration/src/main/resources/schema</directory>
+        <includes>
+            <include>jboss-teiid.xsd</include>
+        </includes>                
+        <outputDirectory>docs/schema</outputDirectory>
+        <fileMode>0644</fileMode>
+        <directoryMode>0755</directoryMode>        
+    </fileSet>    
     	
   </fileSets>
   
-    <files>
-        <file>
-            <source>target/teiid-${project.version}-docs/admin-guide/en-US/pdf/teiid_admin_guide.pdf</source>
-            <outputDirectory>docs/teiid</outputDirectory>
-            <fileMode>0644</fileMode>
-        </file>
-        <file>
-            <source>target/teiid-${project.version}-docs/reference/en-US/pdf/teiid_reference.pdf</source>
-            <outputDirectory>docs/teiid</outputDirectory>
-            <fileMode>0644</fileMode>
-        </file>
-        <file>
-            <source>target/teiid-${project.version}-docs/quick-start-example/en-US/pdf/teiid_quick_start_example.pdf</source>
-            <outputDirectory>docs/teiid</outputDirectory>
-            <fileMode>0644</fileMode>
-        </file>
-        <file>
-            <source>target/teiid-${project.version}-docs/developer-guide/en-US/pdf/teiid_developer_guide.pdf</source>
-            <outputDirectory>docs/teiid</outputDirectory>
-            <fileMode>0644</fileMode>
-        </file>
-        <file>
-            <source>target/teiid-${project.version}-docs/client-developers-guide/en-US/pdf/teiid_client_developers_guide.pdf</source>
-            <outputDirectory>docs/teiid</outputDirectory>
-            <fileMode>0644</fileMode>
-        </file>
-        <file>
-            <source>target/teiid-${project.version}-docs/caching-guide/en-US/pdf/teiid_caching_guide.pdf</source>
-            <outputDirectory>docs/teiid</outputDirectory>
-            <fileMode>0644</fileMode>
-        </file>        
-    </files>
-     
-  
   <!--  these have external dependent clients like connectors-->
   <moduleSets>
 

Modified: trunk/build/kits/jboss-as7/modules/org/jboss/teiid/main/module.xml
===================================================================
--- trunk/build/kits/jboss-as7/modules/org/jboss/teiid/main/module.xml	2012-01-18 20:04:59 UTC (rev 3803)
+++ trunk/build/kits/jboss-as7/modules/org/jboss/teiid/main/module.xml	2012-01-20 19:38:25 UTC (rev 3804)
@@ -12,6 +12,8 @@
         <resource-root path="teiid-admin-${project.version}.jar" />
         <resource-root path="saxonhe-9.2.1.5.jar" />
         <resource-root path="json-simple-1.1.jar" />
+        <resource-root path="xom-1.2.jar" />
+        <resource-root path="nux-1.6.jar" />
         <resource-root path="conf" />
     </resources>
 

Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml	2012-01-18 20:04:59 UTC (rev 3803)
+++ trunk/build/pom.xml	2012-01-20 19:38:25 UTC (rev 3804)
@@ -97,7 +97,6 @@
               <configuration>
                 <descriptors>
                   <descriptor>assembly/src.xml</descriptor>
-                  <descriptor>assembly/docs.xml</descriptor>
                   <descriptor>assembly/client-jar.xml</descriptor>
                   <descriptor>assembly/jboss-as7/dist.xml</descriptor>
                   <descriptor>assembly/adminshell/adminshell-dist.xml</descriptor>

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2012-01-18 20:04:59 UTC (rev 3803)
+++ trunk/pom.xml	2012-01-20 19:38:25 UTC (rev 3804)
@@ -103,7 +103,6 @@
         <maven.javadoc.skip>true</maven.javadoc.skip>
       </properties>
       <modules>
-        <module>documentation</module>
         <module>build</module>        
       </modules>
       <build>