You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ftpserver-commits@incubator.apache.org by ng...@apache.org on 2006/11/18 22:42:04 UTC

svn commit: r476643 - in /incubator/ftpserver/trunk: ./ admin-gui/ core/ core/common/ core/src/java/org/apache/ftpserver/message/ core/src/site/ distribution/bin/ ftplet-api/ ssl-tests/

Author: ngn
Date: Sat Nov 18 14:42:03 2006
New Revision: 476643

URL: http://svn.apache.org/viewvc?view=rev&rev=476643
Log:
Distribution now working, moving pieces for dist project and fixing shell scripts

Removed:
    incubator/ftpserver/trunk/core/appendcp.bat
    incubator/ftpserver/trunk/core/common/
    incubator/ftpserver/trunk/core/ftpd.bat
    incubator/ftpserver/trunk/core/ftpd.sh
    incubator/ftpserver/trunk/core/src/site/
Modified:
    incubator/ftpserver/trunk/admin-gui/pom.xml
    incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/message/MessageResourceImpl.java
    incubator/ftpserver/trunk/distribution/bin/ftpd_ui.bat
    incubator/ftpserver/trunk/distribution/bin/ftpd_ui.sh
    incubator/ftpserver/trunk/ftplet-api/pom.xml
    incubator/ftpserver/trunk/pom.xml
    incubator/ftpserver/trunk/ssl-tests/pom.xml

Modified: incubator/ftpserver/trunk/admin-gui/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/admin-gui/pom.xml?view=diff&rev=476643&r1=476642&r2=476643
==============================================================================
--- incubator/ftpserver/trunk/admin-gui/pom.xml (original)
+++ incubator/ftpserver/trunk/admin-gui/pom.xml Sat Nov 18 14:42:03 2006
@@ -20,8 +20,8 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.ftpserver</groupId>
-        <artifactId>ftpserver</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <artifactId>ftpserver-parent</artifactId>
+        <version>1.0-incubator-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.ftpserver</groupId>
     <artifactId>ftpserver-admin-gui</artifactId>

Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/message/MessageResourceImpl.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/message/MessageResourceImpl.java?view=diff&rev=476643&r1=476642&r2=476643
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/message/MessageResourceImpl.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/message/MessageResourceImpl.java Sat Nov 18 14:42:03 2006
@@ -163,7 +163,11 @@
      * Get all the available languages.
      */
     public String[] getAvailableLanguages() {
-        return (String[]) languages.clone();
+        if(languages == null) {
+            return null;
+        } else {         
+            return (String[]) languages.clone();
+        }
     }
     
     /**

Modified: incubator/ftpserver/trunk/distribution/bin/ftpd_ui.bat
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/distribution/bin/ftpd_ui.bat?view=diff&rev=476643&r1=476642&r2=476643
==============================================================================
--- incubator/ftpserver/trunk/distribution/bin/ftpd_ui.bat (original)
+++ incubator/ftpserver/trunk/distribution/bin/ftpd_ui.bat Sat Nov 18 14:42:03 2006
@@ -21,15 +21,15 @@
 if "%OS%"=="WINNT" @setlocal
 
 rem ----- use the location of this script to infer $FTPD_HOME -------
-if NOT "%OS%"=="Windows_NT" set DEFAULT_FTPD_HOME=.
-if "%OS%"=="Windows_NT" set DEFAULT_FTPD_HOME=%~dp0
-if "%OS%"=="WINNT" set DEFAULT_FTPD_HOME=%~dp0
+if NOT "%OS%"=="Windows_NT" set DEFAULT_FTPD_HOME=..
+if "%OS%"=="Windows_NT" set DEFAULT_FTPD_HOME=%~dp0/..
+if "%OS%"=="WINNT" set DEFAULT_FTPD_HOME=%~dp0/..
 if "%FTPD_HOME%"=="" set FTPD_HOME=%DEFAULT_FTPD_HOME%
 
 rem ----- Create CLASSPATH --------------------------------------------
-set FTPD_CLASSPATH=%CLASSPATH%;%FTPD_HOME%\common\classes;%FTPD_HOME%\target\classes;
+set FTPD_CLASSPATH=%CLASSPATH%;%FTPD_HOME%\common\classes;
 cd /d "%FTPD_HOME%\common\lib"
-for %%i in ("*.jar") do call "%FTPD_HOME%\appendcp.bat" "%FTPD_HOME%\common\lib\%%i"
+for %%i in ("*.jar") do call "%FTPD_HOME%\bin\appendcp.bat" "%FTPD_HOME%\common\lib\%%i"
 cd /d %FTPD_HOME%
 
 rem ----- call java.. ---------------------------------------------------

Modified: incubator/ftpserver/trunk/distribution/bin/ftpd_ui.sh
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/distribution/bin/ftpd_ui.sh?view=diff&rev=476643&r1=476642&r2=476643
==============================================================================
--- incubator/ftpserver/trunk/distribution/bin/ftpd_ui.sh (original)
+++ incubator/ftpserver/trunk/distribution/bin/ftpd_ui.sh Sat Nov 18 14:42:03 2006
@@ -53,7 +53,7 @@
       realpath=$whereami/$whoami
       ;;
   esac
-  FTPD_HOME=`dirname "$realpath"`
+  FTPD_HOME=`dirname "$realpath"`/..
 fi
 
 

Modified: incubator/ftpserver/trunk/ftplet-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/ftplet-api/pom.xml?view=diff&rev=476643&r1=476642&r2=476643
==============================================================================
--- incubator/ftpserver/trunk/ftplet-api/pom.xml (original)
+++ incubator/ftpserver/trunk/ftplet-api/pom.xml Sat Nov 18 14:42:03 2006
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.ftpserver</groupId>
-        <artifactId>ftpserver</artifactId>
+        <artifactId>ftpserver-parent</artifactId>
         <version>1.0-incubator-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.ftpserver</groupId>

Modified: incubator/ftpserver/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/pom.xml?view=diff&rev=476643&r1=476642&r2=476643
==============================================================================
--- incubator/ftpserver/trunk/pom.xml (original)
+++ incubator/ftpserver/trunk/pom.xml Sat Nov 18 14:42:03 2006
@@ -24,7 +24,7 @@
         <version>3</version>
     </parent>
     <groupId>org.apache.ftpserver</groupId>
-    <artifactId>ftpserver</artifactId>
+    <artifactId>ftpserver-parent</artifactId>
     <packaging>pom</packaging>
     <!-- TODO: dummy version. In Maven 2.1, this will be auto-versioned being a generic parent -->
     <version>1.0-incubator-SNAPSHOT</version>
@@ -160,7 +160,7 @@
                     <jdkLevel>${maven.compile.source}</jdkLevel>
                 </configuration>
             </plugin>
-            <plugin>
+<!--            <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>cobertura-maven-plugin</artifactId>
                 <executions>
@@ -171,7 +171,7 @@
                         </goals>
                     </execution>
                 </executions>
-            </plugin>
+            </plugin>-->
             <plugin>
                 <!-- This should possibly better be done by using a resource
 		     definition. However, if we declare a resource with

Modified: incubator/ftpserver/trunk/ssl-tests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/ssl-tests/pom.xml?view=diff&rev=476643&r1=476642&r2=476643
==============================================================================
--- incubator/ftpserver/trunk/ssl-tests/pom.xml (original)
+++ incubator/ftpserver/trunk/ssl-tests/pom.xml Sat Nov 18 14:42:03 2006
@@ -20,8 +20,8 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.ftpserver</groupId>
-        <artifactId>ftpserver</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <artifactId>ftpserver-parent</artifactId>
+        <version>1.0-incubator-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.ftpserver</groupId>
     <artifactId>ftpserver-ssl-tests</artifactId>