commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From joc...@apache.org
Subject svn commit: r507429 - in /jakarta/commons/proper/fileupload/trunk: build.xml pom.xml project.xml
Date Wed, 14 Feb 2007 07:55:40 GMT
Author: jochen
Date: Tue Feb 13 23:55:39 2007
New Revision: 507429

URL: http://svn.apache.org/viewvc?view=rev&rev=507429
Log:
Changing groupId to org.apache.commons.fileupload for 1.3.

Modified:
    jakarta/commons/proper/fileupload/trunk/build.xml
    jakarta/commons/proper/fileupload/trunk/pom.xml
    jakarta/commons/proper/fileupload/trunk/project.xml

Modified: jakarta/commons/proper/fileupload/trunk/build.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/fileupload/trunk/build.xml?view=diff&rev=507429&r1=507428&r2=507429
==============================================================================
--- jakarta/commons/proper/fileupload/trunk/build.xml (original)
+++ jakarta/commons/proper/fileupload/trunk/build.xml Tue Feb 13 23:55:39 2007
@@ -1,50 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--build.xml generated by maven from project.xml version 1.2-SNAPSHOT
-  on date December 24 2005, time 1055-->
+  on date February 14 2007, time 0854-->
 
 <project default="jar" name="commons-fileupload" basedir=".">
-  <!--Load local and user build preferences-->
-
-  <property file="build.properties">
-  </property>
-  <property file="${user.home}/build.properties">
+  <property name="defaulttargetdir" value="target">
   </property>
-  <!--Build properties-->
-
-  <property name="defaulttargetdir" value="${basedir}/target">
+  <property name="libdir" value="target/lib">
   </property>
-  <property name="libdir" value="${user.home}/.maven/repository">
+  <property name="classesdir" value="target/classes">
   </property>
-  <property name="classesdir" value="${basedir}/target/classes">
+  <property name="testclassesdir" value="target/test-classes">
   </property>
-  <property name="testclassesdir" value="${basedir}/target/test-classes">
+  <property name="testclassesdir" value="target/test-classes">
   </property>
-  <property name="testreportdir" value="${basedir}/target/test-reports">
+  <property name="testreportdir" value="target/test-reports">
   </property>
-  <property name="distdir" value="${basedir}/dist">
+  <property name="distdir" value="dist">
   </property>
-  <property name="javadocdir" value="${basedir}/dist/docs/api">
+  <property name="javadocdir" value="dist/docs/api">
   </property>
   <property name="final.name" value="commons-fileupload-1.2-SNAPSHOT">
   </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>
   <path id="build.classpath">
-    <pathelement location="${libdir}/commons-io/jars/commons-io-1.3.jar">
-    </pathelement>
-    <pathelement location="${libdir}/javax.servlet/jars/servlet-api-2.3.jar">
-    </pathelement>
-    <pathelement location="${libdir}/javax.portlet/jars/portlet-api-1.0.jar">
-    </pathelement>
-    <pathelement location="${libdir}/junit/jars/junit-3.8.1.jar">
-    </pathelement>
+    <fileset dir="${libdir}">
+      <include name="**/*.jar">
+      </include>
+    </fileset>
   </path>
   <target name="init" description="o Initializes some properties">
     <mkdir dir="${libdir}">
@@ -57,25 +39,13 @@
 
     <available property="Junit.present" classname="junit.framework.Test">
     </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 name="compile" description="o Compile the code" depends="get-deps">
     <mkdir dir="${classesdir}">
     </mkdir>
     <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
       <src>
-        <pathelement location="${basedir}/src/java">
+        <pathelement location="src/java">
         </pathelement>
       </src>
       <classpath refid="build.classpath">
@@ -84,7 +54,7 @@
     <mkdir dir="${classesdir}/META-INF">
     </mkdir>
     <copy todir="${classesdir}/META-INF">
-      <fileset dir="${basedir}/.">
+      <fileset dir=".">
         <include name="NOTICE.txt">
         </include>
       </fileset>
@@ -117,7 +87,7 @@
   <target name="internal-test" if="Junit.present" depends="junit-present,compile-tests">
     <mkdir dir="${testreportdir}">
     </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>
       <formatter type="xml">
@@ -133,7 +103,7 @@
         </pathelement>
       </classpath>
       <batchtest todir="${testreportdir}">
-        <fileset dir="${basedir}/src/test">
+        <fileset dir="src/test">
           <include name="**/*Test.java">
           </include>
         </fileset>
@@ -150,7 +120,7 @@
     </mkdir>
     <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false"
excludes="**/package.html">
       <src>
-        <pathelement location="${basedir}/src/test">
+        <pathelement location="src/test">
         </pathelement>
       </src>
       <classpath>
@@ -161,7 +131,7 @@
       </classpath>
     </javac>
     <copy todir="${testclassesdir}">
-      <fileset dir="${basedir}/src/test">
+      <fileset dir="src/test">
         <include name="**/*.xml">
         </include>
       </fileset>
@@ -178,80 +148,35 @@
     </property>
     <property name="title" value="FileUpload 1.2-SNAPSHOT API">
     </property>
-    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true"
sourcepath="${basedir}/src/java" packagenames="org.apache.commons.fileupload.*">
+    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true"
sourcepath="src/java" packagenames="org.apache.commons.fileupload.*">
       <classpath>
         <path refid="build.classpath">
         </path>
       </classpath>
     </javadoc>
   </target>
-  <target name="get-dep-commons-io.jar" description="o Download the dependency : commons-io.jar"
unless="commons-io.jar" depends="init,setProxy,noProxy,get-custom-dep-commons-io.jar">
-    <mkdir dir="${libdir}/commons-io/jars/">
-    </mkdir>
-    <get dest="${libdir}/commons-io/jars/commons-io-1.3.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-io/jars/commons-io-1.3.jar">
-    </get>
-  </target>
-  <target name="get-custom-dep-commons-io.jar" if="commons-io.jar" depends="init,setProxy,noProxy">
-    <mkdir dir="${libdir}/commons-io/jars/">
-    </mkdir>
-    <get dest="${libdir}/commons-io/jars/commons-io-1.3.jar" usetimestamp="true" ignoreerrors="true"
src="${commons-io.jar}">
-    </get>
-  </target>
-  <target name="get-dep-servlet-api.jar" description="o Download the dependency : servlet-api.jar"
unless="servlet-api.jar" depends="init,setProxy,noProxy,get-custom-dep-servlet-api.jar">
-    <mkdir dir="${libdir}/javax.servlet/jars/">
-    </mkdir>
-    <get dest="${libdir}/javax.servlet/jars/servlet-api-2.3.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/javax.servlet/jars/servlet-api-2.3.jar">
+  <target name="get-deps" unless="noget" depends="init">
+    <!--Proxy settings works only with a JDK 1.2 and higher.-->
+
+    <setproxy proxyport="8080" proxyhost="httpprox.hq.sag">
+    </setproxy>
+    <get dest="${libdir}/commons-io-1.3.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/commons-io/jars/commons-io-1.3.jar">
     </get>
-  </target>
-  <target name="get-custom-dep-servlet-api.jar" if="servlet-api.jar" depends="init,setProxy,noProxy">
-    <mkdir dir="${libdir}/javax.servlet/jars/">
-    </mkdir>
-    <get dest="${libdir}/javax.servlet/jars/servlet-api-2.3.jar" usetimestamp="true" ignoreerrors="true"
src="${servlet-api.jar}">
+    <get dest="${libdir}/servlet-api-2.3.jar" usetimestamp="true" ignoreerrors="true"
src="http://repo1.maven.org/maven/javax.servlet/jars/servlet-api-2.3.jar">
     </get>
-  </target>
-  <target name="get-dep-portlet-api.jar" description="o Download the dependency : portlet-api.jar"
unless="portlet-api.jar" depends="init,setProxy,noProxy,get-custom-dep-portlet-api.jar">
-    <mkdir dir="${libdir}/javax.portlet/jars/">
-    </mkdir>
-    <get dest="${libdir}/javax.portlet/jars/portlet-api-1.0.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/javax.portlet/jars/portlet-api-1.0.jar">
+    <get dest="${libdir}/portlet-api-1.0.jar" usetimestamp="true" ignoreerrors="true"
src="http://repo1.maven.org/maven/javax.portlet/jars/portlet-api-1.0.jar">
     </get>
-  </target>
-  <target name="get-custom-dep-portlet-api.jar" if="portlet-api.jar" depends="init,setProxy,noProxy">
-    <mkdir dir="${libdir}/javax.portlet/jars/">
-    </mkdir>
-    <get dest="${libdir}/javax.portlet/jars/portlet-api-1.0.jar" usetimestamp="true" ignoreerrors="true"
src="${portlet-api.jar}">
+    <get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/junit/jars/junit-3.8.1.jar">
     </get>
-  </target>
-  <target name="get-dep-junit.jar" description="o Download the dependency : junit.jar"
unless="junit.jar" depends="init,setProxy,noProxy,get-custom-dep-junit.jar">
-    <mkdir dir="${libdir}/junit/jars/">
-    </mkdir>
-    <get dest="${libdir}/junit/jars/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar">
+    <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 name="get-custom-dep-junit.jar" if="junit.jar" depends="init,setProxy,noProxy">
-    <mkdir dir="${libdir}/junit/jars/">
-    </mkdir>
-    <get dest="${libdir}/junit/jars/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true"
src="${junit.jar}">
+    <get dest="${libdir}/maven-changelog-plugin-1.9.1.jar" usetimestamp="true" ignoreerrors="true"
src="http://repo1.maven.org/maven/maven/plugins/maven-changelog-plugin-1.9.1.jar">
     </get>
   </target>
-  <target name="get-deps" unless="noget" depends="get-dep-commons-io.jar,get-dep-servlet-api.jar,get-dep-portlet-api.jar,get-dep-junit.jar">
-  </target>
-  <target name="setProxy" if="useProxy" depends="init">
-    <!--Proxy settings works only with a JDK 1.2 and higher.-->
-
-    <echo>Proxy used :</echo>
-    <echo>Proxy host [${proxy.host}]</echo>
-    <echo>Proxy port [${proxy.port}]</echo>
-    <echo>Proxy user [${proxy.username}]</echo>
-    <setproxy proxyuser="${proxy.username}" proxyport="${proxy.port}" proxypassword="${proxy.password}"
proxyhost="${proxy.host}">
-    </setproxy>
-  </target>
-  <target name="noProxy" unless="useProxy" depends="init">
-    <echo>Proxy not used.</echo>
-  </target>
   <target name="install-maven">
     <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar">
     </get>
     <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
     </unjar>
   </target>
-</project>
+</project>
\ No newline at end of file

Modified: jakarta/commons/proper/fileupload/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/fileupload/trunk/pom.xml?view=diff&rev=507429&r1=507428&r2=507429
==============================================================================
--- jakarta/commons/proper/fileupload/trunk/pom.xml (original)
+++ jakarta/commons/proper/fileupload/trunk/pom.xml Tue Feb 13 23:55:39 2007
@@ -25,9 +25,9 @@
     <version>2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>commons-fileupload</groupId>
+  <groupId>org.apache.commons.fileupload</groupId>
   <artifactId>commons-fileupload</artifactId>
-  <version>1.2-SNAPSHOT</version>
+  <version>1.3-SNAPSHOT</version>
   <name>FileUpload</name>
   <description>
     The FileUpload component provides a simple yet flexible means of adding support for multipart

Modified: jakarta/commons/proper/fileupload/trunk/project.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/fileupload/trunk/project.xml?view=diff&rev=507429&r1=507428&r2=507429
==============================================================================
--- jakarta/commons/proper/fileupload/trunk/project.xml (original)
+++ jakarta/commons/proper/fileupload/trunk/project.xml Tue Feb 13 23:55:39 2007
@@ -20,9 +20,9 @@
   <pomVersion>3</pomVersion>
   
   <name>FileUpload</name>
-  <groupId>commons-fileupload</groupId>
+  <groupId>org.apache.commons.fileupload</groupId>
   <artifactId>commons-fileupload</artifactId>
-  <currentVersion>1.2-SNAPSHOT</currentVersion>
+  <currentVersion>1.3-SNAPSHOT</currentVersion>
   <inceptionYear>2002</inceptionYear>
   <shortDescription>File upload component for Java servlets</shortDescription>
   <description>



---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message