incubator-easyant-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r1201272 - in /incubator/easyant/core/trunk: ./ repository/third-party-lib/org.apache.ivy/ivy/2.3.0-r1201268/ src/main/java/org/apache/easyant/core/ src/main/resources/org/apache/easyant/core/
Date Sat, 12 Nov 2011 14:32:39 GMT
Author: hibou
Date: Sat Nov 12 14:32:39 2011
New Revision: 1201272

URL: http://svn.apache.org/viewvc?rev=1201272&view=rev
Log:
Fix the boostrap build

Added:
    incubator/easyant/core/trunk/ivysettings-bootstrap.xml   (with props)
    incubator/easyant/core/trunk/repository/third-party-lib/org.apache.ivy/ivy/2.3.0-r1201268/
    incubator/easyant/core/trunk/repository/third-party-lib/org.apache.ivy/ivy/2.3.0-r1201268/ivy.ivy
  (with props)
    incubator/easyant/core/trunk/repository/third-party-lib/org.apache.ivy/ivy/2.3.0-r1201268/ivy.jar
  (with props)
Modified:
    incubator/easyant/core/trunk/build.xml
    incubator/easyant/core/trunk/module.ivy
    incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntEngine.java
    incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMagicNames.java
    incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMain.java
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/default-easyant-ivysettings.xml
    incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/extra-easyant-ivysettings.xml

Modified: incubator/easyant/core/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/build.xml?rev=1201272&r1=1201271&r2=1201272&view=diff
==============================================================================
--- incubator/easyant/core/trunk/build.xml (original)
+++ incubator/easyant/core/trunk/build.xml Sat Nov 12 14:32:39 2011
@@ -18,7 +18,7 @@
 
     <target name="ivy:init">
         <path id="ivy.lib.path">
-            <fileset dir="${basedir}/repository/third-party-lib/org.apache.ivy/ivy/" includes="*/*.jar"
/>
+            <fileset dir="${basedir}/repository/third-party-lib/org.apache.ivy/ivy/2.3.0-r1201268"
includes="*.jar" />
         </path>
         <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
classpathref="ivy.lib.path" />
     </target>
@@ -28,16 +28,19 @@
     </target>
 
     <target name="compile" depends="ivy:init">
-        <ivy:configure file="${basedir}/repository/third-party-lib/third-party-ivysettings.xml"
/>
+        <ivy:configure file="${basedir}/ivysettings-bootstrap.xml" />
         <ivy:resolve file="${basedir}/module.ivy" />
         <ivy:cachepath pathid="default.classpath" conf="default" />
         <mkdir dir="${basedir}/target/bootstrap/classes" />
-        <javac srcdir="${basedir}/src/main/java" destdir="${basedir}/target/bootstrap/classes"
includeantruntime="false">
+        <javac srcdir="${basedir}/src/main/java" destdir="${basedir}/target/bootstrap/classes"
includeantruntime="false" debug="true">
             <classpath refid="default.classpath" />
         </javac>
         <copy todir="${basedir}/target/bootstrap/classes">
             <fileset dir="${basedir}/src/main/resources" />
         </copy>
+        <copy todir="${basedir}/target/bootstrap/classes/org/apache/easyant/">
+            <fileset dir="${basedir}/repository" includes="extra-modules/**" />
+        </copy>
         <ivy:info file="${basedir}/module.ivy" />
         <tstamp>
             <format property="now" pattern="yyyyMMddHHmmss" />
@@ -52,18 +55,22 @@
         </propertyfile>
     </target>
 
-    <target name="dist" depends="compile">
+    <target name="jar" depends="compile">
+        <jar destfile="${basedir}/target/bootstrap/easyant.jar" basedir="${basedir}/target/bootstrap/classes"
/>
+    </target>
+
+    <target name="dist" depends="jar">
         <property name="bootstrap.fork" value="false"/>
         <java classname="org.apache.easyant.core.EasyAntMain" failonerror="true" fork="${bootstrap.fork}">
             <classpath>
                 <path refid="default.classpath" />
-                <pathelement location="${basedir}/target/bootstrap/classes" />
-    <!--
-           Ant will try to find the tools.jar using java.home System property, but sometimes
-           this points to JDK, and sometimes to JRE.
-           See http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4200300
-        -->
-        <path path="${java.class.path}"/>
+                <pathelement location="${basedir}/target/bootstrap/easyant.jar" />
+                <!--
+                    Ant will try to find the tools.jar using java.home System property, but
sometimes
+                    this points to JDK, and sometimes to JRE.
+                    See http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4200300
+                -->
+                <path path="${java.class.path}"/>
             </classpath>
             <sysproperty key="easyant.home" file="${basedir}" />
             <arg line="-configfile ${basedir}/easyant-conf.xml" />

Added: incubator/easyant/core/trunk/ivysettings-bootstrap.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/ivysettings-bootstrap.xml?rev=1201272&view=auto
==============================================================================
--- incubator/easyant/core/trunk/ivysettings-bootstrap.xml (added)
+++ incubator/easyant/core/trunk/ivysettings-bootstrap.xml Sat Nov 12 14:32:39 2011
@@ -0,0 +1,32 @@
+<!--
+   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.
+-->
+<ivysettings>
+    <settings defaultResolver="main" />
+    <resolvers>
+        <!-- Maven central -->
+        <ibiblio name="maven2" m2compatible="true" />
+        <!-- for the ivy trunk -->
+        <filesystem name="third-party-lib">
+            <ivy pattern="${ivy.settings.dir}/repository/third-party-lib/[organisation]/[module]/[revision]/[module].ivy"/>
+            <artifact pattern="${ivy.settings.dir}/repository/third-party-lib/[organisation]/[module]/[revision]/[artifact](-[classifier]).[ext]"/>
+        </filesystem>
+        <chain name="main" returnFirst="true">
+            <resolver ref="maven2" />
+            <resolver ref="third-party-lib" />
+        </chain>
+    </resolvers>
+</ivysettings>

Propchange: incubator/easyant/core/trunk/ivysettings-bootstrap.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/easyant/core/trunk/ivysettings-bootstrap.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: incubator/easyant/core/trunk/ivysettings-bootstrap.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: incubator/easyant/core/trunk/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/module.ivy?rev=1201272&r1=1201271&r2=1201272&view=diff
==============================================================================
--- incubator/easyant/core/trunk/module.ivy (original)
+++ incubator/easyant/core/trunk/module.ivy Sat Nov 12 14:32:39 2011
@@ -31,7 +31,7 @@
         <dependency org="org.apache.ant" name="ant-testutil" rev="1.8.2" conf="test->default"
transitive="false" />
 
         <dependency org="org.apache.ant" name="ant" rev="1.8.2" conf="default->default"/>
-        <dependency org="org.apache.ivy" name="ivy" rev="2.3.0-r1165119" conf="default->core"/>
+        <dependency org="org.apache.ivy" name="ivy" rev="2.3.0-r1201268" conf="default->core"/>
         <dependency org="ant-contrib" name="ant-contrib" rev="1.0b2" conf="default->default"/>
         <dependency org="commons-cli" name="commons-cli" rev="1.2" conf="default->default"/>
         <!-- ivy uses a different namespace to reference ant -->

Added: incubator/easyant/core/trunk/repository/third-party-lib/org.apache.ivy/ivy/2.3.0-r1201268/ivy.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/repository/third-party-lib/org.apache.ivy/ivy/2.3.0-r1201268/ivy.ivy?rev=1201272&view=auto
==============================================================================
--- incubator/easyant/core/trunk/repository/third-party-lib/org.apache.ivy/ivy/2.3.0-r1201268/ivy.ivy
(added)
+++ incubator/easyant/core/trunk/repository/third-party-lib/org.apache.ivy/ivy/2.3.0-r1201268/ivy.ivy
Sat Nov 12 14:32:39 2011
@@ -0,0 +1,62 @@
+<!--
+   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.    
+-->
+<ivy-module version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
+    <info organisation="org.apache.ivy" module="ivy" revision="2.3.0-r1201268" status="milestone"
publication="20111112151300">
+        <description homepage="http://ant.apache.org/ivy/">
+        Apache Ivy is a tool for managing (recording, tracking, resolving and reporting)
project dependencies.
+        </description>
+    </info>
+    <configurations>
+        <conf name="core" description="only ivy jar, without any dependencies"/>
+        <conf name="httpclient" extends="core" description="core + optional httpclient
for better http handling"/>
+        <conf name="oro" extends="core" description="to use optional glob matcher"/>
+        <conf name="vfs" extends="core" description="core + optional VirtualFileSystem(VFS)
support"/>
+        <conf name="sftp" extends="core" description="core + optional SFTP support"/>
+        <conf name="standalone" extends="core" description="to launch in standalone mode
(from command line)"/>
+        <conf name="ant" extends="core" description="core + ant jar provided as a dependency"/>
+        <conf name="default" extends="core" description="full ivy with all dependencies"/>
+        <conf name="test" description="dependencies used for junit testing ivy" visibility="private"/>
+        <conf name="source" description="ivy sources"/>
+    </configurations>
+    <publications>
+        <artifact name="ivy" type="jar" conf="core"/>
+    </publications>
+    <dependencies>
+        <dependency org="ant" name="ant" rev="1.6.2" conf="default,ant->default"/>
+        <dependency org="ant" name="ant-nodeps" rev="1.6.2" conf="default"/>
+        <dependency org="ant" name="ant-trax" rev="1.6.2" conf="default"/>
+        <dependency org="commons-httpclient" name="commons-httpclient" rev="3.0" conf="default,httpclient->runtime,master"/>
+        <dependency org="oro" name="oro" rev="2.0.8" conf="default,oro->default"/>
+        <dependency org="commons-vfs" name="commons-vfs" rev="1.0" conf="default,vfs->default"/>
+        <dependency org="com.jcraft" name="jsch" rev="0.1.31" conf="default,sftp->default"/>
+
+        <!-- Test dependencies -->
+        <dependency org="junit" name="junit" rev="3.8.2" conf="test->default"/>
+        <dependency org="commons-lang" name="commons-lang" rev="2.5" revConstraint="[1.0,3.0["
conf="test->default"/>
+        <dependency org="org.apache.ant" name="ant-testutil" rev="1.7.0" conf="test->default"
transitive="false"/>
+        <dependency org="ant" name="ant-launcher" rev="1.6.2" conf="test->default"
transitive="false"/>
+        
+        <!-- This dependency is necessary for having validation in junit tests when running
with JDK1.4 -->
+        <dependency org="xerces" name="xercesImpl" rev="2.6.2" conf="test->default"/>
+        <dependency org="xerces" name="xmlParserAPIs" rev="2.6.2" conf="test->default"/>
+        
+        <!-- Global exclude for junit -->
+        <exclude org="junit" module="junit" conf="core,default,httpclient,oro,vfs,sftp,standalone,ant"/>
+    </dependencies>
+</ivy-module>

Propchange: incubator/easyant/core/trunk/repository/third-party-lib/org.apache.ivy/ivy/2.3.0-r1201268/ivy.ivy
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/easyant/core/trunk/repository/third-party-lib/org.apache.ivy/ivy/2.3.0-r1201268/ivy.ivy
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: incubator/easyant/core/trunk/repository/third-party-lib/org.apache.ivy/ivy/2.3.0-r1201268/ivy.ivy
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: incubator/easyant/core/trunk/repository/third-party-lib/org.apache.ivy/ivy/2.3.0-r1201268/ivy.jar
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/repository/third-party-lib/org.apache.ivy/ivy/2.3.0-r1201268/ivy.jar?rev=1201272&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/easyant/core/trunk/repository/third-party-lib/org.apache.ivy/ivy/2.3.0-r1201268/ivy.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntEngine.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntEngine.java?rev=1201272&r1=1201271&r2=1201272&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntEngine.java
(original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntEngine.java
Sat Nov 12 14:32:39 2011
@@ -119,13 +119,6 @@ public class EasyAntEngine {
                                 .toExternalForm());
 
         project.setNewProperty(EasyAntMagicNames.EASYANT_CORE_JAR_URL, guessEasyantCoreJarUrl().toExternalForm());
-        if (this.getClass().getResource(
-                "/org/apache/easyant/repository/extra-modules") != null) {
-            project.setNewProperty(EasyAntMagicNames.EASYANT_EXTRA_REPO_URL,
-                    this.getClass().getResource(
-                            "/org/apache/easyant/repository/extra-modules")
-                            .toExternalForm());
-        }
 
         File userSettings = getUserEasyAntIvySettings(project);
         String globalSettings = getGlobalEasyAntIvySettings(project);
@@ -171,7 +164,7 @@ public class EasyAntEngine {
     private static Method getLocalURL;
 
     public static URL guessEasyantCoreJarUrl() {
-        URL url = EasyAntEngine.class.getResource("/");
+        URL url = EasyAntEngine.class.getResource("/org/apache/easyant/antlib.xml");
         try {
             if ("jar".equals(url.getProtocol())) {
                 return getJarUrl(url);

Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMagicNames.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMagicNames.java?rev=1201272&r1=1201271&r2=1201272&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMagicNames.java
(original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMagicNames.java
Sat Nov 12 14:32:39 2011
@@ -122,12 +122,6 @@ public interface EasyAntMagicNames {
     public static final String EASYANT_CORE_JAR_URL = "easyant.core.jar.url";
 
     /**
-     * Name of the property containing the easyant extra repository Value:
-     * {@value}
-     */
-    public static final String EASYANT_EXTRA_REPO_URL = "easyant.extramodules.repo.url";
-
-    /**
      * Name of the property containing the log stategy for easyant modules
      * Value: {@value}
      */

Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMain.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMain.java?rev=1201272&r1=1201271&r2=1201272&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMain.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMain.java Sat
Nov 12 14:32:39 2011
@@ -183,9 +183,7 @@ public class EasyAntMain implements AntM
                 }
             }
         } catch (BuildException be) {
-            if (easyAntConfiguration.getErr() != System.err) {
-                printMessage(be);
-            }
+            printMessage(be);
         } catch (Throwable exc) {
             exc.printStackTrace();
             printMessage(exc);
@@ -455,7 +453,6 @@ public class EasyAntMain implements AntM
      */
     private void runBuild(CommandLine line, ClassLoader coreLoader)
             throws BuildException {
-
         if (!readyToRun) {
             return;
         }

Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/default-easyant-ivysettings.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/default-easyant-ivysettings.xml?rev=1201272&r1=1201271&r2=1201272&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/default-easyant-ivysettings.xml
(original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/default-easyant-ivysettings.xml
Sat Nov 12 14:32:39 2011
@@ -18,11 +18,11 @@
     <settings defaultResolver="easyant-default-chain"/>
     <caches defaultCacheDir="${user.home}/.easyant/easyant-cache" useOrigin="true" />
     <resolvers>
-        <jar name="easyant-core-modules" url="${easyant.core.jar.url}">
+        <jar name="easyant-core-modules" url="${easyant.core.jar.url}" descriptor="required">
             <ivy pattern="org/apache/easyant/core/repository/modules/[organisation]/[module]/[revision]/[module].ivy"/>
             <artifact pattern="org/apache/easyant/core/repository/modules/[organisation]/[module]/[revision]/[artifact](-[classifier]).[ext]"/>
         </jar>
-        <filesystem name="easyant-shared-modules">
+        <filesystem name="easyant-shared-modules" descriptor="required">
             <ivy pattern="${user.home}/.easyant/repository/easyant-shared-modules/[organisation]/[module]/[revision]/[module].ivy"/>
             <artifact pattern="${user.home}/.easyant/repository/easyant-shared-modules/[organisation]/[module]/[revision]/[artifact](-[classifier]).[ext]"/>
         </filesystem>

Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/extra-easyant-ivysettings.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/extra-easyant-ivysettings.xml?rev=1201272&r1=1201271&r2=1201272&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/extra-easyant-ivysettings.xml
(original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/extra-easyant-ivysettings.xml
Sat Nov 12 14:32:39 2011
@@ -18,9 +18,9 @@
     <include url="${easyant.default.ivysettings.url}"/>
     <settings defaultResolver="easyant-extra-chain"/>
     <resolvers>
-        <jar name="easyant-extra-modules">
-            <ivy pattern="${easyant.extramodules.repo.url}/[organisation]/[module]/[revision]/[module].ivy"/>
-            <artifact pattern="${easyant.extramodules.repo.url}/[organisation]/[module]/[revision]/[artifact](-[classifier]).[ext]"/>
+        <jar name="easyant-extra-modules" url="${easyant.core.jar.url}" descriptor="required">
+            <ivy pattern="org/apache/easyant/repository/extra-modules/[organisation]/[module]/[revision]/[module].ivy"/>
+            <artifact pattern="org/apache/easyant/repository/extra-modules/[organisation]/[module]/[revision]/[artifact](-[classifier]).[ext]"/>
         </jar>
         <chain name="easyant-extra-chain" returnFirst="true">
             <resolver ref="easyant-extra-modules" />



Mime
View raw message