/ - Diff - Application: gvSIG desktop - gvSIG

             // TODO: move to user preferences or an external configuration file
             String packageDownloadURL =
                 "http://gvsig-desktop.forge.osor.eu/gvSIG-desktop/dists/2.0.0/packages.zip";
                 "http://gvsig-desktop.forge.osor.eu/gvSIG-desktop/dists/2.0.0/packages.gvspki";
             try {
                 SwingInstallerLocator.getSwingInstallerManager()

branches/v2_0_0_prep/extensions/org.gvsig.installer/org.gvsig.installer.main/src/main/java/org/gvsig/installer/main/utils/CreateBoundleFrame.java
183	183	fileNamesArray.add(files[i].getName());
184	184	}
185	185	}
186		compress.compressPlugins(filesArray, fileNamesArray,
	186	compress.compressPluginsAsPackageSet(filesArray, fileNamesArray,
187	187	new FileOutputStream(outputFile));
188	188	} catch (Exception e) {
189	189	JOptionPane.showMessageDialog(this, e.toString());

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/execution/InstallPackageService.java
167	167	* returns <code>null</code> if the package doesn't exist.
168	168	*/
169	169	public PackageInfo getPackageInfo(String packageCode);
	170
170	171	}

         public File getPluginsDirectory();
         /**
          * It creates a bundle with a plugin package inside.
          * It creates a package set with a single plugin package inside.
+         *
          * @param packageInfo
          *            the package that has to be included in the bundle.
          * @param bundleStream
          *            the stream where the the bundle is created.
          *            the information of the plugin that has to be included in the
          *            package set
          * @param packageStream
          *            the stream where the the package set will be created
          * @throws MakePluginPackageServiceException
          *             it is thrown when there is an exception creating the bundle.
          *             it is thrown when there is an exception creating the package
          *             set
          */
         public void createPluginPackage(PackageInfo packageInfo,
             OutputStream bundleStream) throws MakePluginPackageServiceException;
         public void createPackageSet(PackageInfo packageInfo,
             OutputStream packageStream) throws MakePluginPackageServiceException;
         /**
          * It creates a package of a plugin.
+         *
          * @param packageInfo
          *            the information of the plugin that has to be included in the
          *            package
          * @param packageStream
          *            the stream where the the package will be created
          * @throws MakePluginPackageServiceException
          *             it is thrown when there is an exception creating the
          *             package
          */
         public void createPackage(PackageInfo packageInfo,
             OutputStream packageStream) throws MakePluginPackageServiceException;
         /**
          * Writes a package info file with the information provided.
+         *
          * @param packageInfo

         public void setDownloadURL(URL defaultURL);
         /**
          * Returns the package info model version.
+         *
          * @return the package info model version
          */
         public String getModelVersion();
         /**
          * Sets the package info model version.
+         *
          * @param modelVersion
          *            the package info model version
          */
         public void setModelVersion(String modelVersion);
         /**
          * Add an external file that have to be copied in the
          * installation process.
+         *

         /**
          * Fields into the bundle file name message format.
+         *
          * @see InstallerManager#getPackageBundleNameFormat()
          * @see InstallerManager#setPackageBundleNameFormat(String)
          * @see InstallerManager#getPackageSetNameFormat()
          * @see InstallerManager#setPackageSetNameFormat(String)
          */
         public static interface BUNDLE_FILE_NAME_FIELDS {
         public static interface PACKAGE_FILE_NAME_FIELDS {
             static final int GVSIG_VERSION = 0;
             static final int NAME = 1;
-...
+         *
          * @return the package bundle file name format.
          */
         public String getPackageBundleNameFormat();
         public String getPackageSetNameFormat();
         /**
          * Sets the package bundle file name format.
+         *
          * @see InstallerManager#getPackageBundleNameFormat()
          * @see InstallerManager#getPackageSetNameFormat()
          * @param packageBundleNameFormat
          *            the package bundle file name format.
          */
         public void setPackageBundleNameFormat(String packageBundleNameFormat);
         public void setPackageSetNameFormat(String packageBundleNameFormat);
         /**
          * Returns the name of the package bundle file for a given package info.
          * Returns the name of the package set file for a given package info.
+         *
          * @param info
          *            of the plugin
          * @return the name of the package bundle file
          * @return the name of the package set file
          */
         public String getPackageBundleFileName(PackageInfo info);
         public String getPackageSetFileName(PackageInfo info);
         /**
          * Returns the name of the package file for a given package info.
+         *
          * @param info
          *            of the plugin
          * @return the name of the package file
          */
         public String getPackageFileName(PackageInfo info);
         /**
          * It registers a class that implements the service for the installation
          * of a package that is inside a bundle. This class has to implement
          * the {@link InstallPackageService} interface.
-...
          */
         public InstallPackageService getInstallPackageService()
             throws InstallPackageServiceException;
         /**
          * Returns the default extensions of the package files.
+         *
          * @return the default extensions of the package files
          */
         public String getDefaultPackageFileExtension();
         /**
          * Returns the default extensions of the package set files.
+         *
          * @return the default extensions of the package set files
          */
         public String getDefaultPackageSetFileExtension();
+    }

             throws InstallPackageServiceException;
         /**
          * Compress a directory like an zipped outputstream with a concrete name.
          * Compress a folder as a zipped package set in the given outputstream with
          * a concrete name.
+         *
          * @param directory
          *            the directory to compress.
          * @param folder
          *            the folder to compress.
          * @param fileName
          *            name of the zip entry that has the output file.
          *            The name that have to have
-...
          * @throws MakePluginPackageServiceException
          *             if there is any problem compressing.
          */
         public void compress(File directory, String fileName, OutputStream os)
         public void compressPackageSet(File folder, String fileName, OutputStream os)
             throws MakePluginPackageServiceException;
         /**
          * Compress a plugin folder using the plugin's name as a package.
+         *
          * @param folder
          *            the directory to compress.
          * @param os
          *            output stream to write the output.
          * @throws MakePluginPackageServiceException
          *             if there is any problem compressing.
          */
         public void compressPackage(File folder, OutputStream os)
             throws MakePluginPackageServiceException;
         /**
          * Reads the package.info file from a directory a fills the the properties
          * of the {@link PackageInfo} object.
+         *

     import java.io.FileOutputStream;
     import java.io.IOException;
     import java.io.OutputStream;
     import java.net.URL;
     import java.util.Properties;
     import org.gvsig.installer.lib.api.PackageInfo;
-...
                     installInfo.getDescription());
                 properties.setProperty(InstallerInfoTags.VERSION,
                     installInfo.getVersion());
                 properties.setProperty(InstallerInfoTags.BUILD, new Integer(
                     installInfo.getBuild()).toString());
                 properties.setProperty(InstallerInfoTags.BUILD,
                     Integer.toString(installInfo.getBuild()));
                 properties.setProperty(InstallerInfoTags.STATE,
                     installInfo.getState());
                 properties.setProperty(InstallerInfoTags.OFFICIAL, new Boolean(
                     installInfo.isOfficial()).toString());
                 properties.setProperty(InstallerInfoTags.OFFICIAL,
                     Boolean.toString(installInfo.isOfficial()));
                 properties.setProperty(InstallerInfoTags.TYPE,
                     installInfo.getType());
                 properties.setProperty(InstallerInfoTags.OS,
-...
                     installInfo.getJavaVM());
                 properties.setProperty(InstallerInfoTags.GVSIG_VERSION,
                     installInfo.getGvSIGVersion());
                 properties.setProperty(InstallerInfoTags.DOWNLOAD_URL, installInfo
                     .getDownloadURL().toString());
                 URL downloadURL = installInfo.getDownloadURL();
                 if (downloadURL != null) {
                     properties.setProperty(InstallerInfoTags.DOWNLOAD_URL,
                         downloadURL.toString());
+                }
                 properties.setProperty(InstallerInfoTags.MODEL_VERSION,
                     installInfo.getModelVersion());
                 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
45	45	public static final String JVM = "java-version";
46	46	public static final String GVSIG_VERSION = "gvSIG-version";
47	47	public static final String DOWNLOAD_URL = "download-url";
	48	public static final String MODEL_VERSION = "model-version";
48	49	}

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
169	169	}
170	170	installerInfoResource.setDownloadURL(downloadURL);
171	171	}
	172
	173	String modelVersion =
	174	properties.getProperty(InstallerInfoTags.MODEL_VERSION);
	175	if (modelVersion != null) {
	176	installerInfoResource.setModelVersion(modelVersion);
	177	}
172	178	}
173	179
174	180	}

         private URL defaultDownloadURL = null;
         private String modelVersion = "1.0.0";
         public DefaultPackageInfo() {
             super();
             selectedFiles = new ArrayList<File>();
-...
             this.defaultDownloadURL = defaultDownloadURL;
+        }
         public String getModelVersion() {
             return modelVersion;
+        }
         public void setModelVersion(String modelVersion) {
             this.modelVersion = modelVersion;
+        }
+    }

         private ExtensionPointManager extensionPoints = ToolsLocator
             .getExtensionPointManager();
         private String packageBundleNameFormat =
             "gvSIG-desktop-{0}-{1}-{2}-{3,number,#}-{4}-{5}-{6}-{7}.zip";
         private String packageSetNameFormat =
             "gvSIG-desktop-{0}-{1}-{2}-{3,number,#}-{4}-{5}-{6}-{7}.gvspks";
         private String packageNameFormat =
             "gvSIG-desktop-{0}-{1}-{2}-{3,number,#}-{4}-{5}-{6}-{7}.gvspkg";
         public DefaultInstallerManager() {
             super(new DefaultInstallerProviderManager());
+        }
         public String getPackageBundleNameFormat() {
             return packageBundleNameFormat;
         public String getPackageSetNameFormat() {
             return packageSetNameFormat;
+        }
         public void setPackageBundleNameFormat(String packageBundleNameFormat) {
             this.packageBundleNameFormat = packageBundleNameFormat;
         public void setPackageSetNameFormat(String packageSetNameFormat) {
             this.packageSetNameFormat = packageSetNameFormat;
+        }
         public String getPackageNameFormat() {
             return packageNameFormat;
+        }
         public void setPackageNameFormat(String packageNameFormat) {
             this.packageNameFormat = packageNameFormat;
+        }
         public MakePluginPackageService getMakePluginPackageService(
             File pluginsDirectory) throws MakePluginPackageServiceException {
             ExtensionPoint ep =
-...
             return null;
+        }
         public String getPackageBundleFileName(PackageInfo info) {
         public String getPackageSetFileName(PackageInfo info) {
             Object[] parameters = getPackageNameFormatParameters(info);
             return MessageFormat.format(getPackageSetNameFormat(), parameters);
+        }
         public String getPackageFileName(PackageInfo info) {
             Object[] parameters = getPackageNameFormatParameters(info);
             return MessageFormat.format(getPackageNameFormat(), parameters);
+        }
         private Object[] getPackageNameFormatParameters(PackageInfo info) {
             Object[] parameters = new Object[8];
             parameters[BUNDLE_FILE_NAME_FIELDS.GVSIG_VERSION] =
             parameters[PACKAGE_FILE_NAME_FIELDS.GVSIG_VERSION] =
                 info.getGvSIGVersion();
             parameters[BUNDLE_FILE_NAME_FIELDS.NAME] = info.getCode();
             parameters[BUNDLE_FILE_NAME_FIELDS.VERSION] = info.getVersion();
             parameters[BUNDLE_FILE_NAME_FIELDS.BUILD] = info.getBuild();
             parameters[BUNDLE_FILE_NAME_FIELDS.STATE] = info.getState();
             parameters[BUNDLE_FILE_NAME_FIELDS.OS] = info.getOperatingSystem();
             parameters[BUNDLE_FILE_NAME_FIELDS.ARCH] = info.getArchitecture();
             parameters[BUNDLE_FILE_NAME_FIELDS.JVM] = info.getJavaVM();
             return MessageFormat.format(getPackageBundleNameFormat(), parameters);
             parameters[PACKAGE_FILE_NAME_FIELDS.NAME] = info.getCode();
             parameters[PACKAGE_FILE_NAME_FIELDS.VERSION] = info.getVersion();
             parameters[PACKAGE_FILE_NAME_FIELDS.BUILD] = info.getBuild();
             parameters[PACKAGE_FILE_NAME_FIELDS.STATE] = info.getState();
             parameters[PACKAGE_FILE_NAME_FIELDS.OS] = info.getOperatingSystem();
             parameters[PACKAGE_FILE_NAME_FIELDS.ARCH] = info.getArchitecture();
             parameters[PACKAGE_FILE_NAME_FIELDS.JVM] = info.getJavaVM();
             return parameters;
+        }
         public PackageInfo[] getInstalledPackages(File pluginsDirectory)
-...
                 getMakePluginPackageService(pluginsDirectory);
             return service.getInstalledPackages();
+        }
         public String getDefaultPackageFileExtension() {
             return "gvspkg";
+        }
         public String getDefaultPackageSetFileExtension() {
             return "gvspks";
+        }
+    }

             super();
+        }
         public void compressPlugin(File file, String fileName, OutputStream os)
             throws MakePluginPackageServiceException {
         public void compressPluginAsPackageSet(File file, String fileName,
             OutputStream os) throws MakePluginPackageServiceException {
             ArrayList<File> files = new ArrayList<File>();
             ArrayList<String> fileNames = new ArrayList<String>();
             files.add(file);
             fileNames.add(fileName);
             compressPlugins(files, fileNames, os);
             compressPluginsAsPackageSet(files, fileNames, os);
+        }
         public void compressPlugins(File directory, OutputStream os)
         public void compressPluginsAsPackageSet(File directory, OutputStream os)
             throws MakePluginPackageServiceException {
             File[] files = directory.listFiles();
             List<File> filesArray = new ArrayList<File>();
-...
                 filesArray.add(files[i]);
                 fileNamesArray.add(files[i].getName());
+            }
             compressPlugins(filesArray, fileNamesArray, os);
             compressPluginsAsPackageSet(filesArray, fileNamesArray, os);
+        }
         public void compressPlugins(List<File> files, List<String> fileNames,
             OutputStream os) throws MakePluginPackageServiceException {
         public void compressPluginsAsPackageSet(List<File> files,
             List<String> fileNames, OutputStream os)
             throws MakePluginPackageServiceException {
             try {
                 ZipOutputStream zos =
                     new ZipOutputStream(new BufferedOutputStream(os));
                 for (int i = 0; i < files.size(); i++) {
                     File file = files.get(i);
                     int parentFileLenght = file.getParentFile().toString().length();
                     ZipEntry zipEntry = new ZipEntry(fileNames.get(i));
                     zos.putNextEntry(zipEntry);
                     ZipOutputStream zosPlugin = new ZipOutputStream(zos);
                     compressPluginFile(file, parentFileLenght, zosPlugin);
                     zosPlugin.finish();
                     compressPluginFiles(files.get(i), zos);
                     zos.closeEntry();
+                }
                 zos.close();
-...
+            }
+        }
         public void compressPluginAsPackage(File folder, OutputStream os)
             throws MakePluginPackageServiceException {
             ZipOutputStream zos = new ZipOutputStream(os);
             try {
                 ZipEntry zipEntry = new ZipEntry(folder.getName());
                 zos.putNextEntry(zipEntry);
                 compressPluginFiles(folder, zos);
                 zos.closeEntry();
                 zos.flush();
                 zos.close();
             } catch (IOException e) {
                 throw new MakePluginPackageServiceException(
                     "Error compressing the plugin folder: " + folder, e);
+            }
+        }
         private void compressPluginFiles(File fileOrFolder, ZipOutputStream zos)
             throws IOException {
             int parentFileLenght = fileOrFolder.getParentFile().toString().length();
             ZipOutputStream zosPlugin = new ZipOutputStream(zos);
             compressPluginFile(fileOrFolder, parentFileLenght, zosPlugin);
             zosPlugin.finish();
+        }
         private void compressPluginFile(File file, int parenFileLength,
             ZipOutputStream zosPlugin) throws IOException {
             String fileName =

+            }
+        }
         public void compress(File directory, String fileName, OutputStream os)
         public void compressPackageSet(File folder, String fileName,
             OutputStream os)
             throws MakePluginPackageServiceException {
             Compress compress = new Compress();
             compress.compressPlugin(directory, fileName, os);
             compress.compressPluginAsPackageSet(folder, fileName, os);
+        }
         public void compressPackage(File folder, OutputStream os)
             throws MakePluginPackageServiceException {
             Compress compress = new Compress();
             compress.compressPluginAsPackage(folder, os);
+        }
         public void readPackageInfo(File directory, PackageInfo installerInfo)

     import java.io.BufferedInputStream;
     import java.io.File;
     import java.io.FileFilter;
     import java.io.FileInputStream;
     import java.io.FileNotFoundException;
     import java.io.IOException;
-...
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     import org.gvsig.installer.lib.api.InstallerManager;
     import org.gvsig.installer.lib.api.PackageInfo;
     import org.gvsig.installer.lib.api.execution.InstallPackageService;
     import org.gvsig.installer.lib.api.execution.InstallPackageServiceException;
-...
         private Map<PackageInfo, File> packageInfoFileMap = null;
         private Map<PackageInfo, String> zipEntriesMap = null;
         private List<PackageInfo> packageInfos = null;
         private Manager manager;
         private InstallerManager manager;
         private static final Logger logger = LoggerFactory
             .getLogger(DefaultInstallPackageService.class);
         private InstallPackageProviderServices installerProviderServices = null;
-...
+        }
         public void addBundle(URL bundleURL) throws InstallPackageServiceException {
             File bundle = downloadFile(bundleURL, "packages.zip");
             File bundle = downloadFile(bundleURL, "packages.gvspki");
             addBundle(bundle);
+        }
-...
                 throw new InstallPackageServiceException(
                     "The application directory has to be a directory");
+            }
             File[] files = directory.listFiles();
             File[] files = directory.listFiles(new FileFilter() {
                 private String packageExt = manager.getDefaultPackageFileExtension();
                 private String packageSetExt = manager
                     .getDefaultPackageSetFileExtension();
                 public boolean accept(File file) {
                     String name = file.getName().toLowerCase();
                     return name.endsWith(packageExt)
                         || name.endsWith(packageSetExt);
+                }
             });
             for (int i = 0; i < files.length; i++) {
                 if (files[i].isFile()) {
                     addBundle(files[i]);

+            }
+        }
         public void createPluginPackage(PackageInfo packageInfo,
             OutputStream installerStream) throws MakePluginPackageServiceException {
         public void createPackageSet(PackageInfo packageInfo,
             OutputStream packageStream) throws MakePluginPackageServiceException {
             writeAdditionalFiles(packageInfo);
             String pluginFileName = manager.getPackageFileName(packageInfo);
             installerProviderServices.compressPackageSet(
                 getAbsolutePluginPackageDirectory(packageInfo), pluginFileName,
                 packageStream);
+        }
         private void writeAdditionalFiles(PackageInfo packageInfo)
             throws MakePluginPackageServiceException {
             // Write the package.info file
             writePackageInfo(packageInfo);
-...
                 // Copy the selected files
                 writeSelectedFiles(packageInfo);
+            }
+        }
             String pluginFileName = manager.getPackageBundleFileName(packageInfo);
             installerProviderServices.compress(
                 getAbsolutePluginPackageDirectory(packageInfo), pluginFileName,
                 installerStream);
         public void createPackage(PackageInfo packageInfo,
             OutputStream packageStream) throws MakePluginPackageServiceException {
             writeAdditionalFiles(packageInfo);
             installerProviderServices.compressPackage(
                 getAbsolutePluginPackageDirectory(packageInfo), packageStream);
+        }
         private void writePackageInfo(PackageInfo packageInfo)

             // Compress the plugin and create the installer compressed file
             FileOutputStream os = new FileOutputStream(installerFile);
             makePluginPackageService.createPluginPackage(packageInfo, os);
             makePluginPackageService.createPackageSet(packageInfo, os);
             // decompress the plugin and read the plugin information
             InstallPackageService installPackageService =
-...
             // Compress the plugin and create the installer compressed file
             FileOutputStream os = new FileOutputStream(installerFile);
             makePluginPackageService.createPluginPackage(packageInfo, os);
             makePluginPackageService.createPackageSet(packageInfo, os);
             // decompress the plugin and read the plugin information
             InstallPackageService installPackageService =
-...
             // Compress the plugin and create the installer compressed file
             FileOutputStream os = new FileOutputStream(installerFile);
             makePluginPackageService.createPluginPackage(packageInfo, os);
             makePluginPackageService.createPackageSet(packageInfo, os);
             // decompress the plugin and read the plugin information
             InstallPackageService installPackageService =

     /* 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.
+     *
      */
     package org.gvsig.installer.maven;
     import java.io.BufferedOutputStream;
     import java.io.File;
     import java.io.FileNotFoundException;
     import java.io.FileOutputStream;
     import java.io.IOException;
     import org.apache.maven.plugin.AbstractMojo;
     import org.apache.maven.plugin.MojoExecutionException;
     import org.apache.maven.plugin.MojoFailureException;
     import org.apache.maven.plugin.logging.Log;
     import org.gvsig.installer.lib.api.InstallerLocator;
     import org.gvsig.installer.lib.api.InstallerManager;
     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.tools.library.impl.DefaultLibrariesInitializer;
     import org.gvsig.tools.locator.LocatorException;
     /**
      * Maven mojo to launch the gvSIG installer to generate a installation
      * bundle of a gvSIG plugin.
      * <p>
      * Look at the <a href=
      * "http://www.gvsig.org/web/projects/gvsig-desktop/docs/devel/gvsig-devel-guide/2.0.0/anexos/proyectos-oficiales-en-gvsig/nombrado-de-binarios-para-un-plugin-de-gvsig"
      * >gvSIG plugin naming standard</a> for information about installers naming and
      * versioning.
      * </p>
+     *
      * @see InstallerManager
+     *
      * @author gvSIG Team
      * @version $Id$
+     *
      * @goal create-installer
      */
     public class GenerateInstallerMojo extends AbstractMojo {
         /**
          * Location of the gvSIG plugins folder.
+         *
          * @parameter
          * @required
          */
         private File pluginsFolder;
         /**
          * Location of the folder where to create the package bundle file.
+         *
          * @parameter
          * @required
          */
         private File bundleFolder;
         /**
          * Name of the package bundle file. If not provided, the
          * official gvSIG name will be used, as provided by
          * the org.gvsig.installer.lib.api.InstallerManager.
+         *
          * @parameter
          */
         private String bundleFileName;
         /**
          * Plugin project artifactId or code, used as gvSIG plugin name.
+         *
          * @parameter expression="${project.artifactId}"
          * @required
          */
         private String artifactId;
         /**
          * Plugin project packaging, to check it is of jar type.
+         *
          * @parameter expression="${project.packaging}"
          * @required
          */
         private String packaging;
         /**
          * If the mojo execution is disabled. Useful for projects that inherit
          * the maven plugin configuration but don't generate installer.
+         *
          * @parameter
          */
         private boolean disabled = false;
         public void execute() throws MojoExecutionException, MojoFailureException {
             Log log = getLog();
             if (disabled) {
                 log.info("Installer generation disabled.");
                 return;
+            }
             if (!"jar".equals(packaging)) {
                 log.info("Running on a project with packaging of type " + packaging
                     + ". Do nothing, as we only create installers for projects "
                     + "with jar packaging");
                 return;
+            }
             log.info("Generating a installable for the plugin: " + artifactId
                 + " with the following information:");
             log.info("\tgvSIG Plugin's folder: " + pluginsFolder);
             log.info("\tBundle installation file to create: " + bundleFolder);
             File packageBundleFile = null;
             try {
                 new DefaultLibrariesInitializer().fullInitialize();
                 InstallerManager manager = InstallerLocator.getInstallerManager();
                 MakePluginPackageService makePluginService =
                     manager.getMakePluginPackageService(pluginsFolder);
                 // Get and fill the package info data
                 PackageInfo info =
                     makePluginService.getPluginPackageInfo(artifactId);
                 // Create the package bundle file
                 String packageBundleFileName =
                     bundleFileName == null ? manager.getPackageBundleFileName(info)
                         : bundleFileName;
                 if (!bundleFolder.exists()) {
                     bundleFolder.mkdirs();
+                }
                 packageBundleFile = new File(bundleFolder, packageBundleFileName);
                 FileOutputStream fos = new FileOutputStream(packageBundleFile);
                 BufferedOutputStream bos = new BufferedOutputStream(fos);
                 makePluginService.createPluginPackage(info, bos);
                 bos.flush();
                 bos.close();
                 fos.close();
             } catch (LocatorException e) {
                 throw new MojoExecutionException(
                     "Error getting a reference to the InstallerManager", e);
             } catch (MakePluginPackageServiceException e) {
                 throw new MojoExecutionException(
                     "Error getting a MakePluginPackageService for the "
                         + "plugin folder: " + pluginsFolder, e);
             } catch (FileNotFoundException e) {
                 throw new MojoExecutionException(
                     "Error creating the bundle installation file: "
                         + packageBundleFile, e);
             } catch (IOException e) {
                 throw new MojoExecutionException(
                     "I/O error writing the bundle installation file: "
                         + packageBundleFile, e);
+            }
             log.info("Bundle installation file created successfully");
+        }
+    }

     /* 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.
+     *
      */
     package org.gvsig.installer.maven;
     import java.io.OutputStream;
     import org.gvsig.installer.lib.api.InstallerLocator;
     import org.gvsig.installer.lib.api.InstallerManager;
     import org.gvsig.installer.lib.api.PackageInfo;
     import org.gvsig.installer.lib.api.creation.MakePluginPackageService;
     import org.gvsig.installer.lib.api.creation.MakePluginPackageServiceException;
     /**
      * Maven mojo to launch the gvSIG installer to generate a installation
      * bundle of a gvSIG plugin.
      * <p>
      * Look at the <a href=
      * "http://www.gvsig.org/web/projects/gvsig-desktop/docs/devel/gvsig-devel-guide/2.0.0/anexos/proyectos-oficiales-en-gvsig/nombrado-de-binarios-para-un-plugin-de-gvsig"
      * >gvSIG plugin naming standard</a> for information about installers naming and
      * versioning.
      * </p>
+     *
      * @see InstallerManager
+     *
      * @author gvSIG Team
      * @version $Id$
+     *
      * @goal create-package-set
      */
     public class GeneratePluginPackageSetMojo extends AbstractGeneratePackageMojo {
         @Override
         protected void createPackage(MakePluginPackageService makePluginService,
             PackageInfo info, OutputStream os)
             throws MakePluginPackageServiceException {
             makePluginService.createPackageSet(info, os);
+        }
         @Override
         protected String getPackageTypeName() {
             return "Package Set";
+        }
         @Override
         protected String getPackageFileName(PackageInfo info) {
             return InstallerLocator.getInstallerManager().getPackageSetFileName(
                 info);
+        }
+    }

     /* 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.
+     *
      */
     package org.gvsig.installer.maven;
     import java.io.OutputStream;
     import org.gvsig.installer.lib.api.InstallerLocator;
     import org.gvsig.installer.lib.api.InstallerManager;
     import org.gvsig.installer.lib.api.PackageInfo;
     import org.gvsig.installer.lib.api.creation.MakePluginPackageService;
     import org.gvsig.installer.lib.api.creation.MakePluginPackageServiceException;
     /**
      * Maven mojo to launch the gvSIG installer to generate a package of a gvSIG
      * plugin.
      * <p>
      * Look at the <a href=
      * "http://www.gvsig.org/web/projects/gvsig-desktop/docs/devel/gvsig-devel-guide/2.0.0/anexos/proyectos-oficiales-en-gvsig/nombrado-de-binarios-para-un-plugin-de-gvsig"
      * >gvSIG plugin naming standard</a> for information about installers naming and
      * versioning.
      * </p>
+     *
      * @see InstallerManager
+     *
      * @author gvSIG Team
      * @version $Id$
+     *
      * @goal create-package
      */
     public class GeneratePluginPackageMojo extends AbstractGeneratePackageMojo {
         @Override
         protected void createPackage(MakePluginPackageService makePluginService,
             PackageInfo info, OutputStream os)
             throws MakePluginPackageServiceException {
             makePluginService.createPackage(info, os);
+        }
         @Override
         protected String getPackageTypeName() {
             return "Package";
+        }
         @Override
         protected String getPackageFileName(PackageInfo info) {
             return InstallerLocator.getInstallerManager().getPackageFileName(info);
+        }
+    }

     /* 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.
+     *
      */
     package org.gvsig.installer.maven;
     import java.io.BufferedOutputStream;
     import java.io.File;
     import java.io.FileNotFoundException;
     import java.io.FileOutputStream;
     import java.io.IOException;
     import java.io.OutputStream;
     import org.apache.maven.plugin.AbstractMojo;
     import org.apache.maven.plugin.MojoExecutionException;
     import org.apache.maven.plugin.MojoFailureException;
     import org.apache.maven.plugin.logging.Log;
     import org.gvsig.installer.lib.api.InstallerLocator;
     import org.gvsig.installer.lib.api.InstallerManager;
     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.tools.library.impl.DefaultLibrariesInitializer;
     import org.gvsig.tools.locator.LocatorException;
     /**
      * Abstract Maven mojo to launch the gvSIG installer to generate a package of a
      * gvSIG plugin.
      * <p>
      * Look at the <a href=
      * "http://www.gvsig.org/web/projects/gvsig-desktop/docs/devel/gvsig-devel-guide/2.0.0/anexos/proyectos-oficiales-en-gvsig/nombrado-de-binarios-para-un-plugin-de-gvsig"
      * >gvSIG plugin naming standard</a> for information about installers naming and
      * versioning.
      * </p>
+     *
      * @see InstallerManager
+     *
      * @author gvSIG Team
      * @version $Id$
      */
     public abstract class AbstractGeneratePackageMojo extends AbstractMojo {
         /**
          * Location of the gvSIG plugins folder.
+         *
          * @parameter
          * @required
          */
         private File pluginsFolder;
         /**
          * Location of the folder where to create the package file.
+         *
          * @parameter
          * @required
          */
         private File packageFolder;
         /**
          * Name of the package file. If not provided, the
          * official gvSIG name will be used, as provided by
          * the org.gvsig.installer.lib.api.InstallerManager.
+         *
          * @parameter
          */
         private String packageFileName;
         /**
          * Plugin project artifactId or code, used as gvSIG plugin name.
+         *
          * @parameter expression="${project.artifactId}"
          * @required
          */
         private String artifactId;
         /**
          * Plugin project packaging, to check it is of jar type.
+         *
          * @parameter expression="${project.packaging}"
          * @required
          */
         private String packaging;
         /**
          * If the mojo execution is disabled. Useful for projects that inherit
          * the maven plugin configuration but don't generate installer.
+         *
          * @parameter
          */
         private boolean disabled = false;
         public void execute() throws MojoExecutionException, MojoFailureException {
             String packageName;
             MakePluginPackageService makePluginService;
             File packageBundleFile = null;
             Log log = getLog();
             if (disabled) {
                 log.info(getPackageTypeName() + " generation disabled.");
                 return;
+            }
             if (!"jar".equals(packaging)) {
                 log.info("Running on a project with packaging of type " + packaging
                     + ". Do nothing, as we only create installers for projects "
                     + "with jar packaging");
                 return;
+            }
             log.info("Generating a " + getPackageTypeName() + " for the plugin: "
                 + artifactId + " with the following information:");
             log.info("\tgvSIG Plugin's folder: " + pluginsFolder);
             log.info("\tPackage file destination folder: " + packageFolder);
             try {
                 new DefaultLibrariesInitializer().fullInitialize();
                 InstallerManager manager = InstallerLocator.getInstallerManager();
                 makePluginService =
                     manager.getMakePluginPackageService(pluginsFolder);
             } catch (LocatorException e) {
                 throw new MojoExecutionException(
                     "Error getting a reference to the InstallerManager", e);
             } catch (MakePluginPackageServiceException e) {
                 throw new MojoExecutionException(
                     "Error getting a MakePluginPackageService for the "
                         + "plugin folder: " + pluginsFolder, e);
+            }
             // Get and fill the package info data
             PackageInfo info = makePluginService.getPluginPackageInfo(artifactId);
             // Create the package bundle file
             packageName =
                 packageFileName == null ? getPackageFileName(info)
                     : packageFileName;
             if (!packageFolder.exists()) {
                 packageFolder.mkdirs();
+            }
             packageBundleFile = new File(packageFolder, packageName);
             try {
                 FileOutputStream fos = new FileOutputStream(packageBundleFile);
                 BufferedOutputStream bos = new BufferedOutputStream(fos);
                 createPackage(makePluginService, info, bos);
                 bos.flush();
                 bos.close();
                 fos.close();
             } catch (FileNotFoundException e) {
                 throw new MojoExecutionException("Error creating the "
                     + getPackageTypeName() + " file: " + packageBundleFile, e);
             } catch (MakePluginPackageServiceException e) {
                 throw new MojoExecutionException(
                     "Error creating the package file: " + packageName
                         + ", for the plugin: " + artifactId, e);
             } catch (IOException e) {
                 throw new MojoExecutionException("I/O error writing the "
                     + getPackageTypeName() + " file: " + packageBundleFile, e);
+            }
             log.info(getPackageTypeName() + " file created successfully as: "
                 + packageName);
+        }
         /**
          * Returns the name of the package file to create.
+         *
          * @param info
          *            package information
          * @return the name of the file to create
          */
         protected abstract String getPackageFileName(PackageInfo info);
         /**
          * Returns the name of the package type to create.
+         *
          * @return the name of the package type to create
          */
         protected abstract String getPackageTypeName();
         /**
          * Creates the package file into the given {@link OutputStream}.
+         *
          * @param makePluginService
          *            to use to create the package
          * @param info
          *            the information of the package to create
          * @param os
          *            where to create the package file
          * @throws MakePluginPackageServiceException
          *             if there is an error creating the package file
          */
         protected abstract void createPackage(
             MakePluginPackageService makePluginService, PackageInfo info,
             OutputStream os) throws MakePluginPackageServiceException;
+    }

     import javax.swing.JPanel;
     import org.gvsig.installer.lib.api.InstallerManager;
     import org.gvsig.installer.swing.api.creation.MakePluginPackageWizard;
     import org.gvsig.installer.swing.api.creation.MakePluginPackageWizardException;
     import org.gvsig.installer.swing.api.execution.InstallPackageWizard;
-...
          */
         public String getText(String key);
         /**
          * Returns a reference to the {@link InstallerManager}.
+         *
          * @return a reference to the {@link InstallerManager}
          */
         public InstallerManager getInstallerManager();
+    }

             getWizardComponents().getCancelButton().setEnabled(isEnabled);
+        }
         public void setBackButtonEnabled(boolean isEnabled) {
             getWizardComponents().getBackButton().setEnabled(isEnabled);
+        }
         @Override
         public void installFromDefaultDirectory()
             throws InstallPackageServiceException {

     import javax.swing.event.DocumentEvent;
     import javax.swing.event.DocumentListener;
     import org.gvsig.gui.beans.openfile.FileFilter;
     import org.gvsig.gui.beans.openfile.FileTextField;
     import org.gvsig.installer.swing.api.SwingInstallerLocator;
     import org.gvsig.installer.swing.impl.DefaultSwingInstallerManager;
-...
             fileRadioButton = new JRadioButton();
             urlRadioButton = new JRadioButton();
             selectFileText = new FileTextField();
             selectFileText.setFileFilter(new FileFilter() {
                 private String packageExt = swingInstallerManager
                     .getInstallerManager().getDefaultPackageFileExtension();
                 private String packageSetExt = swingInstallerManager
                     .getInstallerManager().getDefaultPackageSetFileExtension();
                 @Override
                 public String getDescription() {
                     return "gvSIG package and package sets (*." + packageExt
                         + ", *." + packageSetExt + ")";
+                }
                 @Override
                 public boolean accept(File file) {
                     if (file.isFile()) {
                         String name = file.getName().toLowerCase();
                         return name.endsWith(packageExt)
                             || name.endsWith(packageSetExt);
+                    }
                     return true;
+                }
                 @Override
                 public String getDefaultExtension() {
                     return packageSetExt;
+                }
             });
             urlText = new JTextField();
             if (defaultDownloadURL != null) {
                 urlText.setText(defaultDownloadURL.toString());

     import java.net.MalformedURLException;
     import java.net.URL;
     import javax.swing.JOptionPane;
     import javax.swing.JPanel;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     import org.gvsig.gui.beans.wizard.panel.NotContinueWizardException;
     import org.gvsig.gui.beans.wizard.panel.OptionPanel;
     import org.gvsig.installer.lib.api.execution.InstallPackageService;
     import org.gvsig.installer.lib.api.execution.InstallPackageServiceException;
-...
             URL defaultDownloadURL) {
             super(defaultDownloadURL);
             this.installerExecutionWizard = installerExecutionWizard;
             updatePanel();
+        }
         public JPanel getJPanel() {
-...
+        }
         public void nextPanel() {
         public void nextPanel() throws NotContinueWizardException {
             InstallPackageService installerExecutionService =
                 installerExecutionWizard.getInstallerExecutionService();
             try {
-...
+                    }
+                }
             } catch (InstallPackageServiceException e) {
                 LOG.error("Error adding installer info", e);
                 JOptionPane.showMessageDialog(installerExecutionWizard,
                     swingInstallerManager.getText("execute_adding_error"));
                 throw new NotContinueWizardException(
                     swingInstallerManager.getText("execute_adding_error"), e, this);
             } catch (MalformedURLException e) {
                 LOG.error("Error adding installer info", e);
                 JOptionPane.showMessageDialog(installerExecutionWizard,
                     swingInstallerManager.getText("execute_adding_error"));
                 throw new NotContinueWizardException(
                     swingInstallerManager.getText("execute_adding_error"), e, this);
+            }
+        }
         public void updatePanel() {
             if (installerExecutionWizard != null) {
                 installerExecutionWizard.setBackButtonEnabled(false);
+            }
+        }
         @Override

             gridBagConstraints.anchor = GridBagConstraints.EAST;
             gridBagConstraints.insets = new Insets(2, 2, 2, 2);
             add(nameLabel, gridBagConstraints);
             gridBagConstraints = new GridBagConstraints();
             gridBagConstraints.gridx = 1;
             gridBagConstraints.gridy = 1;
-...
             gridBagConstraints.insets = new Insets(2, 2, 2, 2);
             add(nameText, gridBagConstraints);
             descriptionLabel.setText(swingInstallerManager.getText("description"));
             gridBagConstraints = new GridBagConstraints();
             gridBagConstraints.gridx = 0;
             gridBagConstraints.gridy = 2;
             gridBagConstraints.anchor = GridBagConstraints.EAST;
             gridBagConstraints.insets = new Insets(2, 2, 2, 2);
             add(descriptionLabel, gridBagConstraints);
             descriptionArea.setColumns(20);
             descriptionArea.setRows(5);
             descriptionScrollPane.setViewportView(descriptionArea);
             gridBagConstraints = new GridBagConstraints();
             gridBagConstraints.gridx = 1;
             gridBagConstraints.gridy = 2;
-...
             gridBagConstraints.insets = new Insets(2, 2, 2, 2);
             add(descriptionScrollPane, gridBagConstraints);
             descriptionLabel.setText(swingInstallerManager.getText("description"));
             gridBagConstraints = new GridBagConstraints();
             gridBagConstraints.gridx = 0;
             gridBagConstraints.gridy = 2;
             gridBagConstraints.anchor = GridBagConstraints.EAST;
             gridBagConstraints.insets = new Insets(2, 2, 2, 2);
             add(descriptionLabel, gridBagConstraints);
             versionLabel.setText(swingInstallerManager.getText("version"));
             gridBagConstraints = new GridBagConstraints();
             gridBagConstraints.gridx = 0;
-...
             gridBagConstraints = new java.awt.GridBagConstraints();
             gridBagConstraints.gridx = 1;
             gridBagConstraints.gridy = 3;
             gridBagConstraints.anchor = GridBagConstraints.WEST;
             gridBagConstraints.fill = GridBagConstraints.HORIZONTAL;
             gridBagConstraints.weightx = 1.0;
             gridBagConstraints.insets = new Insets(2, 2, 2, 2);
             add(versionText, gridBagConstraints);
-...
             gridBagConstraints = new GridBagConstraints();
             gridBagConstraints.gridx = 1;
             gridBagConstraints.gridy = 4;
             gridBagConstraints.anchor = GridBagConstraints.WEST;
             gridBagConstraints.fill = GridBagConstraints.HORIZONTAL;
             gridBagConstraints.weightx = 1.0;
             gridBagConstraints.insets = new Insets(2, 2, 2, 2);
             add(buildText, gridBagConstraints);
-...
             gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
             add(officialLabel, gridBagConstraints);
             gridBagConstraints = new GridBagConstraints();
             gridBagConstraints.gridx = 1;
             gridBagConstraints.gridy = 6;
             gridBagConstraints.anchor = GridBagConstraints.WEST;
             gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
             add(officialCheckBox, gridBagConstraints);
             statusLabel.setText(swingInstallerManager.getText("status"));
             gridBagConstraints = new GridBagConstraints();
             gridBagConstraints.gridx = 0;
-...
             gridBagConstraints.insets = new Insets(2, 2, 2, 2);
             add(statusCombo, gridBagConstraints);
             gridBagConstraints = new GridBagConstraints();
             gridBagConstraints.gridx = 1;
             gridBagConstraints.gridy = 6;
             gridBagConstraints.anchor = GridBagConstraints.WEST;
             gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
             add(officialCheckBox, gridBagConstraints);
             codeLabel.setText(swingInstallerManager.getText("code"));
             gridBagConstraints = new GridBagConstraints();
             gridBagConstraints.anchor = GridBagConstraints.EAST;
             gridBagConstraints.insets = new Insets(2, 2, 2, 2);
             add(codeLabel, gridBagConstraints);
             gridBagConstraints = new GridBagConstraints();
             gridBagConstraints.fill = GridBagConstraints.HORIZONTAL;
             gridBagConstraints.weightx = 1.0;

             try {
                 // Compress the plugin
                 setCompressingText();
                 installerCreationService.createPluginPackage(packageInfo,
                 installerCreationService.createPackageSet(packageInfo,
                     installerCreationWizard.getOutputStream());
                 setProgress(100);

branches/v2_0_0_prep/extensions/org.gvsig.installer/org.gvsig.installer.swing/org.gvsig.installer.swing.impl/src/main/java/org/gvsig/installer/swing/impl/creation/wizard/SelectOutputFileWizard.java
96	96	File installsFolder = installerCreationWizard.getInstallFolder();
97	97	PackageInfo info = installerCreationWizard.getSelectedPackageInfo();
98	98	String fileName =
99		InstallerLocator.getInstallerManager().getPackageBundleFileName(
	99	InstallerLocator.getInstallerManager().getPackageSetFileName(
100	100	info);
101	101	return new File(installsFolder, fileName);

Application: gvSIG desktop

Revision 34005