diff options
28 files changed, 950 insertions, 10 deletions
diff --git a/deployment/zip/pom.xml b/deployment/zip/pom.xml index 6af31ca3..e9df195a 100644 --- a/deployment/zip/pom.xml +++ b/deployment/zip/pom.xml @@ -106,9 +106,11 @@ ant.copy(todir: "${deployUnzip}/conf") { fileset(dir: - "${project.build.directory}/../../../products/target/conf/") + "${project.build.directory}/../../../products/target/conf/", + erroronmissingdir: false) fileset(dir: - "${project.build.directory}/../../../profiles/target/conf/") + "${project.build.directory}/../../../profiles/target/conf/", + erroronmissingdir: false) fileset(file: "${basedir}/src/main/release/conf/*.properties") } @@ -116,7 +118,8 @@ ant.copy(todir: "${deployUnzip}/script") { fileset(dir: - "${project.build.directory}/../../../products/target/script/") + "${project.build.directory}/../../../products/target/script/", + erroronmissingdir: false) } ant.copy(todir: diff --git a/docs/architecture.rst b/docs/architecture.rst index aef51b61..81d0195f 100644 --- a/docs/architecture.rst +++ b/docs/architecture.rst @@ -12,7 +12,7 @@ Following diagram shows the high-level architecture of OCLIP. .. image:: images/portal-cli-arch.png * **Command Registrar** : Registrar keeps track of the commands registered in OCLIP and when user invokes the command, -it identify the corresponding command and helps to invoke the corresponding command plug-in. +it identifies the corresponding command and helps to invoke the corresponding command plug-in. * **Command Discoverer** : Discoverer discovers the commands both in plug-in format and YAML and automatically register them into Registrar. @@ -27,6 +27,6 @@ them into Registrar. * **Web Command Console** : Provides the interactive command line console from web-browser -* **Cache** : Provides an persistent storage for discoverer to store the meta-data about the discovered Commands. +* **Cache** : Provides persistent storage for discoverer to store the meta-data about the discovered Commands. * **open cli schemas** : Set of command YAML provides the CLI definitions. diff --git a/docs/cmd_help.rst b/docs/cmd_help.rst index f45d0f75..a3139452 100644 --- a/docs/cmd_help.rst +++ b/docs/cmd_help.rst @@ -85,7 +85,7 @@ Error:: usage: oclip basic-logout -Provides HTTP basic authorization support. As part of logout, it invalidate authoirzation key generated while login. +Provides HTTP basic authorization support. As part of logout, it invalidates authorization key generated while login. Product: open-cli @@ -140,7 +140,7 @@ Error:: usage: oclip catalog Provides catalog discovery support to find the base api path for given service from product's catalog service. -Any product want to support catalog, it could derive from this command. Currently ONAP uses it and create +If any product wants to support catalog, it could derive from this command. Currently ONAP uses it and creates derived command by using ONAP MSB service. diff --git a/docs/cmd_help_onap_amsterdam.rst b/docs/cmd_help_onap_amsterdam.rst index 1bc0985a..c18412d7 100644 --- a/docs/cmd_help_onap_amsterdam.rst +++ b/docs/cmd_help_onap_amsterdam.rst @@ -15,8 +15,8 @@ onap-amsterdam NOTE: EOL 01-Aug-2018 -ONAP Amsterdam was the first release of ONAP product after merging open-o and open-ecomp together. -It provides platform to creating and maintaining the network services for VoLTE and vCPE types and +ONAP Amsterdam is the first release of ONAP product after merging open-o and open-ecomp. +It provides platform to create and maintain the network services for VoLTE and vCPE types. CLI provides following commands for operating ONAP with this support. [1] basic-login diff --git a/main/src/main/java/org/onap/cli/main/OnapCli.java b/main/src/main/java/org/onap/cli/main/OnapCli.java index 75bf5d18..0c7082f8 100644 --- a/main/src/main/java/org/onap/cli/main/OnapCli.java +++ b/main/src/main/java/org/onap/cli/main/OnapCli.java @@ -43,7 +43,6 @@ import org.onap.cli.fw.registrar.OnapCommandRegistrar; import org.onap.cli.fw.store.OnapCommandExecutionStore; import org.onap.cli.fw.store.OnapCommandExecutionStore.ExecutionStoreContext; import org.onap.cli.fw.utils.OnapCommandDiscoveryUtils; -import org.onap.cli.fw.utils.OnapCommandUtils; import org.onap.cli.main.conf.OnapCliConstants; import org.onap.cli.main.interactive.StringCompleter; import org.onap.cli.main.utils.OnapCliArgsParser; diff --git a/products/onap-elalto/auth/pom.xml b/products/onap-elalto/auth/pom.xml new file mode 100644 index 00000000..5841e33a --- /dev/null +++ b/products/onap-elalto/auth/pom.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright 2019 Huawei Technologies Co., Ltd. + + 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. + --> + +<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> + + <parent> + <groupId>org.onap.cli</groupId> + <artifactId>cli-products-onap-elalto</artifactId> + <version>4.0.0-SNAPSHOT</version> + </parent> + + <artifactId>cli-products-onap-elalto-auth</artifactId> + <name>cli/products/onap-elalto/auth</name> + <packaging>jar</packaging> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + </plugins> + </build> +</project> diff --git a/products/onap-elalto/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLoginCommandElalto.java b/products/onap-elalto/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLoginCommandElalto.java new file mode 100644 index 00000000..d4b23d46 --- /dev/null +++ b/products/onap-elalto/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLoginCommandElalto.java @@ -0,0 +1,24 @@ +/* + * Copyright 2019 Huawei Technologies Co., Ltd. + * + * 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. + */ + +package org.onap.cli.cmd.auth; + +import org.onap.cli.fw.http.cmd.BasicAuthLoginCommand; +import org.onap.cli.fw.schema.OnapCommandSchema; + +@OnapCommandSchema(schema = "basic-login-onap-elalto.yaml") +public class OnapBasicAuthLoginCommandElalto extends BasicAuthLoginCommand { +} diff --git a/products/onap-elalto/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLogoutCommandElalto.java b/products/onap-elalto/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLogoutCommandElalto.java new file mode 100644 index 00000000..38e93f1f --- /dev/null +++ b/products/onap-elalto/auth/src/main/java/org/onap/cli/cmd/auth/OnapBasicAuthLogoutCommandElalto.java @@ -0,0 +1,24 @@ +/* + * Copyright 2019 Huawei Technologies Co., Ltd. + * + * 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. + */ + +package org.onap.cli.cmd.auth; + +import org.onap.cli.fw.http.cmd.BasicAuthLogoutCommand; +import org.onap.cli.fw.schema.OnapCommandSchema; + +@OnapCommandSchema(schema = "basic-logout-onap-elalto.yaml") +public class OnapBasicAuthLogoutCommandElalto extends BasicAuthLogoutCommand { +} diff --git a/products/onap-elalto/auth/src/main/java/org/onap/cli/cmd/auth/OnapPolicyBasicAuthLoginCommandElalto.java b/products/onap-elalto/auth/src/main/java/org/onap/cli/cmd/auth/OnapPolicyBasicAuthLoginCommandElalto.java new file mode 100644 index 00000000..17d7d04a --- /dev/null +++ b/products/onap-elalto/auth/src/main/java/org/onap/cli/cmd/auth/OnapPolicyBasicAuthLoginCommandElalto.java @@ -0,0 +1,24 @@ +/* + * Copyright 2019 Huawei Technologies Co., Ltd. + * + * 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. + */ + +package org.onap.cli.cmd.auth; + +import org.onap.cli.fw.http.cmd.BasicAuthLoginCommand; +import org.onap.cli.fw.schema.OnapCommandSchema; + +@OnapCommandSchema(schema = "basic-login-onap-policy-elalto.yaml") +public class OnapPolicyBasicAuthLoginCommandElalto extends BasicAuthLoginCommand { +} diff --git a/products/onap-elalto/auth/src/main/java/org/onap/cli/cmd/auth/OnapSdcBasicAuthLoginCommandElalto.java b/products/onap-elalto/auth/src/main/java/org/onap/cli/cmd/auth/OnapSdcBasicAuthLoginCommandElalto.java new file mode 100644 index 00000000..f0babea1 --- /dev/null +++ b/products/onap-elalto/auth/src/main/java/org/onap/cli/cmd/auth/OnapSdcBasicAuthLoginCommandElalto.java @@ -0,0 +1,24 @@ +/* + * Copyright 2019 Huawei Technologies Co., Ltd. + * + * 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. + */ + +package org.onap.cli.cmd.auth; + +import org.onap.cli.fw.http.cmd.BasicAuthLoginCommand; +import org.onap.cli.fw.schema.OnapCommandSchema; + +@OnapCommandSchema(schema = "basic-login-onap-sdc-elalto.yaml") +public class OnapSdcBasicAuthLoginCommandElalto extends BasicAuthLoginCommand { +} diff --git a/products/onap-elalto/auth/src/main/resources/META-INF/services/org.onap.cli.fw.cmd.OnapCommand b/products/onap-elalto/auth/src/main/resources/META-INF/services/org.onap.cli.fw.cmd.OnapCommand new file mode 100644 index 00000000..0447158b --- /dev/null +++ b/products/onap-elalto/auth/src/main/resources/META-INF/services/org.onap.cli.fw.cmd.OnapCommand @@ -0,0 +1,18 @@ +# Copyright 2019 Huawei Technologies Co., Ltd. +# +# 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. + +org.onap.cli.cmd.auth.OnapBasicAuthLoginCommandElalto +org.onap.cli.cmd.auth.OnapBasicAuthLogoutCommandElalto +org.onap.cli.cmd.auth.OnapSdcBasicAuthLoginCommandElalto +org.onap.cli.cmd.auth.OnapPolicyBasicAuthLoginCommandElalto diff --git a/products/onap-elalto/auth/src/main/resources/open-cli-schema/basic-login-onap-elalto.yaml b/products/onap-elalto/auth/src/main/resources/open-cli-schema/basic-login-onap-elalto.yaml new file mode 100644 index 00000000..ccd67f55 --- /dev/null +++ b/products/onap-elalto/auth/src/main/resources/open-cli-schema/basic-login-onap-elalto.yaml @@ -0,0 +1,43 @@ +# Copyright 2019 Huawei Technologies Co., Ltd. +# +# 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. + +open_cli_schema_version: 1.0 + +name: basic-login + +description: ONAP basic login auth command + +info: + product: onap-elalto + service: basic-auth + type: auth + author: ONAP CLI Team onap-discuss@lists.onap.org + +results: + direction: portrait + attributes: + - name: Authorization + description: Authorization + scope: short + type: string + - name: X-TransactionId + description: X-TransactionId + scope: short + type: string + default_value: req-$s{uuid} + - name: X-FromAppId + description: X-FromAppId + scope: short + type: string + default_value: ONAP CLI diff --git a/products/onap-elalto/auth/src/main/resources/open-cli-schema/basic-login-onap-policy-elalto.yaml b/products/onap-elalto/auth/src/main/resources/open-cli-schema/basic-login-onap-policy-elalto.yaml new file mode 100644 index 00000000..0916c202 --- /dev/null +++ b/products/onap-elalto/auth/src/main/resources/open-cli-schema/basic-login-onap-policy-elalto.yaml @@ -0,0 +1,45 @@ +# Copyright 2019 Huawei Technologies Co., Ltd. +# +# 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. + +open_cli_schema_version: 1.0 + +name: policy-basic-login + +description: ONAP basic login auth command + + +info: + product: onap-elalto + service: policy-basic-auth + type: auth + author: ONAP CLI Team onap-discuss@lists.onap.org + + +results: + direction: portrait + attributes: + - name: Authorization + description: Authorization + scope: short + type: string + - name: Environment + description: Environment + scope: short + type: string + default_value: TEST + - name: ClientAuth + description: Client Auth + scope: short + type: string + default_value: cHl0aG9uOnRlc3Q= diff --git a/products/onap-elalto/auth/src/main/resources/open-cli-schema/basic-login-onap-sdc-elalto.yaml b/products/onap-elalto/auth/src/main/resources/open-cli-schema/basic-login-onap-sdc-elalto.yaml new file mode 100644 index 00000000..55006d54 --- /dev/null +++ b/products/onap-elalto/auth/src/main/resources/open-cli-schema/basic-login-onap-sdc-elalto.yaml @@ -0,0 +1,50 @@ +# Copyright 2019 Huawei Technologies Co., Ltd. +# +# 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. + +open_cli_schema_version: 1.0 + +name: sdc-basic-login + +description: ONAP basic login auth command + + +info: + product: onap-elalto + service: sdc-basic-auth + type: auth + author: ONAP CLI Team onap-discuss@lists.onap.org + + +results: + direction: portrait + attributes: + - name: Authorization + description: Authorization + scope: short + type: string + - name: X-TransactionId + description: X-TransactionId + scope: short + type: string + default_value: req-$s{uuid} + - name: X-FromAppId + description: X-FromAppId + scope: short + type: string + default_value: ONAP CLI + - name: USER_ID + description: USER_ID for sdc + scope: short + type: string + default_value: ${host-username}
\ No newline at end of file diff --git a/products/onap-elalto/auth/src/main/resources/open-cli-schema/basic-logout-onap-elalto.yaml b/products/onap-elalto/auth/src/main/resources/open-cli-schema/basic-logout-onap-elalto.yaml new file mode 100644 index 00000000..76789b0d --- /dev/null +++ b/products/onap-elalto/auth/src/main/resources/open-cli-schema/basic-logout-onap-elalto.yaml @@ -0,0 +1,34 @@ +# Copyright 2019 Huawei Technologies Co., Ltd. +# +# 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. + +open_cli_schema_version: 1.0 + +name: basic-logout + +description: ONAP basic logout auth command + +info: + product: onap-elalto + service: basic-auth + type: auth + author: ONAP CLI Team onap-discuss@lists.onap.org + + +parameters: + - name: host-username + is_include: false + - name: host-password + is_include: false + - name: no-auth + is_include: false
\ No newline at end of file diff --git a/products/onap-elalto/catalog/pom.xml b/products/onap-elalto/catalog/pom.xml new file mode 100644 index 00000000..4a0e99b9 --- /dev/null +++ b/products/onap-elalto/catalog/pom.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright 2019 Huawei Technologies Co., Ltd. + + 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. + --> + +<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> + + <parent> + <groupId>org.onap.cli</groupId> + <artifactId>cli-products-onap-elalto</artifactId> + <version>4.0.0-SNAPSHOT</version> + </parent> + + <artifactId>cli-products-onap-elalto-catalog</artifactId> + <name>cli/products/onap-elalto/catalog</name> + <packaging>jar</packaging> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + </plugins> + </build> +</project> diff --git a/products/onap-elalto/features/aai/pom.xml b/products/onap-elalto/features/aai/pom.xml new file mode 100644 index 00000000..e363b2ff --- /dev/null +++ b/products/onap-elalto/features/aai/pom.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright 2019 Huawei Technologies Co., Ltd. + + 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. + --> + +<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> + + <parent> + <groupId>org.onap.cli</groupId> + <artifactId>cli-products-onap-elalto-features</artifactId> + <version>4.0.0-SNAPSHOT</version> + </parent> + + <artifactId>cli-products-onap-elalto-features-aai</artifactId> + <name>cli/products/onap-elalto/features/aai</name> + <packaging>jar</packaging> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + </plugins> + </build> +</project> diff --git a/products/onap-elalto/features/msb/pom.xml b/products/onap-elalto/features/msb/pom.xml new file mode 100644 index 00000000..c288b7d8 --- /dev/null +++ b/products/onap-elalto/features/msb/pom.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright 2019 Huawei Technologies Co., Ltd. + + 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. + --> + +<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> + + <parent> + <groupId>org.onap.cli</groupId> + <artifactId>cli-products-onap-elalto-features</artifactId> + <version>4.0.0-SNAPSHOT</version> + </parent> + + <artifactId>cli-products-onap-elalto-features-msb</artifactId> + <name>cli/products/onap-elalto/features/msb</name> + <packaging>jar</packaging> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + </plugins> + </build> +</project> diff --git a/products/onap-elalto/features/multicloud/pom.xml b/products/onap-elalto/features/multicloud/pom.xml new file mode 100644 index 00000000..6766bd68 --- /dev/null +++ b/products/onap-elalto/features/multicloud/pom.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright 2019 Huawei Technologies Co., Ltd. + + 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. + --> + +<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> + + <parent> + <groupId>org.onap.cli</groupId> + <artifactId>cli-products-onap-elalto-features</artifactId> + <version>4.0.0-SNAPSHOT</version> + </parent> + + <artifactId>cli-products-onap-elalto-features-multicloud</artifactId> + <name>cli/products/onap-elalto/features/multicloud</name> + <packaging>jar</packaging> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + </plugins> + </build> +</project> diff --git a/products/onap-elalto/features/policy/pom.xml b/products/onap-elalto/features/policy/pom.xml new file mode 100644 index 00000000..36c69d74 --- /dev/null +++ b/products/onap-elalto/features/policy/pom.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright 2019 Huawei Technologies Co., Ltd. + + 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. + --> + +<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> + + <parent> + <groupId>org.onap.cli</groupId> + <artifactId>cli-products-onap-elalto-features</artifactId> + <version>4.0.0-SNAPSHOT</version> + </parent> + + <artifactId>cli-products-onap-elalto-features-policy</artifactId> + <name>cli/products/onap-elalto/features/policy</name> + <packaging>jar</packaging> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + </plugins> + </build> +</project> diff --git a/products/onap-elalto/features/pom.xml b/products/onap-elalto/features/pom.xml new file mode 100644 index 00000000..5d64a0c2 --- /dev/null +++ b/products/onap-elalto/features/pom.xml @@ -0,0 +1,122 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright © Intel Corporation 2019 + + 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. + --> + +<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> + + <parent> + <groupId>org.onap.cli</groupId> + <artifactId>cli-products-onap-elalto</artifactId> + <version>4.0.0-SNAPSHOT</version> + </parent> + + <artifactId>cli-products-onap-elalto-features</artifactId> + <name>cli/products/onap-elalto/features</name> + <packaging>pom</packaging> + + <modules> + <module>aai</module> + <module>msb</module> + <module>sdc</module> + <module>policy</module> + <module>multicloud</module> + <module>vfc</module> + <module>sdnc</module> + <module>so</module> + <module>vnfsdk</module> + </modules> + + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>3.1.0</version> + <executions> + <execution> + <id>copy-resource-script</id> + <phase>install</phase> + <goals> + <goal>copy-resources</goal> + </goals> + + <configuration> + <outputDirectory>../../../../products/target/script</outputDirectory> + <resources> + <resource> + <directory>${project.basedir}/src/main/resources/script</directory> + <includes> + <include>*.*</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-resource-conf</id> + <phase>install</phase> + <goals> + <goal>copy-resources</goal> + </goals> + + <configuration> + <outputDirectory>../../../../products/target/conf</outputDirectory> + <resources> + <resource> + <directory>${project.basedir}/src/main/resources/conf</directory> + <includes> + <include>*.*</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-artifact</id> + <phase>package</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>${project.groupId}</groupId> + <artifactId>${project.artifactId}</artifactId> + <version>${project.version}</version> + <type>${project.packaging}</type> + </artifactItem> + </artifactItems> + <!-- copy to products dependencies --> + <outputDirectory>../../../../products/target/lib</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> + </build> +</project> diff --git a/products/onap-elalto/features/sdc/pom.xml b/products/onap-elalto/features/sdc/pom.xml new file mode 100644 index 00000000..f8a51ac2 --- /dev/null +++ b/products/onap-elalto/features/sdc/pom.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright 2019 Huawei Technologies Co., Ltd. + + 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. + --> + +<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> + + <parent> + <groupId>org.onap.cli</groupId> + <artifactId>cli-products-onap-elalto-features</artifactId> + <version>4.0.0-SNAPSHOT</version> + </parent> + + <artifactId>cli-products-onap-elalto-features-sdc</artifactId> + <name>cli/products/onap-elalto/features/sdc</name> + <packaging>jar</packaging> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + </plugins> + </build> +</project> diff --git a/products/onap-elalto/features/sdnc/pom.xml b/products/onap-elalto/features/sdnc/pom.xml new file mode 100644 index 00000000..e0821699 --- /dev/null +++ b/products/onap-elalto/features/sdnc/pom.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright 2019 Huawei Technologies Co., Ltd. + + 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. + --> + +<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> + + <parent> + <groupId>org.onap.cli</groupId> + <artifactId>cli-products-onap-elalto-features</artifactId> + <version>4.0.0-SNAPSHOT</version> + </parent> + + <artifactId>cli-products-onap-elalto-features-sdnc</artifactId> + <name>cli/products/onap-elalto/features/sdnc</name> + <packaging>jar</packaging> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + </plugins> + </build> +</project> diff --git a/products/onap-elalto/features/so/pom.xml b/products/onap-elalto/features/so/pom.xml new file mode 100644 index 00000000..70338a0e --- /dev/null +++ b/products/onap-elalto/features/so/pom.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright 2019 Huawei Technologies Co., Ltd. + + 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. + --> + +<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> + + <parent> + <groupId>org.onap.cli</groupId> + <artifactId>cli-products-onap-elalto-features</artifactId> + <version>4.0.0-SNAPSHOT</version> + </parent> + + <artifactId>cli-products-onap-elalto-features-so</artifactId> + <name>cli/products/onap-elalto/features/so</name> + <packaging>jar</packaging> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + </plugins> + </build> +</project> diff --git a/products/onap-elalto/features/vfc/pom.xml b/products/onap-elalto/features/vfc/pom.xml new file mode 100644 index 00000000..cfc52606 --- /dev/null +++ b/products/onap-elalto/features/vfc/pom.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright 2019 Huawei Technologies Co., Ltd. + + 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. + --> + +<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> + + <parent> + <groupId>org.onap.cli</groupId> + <artifactId>cli-products-onap-elalto-features</artifactId> + <version>4.0.0-SNAPSHOT</version> + </parent> + + <artifactId>cli-products-onap-elalto-features-vfc</artifactId> + <name>cli/products/onap-elalto/features/vfc</name> + <packaging>jar</packaging> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + </plugins> + </build> +</project> diff --git a/products/onap-elalto/features/vnfsdk/pom.xml b/products/onap-elalto/features/vnfsdk/pom.xml new file mode 100644 index 00000000..635d502c --- /dev/null +++ b/products/onap-elalto/features/vnfsdk/pom.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright 2018 Huawei Technologies Co., Ltd. + + 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. + --> + +<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> + + <parent> + <groupId>org.onap.cli</groupId> + <artifactId>cli-products-onap-elalto-features</artifactId> + <version>4.0.0-SNAPSHOT</version> + </parent> + + <artifactId>cli-products-onap-elalto-features-vnfsdk</artifactId> + <name>cli/products/onap-elalto/features/vnfsdk</name> + <packaging>jar</packaging> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + </plugins> + </build> +</project> diff --git a/products/onap-elalto/pom.xml b/products/onap-elalto/pom.xml new file mode 100644 index 00000000..883f5558 --- /dev/null +++ b/products/onap-elalto/pom.xml @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright 2019 Huawei Technologies Co., Ltd. + + 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. + --> + +<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> + + <parent> + <groupId>org.onap.cli</groupId> + <artifactId>cli-products</artifactId> + <version>4.0.0-SNAPSHOT</version> + </parent> + + <artifactId>cli-products-onap-elalto</artifactId> + <name>cli/products/onap-elalto</name> + <packaging>pom</packaging> + + <modules> + <module>auth</module> + <module>catalog</module> + <module>features</module> + </modules> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-artifact</id> + <phase>package</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>${project.groupId}</groupId> + <artifactId>${project.artifactId}</artifactId> + <version>${project.version}</version> + <type>${project.packaging}</type> + </artifactItem> + </artifactItems> + <!-- copy to products dependencies --> + <outputDirectory>../../../products/target/lib</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> + </build> +</project> diff --git a/products/pom.xml b/products/pom.xml index b7e8f651..733a4be9 100644 --- a/products/pom.xml +++ b/products/pom.xml @@ -72,6 +72,15 @@ </modules> </profile> <profile> + <id>onap-elalto</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <modules> + <module>onap-elalto</module> + </modules> + </profile> + <profile> <id>eol</id> <activation> <activeByDefault>false</activeByDefault> |