You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by sp...@apache.org on 2005/11/30 20:26:19 UTC
svn commit: r350027 -
/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/maven.xml
Author: sppatel
Date: Wed Nov 30 11:26:15 2005
New Revision: 350027
URL: http://svn.apache.org/viewcvs?rev=350027&view=rev
Log:
don't need to patch schemas anymore
Modified:
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/maven.xml
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/maven.xml?rev=350027&r1=350026&r2=350027&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/maven.xml (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/maven.xml Wed Nov 30 11:26:15 2005
@@ -56,38 +56,9 @@
<ant:include name="**/*.xsd"/>
</ant:fileset>
</ant:move>
-
- <!-- hack for maven 1.1-beta 2 and 1154 -->
- <!--<ant:copy todir="${maven.build.dir}/schema" overwrite="true">
- <ant:fileset dir="${basedir}">
- <ant:include name="geronimo-connector-1.0.xsd"/>
- <ant:include name="geronimo-security-1.1.xsd"/>
- </ant:fileset>
- </ant:copy> -->
-
+
<ant:delete dir="${maven.build.dir}/temp"/>
- <!-- update include paths in all schemas -->
- <ant:fileScanner var="schemaScanner">
- <ant:fileset dir="${maven.build.dir}/schema">
- <ant:include name="*.xsd"/>
- </ant:fileset>
- </ant:fileScanner>
-
- <ant:taskdef name="replaceregexp"
- classname="org.apache.tools.ant.taskdefs.optional.ReplaceRegExp"
- classpathref="maven.dependency.classpath"/>
- <ant:property name="ant.regexp.regexpimpl" value="org.apache.tools.ant.util.regexp.JakartaOroRegexp"/>
-
- <j:forEach var="schema" items="${schemaScanner.iterator()}">
- <ant:replaceregexp file="${schema}" match="schemaLocation="(.*/)(.*xsd)" replace="schemaLocation="\2" byline="true"/>
- <j:if test="${schema.getName().equals('geronimo-connector-1.0.xsd')}">
- <ant:replaceregexp file="${schema}" match="(xs:import.*/>)" replace="\1${patch}"/>
- </j:if>
- <j:if test="${schema.getName().equals('geronimo-security-1.1.xsd')}">
- <ant:replaceregexp file="${schema}" match='(version="1.0">)' replace="\1${patch2}"/>
- </j:if>
- </j:forEach>
</goal>
<goal name="codegen" prereqs="importschemas">