From fc234b1df959e96e1ca97ee98d364d39c87bfaaa Mon Sep 17 00:00:00 2001
From: Apex Dev <dev@apex.apache.org>
Date: Tue, 18 Apr 2017 13:40:22 -0700
Subject: [PATCH] APEXMALHAR-2462 Fixed Checkstyle and Log4j Properties.

---
 examples/jdbc/pom.xml                         | 20 +++++++++
 examples/jdbc/src/assemble/appPackage.xml     | 20 +++++++++
 .../examples/FileToJdbcApp/CustomParser.java  | 26 +++++------
 .../examples/FileToJdbcApp/FileReader.java    | 23 +++++++++-
 .../FileToJdbcApp/FileToJdbcCsvParser.java    | 30 ++++++++++---
 .../FileToJdbcApp/FileToJdbcCustomParser.java | 37 ++++++++++++----
 .../examples/FileToJdbcApp/PojoEvent.java     | 18 ++++++++
 .../JdbcIngest/JdbcPollerApplication.java     | 18 ++++++++
 .../apex/examples/JdbcIngest/PojoEvent.java   | 18 ++++++++
 .../examples/JdbcToJdbc/JdbcToJdbcApp.java    |  2 +-
 .../apex/examples/JdbcToJdbc/PojoEvent.java   | 18 ++++++++
 .../META-INF/properties-FileToJdbcApp.xml     | 20 +++++++++
 .../META-INF/properties-JdbcToJdbcApp.xml     | 20 +++++++++
 .../META-INF/properties-PollJdbcToHDFSApp.xml | 20 +++++++++
 .../properties-SimpleJdbcToHDFSApp.xml        | 20 +++++++++
 .../FileToJdbcApp/ApplicationTest.java        | 44 ++++++++++++++-----
 .../examples/JdbcIngest/JdbcInputAppTest.java |  4 +-
 .../JdbcIngest/JdbcPollerApplicationTest.java | 22 +++++++++-
 .../examples/JdbcToJdbc/ApplicationTest.java  | 17 ++++++-
 .../examples/JdbcToJdbc/JdbcOperatorTest.java |  7 ++-
 ...cApp.sql => example-FileToJdbcApp-sql.txt} |  0
 ...cIngest.sql => example-JdbcIngest-sql.txt} |  0
 ...cToJdbc.sql => example-JdbcToJdbc-sql.txt} |  0
 .../jdbc/src/test/resources/log4j.properties  | 21 +++++++++
 .../src/test/resources/test-FileToJdbcApp.xml | 20 +++++++++
 25 files changed, 396 insertions(+), 49 deletions(-)
 rename examples/jdbc/src/test/resources/{example-FileToJdbcApp.sql => example-FileToJdbcApp-sql.txt} (100%)
 rename examples/jdbc/src/test/resources/{example-JdbcIngest.sql => example-JdbcIngest-sql.txt} (100%)
 rename examples/jdbc/src/test/resources/{example-JdbcToJdbc.sql => example-JdbcToJdbc-sql.txt} (100%)

diff --git a/examples/jdbc/pom.xml b/examples/jdbc/pom.xml
index b697a689c5..b01028a669 100644
--- a/examples/jdbc/pom.xml
+++ b/examples/jdbc/pom.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you 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.
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
diff --git a/examples/jdbc/src/assemble/appPackage.xml b/examples/jdbc/src/assemble/appPackage.xml
index 7ad071c69f..a8708074a2 100644
--- a/examples/jdbc/src/assemble/appPackage.xml
+++ b/examples/jdbc/src/assemble/appPackage.xml
@@ -1,3 +1,23 @@
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you 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.
+
+-->
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
diff --git a/examples/jdbc/src/main/java/org/apache/apex/examples/FileToJdbcApp/CustomParser.java b/examples/jdbc/src/main/java/org/apache/apex/examples/FileToJdbcApp/CustomParser.java
index a22acc98a0..d5fc509d58 100755
--- a/examples/jdbc/src/main/java/org/apache/apex/examples/FileToJdbcApp/CustomParser.java
+++ b/examples/jdbc/src/main/java/org/apache/apex/examples/FileToJdbcApp/CustomParser.java
@@ -18,15 +18,14 @@
  */
 package org.apache.apex.examples.FileToJdbcApp;
 
+import java.util.regex.Pattern;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import com.datatorrent.api.Context.OperatorContext;
 import com.datatorrent.api.DefaultInputPort;
 import com.datatorrent.api.DefaultOutputPort;
 import com.datatorrent.api.annotation.OutputPortFieldAnnotation;
 import com.datatorrent.common.util.BaseOperator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.regex.Pattern;
 
 // parse input line into pojo event
 public class CustomParser extends BaseOperator
@@ -42,12 +41,11 @@ public class CustomParser extends BaseOperator
   @OutputPortFieldAnnotation(optional = false)
   public final transient DefaultOutputPort<PojoEvent> output = new DefaultOutputPort<>();
 
-  public final transient DefaultInputPort<String>
-    input = new DefaultInputPort<String>() {
-
-      @Override
-      public void process(String line)
-      {
+  public final transient DefaultInputPort<String> input = new DefaultInputPort<String>()
+  {
+    @Override
+    public void process(String line)
+    {
       // use custom regex to split line into words
       final String[] words = regexPattern.split(line);
 
@@ -70,14 +68,16 @@ public void process(String line)
         pojo.setAmount(0);
       }
       output.emit(pojo);
-      }
+    }
   };
 
-  public String getRegexStr() {
+  public String getRegexStr()
+  {
     return this.regexStr;
   }
 
-  public void setRegexStr(String regex) {
+  public void setRegexStr(String regex)
+  {
     this.regexStr = regex;
   }
 
diff --git a/examples/jdbc/src/main/java/org/apache/apex/examples/FileToJdbcApp/FileReader.java b/examples/jdbc/src/main/java/org/apache/apex/examples/FileToJdbcApp/FileReader.java
index 4065a5fc83..89515f70e5 100755
--- a/examples/jdbc/src/main/java/org/apache/apex/examples/FileToJdbcApp/FileReader.java
+++ b/examples/jdbc/src/main/java/org/apache/apex/examples/FileToJdbcApp/FileReader.java
@@ -1,10 +1,29 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 org.apache.apex.examples.FileToJdbcApp;
 
-import com.datatorrent.api.DefaultOutputPort;
 import org.apache.apex.malhar.lib.fs.LineByLineFileInputOperator;
 
-public class FileReader extends LineByLineFileInputOperator{
+import com.datatorrent.api.DefaultOutputPort;
 
+public class FileReader extends LineByLineFileInputOperator
+{
   /**
    * output in bytes to match CsvParser input type
    */
diff --git a/examples/jdbc/src/main/java/org/apache/apex/examples/FileToJdbcApp/FileToJdbcCsvParser.java b/examples/jdbc/src/main/java/org/apache/apex/examples/FileToJdbcApp/FileToJdbcCsvParser.java
index d60b275756..be1db6b50a 100755
--- a/examples/jdbc/src/main/java/org/apache/apex/examples/FileToJdbcApp/FileToJdbcCsvParser.java
+++ b/examples/jdbc/src/main/java/org/apache/apex/examples/FileToJdbcApp/FileToJdbcCsvParser.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 org.apache.apex.examples.FileToJdbcApp;
 
 import java.util.List;
@@ -19,10 +37,11 @@
 import static java.sql.Types.VARCHAR;
 
 @ApplicationAnnotation(name = "FileToJdbcCsvParser")
-public class FileToJdbcCsvParser implements StreamingApplication{
-
+public class FileToJdbcCsvParser implements StreamingApplication
+{
   @Override
-  public void populateDAG(DAG dag, Configuration configuration) {
+  public void populateDAG(DAG dag, Configuration configuration)
+  {
     // create operators
     FileReader fileReader = dag.addOperator("FileReader", FileReader.class);
     CsvParser csvParser = dag.addOperator("CsvParser", CsvParser.class);
@@ -45,9 +64,10 @@ public void populateDAG(DAG dag, Configuration configuration) {
      * This method can be modified to have field mappings based on used defined
      * class
      */
-  private List<JdbcFieldInfo> addFieldInfos() {
+  private List<JdbcFieldInfo> addFieldInfos()
+  {
     List<JdbcFieldInfo> fieldInfos = Lists.newArrayList();
-    fieldInfos.add(new JdbcFieldInfo("ACCOUNT_NO", "accountNumber", JdbcFieldInfo.SupportType.INTEGER , INTEGER));
+    fieldInfos.add(new JdbcFieldInfo("ACCOUNT_NO", "accountNumber", JdbcFieldInfo.SupportType.INTEGER, INTEGER));
     fieldInfos.add(new JdbcFieldInfo("NAME", "name", JdbcFieldInfo.SupportType.STRING, VARCHAR));
     fieldInfos.add(new JdbcFieldInfo("AMOUNT", "amount", JdbcFieldInfo.SupportType.INTEGER, INTEGER));
     return fieldInfos;
diff --git a/examples/jdbc/src/main/java/org/apache/apex/examples/FileToJdbcApp/FileToJdbcCustomParser.java b/examples/jdbc/src/main/java/org/apache/apex/examples/FileToJdbcApp/FileToJdbcCustomParser.java
index 42d1d235fb..037ca51063 100755
--- a/examples/jdbc/src/main/java/org/apache/apex/examples/FileToJdbcApp/FileToJdbcCustomParser.java
+++ b/examples/jdbc/src/main/java/org/apache/apex/examples/FileToJdbcApp/FileToJdbcCustomParser.java
@@ -1,24 +1,45 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 org.apache.apex.examples.FileToJdbcApp;
 
+import java.util.List;
+
+import org.apache.hadoop.conf.Configuration;
+
+import com.google.common.collect.Lists;
+
 import com.datatorrent.api.DAG;
 import com.datatorrent.api.StreamingApplication;
 import com.datatorrent.api.annotation.ApplicationAnnotation;
 import com.datatorrent.lib.db.jdbc.JdbcFieldInfo;
 import com.datatorrent.lib.db.jdbc.JdbcPOJOInsertOutputOperator;
 import com.datatorrent.lib.db.jdbc.JdbcTransactionalStore;
-import com.google.common.collect.Lists;
-import org.apache.hadoop.conf.Configuration;
-
-import java.util.List;
 
 import static java.sql.Types.INTEGER;
 import static java.sql.Types.VARCHAR;
 
 @ApplicationAnnotation(name = "FileToJdbcCustomParser")
-public class FileToJdbcCustomParser implements StreamingApplication{
-
+public class FileToJdbcCustomParser implements StreamingApplication
+{
   @Override
-  public void populateDAG(DAG dag, Configuration configuration) {
+  public void populateDAG(DAG dag, Configuration configuration)
+  {
     // create operators
     FileReader fileReader = dag.addOperator("FileReader", FileReader.class);
     CustomParser customParser = dag.addOperator("CustomParser", CustomParser.class);
@@ -41,7 +62,7 @@ public void populateDAG(DAG dag, Configuration configuration) {
   private List<JdbcFieldInfo> addFieldInfos()
   {
     List<JdbcFieldInfo> fieldInfos = Lists.newArrayList();
-    fieldInfos.add(new JdbcFieldInfo("ACCOUNT_NO", "accountNumber", JdbcFieldInfo.SupportType.INTEGER , INTEGER));
+    fieldInfos.add(new JdbcFieldInfo("ACCOUNT_NO", "accountNumber", JdbcFieldInfo.SupportType.INTEGER, INTEGER));
     fieldInfos.add(new JdbcFieldInfo("NAME", "name", JdbcFieldInfo.SupportType.STRING, VARCHAR));
     fieldInfos.add(new JdbcFieldInfo("AMOUNT", "amount", JdbcFieldInfo.SupportType.INTEGER, INTEGER));
     return fieldInfos;
diff --git a/examples/jdbc/src/main/java/org/apache/apex/examples/FileToJdbcApp/PojoEvent.java b/examples/jdbc/src/main/java/org/apache/apex/examples/FileToJdbcApp/PojoEvent.java
index 6de92744bc..2ce2d9f6d0 100755
--- a/examples/jdbc/src/main/java/org/apache/apex/examples/FileToJdbcApp/PojoEvent.java
+++ b/examples/jdbc/src/main/java/org/apache/apex/examples/FileToJdbcApp/PojoEvent.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 org.apache.apex.examples.FileToJdbcApp;
 
 public class PojoEvent
diff --git a/examples/jdbc/src/main/java/org/apache/apex/examples/JdbcIngest/JdbcPollerApplication.java b/examples/jdbc/src/main/java/org/apache/apex/examples/JdbcIngest/JdbcPollerApplication.java
index de47ef4cfe..4f351ef194 100644
--- a/examples/jdbc/src/main/java/org/apache/apex/examples/JdbcIngest/JdbcPollerApplication.java
+++ b/examples/jdbc/src/main/java/org/apache/apex/examples/JdbcIngest/JdbcPollerApplication.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 org.apache.apex.examples.JdbcIngest;
 
 import java.util.List;
diff --git a/examples/jdbc/src/main/java/org/apache/apex/examples/JdbcIngest/PojoEvent.java b/examples/jdbc/src/main/java/org/apache/apex/examples/JdbcIngest/PojoEvent.java
index be366b6ac3..5a6646428a 100644
--- a/examples/jdbc/src/main/java/org/apache/apex/examples/JdbcIngest/PojoEvent.java
+++ b/examples/jdbc/src/main/java/org/apache/apex/examples/JdbcIngest/PojoEvent.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 org.apache.apex.examples.JdbcIngest;
 
 public class PojoEvent
diff --git a/examples/jdbc/src/main/java/org/apache/apex/examples/JdbcToJdbc/JdbcToJdbcApp.java b/examples/jdbc/src/main/java/org/apache/apex/examples/JdbcToJdbc/JdbcToJdbcApp.java
index e85e4affe9..53a41eaa5a 100644
--- a/examples/jdbc/src/main/java/org/apache/apex/examples/JdbcToJdbc/JdbcToJdbcApp.java
+++ b/examples/jdbc/src/main/java/org/apache/apex/examples/JdbcToJdbc/JdbcToJdbcApp.java
@@ -84,7 +84,7 @@ private List<com.datatorrent.lib.db.jdbc.JdbcFieldInfo> addJdbcFieldInfos()
     fieldInfos.add(new com.datatorrent.lib.db.jdbc.JdbcFieldInfo("AMOUNT", "amount", SupportType.INTEGER,0));
     return fieldInfos;
   }
-  
+
   /**
    * This method can be modified to have field mappings based on used defined
    * class
diff --git a/examples/jdbc/src/main/java/org/apache/apex/examples/JdbcToJdbc/PojoEvent.java b/examples/jdbc/src/main/java/org/apache/apex/examples/JdbcToJdbc/PojoEvent.java
index 0abf74d8d2..f40d9302a9 100644
--- a/examples/jdbc/src/main/java/org/apache/apex/examples/JdbcToJdbc/PojoEvent.java
+++ b/examples/jdbc/src/main/java/org/apache/apex/examples/JdbcToJdbc/PojoEvent.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 org.apache.apex.examples.JdbcToJdbc;
 
 public class PojoEvent
diff --git a/examples/jdbc/src/main/resources/META-INF/properties-FileToJdbcApp.xml b/examples/jdbc/src/main/resources/META-INF/properties-FileToJdbcApp.xml
index 29b911b5e0..53374fc7a8 100755
--- a/examples/jdbc/src/main/resources/META-INF/properties-FileToJdbcApp.xml
+++ b/examples/jdbc/src/main/resources/META-INF/properties-FileToJdbcApp.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you 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.
+
+-->
 <configuration>
   <property>
     <name>dt.operator.JdbcOutput.prop.store.databaseDriver</name>
diff --git a/examples/jdbc/src/main/resources/META-INF/properties-JdbcToJdbcApp.xml b/examples/jdbc/src/main/resources/META-INF/properties-JdbcToJdbcApp.xml
index d9199c67e3..b32f8cc58e 100644
--- a/examples/jdbc/src/main/resources/META-INF/properties-JdbcToJdbcApp.xml
+++ b/examples/jdbc/src/main/resources/META-INF/properties-JdbcToJdbcApp.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you 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.
+
+-->
 <configuration>
   <!-- <property> <name>dt.application.{appName}.operator.{opName}.prop.{propName}</name> 
     <value>some-default-value (if value is not specified, it is required from 
diff --git a/examples/jdbc/src/main/resources/META-INF/properties-PollJdbcToHDFSApp.xml b/examples/jdbc/src/main/resources/META-INF/properties-PollJdbcToHDFSApp.xml
index b67f845f20..c75c7b6c0c 100644
--- a/examples/jdbc/src/main/resources/META-INF/properties-PollJdbcToHDFSApp.xml
+++ b/examples/jdbc/src/main/resources/META-INF/properties-PollJdbcToHDFSApp.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you 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.
+
+-->
 <configuration>
     <!-- Static partitioning, specify the partition count, this decides how 
         many ranges would be initiated -->
diff --git a/examples/jdbc/src/main/resources/META-INF/properties-SimpleJdbcToHDFSApp.xml b/examples/jdbc/src/main/resources/META-INF/properties-SimpleJdbcToHDFSApp.xml
index 589dbcda5f..a57dcf735b 100644
--- a/examples/jdbc/src/main/resources/META-INF/properties-SimpleJdbcToHDFSApp.xml
+++ b/examples/jdbc/src/main/resources/META-INF/properties-SimpleJdbcToHDFSApp.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you 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.
+
+-->
 <configuration>
   <!-- <property> <name>dt.application.{appName}.operator.{opName}.prop.{propName}</name> 
     <value>some-default-value (if value is not specified, it is required from 
diff --git a/examples/jdbc/src/test/java/org/apache/apex/examples/FileToJdbcApp/ApplicationTest.java b/examples/jdbc/src/test/java/org/apache/apex/examples/FileToJdbcApp/ApplicationTest.java
index 3024836cc1..8fe0f4183f 100755
--- a/examples/jdbc/src/test/java/org/apache/apex/examples/FileToJdbcApp/ApplicationTest.java
+++ b/examples/jdbc/src/test/java/org/apache/apex/examples/FileToJdbcApp/ApplicationTest.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 org.apache.apex.examples.FileToJdbcApp;
 
 import java.io.File;
@@ -25,13 +43,15 @@
  * The assumption to run this test case is that test_jdbc_table
  * and meta-table are created already.
  */
-public class ApplicationTest {
+public class ApplicationTest
+{
   private static final String DB_DRIVER = "org.hsqldb.jdbcDriver";
   private static final String DB_URL = "jdbc:hsqldb:mem:test;sql.syntax_mys=true";
   private static final String TABLE_NAME = "test_jdbc_table";
 
   @BeforeClass
-  public static void setup() {
+  public static void setup()
+  {
     try {
       Class.forName(DB_DRIVER).newInstance();
 
@@ -39,16 +59,16 @@ public static void setup() {
       Statement stmt = con.createStatement();
 
       String createMetaTable = "CREATE TABLE IF NOT EXISTS " + JdbcTransactionalStore.DEFAULT_META_TABLE + " ( "
-              + JdbcTransactionalStore.DEFAULT_APP_ID_COL + " VARCHAR(100) NOT NULL, "
-              + JdbcTransactionalStore.DEFAULT_OPERATOR_ID_COL + " INT NOT NULL, "
-              + JdbcTransactionalStore.DEFAULT_WINDOW_COL + " BIGINT NOT NULL, "
-              + "UNIQUE (" + JdbcTransactionalStore.DEFAULT_APP_ID_COL + ", "
-              + JdbcTransactionalStore.DEFAULT_OPERATOR_ID_COL + ", " + JdbcTransactionalStore.DEFAULT_WINDOW_COL + ") "
-              + ")";
+          + JdbcTransactionalStore.DEFAULT_APP_ID_COL + " VARCHAR(100) NOT NULL, "
+          + JdbcTransactionalStore.DEFAULT_OPERATOR_ID_COL + " INT NOT NULL, "
+          + JdbcTransactionalStore.DEFAULT_WINDOW_COL + " BIGINT NOT NULL, "
+          + "UNIQUE (" + JdbcTransactionalStore.DEFAULT_APP_ID_COL + ", "
+          + JdbcTransactionalStore.DEFAULT_OPERATOR_ID_COL + ", " + JdbcTransactionalStore.DEFAULT_WINDOW_COL + ") "
+          + ")";
       stmt.executeUpdate(createMetaTable);
 
       String createTable = "CREATE TABLE IF NOT EXISTS " + TABLE_NAME
-              + " (ACCOUNT_NO INTEGER, NAME VARCHAR(255),AMOUNT INTEGER)";
+          + " (ACCOUNT_NO INTEGER, NAME VARCHAR(255),AMOUNT INTEGER)";
       stmt.executeUpdate(createTable);
 
     } catch (Throwable e) {
@@ -85,7 +105,8 @@ public int getNumOfEventsInStore()
   }
 
   @Test
-  public void testCsvParserApp() throws IOException, Exception {
+  public void testCsvParserApp() throws IOException, Exception
+  {
     try {
       LocalMode lma = LocalMode.newInstance();
       Configuration conf = new Configuration(false);
@@ -107,7 +128,8 @@ public void testCsvParserApp() throws IOException, Exception {
   }
 
   @Test
-  public void testCustomParserApp() throws IOException, Exception {
+  public void testCustomParserApp() throws IOException, Exception
+  {
     try {
       LocalMode lma = LocalMode.newInstance();
       Configuration conf = new Configuration(false);
diff --git a/examples/jdbc/src/test/java/org/apache/apex/examples/JdbcIngest/JdbcInputAppTest.java b/examples/jdbc/src/test/java/org/apache/apex/examples/JdbcIngest/JdbcInputAppTest.java
index 574534fb64..6011030cb8 100644
--- a/examples/jdbc/src/test/java/org/apache/apex/examples/JdbcIngest/JdbcInputAppTest.java
+++ b/examples/jdbc/src/test/java/org/apache/apex/examples/JdbcIngest/JdbcInputAppTest.java
@@ -123,10 +123,10 @@ public void testApplication() throws Exception
       LocalMode.Controller lc = lma.getController();
       lc.runAsync();
 
-      // wait for output files to roll      
+      // wait for output files to roll
       Thread.sleep(5000);
 
-      String[] extensions = { "dat.0", "tmp" };
+      String[] extensions = {"dat.0","tmp"};
       Collection<File> list = FileUtils.listFiles(new File(FILE_NAME), extensions, false);
       Assert.assertEquals("Records in file", 10, FileUtils.readLines(list.iterator().next()).size());
 
diff --git a/examples/jdbc/src/test/java/org/apache/apex/examples/JdbcIngest/JdbcPollerApplicationTest.java b/examples/jdbc/src/test/java/org/apache/apex/examples/JdbcIngest/JdbcPollerApplicationTest.java
index 91c8f27a4b..95ead8b0ac 100644
--- a/examples/jdbc/src/test/java/org/apache/apex/examples/JdbcIngest/JdbcPollerApplicationTest.java
+++ b/examples/jdbc/src/test/java/org/apache/apex/examples/JdbcIngest/JdbcPollerApplicationTest.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 org.apache.apex.examples.JdbcIngest;
 
 import java.io.File;
@@ -111,10 +129,10 @@ public void testApplication() throws Exception
       LocalMode.Controller lc = lma.getController();
       lc.runAsync();
 
-      // wait for output files to roll      
+      // wait for output files to roll
       Thread.sleep(45000);
 
-      String[] extensions = { "dat.0", "tmp" };
+      String[] extensions = {"dat.0","tmp"};
       Collection<File> list = FileUtils.listFiles(new File(OUTPUT_DIR_NAME), extensions, false);
       int recordsCount = 0;
       for (File file : list) {
diff --git a/examples/jdbc/src/test/java/org/apache/apex/examples/JdbcToJdbc/ApplicationTest.java b/examples/jdbc/src/test/java/org/apache/apex/examples/JdbcToJdbc/ApplicationTest.java
index 79c7235ade..010a641a12 100644
--- a/examples/jdbc/src/test/java/org/apache/apex/examples/JdbcToJdbc/ApplicationTest.java
+++ b/examples/jdbc/src/test/java/org/apache/apex/examples/JdbcToJdbc/ApplicationTest.java
@@ -1,5 +1,20 @@
 /**
- * Put your copyright and license info here.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 org.apache.apex.examples.JdbcToJdbc;
 
diff --git a/examples/jdbc/src/test/java/org/apache/apex/examples/JdbcToJdbc/JdbcOperatorTest.java b/examples/jdbc/src/test/java/org/apache/apex/examples/JdbcToJdbc/JdbcOperatorTest.java
index 4ecc52db0b..c3fe32fe55 100644
--- a/examples/jdbc/src/test/java/org/apache/apex/examples/JdbcToJdbc/JdbcOperatorTest.java
+++ b/examples/jdbc/src/test/java/org/apache/apex/examples/JdbcToJdbc/JdbcOperatorTest.java
@@ -58,7 +58,7 @@ public static void setup()
     } catch (Exception e) {
       throw new RuntimeException(e);
     }
-    
+
     try {
       Class.forName(DB_DRIVER).newInstance();
 
@@ -71,8 +71,7 @@ public static void setup()
           + JdbcTransactionalStore.DEFAULT_WINDOW_COL + " BIGINT NOT NULL, " + "UNIQUE ("
           + JdbcTransactionalStore.DEFAULT_APP_ID_COL + ", " + JdbcTransactionalStore.DEFAULT_OPERATOR_ID_COL + ", "
           + JdbcTransactionalStore.DEFAULT_WINDOW_COL + ") " + ")";
-      
-      System.out.println(createMetaTable);
+
       stmt.executeUpdate(createMetaTable);
 
       String createTable = "CREATE TABLE " + TABLE_NAME
@@ -147,7 +146,7 @@ public void testApplication() throws Exception
       LocalMode.Controller lc = lma.getController();
       lc.runAsync();
 
-      // wait for records to be added to table    
+      // wait for records to be added to table
       Thread.sleep(5000);
 
       Assert.assertEquals("Events in store", 10, getNumOfEventsInStore());
diff --git a/examples/jdbc/src/test/resources/example-FileToJdbcApp.sql b/examples/jdbc/src/test/resources/example-FileToJdbcApp-sql.txt
similarity index 100%
rename from examples/jdbc/src/test/resources/example-FileToJdbcApp.sql
rename to examples/jdbc/src/test/resources/example-FileToJdbcApp-sql.txt
diff --git a/examples/jdbc/src/test/resources/example-JdbcIngest.sql b/examples/jdbc/src/test/resources/example-JdbcIngest-sql.txt
similarity index 100%
rename from examples/jdbc/src/test/resources/example-JdbcIngest.sql
rename to examples/jdbc/src/test/resources/example-JdbcIngest-sql.txt
diff --git a/examples/jdbc/src/test/resources/example-JdbcToJdbc.sql b/examples/jdbc/src/test/resources/example-JdbcToJdbc-sql.txt
similarity index 100%
rename from examples/jdbc/src/test/resources/example-JdbcToJdbc.sql
rename to examples/jdbc/src/test/resources/example-JdbcToJdbc-sql.txt
diff --git a/examples/jdbc/src/test/resources/log4j.properties b/examples/jdbc/src/test/resources/log4j.properties
index 3bfcdc5517..0a1b8cba5b 100644
--- a/examples/jdbc/src/test/resources/log4j.properties
+++ b/examples/jdbc/src/test/resources/log4j.properties
@@ -1,8 +1,29 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+#
+
 log4j.rootLogger=DEBUG,CONSOLE
 
 log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
 log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
 log4j.appender.CONSOLE.layout.ConversionPattern=%d{ISO8601} [%t] %-5p %c{2} %M - %m%n
+log4j.appender.CONSOLE.threshold=${test.log.console.threshold}
+test.log.console.threshold=WARN
 
 log4j.appender.RFA=org.apache.log4j.RollingFileAppender
 log4j.appender.RFA.layout=org.apache.log4j.PatternLayout
diff --git a/examples/jdbc/src/test/resources/test-FileToJdbcApp.xml b/examples/jdbc/src/test/resources/test-FileToJdbcApp.xml
index 477cdbf5ef..11bd9ae7a1 100755
--- a/examples/jdbc/src/test/resources/test-FileToJdbcApp.xml
+++ b/examples/jdbc/src/test/resources/test-FileToJdbcApp.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you 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.
+
+-->
 <configuration>
   <property>
     <name>dt.operator.JdbcOutput.prop.store.databaseDriver</name>