cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lgaw...@apache.org
Subject svn commit: r320697 - in /cocoon/branches/BRANCH_2_1_X/tools: ide/eclipse/blocks-classpath.xsl ide/eclipse/classpath-tmpl.xml src/gump2blocks.properties.xsl targets/ide-build.xml
Date Thu, 13 Oct 2005 08:49:24 GMT
Author: lgawron
Date: Thu Oct 13 01:49:15 2005
New Revision: 320697

URL: http://svn.apache.org/viewcvs?rev=320697&view=rev
Log:
obsolete eclipse-project replaced with customized one

Modified:
    cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/blocks-classpath.xsl
    cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/classpath-tmpl.xml
    cocoon/branches/BRANCH_2_1_X/tools/src/gump2blocks.properties.xsl
    cocoon/branches/BRANCH_2_1_X/tools/targets/ide-build.xml

Modified: cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/blocks-classpath.xsl
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/blocks-classpath.xsl?rev=320697&r1=320696&r2=320697&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/blocks-classpath.xsl (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/blocks-classpath.xsl Thu Oct 13 01:49:15
2005
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <!--
-  Copyright 1999-2004 The Apache Software Foundation
+  Copyright 1999-2005 The Apache Software Foundation
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -230,6 +230,7 @@
             <!-- now build the .classpath file -->
             <echo>Generate classpath</echo>
             <xslt   in="${{build.temp}}/classpath-temp.xml" out="${{basedir}}/.classpath"
+                    processor="trax"
                     style="${{tools}}/ide/eclipse/make-classpath.xsl">
                 <param name="exportlib" expression="${{ide.eclipse.export.libs}}"/>
             </xslt>

Modified: cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/classpath-tmpl.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/classpath-tmpl.xml?rev=320697&r1=320696&r2=320697&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/classpath-tmpl.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/ide/eclipse/classpath-tmpl.xml Thu Oct 13 01:49:15
2005
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 1999-2004 The Apache Software Foundation
+  Copyright 1999-2005 The Apache Software Foundation
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

Modified: cocoon/branches/BRANCH_2_1_X/tools/src/gump2blocks.properties.xsl
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/src/gump2blocks.properties.xsl?rev=320697&r1=320696&r2=320697&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/src/gump2blocks.properties.xsl (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/src/gump2blocks.properties.xsl Thu Oct 13 01:49:15
2005
@@ -26,7 +26,7 @@
 <desc:descs>
 
 <desc:desc name="license">
-#  Copyright 1999-2004 The Apache Software Foundation
+#  Copyright 1999-2005 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.

Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/ide-build.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/targets/ide-build.xml?rev=320697&r1=320696&r2=320697&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/targets/ide-build.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/targets/ide-build.xml Thu Oct 13 01:49:15 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 1999-2004 The Apache Software Foundation
+  Copyright 1999-2005 The Apache Software Foundation
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -16,13 +16,13 @@
 -->
 <!-- $Id$ -->
 <project name="ide">
+  <description>IDE targets</description>
 
-  <description>
-    IDE targets
-  </description>
-
+  <!-- for those who like long names.. -->
+  <target name="eclipse-customized-project" depends="eclipse-project"/>
+  
   <!-- Build the Eclipse customized project's files -->
-  <target name="eclipse-customized-project" depends="prepare" description="Generate the
Eclipse customized project files (using local.block.properties)">
+  <target name="eclipse-project" depends="prepare" description="Generate the Eclipse customized
project files (using local.block.properties)">
     <echo message="Building Eclipse Customized Project Files"/>
     <xslt in="${gump.descriptor}"
           out="${build.temp}/blocks-eclipse.xml"
@@ -48,104 +48,6 @@
         <filter token="jar.files" value="${jar.files}"/>
         <filter token="src" value="${java}"/>
         <filter token="build.webapp" value="${build.webapp}"/>
-      </filterset>
-    </copy>
-  </target>
-
-  <!-- Build the Eclipse projects files -->
-  <target name="eclipse-project" depends="prepare" description="Generate the Eclipse project
files">
-
-    <echo message="Building Eclipse Project Files"/>
-
-    <!-- prepare the various paths that will form the project -->
-    <path id="srcs">
-      <!-- main source dir -->
-      <pathelement path="${src}/java"/>
-      <!-- samples source dir -->
-      <pathelement path="${src}/samples"/>
-      <!-- deprecated source dir -->
-      <pathelement path="${src}/deprecated/java"/>
-      <!-- test source dir -->
-      <pathelement path="${src}/test"/>
-      <!-- blocks source dirs -->
-      <dirset dir="${blocks}">
-        <include name="*/java"/>
-        <include name="*/test"/>
-        <include name="*/java${target.vm}"/>
-      </dirset>
-    </path>
-
-    <path id="mockss">
-      <dirset dir="${src}">
-        <include name="**/mocks"/>
-      </dirset>
-    </path>
-
-    <path id="libs">
-      <!-- main libs -->
-      <fileset dir="${lib}">
-        <include name="core/*.jar"/>
-        <!-- Currently, we have no JVM dependent libraries
-          <include name="core/jvm${target.vm}/*.jar"/>
-        -->
-        <include name="optional/*.jar"/>
-        <include name="local/*.jar"/>
-        <include name="endorsed/*.jar"/>
-      </fileset>
-      <!-- blocks lib -->
-      <fileset dir="${blocks}">
-        <include name="**/*.jar"/>
-      </fileset>
-      <!-- tools libs -->
-      <fileset dir="${tools}/lib">
-        <include name="*.jar"/>
-      </fileset>
-    </path>
-
-    <!-- convert paths to properties -->
-    <property name="srcs" refid="srcs"/>
-    <property name="mockss" refid="mockss"/>
-    <property name="libs" refid="libs"/>
-
-    <!-- expand properties in the template file -->
-    <copy file="${tools}/ide/eclipse/classpath-tmpl.xml"
-          tofile="${build.temp}/classpath-temp.xml"
-          filtering="yes"
-          overwrite="yes">
-      <filterset>
-        <filter token="SRC_DIRS" value="${srcs}"/>
-        <filter token="LIBS" value="${libs}"/>
-        <filter token="MOCKS_DIRS" value="${mockss}"/>
-        <filter token="OUTPUT_DIR" value="${ide.eclipse.outputdir}"/>
-      </filterset>
-    </copy>
-
-    <!-- split the path in 'item' XML elements -->
-    <replace file="${build.temp}/classpath-temp.xml"
-             token="${path.separator}" value="&lt;/item&gt;&#xA; &lt;item&gt;"/>
-    <!-- relativize file names by removing the current directory -->
-    <replace file="${build.temp}/classpath-temp.xml"
-             token="${user}${file.separator}" value=""/>
-    <!-- and in case that fails, remove the base directory -->
-    <replace file="${build.temp}/classpath-temp.xml"
-             token="${basedir}${file.separator}" value=""/>
-
-    <!-- replace platform-dependent path separator by '/' -->
-    <replace file="${build.temp}/classpath-temp.xml"
-             token="${file.separator}" value="/"/>
-
-    <!-- now build the .classpath file -->
-    <xslt in="${build.temp}/classpath-temp.xml" out="${basedir}/.classpath"
-          style="${tools}/ide/eclipse/make-classpath.xsl">
-       <param name="exportlib" expression="${ide.eclipse.export.libs}"/>
-    </xslt>
-
-    <!-- copy the project file (expand version) -->
-    <copy file="${tools}/ide/eclipse/project"
-          tofile="${basedir}/.project"
-          overwrite="yes">
-      <filterset>
-        <filter token="VERSION" value="${version}"/>
       </filterset>
     </copy>
   </target>



Mime
View raw message