/ - Diff - Application: gvSIG desktop - gvSIG

     import org.gvsig.tools.locator.LocatorException;
     /**
      * This Locator provides the entry point for the gvSIG
      * {@link InstallerManager}
      * @see Locator
      * This Locator provides the entry point for the gvSIG {@link InstallerManager}
+     *
      * @see {@link Locator}
      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera Llodr&aacute;</a>
      */
     public class InstallerLocator extends AbstractLocator {
-...
     	 *            implementing the InstallerManager interface
     	 */
     	public static void registerInstallerManager(Class clazz) {
     		getInstance().register(INSTALLER_MANAGER_NAME,
     				INSTALLER_MANAGER_DESCRIPTION,
     				clazz);

branches/v2_0_0_prep/extensions/org.gvsig.installer/org.gvsig.installer.lib/org.gvsig.installer.lib.api/src/main/java/org/gvsig/installer/lib/api/InstallerLibrary.java
31	31	import org.gvsig.tools.library.LibraryException;
32	32
33	33	/**
	34	*
34	35	* @author <a href="mailto:jpiera@gvsig.org">Jorge Piera Llodrá</a>
35	36	*/
36	37	public class InstallerLibrary extends AbstractLibrary{

     import java.io.InputStream;
     import org.gvsig.installer.lib.api.InstallerInfo;
     import org.gvsig.installer.lib.api.creation.InstallerCreationService;
     /**
      * <p>
      * This service is used to execute an installer file and install the
      * plugins contained in it. It has methods to set the installer file,
      * to read the plugins that can be installed, to select the plugins
      * to install and to install them.
      * </p>
      * <p>
      * The installer stream is a normally a file that has been created using
      * the {@link InstallerCreationService} service. It is possible to create
      * an installer manually, but it has to have the structure defined by the
      * {@link InstallerCreationService} class.
      * </p>
      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera Llodr&aacute;</a>
      */
     public interface InstallerExecutionService {
     	/**
     	 * Sets the stream that contains the installer that contains the
     	 * information to install some plugins. This stream is a zip file
     	 * that has to have the structure defined in the {@link InstallerCreationService}
     	 * documentation.	 *
     	 * @param inputStream
     	 * The stream that contains the installer information.
     	 * @throws InstallerExecutionServiceException
     	 * It is thrown if there is an exception reading the stream
     	 */
     	public void setInstaller(InputStream inputStream) throws InstallerExecutionServiceException;
     	/**
     	 * It
     	 * @param outputDirectory
     	 * @throws InstallerExecutionServiceException
     	 */
     	public void executeInstaller(File outputDirectory) throws InstallerExecutionServiceException;
     	public void selectPluginToInstall(int index);

     import org.gvsig.installer.lib.api.InstallerInfo;
     /**
      * <p>
      * This service is used to create an installer for a gvSIG plugin. It
      * supports just one plugin for every installer. It contains a method to
      * set the plugin path and some methods to set the installer information.
      * </p>
+     *
      * <p>
      * It has also methods to load the current installation information (if exists)
      * and methods to create the installer file from an {@link OutputStream}.
      * </p>
+     *
      * <p>
      * An installer is just a compressed zip file that has a compressed zip file
      * for every plugin to install. In this first version it only has a plugin, but
      * in a future it is possible to create installers with more that one plugin.
      * The structure of an installation file is:
      * </p>
      * <pre>
      * - installer.zip
      * 		- org.gvsig.myplugin-[version]-[build].zip
      * 			- org.gvsig.myplugin
      * 			  	- install.info
      *  			- install.xml
      *  			- files
      *  				- org.gvsig.otherplugin
      *  					- file1
      *  					- file2
      * </pre>
      * <p>
      * installer.zip is the installer file name that has a zip file that
      * contains the plugin to install (org.gvsig.myplugin-[version]-[build].zip).
      * This second file has a root directory with the plugin content and with
      * some extra files with the installer information. These files are:
      * </p>
+     *
      * <lu>
      * <li><b>install.info</b>: file that contains the installer information</li>
      * <li><b>install.xml</b>: ant file that is executed in the execution of the installer
      * to do some extra actions in the installation process. One of these actions
      * is copy all the files located in the files directory</li>
      * <li><b>files directory</b>: it contains some files of other extensions that have
      * to be copied using the ant script.</li>
      * </lu>
+     *
      * <p>
      * The usage of the ant script to copy files from other plugins is not recommended
      * because it is possible that different installers overrides the same file. The
      * suggestion it that one plugin has to have all the files that it needs to work
      * inside the plugin and it never has to override some external files.
      * </p>
      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera Llodr&aacute;</a>
      */
     public interface InstallerCreationService {
     	/**
     	 * It returns an instance of an {@link InstallerInfo} class, that is a
     	 * class that contains all the installer information (plugin name, plugin
     	 * version...).
     	 * @return
     	 * The installer information.
     	 */
     	public InstallerInfo getInstallerInfo();
     	/**
     	 * It sets the directory where the plugin is located, that it has to
     	 * be a valid gvSIG plugin directory.
     	 * @param pluginDirectory
     	 * The directory where the gvSIG plugin is located.
     	 * @throws InstallerCreationServiceException
     	 * This exception is thrown when the directory doesn't exist or the directory is
     	 * not a valid gvSIG plugin directory.
     	 */
     	public void setPluginDirectory(File pluginDirectory) throws InstallerCreationServiceException;
     	/**
     	 * This method reads the install.info file and loads the installation information
     	 * into the current installer creation process. It also reads the information to
     	 * copy some external files and add them to the current installer creation execution.
     	 * @throws InstallerCreationServiceException
     	 * This exception is thrown when the directory is not valid gvSIG plugin directory.
     	 */
     	public void loadInstallInfoFromDirectory() throws InstallerCreationServiceException;
     	/**
     	 * It creates the installer file and copy it in the stream received like
     	 * an argument.
     	 * @param installerStream
     	 * The stream where the the installer is created
     	 * @throws InstallerCreationServiceException
     	 * It is thrown when there is an exception creating the installer.
     	 */
     	public void createInstaller(OutputStream installerStream) throws InstallerCreationServiceException;
+    }

     import org.gvsig.installer.lib.api.execution.InstallerExecutionServiceException;
     /**
      * <p>
      * This manager is used to register and create the services that are used
      * to manage the plugin installers. The services that offers are basically
      * two: the creation of installers service and the execution of installers
      * service.
      * </p>
+     *
      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera Llodr&aacute;</a>
      */
     public interface InstallerManager {
     //	public void registerInstallerInfoResource(Class clazz);
     //
     //	public InstallerInfoResource createInstallerInfoResource() throws CreateInstallerInfoResourceException;
     //
     //	public InstallerInfoResource readInstallerInfoResource(InputStream is) throws InstallerInfoFileException, CreateInstallerInfoResourceException;
     //
     //	public void writeInstallerInfoResource(InstallerInfoResource installerInfoResource, OutputStream os) throws InstallerInfoFileException;
     //
     //	public void compressPlugin(File directory, OutputStream os) throws CompressionPluginException;
     //
     //	public void decompressPlugin(InputStream is, File directory) throws CompressionPluginException;
     	/**
     	 * It registers a class that implements the service for the creation of
     	 * installers. It has to implement the {@link InstallerCreationService} interface.
+    	 *
     	 * @param clazz
     	 * Class that implements the {@link InstallerCreationService} interface.
     	 */
     	@SuppressWarnings(value = "unchecked")
     	public void registerInstallerCreationService(Class clazz);
     	/**
     	 * It creates and returns an object that is used to create an installer for
     	 * a selected plugin. All the parameters are set using the {@link InstallerCreationService}
     	 * interface.
+    	 *
     	 * @return
     	 * An object that is used to create a plugin installer
     	 * @throws InstallerCreationServiceException
     	 * When there is a problem creating the service
     	 */
     	public InstallerCreationService getInstallerCreationService() throws InstallerCreationServiceException;
     	/**
     	 * It registers a class that implements the service for the execution of
     	 * installers. It has to implement the {@link InstallerExecutionService} interface.
+    	 *
     	 * @param clazz
     	 * Class that implements the {@link InstallerExecutionService} interface.
     	 */
     	@SuppressWarnings("unchecked")
     	public void registerInstallerExecutionService(Class clazz);
     	/**
     	 * It creates and returns an object that is used to execute an installer for
     	 * the installation of plugins in gvSIG. All the parameters are set using the
     	 * {@link InstallerExecutionService} interface.
+    	 *
     	 * @return
     	 * An object that is used to install the installer file
     	 * @throws InstallerExecutionServiceException
     	 * When there is a problem creating the service
     	 */
     	public InstallerExecutionService getInstallerExecutionService() throws InstallerExecutionServiceException;
+    }

     	public boolean isOfficial();
     	public void setOfficial(boolean official);
     	public boolean isAdvancedMode();
     	public void setAdvancedMode(boolean isAdvancedMode);
     	public void addFileToCopy(File file);
-...
     	public void setAnScript(String antScript);
     	public String getAntScript();
     	public String getType();
     	public void setType(String type);
+    }

     	protected boolean official;
     	protected List<File> selectedFiles = null;
     	protected String antScript = null;
     	protected boolean isAdvancedMode;
     	protected String type = null;
     	public DefaultInstallerInfo() {
     		super();
     		selectedFiles = new ArrayList<File>();
-...
     		this.antScript = antScript;
+    	}
     	public boolean isAdvancedMode() {
     		return isAdvancedMode;
     	public String getType() {
     		return type;
+    	}
     	public void setAdvancedMode(boolean isAdvancedMode) {
     		this.isAdvancedMode = isAdvancedMode;
     	public void setType(String type) {
     		this.type = type;
+    	}
+    }

     		//Write the install.info file
     		writeInstallInfo();
     		if (isAdvancedMode){
     		//if (isAdvancedMode){
     			//Create the ant file
     			if (antScript != null){
     				writeAntFile();
-...
     				}catch(IOException e){
     					throw new InstallerCreationServiceException("Exception copying the ant file");
+    				}
+    			}
     			//}
     			//Copy the selected files
     			writeSelectedFiles();
-...
     		if (super.getAntScript() != null){
     			return super.getAntScript();
+    		}
     		if (isAdvancedMode){
     		//if (isAdvancedMode){
     			try {
     				loadAntFile(new File(getClass().getClassLoader().getResource(ANT_FILE_NAME).getFile()));
     				return antScript;
     			} catch (IOException e) {
     				logger.error("reading the ant script model", e);
+    			}
+    		}
     		//}
     		return null;
+    	}

     			properties.setProperty(InstallerInfoTags.VERSION, installInfo.getVersion());
     			properties.setProperty(InstallerInfoTags.BUILD, new Integer(installInfo.getBuild()).toString());
     			properties.setProperty(InstallerInfoTags.STATE, installInfo.getState());
     			properties.setProperty(InstallerInfoTags.OFFCICIAL, new Boolean(installInfo.isOfficial()).toString());
     			properties.setProperty(InstallerInfoTags.OFFCICIAL, new Boolean(installInfo.isOfficial()).toString());
     			properties.setProperty(InstallerInfoTags.TYPE, installInfo.getType());
     			properties.store(os, "");
     			os.close();
     		} catch (IOException e) {

branches/v2_0_0_prep/extensions/org.gvsig.installer/org.gvsig.installer.lib/org.gvsig.installer.lib.impl/src/main/java/org/gvsig/installer/lib/impl/info/InstallerInfoTags.java
37	37	public static final String BUILD = "build";
38	38	public static final String STATE = "state";
39	39	public static final String OFFCICIAL = "oficial";
	40	public static final String TYPE = "type";
40	41	}
41	42

branches/v2_0_0_prep/extensions/org.gvsig.installer/org.gvsig.installer.lib/org.gvsig.installer.lib.impl/src/main/java/org/gvsig/installer/lib/impl/info/InstallerInfoFileReader.java
110	110	installerInfoResource.setName(properties.getProperty(InstallerInfoTags.NAME));
111	111	installerInfoResource.setDescription(properties.getProperty(InstallerInfoTags.DESCRIPCTION));
112	112	installerInfoResource.setVersion(properties.getProperty(InstallerInfoTags.VERSION));
	113	installerInfoResource.setType(properties.getProperty(InstallerInfoTags.TYPE));
113	114	String build = properties.getProperty(InstallerInfoTags.BUILD);
114	115	try{
115	116	installerInfoResource.setBuild(Integer.parseInt(properties.getProperty(InstallerInfoTags.BUILD)));

     	public void nextPanel() {
     		installerCreationWizard.setAdvancedModeSelected(isAdvancedModeSelected());
     		installerCreationWizard.getInstallerCreationService().getInstallerInfo().
     			setAdvancedMode(isAdvancedModeSelected());
     //		installerCreationWizard.getInstallerCreationService().getInstallerInfo().
     //			setAdvancedMode(isAdvancedModeSelected());
+    	}
     	public void updatePanel() {

Application: gvSIG desktop

Revision 32333