This patch is to move Infrautils guice inject code to odlguice.
JIRA: ODLGUICE-2
Signed-off-by: VenkataSatya Jonnadula <rsankar@luminanetworks.com>
Change-Id: Id7d42463a55ff1a8b130d18d3edd06b6aef9abcd
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+ Copyright (c) 2016 Hewlett Packard Enterprise, Co. and others. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+-->
+<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.opendaylight.odlparent</groupId>
+ <artifactId>odlparent-lite</artifactId>
+ <version>7.0.3</version>
+ <relativePath/>
+ </parent>
+
+ <groupId>org.opendaylight.odlguice</groupId>
+ <artifactId>odlguice-artifacts</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <!-- <name> formatting is used by autorelease to parse and notify projects on
+ build failure. Please do not modify this unless you have a good reason. -->
+ <name>ODL :: odlguice :: ${project.artifactId}</name>
+
+ <dependencyManagement>
+ <dependencies>
+ <!-- APIs & runtime utilities -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>inject</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>inject.guice</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!-- Test utilities -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>inject.guice.testutils</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Karaf features -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>odl-odlguice-inject</artifactId>
+ <version>${project.version}</version>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <!--
+ Maven Site Configuration
+
+ The following configuration is necessary for maven-site-plugin to
+ correctly identify the correct deployment path for OpenDaylight Maven
+ sites.
+ -->
+ <url>${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/</url>
+
+ <distributionManagement>
+ <site>
+ <id>opendaylight-site</id>
+ <url>${nexus.site.url}/${project.artifactId}/</url>
+ </site>
+ </distributionManagement>
+</project>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2017 Red Hat, Inc. and others. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+ -->
+<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.opendaylight.odlparent</groupId>
+ <artifactId>single-feature-parent</artifactId>
+ <version>7.0.3</version>
+ <relativePath/>
+ </parent>
+
+ <groupId>org.opendaylight.odlguice</groupId>
+ <artifactId>odl-odlguice-inject</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>feature</packaging>
+
+ <name>OpenDaylight :: odlguice :: @Inject</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>inject</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+</project>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2017 Red Hat, Inc. and others. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+ -->
+<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.opendaylight.odlparent</groupId>
+ <artifactId>feature-repo-parent</artifactId>
+ <version>7.0.3</version>
+ <relativePath/>
+ </parent>
+
+ <groupId>org.opendaylight.odlguice</groupId>
+ <artifactId>odlguice-features</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>feature</packaging>
+ <!-- <name> formatting is used by autorelease to parse and notify projects on
+ build failure. Please do not modify this unless you have a good reason. -->
+ <name>ODL :: odlguice :: ${project.artifactId}</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>odl-odlguice-inject</artifactId>
+ <version>${project.version}</version>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
+ </dependencies>
+
+</project>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2017 Red Hat, Inc. and others. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+ -->
+<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.opendaylight.odlparent</groupId>
+ <artifactId>odlparent-lite</artifactId>
+ <version>7.0.3</version>
+ <relativePath/>
+ </parent>
+ <groupId>org.opendaylight.odlguice</groupId>
+ <artifactId>features</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <!-- <name> formatting is used by autorelease to parse and notify projects on
+ build failure. Please do not modify this unless you have a good reason. -->
+ <name>ODL :: odlguice :: ${project.artifactId}</name>
+
+ <modules>
+ <module>odlguice-features</module>
+ <module>odl-odlguice-inject</module>
+ </modules>
+
+ <url>${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/</url>
+ <distributionManagement>
+ <site>
+ <id>opendaylight-site</id>
+ <url>${nexus.site.url}/${project.artifactId}/</url>
+ </site>
+ </distributionManagement>
+</project>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=2 tabstop=2: -->
+<!--
+ Copyright © 2017 Red Hat, Inc. and others. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+-->
+<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.opendaylight.odlparent</groupId>
+ <artifactId>karaf4-parent</artifactId>
+ <version>7.0.3</version>
+ <relativePath/>
+ </parent>
+
+ <groupId>org.opendaylight.odlguice</groupId>
+ <artifactId>odlguice-karaf</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <!-- <name> formatting is used by autorelease to parse and notify projects on
+ build failure. Please do not modify this unless you have a good reason. -->
+ <name>ODL :: odlguice :: ${project.artifactId}</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>framework</artifactId>
+ <type>kar</type>
+ <!-- scope is compile so all features (there is only one) are installed
+ into startup.properties and the feature repo itself is not installed -->
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.opendaylight.odlguice</groupId>
+ <artifactId>odlguice-features</artifactId>
+ <version>${project.version}</version>
+ <classifier>features</classifier>
+ <type>xml</type>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+
+ <!-- DO NOT install or deploy the karaf artifact -->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=2 tabstop=2: -->
+<!--
+ Copyright © 2017 Red Hat, Inc. and others. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+-->
+<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.opendaylight.odlparent</groupId>
+ <artifactId>bundle-parent</artifactId>
+ <version>7.0.2</version>
+ <relativePath/>
+ </parent>
+
+ <groupId>org.opendaylight.odlguice</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <!-- <name> formatting is used by autorelease to parse and notify projects on
+ build failure. Please do not modify this unless you have a good reason. -->
+ <name>ODL :: odlguice :: ${project.artifactId}</name>
+ <packaging>pom</packaging>
+
+ <properties>
+ <!-- Enforce all of odlparent's optional code quality checks: -->
+ <pmd.cpd.fail>true</pmd.cpd.fail> <!-- Fails build for copy/pasted code -->
+ <duplicate-finder.skip>false</duplicate-finder.skip> <!-- Fails build if duplicate classpath entries on dependencies (odlparent 3.0.0) -->
+ <odlparent.modernizer.enforce>true</odlparent.modernizer.enforce>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <!-- ClassGraph is used both in the ClasspathHellDuplicatesCheckRule as well as in the ClassPathScanner -->
+ <groupId>io.github.classgraph</groupId>
+ <artifactId>classgraph</artifactId>
+ <version>4.8.47</version>
+ </dependency>
+ <dependency>
+ <groupId>com.mycila.guice.extensions</groupId>
+ <artifactId>mycila-guice-jsr250</artifactId>
+ <version>4.0.rc1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <version>4.2.3</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.google.truth</groupId>
+ <artifactId>truth</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+ Copyright (c) 2016 Hewlett Packard Enterprise, Co. and others. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+-->
+<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.opendaylight.odlparent</groupId>
+ <artifactId>odlparent-lite</artifactId>
+ <version>7.0.3</version>
+ <relativePath/>
+ </parent>
+
+ <groupId>org.opendaylight.odlguice</groupId>
+ <artifactId>odlguice-common</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <!-- <name> formatting is used by autorelease to parse and notify projects on
+ build failure. Please do not modify this unless you have a good reason. -->
+ <name>ODL :: odlguice :: ${project.artifactId}</name>
+
+ <modules>
+ <module>artifacts</module>
+ <module>features</module>
+ <module>parent</module>
+ </modules>
+
+ <profiles>
+ <profile>
+ <id>karaf</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+
+ <modules>
+ <module>karaf</module>
+ </modules>
+ </profile>
+ </profiles>
+</project>
--- /dev/null
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# SPDX-License-Identifier: EPL-1.0
+##############################################################################
+# Copyright (c) 2018 The Linux Foundation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+##############################################################################
+
+from docs_conf.conf import *
+
+# Append to intersphinx_mapping
+#intersphinx_mapping['odl-releng-builder'] = ('http://docs.opendaylight.org/projects/releng-builder/en/latest/', None)
+
+linkcheck_ignore = [
+ # Ignore jenkins because it's often slow to respond.
+ 'https://jenkins.opendaylight.org/releng',
+ 'https://jenkins.opendaylight.org/sandbox',
+]
+
+nitpicky = True
--- /dev/null
+---
+project_cfg: opendaylight
+project: ODL Odlguice
+version: Aluminium
+copyright: 2020, VenkataSatya
+author: VenkataSatya, VenkataSatya
--- /dev/null
+.. Infrautils documentation master file, created by
+ sphinx-quickstart on Sun Dec 03 21:47:32 2016.
+ You can adapt this file completely to your liking, but it should at least
+ contain the root `toctree` directive.
+
+Infrautils Documentation
+========================
+This documentation provides critical information needed to help you write ODL
+Applications/Projects using Infrautils, which offers various generic utilities
+and infrastructure for ease of application development.
+
+Contents:
+
+.. toctree::
+ :maxdepth: 1
--- /dev/null
+lfdocs-conf
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.opendaylight.infrautils</groupId>
+ <groupId>org.opendaylight.odlguice</groupId>
<artifactId>parent</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>../../common/parent</relativePath>
</parent>
-
+
<artifactId>inject.guice.testutils</artifactId>
<packaging>jar</packaging>
<!-- <name> formatting is used by autorelease to parse and notify projects on
build failure. Please do not modify this unless you have a good reason. -->
- <name>ODL :: infrautils :: ${project.artifactId}</name>
+ <name>ODL :: odlguice :: ${project.artifactId}</name>
<dependencies>
<dependency>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.opendaylight.infrautils</groupId>
+ <groupId>org.opendaylight.odlguice</groupId>
<artifactId>inject</artifactId>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</project>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.opendaylight.infrautils</groupId>
+ <groupId>org.opendaylight.odlguice</groupId>
<artifactId>parent</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>../../common/parent</relativePath>
</parent>
-
+
<artifactId>inject.guice</artifactId>
<packaging>bundle</packaging>
<!-- <name> formatting is used by autorelease to parse and notify projects on
build failure. Please do not modify this unless you have a good reason. -->
- <name>ODL :: infrautils :: ${project.artifactId}</name>
+ <name>ODL :: odlguice :: ${project.artifactId}</name>
<dependencies>
<dependency>
<artifactId>guice</artifactId>
</dependency>
<dependency>
- <groupId>org.opendaylight.infrautils</groupId>
+ <groupId>org.opendaylight.odlguice</groupId>
<artifactId>inject</artifactId>
<version>${project.version}</version>
</dependency>
-
<dependency>
- <groupId>org.opendaylight.infrautils</groupId>
+ <groupId>org.opendaylight.odlguice</groupId>
<artifactId>inject.guice.testutils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.opendaylight.infrautils</groupId>
+ <groupId>org.opendaylight.odlguice</groupId>
<artifactId>parent</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>../../common/parent</relativePath>
</parent>
<packaging>bundle</packaging>
<!-- <name> formatting is used by autorelease to parse and notify projects on
build failure. Please do not modify this unless you have a good reason. -->
- <name>ODL :: infrautils :: ${project.artifactId}</name>
+ <name>ODL :: odlguice :: ${project.artifactId}</name>
<build>
<plugins>
<instructions>
<!-- TODO remove this; it should do this by default? -->
<Export-Package>
- org.opendaylight.infrautils.inject
+ org.opendaylight.odlguice.inject
</Export-Package>
</instructions>
</configuration>
<relativePath/>
</parent>
- <groupId>org.opendaylight.infrautils</groupId>
+ <groupId>org.opendaylight.odlguice</groupId>
<artifactId>inject-aggregator</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<!-- <name> formatting is used by autorelease to parse and notify projects on
build failure. Please do not modify this unless you have a good reason. -->
- <name>ODL :: infrautils :: ${project.artifactId}</name>
+ <name>ODL :: odlguice :: ${project.artifactId}</name>
<modules>
<module>inject</module>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=2 tabstop=2: -->
+<!-- Copyright © 2016 Red Hat, Inc. and others. All rights reserved. This
+ program and the accompanying materials are made available under the terms
+ of the Eclipse Public License v1.0 which accompanies this distribution, and
+ is available at http://www.eclipse.org/legal/epl-v10.html -->
+<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">
+
+ <parent>
+ <groupId>org.opendaylight.odlparent</groupId>
+ <artifactId>bundle-parent</artifactId>
+ <version>7.0.3</version>
+ <relativePath />
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.opendaylight.odlguice</groupId>
+ <artifactId>odlguice</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>odlguice</name>
+
+ <scm>
+ <connection>scm:git:ssh://git.opendaylight.org:29418/odlguice.git</connection>
+ <developerConnection>scm:git:ssh://git.opendaylight.org:29418/odlguice.git</developerConnection>
+ <!-- <url>https://wiki.opendaylight.org/view/Infrastructure_Utilities:Main</url> -->
+ <tag>HEAD</tag>
+ </scm>
+
+ <modules>
+ <module>common</module>
+ <module>inject</module>
+ </modules>
+</project>
\ No newline at end of file
--- /dev/null
+[tox]
+minversion = 1.6.0
+envlist = docs
+skipsdist = true
+
+[testenv:docs]
+deps = -rdocs/requirements.txt
+commands = sphinx-build -W -n -b html -d {envtmpdir}/doctrees ./docs/ {envtmpdir}/html
Code Review / odlguice.git / commitdiff
