Attachment #240306 for bug #429096

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 38-43 public class CreateApplicationCommand extends AbstractCFCommand { Link Here

(-)a/bundles/org.eclipse.orion.server.cf/src/org/eclipse/orion/server/cf/commands/CreateApplicationCommand.java (-1 / +5 lines)
38	private String appCommand;	38	private String appCommand;
39	private int appInstances;	39	private int appInstances;
40	private int appMemory;	40	private int appMemory;
		41	private String buildPack;
41		42
42	private boolean force;	43	private boolean force;
43		44
Lines 73-79 public class CreateApplicationCommand extends AbstractCFCommand { Link Here
73	createAppRequst.put(CFProtocolConstants.V2_KEY_SPACE_GUID, target.getSpace().getCFJSON().getJSONObject(CFProtocolConstants.V2_KEY_METADATA).getString(CFProtocolConstants.V2_KEY_GUID));	74	createAppRequst.put(CFProtocolConstants.V2_KEY_SPACE_GUID, target.getSpace().getCFJSON().getJSONObject(CFProtocolConstants.V2_KEY_METADATA).getString(CFProtocolConstants.V2_KEY_GUID));
74	createAppRequst.put(CFProtocolConstants.V2_KEY_NAME, appName);	75	createAppRequst.put(CFProtocolConstants.V2_KEY_NAME, appName);
75	createAppRequst.put(CFProtocolConstants.V2_KEY_INSTANCES, appInstances);	76	createAppRequst.put(CFProtocolConstants.V2_KEY_INSTANCES, appInstances);
76	createAppRequst.put(CFProtocolConstants.V2_KEY_BUILDPACK, JSONObject.NULL);	77	createAppRequst.put(CFProtocolConstants.V2_KEY_BUILDPACK, buildPack);
77	createAppRequst.put(CFProtocolConstants.V2_KEY_COMMAND, appCommand);	78	createAppRequst.put(CFProtocolConstants.V2_KEY_COMMAND, appCommand);
78	createAppRequst.put(CFProtocolConstants.V2_KEY_MEMORY, appMemory);	79	createAppRequst.put(CFProtocolConstants.V2_KEY_MEMORY, appMemory);
79	createAppRequst.put(CFProtocolConstants.V2_KEY_STACK_GUID, JSONObject.NULL);	80	createAppRequst.put(CFProtocolConstants.V2_KEY_STACK_GUID, JSONObject.NULL);
Lines 113-118 public class CreateApplicationCommand extends AbstractCFCommand { Link Here
113	}	114	}
114	appMemory = ManifestUtils.getMemoryLimit(mem); /* optional */	115	appMemory = ManifestUtils.getMemoryLimit(mem); /* optional */
115		116
		117	//buildpack
		118	buildPack = appJSON.optString(CFProtocolConstants.V2_KEY_BUILDPACK);
		119
116	return Status.OK_STATUS;	120	return Status.OK_STATUS;
117		121
118	} catch (ParseException e) {	122	} catch (ParseException e) {

Lines 57-62 public class ManifestUtils { Link Here

(-)a/bundles/org.eclipse.orion.server.cf/src/org/eclipse/orion/server/cf/manifest/ManifestUtils.java (+5 lines)
57	if (sLabel.length > 1)	57	if (sLabel.length > 1)
58	sLabel[1] = sLabel[1].trim();	58	sLabel[1] = sLabel[1].trim();
59		59
		60	if (sLabel.length == 3 && sLabel[1].startsWith("http")) {
		61	String[] tmpsLabel = new String[] {sLabel[0], sLabel[1] + ":" + sLabel[2]};
		62	sLabel = tmpsLabel;
		63	}
		64
60	return sLabel;	65	return sLabel;
61	}	66	}
62		67

Return to bug 429096