commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ima...@apache.org
Subject svn commit: r232421 - in /jakarta/commons/proper/vfs/trunk: ./ src/java/org/apache/commons/vfs/provider/smb/ src/test-data/
Date Sat, 13 Aug 2005 05:52:10 GMT
Author: imario
Date: Fri Aug 12 22:51:55 2005
New Revision: 232421

URL: http://svn.apache.org/viewcvs?rev=232421&view=rev
Log:
fix: NPE with badly formed smb filenames
fix: use java 1.4 to build test-data
fix: rebulid ant build.xml

Modified:
    jakarta/commons/proper/vfs/trunk/build.xml
    jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/smb/SmbFileNameParser.java
    jakarta/commons/proper/vfs/trunk/src/test-data/nested.jar
    jakarta/commons/proper/vfs/trunk/src/test-data/nested.tar
    jakarta/commons/proper/vfs/trunk/src/test-data/nested.tbz2
    jakarta/commons/proper/vfs/trunk/src/test-data/nested.tgz
    jakarta/commons/proper/vfs/trunk/src/test-data/nested.zip
    jakarta/commons/proper/vfs/trunk/src/test-data/test.jar
    jakarta/commons/proper/vfs/trunk/src/test-data/test.tar
    jakarta/commons/proper/vfs/trunk/src/test-data/test.tbz2
    jakarta/commons/proper/vfs/trunk/src/test-data/test.tgz
    jakarta/commons/proper/vfs/trunk/src/test-data/test.zip

Modified: jakarta/commons/proper/vfs/trunk/build.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/vfs/trunk/build.xml?rev=232421&r1=232420&r2=232421&view=diff
==============================================================================
--- jakarta/commons/proper/vfs/trunk/build.xml (original)
+++ jakarta/commons/proper/vfs/trunk/build.xml Fri Aug 12 22:51:55 2005
@@ -1,200 +1,214 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!--build.xml generated by maven from project.xml version 1.0-RC2
-  on date July 8 2005, time 1649-->
+<!--build.xml generated by maven from project.xml version 1.0-RC3
+  on date August 13 2005, time 0731-->
 
 <project default="jar" name="commons-vfs" basedir=".">
-  <property name="defaulttargetdir" value="target">
-  </property>
-  <property name="libdir" value="target/lib">
-  </property>
-  <property name="classesdir" value="target/classes">
-  </property>
-  <property name="testclassesdir" value="target/test-classes">
-  </property>
-  <property name="testclassesdir" value="target/test-classes">
-  </property>
-  <property name="testreportdir" value="target/test-reports">
-  </property>
-  <property name="distdir" value="dist">
-  </property>
-  <property name="javadocdir" value="dist/docs/api">
-  </property>
-  <property name="final.name" value="commons-vfs-1.0-RC2">
-  </property>
-  <path id="build.classpath">
-    <fileset dir="${libdir}">
-      <include name="**/*.jar">
-      </include>
-    </fileset>
-  </path>
-  <target name="init" description="o Initializes some properties">
-    <mkdir dir="${libdir}">
-    </mkdir>
-    <condition property="noget">
-      <equals arg2="only" arg1="${build.sysclasspath}">
-      </equals>
-    </condition>
-    <!--Test if JUNIT is present in ANT classpath-->
-
-    <available property="Junit.present" classname="junit.framework.Test">
-    </available>
-  </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="src/java">
-        </pathelement>
-      </src>
-      <classpath refid="build.classpath">
-      </classpath>
-    </javac>
-    <copy todir="${classesdir}">
-      <fileset dir="src/java">
-        <include name="**/*.properties">
-        </include>
-        <include name="**/*.xml">
-        </include>
-      </fileset>
-    </copy>
-    <mkdir dir="${classesdir}/META-INF">
-    </mkdir>
-    <copy todir="${classesdir}/META-INF">
-      <fileset dir=".">
-        <include name="NOTICE.txt">
-        </include>
-      </fileset>
-    </copy>
-  </target>
-  <target name="jar" description="o Create the jar" depends="compile,test">
-    <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
-    </jar>
-  </target>
-  <target name="clean" description="o Clean up the generated directories">
-    <delete dir="${defaulttargetdir}">
-    </delete>
-    <delete dir="${distdir}">
-    </delete>
-  </target>
-  <target name="dist" description="o Create a distribution" depends="jar, javadoc">
-    <mkdir dir="dist">
-    </mkdir>
-    <copy todir="dist">
-      <fileset dir="${defaulttargetdir}" includes="*.jar">
-      </fileset>
-      <fileset dir="${basedir}" includes="LICENSE*, README*">
-      </fileset>
-    </copy>
-  </target>
-  <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
-    <fail message="There were test failures.">
-    </fail>
-  </target>
-  <target name="internal-test" if="Junit.present" depends="junit-present,compile-tests">
-    <mkdir dir="${testreportdir}">
-    </mkdir>
-    <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
-      <sysproperty key="basedir" value=".">
-      </sysproperty>
-      <formatter type="xml">
-      </formatter>
-      <formatter usefile="false" type="plain">
-      </formatter>
-      <classpath>
-        <path refid="build.classpath">
-        </path>
-        <pathelement path="${testclassesdir}">
-        </pathelement>
-        <pathelement path="${classesdir}">
-        </pathelement>
-      </classpath>
-      <batchtest todir="${testreportdir}">
-        <fileset dir="src/test">
-          <include name="**/test/*TestCase.java">
-          </include>
-          <exclude name="**/test/Abstract*TestCase.java">
-          </exclude>
-          <exclude name="**/*.java">
-          </exclude>
+    <property name="defaulttargetdir" value="target">
+    </property>
+    <property name="libdir" value="target/lib">
+    </property>
+    <property name="classesdir" value="target/classes">
+    </property>
+    <property name="testclassesdir" value="target/test-classes">
+    </property>
+    <property name="testclassesdir" value="target/test-classes">
+    </property>
+    <property name="testreportdir" value="target/test-reports">
+    </property>
+    <property name="distdir" value="dist">
+    </property>
+    <property name="javadocdir" value="dist/docs/api">
+    </property>
+    <property name="final.name" value="commons-vfs-1.0-RC3">
+    </property>
+    <path id="build.classpath">
+        <fileset dir="${libdir}">
+            <include name="**/*.jar">
+            </include>
         </fileset>
-      </batchtest>
-    </junit>
-  </target>
-  <target name="junit-present" unless="Junit.present" depends="init">
-    <echo>================================= WARNING ================================</echo>
-    <echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not executed.</echo>
-    <echo>==========================================================================</echo>
-  </target>
-  <target name="compile-tests" if="Junit.present" depends="junit-present,compile">
-    <mkdir dir="${testclassesdir}">
-    </mkdir>
-    <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false"
excludes="**/package.html">
-      <src>
-        <pathelement location="src/test">
-        </pathelement>
-      </src>
-      <classpath>
-        <path refid="build.classpath">
-        </path>
-        <pathelement path="${classesdir}">
-        </pathelement>
-      </classpath>
-    </javac>
-  </target>
-  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
-    <mkdir dir="${javadocdir}">
-    </mkdir>
-    <tstamp>
-      <format pattern="2002-yyyy" property="year">
-      </format>
-    </tstamp>
-    <property name="copyright" value="Copyright &amp;copy;  The Apache Software Foundation.
All Rights Reserved.">
-    </property>
-    <property name="title" value="Commons VFS 1.0-RC2 API">
-    </property>
-    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true"
sourcepath="src/java" packagenames="org.apache.commons.vfs.*">
-      <classpath>
-        <path refid="build.classpath">
-        </path>
-      </classpath>
-    </javadoc>
-  </target>
-  <target name="get-deps" unless="noget" depends="init">
-    <!--Proxy settings works only with a JDK 1.2 and higher.-->
+    </path>
+    <target name="init" description="o Initializes some properties">
+        <mkdir dir="${libdir}">
+        </mkdir>
+        <condition property="noget">
+            <equals arg2="only" arg1="${build.sysclasspath}">
+            </equals>
+        </condition>
+        <!--Test if JUNIT is present in ANT classpath-->
+
+        <available property="Junit.present" classname="junit.framework.Test">
+        </available>
+    </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="src/java">
+                </pathelement>
+            </src>
+            <classpath refid="build.classpath">
+            </classpath>
+        </javac>
+        <copy todir="${classesdir}">
+            <fileset dir="src/java">
+                <include name="**/*.properties">
+                </include>
+                <include name="**/*.xml">
+                </include>
+            </fileset>
+        </copy>
+        <mkdir dir="${classesdir}/META-INF">
+        </mkdir>
+        <copy todir="${classesdir}/META-INF">
+            <fileset dir=".">
+                <include name="NOTICE.txt">
+                </include>
+            </fileset>
+        </copy>
+    </target>
+    <target name="jar" description="o Create the jar" depends="compile,test">
+        <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html"
basedir="${classesdir}">
+        </jar>
+    </target>
+    <target name="clean" description="o Clean up the generated directories">
+        <delete dir="${defaulttargetdir}">
+        </delete>
+        <delete dir="${distdir}">
+        </delete>
+    </target>
+    <target name="dist" description="o Create a distribution" depends="jar, javadoc">
+        <mkdir dir="dist">
+        </mkdir>
+        <copy todir="dist">
+            <fileset dir="${defaulttargetdir}" includes="*.jar">
+            </fileset>
+            <fileset dir="${basedir}" includes="LICENSE*, README*">
+            </fileset>
+        </copy>
+    </target>
+    <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
+        <fail message="There were test failures.">
+        </fail>
+    </target>
+    <target name="internal-test" if="Junit.present" depends="junit-present,compile-tests">
+        <mkdir dir="${testreportdir}">
+        </mkdir>
+        <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true"
haltonerror="true">
+            <sysproperty key="basedir" value=".">
+            </sysproperty>
+            <formatter type="xml">
+            </formatter>
+            <formatter usefile="false" type="plain">
+            </formatter>
+            <classpath>
+                <path refid="build.classpath">
+                </path>
+                <pathelement path="${testclassesdir}">
+                </pathelement>
+                <pathelement path="${classesdir}">
+                </pathelement>
+            </classpath>
+            <batchtest todir="${testreportdir}">
+                <fileset dir="src/test">
+                    <include name="**/test/*TestCase.java">
+                    </include>
+                    <exclude name="**/test/Abstract*TestCase.java">
+                    </exclude>
+                    <exclude name="**/*.java">
+                    </exclude>
+                </fileset>
+            </batchtest>
+        </junit>
+    </target>
+    <target name="junit-present" unless="Junit.present" depends="init">
+        <echo>================================= WARNING ================================</echo>
+        <echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not executed.</echo>
+        <echo>==========================================================================</echo>
+    </target>
+    <target name="compile-tests" if="Junit.present" depends="junit-present,compile">
+        <mkdir dir="${testclassesdir}">
+        </mkdir>
+        <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false"
excludes="**/package.html">
+            <src>
+                <pathelement location="src/test">
+                </pathelement>
+            </src>
+            <classpath>
+                <path refid="build.classpath">
+                </path>
+                <pathelement path="${classesdir}">
+                </pathelement>
+            </classpath>
+        </javac>
+    </target>
+    <target name="javadoc" description="o Generate javadoc" depends="get-deps">
+        <mkdir dir="${javadocdir}">
+        </mkdir>
+        <tstamp>
+            <format pattern="2002-yyyy" property="year">
+            </format>
+        </tstamp>
+        <property name="copyright" value="Copyright &amp;copy;  The Apache Software
Foundation. All Rights Reserved.">
+        </property>
+        <property name="title" value="Commons VFS 1.0-RC3 API">
+        </property>
+        <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true"
sourcepath="src/java"
+                 packagenames="org.apache.commons.vfs.*">
+            <classpath>
+                <path refid="build.classpath">
+                </path>
+            </classpath>
+        </javadoc>
+    </target>
+    <target name="get-deps" unless="noget" depends="init">
+        <!--Proxy settings works only with a JDK 1.2 and higher.-->
 
-    <setproxy>
-    </setproxy>
-    <get dest="${libdir}/ant-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar">
-    </get>
-    <get dest="${libdir}/commons-net-1.4.0.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-net/jars/commons-net-1.4.0.jar">
-    </get>
-    <get dest="${libdir}/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>
-    <get dest="${libdir}/commons-compress-20040530.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-compress/jars/commons-compress-20040530.jar">
-    </get>
-    <get dest="${libdir}/commons-collections-3.1.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-collections/jars/commons-collections-3.1.jar">
-    </get>
-    <get dest="${libdir}/jcifs-0.8.3.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/jcifs/jars/jcifs-0.8.3.jar">
-    </get>
-    <get dest="${libdir}/jakarta-slide-webdavlib-20050629.161100.jar" usetimestamp="true"
ignoreerrors="true" src="http://www.ibiblio.org/maven/slide/jars/jakarta-slide-webdavlib-20050629.161100.jar">
-    </get>
-    <get dest="${libdir}/jdom-1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/jdom/jars/jdom-1.0.jar">
-    </get>
-    <get dest="${libdir}/commons-httpclient-2.0.2.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-httpclient/jars/commons-httpclient-2.0.2.jar">
-    </get>
-    <get dest="${libdir}/jsch-0.1.17.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/jsch/jars/jsch-0.1.17.jar">
-    </get>
-    <get dest="${libdir}/xml-apis-1.0.b2.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/xml-apis/jars/xml-apis-1.0.b2.jar">
-    </get>
-    <get dest="${libdir}/oro-2.0.8.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/oro/jars/oro-2.0.8.jar">
-    </get>
-  </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>
+        <setproxy>
+        </setproxy>
+        <get dest="${libdir}/ant-1.6.2.jar" usetimestamp="true" ignoreerrors="true"
+             src="http://www.ibiblio.org/maven/ant/jars/ant-1.6.2.jar">
+        </get>
+        <get dest="${libdir}/commons-net-1.4.0.jar" usetimestamp="true" ignoreerrors="true"
+             src="http://www.ibiblio.org/maven/commons-net/jars/commons-net-1.4.0.jar">
+        </get>
+        <get dest="${libdir}/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>
+        <get dest="${libdir}/commons-compress-20040530.jar" usetimestamp="true" ignoreerrors="true"
+             src="http://www.ibiblio.org/maven/commons-compress/jars/commons-compress-20040530.jar">
+        </get>
+        <get dest="${libdir}/commons-collections-3.1.jar" usetimestamp="true" ignoreerrors="true"
+             src="http://www.ibiblio.org/maven/commons-collections/jars/commons-collections-3.1.jar">
+        </get>
+        <get dest="${libdir}/jcifs-0.8.3.jar" usetimestamp="true" ignoreerrors="true"
+             src="http://www.ibiblio.org/maven/jcifs/jars/jcifs-0.8.3.jar">
+        </get>
+        <get dest="${libdir}/jakarta-slide-webdavlib-20050629.161100.jar" usetimestamp="true"
ignoreerrors="true"
+             src="http://www.ibiblio.org/maven/slide/jars/jakarta-slide-webdavlib-20050629.161100.jar">
+        </get>
+        <get dest="${libdir}/jdom-1.0.jar" usetimestamp="true" ignoreerrors="true"
+             src="http://www.ibiblio.org/maven/jdom/jars/jdom-1.0.jar">
+        </get>
+        <get dest="${libdir}/commons-httpclient-2.0.2.jar" usetimestamp="true" ignoreerrors="true"
+             src="http://www.ibiblio.org/maven/commons-httpclient/jars/commons-httpclient-2.0.2.jar">
+        </get>
+        <get dest="${libdir}/jsch-0.1.17.jar" usetimestamp="true" ignoreerrors="true"
+             src="http://www.ibiblio.org/maven/jsch/jars/jsch-0.1.17.jar">
+        </get>
+        <get dest="${libdir}/xml-apis-1.0.b2.jar" usetimestamp="true" ignoreerrors="true"
+             src="http://www.ibiblio.org/maven/xml-apis/jars/xml-apis-1.0.b2.jar">
+        </get>
+        <get dest="${libdir}/oro-2.0.8.jar" usetimestamp="true" ignoreerrors="true"
+             src="http://www.ibiblio.org/maven/oro/jars/oro-2.0.8.jar">
+        </get>
+    </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>

Modified: jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/smb/SmbFileNameParser.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/smb/SmbFileNameParser.java?rev=232421&r1=232420&r2=232421&view=diff
==============================================================================
--- jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/smb/SmbFileNameParser.java
(original)
+++ jakarta/commons/proper/vfs/trunk/src/java/org/apache/commons/vfs/provider/smb/SmbFileNameParser.java
Fri Aug 12 22:51:55 2005
@@ -51,7 +51,7 @@
         String domain = extractDomain(username);
         if (domain != null)
         {
-            username = username.substring(domain.length()+1);
+            username = username.substring(domain.length() + 1);
         }
 
         // Decode and adjust separators
@@ -83,6 +83,11 @@
 
     private String extractDomain(String username)
     {
+        if (username == null)
+        {
+            return null;
+        }
+
         for (int i = 0; i < username.length(); i++)
         {
             if (username.charAt(i) == '\\')

Modified: jakarta/commons/proper/vfs/trunk/src/test-data/nested.jar
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/vfs/trunk/src/test-data/nested.jar?rev=232421&r1=232420&r2=232421&view=diff
==============================================================================
Binary files - no diff available.

Modified: jakarta/commons/proper/vfs/trunk/src/test-data/nested.tar
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/vfs/trunk/src/test-data/nested.tar?rev=232421&r1=232420&r2=232421&view=diff
==============================================================================
Binary files - no diff available.

Modified: jakarta/commons/proper/vfs/trunk/src/test-data/nested.tbz2
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/vfs/trunk/src/test-data/nested.tbz2?rev=232421&r1=232420&r2=232421&view=diff
==============================================================================
Binary files - no diff available.

Modified: jakarta/commons/proper/vfs/trunk/src/test-data/nested.tgz
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/vfs/trunk/src/test-data/nested.tgz?rev=232421&r1=232420&r2=232421&view=diff
==============================================================================
Binary files - no diff available.

Modified: jakarta/commons/proper/vfs/trunk/src/test-data/nested.zip
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/vfs/trunk/src/test-data/nested.zip?rev=232421&r1=232420&r2=232421&view=diff
==============================================================================
Binary files - no diff available.

Modified: jakarta/commons/proper/vfs/trunk/src/test-data/test.jar
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/vfs/trunk/src/test-data/test.jar?rev=232421&r1=232420&r2=232421&view=diff
==============================================================================
Binary files - no diff available.

Modified: jakarta/commons/proper/vfs/trunk/src/test-data/test.tar
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/vfs/trunk/src/test-data/test.tar?rev=232421&r1=232420&r2=232421&view=diff
==============================================================================
Binary files - no diff available.

Modified: jakarta/commons/proper/vfs/trunk/src/test-data/test.tbz2
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/vfs/trunk/src/test-data/test.tbz2?rev=232421&r1=232420&r2=232421&view=diff
==============================================================================
Binary files - no diff available.

Modified: jakarta/commons/proper/vfs/trunk/src/test-data/test.tgz
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/vfs/trunk/src/test-data/test.tgz?rev=232421&r1=232420&r2=232421&view=diff
==============================================================================
Binary files - no diff available.

Modified: jakarta/commons/proper/vfs/trunk/src/test-data/test.zip
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/vfs/trunk/src/test-data/test.zip?rev=232421&r1=232420&r2=232421&view=diff
==============================================================================
Binary files - no diff available.



---------------------------------------------------------------------
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