ruper2/src/java/ant/org/krysalis/ruper2/ant/task RepositoryToolTask.java,1.3,1.4 SynchronizeTask.java,1.5,1.6

Update of /cvsroot/metamorphosis/ruper2/src/java/ant/org/krysalis/ruper2/ant/task
In directory sc8-pr-cvs1:/tmp/cvs-serv16302/src/java/ant/org/krysalis/ruper2/ant/task

Modified Files:
	RepositoryToolTask.java SynchronizeTask.java 
Log Message:
Attempt to bring closer to working w/ Anou's API.

Index: RepositoryToolTask.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/ant/org/krysalis/ruper2/ant/task/RepositoryToolTask.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** RepositoryToolTask.java	8 Oct 2003 13:23:23 -0000	1.3
--- RepositoryToolTask.java	10 Oct 2003 21:26:24 -0000	1.4
***************
*** 12,16 ****
  import org.krysalis.ruper2.RuperException;
  import org.krysalis.ruper2.ant.util.AntLogListener;
- import org.krysalis.ruper2.config.RuperConfig;
  import org.krysalis.ruper2.impl.RepositoryWrapper;
  import org.krysalis.ruper2.impl.ResourceUpdaterContext;
--- 12,15 ----
***************
*** 55,60 ****
  		// Set logging context..
  		Logger logger = Logger.pushContext(new AntLogListener(this));
- 
- 		RuperConfig.configure();
  
  		try {
--- 54,57 ----

Index: SynchronizeTask.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/java/ant/org/krysalis/ruper2/ant/task/SynchronizeTask.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SynchronizeTask.java	8 Oct 2003 13:23:24 -0000	1.5
--- SynchronizeTask.java	10 Oct 2003 21:26:24 -0000	1.6
***************
*** 9,17 ****
  import org.apache.tools.ant.Project;
  import org.apache.tools.ant.Task;
  import org.krysalis.ruper2.ResourceUpdater;
  import org.krysalis.ruper2.RuperException;
  import org.krysalis.ruper2.ant.util.AntLogListener;
- import org.krysalis.ruper2.api.tool.FileUpdater;
- import org.krysalis.ruper2.config.RuperConfig;
  import org.krysalis.ruper2.log.Logger;
  import org.krysalis.ruper2.repository.Repository;
--- 9,17 ----
  import org.apache.tools.ant.Project;
  import org.apache.tools.ant.Task;
+ import org.krysalis.ruper2.FileAssistant;
+ import org.krysalis.ruper2.FileUpdater;
  import org.krysalis.ruper2.ResourceUpdater;
  import org.krysalis.ruper2.RuperException;
  import org.krysalis.ruper2.ant.util.AntLogListener;
  import org.krysalis.ruper2.log.Logger;
  import org.krysalis.ruper2.repository.Repository;
***************
*** 27,30 ****
--- 27,31 ----
  	private String m_group = null;
  	private String m_ruper = RuperConstants.DEFAULT;
+ 	private String m_target = RuperConstants.LIBRARY;
  	private String m_repositories = RuperConstants.DEFAULT;
  
***************
*** 50,53 ****
--- 51,75 ----
  	}
  
+ 	/**
+ 	 * @return
+ 	 */
+ 	public String getGroup() {
+ 		return m_group;
+ 	}
+ 
+ 	/**
+ 	 * @param string
+ 	 */
+ 	public void setGroup(String string) {
+ 		m_group = string;
+ 	}
+ 
+ 	/**
+ 	 * @param string
+ 	 */
+ 	public void setTarget(String string) {
+ 		m_target = string;
+ 	}
+ 
  	/* (non-Javadoc)
  	 * @see org.apache.tools.ant.Task#execute()
***************
*** 60,69 ****
  		Logger logger = Logger.pushContext(new AntLogListener(this));
  
- 		RuperConfig.configure();
- 
  		try {
  			//
  			// This uses default or configured stuff..
  			//
  
  			if (null != m_group) {
--- 82,101 ----
  		Logger logger = Logger.pushContext(new AntLogListener(this));
  
  		try {
  			//
  			// This uses default or configured stuff..
  			//
+ 			if (!RuperConstants.DEFAULT.equals(m_ruper))
+ 				log("Resource Updater: " + m_ruper, Project.MSG_INFO);
+ 
+ 			// Get the Resource Updater asked for
+ 			ResourceUpdater ruper = new ResourceUpdater(m_ruper);
+ 
+ 			if (!RuperConstants.LIBRARY.equals(m_target))
+ 				log("Target Repository: " + m_target, Project.MSG_INFO);
+ 
+ 			// Assigned the target (to copy into)
+ 			ruper.setDefaultTargetRepository(
+ 				Repository.getRepository(m_target, true));
  
  			if (null != m_group) {
***************
*** 71,83 ****
  				log("Update Group: " + m_group, Project.MSG_INFO);
  
! 				ResourceUpdater api = new ResourceUpdater(m_ruper);
! 				api.setDefaultTargetRepository(
! 					Repository.getRepository(RuperConstants.LIBRARY,true));
! 				api.updateResourceGroup(new ResourceGroup(m_group));
  			}
  			else if (null != m_file) {
  				log("Update File: " + m_file, Project.MSG_INFO);
  
! 				FileUpdater updater = new FileUpdater(m_ruper, m_repositories);
  
  				// Update all files [if folder], or one file
--- 103,116 ----
  				log("Update Group: " + m_group, Project.MSG_INFO);
  
! 				// Update...
! 				ruper.updateResourceGroup(new ResourceGroup(m_group));
  			}
  			else if (null != m_file) {
  				log("Update File: " + m_file, Project.MSG_INFO);
  
! 				// Base files off task base..
! 				FileAssistant filer = new FileAssistant(getProject().getBaseDir());
! 
! 				FileUpdater updater = new FileUpdater(filer, ruper);
  
  				// Update all files [if folder], or one file
***************
*** 95,111 ****
  		}
  	}
- 	/**
- 	 * @return
- 	 */
- 	public String getGroup() {
- 		return m_group;
- 	}
- 
- 	/**
- 	 * @param string
- 	 */
- 	public void setGroup(String string) {
- 		m_group = string;
- 	}
- 
  }
--- 128,130 ----




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