Attachment #38530 for bug #91622

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




    netbeans_clusters="$netbeans_clusters:$netbeans_extraclusters"
fi

readEndorsedDirs() {
    grep -v "^#" "$progdir"/../etc/netbeans.clusters | grep -v "^$" | grep ide | while read X; do
        if [ -d "$progdir"/../$X/modules/ext/jaxws21/api ]; then
            echo -J-Djava.endorsed.dirs="$progdir/../$X/modules/ext/jaxws21/api"
        fi
    done
}

netbeans_endorsed_dirs=`grep -- -J-Djava\.endorsed\.dirs= <<EOF
${netbeans_default_options}
EOF`
if [ -z "${netbeans_endorsed_dirs}" ] ; then
    netbeans_endorsed_dirs=`readEndorsedDirs`
else
    netbeans_endorsed_dirs=""
fi

launchNbexec() {
    nbexec=`grep -v "^#" "$progdir"/../etc/netbeans.clusters | grep -v "^$" | grep platform | while read X; do
        if [ -f "$progdir"/../$X/lib/nbexec ]; then

            -J-Dnetbeans.importclass=org.netbeans.upgrade.AutoUpgrade \
            -J-Dnetbeans.accept_license_class=org.netbeans.license.AcceptLicense \
            ${netbeans_default_options} \
            "${netbeans_endorsed_dirs}" \
            "$@"
        ;;
    *)

            -J-Dnetbeans.importclass=org.netbeans.upgrade.AutoUpgrade \
            -J-Dnetbeans.accept_license_class=org.netbeans.license.AcceptLicense \
            ${netbeans_default_options} \
            "${netbeans_endorsed_dirs}" \
            "$@"
        ;;
esac

Lines 32-37 Link Here

(-)ide/launcher/windows/netbeans.cpp (-2 / +34 lines)
32	static void parseArgs(int argc, char *argv[]);	32	static void parseArgs(int argc, char *argv[]);
33	static int readClusterFile(const char* path);	33	static int readClusterFile(const char* path);
34	static int dirExists(const char* path);	34	static int dirExists(const char* path);
		35	static char readEndorsedDirs(const char progdir, char *clusterDirs, char pOptions);
35		36
36	static char userdir[MAX_PATH] = "c:\\nbuser";	37	static char userdir[MAX_PATH] = "c:\\nbuser";
37	static char options[4098] = "";	38	static char options[4098] = "";
Lines 130-142 Link Here
130	}	131	}
131		132
132	strcat(nbexec, "\\lib\\nbexec.exe");	133	strcat(nbexec, "\\lib\\nbexec.exe");
		134
		135	char *pEndorsedDirs = readEndorsedDirs(topdir, defaultDirs, options);
133		136
134	sprintf(cmdline2, "\"%s\" %s -J-Dnetbeans.importclass=org.netbeans.upgrade.AutoUpgrade -J-Dnetbeans.accept_license_class=org.netbeans.license.AcceptLicense --branding nb --clusters \"%s\" --userdir \"%s\" %s %s",	137	sprintf(cmdline2, "\"%s\" %s -J-Dnetbeans.importclass=org.netbeans.upgrade.AutoUpgrade -J-Dnetbeans.accept_license_class=org.netbeans.license.AcceptLicense --branding nb --clusters \"%s\" --userdir \"%s\" %s \"%s\" %s",
135	nbexec,	138	nbexec,
136	jdkswitch,	139	jdkswitch,
137	dirs,	140	dirs,
138	userdir,	141	userdir,
139	options,	142	options,
		143	pEndorsedDirs,
140	cmdline);	144	cmdline);
141		145
142	STARTUPINFO start;	146	STARTUPINFO start;
Lines 498-501 Link Here
498	}	502	}
499	}	503	}
500		504
501		505	/* Looks for modules/ext/jaxws21/api directory in ideX cluster and if it
		506	* exists returns string that will init java.endorsed.dirs property to this directory
		507	* If the directory does not exist or pOptions defines this property empty string
		508	* is returned.
		509	*/
		510	char readEndorsedDirs(const char progdir, char *clusterDirs, char pOptions) {
		511	if (strstr(pOptions, "-J-Djava.endorsed.dirs=")) {
		512	return "";
		513	}
		514	for (char *clusterName = clusterDirs; clusterName != NULL; clusterName++) {
		515	if (strstr(*clusterName, "ide")) {
		516	char endorsedParam = (char ) malloc(60+strlen(*clusterName)+strlen(progdir));
		517	strcpy(endorsedParam, "-J-Djava.endorsed.dirs=\"");
		518	strcat(endorsedParam, progdir);
		519	strcat(endorsedParam, "\\");
		520	strcat(endorsedParam, *clusterName);
		521	strcat(endorsedParam, "\\modules\\ext\\jaxws21\\api");
		522	#ifdef DEBUG
		523	printf("Searching for : >%s<\n", endorsedParam+24);
		524	#endif
		525	if (dirExists(endorsedParam+24)) {
		526	strcat(endorsedParam, "\"");
		527	return endorsedParam;
		528	}
		529	}
		530	}
		531	return "";
		532	}
		533

Return to bug 91622

Lines 82-87 Link Here

(-)ide/launcher/unix/netbeans (+19 lines)
82	netbeans_clusters="$netbeans_clusters:$netbeans_extraclusters"	82	netbeans_clusters="$netbeans_clusters:$netbeans_extraclusters"
83	fi	83	fi
84		84
		85	readEndorsedDirs() {
		86	grep -v "^#" "$progdir"/../etc/netbeans.clusters \| grep -v "^$" \| grep ide \| while read X; do
		87	if [ -d "$progdir"/../$X/modules/ext/jaxws21/api ]; then
		88	echo -J-Djava.endorsed.dirs="$progdir/../$X/modules/ext/jaxws21/api"
		89	fi
		90	done
		91	}
		92
		93	netbeans_endorsed_dirs=`grep -- -J-Djava\.endorsed\.dirs= <<EOF
		94	${netbeans_default_options}
		95	EOF`
		96	if [ -z "${netbeans_endorsed_dirs}" ] ; then
		97	netbeans_endorsed_dirs=`readEndorsedDirs`
		98	else
		99	netbeans_endorsed_dirs=""
		100	fi
		101
85	launchNbexec() {	102	launchNbexec() {
86	nbexec=`grep -v "^#" "$progdir"/../etc/netbeans.clusters \| grep -v "^$" \| grep platform \| while read X; do	103	nbexec=`grep -v "^#" "$progdir"/../etc/netbeans.clusters \| grep -v "^$" \| grep platform \| while read X; do
87	if [ -f "$progdir"/../$X/lib/nbexec ]; then	104	if [ -f "$progdir"/../$X/lib/nbexec ]; then
Lines 109-114 Link Here
109	-J-Dnetbeans.importclass=org.netbeans.upgrade.AutoUpgrade \	126	-J-Dnetbeans.importclass=org.netbeans.upgrade.AutoUpgrade \
110	-J-Dnetbeans.accept_license_class=org.netbeans.license.AcceptLicense \	127	-J-Dnetbeans.accept_license_class=org.netbeans.license.AcceptLicense \
111	${netbeans_default_options} \	128	${netbeans_default_options} \
		129	"${netbeans_endorsed_dirs}" \
112	"$@"	130	"$@"
113	;;	131	;;
114	*)	132	*)
Lines 119-124 Link Here
119	-J-Dnetbeans.importclass=org.netbeans.upgrade.AutoUpgrade \	137	-J-Dnetbeans.importclass=org.netbeans.upgrade.AutoUpgrade \
120	-J-Dnetbeans.accept_license_class=org.netbeans.license.AcceptLicense \	138	-J-Dnetbeans.accept_license_class=org.netbeans.license.AcceptLicense \
121	${netbeans_default_options} \	139	${netbeans_default_options} \
		140	"${netbeans_endorsed_dirs}" \
122	"$@"	141	"$@"
123	;;	142	;;
124	esac	143	esac