incubator-ftpserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n..@apache.org
Subject svn commit: r611100 - in /incubator/ftpserver/trunk/admin-gui: ./ src/main/java/org/apache/ftpserver/gui/ src/main/resources/ src/main/resources/org/ src/main/resources/org/apache/ src/main/resources/org/apache/ftpserver/ src/main/resources/org/apache/...
Date Fri, 11 Jan 2008 08:11:11 GMT
Author: ngn
Date: Fri Jan 11 00:11:08 2008
New Revision: 611100

URL: http://svn.apache.org/viewvc?rev=611100&view=rev
Log:
Updated to use the refactorings in core
Moved files into a standard Maven structure

Added:
    incubator/ftpserver/trunk/admin-gui/src/main/resources/
    incubator/ftpserver/trunk/admin-gui/src/main/resources/org/
    incubator/ftpserver/trunk/admin-gui/src/main/resources/org/apache/
    incubator/ftpserver/trunk/admin-gui/src/main/resources/org/apache/ftpserver/
    incubator/ftpserver/trunk/admin-gui/src/main/resources/org/apache/ftpserver/gui/
    incubator/ftpserver/trunk/admin-gui/src/main/resources/org/apache/ftpserver/gui/LICENSE.txt
      - copied unchanged from r607073, incubator/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/LICENSE.txt
    incubator/ftpserver/trunk/admin-gui/src/main/resources/org/apache/ftpserver/gui/logo.gif
      - copied unchanged from r607073, incubator/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/logo.gif
    incubator/ftpserver/trunk/admin-gui/src/test/resources/
    incubator/ftpserver/trunk/admin-gui/src/test/resources/log4j.properties
      - copied unchanged from r607073, incubator/ftpserver/trunk/admin-gui/src/test/java/log4j.properties
Removed:
    incubator/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/LICENSE.txt
    incubator/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/logo.gif
    incubator/ftpserver/trunk/admin-gui/src/test/java/log4j.properties
Modified:
    incubator/ftpserver/trunk/admin-gui/pom.xml
    incubator/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/DirectoryPanel.java
    incubator/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/FilePanel.java
    incubator/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/StatisticsPanel.java

Modified: incubator/ftpserver/trunk/admin-gui/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/admin-gui/pom.xml?rev=611100&r1=611099&r2=611100&view=diff
==============================================================================
--- incubator/ftpserver/trunk/admin-gui/pom.xml (original)
+++ incubator/ftpserver/trunk/admin-gui/pom.xml Fri Jan 11 00:11:08 2008
@@ -17,7 +17,6 @@
   <build>
     <resources>
       <resource>
-        <directory>src/java</directory>
         <includes>
           <include>**/*.txt</include>
           <include>**/*.gif</include>
@@ -26,7 +25,6 @@
     </resources>
     <testResources>
       <testResource>
-        <directory>src/test</directory>
         <includes>
           <include>*.properties</include>
         </includes>

Modified: incubator/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/DirectoryPanel.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/DirectoryPanel.java?rev=611100&r1=611099&r2=611100&view=diff
==============================================================================
--- incubator/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/DirectoryPanel.java
(original)
+++ incubator/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/DirectoryPanel.java
Fri Jan 11 00:11:08 2008
@@ -33,6 +33,7 @@
 
 import org.apache.ftpserver.ftplet.FileObject;
 import org.apache.ftpserver.ftplet.User;
+import org.apache.ftpserver.interfaces.FtpIoSession;
 import org.apache.ftpserver.interfaces.FtpServerContext;
 import org.apache.ftpserver.listener.Connection;
 
@@ -114,8 +115,8 @@
     /**
      * Make directory notification.
      */
-    public void notifyMkdir(Connection con, FileObject file) {
-        User user = con.getSession().getUser();
+    public void notifyMkdir(FtpIoSession session, FileObject file) {
+        User user = session.getUser();
         models[0].newEntry(file.getFullName(), user);
     }
     
@@ -123,8 +124,8 @@
     /**
      * Remove directory notification.
      */
-    public void notifyRmdir(Connection con, FileObject file) {
-        User user = con.getSession().getUser();
+    public void notifyRmdir(FtpIoSession session, FileObject file) {
+        User user = session.getUser();
         models[1].newEntry(file.getFullName(), user);
     }
     

Modified: incubator/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/FilePanel.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/FilePanel.java?rev=611100&r1=611099&r2=611100&view=diff
==============================================================================
--- incubator/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/FilePanel.java
(original)
+++ incubator/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/FilePanel.java
Fri Jan 11 00:11:08 2008
@@ -33,8 +33,8 @@
 
 import org.apache.ftpserver.ftplet.FileObject;
 import org.apache.ftpserver.ftplet.User;
+import org.apache.ftpserver.interfaces.FtpIoSession;
 import org.apache.ftpserver.interfaces.FtpServerContext;
-import org.apache.ftpserver.listener.Connection;
 
 /**
  * This panel displays all user file upload, download and remove activities.
@@ -116,24 +116,24 @@
     /**
      * File upload notification.
      */
-    public void notifyUpload(Connection con, FileObject file, long sz) {
-        User user = con.getSession().getUser();
+    public void notifyUpload(FtpIoSession session, FileObject file, long sz) {
+        User user = session.getUser();
         models[0].newEntry(file.getFullName(), user);
     }
     
     /**
      * File download notification.
      */
-    public void notifyDownload(Connection con, FileObject file, long sz) {
-        User user = con.getSession().getUser();
+    public void notifyDownload(FtpIoSession session, FileObject file, long sz) {
+        User user = session.getUser();
         models[1].newEntry(file.getFullName(), user);
     }
     
     /**
      * File delete notification.
      */
-    public void notifyDelete(Connection con, FileObject file) {
-        User user = con.getSession().getUser();
+    public void notifyDelete(FtpIoSession session, FileObject file) {
+        User user = session.getUser();
         models[2].newEntry(file.getFullName(), user);
     }
     

Modified: incubator/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/StatisticsPanel.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/StatisticsPanel.java?rev=611100&r1=611099&r2=611100&view=diff
==============================================================================
--- incubator/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/StatisticsPanel.java
(original)
+++ incubator/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/StatisticsPanel.java
Fri Jan 11 00:11:08 2008
@@ -37,10 +37,10 @@
 
 import org.apache.ftpserver.ftplet.FileObject;
 import org.apache.ftpserver.interfaces.FileObserver;
+import org.apache.ftpserver.interfaces.FtpIoSession;
 import org.apache.ftpserver.interfaces.FtpServerContext;
 import org.apache.ftpserver.interfaces.ServerFtpStatistics;
 import org.apache.ftpserver.interfaces.StatisticsObserver;
-import org.apache.ftpserver.listener.Connection;
 import org.apache.ftpserver.util.DateUtils;
 
 /**
@@ -299,11 +299,11 @@
     /**
      * File upload notification.
      */
-    public void notifyUpload(final Connection connection, final FileObject file, final long
size) {
+    public void notifyUpload(final FtpIoSession session, final FileObject file, final long
size) {
         Runnable runnable = new Runnable() {
             public void run() { 
                 FilePanel filePanel = (FilePanel)getContainer().getPluginPanel(PluginPanelContainer.FILE_INDEX);
-                filePanel.notifyUpload(connection, file, size);        
+                filePanel.notifyUpload(session, file, size);        
             }
         };
         SwingUtilities.invokeLater(runnable);
@@ -331,11 +331,11 @@
     /**
      * File download notification.
      */
-    public void notifyDownload(final Connection connection, final FileObject file, final
long size) {
+    public void notifyDownload(final FtpIoSession session, final FileObject file, final long
size) {
         Runnable runnable = new Runnable() {
             public void run() { 
                 FilePanel filePanel = (FilePanel)getContainer().getPluginPanel(PluginPanelContainer.FILE_INDEX);
-                filePanel.notifyDownload(connection, file, size);        
+                filePanel.notifyDownload(session, file, size);        
             }
         };
         SwingUtilities.invokeLater(runnable);
@@ -360,11 +360,11 @@
     /**
      * File delete notification.
      */
-    public void notifyDelete(final Connection connection, final FileObject file) {
+    public void notifyDelete(final FtpIoSession session, final FileObject file) {
         Runnable runnable = new Runnable() {
             public void run() { 
                 FilePanel filePanel = (FilePanel)getContainer().getPluginPanel(PluginPanelContainer.FILE_INDEX);
-                filePanel.notifyDelete(connection, file);        
+                filePanel.notifyDelete(session, file);        
             }
         };
         SwingUtilities.invokeLater(runnable);
@@ -465,11 +465,11 @@
     /**
      * Make directry notification.
      */
-    public void notifyMkdir(final Connection connection, final FileObject file) {
+    public void notifyMkdir(final FtpIoSession session, final FileObject file) {
         Runnable runnable = new Runnable() {
             public void run() { 
                 DirectoryPanel dirPanel = (DirectoryPanel)getContainer().getPluginPanel(PluginPanelContainer.DIR_INDEX);
-                dirPanel.notifyMkdir(connection, file);        
+                dirPanel.notifyMkdir(session, file);        
             }
         };
         SwingUtilities.invokeLater(runnable);
@@ -494,11 +494,11 @@
     /**
      * Remove directry notification.
      */
-    public void notifyRmdir(final Connection connection, final FileObject file) {
+    public void notifyRmdir(final FtpIoSession session, final FileObject file) {
         Runnable runnable = new Runnable() {
             public void run() { 
                 DirectoryPanel dirPanel = (DirectoryPanel)getContainer().getPluginPanel(PluginPanelContainer.DIR_INDEX);
-                dirPanel.notifyRmdir(connection, file);        
+                dirPanel.notifyRmdir(session, file);        
             }
         };
         SwingUtilities.invokeLater(runnable);



Mime
View raw message