You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by er...@apache.org on 2010/12/19 18:38:57 UTC
svn commit: r1050915 - in /ofbiz/trunk: .classpath LICENSE build.xml
framework/base/lib/ivy-2.2.0.jar ivy.xml
Author: erwan
Date: Sun Dec 19 17:38:57 2010
New Revision: 1050915
URL: http://svn.apache.org/viewvc?rev=1050915&view=rev
Log:
Adding ivy to OFBiz and make an example with cobertura. No more errors when running tests.
Added:
ofbiz/trunk/framework/base/lib/ivy-2.2.0.jar (with props)
ofbiz/trunk/ivy.xml (with props)
Modified:
ofbiz/trunk/.classpath
ofbiz/trunk/LICENSE
ofbiz/trunk/build.xml
Modified: ofbiz/trunk/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/trunk/.classpath?rev=1050915&r1=1050914&r2=1050915&view=diff
==============================================================================
--- ofbiz/trunk/.classpath (original)
+++ ofbiz/trunk/.classpath Sun Dec 19 17:38:57 2010
@@ -24,6 +24,7 @@
<classpathentry kind="lib" path="framework/base/lib/httpunit.jar"/>
<classpathentry kind="lib" path="framework/base/lib/ical4j-1.0-rc2.jar"/>
<classpathentry kind="lib" path="framework/base/lib/icu4j-4_4.jar"/>
+ <classpathentry kind="lib" path="framework/base/lib/ivy-2.2.0.jar"/>
<classpathentry kind="lib" path="framework/base/lib/jakarta-regexp-1.5.jar"/>
<classpathentry kind="lib" path="framework/base/lib/javolution-5.4.3.jar"/>
<classpathentry kind="lib" path="framework/base/lib/jcip-annotations-1.0.jar"/>
Modified: ofbiz/trunk/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/trunk/LICENSE?rev=1050915&r1=1050914&r2=1050915&view=diff
==============================================================================
--- ofbiz/trunk/LICENSE (original)
+++ ofbiz/trunk/LICENSE Sun Dec 19 17:38:57 2010
@@ -22,6 +22,7 @@ ofbiz/trunk/framework/base/lib/avalon-ut
ofbiz/trunk/framework/base/lib/batik-all-1.7.jar
ofbiz/trunk/framework/base/lib/barcode4j-fop-ext-complete-2.0.jar
ofbiz/trunk/framework/base/lib/clhm-release-1.0-lru.jar
+ofbiz/trunk/framework/base/lib/ivy-2.2.0.jar
ofbiz/trunk/framework/base/lib/jakarta-regexp-1.5.jar
ofbiz/trunk/framework/base/lib/jpim-0.1.jar
ofbiz/trunk/framework/base/lib/juel-2.2.1.jar
Modified: ofbiz/trunk/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/build.xml?rev=1050915&r1=1050914&r2=1050915&view=diff
==============================================================================
--- ofbiz/trunk/build.xml (original)
+++ ofbiz/trunk/build.xml Sun Dec 19 17:38:57 2010
@@ -18,7 +18,9 @@ specific language governing permissions
under the License.
-->
-<project name="OFBiz Main Build" default="build" basedir=".">
+<project name="OFBiz Main Build" default="build" basedir="."
+ xmlns:ivy="antlib:org.apache.ivy.ant">
+
<import file="macros.xml"/>
<property name="site.dir" value="../site"/>
<property name="memory.initial.param" value="-Xms128M"/>
@@ -37,6 +39,15 @@ under the License.
<property environment="env"/>
</target>
+ <target name="ivy-init">
+ <taskdef resource="org/apache/ivy/ant/antlib.xml"
+ uri="antlib:org.apache.ivy.ant">
+ <classpath>
+ <pathelement location="framework/base/lib/ivy-2.2.0.jar" />
+ </classpath>
+ </taskdef>
+ </target>
+
<!-- ================================================================== -->
<!-- Removes all created files and directories -->
<!-- ================================================================== -->
@@ -110,7 +121,7 @@ under the License.
</subant>
</target>
- <target name="download-selenium"
+ <target name="download-selenium"
description="Download the selenium files">
<subant target="install-seleniumxml">
<filelist dir="." files="framework/testtools/build.xml"/>
@@ -450,7 +461,7 @@ under the License.
<jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8091"/>
</java>
</target>
- <target name="run-tests" depends="build"
+ <target name="run-tests" depends="download-cobertura, build"
description="Run OFBiz default tests, execute ant run-install before and see results in runtime/logs/test-results/html/all-tests.html">
<java jar="ofbiz.jar" fork="true" resultproperty="test.result">
<jvmarg value="${memory.initial.param}"/>
@@ -487,7 +498,7 @@ under the License.
<arg value="-ant"/>
</java>
</target>
- <target name="run-single-test" depends="build"
+ <target name="run-single-test" depends="download-cobertura, build"
description="Run a single test, syntax eg: ant run-single-test -Dtest.component=service -Dtest.case=service-soap-tests">
<java jar="ofbiz.jar" fork="true" resultproperty="test.result">
<jvmarg value="${memory.initial.param}"/>
@@ -510,7 +521,7 @@ under the License.
</condition>
</fail>
</target>
- <target name="run-single-test-suite" depends="build"
+ <target name="run-single-test-suite" depends="download-cobertura, build"
description="Run a single test suite, syntax eg: ant run-single-test-suite -Dtest.component=mycomponent -Dtest.suiteName=mytests">
<java jar="ofbiz.jar" fork="true" resultproperty="test.result">
<jvmarg value="${memory.initial.param}"/>
@@ -533,7 +544,7 @@ under the License.
<delete dir="runtime/logs/test-results"/>
<ant antfile="runtime/test-list-build.xml" target="all-tests"/>
</target>
-
+
<target name="cobertura-report">
<delete dir="runtime/logs/cobertura-report"/>
<mkdir dir="runtime/logs/cobertura-report"/>
@@ -562,6 +573,14 @@ under the License.
</target>
<!-- ================================================================== -->
+ <!-- Ivy targets, more info at http://ant.apache.org/ivy/ -->
+ <!-- ================================================================== -->
+
+ <target name="download-cobertura" depends="ivy-init">
+ <ivy:retrieve pattern="framework/base/lib/[artifact]-[revision].[ext]" conf="cobertura"/>
+ </target>
+
+ <!-- ================================================================== -->
<!-- Create New Component. This target will create basic directory structure for an OFBiz component in hot-deploy directory. -->
<!-- ================================================================== -->
Added: ofbiz/trunk/framework/base/lib/ivy-2.2.0.jar
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/lib/ivy-2.2.0.jar?rev=1050915&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ofbiz/trunk/framework/base/lib/ivy-2.2.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ofbiz/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/ivy.xml?rev=1050915&view=auto
==============================================================================
--- ofbiz/trunk/ivy.xml (added)
+++ ofbiz/trunk/ivy.xml Sun Dec 19 17:38:57 2010
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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="2.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
+ <info organisation="org.apache" module="ofbiz">
+ <description homepage="http://ofbiz.apache.org/"/>
+ </info>
+ <configurations>
+ <conf name="cobertura" description="downloads cobertura 1.9.3 (GPL2.0) http://cobertura.sourceforge.net/"/>
+ </configurations>
+ <dependencies>
+ <dependency org="net.sourceforge.cobertura" name="cobertura" rev="1.9.3" conf="cobertura->default"/>
+
+ <!--Exclusions for cobertura-->
+ <exclude module="oro" conf="cobertura"/>
+ <exclude module="asm" conf="cobertura"/>
+ <exclude module="asm-tree" conf="cobertura"/>
+ <exclude module="log4j" conf="cobertura"/>
+ <exclude module="ant" conf="cobertura"/>
+ </dependencies>
+
+</ivy-module>
Propchange: ofbiz/trunk/ivy.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/ivy.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/ivy.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml