From d8e51dbb6edb5f9bd4036d56b021df2c57857b5d Mon Sep 17 00:00:00 2001
From: markfisher <mfisher@pivotal.io>
Date: Mon, 13 Feb 2017 09:42:22 -0500
Subject: [PATCH] renamed bytecode resource property

---
 scripts/stream.sh                                      |  6 +++---
 scripts/web.sh                                         |  2 +-
 .../config/FunctionProxyApplicationListener.java       | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/scripts/stream.sh b/scripts/stream.sh
index c022e98de..81a5a1f40 100755
--- a/scripts/stream.sh
+++ b/scripts/stream.sh
@@ -17,19 +17,19 @@ while getopts ":i:s:f:c:o:p:" opt; do
     s)
       FUNC=$OPTARG
       TYPE="$PREFIX.$FUNC.type=supplier"
-      RESOURCE="$PREFIX.$FUNC.resource=$DIR/suppliers/$FUNC.fun"
+      RESOURCE="$PREFIX.$FUNC.bytecode=$DIR/suppliers/$FUNC.fun"
       ;;
     f)
       FUNC=$OPTARG
       for i in `tokenize $OPTARG`; do
-        RESOURCE="$RESOURCE $PREFIX.${i}.resource=$DIR/functions/${i}.fun"
+        RESOURCE="$RESOURCE $PREFIX.${i}.bytecode=$DIR/functions/${i}.fun"
         TYPE="$TYPE $PREFIX.${i}.type=function"
       done
       ;;
     c)
       FUNC=$OPTARG
       TYPE="$PREFIX.$FUNC.type=consumer"
-      RESOURCE="$PREFIX.$FUNC.resource=$DIR/consumers/$FUNC.fun"
+      RESOURCE="$PREFIX.$FUNC.bytecode=$DIR/consumers/$FUNC.fun"
       ;;
     o)
       OUT=--spring.cloud.stream.bindings.output.destination=$OPTARG
diff --git a/scripts/web.sh b/scripts/web.sh
index ae300db79..5b12bebca 100755
--- a/scripts/web.sh
+++ b/scripts/web.sh
@@ -22,6 +22,6 @@ done
 
 java -jar ../spring-cloud-function-samples/spring-cloud-function-sample-compiler/target/function-sample-compiler-1.0.0.BUILD-SNAPSHOT.jar\
  --spring.cloud.function.proxy.$FUNC.type=$TYPE\
- --spring.cloud.function.proxy.$FUNC.resource=file:///tmp/function-registry/$TYPE's'/$FUNC.fun\
+ --spring.cloud.function.proxy.$FUNC.bytecode=file:///tmp/function-registry/$TYPE's'/$FUNC.fun\
  --management.security.enabled=false\
  --server.port=$PORT
diff --git a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/config/FunctionProxyApplicationListener.java b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/config/FunctionProxyApplicationListener.java
index b408d318e..f383de0ed 100644
--- a/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/config/FunctionProxyApplicationListener.java
+++ b/spring-cloud-function-compiler/src/main/java/org/springframework/cloud/function/compiler/config/FunctionProxyApplicationListener.java
@@ -59,13 +59,13 @@ public class FunctionProxyApplicationListener implements ApplicationListener<App
 			@SuppressWarnings("unchecked")
 			Map<String, String> properties = (Map<String, String>) entry.getValue();
 			String type = (properties.get("type") != null) ? properties.get("type") : "function";
-			String resource = properties.get("resource");
+			String bytecodeResource = properties.get("bytecode");
 			String lambda = properties.get("lambda");
-			if (!(null == resource ^ null == lambda)) {
-				throw new IllegalArgumentException("Exactly one of 'resource' or 'lambda' is required for a Function proxy");
+			if (!(null == bytecodeResource ^ null == lambda)) {
+				throw new IllegalArgumentException("Exactly one of 'bytecode' or 'lambda' is required for a Function proxy");
 			}
-			if (resource != null) {
-				registerByteCodeLoadingProxy(name, type, context.getResource(resource), beanFactory);
+			if (bytecodeResource != null) {
+				registerByteCodeLoadingProxy(name, type, context.getResource(bytecodeResource), beanFactory);
 			}
 			else {
 				registerLambdaCompilingProxy(name, type, lambda, beanFactory);