Unverified Commit f98f507a authored by Maxime Lefrançois's avatar Maxime Lefrançois
Browse files

update portal w. patterns

parent 95b1b134

.gitignore

+2 −1
Original line number Diff line number Diff line
@@ -3,3 +3,4 @@ 
catalog-v001.xml

saref-pipeline.jar

target

deploy.sh
 
 No newline at end of file

.gitlab-ci.yml

+61 −61
Original line number Diff line number Diff line
@@ -2,68 +2,68 @@ variables: 
    DEV_KEY: <my_private_key>

    PORTAL_KEY: <my_private_key>



stages:

  - pipeline

  - staging

  - release

# stages:

#   - pipeline

#   - staging

#   - release



prepare-prerelease:

  image: openjdk:8-jdk

  stage: pipeline

  allow_failure: true

  script:

    - curl -L -o saref-pipeline.jar "https://saref.etsi.org/downloads/saref-pipeline.jar"

    - java -Xmx2048m -jar saref-pipeline.jar prerelease-portal -t && touch target/success

  except:

    - master

  artifacts:

    when: always

    paths:

      - target/site

      - target/success

    reports:

      junit: target/report_output.xml

# prepare-prerelease:

#   image: openjdk:8-jdk

#   stage: pipeline

#   allow_failure: true

#   script:

#     - curl -L -o saref-pipeline.jar "https://labs.etsi.org/rep/saref/saref-pipeline/-/releases/permalink/latest/downloads/saref-pipeline.jar"

#     - java -jar saref-pipeline.jar prerelease-portal -t && touch target/success

#   except:

#     - master

#   artifacts:

#     when: always

#     paths:

#       - target/site

#       - target/success

#     reports:

#       junit: target/report_output.xml



prepare-release:

  image: openjdk:8-jdk

  stage: pipeline

  script:

    - curl -L -o saref-pipeline.jar "https://saref.etsi.org/downloads/saref-pipeline.jar"

    - java -Xmx2048m -jar saref-pipeline.jar release-portal && touch target/success

  only:

    - master

  artifacts:

    paths:

      - target/site

      - target/dataset

      - target/success

    reports:

      junit: target/report_output.xml

# prepare-release:

#   image: openjdk:8-jdk

#   stage: pipeline

#   script:

#     - curl -L -o saref-pipeline.jar "https://labs.etsi.org/rep/saref/saref-pipeline/-/releases/permalink/latest/downloads/saref-pipeline.jar"

#     - java -jar saref-pipeline.jar release-portal && touch target/success

#   only:

#     - master

#   artifacts:

#     paths:

#       - target/site

#       - target/dataset

#       - target/success

#     reports:

#       junit: target/report_output.xml



staging:

  image: maximelefrancois86/alpine-ssh-rsync

  stage: staging

  script:

    - eval $(ssh-agent -s)

    - ssh-add <(echo "$DEV_KEY")

    - mkdir -p ~/.ssh

    - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'

    - scp -pr target/site saref-dev@saref.etsi.org:~/staging/$CI_PIPELINE_ID

    - echo "SAREF staging portal  https://saref.etsi.org/staging/$CI_PIPELINE_ID/" 

    - exit $(test -f target/success) $?

# staging:

#   image: maximelefrancois86/alpine-ssh-rsync

#   stage: staging

#   script:

#     - eval $(ssh-agent -s)

#     - ssh-add <(echo "$DEV_KEY")

#     - mkdir -p ~/.ssh

#     - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'

#     - scp -pr target/site saref-dev@saref.etsi.org:~/staging/$CI_PIPELINE_ID

#     - echo "SAREF staging portal  https://saref.etsi.org/staging/$CI_PIPELINE_ID/" 

#     - exit $(test -f target/success) $?



deploy:

  image: maximelefrancois86/alpine-ssh-rsync

  stage: release

  when: manual

  script:

    - eval $(ssh-agent -s)

    - ssh-add <(echo "$PORTAL_KEY")

    - mkdir -p ~/.ssh

    - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'

    - rsync -rcv error-documents/ saref-portal@saref.etsi.org:~/error-documents

    - rsync -rcv target/site/ saref-portal@saref.etsi.org:~/site

    - rsync -rcv target/dataset/ saref-portal@saref.etsi.org:~/dataset

    - ssh saref-portal@saref.etsi.org "sudo ./update-search"

  only:

   - master 
# deploy:

#   image: maximelefrancois86/alpine-ssh-rsync

#   stage: release

#   when: manual

#   script:

#     - eval $(ssh-agent -s)

#     - ssh-add <(echo "$PORTAL_KEY")

#     - mkdir -p ~/.ssh

#     - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'

#     - rsync -rcv error-documents/ saref-portal@saref.etsi.org:~/error-documents

#     - rsync -rcv target/site/ saref-portal@saref.etsi.org:~/site

#     - rsync -rcv target/dataset/ saref-portal@saref.etsi.org:~/dataset

#     - ssh saref-portal@saref.etsi.org "sudo ./update-search"

#   only:

#    - master

error-documents/include/bottom.shtml

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
        </div>

      </div>

      <div class="g-block size-20">

        <div class="g-content g-particle">© ETSI 2021<br /><a style="font-size:10pt; color:white" href="https://www.etsi.org/">Visit ETSI website for more information on Terms & Conditions.</a></div>

        <div class="g-content g-particle">© ETSI 2024<br /><a style="font-size:10pt; color:white" href="https://www.etsi.org/">Visit ETSI website for more information on Terms & Conditions.</a></div>

      </div>

      <div class="g-block g-horizontalmenu size-40">

        <div class="g-content g-particle">

portal/development.html

0 → 100644
+284 −0
Original line number Diff line number Diff line 
<!DOCTYPE html>

<html lang="en-GB" dir="ltr">



<head>

  <meta name="viewport" content="width=device-width, initial-scale=1.0">

  <meta http-equiv="X-UA-Compatible" content="IE=edge" />

  <meta charset="utf-8" />

  <title>SAREF Development Framework and Workflow</title>

  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css"

    integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">

  <link href="static/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" />

  <link href="static/media/gantry5/assets/css/font-awesome.min.css" rel="stylesheet" />

  <link href="static/media/gantry5/engines/nucleus/css-compiled/nucleus.css" rel="stylesheet" />

  <link href="static/templates/g5_helium/custom/css-compiled/helium_19.css" rel="stylesheet" />

  <link href="static/media/gantry5/assets/css/bootstrap-gantry.css" rel="stylesheet" />

  <link href="static/media/gantry5/engines/nucleus/css-compiled/joomla.css" rel="stylesheet" />

  <link href="static/media/jui/css/icomoon.css" rel="stylesheet" />

  <link href="static/templates/g5_helium/custom/css-compiled/helium-joomla_19.css" rel="stylesheet" />

  <link href="static/templates/g5_helium/custom/css-compiled/custom_19.css" rel="stylesheet" />



  <link href="static/jqtree/jqtree.css" rel="stylesheet">

  <script src="static/templates/g5_helium/js/jui/jquery.min.js?06eedc97766b70aa1fa0e80231495faa"></script>

  <script src="static/media/jui/js/jquery-noconflict.js?06eedc97766b70aa1fa0e80231495faa"></script>

  <script src="static/media/jui/js/jquery-migrate.min.js?06eedc97766b70aa1fa0e80231495faa"></script>

  <script src="static/media/system/js/caption.js?06eedc97766b70aa1fa0e80231495faa"></script>

  <script src="static/media/jui/js/bootstrap.min.js?06eedc97766b70aa1fa0e80231495faa"></script>

  <script src="static/templates/g5_helium/js/juitabs.js"></script>



  <script>

    jQuery(window).on('load', function () {

      new JCaption('img.caption');

    });

  </script>

  <!--[if (gte IE 8)&(lte IE 9)]>

        <script type="text/javascript" src="static/media/gantry5/assets/js/html5shiv-printshiv.min.js"></script>

        <link rel="stylesheet" href="media/gantry5/engines/nucleus/css/nucleus-ie9.css" type="text/css"/>

        <script type="text/javascript" src="static/media/gantry5/assets/js/matchmedia.polyfill.js"></script>

        <![endif]-->



</head>



<body

  class="gantry g-helium-style site com_content view-article no-layout no-task dir-ltr itemid-217 outline-19 g-offcanvas-left g-default g-style-preset1">

  <div id="g-offcanvas" data-g-offcanvas-swipe="1" data-g-offcanvas-css3="1">

    <div class="g-grid">

      <div class="g-block size-100">

        <div class="g-content g-particle">

          <div id="g-mobilemenu-container" data-g-menu-breakpoint="48rem"></div>

        </div>

      </div>

    </div>

  </div>

  <div id="g-page-surround">

    <div class="g-offcanvas-hide g-offcanvas-toggle" data-offcanvas-toggle aria-controls="g-offcanvas"

      aria-expanded="false"><i class="fa fa-fw fa-bars"></i></div>

    <section id="g-navigation">

      <div class="g-container">

        <div class="g-grid">

          <div class="g-block size-17">

            <div class="g-content g-particle">

              <a href="https://www.etsi.org/" title="" rel="home" class="g-logo g-logo-helium">

                <img src="static/images/logo-l.png" alt="" />

              </a>

            </div>

          </div>

          <div class="g-block size-65">

            <div class="g-content g-particle">

              <nav class="g-main-nav" role="navigation" data-g-hover-expand="true">

                <ul class="g-toplevel">





                  <li class="g-menu-item g-menu-item-type-component g-menu-item-217 g-standard  ">

                    <a class="g-menu-item-container" href="/index.html">

                      <span class="g-menu-item-content">

                        <span class="g-menu-item-title">Home</span>

                      </span>

                    </a>

                  </li>





                  <li class="g-menu-item g-menu-item-type-component g-menu-item-242 g-standard  ">

                    <a class="g-menu-item-container" href="/core/">

                      <span class="g-menu-item-content">

                        <span class="g-menu-item-title">SAREF core</span>

                      </span>

                    </a>

                  </li>

                  <li class="g-menu-item g-menu-item-type-component g-menu-item-242 g-standard  ">

                    <a class="g-menu-item-container" href="/extensions.html">

                      <span class="g-menu-item-content">

                        <span class="g-menu-item-title">Extensions</span>

                      </span>

                    </a>

                  </li>



                  <li class="g-menu-item g-menu-item-type-component g-menu-item-242 g-standard  ">

                    <a class="g-menu-item-container" href="/sources/">

                      <span class="g-menu-item-content">

                        <span class="g-menu-item-title">Sources &amp; Issues</span>

                      </span>

                    </a>

                  </li>



                  <li class="g-menu-item g-menu-item-type-component g-menu-item-242 g-standard  ">

                    <a class="g-menu-item-container" href="https://www.etsi.org/committee/smartm2m">

                      <span class="g-menu-item-content">

                        <span class="g-menu-item-title">SmartM2M</span>

                      </span>

                    </a>

                  </li>



                  <li class="g-menu-item g-menu-item-type-component g-menu-item-242 g-standard">

                    <form method="GET" action="/search.html">

                      <input class="form-control" id="q" name="q" placeholder="&#x1F50E; ex., device" />

                    </form>

                  </li>



                </ul>

              </nav>

            </div>

          </div>

          <div class="g-block g-social-header size-17">

            <div class="g-content g-particle">

              <div class="g-social ">

                <a target="_blank" href="https://twitter.com/ETSI_STANDARDS" title="" aria-label="">

                  <span class="fa fa-twitter fa-fw"></span> <span class="g-social-text"></span> </a>

                <a target="_blank" href="https://www.facebook.com/etsi.standards" title="" aria-label="">

                  <span class="fa fa-facebook-official"></span> <span class="g-social-text"></span> </a>

                <a target="_blank" href="https://www.linkedin.com/company/etsi?trk=biz-companies-cym" title=""

                  aria-label="">

                  <span class="fa fa-linkedin-square"></span> <span class="g-social-text"></span> </a>

                <a target="_blank" href="https://www.youtube.com/user/ETSIstandards" title="" aria-label="">

                  <span class="fa fa-youtube-play"></span> <span class="g-social-text"></span> </a>

              </div>

            </div>

          </div>

        </div>

      </div>

    </section>



    <header id="g-header">

      <div class="g-container">

        <div class="g-block size-100">

          <div class="g-content g-particle">

            <h1>The Smart Applications REFerence Ontology (SAREF)</h1>

            <p><strong>The Smart Applications REFerence (SAREF)</strong> suite of ontologies forms a shared model of

              consensus intended to enable semantic interoperability between solutions from different providers and

              among various activity sectors in the Internet of Things (IoT), thus contributing to the development of

              data spaces.</p>

            <p>SAREF is published as a set of open standards produced by <strong>ETSI Technical Committee Smart Machine-to-Machine communications

                  (<a href="https://www.etsi.org/committee/smartm2m">SmartM2M</a>)</strong>.</p>

            <p>This <strong>ETSI portal for SAREF</strong> exposes the SAREF ontologies and points to the different

              SAREF-related deliverables.</p>

          </div>

        </div>

      </div>

    </header>



    <section class="g-wrapper">

      <div class="g-container">

        <h2>The SAREF Development Framework and Workflow</h2>

        <div class="alert-warning">NOTE: The text in this page is taken from <a href="https://www.etsi.org/deliver/etsi_ts/103600_103699/103673/">ETSI TS 103 673</a>, and therefore falls under the <a href="https://www.etsi.org/intellectual-property-rights">ETSI IPR Policy</a></div>

        <p>The value of SAREF is strongly correlated with the size of its community of users; therefore the SAREF

          ontologies are available and documented on the Web. As such, SAREF users and the industry actors can be

          attracted to SAREF with clear documentation and a clear indication about how to provide their input and the

          kind of input that they can provide.</p>

        <p>The ETSI members that contribute to SAREF are able to get benefit from feedback coming from its open

          community of industrial users, to better plan new evolution of the current and future extensions, and to

          reduce the costs of developing these extensions. That being said, the development and monitoring of SAREF lies

          in ETSI's hands to ensure that high quality standards are met, and users that provide feedback have to

          understand the implication in terms of IPR. The publication and/or use of such feedback has to therefore be

          controlled by ETSI, but the possibility to provide feedback is open to the world.</p>

        <p>Document ETSI TS 103 673 <a href="#[i.1]">[i.1]</a> defines the development framework for the SAREF ontology

          and its extensions (referred to in a general way as SAREF projects) based on the <a

            href="https://saref.etsi.org/sources/">ETSI forge</a>. The SAREF development framework consists of the

          actors, software, and infrastructure that support the SAREF development workflows. ETSI TS 103 673 defines the

          different actors involved in the development of SAREF, and the workflows to be followed for new SAREF project

          versions, SAREF project version development, and SAREF project release. This document also defines how SAREF

          project versions are specified and documented in the SAREF public forge. The accompanying <a

            href="https://saref.etsi.org/sources/saref-pipeline">SAREF pipeline software</a> enables to automatically

          check the conformance of SAREF project versions with respect to the this document. ETSI TS 103 673, the SAREF

          pipeline, and the SAREF public portal, enable the SAREF developers to speed up the development of SAREF and

          its extensions as well as the SAREF community of users to actively contribute in the development. The SAREF

          development framework and workflow is based on the requirements and guidelines defined in the associated ETSI

          TR 103 608 <a href="#[i.2]">[i.2]</a>.</p>

        <p>ETSI TS 103 673 V1.1.1 <a href="#[i.3]">[i.3]</a> has been developed in the context of the <a

            href="https://portal.etsi.org/STF/STFs/STFHomePages/STF578.aspx">STF 578</a>, which followed the <a

            href="https://portal.etsi.org/STF/STFs/STFHomePages/STF556.aspx">STF 556</a>. STF 578 was established with

          the goal to consolidate SAREF and its community of industrial users based on the experience of the <a

            href="https://itea4.org/project/seas.html">EUREKA ITEA 12004 SEAS</a>

          (Smart Energy Aware Systems) project. It aimed at specifying the SAREF publication framework to

          reinforce the engagement of its community of users and to enable them to implement solutions with SAREF

          faster.</p>

        <p>ETSI TS 103 673 V1.2.1 <a href="#[i.4]">[i.4]</a> has been developed in the context of the <a

            href="https://portal.etsi.org/xtfs/#/xTF/653">STF 653</a>, which aimed at consolidating the SAREF suite of

          ontologies and its development framework and workflow by defining and using reference ontology patterns.

        </p>

      </div>

    </section>

    <section id="references" class="g-wrapper">

      <div class="g-container">

        <h2>References</h2>

        <ul>

          <li id="[i.1]">[i.1] <a href="https://www.etsi.org/deliver/etsi_ts/103600_103699/103673/">ETSI TS

              103 673</a>: "SmartM2M; SAREF Development Framework and Workflow, Streamlining the Development of SAREF

            and its Extensions".</li>

          <li id="[i.2]">[i.2] <a

              href="https://www.etsi.org/deliver/etsi_tr/103600_103699/103608/01.01.01_60/tr_103608v010101p.pdf">ETSI TR

              103 608</a>: "SmartM2M; SAREF publication framework reinforcing the engagement of its community of users".

          </li>

          <li id="[i.3]">[i.3] <a

              href="https://www.etsi.org/deliver/etsi_ts/103600_103699/103673/01.01.01_60/ts_103673v010101p.pdf">ETSI TS

              103 673 (V1.1.1)</a>: "SmartM2M; SAREF Development Framework and Workflow, Streamlining the Development of

            SAREF and its Extensions".</li>

          <li id="[i.4]">[i.4] <a

              href="https://www.etsi.org/deliver/etsi_ts/103600_103699/103673/01.02.01_60/ts_103673v010201p.pdf">ETSI TS

              103 673 (V1.2.1)</a>: "SmartM2M; SAREF Development Framework and Workflow, Streamlining the Development of

            SAREF and its Extensions".</li>

        </ul>

      </div>

    </section>



    <footer id="g-footer">

      <div class="g-container">

        <div class="g-grid">

          <div class="g-block size-15">

            <div class="g-content g-particle">

              <a href="https://www.etsi.org/" title="" class="g-logo g-logo-helium">

                <img src="https://forge.etsi.org/files/ETSI-Logo_BW_S_Office1.png" alt="" />

              </a>

            </div>

          </div>

          <div class="g-block size-20">

            <div class="g-content g-particle">© ETSI 2024<br /><a style="font-size:10pt; color:white"

                href="https://www.etsi.org/">Visit ETSI website for more information on Terms & Conditions.</a></div>

          </div>

          <div class="g-block g-horizontalmenu size-40">

            <div class="g-content g-particle">

              <nav class="g-main-nav" role="navigation" data-g-hover-expand="true">

                <ul class="g-toplevel">

                  <li class="g-menu-item g-menu-item-type-component g-menu-item-245 g-standard  ">

                    <a class="g-menu-item-container" href="https://forge.etsi.org/index.php/legal-matters">

                      <span class="g-menu-item-content">

                        <span class="g-menu-item-title">Legal matters</span>

                      </span>

                    </a>

                  </li>

                  <li class="g-menu-item g-menu-item-type-url g-menu-item-247 g-standard  ">

                    <a class="g-menu-item-container" href="mailto:cti_support@etsi.org?subject=[SAREF]">

                      <span class="g-menu-item-content">

                        <span class="g-menu-item-title">Contact &amp; Support</span>

                      </span>

                    </a>

                  </li>

                </ul>

              </nav>

            </div>

          </div>

          <div class="g-block size-25">

            <div class="g-content g-particle">

              <div class="">

                <div class="g-totop">

                  <a href="#" id="g-totop" rel="nofollow">Back to top <i class="fa fa-chevron-up fa-fw"></i></a>

                </div>

              </div>

            </div>

          </div>

        </div>

      </div>

    </footer>

  </div>



  <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js"

    integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN"

    crossorigin="anonymous"></script>

  <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js"

    integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q"

    crossorigin="anonymous"></script>

  <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"

    integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl"

    crossorigin="anonymous"></script>

</body>



</html>
 
 No newline at end of file

portal/extensions.html

deleted100644 → 0
+0 −540

File deleted.

Preview size limit exceeded, changes collapsed.