Revision 34005 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/execution/DefaultInstallPackageService.java
| DefaultInstallPackageService.java | ||
|---|---|---|
| 29 | 29 |
|
| 30 | 30 |
import java.io.BufferedInputStream; |
| 31 | 31 |
import java.io.File; |
| 32 |
import java.io.FileFilter; |
|
| 32 | 33 |
import java.io.FileInputStream; |
| 33 | 34 |
import java.io.FileNotFoundException; |
| 34 | 35 |
import java.io.IOException; |
| ... | ... | |
| 42 | 43 |
import org.slf4j.Logger; |
| 43 | 44 |
import org.slf4j.LoggerFactory; |
| 44 | 45 |
|
| 46 |
import org.gvsig.installer.lib.api.InstallerManager; |
|
| 45 | 47 |
import org.gvsig.installer.lib.api.PackageInfo; |
| 46 | 48 |
import org.gvsig.installer.lib.api.execution.InstallPackageService; |
| 47 | 49 |
import org.gvsig.installer.lib.api.execution.InstallPackageServiceException; |
| ... | ... | |
| 61 | 63 |
private Map<PackageInfo, File> packageInfoFileMap = null; |
| 62 | 64 |
private Map<PackageInfo, String> zipEntriesMap = null; |
| 63 | 65 |
private List<PackageInfo> packageInfos = null; |
| 64 |
private Manager manager; |
|
| 66 |
private InstallerManager manager;
|
|
| 65 | 67 |
private static final Logger logger = LoggerFactory |
| 66 | 68 |
.getLogger(DefaultInstallPackageService.class); |
| 67 | 69 |
private InstallPackageProviderServices installerProviderServices = null; |
| ... | ... | |
| 185 | 187 |
} |
| 186 | 188 |
|
| 187 | 189 |
public void addBundle(URL bundleURL) throws InstallPackageServiceException {
|
| 188 |
File bundle = downloadFile(bundleURL, "packages.zip");
|
|
| 190 |
File bundle = downloadFile(bundleURL, "packages.gvspki");
|
|
| 189 | 191 |
addBundle(bundle); |
| 190 | 192 |
} |
| 191 | 193 |
|
| ... | ... | |
| 207 | 209 |
throw new InstallPackageServiceException( |
| 208 | 210 |
"The application directory has to be a directory"); |
| 209 | 211 |
} |
| 210 |
File[] files = directory.listFiles(); |
|
| 212 |
File[] files = directory.listFiles(new FileFilter() {
|
|
| 213 |
|
|
| 214 |
private String packageExt = manager.getDefaultPackageFileExtension(); |
|
| 215 |
private String packageSetExt = manager |
|
| 216 |
.getDefaultPackageSetFileExtension(); |
|
| 217 |
|
|
| 218 |
public boolean accept(File file) {
|
|
| 219 |
String name = file.getName().toLowerCase(); |
|
| 220 |
return name.endsWith(packageExt) |
|
| 221 |
|| name.endsWith(packageSetExt); |
|
| 222 |
} |
|
| 223 |
}); |
|
| 211 | 224 |
for (int i = 0; i < files.length; i++) {
|
| 212 | 225 |
if (files[i].isFile()) {
|
| 213 | 226 |
addBundle(files[i]); |
Also available in: Unified diff