Attachment 240306 Details for Bug 429096 – Potential patch

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

[patch] Potential patch

patch.txt (text/plain), 2.54 KB, created by Bogdan Gheorghe

on 2014-02-25 16:49:34 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Bogdan Gheorghe

Created: 2014-02-25 16:49:34 EST

Size: 2.54 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.orion.server.cf/src/org/eclipse/orion/server/cf/commands/CreateApplicationCommand.java b/bundles/org.eclipse.orion.server.cf/src/org/eclipse/orion/server/cf/commands/CreateApplicationCommand.java
>index 7663099..2717796 100644
>--- a/bundles/org.eclipse.orion.server.cf/src/org/eclipse/orion/server/cf/commands/CreateApplicationCommand.java
>+++ b/bundles/org.eclipse.orion.server.cf/src/org/eclipse/orion/server/cf/commands/CreateApplicationCommand.java
>@@ -38,6 +38,7 @@ public class CreateApplicationCommand extends AbstractCFCommand {
> 	private String appCommand;
> 	private int appInstances;
> 	private int appMemory;
>+	private String buildPack;
> 
> 	private boolean force;
> 
>@@ -73,7 +74,7 @@ public class CreateApplicationCommand extends AbstractCFCommand {
> 			createAppRequst.put(CFProtocolConstants.V2_KEY_SPACE_GUID, target.getSpace().getCFJSON().getJSONObject(CFProtocolConstants.V2_KEY_METADATA).getString(CFProtocolConstants.V2_KEY_GUID));
> 			createAppRequst.put(CFProtocolConstants.V2_KEY_NAME, appName);
> 			createAppRequst.put(CFProtocolConstants.V2_KEY_INSTANCES, appInstances);
>-			createAppRequst.put(CFProtocolConstants.V2_KEY_BUILDPACK, JSONObject.NULL);
>+			createAppRequst.put(CFProtocolConstants.V2_KEY_BUILDPACK, buildPack);
> 			createAppRequst.put(CFProtocolConstants.V2_KEY_COMMAND, appCommand);
> 			createAppRequst.put(CFProtocolConstants.V2_KEY_MEMORY, appMemory);
> 			createAppRequst.put(CFProtocolConstants.V2_KEY_STACK_GUID, JSONObject.NULL);
>@@ -113,6 +114,9 @@ public class CreateApplicationCommand extends AbstractCFCommand {
> 			}
> 			appMemory = ManifestUtils.getMemoryLimit(mem); /* optional */
> 
>+			//buildpack
>+			buildPack = appJSON.optString(CFProtocolConstants.V2_KEY_BUILDPACK);
>+
> 			return Status.OK_STATUS;
> 
> 		} catch (ParseException e) {
>diff --git a/bundles/org.eclipse.orion.server.cf/src/org/eclipse/orion/server/cf/manifest/ManifestUtils.java b/bundles/org.eclipse.orion.server.cf/src/org/eclipse/orion/server/cf/manifest/ManifestUtils.java
>index 1ec2132..82caf3d 100644
>--- a/bundles/org.eclipse.orion.server.cf/src/org/eclipse/orion/server/cf/manifest/ManifestUtils.java
>+++ b/bundles/org.eclipse.orion.server.cf/src/org/eclipse/orion/server/cf/manifest/ManifestUtils.java
>@@ -57,6 +57,11 @@ public class ManifestUtils {
> 		if (sLabel.length > 1)
> 			sLabel[1] = sLabel[1].trim();
> 
>+		if (sLabel.length == 3 && sLabel[1].startsWith("http")) {
>+			String[] tmpsLabel = new String[] {sLabel[0], sLabel[1] + ":" + sLabel[2]};
>+			sLabel = tmpsLabel;
>+		}
>+
> 		return sLabel;
> 	}
>

Actions: View | Diff

Attachments on bug 429096: 240306 | 240326