add aafshiro feature 69/78869/5
authorUbuntu <ra1926@att.com>
Wed, 20 Feb 2019 19:24:25 +0000 (19:24 +0000)
committerDan Timoney <dtimoney@att.com>
Wed, 27 Mar 2019 17:10:18 +0000 (17:10 +0000)
add feature module aafshiro to support AAF

Change-Id: Ia2a15e04a070351fb5ba328d8443aef695c51801
Issue-ID: SDNC-485
Signed-off-by: Ubuntu <ra1926@att.com>
aafshiro/features/ccsdk-aafshiro/pom.xml [new file with mode: 0755]
aafshiro/features/features-aafshiro/pom.xml [new file with mode: 0755]
aafshiro/features/pom.xml [new file with mode: 0755]
aafshiro/installer/pom.xml [new file with mode: 0755]
aafshiro/installer/src/assembly/assemble_installer_zip.xml [new file with mode: 0755]
aafshiro/installer/src/assembly/assemble_mvnrepo_zip.xml [new file with mode: 0755]
aafshiro/installer/src/main/resources/scripts/install-feature.sh [new file with mode: 0755]
aafshiro/pom.xml [new file with mode: 0755]
features/ccsdk-features-all/pom.xml
pom.xml

diff --git a/aafshiro/features/ccsdk-aafshiro/pom.xml b/aafshiro/features/ccsdk-aafshiro/pom.xml
new file mode 100755 (executable)
index 0000000..95fb4d5
--- /dev/null
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright © 2018 Bell Canada.
+
+  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.ccsdk.parent</groupId>
+               <artifactId>single-feature-parent</artifactId>
+               <version>1.2.2-SNAPSHOT</version>
+               <relativePath />
+       </parent>
+
+       <groupId>org.onap.ccsdk.features</groupId>
+       <artifactId>ccsdk-aafshiro</artifactId>
+       <version>0.4.2-SNAPSHOT</version>
+       <packaging>feature</packaging>
+
+       <name>ccsdk-features :: aafshiro :: ${project.artifactId}</name>
+
+       <properties>
+               <aaf-shiro-bundle.version>2.1.13</aaf-shiro-bundle.version>
+               <skip.karaf.featureTest>true</skip.karaf.featureTest>
+       </properties>
+
+       <dependencies>
+               <dependency>
+                       <groupId>org.onap.aaf.cadi</groupId>
+                       <artifactId>aaf-shiro-aafrealm-osgi-bundle</artifactId>
+                       <version>${aaf-shiro-bundle.version}</version>
+               </dependency>
+       </dependencies>
+</project>
diff --git a/aafshiro/features/features-aafshiro/pom.xml b/aafshiro/features/features-aafshiro/pom.xml
new file mode 100755 (executable)
index 0000000..bf16b57
--- /dev/null
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright © 2018 Bell Canada.
+
+  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.ccsdk.parent</groupId>
+               <artifactId>feature-repo-parent</artifactId>
+               <version>1.2.2-SNAPSHOT</version>
+               <relativePath />
+       </parent>
+
+       <groupId>org.onap.ccsdk.features</groupId>
+       <artifactId>features-aafshiro</artifactId>
+       <version>0.4.2-SNAPSHOT</version>
+       <packaging>feature</packaging>
+
+       <name>ccsdk-features :: aafshiro :: ${project.artifactId}</name>
+
+       <dependencies>
+               <dependency>
+                       <groupId>${project.groupId}</groupId>
+                       <artifactId>ccsdk-aafshiro</artifactId>
+                       <version>${project.version}</version>
+                       <type>xml</type>
+                       <classifier>features</classifier>
+               </dependency>
+       </dependencies>
+</project>
diff --git a/aafshiro/features/pom.xml b/aafshiro/features/pom.xml
new file mode 100755 (executable)
index 0000000..1e00bc5
--- /dev/null
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (C) 2018 AT&T, Bell Canada
+
+  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.ccsdk.parent</groupId>
+               <artifactId>odlparent-lite</artifactId>
+               <version>1.2.2-SNAPSHOT</version>
+               <relativePath />
+       </parent>
+
+       <groupId>org.onap.ccsdk.features</groupId>
+       <artifactId>aafshiro-features</artifactId>
+       <version>0.4.2-SNAPSHOT</version>
+       <packaging>pom</packaging>
+
+       <name>ccsdk-features :: aafshiro :: ${project.artifactId}</name>
+
+       <modules>
+               <module>ccsdk-aafshiro</module>
+               <module>features-aafshiro</module>
+       </modules>
+</project>
diff --git a/aafshiro/installer/pom.xml b/aafshiro/installer/pom.xml
new file mode 100755 (executable)
index 0000000..f0de709
--- /dev/null
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright © 2018 Bell Canada.
+
+  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.ccsdk.parent</groupId>
+               <artifactId>odlparent-lite</artifactId>
+               <version>1.2.2-SNAPSHOT</version>
+               <relativePath />
+       </parent>
+
+       <groupId>org.onap.ccsdk.features</groupId>
+       <artifactId>aafshiro-installer</artifactId>
+       <version>0.4.2-SNAPSHOT</version>
+       <packaging>pom</packaging>
+
+       <name>ccsdk-features :: aafshiro :: ${project.artifactId}</name>
+
+       <properties>
+               <application.name>ccsdk-aafshiro</application.name>
+               <features.boot>${application.name}</features.boot>
+               <features.repositories>mvn:org.onap.ccsdk.features/${features.boot}/${project.version}/xml/features</features.repositories>
+               <include.transitive.dependencies>false</include.transitive.dependencies>
+               <aaf-shiro-bundle.version>2.1.13</aaf-shiro-bundle.version>
+       </properties>
+
+       <dependencies>
+
+               <dependency>
+                       <groupId>org.onap.ccsdk.features</groupId>
+                       <artifactId>${application.name}</artifactId>
+                       <version>${project.version}</version>
+                       <type>xml</type>
+                       <classifier>features</classifier>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>*</groupId>
+                                       <artifactId>*</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+               <dependency>
+                       <groupId>org.onap.aaf.cadi</groupId>
+                       <artifactId>aaf-shiro-aafrealm-osgi-bundle</artifactId>
+                       <version>${aaf-shiro-bundle.version}</version>
+               </dependency>
+       </dependencies>
+
+       <build>
+               <plugins>
+                       <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>
+                                       <execution>
+                                               <id>installer-zip</id>
+                                               <goals>
+                                                       <goal>single</goal>
+                                               </goals>
+                                               <phase>package</phase>
+                                               <configuration>
+                                                       <attach>true</attach>
+                                                       <finalName>${application.name}-${project.version}-installer</finalName>
+                                                       <descriptors>
+                                                               <descriptor>src/assembly/assemble_installer_zip.xml</descriptor>
+                                                       </descriptors>
+                                                       <appendAssemblyId>false</appendAssemblyId>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
+                       <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>
+                                                       <scope>provided</scope>
+                                               <!--    <includeGroupIds>org.onap.aaf,org.onap.ccsdk.features</includeGroupIds> -->
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
+                       <plugin>
+                               <artifactId>maven-resources-plugin</artifactId>
+                               <version>2.6</version>
+                               <executions>
+                                       <execution>
+                                               <id>copy-version</id>
+                                               <goals>
+                                                       <goal>copy-resources</goal>
+                                               </goals><!-- here the phase you need -->
+                                               <phase>validate</phase>
+                                               <configuration>
+                                                       <outputDirectory>${basedir}/target/stage</outputDirectory>
+                                                       <resources>
+                                                               <resource>
+                                                                       <directory>src/main/resources/scripts</directory>
+                                                                       <includes>
+                                                                               <include>install-feature.sh</include>
+                                                                       </includes>
+                                                                       <filtering>true</filtering>
+                                                               </resource>
+                                                       </resources>
+                                               </configuration>
+                                       </execution>
+
+                               </executions>
+                       </plugin>
+
+               </plugins>
+       </build>
+</project>
diff --git a/aafshiro/installer/src/assembly/assemble_installer_zip.xml b/aafshiro/installer/src/assembly/assemble_installer_zip.xml
new file mode 100755 (executable)
index 0000000..adbec6c
--- /dev/null
@@ -0,0 +1,39 @@
+<!-- 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>installer_zip</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/stage/</directory>
+                       <outputDirectory>${application.name}</outputDirectory>
+                       <fileMode>755</fileMode>
+                       <includes>
+                               <include>*.sh</include>
+                       </includes>
+               </fileSet>
+               <fileSet>
+                       <directory>target/stage/</directory>
+                       <outputDirectory>${application.name}</outputDirectory>
+                       <fileMode>644</fileMode>
+                       <excludes>
+                               <exclude>*.sh</exclude>
+                       </excludes>
+               </fileSet>
+       </fileSets>
+
+
+
+</assembly>
diff --git a/aafshiro/installer/src/assembly/assemble_mvnrepo_zip.xml b/aafshiro/installer/src/assembly/assemble_mvnrepo_zip.xml
new file mode 100755 (executable)
index 0000000..86b07f1
--- /dev/null
@@ -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/aafshiro/installer/src/main/resources/scripts/install-feature.sh b/aafshiro/installer/src/main/resources/scripts/install-feature.sh
new file mode 100755 (executable)
index 0000000..e16e79a
--- /dev/null
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
+ODL_KARAF_CLIENT=${ODL_KARAF_CLIENT:-${ODL_HOME}/bin/client}
+INSTALLERDIR=$(dirname $0)
+
+REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip
+
+if [ -f ${REPOZIP} ]
+then
+       unzip -d ${ODL_HOME} ${REPOZIP}
+else
+       echo "ERROR : repo zip ($REPOZIP) not found"
+       exit 1
+fi
+
+${ODL_KARAF_CLIENT} feature:repo-add ${features.repositories}
+${ODL_KARAF_CLIENT} feature:install ${features.boot}
diff --git a/aafshiro/pom.xml b/aafshiro/pom.xml
new file mode 100755 (executable)
index 0000000..73ba589
--- /dev/null
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright © 2018 Bell Canada.
+
+  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.ccsdk.parent</groupId>
+               <artifactId>odlparent-lite</artifactId>
+               <version>1.2.2-SNAPSHOT</version>
+               <relativePath />
+       </parent>
+
+       <groupId>org.onap.ccsdk.features</groupId>
+       <artifactId>aafshiro</artifactId>
+       <version>0.4.2-SNAPSHOT</version>
+       <packaging>pom</packaging>
+
+       <name>ccsdk-features :: aafshiro</name>
+       <description>AAF Shiro Bundle for UAC</description>
+
+       <modules>
+               <module>features</module>
+               <module>installer</module>
+       </modules>
+</project>
index 82276af..cf02149 100644 (file)
                        <type>xml</type>
                        <classifier>features</classifier>
                </dependency>
+               <dependency>
+                       <groupId>org.onap.ccsdk.features</groupId>
+                       <artifactId>ccsdk-aafshiro</artifactId>
+                       <version>${project.version}</version>
+                       <type>xml</type>
+                       <classifier>features</classifier>
+               </dependency>
 
        </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index acb9fdd..52e978b 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -25,6 +25,7 @@
                <module>features</module>
                <module>sdnr/wt</module>
                <module>blueprints-processor</module>
+               <module>aafshiro</module>
        </modules>
 
        <scm>