ruper2/src/java/core/org/krysalis/ruper2/protocols/impl FileProtocolOperationsProvider.java,NONE,1.1 HttpClientProtocolOperationsProvider.java,1.2,1.3

Update of /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper2/protocols/impl
In directory sc8-pr-cvs1:/tmp/cvs-serv23201/src/java/core/org/krysalis/ruper2/protocols/impl

Modified Files:
	HttpClientProtocolOperationsProvider.java 
Added Files:
	FileProtocolOperationsProvider.java 
Log Message:
1) Moved IMonitor -> IFileMonitor (to allow others)
2) GroupBy now works (iterated unsorted list be accindent)
3) Started on 'clean' (remove old versions from a repo)

--- NEW FILE: FileProtocolOperationsProvider.java ---
/*
 * Created on Aug 27, 2003
 */
package org.krysalis.ruper2.protocols.impl;

import java.io.File;
import java.util.ArrayList;
import java.util.List;

import org.krysalis.ruper2.impl.ResourceUpdaterContext;
import org.krysalis.ruper2.protocols.Protocol;
import org.krysalis.ruper2.util.io.FileUtils;
import org.krysalis.ruper2.util.io.ResolvedFile;
import org.krysalis.ruper2.util.net.VirtualResourceLocator;
import org.krysalis.ruper2.util.select.ISelector;

/**
 * @author ajack
 */
public class FileProtocolOperationsProvider
	extends AbstractProtocolOperationsProvider {

	public void init(ResourceUpdaterContext context) throws Exception {
		super.init(context);

		addSourceProtocol(Protocol.FILE_PROTOCOL);
		addDestinationProtocol(Protocol.FILE_PROTOCOL);

	}

	public boolean exists(VirtualResourceLocator container) throws Exception {
		return container.getFile().exists();
	}

	public List list(VirtualResourceLocator container, ISelector selector)
		throws Exception {
		List children = new ArrayList();

		File folder = container.getFile();
		File files[] = folder.listFiles();
		for (int i = 0; i < files.length; ++i) {
			File file = files[i];
			children.add(
				new VirtualResourceLocator(ResolvedFile.resolve(folder, file.getName())));
		}

		return children;
	}

	public void copy(
		VirtualResourceLocator from,
		VirtualResourceLocator to,
		ISelector selector)
		throws Exception {
		File toFile = to.getFile();
		// Build Folders to this Folder
		toFile.getParentFile().mkdirs();
		try {
			FileUtils.transfer(from.getFile(), toFile);
		}
		catch (Exception e) { // Attempt at cleanup
			try {
				toFile.delete();
			}
			catch (Exception ee) {
			}
		}
	}

}

Index: HttpClientProtocolOperationsProvider.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/core/org/krysalis/ruper2/protocols/impl/HttpClientProtocolOperationsProvider.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** HttpClientProtocolOperationsProvider.java	9 Oct 2003 21:15:01 -0000	1.2
--- HttpClientProtocolOperationsProvider.java	12 Oct 2003 18:12:05 -0000	1.3
***************
*** 10,17 ****
  import org.krysalis.ruper2.impl.ResourceUpdaterContext;
  import org.krysalis.ruper2.protocols.Protocol;
- import org.krysalis.ruper2.util.io.FileUtils;
  import org.krysalis.ruper2.util.io.HtmlUtils;
  import org.krysalis.ruper2.util.io.IOUtils;
- import org.krysalis.ruper2.util.io.ResolvedFile;
  import org.krysalis.ruper2.util.net.VirtualResourceLocator;
  import org.krysalis.ruper2.util.net.http.HttpClientUserAgent;
--- 10,15 ----
***************
*** 22,26 ****
   */
  public class HttpClientProtocolOperationsProvider
! 	extends AbstractProtocolOperationsProvider {
  
  	private HttpClientUserAgent m_agent = null;
--- 20,24 ----
   */
  public class HttpClientProtocolOperationsProvider
! 	extends FileProtocolOperationsProvider {
  
  	private HttpClientUserAgent m_agent = null;
***************
*** 30,37 ****
  
  		addSourceProtocol(Protocol.HTTP_PROTOCOL);
- 		addSourceProtocol(Protocol.FILE_PROTOCOL);
- 
  		addDestinationProtocol(Protocol.HTTP_PROTOCOL);
- 		addDestinationProtocol(Protocol.FILE_PROTOCOL);
  
  		m_agent = new HttpClientUserAgent();
--- 28,32 ----
***************
*** 44,48 ****
  			exists = m_agent.exists(container.toExternalForm());
  		else
! 			exists = container.getFile().exists();
  
  		return exists;
--- 39,43 ----
  			exists = m_agent.exists(container.toExternalForm());
  		else
! 			exists = super.exists(container);
  
  		return exists;
***************
*** 59,72 ****
  					m_agent.getContents(container.toExternalForm()));
  		}
! 		else {
! 			File folder = container.getFile();
! 			File files[] = folder.listFiles();
! 			for (int i = 0; i < files.length; ++i) {
! 				File file = files[i];
! 				children.add(
! 					new VirtualResourceLocator(
! 						ResolvedFile.resolve(folder, file)));
! 			}
! 		}
  
  		return children;
--- 54,59 ----
  					m_agent.getContents(container.toExternalForm()));
  		}
! 		else
! 			children = super.list(container, selector);
  
  		return children;
***************
*** 92,98 ****
  				}
  			}
! 			else {
! 				FileUtils.transfer(from.getFile(), toFile);
! 			}
  
  		}
--- 79,84 ----
  				}
  			}
! 			else
! 				super.copy(from, to, selector);
  
  		}




-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
SourceForge.net hosts over 70,000 Open Source Projects.
See the people who have HELPED US provide better services:
Click here: http://sourceforge.net/supporters.php