geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r349454 - in /geronimo/devtools/trunk/modules/eclipse-plugin: etc/ plugins/org.apache.geronimo.deployment.model/ plugins/org.apache.geronimo.runtime.v1/
Date Mon, 28 Nov 2005 18:32:15 GMT
Author: sppatel
Date: Mon Nov 28 10:32:12 2005
New Revision: 349454

URL: http://svn.apache.org/viewcvs?rev=349454&view=rev
Log:
fix replacerefexp

Removed:
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/geronimo-connector-1.0.xsd
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/geronimo-security-1.1.xsd
Modified:
    geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.xml
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/maven.xml
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.runtime.v1/maven.xml

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.xml?rev=349454&r1=349453&r2=349454&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.xml (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/etc/project.xml Mon Nov 28 10:32:12 2005
@@ -25,5 +25,31 @@
         <name>Apache Software Foundation</name>
         <url>http://geronimo.apache.org/</url>
         <logo>http://geronimo.apache.org/images/geronimo-logo.png</logo>
-    </organization>
+    </organization>
+    <dependencies>
+        <dependency>
+            <groupId>oro</groupId>
+            <artifactId>oro</artifactId>
+            <version>2.0.8</version>
+            <properties>
+                <classloader>root</classloader>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>ant</groupId>
+            <artifactId>ant-apache-oro</artifactId>
+            <version>1.6.4</version>
+             <properties>
+                <classloader>root</classloader>
+            </properties>
+        </dependency>
+        <dependency>
+            <groupId>ant</groupId>
+            <artifactId>ant-optional</artifactId>
+            <version>1.5.3-1</version>
+             <properties>
+                <classloader>root</classloader>
+            </properties>
+        </dependency>
+    </dependencies>   
  </project>

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=349454&r1=349453&r2=349454&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
Mon Nov 28 10:32:12 2005
@@ -58,30 +58,36 @@
     </ant:move>
   	
   	<!-- hack for maven 1.1-beta 2 and 1154 -->
-  	<ant:copy todir="${maven.build.dir}/schema" overwrite="true">
+  	<!--<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:copy> -->
   	
     <ant:delete dir="${maven.build.dir}/temp"/>
     
-    <!-- update include paths in all schemas -->
-    <!-- <ant:fileScanner var="schemaScanner">
+  	<!-- 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()}">
-      <replaceregexp file="${schema}" match="schemaLocation=&quot;(.*/)(.*xsd)" replace="schemaLocation=&quot;\2"
byline="true"/>
+      <ant:replaceregexp file="${schema}" match="schemaLocation=&quot;(.*/)(.*xsd)"
replace="schemaLocation=&quot;\2" byline="true"/>
       <j:if test="${schema.getName().equals('geronimo-connector-1.0.xsd')}">
-         <replaceregexp file="${schema}" match="(xs:import.*/>)" replace="\1${patch}"/>
+         <ant:replaceregexp file="${schema}" match="(xs:import.*/>)" replace="\1${patch}"/>
       </j:if>     
       <j:if test="${schema.getName().equals('geronimo-security-1.1.xsd')}">
-         <replaceregexp file="${schema}" match='(version="1.0">)' replace="\1${patch2}"/>
+         <ant:replaceregexp file="${schema}" match='(version="1.0">)' replace="\1${patch2}"/>
       </j:if>   
-    </j:forEach> -->    
+    </j:forEach>    
   </goal>
   
   <goal name="codegen" prereqs="importschemas">

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.runtime.v1/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.runtime.v1/maven.xml?rev=349454&r1=349453&r2=349454&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.runtime.v1/maven.xml
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.runtime.v1/maven.xml
Mon Nov 28 10:32:12 2005
@@ -49,6 +49,12 @@
     
     <goal name="createpluginxml">
       <ant:copy file="plugin.xml.template" tofile="plugin.xml" overwrite="true"/>
+      
+      <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"/>
+    	
       <replaceregexp file="plugin.xml" match="@runtime.v1.plugin.version@" replace="${distributionjarversion}"
byline="true"/>
       <replaceregexp file="plugin.xml" match="@geronimo_runtime_version@" replace="${geronimo_runtime_version}"
byline="true"/>
       <replaceregexp file="plugin.xml" match="@geronimo_spec_version@" replace="${geronimo_spec_version}"
byline="true"/>



Mime
View raw message