Attachment #149677 for bug #246971

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 246971
Collapse All | Expand All

Lines 8-13 Link Here

(-)a/autoupdate.services/nbproject/project.properties (+3 lines)
8	test-unit-sys-prop.java.awt.headless=true	8	test-unit-sys-prop.java.awt.headless=true
9	pack200.excludes=modules/ext/updater.jar modules/ext/locale/updater_*.jar	9	pack200.excludes=modules/ext/updater.jar modules/ext/locale/updater_*.jar
10		10
		11	cp.extra=${netbeans.dest.dir}/platform/lib/org-openide-modules.jar:\
		12	${netbeans.dest.dir}/platform/lib/boot.jar
		13
11	test.config.stableBTD.includes=*/Test.class	14	test.config.stableBTD.includes=*/Test.class
12	test.config.stableBTD.excludes=\	15	test.config.stableBTD.excludes=\
13	**/ModuleUpdaterConfigTest.class,\	16	**/ModuleUpdaterConfigTest.class,\




                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.bootstrap</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>2.14</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.core.startup</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.39</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.filesystems</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>

                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.modules</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>7.25</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.util</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>

Lines 50-56 Link Here

(-)a/autoupdate.services/src/org/netbeans/api/autoupdate/OperationContainer.java (-1 lines)
50	import java.util.Map;	50	import java.util.Map;
51	import java.util.Set;	51	import java.util.Set;
52	import org.netbeans.modules.autoupdate.services.OperationContainerImpl;	52	import org.netbeans.modules.autoupdate.services.OperationContainerImpl;
53	import org.openide.modules.ModuleInfo;
54		53
55	/**	54	/**
56	* An object that keeps requests for operations upon instances of <code>UpdateEelement</code>	55	* An object that keeps requests for operations upon instances of <code>UpdateEelement</code>




import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.lang.reflect.Method;
import java.util.*;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;

import org.netbeans.Module;
import org.netbeans.api.autoupdate.OperationException;
import org.netbeans.api.autoupdate.UpdateElement;
import org.netbeans.core.startup.MainLookup;
import org.netbeans.core.startup.layers.LocalFileSystemEx;
import org.netbeans.spi.autoupdate.AutoupdateClusterCreator;
import org.netbeans.updater.ModuleDeactivator;
import org.netbeans.updater.UpdateTracking;
import org.openide.filesystems.FileUtil;
import org.openide.filesystems.LocalFileSystem;
import org.openide.modules.InstalledFileLocator;
import org.openide.util.Lookup;
import org.openide.util.lookup.ServiceProvider;


    private static void extendSystemFileSystem(File cluster) {
        try {
            ClassLoader l = Lookup.getDefault().lookup(ClassLoader.class);
            if (l == null) {
                l = Thread.currentThread().getContextClassLoader();
            }
            if (l == null) {
                l = InstallManager.class.getClassLoader();
            }
            
            File extradir = new File(cluster, ModuleDeactivator.CONFIG);
            extradir.mkdir();
            Class<?> c = Class.forName("org.netbeans.core.startup.layers.LocalFileSystemEx", true, l);
            LocalFileSystem lfse = (LocalFileSystem) c.newInstance();
            lfse.setRootDirectory(extradir);
            Class<?> m = Class.forName("org.netbeans.core.startup.MainLookup", true, l);
            Method reg = m.getMethod("register", Object.class);
            reg.invoke(null, lfse);
            synchronized (InstallManager.class) {
                clusters.add(cluster);
            }
        } catch (Exception ioe) {
            ERR.log (Level.INFO, ioe.getMessage (), ioe);
        } catch (IOException ioe) {
            ERR.log (Level.INFO, ioe.getMessage (), ioe);
        }
    }




import java.io.*;
import java.lang.ref.Reference;
import java.lang.ref.WeakReference;
import java.lang.reflect.Method;
import java.security.KeyStore;
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
import java.security.cert.Certificate;
import java.security.cert.CertificateException;
import java.text.MessageFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;

import org.netbeans.api.autoupdate.UpdateElement;
import org.netbeans.api.autoupdate.UpdateManager;
import org.netbeans.api.autoupdate.UpdateUnit;
import org.netbeans.core.startup.AutomaticDependencies;
import org.netbeans.core.startup.Main;
import org.netbeans.core.startup.TopLogging;
import org.netbeans.modules.autoupdate.updateprovider.DummyModuleInfo;
import org.netbeans.modules.autoupdate.updateprovider.InstalledModuleProvider;
import org.netbeans.modules.autoupdate.updateprovider.UpdateItemImpl;

            Collection<UpdateElement> recommended,
            boolean avoidRecommended) {
        Set<Dependency> res = new HashSet<Dependency> ();
        AutomaticDependencies.Report rep = AutomaticDependencies.getDefault().refineDependenciesAndReport(el.getCodeName(), original);
        if (rep.isModified()) {
            err.fine(rep.toString());
        }
        for (Dependency dep : original) {
            if (Dependency.TYPE_RECOMMENDS == dep.getType() && avoidRecommended) {
                continue;

    public static String getProductVersion () {
        if (productVersion == null) {
            String buildNumber = System.getProperty ("netbeans.buildnumber"); // NOI18N
            ResourceBundle b = NbBundle.getBundle("org.netbeans.core.startup.Bundle"); // NOI18N
            productVersion = MessageFormat.format(b.getString("currentVersion"), buildNumber); // NOI18N
        }
        return productVersion;
    }

    }
    
    public static boolean isKitModule (ModuleInfo mi) {
        try {
            ClassLoader l = Lookup.getDefault().lookup(ClassLoader.class);
            if (l == null) {
                l = Thread.currentThread().getContextClassLoader();
            }
            if (l == null) {
                l = InstallManager.class.getClassLoader();
            }
            Class<?> m = Class.forName("org.netbeans.core.startup.Main", true, l);
            Method reg = m.getMethod("getModuleSystem");
            Object ms = reg.invoke(null);
            Method show = ms.getClass().getMethod("isShowInAutoUpdateClient", ModuleInfo.class);
            return (Boolean)show.invoke(ms, mi);
        } catch (Exception ex) {
            Exceptions.printStackTrace(ex);
            return false;
        }
    }
    
    public static boolean isEssentialModule (ModuleInfo mi) {

Return to bug 246971

Lines 15-38 Link Here

(-)a/autoupdate.services/nbproject/project.xml (-26 lines)
15	</run-dependency>	15	</run-dependency>
16	</dependency>	16	</dependency>
17	<dependency>	17	<dependency>
18	<code-name-base>org.netbeans.bootstrap</code-name-base>
19	<build-prerequisite/>
20	<compile-dependency/>
21	<run-dependency>
22	<release-version>1</release-version>
23	<specification-version>2.14</specification-version>
24	</run-dependency>
25	</dependency>
26	<dependency>
27	<code-name-base>org.netbeans.core.startup</code-name-base>
28	<build-prerequisite/>
29	<compile-dependency/>
30	<run-dependency>
31	<release-version>1</release-version>
32	<specification-version>1.39</specification-version>
33	</run-dependency>
34	</dependency>
35	<dependency>
36	<code-name-base>org.openide.filesystems</code-name-base>	18	<code-name-base>org.openide.filesystems</code-name-base>
37	<build-prerequisite/>	19	<build-prerequisite/>
38	<compile-dependency/>	20	<compile-dependency/>
Lines 41-54 Link Here
41	</run-dependency>	23	</run-dependency>
42	</dependency>	24	</dependency>
43	<dependency>	25	<dependency>
44	<code-name-base>org.openide.modules</code-name-base>
45	<build-prerequisite/>
46	<compile-dependency/>
47	<run-dependency>
48	<specification-version>7.25</specification-version>
49	</run-dependency>
50	</dependency>
51	<dependency>
52	<code-name-base>org.openide.util</code-name-base>	26	<code-name-base>org.openide.util</code-name-base>
53	<build-prerequisite/>	27	<build-prerequisite/>
54	<compile-dependency/>	28	<compile-dependency/>

Lines 49-54 Link Here

(-)a/autoupdate.services/src/org/netbeans/modules/autoupdate/services/InstallManager.java (-7 / +16 lines)
49	import java.io.FileOutputStream;	49	import java.io.FileOutputStream;
50	import java.io.IOException;	50	import java.io.IOException;
51	import java.io.OutputStream;	51	import java.io.OutputStream;
		52	import java.lang.reflect.Method;
52	import java.util.*;	53	import java.util.*;
53	import java.util.jar.JarEntry;	54	import java.util.jar.JarEntry;
54	import java.util.jar.JarFile;	55	import java.util.jar.JarFile;
Lines 57-68 Link Here
57	import org.netbeans.Module;	58	import org.netbeans.Module;
58	import org.netbeans.api.autoupdate.OperationException;	59	import org.netbeans.api.autoupdate.OperationException;
59	import org.netbeans.api.autoupdate.UpdateElement;	60	import org.netbeans.api.autoupdate.UpdateElement;
60	import org.netbeans.core.startup.MainLookup;
61	import org.netbeans.core.startup.layers.LocalFileSystemEx;
62	import org.netbeans.spi.autoupdate.AutoupdateClusterCreator;	61	import org.netbeans.spi.autoupdate.AutoupdateClusterCreator;
63	import org.netbeans.updater.ModuleDeactivator;	62	import org.netbeans.updater.ModuleDeactivator;
64	import org.netbeans.updater.UpdateTracking;	63	import org.netbeans.updater.UpdateTracking;
65	import org.openide.filesystems.FileUtil;	64	import org.openide.filesystems.FileUtil;
		65	import org.openide.filesystems.LocalFileSystem;
66	import org.openide.modules.InstalledFileLocator;	66	import org.openide.modules.InstalledFileLocator;
67	import org.openide.util.Lookup;	67	import org.openide.util.Lookup;
68	import org.openide.util.lookup.ServiceProvider;	68	import org.openide.util.lookup.ServiceProvider;
Lines 236-252 Link Here
236		236
237	private static void extendSystemFileSystem(File cluster) {	237	private static void extendSystemFileSystem(File cluster) {
238	try {	238	try {
		239	ClassLoader l = Lookup.getDefault().lookup(ClassLoader.class);
		240	if (l == null) {
		241	l = Thread.currentThread().getContextClassLoader();
		242	}
		243	if (l == null) {
		244	l = InstallManager.class.getClassLoader();
		245	}
		246
239	File extradir = new File(cluster, ModuleDeactivator.CONFIG);	247	File extradir = new File(cluster, ModuleDeactivator.CONFIG);
240	extradir.mkdir();	248	extradir.mkdir();
241	LocalFileSystemEx lfse = new LocalFileSystemEx();	249	Class<?> c = Class.forName("org.netbeans.core.startup.layers.LocalFileSystemEx", true, l);
		250	LocalFileSystem lfse = (LocalFileSystem) c.newInstance();
242	lfse.setRootDirectory(extradir);	251	lfse.setRootDirectory(extradir);
243	MainLookup.register(lfse);	252	Class<?> m = Class.forName("org.netbeans.core.startup.MainLookup", true, l);
		253	Method reg = m.getMethod("register", Object.class);
		254	reg.invoke(null, lfse);
244	synchronized (InstallManager.class) {	255	synchronized (InstallManager.class) {
245	clusters.add(cluster);	256	clusters.add(cluster);
246	}	257	}
247	} catch (PropertyVetoException ioe) {	258	} catch (Exception ioe) {
248	ERR.log (Level.INFO, ioe.getMessage (), ioe);
249	} catch (IOException ioe) {
250	ERR.log (Level.INFO, ioe.getMessage (), ioe);	259	ERR.log (Level.INFO, ioe.getMessage (), ioe);
251	}	260	}
252	}	261	}

Lines 47-57 Link Here

(-)a/autoupdate.services/src/org/netbeans/modules/autoupdate/services/Utilities.java (-9 / +21 lines)
47	import java.io.*;	47	import java.io.*;
48	import java.lang.ref.Reference;	48	import java.lang.ref.Reference;
49	import java.lang.ref.WeakReference;	49	import java.lang.ref.WeakReference;
		50	import java.lang.reflect.Method;
50	import java.security.KeyStore;	51	import java.security.KeyStore;
51	import java.security.KeyStoreException;	52	import java.security.KeyStoreException;
52	import java.security.NoSuchAlgorithmException;	53	import java.security.NoSuchAlgorithmException;
53	import java.security.cert.Certificate;	54	import java.security.cert.Certificate;
54	import java.security.cert.CertificateException;	55	import java.security.cert.CertificateException;
		56	import java.text.MessageFormat;
55	import java.text.ParseException;	57	import java.text.ParseException;
56	import java.text.SimpleDateFormat;	58	import java.text.SimpleDateFormat;
57	import java.util.*;	59	import java.util.*;
Lines 65-73 Link Here
65	import org.netbeans.api.autoupdate.UpdateElement;	67	import org.netbeans.api.autoupdate.UpdateElement;
66	import org.netbeans.api.autoupdate.UpdateManager;	68	import org.netbeans.api.autoupdate.UpdateManager;
67	import org.netbeans.api.autoupdate.UpdateUnit;	69	import org.netbeans.api.autoupdate.UpdateUnit;
68	import org.netbeans.core.startup.AutomaticDependencies;
69	import org.netbeans.core.startup.Main;
70	import org.netbeans.core.startup.TopLogging;
71	import org.netbeans.modules.autoupdate.updateprovider.DummyModuleInfo;	70	import org.netbeans.modules.autoupdate.updateprovider.DummyModuleInfo;
72	import org.netbeans.modules.autoupdate.updateprovider.InstalledModuleProvider;	71	import org.netbeans.modules.autoupdate.updateprovider.InstalledModuleProvider;
73	import org.netbeans.modules.autoupdate.updateprovider.UpdateItemImpl;	72	import org.netbeans.modules.autoupdate.updateprovider.UpdateItemImpl;
Lines 700-709 Link Here
700	Collection<UpdateElement> recommended,	699	Collection<UpdateElement> recommended,
701	boolean avoidRecommended) {	700	boolean avoidRecommended) {
702	Set<Dependency> res = new HashSet<Dependency> ();	701	Set<Dependency> res = new HashSet<Dependency> ();
703	AutomaticDependencies.Report rep = AutomaticDependencies.getDefault().refineDependenciesAndReport(el.getCodeName(), original);
704	if (rep.isModified()) {
705	err.fine(rep.toString());
706	}
707	for (Dependency dep : original) {	702	for (Dependency dep : original) {
708	if (Dependency.TYPE_RECOMMENDS == dep.getType() && avoidRecommended) {	703	if (Dependency.TYPE_RECOMMENDS == dep.getType() && avoidRecommended) {
709	continue;	704	continue;
Lines 983-989 Link Here
983	public static String getProductVersion () {	978	public static String getProductVersion () {
984	if (productVersion == null) {	979	if (productVersion == null) {
985	String buildNumber = System.getProperty ("netbeans.buildnumber"); // NOI18N	980	String buildNumber = System.getProperty ("netbeans.buildnumber"); // NOI18N
986	productVersion = NbBundle.getMessage (TopLogging.class, "currentVersion", buildNumber); // NOI18N	981	ResourceBundle b = NbBundle.getBundle("org.netbeans.core.startup.Bundle"); // NOI18N
		982	productVersion = MessageFormat.format(b.getString("currentVersion"), buildNumber); // NOI18N
987	}	983	}
988	return productVersion;	984	return productVersion;
989	}	985	}
Lines 1097-1103 Link Here
1097	}	1093	}
1098		1094
1099	public static boolean isKitModule (ModuleInfo mi) {	1095	public static boolean isKitModule (ModuleInfo mi) {
1100	return Main.getModuleSystem().isShowInAutoUpdateClient(mi);	1096	try {
		1097	ClassLoader l = Lookup.getDefault().lookup(ClassLoader.class);
		1098	if (l == null) {
		1099	l = Thread.currentThread().getContextClassLoader();
		1100	}
		1101	if (l == null) {
		1102	l = InstallManager.class.getClassLoader();
		1103	}
		1104	Class<?> m = Class.forName("org.netbeans.core.startup.Main", true, l);
		1105	Method reg = m.getMethod("getModuleSystem");
		1106	Object ms = reg.invoke(null);
		1107	Method show = ms.getClass().getMethod("isShowInAutoUpdateClient", ModuleInfo.class);
		1108	return (Boolean)show.invoke(ms, mi);
		1109	} catch (Exception ex) {
		1110	Exceptions.printStackTrace(ex);
		1111	return false;
		1112	}
1101	}	1113	}
1102		1114
1103	public static boolean isEssentialModule (ModuleInfo mi) {	1115	public static boolean isEssentialModule (ModuleInfo mi) {