Revision 38190
| 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 | ||
|---|---|---|
| 71 | 71 |
|
| 72 | 72 |
private static final Logger LOG = LoggerFactory |
| 73 | 73 |
.getLogger(DefaultInstallPackageService.class); |
| 74 |
|
|
| 75 |
private static final String PACKAGE_FILE_NAME = "packages.gvspki"; |
|
| 74 | 76 |
|
| 75 | 77 |
private Map<PackageInfo, File> packageInfoFileMap = null; |
| 76 | 78 |
private Map<PackageInfo, String> zipEntriesMap = null; |
| ... | ... | |
| 409 | 411 |
.endsWith(manager.getDefaultPackageFileExtension()); |
| 410 | 412 |
} |
| 411 | 413 |
|
| 412 |
// public void addBundle(URL bundleURL) throws |
|
| 413 |
// InstallPackageServiceException {
|
|
| 414 |
// File bundle = downloadFile(bundleURL, "packages.gvspki"); |
|
| 415 |
// addBundle(bundle); |
|
| 416 |
// } |
|
| 417 |
|
|
| 418 | 414 |
public void addBundle(URL bundleURL) throws InstallPackageServiceException {
|
| 419 |
String packageFileName = "packages.gvspki"; |
|
| 420 | 415 |
File bundle; |
| 421 |
if (bundleURL.toString().endsWith(packageFileName)) {
|
|
| 416 |
if (bundleURL.toString().endsWith(PACKAGE_FILE_NAME)) {
|
|
| 422 | 417 |
manager.setDownloadBaseURL(bundleURL); |
| 423 |
bundle = downloadFile(bundleURL, packageFileName);
|
|
| 418 |
bundle = downloadFile(bundleURL, PACKAGE_FILE_NAME);
|
|
| 424 | 419 |
addBundle(bundle); |
| 425 | 420 |
} else {
|
| 426 | 421 |
String urlString = bundleURL.toString(); |
| 427 | 422 |
if (!urlString.endsWith("/")) {
|
| 428 | 423 |
urlString += "/"; |
| 429 | 424 |
} |
| 430 |
urlString += ("dists/" + manager.getVersion() + "/" + packageFileName);
|
|
| 425 |
urlString += ("dists/" + manager.getVersion() + "/" + PACKAGE_FILE_NAME);
|
|
| 431 | 426 |
|
| 432 | 427 |
URL completeURL; |
| 433 | 428 |
try {
|
| ... | ... | |
| 439 | 434 |
} |
| 440 | 435 |
|
| 441 | 436 |
manager.setDownloadBaseURL(completeURL); |
| 442 |
bundle = downloadFile(completeURL, packageFileName);
|
|
| 437 |
bundle = downloadFile(completeURL, PACKAGE_FILE_NAME);
|
|
| 443 | 438 |
addBundle(bundle); |
| 444 | 439 |
} |
| 445 | 440 |
|
Also available in: Unified diff