Team 02 - Pull Request - PM1 #1

RyanHotton · 2018-03-15T01:12:42Z

PM2 Part 3 - Step 1

Implemented initial setup for the XML parsing. Approved-by: Miqdad Amirali <[email protected]> Approved-by: Ryan Hotton <[email protected]>

updated the set up to include the interface and sub classes Approved-by: Ryan Hotton <[email protected]> Approved-by: Sophia Kavousifard <[email protected]>

…term. Tested it using the RSS parser.

… clashes with Ryan's XPath implementation.

…alue pairs

Added XPath parsing and made a class for it so it can be called anywhere. Approved-by: Alex Genio <[email protected]> Approved-by: George Grafos <[email protected]>

Implemented the SAX parser class to be used with or without a search term. Tested it using the RSS parser. Approved-by: Ryan Hotton <[email protected]> Approved-by: George Grafos <[email protected]>

…ing the pathToStreamAlert variable and fixed a refactoring error.

…for sending parsed xml to slack via streamalert service.

…ng the setup.

update read me with soph's changes Approved-by: Alex Genio <[email protected]> Approved-by: Ryan Hotton <[email protected]>

…738222 (pull request #15) README.md edited online with Bitbucket

…162080 (pull request #16) README.md edited online with Bitbucket

PM1 Part 3 -> PM1 branch Approved-by: Miqdad Amirali <[email protected]>

…tandalone.

…t using a search term when testing Part 3.

# Conflicts: # .gitignore # README.md

smokhov · 2018-03-24T13:27:47Z

within this PR there is too much unneeded history stuff -- like project templates, PM1.1 and PM1.2; this can be fixed either via git rebase -i in your fork and pick only PM2.3-related commits; then followed by git push --force to rewrite the history, and this will automatically update your PR here; OR, I merge that into a branch; do the same here to clean it all up, but your fork would still have old cruft unless you force-rebase it from here

smokhov · 2018-03-24T13:29:32Z

.gitignore

@@ -1,3 +1,84 @@
+<<<<<<< HEAD


conflicts should be resolved before pushing

Will be fixed

@smokhov just to clarify, you want us to now update the pull request with PM2.3 content instead of just PM1 content?

Thank you for your time.

smokhov · 2018-03-24T13:34:38Z

src/client/streamalert/util/LiveTest.java

+ * LiveTest.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter.


is is valid?

Create parser Approved-by: Darrel-Day Guerrero <[email protected]>

smokhov and others added 30 commits January 28, 2016 13:02

Bootstrap mater template.

c7507bf

Sync bib.

8d86ff1

Sync bib fix.

c4f2bea

updated gitignore

2e1aeee

pm1 branch with pm1 folder

4dc1cbb

added structure and project

06ec047

Merge branch 'pm1' of https://bitbucket.org/soen487-w18-02/soen487-w1…

6dc0744

…8-team02 into pm1

created main

cfa7647

testing git commit

3bc0458

Created package structure for exercise 1 and put in a main.

86283ac

Implemented initial setup for the XML parsing.

6f2d913

Implemented inline comments made in PR.

e4b9dfb

Implemented inline comments made in PR (cont'd).

a844100

Merged in pm1-setup (pull request NAG-DevOps#1)

e15e269

Implemented initial setup for the XML parsing. Approved-by: Miqdad Amirali <[email protected]> Approved-by: Ryan Hotton <[email protected]>

updated teh set up to include the interface and sub classes

c78461c

Merged in pm1-set-up-interface (pull request NAG-DevOps#2)

4d80888

updated the set up to include the interface and sub classes Approved-by: Ryan Hotton <[email protected]> Approved-by: Sophia Kavousifard <[email protected]>

worked on xpath

4d66dbb

fixing merge issue

6508c45

Implemented the SAX parser class to be used with or without a search …

5499ada

…term. Tested it using the RSS parser.

added xpath parsing and adjusted class structure a bit

b04f60e

Moved calling SAX parser from RSS parser to MARFCATIN parser to avoid…

f409074

… clashes with Ryan's XPath implementation.

removed redundancy, as requested

a0df8eb

removed main from xpath parser

bf6177e

non recursive dom parser that prints out nodes as well as attribute-v…

4eb4b4b

…alue pairs

Merged in pm1-xpath (pull request #4)

c520a0b

Added XPath parsing and made a class for it so it can be called anywhere. Approved-by: Alex Genio <[email protected]> Approved-by: George Grafos <[email protected]>

Resolving conflicts.

8e1676f

Merged in pm1-sax-parser (pull request #3)

98d1789

Implemented the SAX parser class to be used with or without a search term. Tested it using the RSS parser. Approved-by: Ryan Hotton <[email protected]> Approved-by: George Grafos <[email protected]>

Renamed the sax parser and updated the WSDL file link.

cde05ec

minor clean ups

465936f

fixed indentation

d5d659c

AlexGenio and others added 25 commits February 21, 2018 22:42

Renamed project.

2c4c2f6

Updated ReadMe for PM1 part 3 service creation.

ad16151

Made adjustments to the Part 3 of the readme. Forgot to mention chang…

a1a04ec

…ing the pathToStreamAlert variable and fixed a refactoring error.

Added dependency on preconfigured setup documentation

0e5c0cb

Updated xml parser to adhere to streamalert format. Generated client …

dc8363c

…for sending parsed xml to slack via streamalert service.

Edited main README to explain our structure.

f4418dc

Added the streamalert configs that were either added or modified duri…

ef5ca44

…ng the setup.

Added description of the streamalert config files.

ad3a9fa

update read me with soph's changes

bbaded1

update read me

73cd7c9

typos in read me

e612ed9

typos in read me

6d2e8bc

Merged in update-read-me (pull request #13)

bd3fb7d

update read me with soph's changes Approved-by: Alex Genio <[email protected]> Approved-by: Ryan Hotton <[email protected]>

README.md added notes that I forgot to mention before.

9e6f5db

README.md fixed notes styling

6e2e762

README.md updated according to Miq's comments on my last commit.

6b711e6

README.md edited online with Bitbucket

a972bd3

Merged in miqdadamirali/readmemd-edited-online-with-bitbucket-1519590…

15c8f41

…738222 (pull request #15) README.md edited online with Bitbucket

README.md edited online with Bitbucket

9919b46

Merged in miqdadamirali/readmemd-edited-online-with-bitbucket-1519591…

f22c1cc

…162080 (pull request #16) README.md edited online with Bitbucket

Cleaned up a bit.

ba5cdd3

Merged in pm1-streamalert-client (pull request #14)

313975d

PM1 Part 3 -> PM1 branch Approved-by: Miqdad Amirali <[email protected]>

README.md added notes in part 2 to explain what to do to run part 2 s…

3fd1cb0

…tandalone.

README.md fixed typos and added section in the notes that mentions no…

4e0bdfc

…t using a search term when testing Part 3.

Merge branch 'pm1' of bitbucket.org:soen487-w18-02/soen487-w18-team02

46ca42e

# Conflicts: # .gitignore # README.md

smokhov reviewed Mar 24, 2018

View reviewed changes

Fix conflicts

ba2e681

smokhov reviewed Mar 24, 2018

View reviewed changes

Skellyboy38 pushed a commit to Skellyboy38/streamalert-ws that referenced this pull request Mar 26, 2018

Merged in create_parser (pull request NAG-DevOps#1)

fe8bd75

Create parser Approved-by: Darrel-Day Guerrero <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Team 02 - Pull Request - PM1 #1

Team 02 - Pull Request - PM1 #1

RyanHotton commented Mar 15, 2018

smokhov commented Mar 24, 2018

smokhov Mar 24, 2018

RyanHotton Mar 27, 2018

RyanHotton Mar 27, 2018

smokhov Mar 24, 2018

Team 02 - Pull Request - PM1 #1

Are you sure you want to change the base?

Team 02 - Pull Request - PM1 #1

Conversation

RyanHotton commented Mar 15, 2018

smokhov commented Mar 24, 2018

smokhov Mar 24, 2018

Choose a reason for hiding this comment

RyanHotton Mar 27, 2018

Choose a reason for hiding this comment

RyanHotton Mar 27, 2018

Choose a reason for hiding this comment

smokhov Mar 24, 2018

Choose a reason for hiding this comment