Commit d743aa66 authored by Walter Featherstone's avatar Walter Featherstone Committed by Gerrit Code Review
Browse files

Merge "bug 16 — Replace 'mp1.security' with 'security'"

parents 9b4fad55 bddb3021

Mp1.yaml

+4 −4
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ paths: 
                    addresses:

                      - host: 192.0.2.0

                        port: '8080'

                  mp1.security:

                  security:

                    oAuth2Info:

                      grantTypes: OAUTH2_CLIENT_CREDENTIALS

                      tokenEndpoint: /meMp1/mp1.security/TokenEndPoint
@@ -399,7 +399,7 @@ paths: 
                    addresses:

                      - host: 192.0.2.0

                        port: '8080'

                  mp1.security:

                  security:

                    oAuth2Info:

                      grantTypes: OAUTH2_CLIENT_CREDENTIALS

                      tokenEndpoint: /meMp1/mp1.security/TokenEndPoint
@@ -1203,7 +1203,7 @@ definitions: 
      - protocol

      - version

      - endpoint

      - mp1.security

      - security

    properties:

      id:

        $ref: '#/definitions/TransportInfo.Id'
@@ -1219,7 +1219,7 @@ definitions: 
        $ref: '#/definitions/TransportInfo.Version'

      endpoint:

        $ref: '#/definitions/EndPointInfo'

      mp1.security:

      security:

        $ref: '#/definitions/SecurityInfo'

      implSpecificInfo:

        $ref: '#/definitions/TransportInfo.ImplSpecificInfo'

definitions/TransportInfo.yaml

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ required: 
- protocol

- version

- endpoint

- mp1.security

- security

properties:

  id:

    $ref: '#/definitions/TransportInfo.Id'
@@ -23,7 +23,7 @@ properties: 
    $ref: '#/definitions/TransportInfo.Version'

  endpoint:

    $ref: '#/definitions/EndPointInfo'

  mp1.security:

  security:

    $ref: '#/definitions/SecurityInfo'

  implSpecificInfo:

    $ref: '#/definitions/TransportInfo.ImplSpecificInfo'
 
 No newline at end of file

examples/ServiceInfo.json

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
          }

        ]

      },

      "mp1.security": {

      "security": {

        "oAuth2Info": {

          "grantTypes": "OAUTH2_CLIENT_CREDENTIALS",

          "tokenEndpoint": "/meMp1/mp1.security/TokenEndPoint"

examples/ServiceInfo.yaml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ ServiceInfo: 
      addresses:

       - host: '192.0.2.0'

         port: '8080'

    mp1.security:

    security:

      oAuth2Info:

        grantTypes: OAUTH2_CLIENT_CREDENTIALS

        tokenEndpoint: /meMp1/mp1.security/TokenEndPoint