/ - Diff - Application: gvSIG desktop - gvSIG

     <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     	<modelVersion>4.0.0</modelVersion>
     	<artifactId>org.gvsig.installer.lib.spi</artifactId>
     	<packaging>jar</packaging>
     	<name>org.gvsig.installer.lib.spi</name>
     	<parent>
     		<groupId>org.gvsig</groupId>
     		<artifactId>org.gvsig.installer.lib</artifactId>
     		<version>1.0.0-SNAPSHOT</version>
     	</parent>
     	<dependencies>
     		<dependency>
     			<groupId>org.gvsig</groupId>
     			<artifactId>org.gvsig.installer.lib.api</artifactId>
     			<version>1.0.0-SNAPSHOT</version>
     		</dependency>
     		<dependency>
     			<groupId>org.gvsig</groupId>
     			<artifactId>org.gvsig.tools.lib</artifactId>
     		</dependency>
     	</dependencies>
     </project>

     /* gvSIG. Geographic Information System of the Valencian Government
+    *
     * Copyright (C) 2007-2008 Infrastructures and Transports Department
     * of the Valencian Government (CIT)
+    *
     * This program is free software; you can redistribute it and/or
     * modify it under the terms of the GNU General Public License
     * as published by the Free Software Foundation; either version 2
     * of the License, or (at your option) any later version.
+    *
     * This program is distributed in the hope that it will be useful,
     * but WITHOUT ANY WARRANTY; without even the implied warranty of
     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     * GNU General Public License for more details.
+    *
     * You should have received a copy of the GNU General Public License
     * along with this program; if not, write to the Free Software
     * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
     * MA  02110-1301, USA.
+    *
     */
     /*
     * AUTHORS (In addition to CIT):
     * 2010 {Prodevelop}   {Task}
     */
     package org.gvsig.installer.lib.spi;
     import org.gvsig.tools.locator.BaseLocator;
     import org.gvsig.tools.locator.Locator;
     import org.gvsig.tools.locator.LocatorException;
     /**
      * This Locator provides the entry point for the gvSIG {@link InstallerProviderManager}
+     *
      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera Llodr&aacute;</a>
      */
     public class InstallerProviderLocator extends BaseLocator{
     	private static final String LOCATOR_NAME = "Installer.provider.locator";
     	public static final String PROVIDER_MANAGER_NAME = "Installer.provider.manager";
     	public static final String PROVIDER_MANAGER_DESCRIPTION = "Installer Manager";
     	/**
     	 * Unique instance.
     	 */
     	private static final InstallerProviderLocator instance = new InstallerProviderLocator();
     	/**
     	 * Return the singleton instance.
+    	 *
     	 * @return the singleton instance
     	 */
     	public static InstallerProviderLocator getInstance() {
     		return instance;
+    	}
     	/**
     	 * Return the Locator's name
+    	 *
     	 * @return a String with the Locator's name
     	 */
     	public String getLocatorName() {
     		return LOCATOR_NAME;
+    	}
     	/**
     	 * Return a reference to InstallerProviderManager.
+    	 *
     	 * @return a reference to InstallerProviderManager
     	 * @throws LocatorException
     	 *             if there is no access to the class or the class cannot be
     	 *             instantiated
     	 * @see Locator#get(String)
     	 */
     	public static InstallerProviderManager getProviderManager() throws LocatorException {
     		return (InstallerProviderManager) getInstance().get(PROVIDER_MANAGER_NAME);
+    	}
     	/**
     	 * Registers the Class implementing the PersistenceManager interface.
+    	 *
     	 * @param clazz
     	 *            implementing the PersistenceManager interface
     	 */
     	@SuppressWarnings(value = "unchecked")
     	public static void registerInstallerProviderManager(Class clazz) {
     		getInstance().register(PROVIDER_MANAGER_NAME, PROVIDER_MANAGER_DESCRIPTION, clazz);
+    	}
+    }

     /* gvSIG. Geographic Information System of the Valencian Government
+    *
     * Copyright (C) 2007-2008 Infrastructures and Transports Department
     * of the Valencian Government (CIT)
+    *
     * This program is free software; you can redistribute it and/or
     * modify it under the terms of the GNU General Public License
     * as published by the Free Software Foundation; either version 2
     * of the License, or (at your option) any later version.
+    *
     * This program is distributed in the hope that it will be useful,
     * but WITHOUT ANY WARRANTY; without even the implied warranty of
     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     * GNU General Public License for more details.
+    *
     * You should have received a copy of the GNU General Public License
     * along with this program; if not, write to the Free Software
     * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
     * MA  02110-1301, USA.
+    *
     */
     /*
     * AUTHORS (In addition to CIT):
     * 2010 {Prodevelop}   {Task}
     */
     package org.gvsig.installer.lib.spi;
     import java.io.File;
     import java.io.InputStream;
     import java.io.OutputStream;
     import java.util.List;
     import java.util.Map;
     import org.gvsig.installer.lib.api.PackageInfo;
     import org.gvsig.installer.lib.api.creation.MakePluginPackageServiceException;
     import org.gvsig.installer.lib.api.execution.InstallPackageServiceException;
     import org.gvsig.tools.service.spi.ProviderServices;
     /**
      * Services that can be used by the providers to create or exceute the bundle. It
      * contains methods to compress and to decompress files and methods to
      * read an install a package file from a directory.
+     *
      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera Llodr&aacute;</a>
      */
     public interface InstallPackageProviderServices extends ProviderServices{
     	/**
     	 * It decompress an input stream and write it on a directory.
     	 * @param is
     	 * The input stream to decompress
     	 * @param outputDirectory.
     	 * The output directory.
     	 * @throws InstallPackageServiceException
     	 * If there is a problem decompressing the stream.
     	 */
     	public void decompress(InputStream is, File outputDirectory) throws InstallPackageServiceException;
     	/**
     	 * Compress a directory like an zipped outputstream with a concrete name.
     	 * @param directory
     	 * the directory to compress.
     	 * @param fileName
     	 * name of the zip entry that has the output file.
     	 * The name that have to have
     	 * @param os
     	 * output stream to write the output.
     	 * @throws MakePluginPackageServiceException
     	 * if there is any problem compressing.
     	 */
     	public void compress(File directory, String fileName, OutputStream os) throws MakePluginPackageServiceException;
     	/**
     	 * Reads the package.info file from a directory a fills the the properties
     	 * of the {@link PackageInfo} object.
     	 * @param directory
     	 * the root directory that contains the installinfo file
     	 * @param installInfo
     	 * the installinfo file that has to be filled.
     	 * @throws InstallerInfoFileException.
     	 * if there is any problem reading the file
     	 */
     	public void readPackageInfo(File directory, PackageInfo installerInfo) throws InstallerInfoFileException;
     	/**
     	 * Reads the package.info file from a bundle fills the the properties
     	 * of the {@link PackageInfo} objects.
     	 * @param is
     	 * the input stream of a bundle.
     	 * @param packageInfos
     	 * a list of the information of the packages to install.
     	 * @param zipEntriesMap
     	 * a map to retrieve the zipEntry for every package. This information is necessary to
     	 * select the plugin to decompress.
     	 * @throws InstallPackageServiceException
     	 * if there is a problem reading the bundle.
     	 */
     	public void readPackageInfo(InputStream is, List<PackageInfo> packageInfos, Map<PackageInfo, String> zipEntriesMap) throws InstallPackageServiceException;
     	/**
     	 * Writes the package.info file in a concrete directory.
     	 * @param directory
     	 * the directory.
     	 * @param packageInfo
     	 * the information to write.
     	 * @throws InstallerInfoFileException
     	 * if there is any problem writing the package.info file.
     	 */
     	public void writePackageInfo(File directory, PackageInfo packageInfo) throws InstallerInfoFileException;
     	/**
     	 * It search a package inside an installer file by the zip name and returns
     	 * the stream in this position ready to decompres.
     	 * @param is
     	 * the input stream of a bundle.
     	 * @param zipEntry
     	 * the name of the zip entry.
     	 * @return
     	 * the input stream ready to install.
     	 * @throws InstallPackageServiceException
     	 * if there is a problem reading the stream
     	 */
     	public InputStream searchPackage(InputStream is, String zipEntry) throws InstallPackageServiceException;
     	/**
     	 * It reads a compressed file and retrieve the package information.
     	 * @param is
     	 * the compressed file
     	 * @return
     	 * the information of the package
     	 * @throws InstallPackageServiceException
     	 * if there is a problem decompressing the file.
     	 */
     	public PackageInfo readCompressedPackageInfo(InputStream is) throws InstallPackageServiceException;
+    }

     /* gvSIG. Geographic Information System of the Valencian Government
+    *
     * Copyright (C) 2007-2008 Infrastructures and Transports Department
     * of the Valencian Government (CIT)
+    *
     * This program is free software; you can redistribute it and/or
     * modify it under the terms of the GNU General Public License
     * as published by the Free Software Foundation; either version 2
     * of the License, or (at your option) any later version.
+    *
     * This program is distributed in the hope that it will be useful,
     * but WITHOUT ANY WARRANTY; without even the implied warranty of
     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     * GNU General Public License for more details.
+    *
     * You should have received a copy of the GNU General Public License
     * along with this program; if not, write to the Free Software
     * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
     * MA  02110-1301, USA.
+    *
     */
     /*
     * AUTHORS (In addition to CIT):
     * 2010 {Prodevelop}   {Task}
     */
     package org.gvsig.installer.lib.spi;
     import org.gvsig.installer.lib.api.PackageInfo;
     import org.gvsig.installer.lib.spi.execution.InstallPackageProvider;
     import org.gvsig.tools.service.ServiceException;
     import org.gvsig.tools.service.spi.ProviderManager;
     /**
      * <p>
      * The installation process install packages in gvSIG. These packages has a type,
      * that can be a plugin, theme, translation, etc. For every type of package
      * the installation process needs a provider for installing the
      * packages.
      * </p>
      * <p>
      * All the packages to install have to have some install properties defined
      * by the {@link PackageInfo} class. This class is just a set of properties
      * and there is a property named <b>type</b> that can be retrieved by the
      * {@link PackageInfo#getType()} method that defines the package type.
      * This property is used to create a {@link InstallPackageProvider}
      * that is used to install the selected package.
      * </p>
      * <p>
      * This manager provides the functionality to register and to create
      * a providers for every package.
      * </p>
+     *
      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera Llodr&aacute;</a>
      */
     public interface InstallerProviderManager extends ProviderManager {
     	/**
     	 * Creates a new provider to execute an installer to add a new package in gvSIG.
     	 * @param providerName
     	 * the provider name used on the registration of the provider. This name is the
     	 * type attribute defined by {@link PackageInfo}.
     	 * @return
     	 * a provider that can be used to install a package.
     	 * @throws ServiceException
     	 * if the provider doesn't exist or if there is a problem creating the provider.
     	 */
     	public InstallPackageProvider createExecutionProvider(String providerName) throws ServiceException;
     	/**
     	 * Creates the services that be used for the providers to execute or
     	 * create a new bundle.
     	 * @return
     	 * the services used to create or execute an bundle.
     	 */
     	public InstallPackageProviderServices createInstallerProviderServices();
+    }

     /* gvSIG. Geographic Information System of the Valencian Government
+    *
     * Copyright (C) 2007-2008 Infrastructures and Transports Department
     * of the Valencian Government (CIT)
+    *
     * This program is free software; you can redistribute it and/or
     * modify it under the terms of the GNU General Public License
     * as published by the Free Software Foundation; either version 2
     * of the License, or (at your option) any later version.
+    *
     * This program is distributed in the hope that it will be useful,
     * but WITHOUT ANY WARRANTY; without even the implied warranty of
     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     * GNU General Public License for more details.
+    *
     * You should have received a copy of the GNU General Public License
     * along with this program; if not, write to the Free Software
     * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
     * MA  02110-1301, USA.
+    *
     */
     /*
     * AUTHORS (In addition to CIT):
     * 2010 {Prodevelop}   {Task}
     */
     package org.gvsig.installer.lib.spi.execution;
     import java.io.File;
     import java.io.InputStream;
     import org.gvsig.installer.lib.api.execution.InstallPackageServiceException;
     /**
      * <p>
      * Provider that manage the installation process of a concrete package. There
      * is a different provider for each package type that is supported. The provider
      * just have a method to install the package in gvSIG
      * </p>
+     *
      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera Llodr&aacute;</a>
      */
     public interface InstallPackageProvider {
     	/**
     	 * This method install a package in a valid gvSIG directory.
     	 * @param applicationDirectory
     	 * the directory where gvSIG is located.
     	 * @param inputStream
     	 * the stream that contains the package information.
     	 * @throws InstallPackageServiceException
     	 * if there is a problem reading the stream or installing the package.
     	 */
     	public void install(File applicationDirectory, InputStream inputStream) throws InstallPackageServiceException;
+    }

     /* gvSIG. Geographic Information System of the Valencian Government
+    *
     * Copyright (C) 2007-2008 Infrastructures and Transports Department
     * of the Valencian Government (CIT)
+    *
     * This program is free software; you can redistribute it and/or
     * modify it under the terms of the GNU General Public License
     * as published by the Free Software Foundation; either version 2
     * of the License, or (at your option) any later version.
+    *
     * This program is distributed in the hope that it will be useful,
     * but WITHOUT ANY WARRANTY; without even the implied warranty of
     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     * GNU General Public License for more details.
+    *
     * You should have received a copy of the GNU General Public License
     * along with this program; if not, write to the Free Software
     * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
     * MA  02110-1301, USA.
+    *
     */
     /*
     * AUTHORS (In addition to CIT):
     * 2010 {Prodevelop}   {Task}
     */
     package org.gvsig.installer.lib.spi;
     import org.gvsig.installer.lib.api.creation.MakePluginPackageServiceException;
     import org.gvsig.tools.exception.BaseException;
     /**
      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera Llodr&aacute;</a>
      */
     public class InstallerInfoFileException extends MakePluginPackageServiceException {
     	private static final long serialVersionUID = -5388898489108649788L;
     	private static final String KEY = "install_infofile_exception";
     	/**
          * @see BaseException#BaseException(String, String, long)
          */
         public InstallerInfoFileException(String message) {
         	 super(message, KEY, serialVersionUID);
+        }
         /**
          * @see BaseException#BaseException(String, Throwable)
          */
         public InstallerInfoFileException(String message, Throwable cause) {
         	 super(message, cause,  KEY, serialVersionUID);
+        }
         /**
          * @see BaseException#BaseException(String, String, long)
          */
         public InstallerInfoFileException(String message, String key, long code) {
        	    super(message, key, code);
+       }
+    }

     /* gvSIG. Geographic Information System of the Valencian Government
+     *
      * Copyright (C) 2007-2008 Infrastructures and Transports Department
      * of the Valencian Government (CIT)
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
      * MA  02110-1301, USA.
+     *
      */
     /*
      * AUTHORS (In addition to CIT):
      * 2010 {Prodevelop}   {Task}
      */
     package org.gvsig.installer.lib.impl;
     import java.io.BufferedOutputStream;
     import java.io.DataOutputStream;
     import java.io.File;
     import java.io.FileInputStream;
     import java.io.FileOutputStream;
     import java.io.IOException;
     import java.io.InputStream;
     import java.io.OutputStream;
     import org.gvsig.tools.junit.AbstractLibraryAutoInitTestCase;
     /**
      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera Llodr&aacute;</a>
      */
     public abstract class InstallerServiceTest extends AbstractLibraryAutoInitTestCase{
     	public File getApplicationDirectory() throws IOException{
     		File templateFile = new File(getClass().getClassLoader().getResource("application").getFile());
     		File applicationDirectory = new File(System.getProperty("java.io.tmpdir") +  File.separator + "tmp_gvsig_installer");
     		if (applicationDirectory.exists()){
     			deleteDir(applicationDirectory);
+    		}
     		copy(templateFile, applicationDirectory);
     		return applicationDirectory;
+    	}
     	public File getTemporalFile(){
     		return new File(System.getProperty("java.io.tmpdir") + File.separator + "installer" + Math.random());
+    	}
     	public File getInstallersDirectory() throws IOException
+    	{
     		File applicationDirectory = getApplicationDirectory();
     		return new File(applicationDirectory + File.separator + "install");
+    	}
     	public File getPluginsDirectory() throws IOException{
     		File applicationDirectory = getApplicationDirectory();
     		return new File(applicationDirectory + File.separator + "gvSIG" + File.separator + "extensiones");
+    	}
     	public boolean deleteDir(File dir) {
     		if (dir.isDirectory()) {
     			String[] children = dir.list();
     			for (int i=0; i<children.length; i++) {
     				boolean success = deleteDir(new File(dir, children[i]));
     				if (!success) {
     					return false;
+    				}
+    			}
+    		}
     		return dir.delete();
+    	}
     	public void copy(File sourceLocation , File targetLocation) throws IOException {
     		if (sourceLocation.isDirectory()) {
     			if (!targetLocation.exists()) {
     				targetLocation.mkdir();
+    			}
     			String[] children = sourceLocation.list();
     			for (int i=0; i<children.length; i++) {
     				copy(new File(sourceLocation, children[i]),
     						new File(targetLocation, children[i]));
+    			}
     		} else {
     			targetLocation.getParentFile().mkdirs();
     			InputStream in = new FileInputStream(sourceLocation);
     			OutputStream out = new FileOutputStream(targetLocation);
     			// Copy the bits from instream to outstream
     			byte[] buf = new byte[1024];
     			int len;
     			while ((len = in.read(buf)) > 0) {
     				out.write(buf, 0, len);
+    			}
     			in.close();
     			out.close();
+    		}
+    	}
     	public void writeToFile(InputStream is, File file) {
     		try {
     			DataOutputStream out = new DataOutputStream(new BufferedOutputStream(new FileOutputStream(file)));
     			InputStream is2 = is;
     			boolean again = true;
     			while(again) {
     				if(is2.read() > -1) {
     					out.writeByte(is.read());
+    				}
     				else again = false;
+    			}
     			is.close();
     			out.close();
+    		}
     		catch(IOException e) {
     			System.err.println("Error Writing/Reading Streams.");
+    		}
+    	}
+    }

     /* gvSIG. Geographic Information System of the Valencian Government
+    *
     * Copyright (C) 2007-2008 Infrastructures and Transports Department
     * of the Valencian Government (CIT)
+    *
     * This program is free software; you can redistribute it and/or
     * modify it under the terms of the GNU General Public License
     * as published by the Free Software Foundation; either version 2
     * of the License, or (at your option) any later version.
+    *
     * This program is distributed in the hope that it will be useful,
     * but WITHOUT ANY WARRANTY; without even the implied warranty of
     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     * GNU General Public License for more details.
+    *
     * You should have received a copy of the GNU General Public License
     * along with this program; if not, write to the Free Software
     * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
     * MA  02110-1301, USA.
+    *
     */
     /*
     * AUTHORS (In addition to CIT):
     * 2010 {Prodevelop}   {Task}
     */
     package org.gvsig.installer.lib.impl.execution;
     import java.io.File;
     import java.io.IOException;
     import junit.framework.Assert;
     import org.gvsig.installer.lib.api.InstallerLocator;
     import org.gvsig.installer.lib.api.PackageInfo;
     import org.gvsig.installer.lib.api.creation.MakePluginPackageService;
     import org.gvsig.installer.lib.api.creation.MakePluginPackageServiceException;
     import org.gvsig.installer.lib.api.execution.InstallPackageService;
     import org.gvsig.installer.lib.api.execution.InstallPackageServiceException;
     import org.gvsig.installer.lib.impl.InstallerServiceTest;
     import org.gvsig.tools.locator.LocatorException;
     /**
      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera Llodr&aacute;</a>
      */
     public class InstallPackageServiceTest  extends InstallerServiceTest{
     	@Override
     	protected void doSetUp() throws Exception {
     		// TODO Auto-generated method stub
+    	}
     	public void testReadPlugins() throws LocatorException, MakePluginPackageServiceException, InstallPackageServiceException, IOException{
     		File installersDirectory = super.getInstallersDirectory();
     		InstallPackageService installPackageService =
     			InstallerLocator.getInstallerManager().getInstallPackageService();
     		installPackageService.addBundlesFromDirectory(installersDirectory);
     		Assert.assertEquals(3, installPackageService.getPackageCount());
     		int pluginsNumber = 0;
     		for (int i=0 ; i<3 ; i++){
     			PackageInfo packageInfo = installPackageService.getPackageInfo(i);
     			if (packageInfo.getCode().equals("org.gvsig.plugin1")){
     				assertNotNull(packageInfo.getState());
     				pluginsNumber++;
     			}else if (packageInfo.getCode().equals("org.gvsig.plugin2")){
     				assertEquals("RC1", packageInfo.getState());
     				pluginsNumber++;
     			}else if (packageInfo.getCode().equals("org.gvsig.plugin3")){
     				assertEquals("Testing", packageInfo.getState());
     				pluginsNumber++;
+    			}
+    		}
     		Assert.assertEquals(3, pluginsNumber);
+    	}
     	public void testInstallPluginFromApplication() throws InstallPackageServiceException, IOException, LocatorException, MakePluginPackageServiceException{
     		File installersDirectory = super.getInstallersDirectory();
     		File pluginsDirectory = super.getPluginsDirectory();
     		File applicationDirectory = super.getApplicationDirectory();
     		InstallPackageService installerExecutionService =
     			InstallerLocator.getInstallerManager().getInstallPackageService();
     		installerExecutionService.addBundlesFromDirectory(installersDirectory);
     		PackageInfo packageInfo = installerExecutionService.getPackageInfo("org.gvsig.plugin1");
     		installerExecutionService.installPackage(applicationDirectory, packageInfo);
     		Assert.assertEquals(3, installerExecutionService.getPackageCount());
     		//Reading the excution and check that the file is installed
     		MakePluginPackageService installerCreationService =
     			InstallerLocator.getInstallerManager().getMakePluginPackageService(pluginsDirectory);
     		Assert.assertEquals(4, installerCreationService.getPluginPackageCount());
+    	}
     	public void testInstallPluginFromExternal() throws InstallPackageServiceException, IOException, LocatorException, MakePluginPackageServiceException{
     		File applicationDirectory = super.getApplicationDirectory();
     		File externalInstallationFile = new File(applicationDirectory.getAbsoluteFile() + File.separator + "install" + File.separator + "bundle1.zip");
     		File pluginsDirectory = super.getPluginsDirectory();
     		InstallPackageService installerExecutionService =
     			InstallerLocator.getInstallerManager().getInstallPackageService();
     		installerExecutionService.addBundle(externalInstallationFile.toURI());
     		PackageInfo packageInfo = installerExecutionService.getPackageInfo("org.gvsig.plugin1");
     		Assert.assertEquals(3, installerExecutionService.getPackageCount());
     		installerExecutionService.installPackage(applicationDirectory, packageInfo);
     		//Reading the excution and check that the file is installed
     		MakePluginPackageService installerCreationService =
     			InstallerLocator.getInstallerManager().getMakePluginPackageService(pluginsDirectory);
     		Assert.assertEquals(4, installerCreationService.getPluginPackageCount());
+    	}
     //	public void testInstallPluginWithAntScript() throws InstallPackageServiceException, LocatorException, MakePluginPackageServiceException, IOException{
     //		File applicationDirectory = super.getApplicationDirectory();
     //		File installersDirectory = super.getInstallersDirectory();
     //		File pluginsDirectory = super.getPluginsDirectory();
     //
     //		InstallPackageService installerExecutionService =
     //			InstallerLocator.getInstallerManager().getInstallPackageService();
     //		installerExecutionService.addBundlesFromDirectory(installersDirectory);
     //
     //		PackageInfo packageInfo = installerExecutionService.getPackageInfo("org.gvsig.plugin2");
     //
     //		Assert.assertEquals(3, installerExecutionService.getPackageCount());
     //
     //		installerExecutionService.installPackage(applicationDirectory, packageInfo);
     //
     //		//Reading the excution and check that the file is installed
     //		MakePluginPackageService installerCreationService =
     //			InstallerLocator.getInstallerManager().getMakePluginPackageService(pluginsDirectory);
     //
     //		Assert.assertEquals(5, installerCreationService.getPluginPackageCount());
     //	}
+    }

     /* gvSIG. Geographic Information System of the Valencian Government
+    *
     * Copyright (C) 2007-2008 Infrastructures and Transports Department
     * of the Valencian Government (CIT)
+    *
     * This program is free software; you can redistribute it and/or
     * modify it under the terms of the GNU General Public License
     * as published by the Free Software Foundation; either version 2
     * of the License, or (at your option) any later version.
+    *
     * This program is distributed in the hope that it will be useful,
     * but WITHOUT ANY WARRANTY; without even the implied warranty of
     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     * GNU General Public License for more details.
+    *
     * You should have received a copy of the GNU General Public License
     * along with this program; if not, write to the Free Software
     * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
     * MA  02110-1301, USA.
+    *
     */
     /*
     * AUTHORS (In addition to CIT):
     * 2010 {Prodevelop}   {Task}
     */
     package org.gvsig.installer.lib.impl.creation;
     import java.io.File;
     import java.io.FileOutputStream;
     import java.io.IOException;
     import junit.framework.Assert;
     import org.gvsig.installer.lib.api.InstallerLocator;
     import org.gvsig.installer.lib.api.PackageInfo;
     import org.gvsig.installer.lib.api.creation.MakePluginPackageService;
     import org.gvsig.installer.lib.api.creation.MakePluginPackageServiceException;
     import org.gvsig.installer.lib.api.execution.InstallPackageService;
     import org.gvsig.installer.lib.api.execution.InstallPackageServiceException;
     import org.gvsig.installer.lib.impl.InstallerServiceTest;
     import org.gvsig.tools.locator.LocatorException;
     /**
      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera Llodr&aacute;</a>
      */
     public class MakePluginPackageServiceTest extends InstallerServiceTest{
     	@Override
     	protected void doSetUp() throws Exception {
+    	}
     	public void testReadPlugins() throws LocatorException, MakePluginPackageServiceException, InstallPackageServiceException, IOException{
     		File pluginsDirectory = super.getPluginsDirectory();
     		MakePluginPackageService makePluginPackageService =
     			InstallerLocator.getInstallerManager().getMakePluginPackageService(pluginsDirectory);
     		Assert.assertEquals(3, makePluginPackageService.getPluginPackageCount());
     		int pluginsNumber = 0;
     		for (int i=0 ; i<3 ; i++){
     			PackageInfo packageInfo = makePluginPackageService.getPluginPackageInfo(i);
     			if (packageInfo.getCode().equals("org.gvsig.wms")){
     				assertNotNull(packageInfo.getState());
     				pluginsNumber++;
     			}else if (packageInfo.getCode().equals("org.gvsig.wfs")){
     				assertEquals("RC2", packageInfo.getState());
     				pluginsNumber++;
     			}else if (packageInfo.getCode().equals("org.gvsig.wcs")){
     				assertEquals("RC1", packageInfo.getState());
     				pluginsNumber++;
+    			}
+    		}
     		Assert.assertEquals(3, pluginsNumber);
+    	}
     	public void testMakePluginPackage() throws IOException, LocatorException, MakePluginPackageServiceException, InstallPackageServiceException{
     		File pluginsDirectory = super.getPluginsDirectory();
     		File installerFile = super.getTemporalFile();
     		MakePluginPackageService makePluginPackageService =
     			InstallerLocator.getInstallerManager().getMakePluginPackageService(pluginsDirectory);
     		PackageInfo packageInfo = makePluginPackageService.getPluginPackageInfo("org.gvsig.wfs");
     		assertEquals("1.0.0", packageInfo.getVersion());
     		//Change the version to check that the installation process works fine
     		packageInfo.setVersion("1.0.1");
     		//Compress the plugin and create the installer compressed file
     		FileOutputStream os = new FileOutputStream(installerFile);
     		makePluginPackageService.createPluginPackage(packageInfo, os);
     		//decompress the plugin and read the plugin information
     		InstallPackageService installPackageService =
     		InstallerLocator.getInstallerManager().getInstallPackageService();
     		installPackageService.addBundle(installerFile.toURI());
     		assertEquals(1, installPackageService.getPackageCount());
     		PackageInfo newInstallerInfo = makePluginPackageService.getPluginPackageInfo(0);
     		assertEquals("1.0.1", newInstallerInfo.getVersion());
+    	}
     	public void testCreateInstallerWithAntFile() throws IOException, LocatorException, MakePluginPackageServiceException, InstallPackageServiceException{
     		File pluginsDirectory = super.getPluginsDirectory();
     		File installerFile = super.getTemporalFile();
     		MakePluginPackageService makePluginPackageService =
     			InstallerLocator.getInstallerManager().getMakePluginPackageService(pluginsDirectory);
     		PackageInfo packageInfo = makePluginPackageService.getPluginPackageInfo("org.gvsig.wfs");
     		packageInfo.setAnScript(makePluginPackageService.getDefaultAntScript());
     		//Compress the plugin and create the installer compressed file
     		FileOutputStream os = new FileOutputStream(installerFile);
     		makePluginPackageService.createPluginPackage(packageInfo, os);
     		//decompress the plugin and read the plugin information
     		InstallPackageService installPackageService =
     			InstallerLocator.getInstallerManager().getInstallPackageService();
     		installPackageService.addBundle(installerFile.toURI());
     		assertEquals(1, installPackageService.getPackageCount());
     		PackageInfo newInstallerInfo = makePluginPackageService.getPluginPackageInfo(0);
     		assertTrue(newInstallerInfo.getAntScript().startsWith("<project"));
+    	}
     	public void testCreateInstallerWithFiles() throws IOException, LocatorException, MakePluginPackageServiceException, InstallPackageServiceException{
     		File pluginsDirectory = super.getPluginsDirectory();
     		File installerFile = super.getTemporalFile();
     		File resource = new File (pluginsDirectory + File.separator + "org.gvsig.wms" + File.separator + "resources2.txt");
     		MakePluginPackageService makePluginPackageService =
     			InstallerLocator.getInstallerManager().getMakePluginPackageService(pluginsDirectory);
     		PackageInfo packageInfo = makePluginPackageService.getPluginPackageInfo("org.gvsig.wcs");
     		packageInfo.addFileToCopy(resource);
     		//Compress the plugin and create the installer compressed file
     		FileOutputStream os = new FileOutputStream(installerFile);
     		makePluginPackageService.createPluginPackage(packageInfo, os);
     		//decompress the plugin and read the plugin information
     		InstallPackageService installPackageService =
     			InstallerLocator.getInstallerManager().getInstallPackageService();
     		installPackageService.addBundle(installerFile.toURI());
     		assertEquals(1, installPackageService.getPackageCount());
     		PackageInfo newInstallerInfo = makePluginPackageService.getPluginPackageInfo(0);
     		assertEquals(1, newInstallerInfo.getFileToCopySize());
+    	}
+    }

     /* gvSIG. Geographic Information System of the Valencian Government
+    *
     * Copyright (C) 2007-2008 Infrastructures and Transports Department
     * of the Valencian Government (CIT)
+    *
     * This program is free software; you can redistribute it and/or
     * modify it under the terms of the GNU General Public License
     * as published by the Free Software Foundation; either version 2
     * of the License, or (at your option) any later version.
+    *
     * This program is distributed in the hope that it will be useful,
     * but WITHOUT ANY WARRANTY; without even the implied warranty of
     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     * GNU General Public License for more details.
+    *
     * You should have received a copy of the GNU General Public License
     * along with this program; if not, write to the Free Software
     * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
     * MA  02110-1301, USA.
+    *
     */
     /*
     * AUTHORS (In addition to CIT):
     * 2010 {Prodevelop}   {Task}
     */
     package org.gvsig.installer.lib.impl.info;
     import java.io.ByteArrayInputStream;
     import java.io.ByteArrayOutputStream;
     import org.gvsig.installer.lib.api.PackageInfo;
     import org.gvsig.installer.lib.impl.DefaultPackageInfo;
     import org.gvsig.installer.lib.spi.InstallerInfoFileException;
     import org.gvsig.tools.junit.AbstractLibraryAutoInitTestCase;
     import org.gvsig.tools.locator.LocatorException;
     /**
      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera Llodr&aacute;</a>
      */
     public class InstallerInfoFileWriterTest extends AbstractLibraryAutoInitTestCase{
     	@Override
     	protected void doSetUp() throws Exception {
     		// TODO Auto-generated method stub
+    	}
     	public void testWriteFile() throws LocatorException, InstallerInfoFileException {
     		DefaultPackageInfo installerInfo = new DefaultPackageInfo();
     		installerInfo.setCode("org.gvsig.myplugin");
     		installerInfo.setName("My name");
     		installerInfo.setDescription("My description");
     		installerInfo.setVersion("1.0.0");
     		installerInfo.setBuild(4);
     		installerInfo.setState("final");
     		installerInfo.setOfficial(false);
     		installerInfo.setType("plugin");
     		ByteArrayOutputStream out = new ByteArrayOutputStream();
     		InstallerInfoFileWriter installerInfoFileWriter = new InstallerInfoFileWriter();
     		installerInfoFileWriter.write(installerInfo, out);
     		PackageInfo installerInfo2 = new DefaultPackageInfo();
     		InstallerInfoFileReader installerInfoFileReader = new InstallerInfoFileReader();
     		installerInfoFileReader.read(installerInfo2, new ByteArrayInputStream(out.toByteArray()));
     		assertEquals("org.gvsig.myplugin", installerInfo2.getCode());
     		assertEquals("My name", installerInfo2.getName());
     		assertEquals("My description", installerInfo2.getDescription());
     		assertEquals("1.0.0", installerInfo2.getVersion());
     		assertEquals(4, installerInfo2.getBuild());
     		assertEquals("final", installerInfo2.getState());
     		assertEquals(false, installerInfo2.isOfficial());
+    	}
+    }

     /* gvSIG. Geographic Information System of the Valencian Government
+    *
     * Copyright (C) 2007-2008 Infrastructures and Transports Department
     * of the Valencian Government (CIT)
+    *
     * This program is free software; you can redistribute it and/or
     * modify it under the terms of the GNU General Public License
     * as published by the Free Software Foundation; either version 2
     * of the License, or (at your option) any later version.
+    *
     * This program is distributed in the hope that it will be useful,
     * but WITHOUT ANY WARRANTY; without even the implied warranty of
     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     * GNU General Public License for more details.
+    *
     * You should have received a copy of the GNU General Public License
     * along with this program; if not, write to the Free Software
     * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
     * MA  02110-1301, USA.
+    *
     */
     /*
     * AUTHORS (In addition to CIT):
     * 2010 {Prodevelop}   {Task}
     */
     package org.gvsig.installer.lib.impl.info;
     import java.io.FileInputStream;
     import java.io.FileNotFoundException;
     import org.gvsig.installer.lib.impl.DefaultPackageInfo;
     import org.gvsig.installer.lib.spi.InstallerInfoFileException;
     import org.gvsig.tools.junit.AbstractLibraryAutoInitTestCase;
     import org.gvsig.tools.locator.LocatorException;
     /**
      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera Llodr&aacute;</a>
      */
     public class InstallerInfoFileReaderTest extends AbstractLibraryAutoInitTestCase{
     	@Override
     	protected void doSetUp() throws Exception {
     		// TODO Auto-generated method stub
+    	}
     	public void testReadFile() throws LocatorException, InstallerInfoFileException, FileNotFoundException {
     		FileInputStream fis = new FileInputStream(getClass().getClassLoader().getResource("package.info1").getFile());
     		DefaultPackageInfo installerInfo = new DefaultPackageInfo();
     		InstallerInfoFileReader installerInfoFileReader = new InstallerInfoFileReader();
     		installerInfoFileReader.read(installerInfo, fis);
     		assertEquals(installerInfo.getCode(), "org.gvsig.myplugin");
     		assertEquals(installerInfo.getName(), "myplugin");
     		assertEquals(installerInfo.getDescription(), "Test");
     		assertEquals(installerInfo.getVersion(), "1.0.0");
     		assertEquals(installerInfo.getBuild(), 1);
     		assertEquals(installerInfo.getState(), "RC1");
     		assertEquals(installerInfo.isOfficial(), true);
+    	}
+    }

     code=org.gvsig.wcs
     name=myplugin
     description=Test
     version=1.0.0
     build=1
     state=RC1
     oficial=true
     type=plugin

     <project name="org.gvsig.plugin1" default="main" basedir=".">
     	<target name="main" depends="copy_files"/>
         <target name="copy_files">
         	<copy todir="${gvsig_dir}">
         		<fileset dir="./files" includes="**"/>
     		</copy>
     	</target>
     </project>

     code=org.gvsig.wfs
     name=myplugin
     description=Test
     version=1.0.0
     build=1
     state=RC2
     oficial=true
     type=plugin

     code=org.gvsig.myplugin
     name=myplugin
     description=Test
     version=1.0.0
     build=1
     state=RC1
     oficial=true
     type=plugin

     code=org.gvsig.plugin1
     name=myplugin
     description=Test
     version=1.0.0
     build=1
     state=RC2
     oficial=true
     type=plugin

     <project name="org.gvsig.plugin1" default="main" basedir=".">
     	<target name="main" depends="copy_files"/>
         <target name="copy_files">
         	<copy todir="${gvsig_dir}">
         		<fileset dir="./files" includes="**"/>
     		</copy>
     	</target>
     </project>

     code=org.gvsig.plugin2
     name=myplugin
     description=Test
     version=1.0.0
     build=1
     state=RC1
     oficial=true
     type=plugin

     /* gvSIG. Geographic Information System of the Valencian Government
+     *
      * Copyright (C) 2007-2008 Infrastructures and Transports Department
      * of the Valencian Government (CIT)
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
      * MA  02110-1301, USA.
+     *
      */
     /*
      * AUTHORS (In addition to CIT):
      * 2010 {Prodevelop}   {Task}
      */
     package org.gvsig.installer.lib.impl.utils;
     import java.io.ByteArrayInputStream;
     import java.io.ByteArrayOutputStream;
     import java.io.File;
     import java.io.FileOutputStream;
     import java.io.IOException;
     import java.io.InputStream;
     import java.util.ArrayList;
     import java.util.List;
     import java.util.Map;
     import java.util.zip.ZipEntry;
     import java.util.zip.ZipException;
     import java.util.zip.ZipInputStream;
     import org.gvsig.installer.lib.api.PackageInfo;
     import org.gvsig.installer.lib.api.execution.InstallPackageServiceException;
     import org.gvsig.installer.lib.impl.DefaultPackageInfo;
     import org.gvsig.installer.lib.impl.info.InstallerInfoFileReader;
     import org.gvsig.installer.lib.spi.InstallerInfoFileException;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     /**
      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera Llodr&aacute;</a>
      */
     public class Decompress {
     	private static final int OPTION_DECOMPRESS = 1;
     	private static final int OPTION_READ_INSTALLINFO = 2;
     	private static final int OPTION_INSTALL = 3;
     	private int option = 0;
     	private int BUFFER = 2048;
     	private static final Logger logger = LoggerFactory.getLogger(Decompress.class);
     	private List<PackageInfo> readedIinstallerInfos = null;
     	private File outputDirectory = null;
     	private List<PackageInfo> selectedInstallerInfos = null;
     	private Map<PackageInfo, String> zipEntriesMap = null;
     	public Decompress(){
+    	}
     	public void decompressPlugins(InputStream is, File outputDirectory) throws InstallPackageServiceException {
     		option = OPTION_DECOMPRESS;
     		this.outputDirectory = outputDirectory;
     		decompressFolderOfPlugins(is);
+    	}
     	public void readInstallInfo(InputStream is, List<PackageInfo> installerInfos, Map<PackageInfo, String> zipEntriesMap) throws InstallPackageServiceException{
     		option = OPTION_READ_INSTALLINFO;
     		this.readedIinstallerInfos = installerInfos;
     		this.zipEntriesMap = zipEntriesMap;
     		decompressFolderOfPlugins(is);
+    	}
     	public void decompressPlugin(InputStream is, File outputDirectory) throws InstallPackageServiceException {
     		try{
     			option = OPTION_DECOMPRESS;
     			this.outputDirectory = outputDirectory;
     			decompressPlugin(new ZipInputStream(is), "");
     		} catch (Exception e) {
     			throw new InstallPackageServiceException("Error reading the plugin", e);
+    		}
+    	}
     	public InputStream searchPlugin(InputStream is, String zipEntry) throws InstallPackageServiceException{
     		ZipEntry entry = null;
     		try {
     			ZipInputStream zipInputStream = new ZipInputStream(is);
     			while((entry = zipInputStream.getNextEntry()) != null) {
     				if (entry.getName().equals(zipEntry)){
     					return zipInputStream;
+    				}
     				zipInputStream.closeEntry();
+    			}
     			zipInputStream.closeEntry();
     			zipInputStream.close();
     		} catch (Exception e) {
     			throw new InstallPackageServiceException("Error reading the plugin", e);
+    		}
     		return null;
+    	}
     	public void installFromStream(InputStream is, PackageInfo installerInfo) throws InstallPackageServiceException{
     		option = OPTION_INSTALL;
     		this.selectedInstallerInfos = new ArrayList<PackageInfo>();
     		this.selectedInstallerInfos.add(installerInfo);
     		decompressFolderOfPlugins(is);
+    	}
     	public void installFromStream(InputStream is, List<PackageInfo> installerInfos) throws InstallPackageServiceException{
     		option = OPTION_INSTALL;
     		this.selectedInstallerInfos = installerInfos;
     		decompressFolderOfPlugins(is);
+    	}
     	private void decompressFolderOfPlugins(InputStream is) throws InstallPackageServiceException {
     		ZipInputStream zipInputStream = new ZipInputStream(is);
     		ZipEntry entry = null;
     		try {
     			while((entry = zipInputStream.getNextEntry()) != null) {
     				logger.debug("Extracting all Plugins, plugin: " + entry);
     				if (option == OPTION_INSTALL){
     				}else if (option == OPTION_DECOMPRESS){
     					decompressPlugin(new ZipInputStream(zipInputStream), entry.getName());
     				}else if (option == OPTION_READ_INSTALLINFO){
     					readPlugin(new ZipInputStream(zipInputStream), entry.getName());
+    				}
     				zipInputStream.closeEntry();
+    			}
     			zipInputStream.close();
     		} catch (Exception e) {
     			throw new InstallPackageServiceException("Error reading the plugin", e);
+    		}
+    	}
     	private void readPlugin(ZipInputStream zipInputStream, String zipEntryName) throws ZipException, IOException, InstallerInfoFileException{
     		ZipEntry entry = null;
     		int installerInfoNumber = zipEntriesMap.size();

Application: gvSIG desktop

Revision 33175