You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2004/12/04 05:56:10 UTC
svn commit: r109768 - in lenya/branches/BRANCH_1_2_X/src: resources/dev/eclipse targets
Author: antonio
Date: Fri Dec 3 20:56:09 2004
New Revision: 109768
URL: http://svn.apache.org/viewcvs?view=rev&rev=109768
Log:
Eclipse project now use cocoon 2.1.6
Added:
lenya/branches/BRANCH_1_2_X/src/resources/dev/eclipse/project.xml
Removed:
lenya/branches/BRANCH_1_2_X/src/resources/dev/eclipse/project
Modified:
lenya/branches/BRANCH_1_2_X/src/resources/dev/eclipse/make-classpath.xsl
lenya/branches/BRANCH_1_2_X/src/targets/ide-build.xml
Modified: lenya/branches/BRANCH_1_2_X/src/resources/dev/eclipse/make-classpath.xsl
Url: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/resources/dev/eclipse/make-classpath.xsl?view=diff&rev=109768&p1=lenya/branches/BRANCH_1_2_X/src/resources/dev/eclipse/make-classpath.xsl&r1=109767&p2=lenya/branches/BRANCH_1_2_X/src/resources/dev/eclipse/make-classpath.xsl&r2=109768
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/resources/dev/eclipse/make-classpath.xsl (original)
+++ lenya/branches/BRANCH_1_2_X/src/resources/dev/eclipse/make-classpath.xsl Fri Dec 3 20:56:09 2004
@@ -17,15 +17,16 @@
<!--
Build the Eclipse .classpath file from a list of path items
(see "eclipse-project" target in build.xml)
-
- $Id: make-classpath.xsl,v 1.1 2004/03/21 21:26:21 gregor Exp $
+
+ $Id$
-->
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:output indent="yes" method="xml"/>
<xsl:param name="exportlib"/>
-
+ <xsl:param name="eclipse-cocoon-project"/>
+
<xsl:strip-space elements="*"/>
<xsl:template match="/data">
@@ -37,7 +38,7 @@
<xsl:sort select="."/>
<classpathentry kind="src" path="{.}"/>
</xsl:for-each>
-
+
<!-- 2. libraries -->
<xsl:for-each select="libs/item">
<!-- alphabetical sorting, only file name -->
@@ -54,14 +55,14 @@
<!-- 3. JRE runtime -->
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-
+
<!-- 4. output directory
Build in a separate dir since Eclipse is confused
by classes compiled externally by Sun's Javac -->
<classpathentry kind="output" path="{output}"/>
<!-- 5. Dependance on Cocoon. There needs to be a cocoon-2.1 eclipse project -->
- <classpathentry kind="src" path="/cocoon-2.1"/>
+ <classpathentry kind="src" path="/{$eclipse-cocoon-project}"/>
</classpath>
</xsl:template>
Deleted: /lenya/branches/BRANCH_1_2_X/src/resources/dev/eclipse/project
Url: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/resources/dev/eclipse/project?view=auto&rev=109767
==============================================================================
Added: lenya/branches/BRANCH_1_2_X/src/resources/dev/eclipse/project.xml
Url: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/resources/dev/eclipse/project.xml?view=auto&rev=109768
==============================================================================
--- (empty file)
+++ lenya/branches/BRANCH_1_2_X/src/resources/dev/eclipse/project.xml Fri Dec 3 20:56:09 2004
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>Lenya 1.2</name>
+ <comment></comment>
+ <projects>
+ <project>cocoon-2.1.6</project>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Modified: lenya/branches/BRANCH_1_2_X/src/targets/ide-build.xml
Url: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/targets/ide-build.xml?view=diff&rev=109768&p1=lenya/branches/BRANCH_1_2_X/src/targets/ide-build.xml&r1=109767&p2=lenya/branches/BRANCH_1_2_X/src/targets/ide-build.xml&r2=109768
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/targets/ide-build.xml (original)
+++ lenya/branches/BRANCH_1_2_X/src/targets/ide-build.xml Fri Dec 3 20:56:09 2004
@@ -15,7 +15,7 @@
limitations under the License.
-->
<project name="ide">
-
+
<description>
IDE targets
</description>
@@ -37,7 +37,7 @@
<!-- Cocoon libs -->
<fileset dir="${cocoon.src.dir}/${lib.dir}">
<include name="core/*.jar"/>
- <!-- Currently, we have no JVM dependent libraries
+ <!-- Currently, we have no JVM dependent libraries
<include name="core/jvm${target.vm}/*.jar"/>
-->
<include name="optional/*.jar"/>
@@ -54,7 +54,7 @@
<exclude name="xalan*.jar"/>
<exclude name="xml-api*.jar"/>
<exclude name="xerces*.jar"/>
- </fileset>
+ </fileset>
<!-- main libs -->
<fileset dir="${lib.dir}">
<include name="*.jar"/>
@@ -97,10 +97,11 @@
processor="trax"
style="src/resources/dev/eclipse/make-classpath.xsl">
<param name="exportlib" expression="${ide.eclipse.export.libs}"/>
+ <param name="eclipse-cocoon-project" expression="Cocoon 2.1.6"/>
</xslt>
<!-- copy the project file (expand version) -->
- <copy file="src/resources/dev/eclipse/project"
+ <copy file="src/resources/dev/eclipse/project.xml"
tofile="${basedir}/.project"
overwrite="yes">
</copy>
@@ -115,7 +116,7 @@
tofile="${build.webapp}/WEB-INF/classes/org/apache/cocoon/cocoon.roles"
overwrite="yes"/>
</target>
-
+
<target name="eclipse-webapp-delete-jars" depends="prepare">
<!-- delete all jars and class files, they are already included in the project -->
<delete>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org