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 28732
Collapse All | Expand All

(-)corba/manifest.mf (-2 / +2 lines)
Lines 5-12 Link Here
5
OpenIDE-Module-Specification-Version: 1.5
5
OpenIDE-Module-Specification-Version: 1.5
6
OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
6
OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
7
OpenIDE-Module-Module-Dependencies: org.openide.deprecated > 1.0, org.netbeans.modules.java/1, org.openide.compiler > 1.0, org.openide.execution > 1.0, org.openide.src > 1.0
7
OpenIDE-Module-Module-Dependencies: org.openide.deprecated > 1.0, org.netbeans.modules.java/1, org.openide.compiler > 1.0, org.openide.execution > 1.0, org.openide.src > 1.0
8
OpenIDE-Module-Requires: org.openide.compiler.CompilationEngine
8
OpenIDE-Module-Requires: org.openide.compiler.CompilationEngine, org.openide.modules.InstalledFileLocator
9
OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.17
9
OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.21
10
OpenIDE-Module-Package-Dependencies: org.apache.regexp[RE]
10
OpenIDE-Module-Package-Dependencies: org.apache.regexp[RE]
11
Class-Path: docs/corba.jar
11
Class-Path: docs/corba.jar
12
12
(-)corba/src/org/netbeans/modules/corba/settings/CORBASupportSettings.java (-23 / +16 lines)
Lines 50-55 Link Here
50
import java.beans.beancontext.BeanContext;
50
import java.beans.beancontext.BeanContext;
51
import java.beans.beancontext.BeanContextSupport;
51
import java.beans.beancontext.BeanContextSupport;
52
import java.beans.beancontext.BeanContextProxy;
52
import java.beans.beancontext.BeanContextProxy;
53
import java.net.MalformedURLException;
53
54
54
import org.openide.TopManager;
55
import org.openide.TopManager;
55
import org.openide.NotifyDescriptor;
56
import org.openide.NotifyDescriptor;
Lines 62-67 Link Here
62
import org.netbeans.modules.corba.browser.ns.NamingServiceChild;
63
import org.netbeans.modules.corba.browser.ns.NamingServiceChild;
63
64
64
import org.netbeans.modules.corba.utils.FullBeanContextSupport;
65
import org.netbeans.modules.corba.utils.FullBeanContextSupport;
66
import org.openide.modules.InstalledFileLocator;
65
67
66
public class CORBASupportSettings extends SystemOption implements BeanContextProxy {
68
public class CORBASupportSettings extends SystemOption implements BeanContextProxy {
67
								  //PropertyChangeListener {
69
								  //PropertyChangeListener {
Lines 447-474 Link Here
447
	String __orb_class = System.getProperty ("org.omg.CORBA.ORBClass");
449
	String __orb_class = System.getProperty ("org.omg.CORBA.ORBClass");
448
	String __orb_singleton = System.getProperty ("org.omg.CORBA.ORBSingletonClass");
450
	String __orb_singleton = System.getProperty ("org.omg.CORBA.ORBSingletonClass");
449
	boolean __set_property = false;
451
	boolean __set_property = false;
450
	String __config_url = null;
452
        String __config_url = "openorb.xml"; // NOI18N
451
	String __userHome = System.getProperty("netbeans.user");
453
        File f = InstalledFileLocator.getDefault().locate(
452
	String __home = System.getProperty ("netbeans.home");
454
            "bin/openorb.xml", "org.netbeans.modules.corba", false); // NOI18N
453
	if (__userHome != null && (!__userHome.equals(""))) {
455
        if (f != null) {
454
	    String __fileName = __userHome + File.separatorChar + "bin" + File.separatorChar + "openorb.xml";
456
            try {
455
	    File __file = new File (__fileName);
457
                // XXX JDK 1.4: f.toURI().toURL().toExternalForm();
456
	    if (__file.exists() && __file.isFile() && __file.canRead())
458
                __config_url = f.toURL().toExternalForm();
457
                try {
459
            } catch (MalformedURLException e) {
458
                    __config_url = __file.toURL().toString();
460
                ErrorManager.getDefault().notify(e);
459
                }catch (java.net.MalformedURLException mfue) {}
461
            }
460
	}	    
462
        }
461
	if (__config_url==null && __home != null && (!__home.equals (""))) {
462
	    String __fileName = __home + File.separatorChar + "bin" + File.separatorChar + "openorb.xml";
463
            File __file = new File (__fileName);
464
	    if (__file.exists() && __file.isFile() && __file.canRead())
465
                try {
466
                    __config_url = __file.toURL().toString();
467
                }catch (java.net.MalformedURLException mfue){}
468
	}
469
	else if (__config_url == null){
470
	    __config_url = "openorb.xml";
471
	}
472
	if (__orb_class == null && __orb_singleton == null) {
463
	if (__orb_class == null && __orb_singleton == null) {
473
	    __set_property = true;
464
	    __set_property = true;
474
	}
465
	}
Lines 497-503 Link Here
497
	    __props.put ("org.omg.CORBA.ORBClass", "org.openorb.CORBA.ORB");
488
	    __props.put ("org.omg.CORBA.ORBClass", "org.openorb.CORBA.ORB");
498
	    __props.put ("org.omg.CORBA.ORBSingletonClass",
489
	    __props.put ("org.omg.CORBA.ORBSingletonClass",
499
			 "org.openorb.CORBA.ORBSingleton");
490
			 "org.openorb.CORBA.ORBSingleton");
500
	    __props.put ("openorb.config", __config_url);
491
            if (__config_url != null) {
492
                __props.put ("openorb.config", __config_url);
493
            }
501
	}
494
	}
502
        _M_orb = ORB.init (new String[] {""}, __props); // NOI18N
495
        _M_orb = ORB.init (new String[] {""}, __props); // NOI18N
503
    }
496
    }

Return to bug 28732