[Hawkular-commits] [hawkular/hawkular] 4466c9: HAWKULAR-581 needed to secure the websocket comm

[Jirka Kremser]

  Branch: refs/heads/master
  Home:   https://github.com/hawkular/hawkular
  Commit: 4466c951ea7e1ed5319481d5416bd0a6dac853b9
      https://github.com/hawkular/hawkular/commit/4466c951ea7e1ed5319481d5416bd0a6dac853b9
  Author: John Mazzitelli <mazz at redhat.com>
  Date:   2015-09-01 (Tue, 01 Sep 2015)

  Changed paths:
    M dist/src/main/resources/wildfly/patches/standalone.xsl

  Log Message:
  -----------
  HAWKULAR-581 needed to secure the websocket comm


  Commit: ccccb45f3bfd969528d186cd1acaaa32255c58fe
      https://github.com/hawkular/hawkular/commit/ccccb45f3bfd969528d186cd1acaaa32255c58fe
  Author: John Mazzitelli <mazz at redhat.com>
  Date:   2015-09-02 (Wed, 02 Sep 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  HAWKULAR-581 move to latest versions to support authenticated websockets


  Commit: 380d134b8bf67edb517d75173bb0f012658150e6
      https://github.com/hawkular/hawkular/commit/380d134b8bf67edb517d75173bb0f012658150e6
  Author: John Mazzitelli <mazz at redhat.com>
  Date:   2015-09-02 (Wed, 02 Sep 2015)

  Changed paths:
    M console/src/main/scripts/bower.json
    M console/src/main/scripts/plugins/metrics/html/url-list.html
    M console/src/main/scripts/plugins/metrics/ts/metricsPlugin.ts
    M console/src/main/scripts/plugins/metrics/ts/urlList.ts

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into mazz/hawkular-581-websocket-auth

Conflicts:
	pom.xml


  Commit: e5210f2cf5938900520c7a7f75b0659c13d93c0e
      https://github.com/hawkular/hawkular/commit/e5210f2cf5938900520c7a7f75b0659c13d93c0e
  Author: Jirka Kremser <jkremser at redhat.com>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M console/src/main/scripts/bower.json
    M console/src/main/scripts/gulpfile.js
    M console/src/main/scripts/plugins/accessPortal/vendor/js/custom-cases.js
    M console/src/main/scripts/plugins/accessPortal/vendor/js/redhat_access_angular_ui.js
    M console/src/main/scripts/plugins/directives/topbar/ts/topbarDirective.ts
    M console/src/main/scripts/plugins/metrics/ts/app-details/appServerDatasourcesDetails.ts
    M console/src/main/scripts/plugins/metrics/ts/app-details/appServerDeploymentsDetails.ts
    M console/src/main/scripts/plugins/metrics/ts/metricsAppServerList.ts
    M console/src/main/scripts/plugins/metrics/ts/metricsPlugin.ts
    M console/src/main/scripts/plugins/metrics/ts/urlList.ts
    M dist/assembly.xml
    M dist/pom.xml
    M dist/src/main/resources/wildfly/patches/standalone.xsl
    A modules/redhat-access-integration-backend/pom.xml
    A modules/redhat-access-integration-backend/src/main/java/org/hawkular/accesportal/backend/boundary/AttachmentEndpoint.java
    A modules/redhat-access-integration-backend/src/main/java/org/hawkular/accesportal/backend/control/JDRLocalReport.java
    A modules/redhat-access-integration-backend/src/main/java/org/hawkular/accesportal/backend/control/JaxRsActivator.java
    A modules/redhat-access-integration-backend/src/main/java/org/hawkular/accesportal/backend/control/RedHatAccessConfiguration.java
    A modules/redhat-access-integration-backend/src/main/java/org/hawkular/accesportal/backend/entity/SelectedFileForUpload.java
    A modules/redhat-access-integration-backend/src/main/webapp/WEB-INF/jboss-ejb3.xml
    A modules/redhat-access-integration-backend/src/main/webapp/WEB-INF/jboss-web.xml
    A modules/redhat-access-integration-backend/src/main/webapp/WEB-INF/web.xml
    M pom.xml

  Log Message:
  -----------
  Merge branch 'master' into mazz/hawkular-581-websocket-auth

 Conflicts:
	dist/src/main/resources/wildfly/patches/standalone.xsl


  Commit: de7801cd705b3a5f29373bcd85afad15fa78fd97
      https://github.com/hawkular/hawkular/commit/de7801cd705b3a5f29373bcd85afad15fa78fd97
  Author: Jirka Kremser <jkremser at redhat.com>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M dist/src/main/resources/wildfly/patches/standalone.xsl
    M pom.xml

  Log Message:
  -----------
  Merge branch 'mazz/hawkular-581-websocket-auth'


Compare: https://github.com/hawkular/hawkular/compare/50335ca4cc5c...de7801cd705b