/ - Diff - Application: gvSIG desktop - gvSIG

     code=org.gvsig.myplugin
     name=myplugin
     description=Test
     version=1.0.0
     build=1
     state=RC1
     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.myplugin2
     name=myplugin
     description=Test
     version=1.0.0
     build=1
     state=RC1
     oficial=true
     type=plugin

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

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

     code=org.gvsig.plugin3
     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.main.utils;
     /**
      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera Llodr&aacute;</a>
      */
     public class CreateBundleLauncher {
     	public static void main(String[] args){
     		new CreateBundleLauncher();
+    	}
     	public CreateBundleLauncher() {
     		super();
     		CreateBoundleFrame createBoundleFrame = new CreateBoundleFrame();
     		createBoundleFrame.setBounds(0, 0, 500, 150);
     		createBoundleFrame.setVisible(true);
+    	}
+    }

     /* 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.main.utils;
     import java.awt.HeadlessException;
     import java.awt.event.ActionEvent;
     import java.awt.event.ActionListener;
     import java.awt.event.WindowEvent;
     import java.awt.event.WindowListener;
     import java.io.File;
     import java.io.FileNotFoundException;
     import java.io.FileOutputStream;
     import java.util.ArrayList;
     import java.util.List;
     import javax.swing.JFrame;
     import javax.swing.JOptionPane;
     import org.gvsig.gui.beans.openfile.FileTextField;
     import org.gvsig.installer.lib.api.creation.MakePluginPackageServiceException;
     import org.gvsig.installer.lib.impl.utils.Compress;
     /**
      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera Llodr&aacute;</a>
      */
     public class CreateBoundleFrame extends JFrame implements WindowListener, ActionListener {
     	private javax.swing.JButton executeButton;
     	private javax.swing.JLabel inputLabel;
     	private FileTextField inputText;
     	private javax.swing.JLabel jLabel2;
     	private FileTextField outputText;
     	public CreateBoundleFrame() throws HeadlessException {
     		super();
     		initializeComponents();
     		this.addWindowListener(this);
     		executeButton.addActionListener(this);
+    	}
     	private void initializeComponents() {
     		java.awt.GridBagConstraints gridBagConstraints;
     		inputLabel = new javax.swing.JLabel();
     		executeButton = new javax.swing.JButton();
     		inputText = new FileTextField();
     		outputText = new FileTextField();
     		jLabel2 = new javax.swing.JLabel();
     		setLayout(new java.awt.GridBagLayout());
     		inputLabel.setText("Input directory");
     		gridBagConstraints = new java.awt.GridBagConstraints();
     		gridBagConstraints.gridx = 0;
     		gridBagConstraints.gridy = 0;
     		gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
     		gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
     		add(inputLabel, gridBagConstraints);
     		executeButton.setText("Execute");
     		gridBagConstraints = new java.awt.GridBagConstraints();
     		gridBagConstraints.gridx = 1;
     		gridBagConstraints.gridy = 2;
     		gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
     		gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
     		add(executeButton, gridBagConstraints);
     		gridBagConstraints = new java.awt.GridBagConstraints();
     		gridBagConstraints.gridx = 1;
     		gridBagConstraints.gridy = 0;
     		gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
     		gridBagConstraints.ipadx = 67;
     		gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
     		gridBagConstraints.weightx = 1.0;
     		gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
     		add(inputText, gridBagConstraints);
     		gridBagConstraints = new java.awt.GridBagConstraints();
     		gridBagConstraints.gridx = 1;
     		gridBagConstraints.gridy = 1;
     		gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
     		gridBagConstraints.ipadx = 67;
     		gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
     		gridBagConstraints.weightx = 1.0;
     		gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
     		add(outputText, gridBagConstraints);
     		jLabel2.setText("Output");
     		gridBagConstraints = new java.awt.GridBagConstraints();
     		gridBagConstraints.gridx = 0;
     		gridBagConstraints.gridy = 1;
     		gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
     		gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
     		add(jLabel2, gridBagConstraints);
+    	}
     	public void windowActivated(WindowEvent arg0) {
     		// TODO Auto-generated method stub
+    	}
     	public void windowClosed(WindowEvent arg0) {
     		System.exit(0);
+    	}
     	public void windowClosing(WindowEvent arg0) {
     		// TODO Auto-generated method stub
+    	}
     	public void windowDeactivated(WindowEvent arg0) {
     		// TODO Auto-generated method stub
+    	}
     	public void windowDeiconified(WindowEvent arg0) {
     		// TODO Auto-generated method stub
+    	}
     	public void windowIconified(WindowEvent arg0) {
     		// TODO Auto-generated method stub
+    	}
     	public void windowOpened(WindowEvent arg0) {
     		// TODO Auto-generated method stub
+    	}
     	public void actionPerformed(ActionEvent arg0) {
     		File inputDirectory = inputText.getSelectedFile();
     		File outputFile = outputText.getSelectedFile();
     		if (!inputDirectory.exists()){
     			JOptionPane.showMessageDialog(this, "Input directory doesn't exist");
     			return;
+    		}
     		if (outputFile.exists()){
     			outputFile.delete();
+    		}
     		Compress compress = new Compress();
     		try {
     			File[] files = inputDirectory.listFiles();
     			List<File> filesArray = new ArrayList<File>();
     			List<String> fileNamesArray = new ArrayList<String>();
     			for (int i=0 ; i<files.length ; i++){
     				if (!files[i].getName().toUpperCase().equals(".SVN")){
     					filesArray.add(files[i]);
     					fileNamesArray.add(files[i].getName());
+    				}
+    			}
     			compress.compressPlugins(filesArray, fileNamesArray, new FileOutputStream(outputFile));
     		} catch (Exception e) {
     			JOptionPane.showMessageDialog(this, e.toString());
+    		}
+    	}
+    }

     /**
      * <p>
      * This manager is used to register and create the services that are used
      * to manage the plugin installers. The services that offers are basically
      * two: the creation of installers service and the execution of installers
      * to manage the creation and the execution of installers. An installer is
      * a file called <b>bundle</b> that is composed of a set <b>packages</b>.
      * </p>
      * <p>
      * A package has some information that is defined by the {@link PackageInfo}
      * class and is composed of a set of attributes. One of these attributes,
      * the type, denotes if the package is a plugin, theme, translation, etc.
      * </p>
      * <p>
      * In practice a bundle is just a compressed zip file that has a compressed zip file
      * for every package to install. The structure of a bundle file with two
      * packages of type plugin could be:
      * </p>
      * <pre>
      * - bundle (compressed file)
      * 		- org.gvsig.plugin1-1_0_0-23 (compressed file)
      * 			- org.gvsig.plugin1
      * 			  	- package.info
      *  	- org.gvsig.plugin2-2_0_1-35 (compressed file)
      *  		- org.gvsig.plugin1
      *  			- package.info
      * </pre>
      * <p>
      * bundle is the compressed file that contains a zip entry for every
      * package to install. The name of the zip entry follows next pattern:
      * </p>
      * <pre>
      * 		[package code]-[version]-[build]
      * </pre>
      * <p>
      * Every zip entry contains a main folder inside that contains all the
      * package files that are used in the installation process. Depending of the
      * type of packages, the information inside this folder can be different,
      * but all the types of packages have to have the <b>package.info</b> that
      * has all the package information. To see the <b>package.info</b> description
      * see {@link PackageInfo}.
      * <p>
      * </p>
      * The services that offers this managers are basically two: the creation of
      * bundles for just one package of type plugin and a service for the
      * installation of packages.
      * service.
      * </p>
+     *

     public class Compress {
     	static final int BUFFER = 2048;
     	private static final Logger logger = LoggerFactory.getLogger(Compress.class);
     	public Compress() {
     		super();
+    	}
-...
     		compressPlugins(files, fileNames, os);
+    	}
     	public void compressPlugins(File directory, OutputStream os) throws MakePluginPackageServiceException{
     		File[] files = directory.listFiles();
     		List<File> filesArray = new ArrayList<File>();
     		List<String> fileNamesArray = new ArrayList<String>();
     		for (int i=0 ; i<files.length ; i++){
     			filesArray.add(files[i]);
     			fileNamesArray.add(files[i].getName());
+    		}
     		compressPlugins(filesArray, fileNamesArray, os);
+    	}
     	public void compressPlugins(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));
     				ZipEntry zipEntry = new ZipEntry(fileNames.get(i));
     				zos.putNextEntry(zipEntry);
     				ZipOutputStream zosPlugin = new ZipOutputStream(zos);
     				compressPluginFile(file, parentFileLenght, zosPlugin);
     				zosPlugin.finish();
     				zos.closeEntry();
     				zos.close();
     				zos.closeEntry();
+    			}
     			zos.close();
     		} catch (Exception e) {
-...
     	private void compressPluginFile(File file, int parenFileLength, ZipOutputStream zosPlugin) throws IOException  {
     		String fileName = file.toString().substring(parenFileLength, file.toString().length());
     		if (file.isDirectory()) {
     			String[] fileNames = file.list();
     			if (fileNames != null) {
     				for (int i=0; i<fileNames.length; i++)  {
     					compressPluginFile(new File(file, fileNames[i]), parenFileLength, zosPlugin);
     			//Remove the subversion folders
     			if (!file.getName().toUpperCase().equals(".SVN")){
     				//Adding the files
     				String[] fileNames = file.list();
     				if (fileNames != null) {
     					for (int i=0; i<fileNames.length; i++)  {
     						compressPluginFile(new File(file, fileNames[i]), parenFileLength, zosPlugin);
+    					}
+    				}
+    			}
     		}else{
     			byte[] buf = new byte[1024];
     			int len;
     			int len;
     			String fileName = file.toString().substring(parenFileLength, file.toString().length());
     			ZipEntry zipEntry = new ZipEntry(fileName);
     			zosPlugin.putNextEntry(zipEntry);
     			FileInputStream fin = new FileInputStream(file);
     			BufferedInputStream in = new BufferedInputStream(fin);
     			while ((len = in.read(buf)) >= 0) {

     		while((entry = zipInputStream.getNextEntry()) != null) {
     			logger.debug("Extracting: " + entry.getName());
     			if (entry.getName().endsWith(File.separator + "install.info")){
     			if (entry.getName().endsWith(File.separator + "package.info")){
     				PackageInfo installerInfo = readInstallInfo(zipInputStream);
     				zipEntriesMap.put(installerInfo, zipEntryName);
     				readedIinstallerInfos.add(installerInfo);
-...
     			if (entry.isDirectory()){
     				file.mkdir();
     			}else{
     				FileOutputStream fos = new FileOutputStream(outputDirectory.getAbsolutePath() + File.separator + entry.getName());
     				createParentFolder(file);
     				FileOutputStream fos = new FileOutputStream(file);
     				while ((count = zipInputStream.read(data, 0, BUFFER)) != -1) {
     					fos.write(data, 0, count);
+    				}
     				fos.flush();
     				fos.close();
+    			}
     			//zipInputStream.closeEntry();
+    			}
+    		}
+    	}
     	private void createParentFolder(File file) {
     		File parentFile = file.getParentFile();
     		if (!parentFile.exists()){
     			createParentFolder(parentFile);
     			parentFile.mkdir();
+    		}
+    	}
     	public boolean delete(File dir) {
     		if (dir.isDirectory()){
     			String[] children = dir.list();

      * @author <a href="mailto:jpiera@gvsig.org">Jorge Piera Llodr&aacute;</a>
      */
     public class DefaultInstallerProviderServices extends AbstractProviderServices implements InstallerProviderServices{
     	private static final String INSTALL_INFO_FILE = "install.info";
     	private static final String INSTALL_INFO_FILE = "package.info";
     	public void decompress(InputStream is, File outputDirectory) throws InstallPackageServiceException {
     		Decompress decompress = new Decompress();

     			}else if (packageInfo.getCode().equals("org.gvsig.plugin2")){
     				assertEquals("RC1", packageInfo.getState());
     				pluginsNumber++;
     			}else if (packageInfo.getCode().equals("org.gvsig.plugin3.zip")){
     			}else if (packageInfo.getCode().equals("org.gvsig.plugin3")){
     				assertEquals("Testing", packageInfo.getState());
     				pluginsNumber++;
+    			}
-...
     	public void testInstallPluginFromExternal() throws InstallPackageServiceException, IOException, LocatorException, MakePluginPackageServiceException{
     		File applicationDirectory = super.getApplicationDirectory();
     		File externalInstallationFile = new File(applicationDirectory.getAbsoluteFile() + File.separator + "install" + File.separator + "installer1.zip");
     		File externalInstallationFile = new File(applicationDirectory.getAbsoluteFile() + File.separator + "install" + File.separator + "bundle1.zip");
     		File pluginsDirectory = super.getPluginsDirectory();
     		InstallPackageService installerExecutionService =

+    	}
     	public void testReadFile() throws LocatorException, InstallerInfoFileException, FileNotFoundException {
     		FileInputStream fis = new FileInputStream(getClass().getClassLoader().getResource("install.info1").getFile());
     		FileInputStream fis = new FileInputStream(getClass().getClassLoader().getResource("package.info1").getFile());
     		DefaultPackageInfo installerInfo = new DefaultPackageInfo();

     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

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

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

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

     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

Application: gvSIG desktop

Revision 32585