Merge pull request #345 from IBMStreams/develop

Corrections for version 3.1.1

Author: joergboe

.gitignore

@@ -8,7 +8,6 @@ toolkit.xml
 /com.ibm.streamsx.inet/impl/nl/*.dat
 /com.ibm.streamsx.inet/impl/nl/include
 /com.ibm.streamsx.inet/build.info
-/com.ibm.streamsx.inet/opt/downloaded/
 /release/
 doc/
 

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changes
 =======
+## v3.1.1:
+* Remove opt/downloaded from all lib enties to avoid classpath warnings
+* Corrections in tests 
 
 ## v3.1.0:
 * Update apache http client library to v 4.5.7

com.ibm.streamsx.inet/build.xml

@@ -29,7 +29,6 @@ All required libs are now available in the source repository
 	<property name="gensrc.dir"        location="impl/java/src-gen" />
 	<property name="test.run.dir"      location="unittestrun" />
 	<property name="test.build.dir"    location="${test.run.dir}/bin" />
-	<property name="downloads.dir"     location="opt/downloaded" /> <!-- used for cleanup only -->
 	<property name="jarfile"           value="com.ibm.streamsx.inet.jar" />
 
 	<defaultexcludes add="**/.gitkeep"/>
@@ -73,7 +72,6 @@ All required libs are now available in the source repository
 		<delete dir="${build.dir}" />
 		<delete dir="${lib.dir}" />
 		<delete dir="${impl.lib.dir}" />
-		<delete dir="${downloads.dir}" />
 		<delete dir="output" />
 		<delete dir="doc" />
 		<delete dir="${nl.dir}/include"/>

com.ibm.streamsx.inet/impl/java/src/com/ibm/streamsx/inet/http/HTTPPostOper.java

@@ -37,7 +37,6 @@
 import com.ibm.streams.operator.model.Icons;
 import com.ibm.streams.operator.model.InputPortSet;
 import com.ibm.streams.operator.model.InputPorts;
-import com.ibm.streams.operator.model.Libraries;
 import com.ibm.streams.operator.model.OutputPortSet;
 import com.ibm.streams.operator.model.OutputPorts;
 import com.ibm.streams.operator.model.Parameter;
@@ -55,7 +54,6 @@
 
 ))
 @PrimitiveOperator(name=HTTPPostOper.OPER_NAME, description=HTTPPostOper.DESC)
-@Libraries(value={"opt/downloaded/*"})
 @Icons(location32="icons/HTTPPost_32.gif", location16="icons/HTTPPost_16.gif")
 public class HTTPPostOper extends AbstractOperator  
 {

com.ibm.streamsx.inet/impl/java/src/com/ibm/streamsx/inet/http/HTTPRequestOper.java

@@ -57,7 +57,6 @@
 import com.ibm.streams.operator.model.Icons;
 import com.ibm.streams.operator.model.InputPortSet;
 import com.ibm.streams.operator.model.InputPorts;
-import com.ibm.streams.operator.model.Libraries;
 import com.ibm.streams.operator.model.PrimitiveOperator;
 import com.ibm.streams.operator.types.Blob;
 import com.ibm.streams.operator.types.RString;
@@ -84,7 +83,6 @@
  * 
  ********************************************************************************************/
 @PrimitiveOperator(name = HTTPRequestOper.OPER_NAME, description = HTTPRequestOperAPI.DESC)
-@Libraries("opt/httpcomponents-client-4.5.5/lib/*")
 @Icons(location32 = "icons/HTTPPost_32.gif", location16 = "icons/HTTPPost_16.gif")
 @InputPorts(@InputPortSet(cardinality = 1, description = "This stream contains the information sent in a http request. Each tuple with valid request data results in an HTTP request except if method `NONE` is specified."))
 @OutputPorts(

com.ibm.streamsx.inet/impl/java/src/com/ibm/streamsx/inet/http/HTTPRequestOperAPI.java

@@ -380,7 +380,7 @@ public void setSslTrustStorePassword(String sslTrustStorePassword){
         this.sslTrustStorePassword = sslTrustStorePassword;
     }
     @Parameter(optional=true, description="Path to jks key store file used for client authentication. This store should contain one client key pair."
-        + "If this parameter is set, parameter `sslTrustStorePassword` is optional."
+        + "If this parameter is set, parameter `sslKeyStorePassword` is optional."
         + "If this parameter is set, parameter `sslKeyPassword` is required.")
     public void setSslKeyStoreFile(String sslKeyStoreFile){
         this.sslKeyStoreFile = sslKeyStoreFile;

com.ibm.streamsx.inet/impl/java/src/com/ibm/streamsx/inet/http/HTTPStreamReader.java

@@ -24,7 +24,6 @@
 import com.ibm.streams.operator.logging.LogLevel;
 import com.ibm.streams.operator.logging.TraceLevel;
 import com.ibm.streams.operator.model.Icons;
-import com.ibm.streams.operator.model.Libraries;
 import com.ibm.streams.operator.model.OutputPortSet;
 import com.ibm.streams.operator.model.OutputPortSet.WindowPunctuationOutputMode;
 import com.ibm.streams.operator.model.OutputPorts;
@@ -41,7 +40,6 @@
 			  description="Error information will be sent out on this port including the response code and any message recieved from the server. " +
 			  		"Tuple structure must conform to the [HTTPResponse] type specified in this namespace.")})
 @PrimitiveOperator(name=HTTPStreamReader.OPER_NAME, description=HTTPStreamReader.DESC)
-@Libraries(value={"opt/downloaded/*"})
 @Icons(location32="icons/"+HTTPStreamReader.OPER_NAME+"_32.gif", location16="icons/"+HTTPStreamReader.OPER_NAME+"_16.gif")
 public class HTTPStreamReader extends AbstractOperator {
 

com.ibm.streamsx.inet/impl/java/src/com/ibm/streamsx/inet/window/WindowContentsAtTrigger.java

@@ -15,7 +15,7 @@ This toolkit separates its functionality into a number of namespaces:
 The http rest functions and the WebSocket server functions are now moved into streamsx.inetserver toolkit https://github.com/IBMStreams/streamsx.inetserver/releases
 
     </description>
-    <version>3.1.0</version>
+    <version>3.1.1</version>
     <requiredProductVersion>4.0.1.0</requiredProductVersion>
   </identity>
   <dependencies/>

com.ibm.streamsx.inet/info.xml

@@ -2,6 +2,44 @@
 
 This directory provides an automatic test for a number of operators of the inet toolkit.
 
+## Prerequisites
+
+### Installation and Environment
+This test suite requires an local Streams installation (minimum v4.0.1) and a propperly setup of the Streams environment. 
+This environments are required:
+* STREAMS_INSTALL
+* JAVA_HOME
+* STREAMS_DOMAIN_ID
+* STREAMS_INSTANCE_ID
+* STREAMS_ZKCONNECT - if an external zookeeper has to be used
+
+Additionaly this test collection requires that the packages `curl`, `ftp` and `lftp` are installed.
+
+### FTP Test Server
+The script framework automatically tries to start a local ftp-server, which requires package `vsftp`. Additionally the current user must be able to execute 
+`service vsftpd start` without password interaction (sudoers configuration).
+
+Alternatively you can start the ftp server by hand and provide property `TTPR_ftpServerHost` with the value of the ftp-servers hostname.
+
+If the standard setup of the ftp server is used, an user `ftpuser` with password `streams` is required. This standart setup can be overwritten
+with properties `TTPR_ftpServerUser` and `TTPR_ftpServerPasswd` in TestProperties.sh file.
+
+If the property `TTPR_ftpServerHost` is set to an empty value, all ftp test are skipped.
+
+**Note:** The FtpTest requires an running ssh daemon at the ftp server host.
+
+### HTTP Test Server
+In the standard environment the http-test server is started automatically from the test script.
+
+This HTTP Test Server requires the java 1.8 runtime from the streams installation and that ports **8097** and **1443** are available at the local host.
+
+If the property `TTPR_httpServerHost` is provided, the automatic start is skipped and the provided server is used.
+In this case you must also provide `TTPR_httpServerAddr` and `TTPR_httpsServerAddr`. This values must have the form : *hostname:port*
+
+### Toolkit and Toolkit Samples 
+The standard setup expects the inet toolkit in directory *../../com.ibm.streamsx.inet/* and the toolkit samples in *../../samples/*.
+You can change this setting with properties `TTPR_streamsxInetToolkit` and `TTRO_streamsxInetSamplesPath`.
+
 ## Test Execution
 
 To start the full test execute:  
@@ -29,29 +67,6 @@ checks if there is a running Streams instance and starts the ftp test server and
 If the Streams instance is not running, a domain and an instance is created from the scratch and started. You can force the 
 creation of instance and domain with command line option `--clean`
 
-In the standard environment the ftp-test server is started automatically from the test script. If the 
-property `TTPR_ftpServerHost` is set to a non empty value, the automatic start is skipped and the provided server is used. 
-In this case the properties `TTPR_ftpServerUser` and `TTPR_ftpServerPasswd` must provide the username and password for the ftp-tests. 
-You can skip the ftp test cases if the property `TTPR_ftpServerHost` is set to an empty value.
-
-In the standard environment the http-test server is started automatically from the test script. If the 
-property `TTPR_httpServerHost` is set, the automatic start is skipped and the provided server is used. In this case you must also 
-provide `TTPR_httpServerAddr` and `TTPR_httpsServerAddr`. This values must have the form <hostname>:<port>
-
-The inet toolkit is expected in directory `../../com.ibm.streamsx.inet/` and must be built with the current Streams version. 
-The inet toolkit samples are expected in `TTRO_streamsxInetSamplesPath`. 
-
 Use command line option `-D <name>=<value>` to set external variables or provide a new properties file with command line option 
 `--properties <filename>`. The standard properties file is `tests/TestProperties.sh`.
 
-## Requirements
-
-The test framework requires an valid Streams installation and environment.
-
-The ftp test server requires the packages **vsftpd** and **ftp**. Additionally the current user must be able to execute 
-`service vsftpd start` without password interaction (sudoers configuration). Alternatively you can start the ftp server by 
-hand and provide property `TTPR_ftpServerHost`.
-If the standard setup of the ftp server is used, an user `ftpuser` with password `streams` is required.
-
-The http test server requires a standard java 1.8 runtime. With the streams java runtime the ssl connections are not possible.
-The http test server requires that ports 8097 and 1443 are available at the local host.