diff --git a/ONFTappingApp.config b/ONFTappingApp.config
index 2d2ddc5..bcb921d 100644
--- a/ONFTappingApp.config
+++ b/ONFTappingApp.config
@@ -4,6 +4,5 @@
 MongoDBPort=27017
 MongoDBUsername=
 MongoDBPassword=
-www-rootdir=/home/wiretap/ONF-ODL/OpenDaylight/controller/opendaylight/distribution/opendaylight/target/distribution.opendaylight-os
-gipackage/opendaylight/www/app
+www-rootdir=/home/odl/controller/opendaylight/samples/SampleTap/web-ui/tapping-ui_2.6
 # End of file
diff --git a/src/main/java/org/opendaylight/controller/samples/#license.txt# b/src/main/java/org/opendaylight/controller/samples/#license.txt#
index b9fe6a4..a6e4282 100644
--- a/src/main/java/org/opendaylight/controller/samples/#license.txt#
+++ b/src/main/java/org/opendaylight/controller/samples/#license.txt#
@@ -2,8 +2,8 @@
 
 Copyright ��2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/add-license.sh b/src/main/java/org/opendaylight/controller/samples/add-license.sh
index b9befc1..8ed6d60 100755
--- a/src/main/java/org/opendaylight/controller/samples/add-license.sh
+++ b/src/main/java/org/opendaylight/controller/samples/add-license.sh
@@ -2,5 +2,5 @@
 
 for filename in *.java
 do
-  cat ../license.txt $filename > new/$filename 
+  cat ../license.txt $filename > new/$filename
 done
\ No newline at end of file
diff --git a/src/main/java/org/opendaylight/controller/samples/license.txt b/src/main/java/org/opendaylight/controller/samples/license.txt
index 1269bc3..672ac79 100644
--- a/src/main/java/org/opendaylight/controller/samples/license.txt
+++ b/src/main/java/org/opendaylight/controller/samples/license.txt
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/AddressDesc.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/AddressDesc.java
index 0edb3d1..94aa8d8 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/AddressDesc.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/AddressDesc.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/CaptureDev.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/CaptureDev.java
index 19c6609..6a3c3fe 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/CaptureDev.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/CaptureDev.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/CaptureTypeEnum.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/CaptureTypeEnum.java
index 738be16..b929641 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/CaptureTypeEnum.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/CaptureTypeEnum.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/DBAuthenticationException.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/DBAuthenticationException.java
index 0d9893f..e9c5c8f 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/DBAuthenticationException.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/DBAuthenticationException.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/DBTableChangeEnum.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/DBTableChangeEnum.java
index d31f040..d607e2c 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/DBTableChangeEnum.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/DBTableChangeEnum.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/DatabaseConnectException.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/DatabaseConnectException.java
index 3133933..0679558 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/DatabaseConnectException.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/DatabaseConnectException.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/DatabaseNames.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/DatabaseNames.java
index 3a1dd0a..b32272a 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/DatabaseNames.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/DatabaseNames.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/DuplicateEntryException.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/DuplicateEntryException.java
index b7f1f18..f594fd9 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/DuplicateEntryException.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/DuplicateEntryException.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/EntryField.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/EntryField.java
index 9585d5d..2919b35 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/EntryField.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/EntryField.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/InconsistentDatabaseException.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/InconsistentDatabaseException.java
index 8365f60..8fe8a42 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/InconsistentDatabaseException.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/InconsistentDatabaseException.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/LinkStateEnum.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/LinkStateEnum.java
index ce0e1dd..da83b76 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/LinkStateEnum.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/LinkStateEnum.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/LoggedMessage.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/LoggedMessage.java
index f997ecf..8e18e8b 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/LoggedMessage.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/LoggedMessage.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/LoggingLevelEnum.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/LoggingLevelEnum.java
index 59cb225..d3e3f2f 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/LoggingLevelEnum.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/LoggingLevelEnum.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/MatchCriteria.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/MatchCriteria.java
index b195c8c..cfb4628 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/MatchCriteria.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/MatchCriteria.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/MatchField.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/MatchField.java
index 40cd19d..9af962f 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/MatchField.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/MatchField.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/NextHopSwitch.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/NextHopSwitch.java
index 91ff1da..de54a18 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/NextHopSwitch.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/NextHopSwitch.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/NotFoundException.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/NotFoundException.java
index e03a699..2445387 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/NotFoundException.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/NotFoundException.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/OPFSwitch.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/OPFSwitch.java
index fea3fda..afa39df 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/OPFSwitch.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/OPFSwitch.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/OPFSwitchIsAssignedException.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/OPFSwitchIsAssignedException.java
index d0f2a62..c9701b8 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/OPFSwitchIsAssignedException.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/OPFSwitchIsAssignedException.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/OPFSwitchIsNotAssignedException.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/OPFSwitchIsNotAssignedException.java
index e093568..352cf6c 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/OPFSwitchIsNotAssignedException.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/OPFSwitchIsNotAssignedException.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/OPFSwitchNotFoundException.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/OPFSwitchNotFoundException.java
index 88826e0..0acd707 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/OPFSwitchNotFoundException.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/OPFSwitchNotFoundException.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/ObjectInUseException.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/ObjectInUseException.java
index c9ef54e..ef3cad8 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/ObjectInUseException.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/ObjectInUseException.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/PortChain.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/PortChain.java
index bd266af..32ba355 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/PortChain.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/PortChain.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/PortDescription.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/PortDescription.java
index b746d45..d2cb11f 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/PortDescription.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/PortDescription.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/PortRange.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/PortRange.java
index 53694ec..f55c6e6 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/PortRange.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/PortRange.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/PortRangeList.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/PortRangeList.java
index 6b47830..5d52be9 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/PortRangeList.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/PortRangeList.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/PortStatistics.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/PortStatistics.java
index 76e05bb..c8311af 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/PortStatistics.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/PortStatistics.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/PortStatus.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/PortStatus.java
index 628a813..a60582a 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/PortStatus.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/PortStatus.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/PortTypeEnum.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/PortTypeEnum.java
index 829b62f..6566931 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/PortTypeEnum.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/PortTypeEnum.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/ReferenceCountEnum.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/ReferenceCountEnum.java
index df58483..60ee13a 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/ReferenceCountEnum.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/ReferenceCountEnum.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/RewriteParams.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/RewriteParams.java
index c6cfb5e..f692cd1 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/RewriteParams.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/RewriteParams.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/Router.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/Router.java
index 4d109b7..e3b5495 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/Router.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/Router.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/RouterLauncher.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/RouterLauncher.java
index c55e5db..fbccceb 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/RouterLauncher.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/RouterLauncher.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/SwitchAndPort.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/SwitchAndPort.java
index 1471d23..c6b59c1 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/SwitchAndPort.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/SwitchAndPort.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/SwitchEntry.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/SwitchEntry.java
index c515687..5d44d5d 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/SwitchEntry.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/SwitchEntry.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/SwitchInfo.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/SwitchInfo.java
index df76e78..9a6acdf 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/SwitchInfo.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/SwitchInfo.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/SwitchVersionEnum.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/SwitchVersionEnum.java
index c707c12..1196560 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/SwitchVersionEnum.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/SwitchVersionEnum.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/TapAppException.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/TapAppException.java
index 709cd1b..969a720 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/TapAppException.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/TapAppException.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/TapPolicy.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/TapPolicy.java
index b25cf7f..5263546 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/TapPolicy.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/TapPolicy.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/TapPolicySummary.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/TapPolicySummary.java
index 413b2db..36d25b7 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/TapPolicySummary.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/TapPolicySummary.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/TappingApp.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/TappingApp.java
index b59431b..d0c47ff 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/TappingApp.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/TappingApp.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
@@ -122,7 +122,7 @@ public TappingApp(String appName, String hostname, ONFTappingAppImpl onfTappingA
             try {
                     loadConfigurationFromFile();
             } catch (IOException e) {
-                    logger.error(fatal, "Unable to load ONS Tapping Application configuration file");
+                    logger.error(fatal, "Unable to load ONF Tapping Application configuration file");
                     logger.debug("Exception:", e);
                     return;
             }
@@ -158,7 +158,7 @@ public void close() {
             try {
                 saveConfigurationToFile();
             } catch (IOException e) {
-                logger.error("Unable to save ONS Tapping Application configuration file");
+                logger.error("Unable to save ONF Tapping Application configuration file");
                 logger.debug("Exception:", e);
             }
         }
@@ -204,7 +204,7 @@ public static String getWwwRootdir() {
 
         private void loadConfigurationFromFile() throws IOException {
             // now load properties from last invocation
-            FileInputStream in  = new FileInputStream("ONSTappingApp.config");
+            FileInputStream in  = new FileInputStream("ONFTappingApp.config");
             applicationProps.load(in);
             in.close();
 
@@ -221,7 +221,7 @@ private void loadConfigurationFromFile() throws IOException {
 
         // Store the application properties to the configuration file
         private static void saveConfigurationToFile() throws IOException {
-            FileOutputStream out = new FileOutputStream("ONSTappingApp.config");
+            FileOutputStream out = new FileOutputStream("ONFTappingApp.config");
 
             Properties properties = new Properties();
             properties.setProperty("MongoDBUsername", mongoDBUsername);
@@ -230,7 +230,7 @@ private static void saveConfigurationToFile() throws IOException {
             String mongoPort = Integer.toString(TappingApp.getMongoDBPort());
             properties.setProperty("MongoDBPort", mongoPort);
 
-            properties.store(out, "Settings for the ONS Tapping Application");
+            properties.store(out, "Settings for the ONF Tapping Application");
             out.close();
         }
 
@@ -1671,4 +1671,4 @@ public Set<NodeConnector> getODLNodeConnectors(Node node) {
         //return this.onfTappingAppImpl.getSwitchManager().getNodeConnectors(node);
  //             .getPhysicalNodeConnectors(node);
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/TappingAppHandler.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/TappingAppHandler.java
index 67a05f8..a6c5737 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/TappingAppHandler.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/TappingAppHandler.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/TappingAppLogic.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/TappingAppLogic.java
index 324ce92..806a5b8 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/TappingAppLogic.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/TappingAppLogic.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/TappingModeEnum.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/TappingModeEnum.java
index 6de87dd..426c0da 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/TappingModeEnum.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/TappingModeEnum.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/TappingRoute.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/TappingRoute.java
index b0e95a7..3b399ce 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/TappingRoute.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/TappingRoute.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/internal/Activator.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/internal/Activator.java
index 833dc7c..c2528d3 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/internal/Activator.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/internal/Activator.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
diff --git a/src/main/java/org/opendaylight/controller/samples/onftappingapp/internal/ONFTappingAppImpl.java b/src/main/java/org/opendaylight/controller/samples/onftappingapp/internal/ONFTappingAppImpl.java
index ec6e46a..806450f 100644
--- a/src/main/java/org/opendaylight/controller/samples/onftappingapp/internal/ONFTappingAppImpl.java
+++ b/src/main/java/org/opendaylight/controller/samples/onftappingapp/internal/ONFTappingAppImpl.java
@@ -2,8 +2,8 @@
 
 Copyright ©2014 Open Networking Foundation
 
-This ONF SampleTap software is licensed under the Apache License, 
-Version 2.0 (the "License"); you may not use this file except in 
+This ONF SampleTap software is 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 original
 license at http://www.apache.org/licenses/LICENSE-2.0 and also in
 the main directory of the source distribution.
@@ -45,6 +45,7 @@
 import org.opendaylight.controller.samples.onftappingapp.DBAuthenticationException;
 import org.opendaylight.controller.samples.onftappingapp.DatabaseConnectException;
 import org.opendaylight.controller.samples.onftappingapp.TappingApp;
+import org.opendaylight.controller.samples.onftappingapp.Router;
 
 /**
  * This class implements port tapping for hosts connected to the managed devices.