removed conflicting licenses, hostnames

Author: grogu01

.gitignore

@@ -0,0 +1,6 @@
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties

docker-monitoring-eparest/sample.properties

@@ -1,6 +1,6 @@
 # Name or IP address of the docker server host.
 # This parameter is required.  There is no default value.
-docker.hostname=bhaab01-U148604
+docker.hostname=localhost
 
 # Port where docker application is listening.  This parameter is required.
 # There is no default value.
@@ -13,7 +13,7 @@ docker.interval.seconds=15
 
 # Hostname or IP address of APM API server.  This parameter is required.
 # There is no default value.
-apm.apihost=bhaab01-U148604
+apm.apihost=localhost
 # Port for APM API server.  This parameter is required.
 # There is no default value.
 apm.apiport=8080

docker-monitoring-eparest/samplehttps.properties

@@ -1,6 +1,6 @@
 # Name or IP address of the docker server host.
 # This parameter is required.  There is no default value.
-docker.hostname=bhaab01-U150071
+docker.hostname=localhost
 
 # Port where docker application is listening.  This parameter is required.
 # There is no default value.
@@ -13,7 +13,7 @@ docker.interval.seconds=15
 
 # Hostname or IP address of APM API server.  This parameter is required.
 # There is no default value.
-apm.apihost=bhaab01-U148604
+apm.apihost=localhost
 # Port for APM API server.  This parameter is required.
 # There is no default value.
 apm.apiport=8080

docker-monitoring-eparest/src/main/java/com/ca/docker/Constants.java

@@ -1,6 +1,5 @@
 package com.ca.docker;
 
-import java.math.BigDecimal;
 /**
  * This file contains all the constants used in the application
  * @author bhaab01

docker-monitoring-eparest/src/main/java/com/ca/docker/Container.java

@@ -57,7 +57,6 @@ public void populateMetricData(Container c)
     @Override
     public HashMap<String, Comparable<?>> getDockerInfo()
     {
-        // TODO Auto-generated method stub
         return containerInfo;
     }
 

docker-monitoring-eparest/src/main/java/com/ca/docker/ContainerStatInfo.java

@@ -1,9 +1,6 @@
 package com.ca.docker;
 
 import java.util.HashMap;
-import java.util.List;
-
-import com.google.gson.annotations.SerializedName;
 
 public class ContainerStatInfo
     implements DockerInfo

docker-monitoring-eparest/src/main/java/com/ca/docker/DataPoller.java

@@ -24,7 +24,6 @@
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.codehaus.jackson.JsonNode;

docker-monitoring-eparest/src/main/java/com/ca/docker/DockerCertificates.java

@@ -1,48 +1,24 @@
-/*
- * Copyright (c) 2014 Spotify AB.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
 package com.ca.docker;
 
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.conn.ssl.SSLContexts;
-import org.apache.http.conn.ssl.X509HostnameVerifier;
-import org.bouncycastle.openssl.PEMKeyPair;
-import org.bouncycastle.openssl.PEMParser;
-
-import java.io.IOException;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.security.KeyFactory;
-import java.security.KeyManagementException;
 import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
 import java.security.PrivateKey;
-import java.security.UnrecoverableKeyException;
 import java.security.cert.Certificate;
-import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
-import java.security.spec.InvalidKeySpecException;
 import java.security.spec.PKCS8EncodedKeySpec;
 
 import javax.net.ssl.SSLContext;
 
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.conn.ssl.SSLContexts;
+import org.apache.http.conn.ssl.X509HostnameVerifier;
+import org.bouncycastle.openssl.PEMKeyPair;
+import org.bouncycastle.openssl.PEMParser;
+
 /**
  * DockerCertificates holds certificates for connecting to an HTTPS-secured Docker instance with
  * client/server authentication.