Return-Path: 
 <scm-return-8925-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 93762 invoked from network); 6 Dec 2005 01:16:11 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 6 Dec 2005 01:16:11 -0000
Received: (qmail 55330 invoked by uid 500); 6 Dec 2005 01:16:11 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 55291 invoked by uid 500); 6 Dec 2005 01:16:10 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 55280 invoked by uid 99); 6 Dec 2005 01:16:10 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Dec 2005 17:16:10 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Mon, 05 Dec 2005 17:16:09 -0800
Received: (qmail 93708 invoked by uid 65534); 6 Dec 2005 01:15:49 -0000
Message-ID: <20051206011549.93706.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r354252 -
 /geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly
Date: Tue, 06 Dec 2005 01:15:48 -0000
To: scm@geronimo.apache.org
From: djencks@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: djencks
Date: Mon Dec  5 17:15:45 2005
New Revision: 354252

URL: http://svn.apache.org/viewcvs?rev=354252&view=rev
Log:
extract schemas from g. repo

Modified:
    geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly

Modified: geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly?rev=354252&r1=354251&r2=354252&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly (original)
+++ geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly Mon Dec  5 17:15:45 2005
@@ -116,7 +116,7 @@
     <goal name="assemble:assemble-unpack">
         <ant:mkdir dir="${geronimo.assembly.dest}"/>
         <ant:unjar dest="${geronimo.assembly.dest}">
-             <ant:fileset dir="${maven.repo.local}">
+            <ant:fileset dir="${maven.repo.local}">
                 <j:set var="hasUnpack" value="false"/>
                 <j:forEach var="artifact" items="${pom.artifacts}">
                     <j:set var="dependency" value="${artifact.dependency}"/>
@@ -132,10 +132,33 @@
         </ant:unjar>
     </goal>
 
+    <goal name="assemble:assemble-schemas">
+        <!-- this is not ideal-->
+        <ant:mkdir dir="${geronimo.assembly.dest}/schema"/>
+        <ant:mkdir dir="${maven.build.dir}/schema"/>
+        <ant:unjar dest="${maven.build.dir}/schema">
+            <ant:patternset>
+                <ant:include name="schemaorg_apache_xmlbeans/src/**/*.xsd"/>
+            </ant:patternset>
+            <ant:fileset dir="${geronimo.assembly.dest}/repository">
+                <ant:include name="*/jars/*-builder-*.jar"/>
+                <ant:include name="geronimo/jars/geronimo-j2ee-schema-*.jar"/>
+            </ant:fileset>
+        </ant:unjar>
+        <ant:copy todir="${geronimo.assembly.dest}/schema" flatten="true">
+            <ant:fileset dir="${maven.build.dir}/schema">
+                <ant:include name="**/*.xsd"/>
+                <ant:include name="**/*.dtd"/>
+            </ant:fileset>
+        </ant:copy>
+    </goal>
+
+
+
     <!-- todo automatically add libraries listed in an executable's MCP in the right place, relative to it -->
     <goal name="assemble:assemble-configurations">
         <j:set var="configStoreDir" value="${geronimo.assembly.dest}/config-store"/>
-<!--        <ant:delete dir="${configStoreDir}"/>-->
+        <!--        <ant:delete dir="${configStoreDir}"/>-->
         <ant:mkdir dir="${configStoreDir}"/>
         <ant:mkdir dir="${geronimo.assembly.dest}/repository"/>
         <j:forEach var="artifact" items="${pom.artifacts}">
@@ -162,7 +185,7 @@
 
     <goal name="assemble:assemble-configurations-to-repo">
         <j:set var="configStoreDir" value="${geronimo.assembly.dest}/config-store"/>
-<!--        <ant:delete dir="${configStoreDir}"/>-->
+        <!--        <ant:delete dir="${configStoreDir}"/>-->
         <ant:mkdir dir="${configStoreDir}"/>
         <ant:mkdir dir="${geronimo.assembly.dest}/repository"/>
         <j:forEach var="artifact" items="${pom.artifacts}">
@@ -192,6 +215,7 @@
         <attainGoal name="assemble:assemble-lib"/>
         <attainGoal name="assemble:assemble-unpack"/>
         <attainGoal name="assemble:assemble-configurations"/>
+        <attainGoal name="assemble:assemble-schemas"/>
     </goal>
 
     <goal name="assemble:assemble-to-repo" prereqs="assemble:assemble-prepare" description="Assemble a Geronimo installation">
@@ -236,20 +260,20 @@
             <ant:mkdir dir="${maven.repo.local}/${pom.groupId}/distributions"/>
             <ant:copy file="${maven.build.dir}/${maven.final.name}.tar.gz"
                 todir="${maven.repo.local}/${pom.groupId}/distributions"/>
-<!--            <artifact:install-->
-<!--                artifact="${maven.build.dir}/${maven.final.name}.tar.gz"-->
-<!--                type="distribution-targz"-->
-<!--                project="${pom}"-->
+            <!--            <artifact:install-->
+            <!--                artifact="${maven.build.dir}/${maven.final.name}.tar.gz"-->
+            <!--                type="distribution-targz"-->
+            <!--                project="${pom}"-->
         </j:if>
 
         <j:if test="${context.getVariable('geronimo.assembly.zip') == 'true'}">
             <ant:mkdir dir="${maven.repo.local}/${pom.groupId}/distributions"/>
             <ant:copy file="${maven.build.dir}/${maven.final.name}.zip"
                 todir="${maven.repo.local}/${pom.groupId}/distributions"/>
-<!--            <artifact:install-->
-<!--                artifact="${maven.build.dir}/${maven.final.name}.zip"-->
-<!--                type="distribution-zip"-->
-<!--                project="${pom}"-->
+            <!--            <artifact:install-->
+            <!--                artifact="${maven.build.dir}/${maven.final.name}.zip"-->
+            <!--                type="distribution-zip"-->
+            <!--                project="${pom}"-->
         </j:if>
     </goal>
 
@@ -257,27 +281,27 @@
     <!-- D E P L O Y   D I S T R I B U T I O N                              -->
     <!-- ================================================================== -->
 
-<!--    <goal name="geronimo:deploy-assembly" description="Deploy a binary distribution" prereqs="geronimo:package-assembly">-->
-<!--        <j:if test="${context.getVariable('geronimo.assembly.tar') == 'true'}">-->
-<!--            <artifact:deploy-->
-<!--                artifact="${maven.build.dir}/${maven.final.name}.tar.gz"-->
-<!--                type="distribution-targz"-->
-<!--                project="${pom}"-->
-<!--                typeHandler="${distTypeHandler}"/>-->
-<!--        </j:if>-->
-<!---->
-<!--        <j:if test="${context.getVariable('geronimo.assembly.zip') == 'true'}">-->
-<!--            <artifact:deploy-->
-<!--                artifact="${maven.build.dir}/${maven.final.name}.zip"-->
-<!--                type="distribution-zip"-->
-<!--                project="${pom}"-->
-<!--                typeHandler="${distTypeHandler}"/>-->
-<!--        </j:if>-->
-<!--    </goal>-->
-
-<!--    <goal name="geronimo:install-assembly" prereqs="geronimo:jar-assembly" description="Install an assembled Geronimo installation into the local repository">-->
-<!--        <artifact:install artifact="${maven.build.dir}/${maven.final.name}.jar" project="${pom}"/>-->
-<!--    </goal>-->
+    <!--    <goal name="geronimo:deploy-assembly" description="Deploy a binary distribution" prereqs="geronimo:package-assembly">-->
+    <!--        <j:if test="${context.getVariable('geronimo.assembly.tar') == 'true'}">-->
+    <!--            <artifact:deploy-->
+    <!--                artifact="${maven.build.dir}/${maven.final.name}.tar.gz"-->
+    <!--                type="distribution-targz"-->
+    <!--                project="${pom}"-->
+    <!--                typeHandler="${distTypeHandler}"/>-->
+    <!--        </j:if>-->
+    <!---->
+    <!--        <j:if test="${context.getVariable('geronimo.assembly.zip') == 'true'}">-->
+    <!--            <artifact:deploy-->
+    <!--                artifact="${maven.build.dir}/${maven.final.name}.zip"-->
+    <!--                type="distribution-zip"-->
+    <!--                project="${pom}"-->
+    <!--                typeHandler="${distTypeHandler}"/>-->
+    <!--        </j:if>-->
+    <!--    </goal>-->
+
+    <!--    <goal name="geronimo:install-assembly" prereqs="geronimo:jar-assembly" description="Install an assembled Geronimo installation into the local repository">-->
+    <!--        <artifact:install artifact="${maven.build.dir}/${maven.final.name}.jar" project="${pom}"/>-->
+    <!--    </goal>-->
 
     <!--
         <goal name="geronimo:deploy-assembly" prereqs="geronimo:assemble" description="Deploy an assembled Geronimo installation into the remote repository">