forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgard...@apache.org
Subject svn commit: r570835 - in /forrest/trunk/whiteboard/forrest2/core: ./ build.properties build.xml ivy.xml ivyconf.xml version.properties
Date Wed, 29 Aug 2007 15:23:03 GMT
Author: rgardler
Date: Wed Aug 29 08:23:02 2007
New Revision: 570835

URL: http://svn.apache.org/viewvc?rev=570835&view=rev
Log:
Use "standard" ivy scripts

Added:
    forrest/trunk/whiteboard/forrest2/core/build.properties   (with props)
    forrest/trunk/whiteboard/forrest2/core/version.properties   (with props)
Removed:
    forrest/trunk/whiteboard/forrest2/core/ivyconf.xml
Modified:
    forrest/trunk/whiteboard/forrest2/core/   (props changed)
    forrest/trunk/whiteboard/forrest2/core/build.xml
    forrest/trunk/whiteboard/forrest2/core/ivy.xml

Propchange: forrest/trunk/whiteboard/forrest2/core/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 29 08:23:02 2007
@@ -1,5 +1,6 @@
-build
-bin
-lib
-dist
-local.build.properties
+build
+bin
+lib
+dist
+local.build.properties
+distrib

Added: forrest/trunk/whiteboard/forrest2/core/build.properties
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/build.properties?rev=570835&view=auto
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/build.properties (added)
+++ forrest/trunk/whiteboard/forrest2/core/build.properties Wed Aug 29 08:23:02 2007
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+build.dir=build
+ivy.repository.dir=tools/ivy
+ivy.distrib.dir = ${ivy.project.dir}/dist
\ No newline at end of file

Propchange: forrest/trunk/whiteboard/forrest2/core/build.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: forrest/trunk/whiteboard/forrest2/core/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/build.xml?rev=570835&r1=570834&r2=570835&view=diff
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/build.xml (original)
+++ forrest/trunk/whiteboard/forrest2/core/build.xml Wed Aug 29 08:23:02 2007
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,109 +15,25 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project xmlns:ivy="antlib:fr.jayasoft.ivy.ant" name="forrest2" default="compile-core">
-  <property file="local.build.properties" />
-  <property name="project.name" value="forrest2" />
-  <property name="project.core.src.dir" location="src/core" />
-  <property name="project.core.test.src.dir" location="src/test" />
-  <property name="project.dist.dir" location="dist" />
-  <property name="project.build.classes.dir" location="build/classes" />
-  <property name="test.reports" location="build/reports" />
-  <property name="content.object.dir" location="src/examples/helloWorld"/>
-  <property name="content.object.start.uri" value="helloWorld.html"/>
-  <property name="content.object.src.dir" location="${content.object.dir}/src"/>
-  <property name="content.object.build.dir" location="${content.object.dir}/build"/>
-  <property name="compile.debug" value="off" />
-  <property name="ivy.jar.dir" location="tools/ivy" />
-<!-- try to load ivy here from local tools/ivy dir, in case the user has not already dropped
+<project default="resolve" basedir="." name="forrest2">
+
+  <description>
+    Ivy based build system for Apache Forrest2.
+  </description>
+    
+  <property file="local.build.properties"/>
+  <property file="build.properties"/>
+        
+  <!-- try to load ivy here from local tools/ivy dir, in case the user has not already
dropped
 	      it into ant's lib dir (note that the latter copy will always take precedence).
 	      We will not fail as long as local lib dir exists (it may be empty) and
 	      ivy is in at least one of ant's lib dir or the local lib dir. -->
   <path id="ivy.lib.path">
-    <fileset dir="${ivy.jar.dir}" includes="*.jar" />
+    <fileset dir="${ivy.repository.dir}" includes="*.jar" />
   </path>
+
   <taskdef resource="fr/jayasoft/ivy/ant/antlib.xml" uri="antlib:fr.jayasoft.ivy.ant"
classpathref="ivy.lib.path" />
-  <target name="clean">
-    <delete dir="${project.build.classes.dir}" />
-    <delete dir="${project.dist.dir}" />
-    <delete dir="${content.object.build.dir}" />
-  </target>
-  <target name="init" depends="clean">
-    <mkdir dir="${project.build.classes.dir}" />
-    <mkdir dir="${project.dist.dir}" />
-    <mkdir dir="${project.dist.dir}/lib" />
-    <mkdir dir="${content.object.build.dir}"/>
-    <ivy:cachepath pathid="lib.path.id" conf="default" />
-  </target>
-  <target name="copy-core-resources" depends="init">
-    <copy todir="${project.build.classes.dir}">
-      <fileset dir="${project.core.src.dir}">
-        <exclude name="**/*.java"/>
-      </fileset>
-    </copy>
-  </target>
-  <target name="copy-test-resources" depends="init">
-    <copy todir="${project.build.classes.dir}">
-      <fileset dir="${project.core.test.src.dir}">
-        <exclude name="**/*.java"/>
-      </fileset>
-    </copy>
-  </target>
-  <target name="copy-content-object-resources" depends="init">
-<!-- <copy todir="${project.build.classes.dir}"> -->
-    <copy todir="${content.object.build.dir}">
-      <fileset dir="${content.object.src.dir}">
-        <exclude name="**/*.java"/>
-      </fileset>
-    </copy>
-  </target>
-  <target name="compile-core" depends="copy-core-resources">
-    <javac destdir="${project.build.classes.dir}" debug="${compile.debug}" classpathref="lib.path.id">
-      <src path="${project.core.src.dir}" />
-    </javac>
-  </target>
-  <target name="compile-content-object" depends="compile-core, copy-content-object-resources">
-    <javac destdir="${content.object.build.dir}" debug="${compile.debug}">
-      <classpath>
-        <path refid="lib.path.id"/>
-        <pathelement path="${project.build.classes.dir}"/>
-      </classpath>
-      <src path="${content.object.src.dir}" />
-    </javac>
-  </target>
-  <target name="compile-core-tests" depends="compile-core, copy-test-resources">
-    <javac destdir="${project.build.classes.dir}" debug="${compile.debug}" classpathref="lib.path.id">
-      <src path="${project.core.test.src.dir}" />
-    </javac>
-  </target>
-<!-- ================================= 
-	          Ivy Targets           
-    ================================= -->
-  <target name="resolve">
-    <ivy:configure file="./ivyconf.xml" />
-    <ivy:resolve file="ivy.xml" conf="default" />
-  </target>
-  <target name="retrieve-default" depends="resolve">
-    <ivy:retrieve pattern="lib/default/[artifact]-[revision].[ext]" conf="default" />
-  </target>
-  <target name="retrieve-test" depends="resolve">
-    <ivy:retrieve pattern="lib/test/[artifact]-[revision].[ext]" conf="test" />
-  </target>
-  <target name="retrieve-all" depends="resolve">
-    <ivy:retrieve pattern="lib/[conf]/[artifact]-[revision].[ext]" conf="*" />
-  </target>
-  <target name="deliver" depends="retrieve-all">
-    <ivy:deliver deliverpattern="${project.dist.dir}/lib/[artifact]-[revision].[ext]"
pubrevision="1.1b4" pubdate="20050115123254" status="milestone" />
-  </target>
-  <target name="run" depends="compile-content-object">
-    <java classname="org.apache.forrest.cli.CLI" 
-			dir="${content.object.dir}" fork="yes" failonerror="yes">
-      <classpath>
-        <path refid="lib.path.id" />
-        <pathelement path="${project.build.classes.dir}"/>
-        <pathelement path="${content.object.build.dir}"/>
-      </classpath>
-      <arg line="${content.object.start.uri}"/>
-    </java>
-  </target>
-</project>
+    
+  <import file="${ivy.repository.dir}/build-scripts/common-java.xml"/>
+
+</project>
\ No newline at end of file

Modified: forrest/trunk/whiteboard/forrest2/core/ivy.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/ivy.xml?rev=570835&r1=570834&r2=570835&view=diff
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/ivy.xml (original)
+++ forrest/trunk/whiteboard/forrest2/core/ivy.xml Wed Aug 29 08:23:02 2007
@@ -17,21 +17,24 @@
 -->
 <ivy-module version="1.0">
   <info 
-        organisation="Apache"
+        organisation="apache"
         module="forrest2"
         status="integration"></info>
   <configurations>
     <conf name="default"/>
     <conf name="test" extends="default"/>
   </configurations>
+  <publications>
+    <artifact name="forrest2" type="jar"/>
+  </publications>
   <dependencies>
-    <dependency org="apache" name="commons-httpclient" rev="latest.milestone" />
+    <dependency org="apache" name="commons-httpclient" rev="3.1-alpha1" />
     <dependency org="apache" name="commons-codec" rev="1.3" />
     <dependency org="apache" name="commons-logging" rev="1.1"/>
-    <dependency org="apache" name="xerces" rev="latest.release"/>
+    <dependency org="apache" name="xerces" rev="2.5.0"/>
     <dependency org="jtidy" name="jtidy" rev="4aug2000r7-dev"/>
     <dependency org="junit" name="junit" rev="4.1"/>
-    <dependency org="springframework" name="springframework" rev="latest.release">
+    <dependency org="springframework" name="springframework" rev="2.0">
       <conf name="core"/>
     </dependency>
   </dependencies>

Added: forrest/trunk/whiteboard/forrest2/core/version.properties
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/version.properties?rev=570835&view=auto
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/version.properties (added)
+++ forrest/trunk/whiteboard/forrest2/core/version.properties Wed Aug 29 08:23:02 2007
@@ -0,0 +1 @@
+version=1
\ No newline at end of file

Propchange: forrest/trunk/whiteboard/forrest2/core/version.properties
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message