merge conflictsMerge branch 'dev' of https://git.zipcode.rocks/shiv-365/wyd-on-my-network into dev

.editorconfig

@@ -1,17 +0,0 @@
-# EditorConfig helps developers define and maintain consistent coding styles between different editors and IDEs
-# editorconfig.org
-
-root = true
-
-[*]
-indent_style = space
-indent_size = 2
-
-# We recommend you to keep these unchanged
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.md]
-trim_trailing_whitespace = false

.gitignore

@@ -8,4 +8,3 @@ target/generated-sources/
 target/generated-test-sources/
 target/test-classes/
 
-

target/classes/application.properties

@@ -0,0 +1,38 @@
+# ===============================
+# TOMCAT
+# ===============================
+#server.address=127.0.0.1
+#server.error.whitelabel.enabled=true
+## ===============================
+## = LOGGING
+## ===============================
+#logging.level.org.springframework.web=DEBUG
+#logging.level.org.hibernate=ERROR
+#
+## ===============================
+## = DATA SOURCE
+## ===============================
+#spring.datasource.url=jdbc:mysql://localhost:3306/pcap
+#spring.datasource.username=root
+#spring.datasource.password=
+#spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+#spring.datasource.tomcat.max-wait=10000
+#spring.datasource.tomcat.max-active=5
+#spring.datasource.tomcat.test-on-borrow=true
+#
+## ===============================
+## = JPA / HIBERNATE
+## ===============================
+#spring.jpa.show-sql = true
+#spring.jpa.hibernate.ddl-auto = create-drop
+##change to update once functional
+
+#app.config.redis.host=localhost
+#app.config.redis.port=6379
+#app.config.redis.user=
+#app.config.redis.password=
+
+
+spring.redis.host= localhost
+
+spring.redis.port= 6379

target/maven-archiver/pom.properties

@@ -0,0 +1,4 @@
+#Created by Apache Maven 3.5.4
+version=1.0.0
+groupId=com.wyds.packets
+artifactId=pcap

target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -0,0 +1,9 @@
+com/wyds/Loader/PacketLoader.class
+com/wyds/PacketController/PacketController.class
+com/wyds/packets/Capture.class
+com/wyds/PacketTracker.class
+com/wyds/config/SpringSessionRedisConfiguration.class
+com/wyds/packets/PacketParser.class
+com/wyds/packets/PacketMapper.class
+com/wyds/packets/PacketEntity.class
+com/wyds/PacketRepo/PacketRep.class

target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,9 @@
+/Users/shivamp/Desktop/wydsProject/pcap/src/main/java/com/wyds/packets/Capture.java
+/Users/shivamp/Desktop/wydsProject/pcap/src/main/java/com/wyds/PacketRepo/PacketRep.java
+/Users/shivamp/Desktop/wydsProject/pcap/src/main/java/com/wyds/Loader/PacketLoader.java
+/Users/shivamp/Desktop/wydsProject/pcap/src/main/java/com/wyds/PacketController/PacketController.java
+/Users/shivamp/Desktop/wydsProject/pcap/src/main/java/com/wyds/packets/PacketEntity.java
+/Users/shivamp/Desktop/wydsProject/pcap/src/main/java/com/wyds/packets/PacketMapper.java
+/Users/shivamp/Desktop/wydsProject/pcap/src/main/java/com/wyds/packets/PacketParser.java
+/Users/shivamp/Desktop/wydsProject/pcap/src/main/java/com/wyds/config/SpringSessionRedisConfiguration.java
+/Users/shivamp/Desktop/wydsProject/pcap/src/main/java/com/wyds/PacketTracker.java