/ - Diff - Application: gvSIG desktop - gvSIG

Revision 37489

branches/v2_0_0_prep/extensions/org.gvsig.installer.app/org.gvsig.installer.app.extension/src/main/resources/defaultDownloadsURLs
1		http://dl.dropbox.com/u/50540894/gvSIG-desktop/dists/<%Version%>/packages.gvspki
2		http://gvsig.freegis.ru/download/gvsig-desktop/dists/<%Version%>/packages.gvspki
3		http://gvsig-desktop.forge.osor.eu/gvSIG-desktop/dists/<%Version%>/packages.gvspki
4		http://ubuntuone.com/6eZyYCSAiUzBPBH4imhug6
	1	http://dl.dropbox.com/u/50540894/gvSIG-desktop
	2	http://gvsig.freegis.ru/download/gvsig-desktop
	3	http://gvsig-desktop.forge.osor.eu/gvSIG-desktop

branches/v2_0_0_prep/extensions/org.gvsig.installer.app/org.gvsig.installer.app.extension/src/main/java/org/gvsig/installer/app/extension/execution/InstallPackageExtension.java
97	97	+ line, e);
98	98	}
99	99	}
	100	manager.getInstallerManager().setVersion(version.getFormat());
100	101	} catch (Throwable e) {
101	102	LOG.error("Error reading the default packages download URL file "
102	103	+ "/defaultDownloadsURLs", e);

          * @return the package bundle download {@link URL}
          */
         public URL getDownloadURL();
     //    /**
     //     * Returns the package bundle download {@link URL}.
     //     *
     //     * May be null if there is no remote URL to download the bundle.
     //     *
     //     * @return the package bundle download {@link URL}
     //     */
         public URL getDownloadURL(URL baseURL);
         /**
          * Sets the package bundle download {@link URL}. Optional.
-...
          *            the package bundle download {@link URL}
          */
         public void setDownloadURL(URL defaultURL);
         /**
          * Returns the package info model version.
+         *

     package org.gvsig.installer.lib.api;
     import java.io.File;
     import java.net.URL;
     import java.text.MessageFormat;
     import org.gvsig.installer.lib.api.creation.MakePackageService;
-...
         public PackageInfoReader getDefaultPackageInfoReader();
         public MakePackageService createMakePackage(File packageFolder, PackageInfo packageInfo);
         public void setDownloadBaseURL(URL url);
         public URL getDownloadBaseURL();
         public void setVersion(String version);
         public String getVersion();
+    }

     import java.io.File;
     import java.io.IOException;
     import java.net.MalformedURLException;
     import java.net.URL;
     import java.util.ArrayList;
     import java.util.List;
     import org.gvsig.installer.lib.api.Dependencies;
     import org.gvsig.installer.lib.api.PackageInfo;
     import org.gvsig.installer.lib.api.Version;
     import org.gvsig.installer.lib.api.InstallerManager.ARCH;
     import org.gvsig.installer.lib.api.InstallerManager.JVM;
     import org.gvsig.installer.lib.api.InstallerManager.OS;
     import org.gvsig.installer.lib.api.InstallerManager.STATE;
     import org.gvsig.installer.lib.api.PackageInfo;
     import org.gvsig.installer.lib.api.Version;
     import org.gvsig.installer.lib.api.execution.InstallPackageServiceException;
     import org.gvsig.installer.lib.impl.info.InstallerInfoTags;
     import org.gvsig.installer.lib.impl.utils.DeleteFile;
-...
         public URL getDownloadURL() {
             return defaultDownloadURL;
+        }
         public URL getDownloadURL(URL baseURL) {
             String URLString = baseURL.toString();
             if (!URLString.endsWith("/")) {
                 URLString += "/";
+            }
             URLString += ("dists/" + getGvSIGVersion() + "/" + "packages.gvspki");
             try {
                 return new URL(URLString);
             } catch (MalformedURLException e) {
                 // TODO Auto-generated catch block
                 e.printStackTrace();
                 return null;
+            }
+        }
         public void setDownloadURL(URL defaultDownloadURL) {
             this.defaultDownloadURL = defaultDownloadURL;
+        }
         public String getModelVersion() {
             return modelVersion;
+        }

     package org.gvsig.installer.lib.impl;
     import java.io.File;
     import java.net.URL;
     import java.text.MessageFormat;
     import org.gvsig.installer.lib.api.DependenciesCalculator;
-...
      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera Llodr&aacute;</a>
      */
     public class DefaultInstallerManager extends AbstractManager implements
     		InstallerManager {
         InstallerManager {
     	private static final String INSTALLER_MANAGER_EXTENSION_POINT = "InstallerManagerExtensionPoint";
     	private static final String INSTALLER_CREATION_SERVICE_NAME = "InstallerCreationService";
     	private static final String INSTALLER_EXECUTION_SERVICE_NAME = "InstallerExecutionService";
     	private ExtensionPointManager extensionPoints = ToolsLocator
     			.getExtensionPointManager();
         private static final String INSTALLER_MANAGER_EXTENSION_POINT =
             "InstallerManagerExtensionPoint";
         private static final String INSTALLER_CREATION_SERVICE_NAME =
             "InstallerCreationService";
         private static final String INSTALLER_EXECUTION_SERVICE_NAME =
             "InstallerExecutionService";
         private ExtensionPointManager extensionPoints =
             ToolsLocator.getExtensionPointManager();
         private String packageSetNameFormat =
             "gvSIG-desktop-{0}-{1}-{2}-{4}-{5}-{6}-{7}.gvspks";
-...
         private String packageIndexNameFormat =
             "gvSIG-desktop-{0}-{1}-{2}-{4}-{5}-{6}-{7}.gvspki";
     	public DefaultInstallerManager() {
     		super(new DefaultInstallerProviderManager());
+    	}
         private URL BaseDownloadURL = null;
         private String version = null;
     	public String getPackageSetNameFormat() {
     		return packageSetNameFormat;
+    	}
         public DefaultInstallerManager() {
             super(new DefaultInstallerProviderManager());
+        }
     	public void setPackageSetNameFormat(String packageSetNameFormat) {
     		this.packageSetNameFormat = packageSetNameFormat;
+    	}
         public String getPackageSetNameFormat() {
             return packageSetNameFormat;
+        }
     	public String getPackageNameFormat() {
     		return packageNameFormat;
+    	}
         public void setPackageSetNameFormat(String packageSetNameFormat) {
             this.packageSetNameFormat = packageSetNameFormat;
+        }
     	public void setPackageNameFormat(String packageNameFormat) {
     		this.packageNameFormat = packageNameFormat;
+    	}
         public String getPackageNameFormat() {
             return packageNameFormat;
+        }
         public void setPackageNameFormat(String packageNameFormat) {
             this.packageNameFormat = packageNameFormat;
+        }
         public String getPackageIndexNameFormat() {
             return packageIndexNameFormat;
+        }
-...
+        }
         public MakePluginPackageService getMakePluginPackageService(
     			File pluginsDirectory) throws MakePluginPackageServiceException {
     		ExtensionPoint ep = extensionPoints
     				.add(INSTALLER_MANAGER_EXTENSION_POINT);
     		try {
     			Object[] args = new Object[] { this, pluginsDirectory };
     			return (MakePluginPackageService) ep.create(
     					INSTALLER_CREATION_SERVICE_NAME, args);
     		} catch (Exception e) {
     			throw new MakePluginPackageServiceException(
     					"Exception creating the installer service to create installers",
     					e);
+    		}
+    	}
             File pluginsDirectory) throws MakePluginPackageServiceException {
             ExtensionPoint ep =
                 extensionPoints.add(INSTALLER_MANAGER_EXTENSION_POINT);
             try {
                 Object[] args = new Object[] { this, pluginsDirectory };
                 return (MakePluginPackageService) ep.create(
                     INSTALLER_CREATION_SERVICE_NAME, args);
             } catch (Exception e) {
                 throw new MakePluginPackageServiceException(
                     "Exception creating the installer service to create installers",
                     e);
+            }
+        }
         public class InstallerCreationException extends
             InstallPackageServiceException {
-...
+        }
     	public InstallPackageService getInstallPackageService()
     			throws InstallPackageServiceException {
     		ExtensionPoint ep = extensionPoints
     				.add(INSTALLER_MANAGER_EXTENSION_POINT);
     		try {
     			Object[] args = new Object[1];
     			args[0] = this;
     			return (InstallPackageService) ep.create(
     					INSTALLER_EXECUTION_SERVICE_NAME, args);
     		} catch (Exception e) {
     			throw new InstallerCreationException(e);
+    		}
+    	}
         public InstallPackageService getInstallPackageService()
             throws InstallPackageServiceException {
             ExtensionPoint ep =
                 extensionPoints.add(INSTALLER_MANAGER_EXTENSION_POINT);
             try {
                 Object[] args = new Object[1];
                 args[0] = this;
                 return (InstallPackageService) ep.create(
                     INSTALLER_EXECUTION_SERVICE_NAME, args);
             } catch (Exception e) {
                 throw new InstallerCreationException(e);
+            }
+        }
     	public void registerMakePluginPackageService(
     			Class<? extends MakePluginPackageService> clazz) {
     		ExtensionPoint extensionPoint = extensionPoints.add(
     				INSTALLER_MANAGER_EXTENSION_POINT, "");
     		extensionPoint.append(INSTALLER_CREATION_SERVICE_NAME, "", clazz);
+    	}
         public void registerMakePluginPackageService(
             Class<? extends MakePluginPackageService> clazz) {
             ExtensionPoint extensionPoint =
                 extensionPoints.add(INSTALLER_MANAGER_EXTENSION_POINT, "");
             extensionPoint.append(INSTALLER_CREATION_SERVICE_NAME, "", clazz);
+        }
     	public void registerInstallPackageService(
     			Class<? extends InstallPackageService> clazz) {
     		ExtensionPoint extensionPoint = extensionPoints.add(
     				INSTALLER_MANAGER_EXTENSION_POINT, "");
     		extensionPoint.append(INSTALLER_EXECUTION_SERVICE_NAME, "", clazz);
+    	}
         public void registerInstallPackageService(
             Class<? extends InstallPackageService> clazz) {
             ExtensionPoint extensionPoint =
                 extensionPoints.add(INSTALLER_MANAGER_EXTENSION_POINT, "");
             extensionPoint.append(INSTALLER_EXECUTION_SERVICE_NAME, "", clazz);
+        }
     	public Service getService(DynObject parameters) throws ServiceException {
     		return null;
+    	}
         public Service getService(DynObject parameters) throws ServiceException {
             return null;
+        }
     	public String getPackageSetFileName(PackageInfo info) {
     		Object[] parameters = getPackageNameFormatParameters(info);
     		return MessageFormat.format(getPackageSetNameFormat(), parameters);
+    	}
         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);
+    	}
         public String getPackageFileName(PackageInfo info) {
             Object[] parameters = getPackageNameFormatParameters(info);
             return MessageFormat.format(getPackageNameFormat(), parameters);
+        }
         public String getPackageIndexFileName(PackageInfo info) {
             Object[] parameters = getPackageNameFormatParameters(info);
             return MessageFormat.format(getPackageIndexNameFormat(), parameters);
+        }
     	private Object[] getPackageNameFormatParameters(PackageInfo info) {
     		Object[] parameters = new Object[8];
     		parameters[PACKAGE_FILE_NAME_FIELDS.GVSIG_VERSION] = info
     				.getGvSIGVersion();
     		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;
+    	}
         private Object[] getPackageNameFormatParameters(PackageInfo info) {
             Object[] parameters = new Object[8];
             parameters[PACKAGE_FILE_NAME_FIELDS.GVSIG_VERSION] =
                 info.getGvSIGVersion();
             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)
     			throws MakePluginPackageServiceException {
     		MakePluginPackageService service = getMakePluginPackageService(pluginsDirectory);
     		return service.getInstalledPackages();
+    	}
         public PackageInfo[] getInstalledPackages(File pluginsDirectory)
             throws MakePluginPackageServiceException {
             MakePluginPackageService service =
                 getMakePluginPackageService(pluginsDirectory);
             return service.getInstalledPackages();
+        }
     	public String getDefaultPackageFileExtension() {
     		return "gvspkg";
+    	}
         public String getDefaultPackageFileExtension() {
             return "gvspkg";
+        }
     	public String getDefaultPackageSetFileExtension() {
     		return "gvspks";
+    	}
         public String getDefaultPackageSetFileExtension() {
             return "gvspks";
+        }
     	public String getOperatingSystem() {
     		String osname = System.getProperty("os.name");
     		if( osname.toLowerCase().startsWith("linux") ) {
     			return InstallerManager.OS.LINUX;
+    		}
     		if( osname.toLowerCase().startsWith("window") ) {
     			return InstallerManager.OS.WINDOWS;
+    		}
     		return osname;
+    	}
     	public String getArchitecture() {
     		String osarch = System.getProperty("os.arch");
     		if( osarch.toLowerCase().startsWith("i386") ) {
     			return InstallerManager.ARCH.X86;
+    		}
     		if( osarch.toLowerCase().startsWith("x86") ) {
     			return InstallerManager.ARCH.X86;
+    		}
     		if( osarch.toLowerCase().startsWith("amd64") ) {
     			return InstallerManager.ARCH.X86_64;
+    		}
     		return osarch;
+    	}
         public String getOperatingSystem() {
             String osname = System.getProperty("os.name");
             if (osname.toLowerCase().startsWith("linux")) {
                 return InstallerManager.OS.LINUX;
+            }
             if (osname.toLowerCase().startsWith("window")) {
                 return InstallerManager.OS.WINDOWS;
+            }
             return osname;
+        }
     	public Dependency createDependency(PackageInfo packageInfo) {
     		return new DefaultDependency(packageInfo);
+    	}
         public String getArchitecture() {
             String osarch = System.getProperty("os.arch");
             if (osarch.toLowerCase().startsWith("i386")) {
                 return InstallerManager.ARCH.X86;
+            }
             if (osarch.toLowerCase().startsWith("x86")) {
                 return InstallerManager.ARCH.X86;
+            }
             if (osarch.toLowerCase().startsWith("amd64")) {
                 return InstallerManager.ARCH.X86_64;
+            }
             return osarch;
+        }
     	public Dependency createDependency() {
     		return new DefaultDependency();
+    	}
         public Dependency createDependency(PackageInfo packageInfo) {
             return new DefaultDependency(packageInfo);
+        }
     	public DependenciesCalculator createDependenciesCalculator(InstallPackageService installService) {
     		return new DefaultDependenciesCalculator(installService);
+    	}
         public Dependency createDependency() {
             return new DefaultDependency();
+        }
     	public Version createVersion() {
     		return new DefaultVersion();
+    	}
     	public PackageInfoReader getDefaultPackageInfoReader() {
     	    return new InstallerInfoFileReader();
+    	}
     	public PackageInfoWriter getDefaultPackageInfoWriter() {
     	    return new InstallerInfoFileWriter();
+    	}
     	public MakePackageService createMakePackage(File packageFolder,
     	    PackageInfo packageInfo) {
     	    return new DefaultMakePackageService(this, packageFolder, packageInfo);
+    	}
     	public PackageInfo createPackageInfo() {
     	    return new DefaultPackageInfo();
+    	}
         public DependenciesCalculator createDependenciesCalculator(
             InstallPackageService installService) {
             return new DefaultDependenciesCalculator(installService);
+        }
         public Version createVersion() {
             return new DefaultVersion();
+        }
         public PackageInfoReader getDefaultPackageInfoReader() {
             return new InstallerInfoFileReader();
+        }
         public PackageInfoWriter getDefaultPackageInfoWriter() {
             return new InstallerInfoFileWriter();
+        }
         public MakePackageService createMakePackage(File packageFolder,
             PackageInfo packageInfo) {
             return new DefaultMakePackageService(this, packageFolder, packageInfo);
+        }
         public PackageInfo createPackageInfo() {
             return new DefaultPackageInfo();
+        }
         public URL getDownloadBaseURL() {
             return this.BaseDownloadURL;
+        }
         public String getVersion() {
             return this.version;
+        }
         public void setDownloadBaseURL(URL url) {
             this.BaseDownloadURL = url;
+        }
         public void setVersion(String version) {
             this.version = version;
+        }
+    }

     import java.io.FileNotFoundException;
     import java.io.IOException;
     import java.io.InputStream;
     import java.net.MalformedURLException;
     import java.net.URL;
     import java.util.ArrayList;
     import java.util.HashMap;
-...
                 .endsWith(manager.getDefaultPackageFileExtension());
+        }
     //    public void addBundle(URL bundleURL) throws InstallPackageServiceException {
     //        File bundle = downloadFile(bundleURL, "packages.gvspki");
     //        addBundle(bundle);
     //    }
         public void addBundle(URL bundleURL) throws InstallPackageServiceException {
             File bundle = downloadFile(bundleURL, "packages.gvspki");
             addBundle(bundle);
             String packageFileName = "packages.gvspki";
             File bundle;
             if (bundleURL.toString().endsWith(packageFileName)) {
                 bundle = downloadFile(bundleURL, packageFileName);
                 addBundle(bundle);
             } else {
                 manager.setDownloadBaseURL(bundleURL);
                 String urlString = bundleURL.toString();
                 if (!urlString.endsWith("/")) {
                     urlString += "/";
+                }
                 urlString +=
                     ("dists/" + manager.getVersion() + "/" + packageFileName);
                 URL completeURL;
                 try {
                     completeURL = new URL(urlString);
                 } catch (MalformedURLException e) {
                     // TODO Auto-generated catch block
                     e.printStackTrace();
                     return;
+                }
                 bundle = downloadFile(completeURL, packageFileName);
                 addBundle(bundle);
+            }
+        }
         private File downloadFile(URL bundleURL, String defaultFileName)

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/execution/panel/SelectBundlesPanel.java
202	202	}
203	203
204	204	protected URL getSelectedURL() throws MalformedURLException {
205		return (URL)downloadURL.getSelectedItem();
	205	if (downloadURL.getSelectedItem() instanceof URL) {
	206	return (URL)downloadURL.getSelectedItem();
	207	}
	208	return new URL(downloadURL.getSelectedItem().toString());
	209
206	210	}
207	211
208	212	protected boolean isStandardSelected() {

          */
         private void doInstall(String[] args) throws Exception {
             String installURL = null;
             if (args.length >= 4) {
             String gvSIGVersion = null;
             if (args.length >= 5) {
                 String installURLParam = args[3];
                 if (installURLParam.startsWith("--installURL=")) {
                     installURL =
                         installURLParam.substring("--installURL=".length());
+                }
                 String gvSIGVersionParam = args[4];
                 if (gvSIGVersionParam.startsWith("--installVersion=")) {
                     gvSIGVersion =
                         gvSIGVersionParam.substring("--installVersion=".length());
+                }
+            }
             if (args.length < 3) {
-...
             // default packages will be selected.
             installPackageWizard.setSelectDefaultPackages(true);
             // set the gvSIG version to the install manager, to compose the download
             // URL:
             InstallerLocator.getInstallerManager().setVersion(gvSIGVersion);
             // 1. Create the frame.
             JFrame frame = new JFrame(Messages.get("gvsig_package_installer"));

Also available in: Unified diff