Revision 32516

View differences:

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/creation/DefaultInstallerCreationService.java
103 103
	}
104 104

  
105 105

  
106
	private void writeInstallInfo() throws InstallerCreationServiceException{
107
		installerProviderServices.writeInstallInfo(new File(directories.get(getSelectedInstallerInfo())), getSelectedInstallerInfo());
106
	private void writeInstallInfo() throws InstallerCreationServiceException{		
107
		installerProviderServices.writeInstallInfo(getAbsoluteSelectePluginFile(), getSelectedInstallerInfo());
108 108
	}
109 109

  
110 110
	private void writeSelectedFiles() throws InstallerCreationServiceException {
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/utils/Compress.java
64 64
	public void compressPlugins(List<File> files, List<String> fileNames, OutputStream os) throws InstallerCreationServiceException {
65 65
		try{
66 66
			ZipOutputStream zos = new ZipOutputStream(new BufferedOutputStream(os));
67
			byte[] buf = new byte[1024];
68
			int len;
69
			
67
					
70 68
			for (int i=0 ; i<files.size() ; i++){
71 69
				File file = files.get(i);				
72 70
				
73
				int parentFileLenght = file.getParentFile().toString().length();
74
				String pluginName = file.toString().substring(parentFileLenght, file.toString().length());				
71
				int parentFileLenght = file.getParentFile().toString().length();				
75 72
				
76 73
				ZipEntry zipEntry = new ZipEntry(fileNames.get(i));				
77 74
				zos.putNextEntry(zipEntry);								
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/utils/Decompress.java
43 43
import org.gvsig.installer.lib.api.InstallerInfo;
44 44
import org.gvsig.installer.lib.api.execution.InstallerExecutionServiceException;
45 45
import org.gvsig.installer.lib.impl.DefaultInstallerInfo;
46
import org.gvsig.installer.lib.impl.creation.DefaultInstallerCreationService;
47 46
import org.gvsig.installer.lib.impl.info.InstallerInfoFileReader;
48 47
import org.gvsig.installer.lib.spi.InstallerInfoFileException;
49
import org.gvsig.installer.lib.spi.InstallerProviderLocator;
50
import org.gvsig.installer.lib.spi.InstallerProviderManager;
51 48
import org.slf4j.Logger;
52 49
import org.slf4j.LoggerFactory;
53 50

  
......
70 67
	private List<InstallerInfo> selectedInstallerInfos = null;
71 68
	private Map<InstallerInfo, String> zipEntriesMap = null;
72 69

  
73
	private static final InstallerProviderManager installerProviderManager = InstallerProviderLocator.getProviderManager();
74

  
75 70
	public Decompress(){		
76 71

  
77 72
	}
......
160 155
	}
161 156

  
162 157
	private void readPlugin(ZipInputStream zipInputStream, String zipEntryName) throws ZipException, IOException, InstallerInfoFileException{
163
		ZipEntry entry = null;
164
		byte data[] = new byte[BUFFER];		
165
		int count;
158
		ZipEntry entry = null;		
166 159
		int installerInfoNumber = zipEntriesMap.size();
167 160

  
168 161
		while((entry = zipInputStream.getNextEntry()) != null) {			        
......
191 184
		ZipEntry entry = null;
192 185
		byte data[] = new byte[BUFFER];		
193 186
		int count;
194
		int installerInfoNumber = 0;
195

  
196
		if (zipEntriesMap != null){
197
			installerInfoNumber = zipEntriesMap.size();
198
		}
199

  
187
	
200 188
		while((entry = zipInputStream.getNextEntry()) != null) {			        
201 189
			logger.debug("Extracting: " + entry.getName());	
202 190

  
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/DefaultInstallerProviderServices.java
87 87
			throw new InstallerInfoFileException("The directory doesn't exist");
88 88
		}
89 89
		InstallerInfoFileWriter installerInfoFileWriter = new InstallerInfoFileWriter();
90
		installerInfoFileWriter.write(installerInfo, directory);// + File.separator + INSTALL_INFO_FILE);		
90
		installerInfoFileWriter.write(installerInfo, directory + File.separator + INSTALL_INFO_FILE);		
91 91
	}
92 92

  
93 93
	public InputStream searchPlugin(InputStream is, String zipEntry) throws InstallerExecutionServiceException {

Also available in: Unified diff