/*
# Licensed Materials - Property of IBM
# Copyright IBM Corp. 2016  
 */
package com.ibm.streamsx.topology.context;

public interface AnalyticsServiceProperties {
    /**
     * Name of the service to use as a {@code String}.
     * The information for the service will be extracted
     * from the VCAP using this name. This property must be
     * set when submitting to {@link StreamsContext.Type#STREAMING_ANALYTICS_SERVICE}.
     */
    String SERVICE_NAME = "topology.service.name";
    
    /**
     * Definition of IBM Bluemix services. The value
     * may be:
     * <UL>
     * <LI>{@code java.io.File} - File containing the VCAP services JSON.</LI>
     * <LI>{@code String} - String containing the VCAP services serialized JSON.</LI>
     * <LI>{@code com.ibm.json.java.JSONObject} - JSON object containing the VCAP services.</LI>
     * </UL>
     */
    String VCAP_SERVICES = "topology.service.vcap";
}

@@ -112,16 +112,710 @@
 ntext;%0A%0A
+/**%0A * Configuration properties for the Streaming Analytics service%0A * on IBM Cloud.%0A * %0A * When submitting to a Streaming Analytics service %3CB%3Eone%3C/B%3E%0A * of these two sets of information must be provided:%0A * %3CUL%3E%0A * %3CLI%3E%0A * %7B@linkplain #SERVICE_DEFINITION Service definition%7D.%0A * %3C/LI%3E%0A * %3CLI%3E%0A * IBM Cloud %7B@linkplain VCAP_SERVICES service definitions%7D and%0A * a %7B@linkplain #SERVICE_NAME service name%7D. The named service must exist in%0A * service definitions and must be of type %7B@code streaming-analytics%7D.%0A * %3C/LI%3E%0A * %3C/UL%3E%0A * A %7B@code SERVICE_DEFINITION%7D takes precedence over %7B@code VCAP_SERVICES%7D and%0A * %7B@code SERVICE_NAME%7D.%0A *%0A * @see StreamsContext.Type#STREAMING_ANALYTICS_SERVICE%0A*/%0A
 public i
@@ -993,16 +993,36 @@
 he VCAP 
+service definitions 
 using th
@@ -1222,43 +1222,53 @@
   * 
-Definition of IBM Bluemix services.
+IBM Cloud service definitions.%0A     * %0A     *
  The
@@ -1273,23 +1273,16 @@
 he value
-%0A     *
  may be:
@@ -1579,59 +1579,1060 @@
    *
-/%0A    String VCAP_SERVICES = %22topology.service.vcap
+ If not set then the environment variable %7B@code VCAP_SERVICES%7D is assumed%0A     * to contain service definitions directly or a file name containing the definitions.%0A     */%0A    String VCAP_SERVICES = %22topology.service.vcap%22;%0A    %0A    /**%0A     * Definition of a Streaming Analytics service. A service definition is a JSON%0A     * object describing a Streaming Analytics service.%0A     * %3CUL%3E%0A     * %3CLI%3EThe %3Cem%3Eservice credentials%3C/em%3E copied from the %3Cem%3EService credentials%3C/em%3E%0A     * page of the service console (not the Streams console).%0A     * Credentials are provided in JSON format. They contain such as%0A     * the API key and secret, as well as connection information for the service.%0A     * %3CLI%3EA JSON object of the form:%0A     * %3Ccode%3E%7B %22type%22: %22streaming-analytics%22, %22name%22: %22%3C/code%3E%3Cem%3Eservice-name%3C/em%3E%3Ccode%3E%22, %22credentials%22: %7B...%7D %7D%3C/code%3E%0A     * with the %3Cem%3Eservice credentials%3C/em%3E as the value of the %7B@code credentials%7D key%3C/LI%3E%0A     * %3C/UL%3E%0A     * %0A     * @since 1.8%0A     */%0A    String SERVICE_DEFINITION = %22topology.service.definition
 %22;%0A%7D

Add property for service definition