Code

Team 02 - Pull Request - PM1#1

Code

Open

RyanHotton wants to merge 73 commits intoNAG-DevOps:masterNAG-DevOps/streamalert-ws:masterfrom RyanHotton:masterRyanHotton/streamalert-ws:masterCopy head branch name to clipboard

+41,617

Commits

Commits on Jan 28, 2016

• Bootstrap mater template.

  smokhov

  committed
  c7507bf

  Copy full SHA for c7507bf

Commits on Mar 7, 2016

• Sync bib.

  smokhov

  committed
  8d86ff1

  Copy full SHA for 8d86ff1

Commits on Mar 10, 2016

• Sync bib fix.

  smokhov

  committed
  c4f2bea

  Copy full SHA for c4f2bea

Commits on Feb 3, 2018

• updated gitignore

  miqdadamirali

  committed
  2e1aeee

  Copy full SHA for 2e1aeee

• pm1 branch with pm1 folder

  miqdadamirali

  committed
  4dc1cbb

  Copy full SHA for 4dc1cbb

• added structure and project

  miqdadamirali

  committed
  06ec047

  Copy full SHA for 06ec047

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

  miqdadamirali

  committed
  6dc0744

  Copy full SHA for 6dc0744

• created main

  miqdadamirali

  committed
  cfa7647

  Copy full SHA for cfa7647

• testing git commit

  RyanHotton

  committed
  3bc0458

  Copy full SHA for 3bc0458

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

  AlexGenio

  committed
  86283ac

  Copy full SHA for 86283ac

• Implemented initial setup for the XML parsing.

  AlexGenio

  committed
  6f2d913

  Copy full SHA for 6f2d913

• Implemented inline comments made in PR.

  AlexGenio

  committed
  e4b9dfb

  Copy full SHA for e4b9dfb

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

  AlexGenio

  committed
  a844100

  Copy full SHA for a844100

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

  Show description for e15e269
  

  Alex Genio

  committed
  e15e269

  Copy full SHA for e15e269

• updated teh set up to include the interface and sub classes

  miqdadamirali

  committed
  c78461c

  Copy full SHA for c78461c

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

  Show description for 4d80888
  

  Miqdad Amirali

  committed
  4d80888

  Copy full SHA for 4d80888

• worked on xpath

  RyanHotton

  committed
  4d66dbb

  Copy full SHA for 4d66dbb

Commits on Feb 4, 2018

• fixing merge issue

  RyanHotton

  committed
  6508c45

  Copy full SHA for 6508c45

• Implemented the SAX parser class to be used with or without a search term. Tested it using the RSS parser.

  AlexGenio

  committed
  5499ada

  Copy full SHA for 5499ada

• added xpath parsing and adjusted class structure a bit

  RyanHotton

  committed
  b04f60e

  Copy full SHA for b04f60e

• Moved calling SAX parser from RSS parser to MARFCATIN parser to avoid clashes with Ryan's XPath implementation.

  AlexGenio

  committed
  f409074

  Copy full SHA for f409074

• removed redundancy, as requested

  RyanHotton

  committed
  a0df8eb

  Copy full SHA for a0df8eb

• removed main from xpath parser

  RyanHotton

  committed
  bf6177e

  Copy full SHA for bf6177e

Commits on Feb 5, 2018

• non recursive dom parser that prints out nodes as well as attribute-value pairs

  SophiaK4

  committed
  4eb4b4b

  Copy full SHA for 4eb4b4b

• Merged in pm1-xpath (pull request #4)

  Show description for c520a0b
  

  Ryan Hotton

  committed
  c520a0b

  Copy full SHA for c520a0b

Commits on Feb 6, 2018

• Resolving conflicts.

  AlexGenio

  committed
  8e1676f

  Copy full SHA for 8e1676f

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

  Show description for 98d1789
  

  Alex Genio

  committed
  98d1789

  Copy full SHA for 98d1789

Commits on Feb 7, 2018

• Renamed the sax parser and updated the WSDL file link.

  AlexGenio

  committed
  cde05ec

  Copy full SHA for cde05ec

Commits on Feb 8, 2018

• minor clean ups

  miqdadamirali

  committed
  465936f

  Copy full SHA for 465936f

• fixed indentation

  miqdadamirali

  committed
  d5d659c

  Copy full SHA for d5d659c

• Merged in minor-cleans (pull request #5)

  Show description for 96ca0c3
  

  Miqdad Amirali

  authored and

  Alex Genio

  committed
  96ca0c3

  Copy full SHA for 96ca0c3

• Added parser type enum and refactoring. Reduced the amount of parser classes.

  AlexGenio

  committed
  5113adf

  Copy full SHA for 5113adf

• Resolving conflicts with dom parser merge.

  AlexGenio

  committed
  da3f311

  Copy full SHA for da3f311

• Merged in pm1-dom-parser (pull request #8)

  AlexGenio

  committed
  ce93626

  Copy full SHA for ce93626

• Merged Sophia's DOM parser code with my enum and refactoring modifications. Added missing comments.

  AlexGenio

  committed
  d85012e

  Copy full SHA for d85012e

• Created an abstract parser class to remove redundant instances of logger, have an abstract parse method, and be able to create parsers dynamically. Removed the searching interfact as the XMLParserH…

  Show description for 208d5bf
  AlexGenio

  committed
  208d5bf

  Copy full SHA for 208d5bf

Commits on Feb 9, 2018

• Fixed things that Miq commented on in the PR.

  AlexGenio

  committed
  96c058b

  Copy full SHA for 96c058b

• Added command line parsing. The way we process our command line needs to be documented in the README.

  AlexGenio

  committed
  48dc7a5

  Copy full SHA for 48dc7a5

• Merged in pm1-enums (pull request #9)

  Show description for 9b0103d
  

  Alex Genio

  committed
  9b0103d

  Copy full SHA for 9b0103d

Commits on Feb 12, 2018

• Created README for part1

  georgegrafos

  committed
  580336e

  Copy full SHA for 580336e

• updated README with references

  RyanHotton

  committed
  85917a1

  Copy full SHA for 85917a1

Commits on Feb 14, 2018

• Merged in pm1-readme (pull request #10)

  Show description for cc556c1
  

  George Grafos

  committed
  cc556c1

  Copy full SHA for cc556c1

• Consistency with DOM parser. Added semicolon to printout of elements.

  AlexGenio

  committed
  5874e06

  Copy full SHA for 5874e06

Commits on Feb 15, 2018

• made aprt one into a dynamic web project

  miqdadamirali

  committed
  35763f9

  Copy full SHA for 35763f9

• Restructured repository and updated the README to contain detailed instructions on how to set up each part.

  AlexGenio

  committed
  804e774

  Copy full SHA for 804e774

Commits on Feb 17, 2018

• Updated README and gitignore.

  AlexGenio

  committed
  8976b1e

  Copy full SHA for 8976b1e

Commits on Feb 22, 2018

• Created streamalert service wrapper that takes in data in kay-value format and invokes a live-test in streamalert.

  AlexGenio

  committed
  bc47c3a

  Copy full SHA for bc47c3a

• Renamed project.

  AlexGenio

  committed
  2c4c2f6

  Copy full SHA for 2c4c2f6

• Updated ReadMe for PM1 part 3 service creation.

  

  Alex Genio

  committed
  ad16151

  Copy full SHA for ad16151

• Made adjustments to the Part 3 of the readme. Forgot to mention changing the pathToStreamAlert variable and fixed a refactoring error.

  

  Alex Genio

  committed
  a1a04ec

  Copy full SHA for a1a04ec

• Added dependency on preconfigured setup documentation

  

  Alex Genio

  committed
  0e5c0cb

  Copy full SHA for 0e5c0cb

Commits on Feb 25, 2018

• Updated xml parser to adhere to streamalert format. Generated client for sending parsed xml to slack via streamalert service.

  SophiaK4

  committed
  dc8363c

  Copy full SHA for dc8363c

• Edited main README to explain our structure.

  

  Alex Genio

  committed
  f4418dc

  Copy full SHA for f4418dc

• Added the streamalert configs that were either added or modified during the setup.

  AlexGenio

  committed
  ef5ca44

  Copy full SHA for ef5ca44

• Added description of the streamalert config files.

  

  Alex Genio

  committed
  ad3a9fa

  Copy full SHA for ad3a9fa

• update read me with soph's changes

  miqdadamirali

  committed
  bbaded1

  Copy full SHA for bbaded1

• update read me

  miqdadamirali

  committed
  73cd7c9

  Copy full SHA for 73cd7c9

• typos in read me

  miqdadamirali

  committed
  e612ed9

  Copy full SHA for e612ed9

• typos in read me

  miqdadamirali

  committed
  6d2e8bc

  Copy full SHA for 6d2e8bc

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

  Show description for bd3fb7d
  

  Miqdad Amirali

  committed
  bd3fb7d

  Copy full SHA for bd3fb7d

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

  

  Alex Genio

  committed
  9e6f5db

  Copy full SHA for 9e6f5db

• README.md fixed notes styling

  

  Alex Genio

  committed
  6e2e762

  Copy full SHA for 6e2e762

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

  

  Alex Genio

  committed
  6b711e6

  Copy full SHA for 6b711e6

• README.md edited online with Bitbucket

  

  Miqdad Amirali

  committed
  a972bd3

  Copy full SHA for a972bd3

• Merged in miqdadamirali/readmemd-edited-online-with-bitbucket-1519590738222 (pull request #15)

  Show description for 15c8f41
  

  Miqdad Amirali

  authored and

  Alex Genio

  committed
  15c8f41

  Copy full SHA for 15c8f41

• README.md edited online with Bitbucket

  

  Miqdad Amirali

  committed
  9919b46

  Copy full SHA for 9919b46

• Merged in miqdadamirali/readmemd-edited-online-with-bitbucket-1519591162080 (pull request #16)

  Show description for f22c1cc
  

  Miqdad Amirali

  authored and

  Alex Genio

  committed
  f22c1cc

  Copy full SHA for f22c1cc

• Cleaned up a bit.

  AlexGenio

  committed
  ba5cdd3

  Copy full SHA for ba5cdd3

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

  Show description for 313975d
  

  Ryan Hotton

  authored and

  Miqdad Amirali

  committed
  313975d

  Copy full SHA for 313975d

• README.md added notes in part 2 to explain what to do to run part 2 standalone.

  

  Alex Genio

  committed
  3fd1cb0

  Copy full SHA for 3fd1cb0

• README.md fixed typos and added section in the notes that mentions not using a search term when testing Part 3.

  

  Alex Genio

  committed
  4e0bdfc

  Copy full SHA for 4e0bdfc

Commits on Mar 15, 2018

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

  Show description for 46ca42e
  RyanHotton

  committed
  46ca42e

  Copy full SHA for 46ca42e

Commits on Mar 24, 2018

• Fix conflicts

  smokhov

  authored
  ba2e681

  Copy full SHA for ba2e681