krysalis-update/src/java/org/krysalis/depot/update/protocols IProtocolOperationsProvider.java,1.1,1.2 ProtocolOperationsManager.java,1.1,1.2 DefaultProtocolOperationsManager.java,1.1,1.2 Protocol.java,1.1,1.2

Update of /cvsroot/krysalis/krysalis-update/src/java/org/krysalis/depot/update/protocols
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26470/src/java/org/krysalis/depot/update/protocols

Modified Files:
	IProtocolOperationsProvider.java 
	ProtocolOperationsManager.java 
	DefaultProtocolOperationsManager.java Protocol.java 
Log Message:
format

Index: ProtocolOperationsManager.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-update/src/java/org/krysalis/depot/update/protocols/ProtocolOperationsManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ProtocolOperationsManager.java	8 Dec 2004 09:06:34 -0000	1.1
--- ProtocolOperationsManager.java	8 Dec 2004 09:11:54 -0000	1.2
***************
*** 39,45 ****
--- 39,47 ----
  public class ProtocolOperationsManager implements Dumpable {
  	private ArtifactUpdaterContext m_context = null;
+ 
  	private List m_providers = new ArrayList();
  
  	private Map m_sourceProtocolMap = new HashMap();
+ 
  	private Map m_destinationProtocolMap = new HashMap();
  
***************
*** 54,60 ****
  		public boolean select(Object protocolProvider) {
  
! 			List listOfSourceProtocols = ((IProtocolOperationsProvider) protocolProvider).getSupportedSourceProtocols();
  
! 			for (Iterator protocolIterator = listOfSourceProtocols.iterator(); protocolIterator.hasNext();) {
  				String protocol = (String) protocolIterator.next();
  				if (protocol.equals(m_sourceProtocol)) {
--- 56,64 ----
  		public boolean select(Object protocolProvider) {
  
! 			List listOfSourceProtocols = ((IProtocolOperationsProvider) protocolProvider)
! 					.getSupportedSourceProtocols();
  
! 			for (Iterator protocolIterator = listOfSourceProtocols.iterator(); protocolIterator
! 					.hasNext();) {
  				String protocol = (String) protocolIterator.next();
  				if (protocol.equals(m_sourceProtocol)) {
***************
*** 76,82 ****
  		public boolean select(Object protocolProvider) {
  
! 			List listOfDestinationProtocols = ((IProtocolOperationsProvider) protocolProvider).getSupportedDestinationProtocols();
  
! 			for (Iterator protocolIterator = listOfDestinationProtocols.iterator(); protocolIterator.hasNext();) {
  				String protocol = (String) protocolIterator.next();
  				if (protocol.equals(m_destinationProtocol)) {
--- 80,88 ----
  		public boolean select(Object protocolProvider) {
  
! 			List listOfDestinationProtocols = ((IProtocolOperationsProvider) protocolProvider)
! 					.getSupportedDestinationProtocols();
  
! 			for (Iterator protocolIterator = listOfDestinationProtocols
! 					.iterator(); protocolIterator.hasNext();) {
  				String protocol = (String) protocolIterator.next();
  				if (protocol.equals(m_destinationProtocol)) {
***************
*** 88,96 ****
  	}
  
! 	private class SourceDestinationProtocolProviderSelector
! 			implements
! 				ISelector {
  
  		String m_sourceProtocol;
  		String m_destinationProtocol;
  
--- 94,102 ----
  	}
  
! 	private class SourceDestinationProtocolProviderSelector implements
! 			ISelector {
  
  		String m_sourceProtocol;
+ 
  		String m_destinationProtocol;
  
***************
*** 103,116 ****
  		public boolean select(Object protocolProvider) {
  
! 			List listOfSourceProtocols = ((IProtocolOperationsProvider) protocolProvider).getSupportedSourceProtocols();
  
  			// check the src protocol
! 			for (Iterator srcProtocolIterator = listOfSourceProtocols.iterator(); srcProtocolIterator.hasNext();) {
  				String protocol = (String) srcProtocolIterator.next();
  				if (protocol.equals(m_sourceProtocol)) {
  					// if src protocol matches, check the destination protocol
! 					List listOfDestinationProtocols = ((IProtocolOperationsProvider) protocolProvider).getSupportedDestinationProtocols();
  
! 					for (Iterator protocolIterator = listOfDestinationProtocols.iterator(); protocolIterator.hasNext();) {
  						String destProtocol = (String) protocolIterator.next();
  						if (destProtocol.equals(m_destinationProtocol)) {
--- 109,126 ----
  		public boolean select(Object protocolProvider) {
  
! 			List listOfSourceProtocols = ((IProtocolOperationsProvider) protocolProvider)
! 					.getSupportedSourceProtocols();
  
  			// check the src protocol
! 			for (Iterator srcProtocolIterator = listOfSourceProtocols
! 					.iterator(); srcProtocolIterator.hasNext();) {
  				String protocol = (String) srcProtocolIterator.next();
  				if (protocol.equals(m_sourceProtocol)) {
  					// if src protocol matches, check the destination protocol
! 					List listOfDestinationProtocols = ((IProtocolOperationsProvider) protocolProvider)
! 							.getSupportedDestinationProtocols();
  
! 					for (Iterator protocolIterator = listOfDestinationProtocols
! 							.iterator(); protocolIterator.hasNext();) {
  						String destProtocol = (String) protocolIterator.next();
  						if (destProtocol.equals(m_destinationProtocol)) {
***************
*** 134,142 ****
  		p.init(m_context);
  
! 		registerIntoMap(m_sourceProtocolMap, p,
! 				p.getSupportedSourceProtocols().iterator());
  
! 		registerIntoMap(m_destinationProtocolMap, p,
! 				p.getSupportedDestinationProtocols().iterator());
  	}
  
--- 144,152 ----
  		p.init(m_context);
  
! 		registerIntoMap(m_sourceProtocolMap, p, p.getSupportedSourceProtocols()
! 				.iterator());
  
! 		registerIntoMap(m_destinationProtocolMap, p, p
! 				.getSupportedDestinationProtocols().iterator());
  	}
  
***************
*** 225,230 ****
  		// types (e.g. protocols)
  
! 		List providers = determineSourceDestinationProviders(
! 				source.getProtocol(), destination.getProtocol());
  
  		if (0 == providers.size())
--- 235,240 ----
  		// types (e.g. protocols)
  
! 		List providers = determineSourceDestinationProviders(source
! 				.getProtocol(), destination.getProtocol());
  
  		if (0 == providers.size())
***************
*** 233,237 ****
  					+ destination.getProtocol());
  
! 		IProtocolOperationsProvider provider = (IProtocolOperationsProvider) providers.get(0);
  
  		//
--- 243,248 ----
  					+ destination.getProtocol());
  
! 		IProtocolOperationsProvider provider = (IProtocolOperationsProvider) providers
! 				.get(0);
  
  		//
***************
*** 252,256 ****
  					+ source.getProtocol());
  
! 		IProtocolOperationsProvider provider = (IProtocolOperationsProvider) providers.get(0);
  
  		//
--- 263,268 ----
  					+ source.getProtocol());
  
! 		IProtocolOperationsProvider provider = (IProtocolOperationsProvider) providers
! 				.get(0);
  
  		//
***************
*** 263,280 ****
  	private List determineSourceProviders(String protocol)
  			throws UpdateException {
! 		return SelectionHelper.select(m_providers, new SourceProtocolProviderSelector(
! 				protocol));
  	}
  
  	private List determineDestinationProviders(String protocol)
  			throws UpdateException {
! 		return SelectionHelper.select(m_providers, new DestinationProtocolProviderSelector(
! 				protocol));
  	}
  
  	private List determineSourceDestinationProviders(String srcProtocol,
  			String destProtocol) throws UpdateException {
! 		return SelectionHelper.select(m_providers, new SourceDestinationProtocolProviderSelector(
! 				srcProtocol, destProtocol));
  	}
  
--- 275,293 ----
  	private List determineSourceProviders(String protocol)
  			throws UpdateException {
! 		return SelectionHelper.select(m_providers,
! 				new SourceProtocolProviderSelector(protocol));
  	}
  
  	private List determineDestinationProviders(String protocol)
  			throws UpdateException {
! 		return SelectionHelper.select(m_providers,
! 				new DestinationProtocolProviderSelector(protocol));
  	}
  
  	private List determineSourceDestinationProviders(String srcProtocol,
  			String destProtocol) throws UpdateException {
! 		return SelectionHelper.select(m_providers,
! 				new SourceDestinationProtocolProviderSelector(srcProtocol,
! 						destProtocol));
  	}
  
***************
*** 293,297 ****
  	 */
  	public void dump(PrintWriter out, int depth, boolean verbose) {
! 		//String indent = DebugUtils.getIndent(depth);
  		String indent1 = DebugUtils.getIndent(depth + 1);
  
--- 306,310 ----
  	 */
  	public void dump(PrintWriter out, int depth, boolean verbose) {
! 		// String indent = DebugUtils.getIndent(depth);
  		String indent1 = DebugUtils.getIndent(depth + 1);
  
***************
*** 313,317 ****
  
  			for (Iterator ii = providers.iterator(); ii.hasNext();) {
! 				IProtocolOperationsProvider p = (IProtocolOperationsProvider) ii.next();
  				out.print(indent);
  				out.print("Key: \'" + key + "\' -> ");
--- 326,331 ----
  
  			for (Iterator ii = providers.iterator(); ii.hasNext();) {
! 				IProtocolOperationsProvider p = (IProtocolOperationsProvider) ii
! 						.next();
  				out.print(indent);
  				out.print("Key: \'" + key + "\' -> ");

Index: IProtocolOperationsProvider.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-update/src/java/org/krysalis/depot/update/protocols/IProtocolOperationsProvider.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IProtocolOperationsProvider.java	8 Dec 2004 09:06:34 -0000	1.1
--- IProtocolOperationsProvider.java	8 Dec 2004 09:11:54 -0000	1.2
***************
*** 28,42 ****
  public interface IProtocolOperationsProvider {
  
! 	//	Configuration...
! 	void init(ArtifactUpdaterContext context) throws Exception ;
  	List getSupportedSourceProtocols();
  	List getSupportedDestinationProtocols();
  
! 	//	Work...
  	boolean exists(VirtualResourceLocator container) throws Exception;
  	List list(VirtualResourceLocator container) throws Exception;
! 	List list(VirtualResourceLocator container, ISelector selector) throws Exception;
! 	void copy(VirtualResourceLocator from, VirtualResourceLocator to) throws Exception;
! 	void copy(VirtualResourceLocator from, VirtualResourceLocator to, ISelector selector) throws Exception;
! 	void delete(VirtualResourceLocator locator, ISelector selector) throws Exception;
  }
--- 28,53 ----
  public interface IProtocolOperationsProvider {
  
! 	// Configuration...
! 	void init(ArtifactUpdaterContext context) throws Exception;
! 
  	List getSupportedSourceProtocols();
+ 
  	List getSupportedDestinationProtocols();
  
! 	// Work...
  	boolean exists(VirtualResourceLocator container) throws Exception;
+ 
  	List list(VirtualResourceLocator container) throws Exception;
! 
! 	List list(VirtualResourceLocator container, ISelector selector)
! 			throws Exception;
! 
! 	void copy(VirtualResourceLocator from, VirtualResourceLocator to)
! 			throws Exception;
! 
! 	void copy(VirtualResourceLocator from, VirtualResourceLocator to,
! 			ISelector selector) throws Exception;
! 
! 	void delete(VirtualResourceLocator locator, ISelector selector)
! 			throws Exception;
  }

Index: DefaultProtocolOperationsManager.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-update/src/java/org/krysalis/depot/update/protocols/DefaultProtocolOperationsManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DefaultProtocolOperationsManager.java	8 Dec 2004 09:06:34 -0000	1.1
--- DefaultProtocolOperationsManager.java	8 Dec 2004 09:11:54 -0000	1.2
***************
*** 29,33 ****
--- 29,35 ----
  
  	public static final String VFS_PROVIDER = "org.krysalis.depot.update.protocols.impl.VfsProtocolOperationsProvider";
+ 
  	public static final String HTTP_CLIENT_PROVIDER = "org.krysalis.depot.update.protocols.impl.HttpClientProtocolOperationsProvider";
+ 
  	public static final String URL_PROVIDER = "org.krysalis.depot.update.protocols.impl.BasicProtocolOperationsProvider";
  
***************
*** 42,56 ****
  			ClassLoaderContext loader = new ClassLoaderContext(context);
  
! 			IProtocolOperationsProvider provider = (IProtocolOperationsProvider) loader.loadClassWithFallbacks(
! 					VFS_PROVIDER, HTTP_CLIENT_PROVIDER, URL_PROVIDER);
  
  			registerProvider(provider);
! 			
! 			Logger.getLogger().info("Selected Provider: " + provider.getClass().getName() + " for " + context);
! 			
  		} catch (Exception ve) {
  			throw new UpdateRuntimeException(
  					"No *Working* Protocol Operation Providers Detected", ve);
! 		}		
  	}
  
--- 44,61 ----
  			ClassLoaderContext loader = new ClassLoaderContext(context);
  
! 			IProtocolOperationsProvider provider = (IProtocolOperationsProvider) loader
! 					.loadClassWithFallbacks(VFS_PROVIDER, HTTP_CLIENT_PROVIDER,
! 							URL_PROVIDER);
  
  			registerProvider(provider);
! 
! 			Logger.getLogger().info(
! 					"Selected Provider: " + provider.getClass().getName()
! 							+ " for " + context);
! 
  		} catch (Exception ve) {
  			throw new UpdateRuntimeException(
  					"No *Working* Protocol Operation Providers Detected", ve);
! 		}
  	}
  

Index: Protocol.java
===================================================================
RCS file: /cvsroot/krysalis/krysalis-update/src/java/org/krysalis/depot/update/protocols/Protocol.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Protocol.java	8 Dec 2004 09:06:34 -0000	1.1
--- Protocol.java	8 Dec 2004 09:11:54 -0000	1.2
***************
*** 23,26 ****
--- 23,27 ----
  
  	public final static String HTTP_PROTOCOL = "http";
+ 
  	public final static String FILE_PROTOCOL = "file";
  



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now. 
http://productguide.itmanagersjournal.com/