aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbveliev2011-10-22 06:58:17 (EDT)
committerbveliev2011-10-22 06:58:17 (EDT)
commit12ebd2a405457bd9c856fedc7c172b1b9c63eb90 (patch)
treef1244458cab772005d6202118d25a8f84b3d4842
parent4408a8d869288f6a6996485fcfa5b23d537c361f (diff)
downloadorg.eclipse.rtp-12ebd2a405457bd9c856fedc7c172b1b9c63eb90.zip
org.eclipse.rtp-12ebd2a405457bd9c856fedc7c172b1b9c63eb90.tar.gz
org.eclipse.rtp-12ebd2a405457bd9c856fedc7c172b1b9c63eb90.tar.bz2
NEW - bug 361724: [Configurator] Show progress during install
https://bugs.eclipse.org/bugs/show_bug.cgi?id=361724
-rw-r--r--bundles/org.eclipse.rtp.core.service.provider/build.properties5
-rw-r--r--bundles/org.eclipse.rtp.core.service.provider/src/org/eclipse/rtp/configurator/service/provider/internal/DefaultConfiguratorService.java10
2 files changed, 14 insertions, 1 deletions
diff --git a/bundles/org.eclipse.rtp.core.service.provider/build.properties b/bundles/org.eclipse.rtp.core.service.provider/build.properties
index 4ab6e26..d4dcada 100644
--- a/bundles/org.eclipse.rtp.core.service.provider/build.properties
+++ b/bundles/org.eclipse.rtp.core.service.provider/build.properties
@@ -1,5 +1,8 @@
output.. = bin/
bin.includes = META-INF/,\
.,\
- OSGI-INF/
+ OSGI-INF/,\
+ data/
source.. = src/
+bin.excludes = data/real-sources.json,\
+ data/example-sources.json
diff --git a/bundles/org.eclipse.rtp.core.service.provider/src/org/eclipse/rtp/configurator/service/provider/internal/DefaultConfiguratorService.java b/bundles/org.eclipse.rtp.core.service.provider/src/org/eclipse/rtp/configurator/service/provider/internal/DefaultConfiguratorService.java
index 282ab33..c4933b9 100644
--- a/bundles/org.eclipse.rtp.core.service.provider/src/org/eclipse/rtp/configurator/service/provider/internal/DefaultConfiguratorService.java
+++ b/bundles/org.eclipse.rtp.core.service.provider/src/org/eclipse/rtp/configurator/service/provider/internal/DefaultConfiguratorService.java
@@ -50,8 +50,12 @@ public class DefaultConfiguratorService implements IConfiguratorService {
try {
SourceVersion sourceVersion = getSourceVersions( parameter );
if( sourceVersion != null ) {
+ System.out.println( "Loading repository: " + sourceVersion.getRepositoryUrl() );
loadRepository( sourceVersion );
+ System.out.println( "Repository loaded: " + sourceVersion.getRepositoryUrl() );
+ System.out.println( "Installation started" );
install( sourceVersion );
+ System.out.println( "Installaiton successful" );
result = Status.OK_STATUS;
} else {
System.out.println( "No source found to install" );
@@ -192,15 +196,20 @@ public class DefaultConfiguratorService implements IConfiguratorService {
@Override
public IStatus update( List<String> anyListOf ) {
List<Source> sources = ConfiguratorModelUtil.getSourceProvider().getSources();
+ System.out.println( "Searching for updates" );
List<Source> sourceToUpdate = searchSources( anyListOf, sources );
+ System.out.println( "Update started" );
IStatus result = updateSources( sourceToUpdate );
+ System.out.println( "Update successful" );
return result;
}
@Override
public IStatus updateWorld() {
List<Source> sources = ConfiguratorModelUtil.getSourceProvider().getSources();
+ System.out.println( "Update started" );
IStatus result = updateSources( sources );
+ System.out.println( "Update successful" );
return result;
}
@@ -212,6 +221,7 @@ public class DefaultConfiguratorService implements IConfiguratorService {
Collections.sort( versions, getSourceVersionComparator() );
SourceVersion latestSourceVersion = versions.get( 0 );
if( !featureManager.isInstalled( latestSourceVersion ) ) {
+ System.out.println( "Updating feature: " + source.getName() );
updateStatusList.addAll( uninstall( featureManager, versions ) );
List<String> parameters = getInstallParameters( source, latestSourceVersion );
updateStatusList.add( install( parameters ) );