diff options
author | Herbert Eiselt <herbert.eiselt@highstreet-technologies.com> | 2019-02-12 14:32:50 +0100 |
---|---|---|
committer | Herbert Eiselt <herbert.eiselt@highstreet-technologies.com> | 2019-02-12 14:33:52 +0100 |
commit | fa5487789f31939d818d8584980c4b8ce09f6900 (patch) | |
tree | f74439bde51483b7ad68d1ae98cf9f58bcdedf7b | |
parent | 3d202a04b99f0e61b6ccf8b7a5610e1a15ca58e7 (diff) |
Add sdnr wt featureaggregator
Add complete sdnr wireless transport featureaggregator
Change-Id: Iaadb1589f942a0c3b6afffb0366bb5fb79229c06
Issue-ID: SDNC-632
Signed-off-by: Herbert Eiselt <herbert.eiselt@highstreet-technologies.com>
-rw-r--r-- | sdnr/wt/README.md | 18 | ||||
-rw-r--r-- | sdnr/wt/featureaggregator/feature/pom.xml | 102 | ||||
-rwxr-xr-x | sdnr/wt/featureaggregator/installer/pom.xml | 109 | ||||
-rwxr-xr-x | sdnr/wt/featureaggregator/installer/src/assembly/assemble_mvnrepo_zip.xml | 29 | ||||
-rwxr-xr-x | sdnr/wt/featureaggregator/pom.xml | 38 | ||||
-rw-r--r-- | sdnr/wt/odlux/package.json | 2 | ||||
-rw-r--r-- | sdnr/wt/odlux/yarn.lock | 42 | ||||
-rw-r--r-- | sdnr/wt/pom.xml | 13 |
8 files changed, 324 insertions, 29 deletions
diff --git a/sdnr/wt/README.md b/sdnr/wt/README.md index e473740bc..1a8d1e961 100644 --- a/sdnr/wt/README.md +++ b/sdnr/wt/README.md @@ -12,6 +12,22 @@ The API gateway provides WEB access to all wt related web service providers to p Model classes, specified by ONF Model and provided as yang files for Java class generation for NETCONF devices. -## websocketmanager +## websocketmanager2 Notification service for browser clients. + +## devicemanager + +Management application for NETCONF devices. + +## odlux + +Web applications for user operations for devices + +## helpserver + +Providing help pages for related web applications + +## featureaggregator + +karaf feature with name sdnr-wt-feature-aggregator to start all services. diff --git a/sdnr/wt/featureaggregator/feature/pom.xml b/sdnr/wt/featureaggregator/feature/pom.xml new file mode 100644 index 000000000..6497eae13 --- /dev/null +++ b/sdnr/wt/featureaggregator/feature/pom.xml @@ -0,0 +1,102 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * ============LICENSE_START======================================================= + * ONAP : CCSDK.feature.sdnr.wt + * ================================================================================ + * Copyright (C) 2018 highstreet technologies GmbH Intellectual Property. + * All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> + <artifactId>sdnr-wt-feature-aggregator</artifactId> + <version>0.4.1-SNAPSHOT</version> + <packaging>feature</packaging> + <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> + + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>1.2.1-SNAPSHOT</version> + <relativePath /> + </parent> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.opendaylight.mdsal.model</groupId> + <artifactId>mdsal-model-artifacts</artifactId> + <version>${odl.mdsal.model.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + <dependency> + <groupId>org.opendaylight.controller</groupId> + <artifactId>mdsal-artifacts</artifactId> + <version>${odl.controller.mdsal.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> + </dependencyManagement> + + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>sdnr-wt-apigateway-feature</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>sdnr-wt-helpserver-feature</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>sdnr-wt-websocketmanager2-feature</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>sdnr-wt-devicemanager-feature</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>sdnr-wt-odlux-core-feature</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>sdnr-wt-odlux-apps-feature</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + </dependency> + </dependencies> +</project> diff --git a/sdnr/wt/featureaggregator/installer/pom.xml b/sdnr/wt/featureaggregator/installer/pom.xml new file mode 100755 index 000000000..4f3b1d32e --- /dev/null +++ b/sdnr/wt/featureaggregator/installer/pom.xml @@ -0,0 +1,109 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * ============LICENSE_START======================================================= + * ONAP : CCSDK.feature.sdnr.wt + * ================================================================================ + * Copyright (C) 2018 highstreet technologies GmbH Intellectual Property. + * All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> + <artifactId>sdnr-wt-feature-aggregator-installer</artifactId> + <version>0.4.1-SNAPSHOT</version> + <packaging>pom</packaging> + <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> + + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>1.2.1-SNAPSHOT</version> + <relativePath /> + </parent> + + <properties> + <application.name>sdnr-wt-feature-aggregator</application.name> + <include.transitive.dependencies>false</include.transitive.dependencies> + </properties> + + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>${application.name}</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-dependencies</id> + <goals> + <goal>copy-dependencies</goal> + </goals> + <phase>prepare-package</phase> + <configuration> + <transitive>false</transitive> + <outputDirectory>${project.build.directory}/assembly/system</outputDirectory> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>true</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + <useRepositoryLayout>true</useRepositoryLayout> + <addParentPoms>false</addParentPoms> + <copyPom>false</copyPom> + <includeGroupIds>${project.groupId}</includeGroupIds> + <scope>provided</scope> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>maven-repo-zip</id> + <goals> + <goal>single</goal> + </goals> + <phase>package</phase> + <configuration> + <attach>true</attach> + <finalName>stage/${application.name}-${project.version}</finalName> + <descriptors> + <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor> + </descriptors> + <appendAssemblyId>true</appendAssemblyId> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> diff --git a/sdnr/wt/featureaggregator/installer/src/assembly/assemble_mvnrepo_zip.xml b/sdnr/wt/featureaggregator/installer/src/assembly/assemble_mvnrepo_zip.xml new file mode 100755 index 000000000..86b07f1f3 --- /dev/null +++ b/sdnr/wt/featureaggregator/installer/src/assembly/assemble_mvnrepo_zip.xml @@ -0,0 +1,29 @@ +<!-- Defines how we build the .zip file which is our distribution. --> + +<assembly + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd"> + <id>repo</id> + + <formats> + <format>zip</format> + </formats> + + <!-- we want "system" and related files right at the root level + as this file is suppose to be unzip on top of a karaf + distro. --> + <includeBaseDirectory>false</includeBaseDirectory> + + <fileSets> + <fileSet> + <directory>target/assembly/</directory> + <outputDirectory>.</outputDirectory> + <excludes> + </excludes> + </fileSet> + </fileSets> + + + +</assembly> diff --git a/sdnr/wt/featureaggregator/pom.xml b/sdnr/wt/featureaggregator/pom.xml new file mode 100755 index 000000000..182ce10d0 --- /dev/null +++ b/sdnr/wt/featureaggregator/pom.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * ============LICENSE_START======================================================= + * ONAP : CCSDK.feature.sdnr.wt + * ================================================================================ + * Copyright (C) 2019 highstreet technologies GmbH Intellectual Property. + * All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> + <artifactId>sdnr-wt-feature-aggregator-top</artifactId> + <version>0.4.1-SNAPSHOT</version> + <packaging>pom</packaging> + <name>ccsdk-features-sdnr-wt :: ${project.artifactId}</name> + + <modules> + <module>feature</module> + <module>installer</module> + </modules> + +</project> diff --git a/sdnr/wt/odlux/package.json b/sdnr/wt/odlux/package.json index 4b9196c90..27a4d7387 100644 --- a/sdnr/wt/odlux/package.json +++ b/sdnr/wt/odlux/package.json @@ -28,7 +28,7 @@ "classnames": "2.2.6", "jquery": "3.3.1", "jsonwebtoken": "8.3.0", - "lerna": "^3.11.0", + "lerna": "^3.11.1", "notistack": "0.4.1", "prop-types": "15.6.2", "react": "16.5.2", diff --git a/sdnr/wt/odlux/yarn.lock b/sdnr/wt/odlux/yarn.lock index bcd5178e5..61f3effe1 100644 --- a/sdnr/wt/odlux/yarn.lock +++ b/sdnr/wt/odlux/yarn.lock @@ -816,16 +816,16 @@ "@lerna/output" "3.6.0" "@lerna/version" "3.10.6" -"@lerna/changed@3.11.0": - version "3.11.0" - resolved "https://registry.yarnpkg.com/@lerna/changed/-/changed-3.11.0.tgz#aa164446dc175cc59b6b70f878a9ccdc52a89e4d" - integrity sha512-owUwGqinBx4YWRelPlYyz+F7TqoyZcYCRPQZG+8F16Bivof5yj3bdnuzx0xzeOSW3WNOWANiaD4rWGdo3rmjeQ== +"@lerna/changed@3.11.1": + version "3.11.1" + resolved "https://registry.yarnpkg.com/@lerna/changed/-/changed-3.11.1.tgz#d8a856f8237e37e7686d17a1e13bf4d082a3e48b" + integrity sha512-A21h3DvMjDwhksmCmTQ1+3KPHg7gHVHFs3zC5lR9W+whYlm0JI2Yp70vYnqMv2hPAcJx+2tlCrqJkzCFkNQdqg== dependencies: "@lerna/collect-updates" "3.11.0" "@lerna/command" "3.11.0" "@lerna/listable" "3.11.0" "@lerna/output" "3.11.0" - "@lerna/version" "3.11.0" + "@lerna/version" "3.11.1" "@lerna/check-working-tree@3.10.0": version "3.10.0" @@ -1576,10 +1576,10 @@ p-reduce "^1.0.0" semver "^5.5.0" -"@lerna/publish@3.11.0": - version "3.11.0" - resolved "https://registry.yarnpkg.com/@lerna/publish/-/publish-3.11.0.tgz#b35460bf6f472d17d756043baedb02c6f434acf0" - integrity sha512-8vdb5YOnPphIig4FCXwuLAdptFNfMcCj/TMCwtsFDQqNbeCbVABkptqjfmldVmGfcxwbkqHLH7cbazVSIGPonA== +"@lerna/publish@3.11.1": + version "3.11.1" + resolved "https://registry.yarnpkg.com/@lerna/publish/-/publish-3.11.1.tgz#06b0f646afea7f29cd820a63086692a4ac4d080e" + integrity sha512-UOvmSivuqzWoiTqoYWk+liPDZvC6O7NrT8DwoG2peRvjIPs5RKYMubwXPOrBBVVE+yX/vR6V1Y3o6vf3av52dg== dependencies: "@lerna/batch-packages" "3.11.0" "@lerna/check-working-tree" "3.11.0" @@ -1598,7 +1598,7 @@ "@lerna/run-lifecycle" "3.11.0" "@lerna/run-parallel-batches" "3.0.0" "@lerna/validation-error" "3.11.0" - "@lerna/version" "3.11.0" + "@lerna/version" "3.11.1" figgy-pudding "^3.5.1" fs-extra "^7.0.0" libnpmaccess "^3.0.1" @@ -1813,10 +1813,10 @@ slash "^1.0.0" temp-write "^3.4.0" -"@lerna/version@3.11.0": - version "3.11.0" - resolved "https://registry.yarnpkg.com/@lerna/version/-/version-3.11.0.tgz#84c7cb9ecbf670dc6ebb72fda9339017435b7738" - integrity sha512-J6Ffq1qU7hYwgmn7vM1QlhkBUH1wakG5wiHWv6Pk4XpCCA+PoHKTjCbpovmFIIYOI19QGYpdZV9C8dST/0aPiA== +"@lerna/version@3.11.1": + version "3.11.1" + resolved "https://registry.yarnpkg.com/@lerna/version/-/version-3.11.1.tgz#c4031670838ccd5e285ec481c36e8703f4d835b2" + integrity sha512-+lFq4D8BpchIslIz6jyUY6TZO1kuAgQ+G1LjaYwUBiP2SzXVWgPoPoq/9dnaSq38Hhhvlf7FF6i15d+q8gk1xQ== dependencies: "@lerna/batch-packages" "3.11.0" "@lerna/check-working-tree" "3.11.0" @@ -6991,14 +6991,14 @@ lerna@^3.10.7: import-local "^1.0.0" libnpm "^2.0.1" -lerna@^3.11.0: - version "3.11.0" - resolved "https://registry.yarnpkg.com/lerna/-/lerna-3.11.0.tgz#bd2542bdd8c0bdd6e71260877224cfd56530ca5d" - integrity sha512-87gFkJ/E/XtWvKrnBnixfPkroAZls7Vzfhdt42gPJYaBdXBqeJWQskGB10mr80GZTm8RmMPrC8M+t7XL1g/YQA== +lerna@^3.11.1: + version "3.11.1" + resolved "https://registry.yarnpkg.com/lerna/-/lerna-3.11.1.tgz#c3f86aaf6add615ffc172554657a139bc2360b9a" + integrity sha512-7an/cia9u6qVTts5PQ/adFq8QSgE7gzG1pUHhH+XKVU1seDKQ99JLu61n3/euv2qeQF+ww4WLKnFHIPa5+LJSQ== dependencies: "@lerna/add" "3.11.0" "@lerna/bootstrap" "3.11.0" - "@lerna/changed" "3.11.0" + "@lerna/changed" "3.11.1" "@lerna/clean" "3.11.0" "@lerna/cli" "3.11.0" "@lerna/create" "3.11.0" @@ -7008,9 +7008,9 @@ lerna@^3.11.0: "@lerna/init" "3.11.0" "@lerna/link" "3.11.0" "@lerna/list" "3.11.0" - "@lerna/publish" "3.11.0" + "@lerna/publish" "3.11.1" "@lerna/run" "3.11.0" - "@lerna/version" "3.11.0" + "@lerna/version" "3.11.1" import-local "^1.0.0" npmlog "^4.1.2" diff --git a/sdnr/wt/pom.xml b/sdnr/wt/pom.xml index 524bf5d64..b66f7163f 100644 --- a/sdnr/wt/pom.xml +++ b/sdnr/wt/pom.xml @@ -36,12 +36,13 @@ <description>SDN-R wireless transport micro-services</description> <modules> - <module>apigateway</module> - <module>devicemodel</module> - <module>websocketmanager2</module> - <module>helpserver</module> - <module>devicemanager</module> - <module>odlux</module> + <module>apigateway</module> + <module>devicemodel</module> + <module>websocketmanager2</module> + <module>helpserver</module> + <module>devicemanager</module> + <module>odlux</module> + <module>featureaggregator</module> </modules> </project> |