<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>ch.vorburger.opendaylight.simple</groupId>
- <artifactId>simple-aggregator</artifactId>
+ <groupId>org.opendaylight.odlmicro</groupId>
+ <artifactId>micro-aggregator</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
- <groupId>ch.vorburger.opendaylight.simple</groupId>
- <artifactId>simple-core</artifactId>
+ <groupId>org.opendaylight.odlmicro</groupId>
+ <artifactId>micro-core</artifactId>
<version>1.0.0-SNAPSHOT</version>
<dependencies>
<artifactId>infrautils-testutils</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.opendaylight.infrautils</groupId>
<artifactId>inject.guice.testutils</artifactId>
- <scope>compile</scope>
+ <scope>compile</scope-->
<!-- TODO <scope>test</scope> instead of compile here once I'll create
a new infrautils:inject.guice.testutils (non-testutils) for the run-time part.. -->
- </dependency>
+ <!--/dependency-->
<!-- TODO remove, this is just a temporary hack, see above -->
<dependency>
<groupId>junit</groupId>
<version>3.1.1</version>
<configuration>
<descriptors>
- <descriptor>src/assembly/simple.xml</descriptor>
+ <descriptor>src/assembly/micro.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
<classpathPrefix>lib/</classpathPrefix>
<!-- <classpathLayoutType>repository</classpathLayoutType> -->
<classpathLayoutType>custom</classpathLayoutType>
- <!-- This must match the outputFileNameMapping in the simple.xml assembly descriptor -->
+ <!-- This must match the outputFileNameMapping in the micro.xml assembly descriptor -->
<customClasspathLayout>$${artifact.groupId}.$${artifact.artifactId}-$${artifact.version}$${dashClassifier?}.$${artifact.extension}</customClasspathLayout>
</manifest>
</archive>
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
- <id>simple</id>
+ <id>micro</id>
<formats>
<format>dir</format>
<format>tar</format>
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.aaa.simple;
+package org.opendaylight.aaa.micro;
import com.google.inject.AbstractModule;
import com.google.inject.Provides;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.aaa.simple;
+package org.opendaylight.aaa.micro;
import com.google.inject.AbstractModule;
import com.google.inject.Provides;
import org.opendaylight.aaa.cert.impl.AaaCertRpcServiceImpl;
import org.opendaylight.aaa.cert.impl.CertificateManagerService;
import org.opendaylight.aaa.encrypt.AAAEncryptionService;
-import org.opendaylight.controller.simple.ConfigReader;
+import org.opendaylight.controller.micro.ConfigReader;
import org.opendaylight.mdsal.binding.api.DataBroker;
import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rev151126.AaaCertServiceConfig;
import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.AaaCertRpcService;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.aaa.simple;
+package org.opendaylight.aaa.micro;
import com.google.inject.AbstractModule;
import com.google.inject.Provides;
import javax.inject.Singleton;
import org.opendaylight.aaa.encrypt.AAAEncryptionService;
import org.opendaylight.aaa.encrypt.impl.AAAEncryptionServiceImpl;
-import org.opendaylight.controller.simple.ConfigReader;
+import org.opendaylight.controller.micro.ConfigReader;
import org.opendaylight.mdsal.binding.api.DataBroker;
import org.opendaylight.yang.gen.v1.config.aaa.authn.encrypt.service.config.rev160915.AaaEncryptServiceConfig;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.aaa.simple;
+package org.opendaylight.aaa.micro;
import com.google.inject.AbstractModule;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.controller.simple;
+package org.opendaylight.controller.micro;
import com.google.common.io.Files;
import com.google.common.io.Resources;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.controller.simple;
+package org.opendaylight.controller.micro;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.controller.simple;
+package org.opendaylight.controller.micro;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.controller.simple;
+package org.opendaylight.controller.micro;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.controller.simple;
+package org.opendaylight.controller.micro;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.controller.simple;
+package org.opendaylight.controller.micro;
import com.google.inject.Provides;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import org.opendaylight.mdsal.dom.api.DOMRpcService;
import org.opendaylight.mdsal.dom.api.DOMSchemaService;
import org.opendaylight.mdsal.dom.broker.DOMRpcRouter;
-import org.opendaylight.mdsal.simple.MdsalModule;
-import org.opendaylight.mdsal.simple.PingPong;
+import org.opendaylight.mdsal.micro.MdsalModule;
+import org.opendaylight.mdsal.micro.PingPong;
@SuppressFBWarnings("UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR")
* and better to just annotate such types with PreDestroy, but if you cannot,
* this is useful.
*
- * <p>This works in conjunction with org.opendaylight.infrautils.simple.Main
+ * <p>This works in conjunction with org.opendaylight.infrautils.micro.Main
* or org.opendaylight.infrautils.inject.guice.testutils.GuiceRule, both of
* which explicitly use com.mycila.guice.ext.closeable.CloseableInjector.
*
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.infrautils.simple;
+package org.opendaylight.infrautils.micro;
import com.google.inject.AbstractModule;
import org.opendaylight.infrautils.caches.CacheProvider;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.infrautils.simple;
+package org.opendaylight.infrautils.micro;
import static org.immutables.value.Value.Style.ImplementationVisibility.PRIVATE;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.infrautils.simple;
+package org.opendaylight.infrautils.micro;
import com.google.inject.AbstractModule;
import com.google.inject.TypeLiteral;
// TODO DiagStatusCommand must be made to (again) implement
// org.apache.karaf.shell.api.action.Action, ideally via org.opendaylight.infrautils.shell.LoggingAction
// instead of the deprecated legacy Karaf API org.apache.karaf.shell.commands.Action, which
- // we do not want to (can't) anymore depend in opendaylight-simple.
+ // we do not want to (can't) anymore depend in opendaylight-micro.
// This was changed in https://github.com/opendaylight/infrautils/commit/c88543dd8823585bbfd1d3cc72c56b922896df9c
// actionsBinder.addBinding().to(DiagStatusCommand.class);
}
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.infrautils.simple;
+package org.opendaylight.infrautils.micro;
import com.google.inject.AbstractModule;
import org.opendaylight.infrautils.ready.guice.ReadyModule;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.infrautils.simple;
+package org.opendaylight.infrautils.micro;
import com.google.inject.AbstractModule;
import org.opendaylight.infrautils.jobcoordinator.JobCoordinator;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.infrautils.simple;
+package org.opendaylight.infrautils.micro;
import com.google.inject.Guice;
import com.google.inject.Injector;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.infrautils.simple;
+package org.opendaylight.infrautils.micro;
import com.google.inject.AbstractModule;
import org.opendaylight.infrautils.metrics.MetricProvider;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.infrautils.simple;
+package org.opendaylight.infrautils.micro;
import com.google.inject.Module;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.infrautils.simple;
+package org.opendaylight.infrautils.micro;
import com.google.inject.AbstractModule;
import com.google.inject.Injector;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.mdsal.simple;
+package org.opendaylight.mdsal.micro;
import com.google.inject.AbstractModule;
import com.google.inject.Provides;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.mdsal.simple;
+package org.opendaylight.mdsal.micro;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.restconf.simple;
+package org.opendaylight.restconf.micro;
import java.net.InetAddress;
import org.immutables.value.Value;
-import org.opendaylight.infrautils.simple.ConfigImmutableStyle;
+import org.opendaylight.infrautils.micro.ConfigImmutableStyle;
/**
* Configuration for the RESTCONF server.
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.restconf.simple;
+package org.opendaylight.restconf.micro;
import com.google.inject.AbstractModule;
import java.net.InetAddress;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.restconf.simple;
+package org.opendaylight.restconf.micro;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.serviceutils.simple;
+package org.opendaylight.serviceutils.micro;
import com.google.inject.AbstractModule;
import org.opendaylight.serviceutils.srm.ServiceRecoveryRegistry;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.serviceutils.simple;
+package org.opendaylight.serviceutils.micro;
import com.google.inject.AbstractModule;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.serviceutils.simple;
+package org.opendaylight.serviceutils.micro;
import com.google.inject.AbstractModule;
import com.google.inject.Provides;
import javax.inject.Singleton;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.simple.ConfigReader;
+import org.opendaylight.controller.micro.ConfigReader;
import org.opendaylight.serviceutils.upgrade.UpgradeState;
import org.opendaylight.serviceutils.upgrade.impl.UpgradeStateListener;
import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.upgrade.rev180702.UpgradeConfig;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.aaa.simple.test;
+package org.opendaylight.aaa.micro.test;
import org.junit.Ignore;
import org.junit.Rule;
-import org.opendaylight.aaa.simple.AAAModule;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
+import org.opendaylight.aaa.micro.AAAModule;
+import org.opendaylight.controller.micro.InMemoryControllerModule;
import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
+import org.opendaylight.infrautils.micro.testutils.AbstractSimpleDistributionTest;
@Ignore // TODO fix NullPointerException at org.opendaylight.aaa.cert.impl.DefaultMdsalSslData.createKeyStores :155
public class AAAModuleTest extends AbstractSimpleDistributionTest {
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.aaa.simple.test;
+package org.opendaylight.aaa.micro.test;
import javax.inject.Inject;
import org.junit.Rule;
import org.opendaylight.aaa.cert.api.ICertificateManager;
-import org.opendaylight.aaa.simple.CertModule;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
+import org.opendaylight.aaa.micro.CertModule;
+import org.opendaylight.controller.micro.InMemoryControllerModule;
import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
+import org.opendaylight.infrautils.micro.testutils.AbstractSimpleDistributionTest;
public class CertModuleTest extends AbstractSimpleDistributionTest {
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.aaa.simple.test;
+package org.opendaylight.aaa.micro.test;
import javax.inject.Inject;
import org.junit.Rule;
import org.opendaylight.aaa.encrypt.AAAEncryptionService;
-import org.opendaylight.aaa.simple.EncryptModule;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
+import org.opendaylight.aaa.micro.EncryptModule;
+import org.opendaylight.controller.micro.InMemoryControllerModule;
import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
+import org.opendaylight.infrautils.micro.testutils.AbstractSimpleDistributionTest;
public class EncryptModuleTest extends AbstractSimpleDistributionTest {
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.controller.simple.test;
+package org.opendaylight.controller.micro.test;
import java.util.concurrent.ExecutionException;
import javax.inject.Inject;
import org.junit.Test;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.opendaylight.controller.md.sal.binding.api.NotificationService;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
+import org.opendaylight.controller.micro.InMemoryControllerModule;
import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
-import org.opendaylight.mdsal.simple.PingPong;
+import org.opendaylight.infrautils.micro.testutils.AbstractSimpleDistributionTest;
+import org.opendaylight.mdsal.micro.PingPong;
public class InMemoryControllerModuleTest extends AbstractSimpleDistributionTest {
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.infrautils.simple.test;
+package org.opendaylight.infrautils.micro.test;
import javax.inject.Inject;
import org.junit.Rule;
import org.opendaylight.infrautils.diagstatus.DiagStatusService;
import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
+import org.opendaylight.infrautils.micro.DiagStatusModule;
import org.opendaylight.infrautils.ready.guice.ReadyModule;
-import org.opendaylight.infrautils.simple.DiagStatusModule;
import org.opendaylight.infrautils.web.WebModule;
/**
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.infrautils.simple.test;
+package org.opendaylight.infrautils.micro.test;
import org.junit.Test;
import org.opendaylight.infrautils.inject.guice.testutils.AbstractGuiceJsr250Module;
+import org.opendaylight.infrautils.micro.Main;
import org.opendaylight.infrautils.ready.guice.ReadyModule;
-import org.opendaylight.infrautils.simple.Main;
/**
* Unit test for Main.
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.infrautils.simple.testutils;
+package org.opendaylight.infrautils.micro.testutils;
import static com.google.common.truth.Truth.assertThat;
import org.opendaylight.infrautils.testutils.LogRule;
/**
- * Abstract base class for simple distribution component tests.
+ * Abstract base class for micro distribution component tests.
*
* @author Michael Vorburger.ch
*/
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.mdsal.simple.test;
+package org.opendaylight.mdsal.micro.test;
import java.util.concurrent.ExecutionException;
import javax.inject.Inject;
import org.junit.Rule;
import org.junit.Test;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
+import org.opendaylight.controller.micro.InMemoryControllerModule;
import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
+import org.opendaylight.infrautils.micro.testutils.AbstractSimpleDistributionTest;
import org.opendaylight.mdsal.binding.api.DataBroker;
import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry;
import org.opendaylight.mdsal.binding.api.RpcProviderService;
-import org.opendaylight.mdsal.simple.PingPong;
+import org.opendaylight.mdsal.micro.PingPong;
public class InMemoryMdsalModuleTest extends AbstractSimpleDistributionTest {
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.restconf.simple.test;
+package org.opendaylight.restconf.micro.test;
import static com.google.common.truth.Truth.assertThat;
import static org.opendaylight.infrautils.testutils.web.TestWebClient.Method.GET;
import org.junit.Test;
import org.opendaylight.aaa.web.WebServer;
import org.opendaylight.aaa.web.testutils.TestWebClient;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
+import org.opendaylight.controller.micro.InMemoryControllerModule;
import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
+import org.opendaylight.infrautils.micro.testutils.AbstractSimpleDistributionTest;
import org.opendaylight.infrautils.web.WebModule;
-import org.opendaylight.restconf.simple.RestConfModule;
+import org.opendaylight.restconf.micro.RestConfModule;
/**
* Tests if the {@link RestConfModule} works.
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.serviceutils.simple.test;
+package org.opendaylight.serviceutils.micro.test;
import javax.inject.Inject;
import org.junit.Rule;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
+import org.opendaylight.controller.micro.InMemoryControllerModule;
import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
-import org.opendaylight.serviceutils.simple.ServiceUtilsModule;
+import org.opendaylight.infrautils.micro.testutils.AbstractSimpleDistributionTest;
+import org.opendaylight.serviceutils.micro.ServiceUtilsModule;
import org.opendaylight.serviceutils.upgrade.UpgradeState;
/**
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>ch.vorburger.opendaylight.simple</groupId>
- <artifactId>simple-aggregator</artifactId>
+ <groupId>org.opendaylight.odlmicro</groupId>
+ <artifactId>micro-aggregator</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
- <groupId>ch.vorburger.opendaylight.simple</groupId>
- <artifactId>simple-genius</artifactId>
+ <groupId>org.opendaylight.odlmicro</groupId>
+ <artifactId>micro-genius</artifactId>
<version>1.0.0-SNAPSHOT</version>
<dependencies>
<dependency>
- <groupId>ch.vorburger.opendaylight.simple</groupId>
- <artifactId>simple-core</artifactId>
+ <groupId>org.opendaylight.odlmicro</groupId>
+ <artifactId>micro-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>ch.vorburger.opendaylight.simple</groupId>
- <artifactId>simple-openflowplugin</artifactId>
+ <groupId>org.opendaylight.odlmicro</groupId>
+ <artifactId>micro-openflowplugin</artifactId>
<version>${project.version}</version>
</dependency>
<version>3.1.1</version>
<configuration>
<descriptors>
- <descriptor>src/assembly/simple.xml</descriptor>
+ <descriptor>src/assembly/micro.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
<classpathPrefix>lib/</classpathPrefix>
<!-- <classpathLayoutType>repository</classpathLayoutType> -->
<classpathLayoutType>custom</classpathLayoutType>
- <!-- This must match the outputFileNameMapping in the simple.xml assembly descriptor -->
+ <!-- This must match the outputFileNameMapping in the micro.xml assembly descriptor -->
<customClasspathLayout>$${artifact.groupId}.$${artifact.artifactId}-$${artifact.version}$${dashClassifier?}.$${artifact.extension}</customClasspathLayout>
- <mainClass>org.opendaylight.genius.simple.GeniusMain</mainClass>
+ <mainClass>org.opendaylight.genius.micro.GeniusMain</mainClass>
</manifest>
</archive>
</configuration>
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
- <id>simple</id>
+ <id>micro</id>
<formats>
<format>dir</format>
<format>tar</format>
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.genius.simple;
+package org.opendaylight.genius.micro;
import org.opendaylight.infrautils.inject.guice.GuiceClassPathBinder;
-import org.opendaylight.infrautils.simple.ShellMain;
+import org.opendaylight.infrautils.micro.ShellMain;
public final class GeniusMain {
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.genius.simple;
+package org.opendaylight.genius.micro;
import com.google.inject.Provides;
import javax.inject.Singleton;
-import org.opendaylight.controller.simple.ConfigReader;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
+import org.opendaylight.controller.micro.ConfigReader;
+import org.opendaylight.controller.micro.InMemoryControllerModule;
import org.opendaylight.daexim.DataImportBootReady;
import org.opendaylight.genius.arputil.internal.ArpUtilImpl;
import org.opendaylight.genius.ipv6util.nd.Ipv6NdUtilServiceImpl;
import org.opendaylight.infrautils.inject.guice.AutoWiringModule;
import org.opendaylight.infrautils.inject.guice.GuiceClassPathBinder;
import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
-import org.opendaylight.infrautils.simple.InfraUtilsModule;
-import org.opendaylight.openflowplugin.simple.OpenFlowPluginModule;
-import org.opendaylight.restconf.simple.RestConfModule;
-import org.opendaylight.serviceutils.simple.ServiceUtilsModule;
+import org.opendaylight.infrautils.micro.InfraUtilsModule;
+import org.opendaylight.openflowplugin.micro.OpenFlowPluginModule;
+import org.opendaylight.restconf.micro.RestConfModule;
+import org.opendaylight.serviceutils.micro.ServiceUtilsModule;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.arputil.rev160406.OdlArputilService;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.ipv6.nd.util.rev170210.Ipv6NdUtilService;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.networkutils.config.rev181129.NetworkConfig;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.genius.simple;
+package org.opendaylight.genius.micro;
import com.google.inject.AbstractModule;
import javax.annotation.Nullable;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.genius.simple;
+package org.opendaylight.genius.micro;
import com.google.inject.AbstractModule;
import com.google.inject.multibindings.Multibinder;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.aaa.simple.test;
+package org.opendaylight.aaa.micro.test;
import org.junit.Ignore;
import org.junit.Rule;
-import org.opendaylight.aaa.simple.AAAModule;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
+import org.opendaylight.aaa.micro.AAAModule;
+import org.opendaylight.controller.micro.InMemoryControllerModule;
import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
+import org.opendaylight.infrautils.micro.testutils.AbstractSimpleDistributionTest;
@Ignore // TODO fix NullPointerException at org.opendaylight.aaa.cert.impl.DefaultMdsalSslData.createKeyStores :155
public class AAAModuleTest extends AbstractSimpleDistributionTest {
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.aaa.simple.test;
+package org.opendaylight.aaa.micro.test;
import javax.inject.Inject;
import org.junit.Rule;
import org.opendaylight.aaa.cert.api.ICertificateManager;
-import org.opendaylight.aaa.simple.CertModule;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
+import org.opendaylight.aaa.micro.CertModule;
+import org.opendaylight.controller.micro.InMemoryControllerModule;
import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
+import org.opendaylight.infrautils.micro.testutils.AbstractSimpleDistributionTest;
public class CertModuleTest extends AbstractSimpleDistributionTest {
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.aaa.simple.test;
+package org.opendaylight.aaa.micro.test;
import javax.inject.Inject;
import org.junit.Rule;
import org.opendaylight.aaa.encrypt.AAAEncryptionService;
-import org.opendaylight.aaa.simple.EncryptModule;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
+import org.opendaylight.aaa.micro.EncryptModule;
+import org.opendaylight.controller.micro.InMemoryControllerModule;
import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
+import org.opendaylight.infrautils.micro.testutils.AbstractSimpleDistributionTest;
public class EncryptModuleTest extends AbstractSimpleDistributionTest {
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.controller.simple.test;
+package org.opendaylight.controller.micro.test;
import java.util.concurrent.ExecutionException;
import javax.inject.Inject;
import org.junit.Test;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.opendaylight.controller.md.sal.binding.api.NotificationService;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
+import org.opendaylight.controller.micro.InMemoryControllerModule;
import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
-import org.opendaylight.mdsal.simple.PingPong;
+import org.opendaylight.infrautils.micro.testutils.AbstractSimpleDistributionTest;
+import org.opendaylight.mdsal.micro.PingPong;
public class InMemoryControllerModuleTest extends AbstractSimpleDistributionTest {
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.genius.simple.test;
+package org.opendaylight.genius.micro.test;
import javax.inject.Inject;
import org.junit.Rule;
import org.opendaylight.genius.interfacemanager.interfaces.InterfaceManagerService;
import org.opendaylight.genius.itm.api.IITMProvider;
-import org.opendaylight.genius.simple.GeniusModule;
+import org.opendaylight.genius.micro.GeniusModule;
import org.opendaylight.infrautils.inject.guice.GuiceClassPathBinder;
import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.simple.ShellTestModule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
+import org.opendaylight.infrautils.micro.ShellTestModule;
+import org.opendaylight.infrautils.micro.testutils.AbstractSimpleDistributionTest;
/**
* Genius full distribution component test.
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.infrautils.simple.test;
+package org.opendaylight.infrautils.micro.test;
import javax.inject.Inject;
import org.junit.Rule;
import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
import org.opendaylight.infrautils.ready.guice.ReadyModule;
-import org.opendaylight.infrautils.simple.DiagStatusModule;
+import org.opendaylight.infrautils.micro.DiagStatusModule;
import org.opendaylight.infrautils.web.WebModule;
/**
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.infrautils.simple.test;
+package org.opendaylight.infrautils.micro.test;
import org.junit.Test;
import org.opendaylight.infrautils.inject.guice.testutils.AbstractGuiceJsr250Module;
import org.opendaylight.infrautils.ready.guice.ReadyModule;
-import org.opendaylight.infrautils.simple.Main;
+import org.opendaylight.infrautils.micro.Main;
/**
* Unit test for Main.
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.infrautils.simple.testutils;
+package org.opendaylight.infrautils.micro.testutils;
import static com.google.common.truth.Truth.assertThat;
import org.opendaylight.infrautils.testutils.LogRule;
/**
- * Abstract base class for simple distribution component tests.
+ * Abstract base class for micro distribution component tests.
*
* @author Michael Vorburger.ch
*/
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.mdsal.simple.test;
+package org.opendaylight.mdsal.micro.test;
import java.util.concurrent.ExecutionException;
import javax.inject.Inject;
import org.junit.Rule;
import org.junit.Test;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
+import org.opendaylight.controller.micro.InMemoryControllerModule;
import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
+import org.opendaylight.infrautils.micro.testutils.AbstractSimpleDistributionTest;
import org.opendaylight.mdsal.binding.api.DataBroker;
import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry;
import org.opendaylight.mdsal.binding.api.RpcProviderService;
-import org.opendaylight.mdsal.simple.PingPong;
+import org.opendaylight.mdsal.micro.PingPong;
public class InMemoryMdsalModuleTest extends AbstractSimpleDistributionTest {
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.netvirt.simple.test;
+package org.opendaylight.netvirt.micro.test;
import org.junit.Ignore;
import org.junit.Rule;
import org.opendaylight.infrautils.inject.guice.GuiceClassPathBinder;
import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.simple.ShellTestModule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
-import org.opendaylight.netvirt.simple.NetvirtModule;
+import org.opendaylight.infrautils.micro.ShellTestModule;
+import org.opendaylight.infrautils.micro.testutils.AbstractSimpleDistributionTest;
+import org.opendaylight.netvirt.micro.NetvirtModule;
/**
* Netvirt full distribution component test.
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.neutron.simple.test;
+package org.opendaylight.neutron.micro.test;
import static com.google.common.truth.Truth.assertThat;
import static org.opendaylight.infrautils.testutils.web.TestWebClient.Method.GET;
import org.junit.Test;
import org.opendaylight.aaa.web.WebServer;
import org.opendaylight.aaa.web.testutils.TestWebClient;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
+import org.opendaylight.controller.micro.InMemoryControllerModule;
import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
+import org.opendaylight.infrautils.micro.testutils.AbstractSimpleDistributionTest;
import org.opendaylight.infrautils.web.WebModule;
-import org.opendaylight.neutron.simple.NeutronModule;
+import org.opendaylight.neutron.micro.NeutronModule;
/**
* Neutron component test.
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.openflowplugin.simple.test;
+package org.opendaylight.openflowplugin.micro.test;
import static com.google.common.truth.Truth.assertThat;
import org.junit.Rule;
import org.junit.Test;
import org.opendaylight.aaa.web.testutils.WebTestModule;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
+import org.opendaylight.controller.micro.InMemoryControllerModule;
import org.opendaylight.infrautils.diagstatus.DiagStatusService;
import org.opendaylight.infrautils.diagstatus.ServiceStatusSummary;
import org.opendaylight.infrautils.inject.guice.GuiceClassPathBinder;
import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
import org.opendaylight.infrautils.ready.guice.ReadyModule;
-import org.opendaylight.infrautils.simple.DiagStatusModule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
+import org.opendaylight.infrautils.micro.DiagStatusModule;
+import org.opendaylight.infrautils.micro.testutils.AbstractSimpleDistributionTest;
import org.opendaylight.openflowplugin.api.openflow.OpenFlowPluginProvider;
import org.opendaylight.openflowplugin.impl.OpenFlowPluginProviderImpl;
-import org.opendaylight.openflowplugin.simple.OpenFlowPluginModule;
-import org.opendaylight.serviceutils.simple.ServiceUtilsModule;
+import org.opendaylight.openflowplugin.micro.OpenFlowPluginModule;
+import org.opendaylight.serviceutils.micro.ServiceUtilsModule;
import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketProcessingService;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow.provider.config.rev160510.OpenflowProviderConfig;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.app.forwardingrules.manager.config.rev160511.ForwardingRulesManagerConfig;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.ovsdb.simple.test;
+package org.opendaylight.ovsdb.micro.test;
import javax.inject.Inject;
import org.junit.Rule;
-import org.opendaylight.aaa.simple.CertModule;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
+import org.opendaylight.aaa.micro.CertModule;
+import org.opendaylight.controller.micro.InMemoryControllerModule;
import org.opendaylight.infrautils.inject.guice.GuiceClassPathBinder;
import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
import org.opendaylight.infrautils.ready.guice.ReadyModule;
-import org.opendaylight.infrautils.simple.DiagStatusModule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
+import org.opendaylight.infrautils.micro.DiagStatusModule;
+import org.opendaylight.infrautils.micro.testutils.AbstractSimpleDistributionTest;
import org.opendaylight.infrautils.web.WebModule;
import org.opendaylight.ovsdb.hwvtepsouthbound.HwvtepSouthboundProvider;
import org.opendaylight.ovsdb.lib.OvsdbConnection;
import org.opendaylight.ovsdb.lib.impl.OvsdbConnectionService;
-import org.opendaylight.ovsdb.simple.OvsdbModule;
+import org.opendaylight.ovsdb.micro.OvsdbModule;
import org.opendaylight.ovsdb.southbound.SouthboundProvider;
public class OvsdbModuleTest extends AbstractSimpleDistributionTest {
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.restconf.simple.test;
+package org.opendaylight.restconf.micro.test;
import static com.google.common.truth.Truth.assertThat;
import static org.opendaylight.infrautils.testutils.web.TestWebClient.Method.GET;
import org.junit.Test;
import org.opendaylight.aaa.web.WebServer;
import org.opendaylight.aaa.web.testutils.TestWebClient;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
+import org.opendaylight.controller.micro.InMemoryControllerModule;
import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
+import org.opendaylight.infrautils.micro.testutils.AbstractSimpleDistributionTest;
import org.opendaylight.infrautils.web.WebModule;
-import org.opendaylight.restconf.simple.RestConfModule;
+import org.opendaylight.restconf.micro.RestConfModule;
/**
* Tests if the {@link RestConfModule} works.
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.serviceutils.simple.test;
+package org.opendaylight.serviceutils.micro.test;
import javax.inject.Inject;
import org.junit.Rule;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
+import org.opendaylight.controller.micro.InMemoryControllerModule;
import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
-import org.opendaylight.serviceutils.simple.ServiceUtilsModule;
+import org.opendaylight.infrautils.micro.testutils.AbstractSimpleDistributionTest;
+import org.opendaylight.serviceutils.micro.ServiceUtilsModule;
import org.opendaylight.serviceutils.upgrade.UpgradeState;
/**
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>ch.vorburger.opendaylight.simple</groupId>
- <artifactId>simple-aggregator</artifactId>
+ <groupId>org.opendaylight.odlmicro</groupId>
+ <artifactId>micro-aggregator</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
- <groupId>ch.vorburger.opendaylight.simple</groupId>
- <artifactId>simple-netconf</artifactId>
+ <groupId>org.opendaylight.odlmicro</groupId>
+ <artifactId>micro-netconf</artifactId>
<version>1.0.0-SNAPSHOT</version>
<dependencies>
<dependency>
- <groupId>ch.vorburger.opendaylight.simple</groupId>
- <artifactId>simple-core</artifactId>
+ <groupId>org.opendaylight.odlmicro</groupId>
+ <artifactId>micro-core</artifactId>
<version>${project.version}</version>
</dependency>
<version>3.1.1</version>
<configuration>
<descriptors>
- <descriptor>src/assembly/simple.xml</descriptor>
+ <descriptor>src/assembly/micro.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
<classpathPrefix>lib/</classpathPrefix>
<!-- <classpathLayoutType>repository</classpathLayoutType> -->
<classpathLayoutType>custom</classpathLayoutType>
- <!-- This must match the outputFileNameMapping in the simple.xml assembly descriptor -->
+ <!-- This must match the outputFileNameMapping in the micro.xml assembly descriptor -->
<customClasspathLayout>$${artifact.groupId}.$${artifact.artifactId}-$${artifact.version}$${dashClassifier?}.$${artifact.extension}</customClasspathLayout>
- <mainClass>org.opendaylight.netconf.simple.NetconfMain</mainClass>
+ <mainClass>org.opendaylight.netconf.micro.NetconfMain</mainClass>
</manifest>
</archive>
</configuration>
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
- <id>simple</id>
+ <id>micro</id>
<formats>
<format>dir</format>
<format>tar</format>
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.netconf.simple;
+package org.opendaylight.netconf.micro;
import org.opendaylight.infrautils.inject.guice.GuiceClassPathBinder;
-import org.opendaylight.infrautils.simple.Main;
+import org.opendaylight.infrautils.micro.Main;
public final class NetconfMain {
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.netconf.simple;
+package org.opendaylight.netconf.micro;
import com.google.inject.Provides;
import io.netty.channel.EventLoopGroup;
import org.opendaylight.aaa.api.CredentialAuth;
import org.opendaylight.aaa.api.PasswordCredentials;
import org.opendaylight.aaa.encrypt.AAAEncryptionService;
-import org.opendaylight.aaa.simple.AAAModule;
+import org.opendaylight.aaa.micro.AAAModule;
import org.opendaylight.controller.config.threadpool.ScheduledThreadPool;
import org.opendaylight.controller.config.threadpool.ThreadPool;
import org.opendaylight.controller.config.threadpool.util.FlexibleThreadPoolWrapper;
import org.opendaylight.controller.config.threadpool.util.NamingThreadPoolFactory;
import org.opendaylight.controller.config.threadpool.util.ScheduledThreadPoolWrapper;
-import org.opendaylight.controller.simple.GlobalBossGroup;
-import org.opendaylight.controller.simple.GlobalEventExecutor;
-import org.opendaylight.controller.simple.GlobalTimer;
-import org.opendaylight.controller.simple.GlobalWorkerGroup;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
+import org.opendaylight.controller.micro.GlobalBossGroup;
+import org.opendaylight.controller.micro.GlobalEventExecutor;
+import org.opendaylight.controller.micro.GlobalTimer;
+import org.opendaylight.controller.micro.GlobalWorkerGroup;
+import org.opendaylight.controller.micro.InMemoryControllerModule;
import org.opendaylight.infrautils.inject.guice.AutoWiringModule;
import org.opendaylight.infrautils.inject.guice.GuiceClassPathBinder;
import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
-import org.opendaylight.infrautils.simple.InfraUtilsModule;
+import org.opendaylight.infrautils.micro.InfraUtilsModule;
import org.opendaylight.mdsal.binding.api.DataBroker;
import org.opendaylight.mdsal.dom.api.DOMDataBroker;
import org.opendaylight.mdsal.dom.api.DOMMountPointService;
import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory;
import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactoryListener;
import org.opendaylight.netconf.mdsal.connector.MdsalNetconfOperationServiceFactory;
-import org.opendaylight.netconf.simple.annotations.AggregatedNetconfOperationServiceFactoryMappers;
-import org.opendaylight.netconf.simple.annotations.GlobalNetconfProcessingExecutor;
-import org.opendaylight.netconf.simple.annotations.GlobalNetconfSshScheduledExecutor;
-import org.opendaylight.netconf.simple.annotations.MdsalNetconfConnector;
-import org.opendaylight.netconf.simple.annotations.NetconfAuthProvider;
+import org.opendaylight.netconf.micro.annotations.AggregatedNetconfOperationServiceFactoryMappers;
+import org.opendaylight.netconf.micro.annotations.GlobalNetconfProcessingExecutor;
+import org.opendaylight.netconf.micro.annotations.GlobalNetconfSshScheduledExecutor;
+import org.opendaylight.netconf.micro.annotations.MdsalNetconfConnector;
+import org.opendaylight.netconf.micro.annotations.NetconfAuthProvider;
import org.opendaylight.netconf.topology.api.NetconfTopology;
import org.opendaylight.netconf.topology.impl.NetconfTopologyImpl;
import org.opendaylight.netconf.topology.impl.SchemaRepositoryProviderImpl;
-import org.opendaylight.restconf.simple.RestConfModule;
-import org.opendaylight.serviceutils.simple.ServiceUtilsModule;
+import org.opendaylight.restconf.micro.RestConfModule;
+import org.opendaylight.serviceutils.micro.ServiceUtilsModule;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
// START
@Provides
@Singleton
- @org.opendaylight.netconf.simple.annotations.NetconfClientDispatcher
+ @org.opendaylight.netconf.micro.annotations.NetconfClientDispatcher
NetconfClientDispatcher getNetconfClientDispatcher(
@GlobalBossGroup EventLoopGroup globalBossGroup,
@GlobalWorkerGroup EventLoopGroup globalWorkerGroup,
// START
@Provides
@Singleton
- @org.opendaylight.netconf.simple.annotations.MapperAggregatorRegistry
+ @org.opendaylight.netconf.micro.annotations.MapperAggregatorRegistry
NetconfOperationServiceFactoryListener getMapperAggregatorRegistry() {
return new AggregatedNetconfOperationServiceFactory();
}
@Provides
@Singleton
- @org.opendaylight.netconf.simple.annotations.AggregatedNetconfOperationServiceFactory
+ @org.opendaylight.netconf.micro.annotations.AggregatedNetconfOperationServiceFactory
NetconfOperationServiceFactory getAggregatedNetconfOperationServiceFactoryListener() {
return new AggregatedNetconfOperationServiceFactory();
}
@Singleton
@AggregatedNetconfOperationServiceFactoryMappers
AggregatedNetconfOperationServiceFactory getAggregatedNetconfOperationServiceFactoryMappers(
- @org.opendaylight.netconf.simple.annotations.AggregatedNetconfOperationServiceFactory
+ @org.opendaylight.netconf.micro.annotations.AggregatedNetconfOperationServiceFactory
NetconfOperationServiceFactory aggregatedNetconfOperationServiceFactory) {
return new AggregatedNetconfOperationServiceFactory(Arrays.asList(aggregatedNetconfOperationServiceFactory));
}
@Provides
@Singleton
NetconfMonitoringService getNetconfMonitoringService(
- @org.opendaylight.netconf.simple.annotations.AggregatedNetconfOperationServiceFactory
+ @org.opendaylight.netconf.micro.annotations.AggregatedNetconfOperationServiceFactory
NetconfOperationServiceFactory aggregatedNetconfOperationServiceFactory,
@GlobalNetconfSshScheduledExecutor ScheduledThreadPool scheduledThreadPool) {
return new NetconfMonitoringServiceImpl(
@Provides
@Singleton
- NetconfTopology getNetconfTopology(@org.opendaylight.netconf.simple.annotations.NetconfClientDispatcher
+ NetconfTopology getNetconfTopology(@org.opendaylight.netconf.micro.annotations.NetconfClientDispatcher
NetconfClientDispatcher clientDispatcherDependency,
@GlobalNetconfSshScheduledExecutor ScheduledThreadPool keepAliveExecutor,
@GlobalNetconfProcessingExecutor ThreadPool processingExecutor,
// @GlobalNetconfProcessingExecutor ThreadPool processingExecutor,
// ActorSystemProvider actorSystemProvider,
// @GlobalEventExecutor EventExecutor eventExecutor,
-// @org.opendaylight.netconf.simple.NetconfClientDispatcher NetconfClientDispatcher clientDispatcherDependency,
+// @org.opendaylight.netconf.micro.NetconfClientDispatcher NetconfClientDispatcher clientDispatcherDependency,
// DOMMountPointService mountPointService,
// AAAEncryptionService encryptionService) {
// Config config = new ConfigBuilder().setWriteTransactionIdleTimeout(WRITE_TRANSACTION_IDLE_TIMEOUT_MILLIS)
@Singleton
@MdsalNetconfConnector
NetconfOperationServiceFactory getMdsalNetconfOperationServiceFactory(DOMSchemaService schemaService,
- @org.opendaylight.netconf.simple.annotations.MapperAggregatorRegistry
+ @org.opendaylight.netconf.micro.annotations.MapperAggregatorRegistry
NetconfOperationServiceFactoryListener mapperAggregatorRegistry,
DOMDataBroker domDataBroker,
DOMRpcService domRpcService) {
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.netconf.simple.annotations;
+package org.opendaylight.netconf.micro.annotations;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.netconf.simple.annotations;
+package org.opendaylight.netconf.micro.annotations;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.netconf.simple.annotations;
+package org.opendaylight.netconf.micro.annotations;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.netconf.simple.annotations;
+package org.opendaylight.netconf.micro.annotations;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.netconf.simple.annotations;
+package org.opendaylight.netconf.micro.annotations;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.netconf.simple.annotations;
+package org.opendaylight.netconf.micro.annotations;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.netconf.simple.annotations;
+package org.opendaylight.netconf.micro.annotations;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.netconf.simple.annotations;
+package org.opendaylight.netconf.micro.annotations;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>ch.vorburger.opendaylight.simple</groupId>
- <artifactId>simple-aggregator</artifactId>
+ <groupId>org.opendaylight.odlmicro</groupId>
+ <artifactId>micro-aggregator</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
- <groupId>ch.vorburger.opendaylight.simple</groupId>
- <artifactId>simple-netvirt</artifactId>
+ <groupId>org.opendaylight.odlmicro</groupId>
+ <artifactId>micro-netvirt</artifactId>
<version>1.0.0-SNAPSHOT</version>
<dependencies>
<dependency>
- <groupId>ch.vorburger.opendaylight.simple</groupId>
- <artifactId>simple-genius</artifactId>
+ <groupId>org.opendaylight.odlmicro</groupId>
+ <artifactId>micro-genius</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.netvirt</groupId>
<version>3.1.1</version>
<configuration>
<descriptors>
- <descriptor>src/assembly/simple.xml</descriptor>
+ <descriptor>src/assembly/micro.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
<classpathPrefix>lib/</classpathPrefix>
<!-- <classpathLayoutType>repository</classpathLayoutType> -->
<classpathLayoutType>custom</classpathLayoutType>
- <!-- This must match the outputFileNameMapping in the simple.xml assembly descriptor -->
+ <!-- This must match the outputFileNameMapping in the micro.xml assembly descriptor -->
<customClasspathLayout>$${artifact.groupId}.$${artifact.artifactId}-$${artifact.version}$${dashClassifier?}.$${artifact.extension}</customClasspathLayout>
- <mainClass>org.opendaylight.netvirt.simple.NetvirtMain</mainClass>
+ <mainClass>org.opendaylight.netvirt.micro.NetvirtMain</mainClass>
</manifest>
</archive>
</configuration>
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
- <id>simple</id>
+ <id>micro</id>
<formats>
<format>dir</format>
<format>tar</format>
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.netvirt.simple;
+package org.opendaylight.netvirt.micro;
import com.google.inject.AbstractModule;
import org.opendaylight.netvirt.aclservice.AclServiceManagerImpl;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.netvirt.simple;
+package org.opendaylight.netvirt.micro;
import org.opendaylight.infrautils.inject.guice.GuiceClassPathBinder;
-import org.opendaylight.infrautils.simple.Main;
+import org.opendaylight.infrautils.micro.Main;
public final class NetvirtMain {
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.netvirt.simple;
+package org.opendaylight.netvirt.micro;
-import org.opendaylight.genius.simple.GeniusModule;
+import org.opendaylight.genius.micro.GeniusModule;
import org.opendaylight.infrautils.inject.guice.AutoWiringModule;
import org.opendaylight.infrautils.inject.guice.GuiceClassPathBinder;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.netvirt.simple.test;
+package org.opendaylight.netvirt.micro.test;
import org.junit.Ignore;
import org.junit.Rule;
import org.opendaylight.infrautils.inject.guice.GuiceClassPathBinder;
import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.simple.ShellTestModule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
-import org.opendaylight.netvirt.simple.NetvirtModule;
+import org.opendaylight.infrautils.micro.ShellTestModule;
+import org.opendaylight.infrautils.micro.testutils.AbstractSimpleDistributionTest;
+import org.opendaylight.netvirt.micro.NetvirtModule;
/**
* Netvirt full distribution component test.
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>ch.vorburger.opendaylight.simple</groupId>
- <artifactId>simple-aggregator</artifactId>
+ <groupId>org.opendaylight.odlmicro</groupId>
+ <artifactId>micro-aggregator</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
- <groupId>ch.vorburger.opendaylight.simple</groupId>
- <artifactId>simple-neutron</artifactId>
+ <groupId>org.opendaylight.odlmicro</groupId>
+ <artifactId>micro-neutron</artifactId>
<version>1.0.0-SNAPSHOT</version>
<build>
<version>3.1.1</version>
<configuration>
<descriptors>
- <descriptor>src/assembly/simple.xml</descriptor>
+ <descriptor>src/assembly/micro.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
<classpathPrefix>lib/</classpathPrefix>
<!-- <classpathLayoutType>repository</classpathLayoutType> -->
<classpathLayoutType>custom</classpathLayoutType>
- <!-- This must match the outputFileNameMapping in the simple.xml assembly descriptor -->
+ <!-- This must match the outputFileNameMapping in the micro.xml assembly descriptor -->
<customClasspathLayout>$${artifact.groupId}.$${artifact.artifactId}-$${artifact.version}$${dashClassifier?}.$${artifact.extension}</customClasspathLayout>
</manifest>
</archive>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2018 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
+-->
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+ <id>micro</id>
+ <formats>
+ <format>dir</format>
+ <format>tar</format>
+ </formats>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <!-- This must match the customClasspathLayout of the maven-jar-plugin -->
+ <outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+ </dependencySets>
+<!--
+ <repositories>
+ <repository>
+ <outputDirectory>system</outputDirectory>
+ </repository>
+ </repositories>
+-->
+</assembly>
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.neutron.simple;
+package org.opendaylight.neutron.micro;
import com.google.inject.AbstractModule;
import org.opendaylight.neutron.northbound.api.WebInitializer;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.neutron.simple.test;
+package org.opendaylight.neutron.micro.test;
import static com.google.common.truth.Truth.assertThat;
import static org.opendaylight.infrautils.testutils.web.TestWebClient.Method.GET;
import org.junit.Test;
import org.opendaylight.aaa.web.WebServer;
import org.opendaylight.aaa.web.testutils.TestWebClient;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
+import org.opendaylight.controller.micro.InMemoryControllerModule;
import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
+import org.opendaylight.infrautils.micro.testutils.AbstractSimpleDistributionTest;
import org.opendaylight.infrautils.web.WebModule;
-import org.opendaylight.neutron.simple.NeutronModule;
+import org.opendaylight.neutron.micro.NeutronModule;
/**
* Neutron component test.
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>ch.vorburger.opendaylight.simple</groupId>
- <artifactId>simple-aggregator</artifactId>
+ <groupId>org.opendaylight.odlmicro</groupId>
+ <artifactId>micro-aggregator</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
- <groupId>ch.vorburger.opendaylight.simple</groupId>
- <artifactId>simple-openflowplugin</artifactId>
+ <groupId>org.opendaylight.odlmicro</groupId>
+ <artifactId>micro-openflowplugin</artifactId>
<version>1.0.0-SNAPSHOT</version>
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>ch.vorburger.opendaylight.simple</groupId>
- <artifactId>simple-core</artifactId>
+ <groupId>org.opendaylight.odlmicro</groupId>
+ <artifactId>micro-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<version>3.1.1</version>
<configuration>
<descriptors>
- <descriptor>src/assembly/simple.xml</descriptor>
+ <descriptor>src/assembly/micro.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
<classpathPrefix>lib/</classpathPrefix>
<!-- <classpathLayoutType>repository</classpathLayoutType> -->
<classpathLayoutType>custom</classpathLayoutType>
- <!-- This must match the outputFileNameMapping in the simple.xml assembly descriptor -->
+ <!-- This must match the outputFileNameMapping in the micro.xml assembly descriptor -->
<customClasspathLayout>$${artifact.groupId}.$${artifact.artifactId}-$${artifact.version}$${dashClassifier?}.$${artifact.extension}</customClasspathLayout>
- <mainClass>org.opendaylight.openflowplugin.simple.OpenFlowPluginMain</mainClass>
+ <mainClass>org.opendaylight.openflowplugin.micro.OpenFlowPluginMain</mainClass>
</manifest>
</archive>
</configuration>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2018 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
+-->
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+ <id>micro</id>
+ <formats>
+ <format>dir</format>
+ <format>tar</format>
+ </formats>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <!-- This must match the customClasspathLayout of the maven-jar-plugin -->
+ <outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+ </dependencySets>
+<!--
+ <repositories>
+ <repository>
+ <outputDirectory>system</outputDirectory>
+ </repository>
+ </repositories>
+-->
+</assembly>
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.openflowplugin.simple;
+package org.opendaylight.openflowplugin.micro;
import static com.google.common.collect.Lists.newArrayList;
import javax.inject.Inject;
import javax.inject.Singleton;
-import org.opendaylight.controller.simple.ConfigReader;
+import org.opendaylight.controller.micro.ConfigReader;
import org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProvider;
import org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProviderFactory;
import org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProviderList;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.openflowplugin.simple;
+package org.opendaylight.openflowplugin.micro;
import com.google.inject.Provides;
import javax.inject.Singleton;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.simple.ConfigReader;
+import org.opendaylight.controller.micro.ConfigReader;
import org.opendaylight.infrautils.inject.guice.AutoWiringModule;
import org.opendaylight.infrautils.inject.guice.GuiceClassPathBinder;
import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry;
-import org.opendaylight.mdsal.simple.PingPong;
+import org.opendaylight.mdsal.micro.PingPong;
import org.opendaylight.openflowjava.protocol.impl.core.SwitchConnectionProviderFactoryImpl;
import org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProviderFactory;
import org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProviderList;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.openflowplugin.simple;
+package org.opendaylight.openflowplugin.micro;
import org.opendaylight.infrautils.inject.guice.GuiceClassPathBinder;
-import org.opendaylight.infrautils.simple.ShellMain;
+import org.opendaylight.infrautils.micro.ShellMain;
public final class OpenflowPluginMain {
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.infrautils.simple.testutils;
+package org.opendaylight.infrautils.micro.testutils;
import static com.google.common.truth.Truth.assertThat;
import org.opendaylight.infrautils.testutils.LogRule;
/**
- * Abstract base class for simple distribution component tests.
+ * Abstract base class for micro distribution component tests.
*
* @author Michael Vorburger.ch
*/
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.openflowplugin.simple.test;
+package org.opendaylight.openflowplugin.micro.test;
import static com.google.common.truth.Truth.assertThat;
import org.junit.Rule;
import org.junit.Test;
import org.opendaylight.aaa.web.testutils.WebTestModule;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
+import org.opendaylight.controller.micro.InMemoryControllerModule;
import org.opendaylight.infrautils.diagstatus.DiagStatusService;
import org.opendaylight.infrautils.diagstatus.ServiceStatusSummary;
import org.opendaylight.infrautils.inject.guice.GuiceClassPathBinder;
import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
+import org.opendaylight.infrautils.micro.DiagStatusModule;
+import org.opendaylight.infrautils.micro.testutils.AbstractSimpleDistributionTest;
import org.opendaylight.infrautils.ready.guice.ReadyModule;
-import org.opendaylight.infrautils.simple.DiagStatusModule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
import org.opendaylight.openflowplugin.api.openflow.OpenFlowPluginProvider;
import org.opendaylight.openflowplugin.impl.OpenFlowPluginProviderImpl;
-import org.opendaylight.openflowplugin.simple.OpenFlowPluginModule;
-import org.opendaylight.serviceutils.simple.ServiceUtilsModule;
+import org.opendaylight.openflowplugin.micro.OpenFlowPluginModule;
+import org.opendaylight.serviceutils.micro.ServiceUtilsModule;
import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketProcessingService;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow.provider.config.rev160510.OpenflowProviderConfig;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.app.forwardingrules.manager.config.rev160511.ForwardingRulesManagerConfig;
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>ch.vorburger.opendaylight.simple</groupId>
- <artifactId>simple-aggregator</artifactId>
+ <groupId>org.opendaylight.odlmicro</groupId>
+ <artifactId>micro-aggregator</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
- <groupId>ch.vorburger.opendaylight.simple</groupId>
- <artifactId>simple-ovsdb</artifactId>
+ <groupId>org.opendaylight.odlmicro</groupId>
+ <artifactId>micro-ovsdb</artifactId>
<version>1.0.0-SNAPSHOT</version>
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>ch.vorburger.opendaylight.simple</groupId>
- <artifactId>simple-core</artifactId>
+ <groupId>org.opendaylight.odlmicro</groupId>
+ <artifactId>micro-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<version>3.1.1</version>
<configuration>
<descriptors>
- <descriptor>src/assembly/simple.xml</descriptor>
+ <descriptor>src/assembly/micro.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
<classpathPrefix>lib/</classpathPrefix>
<!-- <classpathLayoutType>repository</classpathLayoutType> -->
<classpathLayoutType>custom</classpathLayoutType>
- <!-- This must match the outputFileNameMapping in the simple.xml assembly descriptor -->
+ <!-- This must match the outputFileNameMapping in the micro.xml assembly descriptor -->
<customClasspathLayout>$${artifact.groupId}.$${artifact.artifactId}-$${artifact.version}$${dashClassifier?}.$${artifact.extension}</customClasspathLayout>
- <mainClass>org.opendaylight.ovsdb.simple.OvsdbMain</mainClass>
+ <mainClass>org.opendaylight.ovsdb.micro.OvsdbMain</mainClass>
</manifest>
</archive>
</configuration>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2018 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
+-->
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+ <id>micro</id>
+ <formats>
+ <format>dir</format>
+ <format>tar</format>
+ </formats>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <!-- This must match the customClasspathLayout of the maven-jar-plugin -->
+ <outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+ </dependencySets>
+<!--
+ <repositories>
+ <repository>
+ <outputDirectory>system</outputDirectory>
+ </repository>
+ </repositories>
+-->
+</assembly>
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.ovsdb.simple;
+package org.opendaylight.ovsdb.micro;
import org.opendaylight.infrautils.inject.guice.AutoWiringModule;
import org.opendaylight.infrautils.inject.guice.GuiceClassPathBinder;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.infrautils.simple.testutils;
+package org.opendaylight.infrautils.micro.testutils;
import static com.google.common.truth.Truth.assertThat;
import org.opendaylight.infrautils.testutils.LogRule;
/**
- * Abstract base class for simple distribution component tests.
+ * Abstract base class for micro distribution component tests.
*
* @author Michael Vorburger.ch
*/
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-package org.opendaylight.ovsdb.simple.test;
+package org.opendaylight.ovsdb.micro.test;
import javax.inject.Inject;
import org.junit.Rule;
-import org.opendaylight.aaa.simple.CertModule;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
+import org.opendaylight.aaa.micro.CertModule;
+import org.opendaylight.controller.micro.InMemoryControllerModule;
import org.opendaylight.infrautils.inject.guice.GuiceClassPathBinder;
import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
+import org.opendaylight.infrautils.micro.DiagStatusModule;
+import org.opendaylight.infrautils.micro.testutils.AbstractSimpleDistributionTest;
import org.opendaylight.infrautils.ready.guice.ReadyModule;
-import org.opendaylight.infrautils.simple.DiagStatusModule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
import org.opendaylight.infrautils.web.WebModule;
import org.opendaylight.ovsdb.hwvtepsouthbound.HwvtepSouthboundProvider;
import org.opendaylight.ovsdb.lib.OvsdbConnection;
import org.opendaylight.ovsdb.lib.impl.OvsdbConnectionService;
-import org.opendaylight.ovsdb.simple.OvsdbModule;
+import org.opendaylight.ovsdb.micro.OvsdbModule;
import org.opendaylight.ovsdb.southbound.SouthboundProvider;
public class OvsdbModuleTest extends AbstractSimpleDistributionTest {
<relativePath />
</parent>
- <groupId>ch.vorburger.opendaylight.simple</groupId>
- <artifactId>simple-aggregator</artifactId>
+ <groupId>org.opendaylight.odlmicro</groupId>
+ <artifactId>micro-aggregator</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<!-- TODO remove this (to inherit the skip>false from infrautils' parent),
- as soon as all of https://git.opendaylight.org/gerrit/#/q/topic:simple-dist are in,
+ as soon as all of https://git.opendaylight.org/gerrit/#/q/topic:micro-dist are in,
notably e.g. https://git.opendaylight.org/gerrit/#/c/67179/ et al. (and we bumped odlparent) -->
<duplicate-finder.skip>true</duplicate-finder.skip>
<maven.javadoc.skip>true</maven.javadoc.skip>
<!--mdsal-->
<dependency>
- <!-- TODO remove this temporary v0.1 hack; see org.opendaylight.controller.simple.ControllerModule -->
+ <!-- TODO remove this temporary v0.1 hack; see org.opendaylight.controller.micro.ControllerModule -->
<groupId>org.opendaylight.controller</groupId>
<artifactId>sal-binding-broker-impl</artifactId>
<type>test-jar</type>
</dependencies>
<modules>
- <module>simple-core</module>
- <module>simple-netconf</module>
- <module>simple-openflowplugin</module>
- <module>simple-ovsdb</module>
- <!--module>simple-genius</module>
- <module>simple-netvirt</module>
- <module>simple-neutron</module>
- <module>simple-ovsdb</module-->
+ <module>micro-core</module>
+ <module>micro-netconf</module>
+ <module>micro-openflowplugin</module>
+ <module>micro-ovsdb</module>
+ <!--module>micro-genius</module>
+ <module>micro-netvirt</module>
+ <module>micro-neutron</module>
+ <module>micro-ovsdb</module-->
</modules>
</project>
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2018 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
--->
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
- <id>simple</id>
- <formats>
- <format>dir</format>
- <format>tar</format>
- </formats>
- <dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <!-- This must match the customClasspathLayout of the maven-jar-plugin -->
- <outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
- </dependencySets>
-<!--
- <repositories>
- <repository>
- <outputDirectory>system</outputDirectory>
- </repository>
- </repositories>
--->
-</assembly>
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2018 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
--->
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
- <id>simple</id>
- <formats>
- <format>dir</format>
- <format>tar</format>
- </formats>
- <dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <!-- This must match the customClasspathLayout of the maven-jar-plugin -->
- <outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
- </dependencySets>
-<!--
- <repositories>
- <repository>
- <outputDirectory>system</outputDirectory>
- </repository>
- </repositories>
--->
-</assembly>
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2018 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
--->
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
- <id>simple</id>
- <formats>
- <format>dir</format>
- <format>tar</format>
- </formats>
- <dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <!-- This must match the customClasspathLayout of the maven-jar-plugin -->
- <outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
- </dependencySets>
-<!--
- <repositories>
- <repository>
- <outputDirectory>system</outputDirectory>
- </repository>
- </repositories>
--->
-</assembly>
Code Review / odlmicro.git / commitdiff