Attachment #40204 for bug #139056





		String packExcludes = properties.getProperty("pack.excludes"); //$NON-NLS-1$
		if (packExcludes != null) {
			String[] excludes = toStringArray(packExcludes, ","); //$NON-NLS-1$
			Set packExclusions = new HashSet();
			for (int i = 0; i < excludes.length; i++) {
				packExclusions.add(excludes[i]);

			return Collections.EMPTY_SET;
		String signExcludes = properties.getProperty("sign.excludes"); //$NON-NLS-1$
		if (signExcludes != null) {
			String[] excludes = toStringArray(signExcludes, ","); //$NON-NLS-1$
			Set signExclusions = new HashSet();
			for (int i = 0; i < excludes.length; i++) {
				signExclusions.add(excludes[i]);

		}
		return buffer.toString();
	}

	public static String[] toStringArray(String input, String separator) {
		StringTokenizer tokenizer = new StringTokenizer(input, separator);
		int count = tokenizer.countTokens();
		String[] result = new String[count];
		for (int i = 0; i < count; i++) {
			result[i] = tokenizer.nextToken();
		}
		return result;
	}
}

Lines 91-97 Link Here

(-)src/org/eclipse/update/internal/jarprocessor/PackStep.java (-1 / +1 lines)
91	String[] cmd = null;	91	String[] cmd = null;
92	String arguments = getOptions().getProperty(input.getName() + ".pack.args"); //$NON-NLS-1$	92	String arguments = getOptions().getProperty(input.getName() + ".pack.args"); //$NON-NLS-1$
93	if (arguments != null) {	93	if (arguments != null) {
94	String[] args = arguments.split(",\\s*"); //$NON-NLS-1$	94	String[] args = Utils.toStringArray(arguments, ","); //$NON-NLS-1$
95	cmd = new String[3 + args.length];	95	cmd = new String[3 + args.length];
96	cmd[0] = packCommand;	96	cmd[0] = packCommand;
97	System.arraycopy(args, 0, cmd, 1, args.length);	97	System.arraycopy(args, 0, cmd, 1, args.length);

Return to bug 139056

Lines 151-157 Link Here

(-)src/org/eclipse/update/internal/jarprocessor/Utils.java (-2 / +12 lines)
151		151
152	String packExcludes = properties.getProperty("pack.excludes"); //$NON-NLS-1$	152	String packExcludes = properties.getProperty("pack.excludes"); //$NON-NLS-1$
153	if (packExcludes != null) {	153	if (packExcludes != null) {
154	String[] excludes = packExcludes.split(",\\s*"); //$NON-NLS-1$	154	String[] excludes = toStringArray(packExcludes, ","); //$NON-NLS-1$
155	Set packExclusions = new HashSet();	155	Set packExclusions = new HashSet();
156	for (int i = 0; i < excludes.length; i++) {	156	for (int i = 0; i < excludes.length; i++) {
157	packExclusions.add(excludes[i]);	157	packExclusions.add(excludes[i]);
Lines 166-172 Link Here
166	return Collections.EMPTY_SET;	166	return Collections.EMPTY_SET;
167	String signExcludes = properties.getProperty("sign.excludes"); //$NON-NLS-1$	167	String signExcludes = properties.getProperty("sign.excludes"); //$NON-NLS-1$
168	if (signExcludes != null) {	168	if (signExcludes != null) {
169	String[] excludes = signExcludes.split(",\\s*"); //$NON-NLS-1$	169	String[] excludes = toStringArray(signExcludes, ","); //$NON-NLS-1$
170	Set signExclusions = new HashSet();	170	Set signExclusions = new HashSet();
171	for (int i = 0; i < excludes.length; i++) {	171	for (int i = 0; i < excludes.length; i++) {
172	signExclusions.add(excludes[i]);	172	signExclusions.add(excludes[i]);
Lines 185-188 Link Here
185	}	185	}
186	return buffer.toString();	186	return buffer.toString();
187	}	187	}
		188
		189	public static String[] toStringArray(String input, String separator) {
		190	StringTokenizer tokenizer = new StringTokenizer(input, separator);
		191	int count = tokenizer.countTokens();
		192	String[] result = new String[count];
		193	for (int i = 0; i < count; i++) {
		194	result[i] = tokenizer.nextToken();
		195	}
		196	return result;
		197	}
188	}	198	}