Merge branch 'dev' into 'main'

+ added yang tools wrapper

See merge request !2

.gitlab-ci.yml

@@ -44,8 +44,10 @@ variables:
   BETA_KEY: "beta"
   MAIN_KEY: "stable"
   RELEASE_KEY: "beta"
-  RELEASE_PATH: "public/updatesite/${RELEASE_KEY}"
-  RELEASE_PAGE: "https://top.etsi.org/top-extras/updatesite/${RELEASE_KEY}"
+  RELEASE_BASE_PATH: "public/updatesite"
+  RELEASE_PATH: "${RELEASE_BASE_PATH}/${RELEASE_KEY}"
+  RELEASE_BASE_URL: "https://top.etsi.org/top-extras/updatesite"
+  RELEASE_PAGE: "${RELEASE_BASE_URL}/${RELEASE_KEY}"
   STANDALONE_LOCATION: "plugins/org.etsi.mts.tdl.standalone/target"
   STANDALONE_NAME: "org.etsi.mts.tdl.standalone-1.0.0-SNAPSHOT-shadow.jar"
   STANDALONE_PATH: "${STANDALONE_LOCATION}/${STANDALONE_NAME}"
@@ -236,26 +238,28 @@ pages:
       artifacts: true
   script:
     # Get the previous GitLab Pages content (otherwise other beta/stable branch gets removed..)
-    - rm -rf /var/lib/apt/lists/*
-    - apt update
-    - apt-cache gencaches
-    - apt install -y zip unzip
-    - zip --help
-    - set +e
-    - curl --fail "$CI_PAGES_URL/content.zip" -o "content.zip"
-    - if [ -e "content.zip" ]; then unzip "content.zip"; rm "content.zip"; fi
-    - set -e
+    #- rm -rf /var/lib/apt/lists/*
+    #- apt update
+    #- apt-cache gencaches
+    #- apt install -y zip unzip
+    #- zip --help
+    #- set +e
+    #- curl --fail "$CI_PAGES_URL/content.zip" -o "content.zip"
+    #- if [ -e "content.zip" ]; then unzip "content.zip"; rm "content.zip"; fi
+    #- set -e
     # Cleanup content? -> remove content in release path?
     # Add/update content
     - echo $CI_PAGES_URL
     - echo $RELEASE_PATH
     - mkdir -p $RELEASE_PATH
-    - rm -rf $RELEASE_PATH/*
-    - cp -r -f $SITE_PATH/* $RELEASE_PATH
-    - ls -la $RELEASE_PATH
+    #- rm -rf $RELEASE_PATH/*
+    - chmod +x prepare.sh
+    - ./prepare.sh $RELEASE_BASE_URL $RELEASE_KEY $SITE_PATH $RELEASE_BASE_PATH
+    - cp -r -f $SITE_PATH/* $RELEASE_PATH 
+    - find $RELEASE_BASE_PATH
     # Zip the content and publish the zip again
-    - zip -r "content.zip" "public"
-    - mv "content.zip" "public/"
+    #- zip -r "content.zip" "public"
+    #- mv "content.zip" "public/"
     # - mv $SITE_ARCHIVE $RELEASE_PATH/content.zip
   artifacts:
     paths:

README.md

 # TOP: TDL Open source Project: Extras
 
-This repository contains additional components for the TDL Open source Project (TOP). Currently it only includes a wrapper for the OpenAPI Generator. 
+This repository contains additional components for the TDL Open source Project (TOP). Currently, it includes:
+- a wrapper for the OpenAPI Generator
+- a wrapper for the YANG Tools
 
 More info at [TDL website](https://tdl.etsi.org)
 

features/org.etsi.mts.tdl.extras.feature/.project

@@ -20,4 +20,15 @@
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.FeatureNature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1704887424736</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

features/org.etsi.mts.tdl.extras.feature/feature.xml

@@ -314,5 +314,11 @@ any resulting litigation.
          install-size="0"
          version="0.0.0"
          unpack="false"/>
+   <plugin
+         id="org.etsi.mts.tdl.extras.yang.tools.wrapper"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
 </feature>

org.etsi.mts.tdl.extras.parent/.project

@@ -14,4 +14,15 @@
 	<natures>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1704887424740</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

org.etsi.mts.tdl.extras.parent/pom.xml

@@ -11,6 +11,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 	<modules>
 		<!-- Converters -->
 		<module>../plugins/org.etsi.mts.tdl.extras.openapi.generator.wrapper</module>
+		<module>../plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper</module>
 		<!-- Features -->
 		<module>../features/org.etsi.mts.tdl.extras.feature</module> 
 		<!-- Update Site -->

plugins/org.etsi.mts.tdl.extras.openapi.generator.wrapper/README.md

 # OpenAPI Generator Wrapper
 
-This plug-in wraps the [OpenAPI Generator](https://openapi-generator.tech) licensed unter the Apache 2.0 Software License for consumption as an Eclipse plug-in. It is currently used as a dependency in the OpenAPI-to-TDL generator and in the OpenAPI Generator UI components.
\ No newline at end of file
+This plug-in wraps the [OpenAPI Generator](https://openapi-generator.tech) licensed under the Apache 2.0 Software Licence for consumption as an Eclipse plug-in. It is currently used as a dependency in the OpenAPI-to-TDL generator and in the OpenAPI Generator UI components.
\ No newline at end of file

plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/.classpath

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry exported="true" kind="lib" path="lib/antlr4-runtime-4.11.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/checker-qual-3.12.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/concepts-10.0.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/error_prone_annotations-2.11.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/failureaccess-1.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/gson-2.9.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/guava-31.1-jre.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/hamcrest-core-1.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/j2objc-annotations-1.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jsr305-3.0.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/junit-4.11.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/odlext-model-api-10.0.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/odlext-parser-support-10.0.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/rfc7952-model-api-10.0.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/slf4j-api-2.0.6.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/slf4j-simple-2.0.6.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/triemap-1.2.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/util-10.0.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/yang-common-10.0.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/yang-ir-10.0.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/yang-model-api-10.0.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/yang-model-ri-10.0.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/yang-model-spi-10.0.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/yang-parser-api-10.0.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/yang-parser-reactor-10.0.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/yang-parser-rfc7950-10.0.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/yang-parser-spi-10.0.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/yang-repo-api-10.0.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/yang-repo-spi-10.0.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/yang-xpath-api-10.0.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/yang-xpath-impl-10.0.4.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/.project

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.etsi.mts.tdl.extras.yang.tools.wrapper</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1704887424744</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>

plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/.settings/org.eclipse.core.resources.prefs

+eclipse.preferences.version=1
+encoding/<project>=UTF-8

plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/.settings/org.eclipse.jdt.core.prefs

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11

plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/.settings/org.eclipse.m2e.core.prefs

+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/META-INF/MANIFEST.MF

+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: YANG Generator Wrapper
+Bundle-SymbolicName: org.etsi.mts.tdl.extras.yang.tools.wrapper
+Bundle-Version: 1.0.0.qualifier
+Export-Package: org.opendaylight.yangtools.odlext.parser,
+ org.opendaylight.yangtools.yang.common,
+ org.opendaylight.yangtools.yang.model.api,
+ org.opendaylight.yangtools.yang.model.api.meta,
+ org.opendaylight.yangtools.yang.model.api.stmt,
+ org.opendaylight.yangtools.yang.model.api.type,
+ org.opendaylight.yangtools.yang.model.repo.api,
+ org.opendaylight.yangtools.yang.model.ri.stmt.impl.eff,
+ org.opendaylight.yangtools.yang.model.ri.type,
+ org.opendaylight.yangtools.yang.model.spi,
+ org.opendaylight.yangtools.yang.model.spi.meta,
+ org.opendaylight.yangtools.yang.parser.api,
+ org.opendaylight.yangtools.yang.parser.rfc7950.reactor,
+ org.opendaylight.yangtools.yang.parser.rfc7950.repo,
+ org.opendaylight.yangtools.yang.parser.spi.meta,
+ org.opendaylight.yangtools.yang.parser.spi.source,
+ org.opendaylight.yangtools.yang.parser.stmt.reactor
+Bundle-Vendor: ETSI
+Bundle-ClassPath: lib/antlr4-runtime-4.11.1.jar,
+ lib/checker-qual-3.12.0.jar,
+ lib/concepts-10.0.4.jar,
+ lib/error_prone_annotations-2.11.0.jar,
+ lib/failureaccess-1.0.1.jar,
+ lib/gson-2.9.1.jar,
+ lib/guava-31.1-jre.jar,
+ lib/hamcrest-core-1.3.jar,
+ lib/j2objc-annotations-1.3.jar,
+ lib/jsr305-3.0.2.jar,
+ lib/junit-4.11.jar,
+ lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar,
+ lib/odlext-model-api-10.0.4.jar,
+ lib/odlext-parser-support-10.0.4.jar,
+ lib/rfc7952-model-api-10.0.4.jar,
+ lib/slf4j-api-2.0.6.jar,
+ lib/slf4j-simple-2.0.6.jar,
+ lib/triemap-1.2.0.jar,
+ lib/util-10.0.4.jar,
+ lib/yang-common-10.0.4.jar,
+ lib/yang-ir-10.0.4.jar,
+ lib/yang-model-api-10.0.4.jar,
+ lib/yang-model-ri-10.0.4.jar,
+ lib/yang-model-spi-10.0.4.jar,
+ lib/yang-parser-api-10.0.4.jar,
+ lib/yang-parser-reactor-10.0.4.jar,
+ lib/yang-parser-rfc7950-10.0.4.jar,
+ lib/yang-parser-spi-10.0.4.jar,
+ lib/yang-repo-api-10.0.4.jar,
+ lib/yang-repo-spi-10.0.4.jar,
+ lib/yang-xpath-api-10.0.4.jar,
+ lib/yang-xpath-impl-10.0.4.jar
+Automatic-Module-Name: org.etsi.mts.tdl.yang2tdl

plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/README.md

+# YANG Tools Wrapper
+
+This plug-in wraps the [YANG Tools](https://wiki.opendaylight.org/display/ODL/YANG+Tools) licensed under the EPL 1.0 Software Licence for consumption as an Eclipse plug-in. It is currently used as a dependency in the YANG-to-TDL generator.
\ No newline at end of file

plugins/org.etsi.mts.tdl.extras.yang.tools.wrapper/build.properties

+bin.includes = META-INF/,\
+               lib/