Apache
/
commons-math
mirror of https://github.com/apache/commons-math.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

removed references to discovery 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/math/branches/MATH_2_0@651280 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Luc Maisonobe 2008-04-24 14:40:29 +00:00
parent bd162ca7d4
commit 9b8972d209
7 changed files with 31 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
build.xml
View File

@ -1,46 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!--build.xml generated by maven from project.xml version 1.2-SNAPSHOT <!--build.xml generated by maven from project.xml version 1.2-RC2
on date December 22 2005, time 1344--> on date April 24 2008, time 1634-->
<project default="jar" name="commons-math" basedir="."> <project default="jar" name="commons-math" basedir=".">
<!--Load local and user build preferences--> <property name="defaulttargetdir" value="target">
<property file="build.properties">
</property> </property>
<property file="${user.home}/build.properties"> <property name="libdir" value="target/lib">
</property> </property>
<!--Build properties--> <property name="classesdir" value="target/classes">
<property name="defaulttargetdir" value="${basedir}/target">
</property> </property>
<property name="libdir" value="${user.home}/.maven/repository"> <property name="testclassesdir" value="target/test-classes">
</property> </property>
<property name="classesdir" value="${basedir}/target/classes"> <property name="testclassesdir" value="target/test-classes">
</property> </property>
<property name="testclassesdir" value="${basedir}/target/test-classes"> <property name="testreportdir" value="target/test-reports">
</property> </property>
<property name="testreportdir" value="${basedir}/target/test-reports"> <property name="distdir" value="dist">
</property> </property>
<property name="distdir" value="${basedir}/dist"> <property name="javadocdir" value="dist/docs/api">
</property> </property>
<property name="javadocdir" value="${basedir}/dist/docs/api"> <property name="final.name" value="commons-math-1.2-RC2">
</property>
<property name="final.name" value="commons-math-1.2">
</property>
<property name="proxy.host" value="">
</property>
<property name="proxy.port" value="">
</property>
<property name="proxy.username" value="">
</property>
<property name="proxy.password" value="">
</property> </property>
<path id="build.classpath"> <path id="build.classpath">
<pathelement location="${libdir}/commons-logging/jars/commons-logging-1.0.3.jar"> <fileset dir="${libdir}">
</pathelement> <include name="**/*.jar">
<pathelement location="${libdir}/commons-discovery/jars/commons-discovery-0.2.jar"> </include>
</pathelement> </fileset>
</path> </path>
<target name="init" description="o Initializes some properties"> <target name="init" description="o Initializes some properties">
<mkdir dir="${libdir}"> <mkdir dir="${libdir}">
@ -53,25 +39,13 @@
<available property="Junit.present" classname="junit.framework.Test"> <available property="Junit.present" classname="junit.framework.Test">
</available> </available>
<!--Test if user defined a proxy-->
<condition property="useProxy">
<and>
<isset property="proxy.host">
</isset>
<not>
<equals trim="true" arg2="" arg1="${proxy.host}">
</equals>
</not>
</and>
</condition>
</target> </target>
<target name="compile" description="o Compile the code" depends="get-deps"> <target name="compile" description="o Compile the code" depends="get-deps">
<mkdir dir="${classesdir}"> <mkdir dir="${classesdir}">
</mkdir> </mkdir>
<javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html"> <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
<src> <src>
<pathelement location="${basedir}/src/java"> <pathelement location="src/java">
</pathelement> </pathelement>
</src> </src>
<classpath refid="build.classpath"> <classpath refid="build.classpath">
@ -80,11 +54,9 @@
<mkdir dir="${classesdir}/META-INF"> <mkdir dir="${classesdir}/META-INF">
</mkdir> </mkdir>
<copy todir="${classesdir}/META-INF"> <copy todir="${classesdir}/META-INF">
<fileset dir="${basedir}/."> <fileset dir=".">
<include name="NOTICE.txt"> <include name="NOTICE.txt">
</include> </include>
<include name="LICENSE.txt">
</include>
</fileset> </fileset>
</copy> </copy>
</target> </target>
@ -115,7 +87,7 @@
<target name="internal-test" if="Junit.present" depends="junit-present,compile-tests"> <target name="internal-test" if="Junit.present" depends="junit-present,compile-tests">
<mkdir dir="${testreportdir}"> <mkdir dir="${testreportdir}">
</mkdir> </mkdir>
<junit dir="${basedir}" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true"> <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
<sysproperty key="basedir" value="."> <sysproperty key="basedir" value=".">
</sysproperty> </sysproperty>
<formatter type="xml"> <formatter type="xml">
@ -131,7 +103,7 @@
</pathelement> </pathelement>
</classpath> </classpath>
<batchtest todir="${testreportdir}"> <batchtest todir="${testreportdir}">
<fileset dir="${basedir}/src/test"> <fileset dir="src/test">
<include name="**/*Test.java"> <include name="**/*Test.java">
</include> </include>
<exclude name="**/*AbstractTest.java"> <exclude name="**/*AbstractTest.java">
@ -150,7 +122,7 @@
</mkdir> </mkdir>
<javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html"> <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
<src> <src>
<pathelement location="${basedir}/src/test"> <pathelement location="src/test">
</pathelement> </pathelement>
</src> </src>
<classpath> <classpath>
@ -161,7 +133,7 @@
</classpath> </classpath>
</javac> </javac>
<copy todir="${testclassesdir}"> <copy todir="${testclassesdir}">
<fileset dir="${basedir}/src/test"> <fileset dir="src/test">
<include name="**/*.xml"> <include name="**/*.xml">
</include> </include>
<include name="**/*.txt"> <include name="**/*.txt">
@ -178,42 +150,16 @@
</tstamp> </tstamp>
<property name="copyright" value="Copyright &amp;copy; The Apache Software Foundation. All Rights Reserved."> <property name="copyright" value="Copyright &amp;copy; The Apache Software Foundation. All Rights Reserved.">
</property> </property>
<property name="title" value="Math 1.2-SNAPSHOT API"> <property name="title" value="Math 1.2-RC2 API">
</property> </property>
<javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="${basedir}/src/java" packagenames="org.apache.commons.math.*"> <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.commons.math.*">
<classpath> <classpath>
<path refid="build.classpath"> <path refid="build.classpath">
</path> </path>
</classpath> </classpath>
</javadoc> </javadoc>
</target> </target>
<target name="get-dep-commons-logging.jar" description="o Download the dependency : commons-logging.jar" unless="commons-logging.jar" depends="init,setProxy,noProxy,get-custom-dep-commons-logging.jar"> <target name="get-deps" unless="noget" depends="init">
<mkdir dir="${libdir}/commons-logging/jars/">
</mkdir>
<get dest="${libdir}/commons-logging/jars/commons-logging-1.0.4.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.4.jar">
</get>
</target>
<target name="get-custom-dep-commons-logging.jar" if="commons-logging.jar" depends="init,setProxy,noProxy">
<mkdir dir="${libdir}/commons-logging/jars/">
</mkdir>
<get dest="${libdir}/commons-logging/jars/commons-logging-1.0.4.jar" usetimestamp="true" ignoreerrors="true" src="${commons-logging.jar}">
</get>
</target>
<target name="get-dep-commons-discovery.jar" description="o Download the dependency : commons-discovery.jar" unless="commons-discovery.jar" depends="init,setProxy,noProxy,get-custom-dep-commons-discovery.jar">
<mkdir dir="${libdir}/commons-discovery/jars/">
</mkdir>
<get dest="${libdir}/commons-discovery/jars/commons-discovery-0.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-discovery/jars/commons-discovery-0.2.jar">
</get>
</target>
<target name="get-custom-dep-commons-discovery.jar" if="commons-discovery.jar" depends="init,setProxy,noProxy">
<mkdir dir="${libdir}/commons-discovery/jars/">
</mkdir>
<get dest="${libdir}/commons-discovery/jars/commons-discovery-0.2.jar" usetimestamp="true" ignoreerrors="true" src="${commons-discovery.jar}">
</get>
</target>
<target name="get-deps" unless="noget" depends="get-dep-commons-logging.jar,get-dep-commons-discovery.jar">
</target>
<target name="setProxy" if="useProxy" depends="init">
<!--Proxy settings works only with a JDK 1.2 and higher.--> <!--Proxy settings works only with a JDK 1.2 and higher.-->
<echo>Proxy used :</echo> <echo>Proxy used :</echo>
@ -222,6 +168,10 @@
<echo>Proxy user [${proxy.username}]</echo> <echo>Proxy user [${proxy.username}]</echo>
<setproxy proxyuser="${proxy.username}" proxyport="${proxy.port}" proxypassword="${proxy.password}" proxyhost="${proxy.host}"> <setproxy proxyuser="${proxy.username}" proxyport="${proxy.port}" proxypassword="${proxy.password}" proxyhost="${proxy.host}">
</setproxy> </setproxy>
<get dest="${libdir}/maven-cobertura-plugin-1.1.1.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/maven-plugins/plugins/maven-cobertura-plugin-1.1.1.jar">
</get>
<get dest="${libdir}/maven-xdoc-plugin-1.9.2.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/maven/plugins/maven-xdoc-plugin-1.9.2.jar">
</get>
</target> </target>
<target name="noProxy" unless="useProxy" depends="init"> <target name="noProxy" unless="useProxy" depends="init">
<echo>Proxy not used.</echo> <echo>Proxy not used.</echo>

6
maven.xml
View File

@ -51,12 +51,6 @@
</preGoal> </preGoal>
--> -->
<!-- Uncomment to include compile time dependent jars (discovery, logging)
<preGoal name="dist:build-bin">
<deploy:copy-deps todir="${maven.build.dir}/${maven.final.name}/bin/${maven.final.name}" />
</preGoal>
-->
<!-- Limit maven resources included in site generation --> <!-- Limit maven resources included in site generation -->
<postGoal name="xdoc:copy-resources"> <postGoal name="xdoc:copy-resources">
<copy todir="${maven.docs.dest}/images"> <copy todir="${maven.docs.dest}/images">

3
project.properties
View File

@ -44,8 +44,7 @@ maven.docs.dest=${maven.build.dir}/site
maven.docs.src=${basedir}/src/site/xdoc maven.docs.src=${basedir}/src/site/xdoc
maven.javadoc.links = http://java.sun.com/j2se/1.4.2/docs/api/,\ maven.javadoc.links = http://java.sun.com/j2se/1.4.2/docs/api/,\
http://commons.apache.org/collections/api/,\ http://commons.apache.org/collections/api/
http://commons.apache.org/discovery/apidocs/
maven.changes.issue.template=http://issues.apache.org/jira/browse/%ISSUE% maven.changes.issue.template=http://issues.apache.org/jira/browse/%ISSUE%

24
project.xml
View File

@ -202,30 +202,6 @@
</contributor> </contributor>
</contributors> </contributors>
<dependencies> <dependencies>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
<url>http://commons.apache.org/logging</url>
<properties>
<comment>
Only required when commons-discovery is used for class factory
configuration. No hard compile or runtime dependency.
</comment>
</properties>
</dependency>
<dependency>
<groupId>commons-discovery</groupId>
<artifactId>commons-discovery</artifactId>
<version>0.2</version>
<url>http://commons.apache.org/discovery</url>
<properties>
<comment>
Only required when commons-discovery is used for class
factory configuration. No hard compile or runtime dependency.
</comment>
</properties>
</dependency>
<dependency> <dependency>
<groupId>maven-plugins</groupId> <groupId>maven-plugins</groupId>
<artifactId>maven-cobertura-plugin</artifactId> <artifactId>maven-cobertura-plugin</artifactId>

5
src/java/org/apache/commons/math/analysis/UnivariateRealSolverFactory.java
View File

@ -35,11 +35,6 @@ package org.apache.commons.math.analysis;
* BrentSolver solver = factory.newBrentSolver(f); * BrentSolver solver = factory.newBrentSolver(f);
* </pre> * </pre>
* *
* <a href="http://commons.apache.org/discovery/">Apache Commons Discovery</a>
* is used to determine the concrete factory returned by
* <code>UnivariateRealSolverFactory.newInstance().</code> The default is
* {@link UnivariateRealSolverFactoryImpl}.
*
* @version $Revision$ $Date$ * @version $Revision$ $Date$
*/ */
public abstract class UnivariateRealSolverFactory { public abstract class UnivariateRealSolverFactory {

12
src/site/xdoc/userguide/overview.xml
View File

@ -115,17 +115,7 @@
<subsection name="0.5 Dependencies" href="dependencies"> <subsection name="0.5 Dependencies" href="dependencies">
<p> <p>
Commons Math requires JDK 1.3+ and has no runtime dependencies. Commons Commons Math requires JDK 1.3+ and has no runtime dependencies.
Discovery is used to enable pluggable implementations in the
<code>distributions, analysis</code> and <code>stat</code> packages; but
default implementations are used if the commons-discovery and
commons-logging (a dependency of commons-discovery) jars are not present in
the classpath. To compile the sources, the following versions of these
components are required:
<ul>
<li>commons-discovery 0.2 </li>
<li>commons-logging 1.0.3 </li>
</ul>
</p> </p>
</subsection> </subsection>

13
test-jar.xml
View File

@ -95,7 +95,7 @@
========================================================================== ==========================================================================
</echo> </echo>
</target> </target>
<target name="compile-tests" if="Junit.present" depends="junit-present,get-deps"> <target name="compile-tests" if="Junit.present" depends="junit-present">
<mkdir dir="${testclassesdir}"/> <mkdir dir="${testclassesdir}"/>
<javac destdir="${testclassesdir}" deprecation="true" debug="true" <javac destdir="${testclassesdir}" deprecation="true" debug="true"
optimize="false" excludes="**/package.html"> optimize="false" excludes="**/package.html">
@ -113,15 +113,4 @@
</fileset> </fileset>
</copy> </copy>
</target> </target>
<target name="get-deps" unless="noget" depends="init">
<get dest="${libdir}/commons-logging-1.0.3.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.3.jar"/>
<get dest="${libdir}/commons-discovery-0.2.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-discovery/jars/commons-discovery-0.2.jar"/>
<copy todir="${libdir}">
<fileset dir="${jardir}">
<include name="*.jar"/>
</fileset>
</copy>
</target>
</project> </project>