Attachment #37882 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

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