Attachment #148647 for bug #239836

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




        GlassFishVersion version = ServerUtils.getServerVersion(
                ip.get(GlassfishModule.GLASSFISH_FOLDER_ATTR));
        try {
            instance = new GlassfishInstance(ip, version, gip, updateNow);
            tagUnderConstruction(deployerUri);
            if (!instance.isPublicAccess()) {
                instance.ic.add(instance.commonSupport);

     * @throws IOException 
     */
    public static GlassfishInstance readInstanceFromFile(
            FileObject instanceFO, boolean autoregistered) throws IOException {
        GlassfishInstance instance = null;

        String installRoot

            }
            ip.put(INSTANCE_FO_ATTR, instanceFO.getName());
            fixImportedAttributes(ip, instanceFO);
            instance = create(ip,GlassfishInstanceProvider.getProvider(), autoregistered);
        } else {
            LOGGER.log(Level.FINER,
                    "GlassFish folder {0} is not a valid install.",


    @SuppressWarnings("LeakingThisInConstructor")
    private GlassfishInstance(Map<String, String> ip, GlassFishVersion version,
            GlassfishInstanceProvider instanceProvider, boolean prepareProperties) {
        this.version = version;
        this.process = null;
        ic = new InstanceContent();

        } else {
            domainXMLListener = null;
        }
        if (prepareProperties) {
            this.properties = prepareProperties(ip);
        } else {
            this.properties = new Props(ip);
        }
        if (!isPublicAccess()) {
            // Add this instance into local lookup (to find instance from
            // node lookup).

Lines 455-461 Link Here

(-)a/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassfishInstanceProvider.java (-2 / +2 lines)
455	continue;	455	continue;
456	}	456	}
457	GlassfishInstance si = GlassfishInstance	457	GlassfishInstance si = GlassfishInstance
458	.readInstanceFromFile(instanceFOs[i]);	458	.readInstanceFromFile(instanceFOs[i], false);
459	if (si != null) {	459	if (si != null) {
460	activeDisplayNames.add(si.getDisplayName());	460	activeDisplayNames.add(si.getDisplayName());
461	} else {	461	} else {
Lines 475-481 Link Here
475	.get(AUTOINSTANCECOPIED, null)) {	475	.get(AUTOINSTANCECOPIED, null)) {
476	try {	476	try {
477	GlassfishInstance igi = GlassfishInstance.	477	GlassfishInstance igi = GlassfishInstance.
478	readInstanceFromFile(installedInstance);	478	readInstanceFromFile(installedInstance, true);
479	try {	479	try {
480	NbPreferences.forModule(this.getClass())	480	NbPreferences.forModule(this.getClass())
481	.put(AUTOINSTANCECOPIED, "true"); // NOI18N	481	.put(AUTOINSTANCECOPIED, "true"); // NOI18N

Return to bug 239836

Lines 442-448 Link Here

(-)a/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassfishInstance.java (-5 / +9 lines)
442	GlassFishVersion version = ServerUtils.getServerVersion(	442	GlassFishVersion version = ServerUtils.getServerVersion(
443	ip.get(GlassfishModule.GLASSFISH_FOLDER_ATTR));	443	ip.get(GlassfishModule.GLASSFISH_FOLDER_ATTR));
444	try {	444	try {
445	instance = new GlassfishInstance(ip, version, gip);	445	instance = new GlassfishInstance(ip, version, gip, updateNow);
446	tagUnderConstruction(deployerUri);	446	tagUnderConstruction(deployerUri);
447	if (!instance.isPublicAccess()) {	447	if (!instance.isPublicAccess()) {
448	instance.ic.add(instance.commonSupport);	448	instance.ic.add(instance.commonSupport);
Lines 584-590 Link Here
584	* @throws IOException	584	* @throws IOException
585	*/	585	*/
586	public static GlassfishInstance readInstanceFromFile(	586	public static GlassfishInstance readInstanceFromFile(
587	FileObject instanceFO) throws IOException {	587	FileObject instanceFO, boolean autoregistered) throws IOException {
588	GlassfishInstance instance = null;	588	GlassfishInstance instance = null;
589		589
590	String installRoot	590	String installRoot
Lines 618-624 Link Here
618	}	618	}
619	ip.put(INSTANCE_FO_ATTR, instanceFO.getName());	619	ip.put(INSTANCE_FO_ATTR, instanceFO.getName());
620	fixImportedAttributes(ip, instanceFO);	620	fixImportedAttributes(ip, instanceFO);
621	instance = create(ip,GlassfishInstanceProvider.getProvider(),false);	621	instance = create(ip,GlassfishInstanceProvider.getProvider(), autoregistered);
622	} else {	622	} else {
623	LOGGER.log(Level.FINER,	623	LOGGER.log(Level.FINER,
624	"GlassFish folder {0} is not a valid install.",	624	"GlassFish folder {0} is not a valid install.",
Lines 760-766 Link Here
760		760
761	@SuppressWarnings("LeakingThisInConstructor")	761	@SuppressWarnings("LeakingThisInConstructor")
762	private GlassfishInstance(Map<String, String> ip, GlassFishVersion version,	762	private GlassfishInstance(Map<String, String> ip, GlassFishVersion version,
763	GlassfishInstanceProvider instanceProvider) {	763	GlassfishInstanceProvider instanceProvider, boolean prepareProperties) {
764	this.version = version;	764	this.version = version;
765	this.process = null;	765	this.process = null;
766	ic = new InstanceContent();	766	ic = new InstanceContent();
Lines 783-789 Link Here
783	} else {	783	} else {
784	domainXMLListener = null;	784	domainXMLListener = null;
785	}	785	}
786	this.properties = prepareProperties(ip);	786	if (prepareProperties) {
		787	this.properties = prepareProperties(ip);
		788	} else {
		789	this.properties = new Props(ip);
		790	}
787	if (!isPublicAccess()) {	791	if (!isPublicAccess()) {
788	// Add this instance into local lookup (to find instance from	792	// Add this instance into local lookup (to find instance from
789	// node lookup).	793	// node lookup).