Revision 42685 trunk/org.gvsig.desktop/org.gvsig.desktop.framework/org.gvsig.andami/src/main/java/org/gvsig/andami/Launcher.java

View differences:

Launcher.java
3636 3636
            if (line.hasOption("installURLFile")) {
3637 3637
                installURLFile = line.getOptionValue("installURLFile");
3638 3638
            } else {
3639
                installURLFile = myArgs[1] + "/org.gvsig.installer.app.mainplugin/defaultDownloadsURLs";
3639
                installURLFile = "gvsig-installer-urls.config";
3640 3640
            }
3641 3641

  
3642 3642
            if (!hasAllMandatoryOptions) {
......
3662 3662
        initializeInstallerManager();
3663 3663

  
3664 3664
        InstallerManager installerManager = InstallerLocator.getInstallerManager();
3665
        
3666
//        try {
3667
//            logger.info("Loading plugins configurations");
3668
//            this.loadPluginConfigs();
3669
//        } catch (Throwable ex) {
3670
//            logger.warn("Can't load plugins configurations", ex);
3671
//        }
3672
//
3673
//        try {
3674
//            logger.info("Loading plugins");
3675
//            this.loadPluginServices();
3676
//        } catch (Throwable ex) {
3677
//            logger.warn("Can't load plugins", ex);
3678
//        }
3665 3679

  
3666
        try {
3667
            logger.info("Loading plugins configurations");
3668
            this.loadPluginConfigs();
3669
        } catch (Throwable ex) {
3670
            logger.warn("Can't load plugins configurations", ex);
3671
        }
3672

  
3673
        try {
3674
            logger.info("Loading plugins");
3675
            this.loadPluginServices();
3676
        } catch (Throwable ex) {
3677
            logger.warn("Can't load plugins", ex);
3678
        }
3679

  
3680 3680
        AndamiConfig config = getAndamiConfig();
3681 3681

  
3682 3682
        initializeIdentityManagement(new File(config.getPluginsDirectory()).getAbsoluteFile());
3683 3683

  
3684 3684
        initializeLibraries();
3685 3685

  
3686
//        config.setLocaleLanguage(locale.getLanguage());
3687
//        config.setLocaleCountry(locale.getCountry());
3688
//        config.setLocaleVariant(locale.getVariant());
3689 3686
        packageInfo = getPackageInfo(myArgs[1]);
3690 3687

  
3691 3688
        // set the gvSIG version to the install manager, to compose the download URL

Also available in: Unified diff