<includes>
<include>.gitreview</include>
<include>pom.xml</include>
- <include>deploy-site.xml</include>
<include>src/**</include>
</includes>
</fileSet>
<fileSet filtered="true" encoding="UTF-8">
<directory>features</directory>
<includes>
- <include>pom.xml</include>
- </includes>
- </fileSet>
- <fileSet filtered="true" encoding="UTF-8">
- <directory>features/features-X</directory>
- <includes>
- <include>pom.xml</include>
- </includes>
- </fileSet>
- <fileSet filtered="true" encoding="UTF-8">
- <directory>features/odl-X-api</directory>
- <includes>
- <include>pom.xml</include>
+ <include>**/pom.xml</include>
</includes>
</fileSet>
- <fileSet filtered="true" encoding="UTF-8">
- <directory>features/odl-X</directory>
- <includes>
- <include>pom.xml</include>
- </includes>
- </fileSet>
- <fileSet filtered="true" encoding="UTF-8">
- <directory>features/odl-X-cli</directory>
- <includes>
- <include>pom.xml</include>
- </includes>
- </fileSet>
- <fileSet filtered="true" encoding="UTF-8">
- <directory>features/odl-X-rest</directory>
- <includes>
- <include>pom.xml</include>
- </includes>
- </fileSet>
-
<!-- impl -->
<fileSet filtered="true" encoding="UTF-8">
<directory>impl</directory>
* This is an example class. The class name can be renamed to match the command implementation that it will invoke.
* Specify command details by updating the fields in the Command annotation below.
*/
-@Command(name = "test-command", scope = "add the scope of the command, usually project name", description = "add a description for the command")
+@Command(name = "test-command", scope = "add the scope of the command, usually project name",
+ description = "add a description for the command")
public class ${classPrefix}CliTestCommand extends AbstractAction {
private static final Logger LOG = LoggerFactory.getLogger(${classPrefix}CliTestCommand.class);
final String testMessage = (String) service.testCommand(testArgument);
return testMessage;
}
-}
\ No newline at end of file
+}
package ${package}.cli.impl;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import ${package}.cli.api.${classPrefix}CliCommands;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import ${package}.cli.api.${classPrefix}CliCommands;
public class ${classPrefix}CliCommandsImpl implements ${classPrefix}CliCommands {
public Object testCommand(Object testArgument) {
return "This is a test implementation of test-command";
}
-}
\ No newline at end of file
+}
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=2 tabstop=2: -->
-<!--
- Copyright (c) ${copyrightYear} ${copyright} 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>
-
- <groupId>${groupId}</groupId>
- <artifactId>deploy-site</artifactId>
- <version>${version}</version>
- <packaging>pom</packaging>
-
- <properties>
- <stream>latest</stream>
- <nexus.site.url>dav:https://nexus.opendaylight.org/content/sites/site/${project.groupId}/${stream}/</nexus.site.url>
- </properties>
-
- <build>
- <extensions>
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-webdav-jackrabbit</artifactId>
- <version>2.9</version>
- </extension>
- </extensions>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.4</version>
- <configuration>
- <inputDirectory>${project.build.directory}/staged-site</inputDirectory>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <distributionManagement>
- <site>
- <id>opendaylight-site</id>
- <url>${nexus.site.url}</url>
- </site>
- </distributionManagement>
-</project>
<type>xml</type>
<classifier>features</classifier>
</dependency>
+ <dependency>
+ <groupId>${symbol_dollar}{project.groupId}</groupId>
+ <artifactId>odl-${artifactId}</artifactId>
+ <version>${symbol_dollar}{project.version}</version>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
+ <dependency>
+ <groupId>${symbol_dollar}{project.groupId}</groupId>
+ <artifactId>odl-${artifactId}-cli</artifactId>
+ <version>${symbol_dollar}{project.version}</version>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
+ <dependency>
+ <groupId>${symbol_dollar}{project.groupId}</groupId>
+ <artifactId>odl-${artifactId}-rest</artifactId>
+ <version>${symbol_dollar}{project.version}</version>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
</dependencies>
</project>
<name>ODL :: ${groupId} :: ${project.artifactId}</name>
<modules>
- <module>features-X</module>
- <module>odl-X-api</module>
- <module>odl-X</module>
- <module>odl-X-rest</module>
- <module>odl-X-cli</module>
+ <module>features-${artifactId}</module>
+ <module>odl-${artifactId}-api</module>
+ <module>odl-${artifactId}</module>
+ <module>odl-${artifactId}-rest</module>
+ <module>odl-${artifactId}-cli</module>
</modules>
</project>
<!-- <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 :: ${groupId} :: ${project.artifactId}</name>
- <packaging>bundle</packaging>
<properties>
<skipITs>false</skipITs>
<groupId>${project.groupId}</groupId>
<artifactId>features-${artifactId}</artifactId>
<version>${project.version}</version>
+ <type>xml</type>
+ <classifier>features</classifier>
</dependency>
</dependencies>
</project>
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
import org.junit.Assert;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.opendaylight.controller.mdsal.it.base.AbstractMdsalTestBase;
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
-public class ${classPrefix}IT extends AbstractMdsalTestBase {
- private static final Logger LOG = LoggerFactory.getLogger(${classPrefix}IT.class);
+public class ${classPrefix}Test extends AbstractMdsalTestBase {
+ private static final Logger LOG = LoggerFactory.getLogger(${classPrefix}Test.class);
@Override
public MavenUrlReference getFeatureRepo() {
@Override
public Option getLoggingOption() {
Option option = editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG,
- logConfiguration(${classPrefix}IT.class),
+ logConfiguration(${classPrefix}Test.class),
LogLevel.INFO.name());
option = composite(option, super.getLoggingOption());
return option;
}
@Test
+ @Ignore // TODO https://jira.opendaylight.org/browse/CONTROLLER-1810
public void test${artifactId}FeatureLoad() {
Assert.assertTrue(true);
}
<name>ODL :: ${groupId} :: ${project.artifactId}</name>
<properties>
- <!-- TODO <karaf.localFeature>odl-${artifactId}-rest</karaf.localFeature> -->
+ <karaf.localFeature>odl-${artifactId}-rest</karaf.localFeature>
</properties>
<dependencyManagement>
<module>features</module>
<module>artifacts</module>
<module>cli</module>
- <!-- <module>it</module> -->
+ <!-- TODO CONTROLLER-1811 *and* then CONTROLLER-1810: <module>it</module> -->
</modules>
<!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
</plugins>
</build>
- <profiles>
- <profile>
- <!--
- This profile is to ensure we only build javadocs reports
- when we plan to deploy Maven site for our project.
- -->
- <id>maven-site</id>
- <activation>
- <file>
- <exists>${user.dir}/deploy-site.xml</exists>
- </file>
- </activation>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <inherited>false</inherited>
- <executions>
- <execution>
- <id>aggregate</id>
- <goals>
- <goal>aggregate</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <failsOnError>true</failsOnError>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
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>
<version>3.0.2</version>
<relativePath/>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<groupId>org.opendaylight.controller</groupId>
<artifactId>mdsal-it-parent</artifactId>
<version>1.7.0-SNAPSHOT</version>
<packaging>pom</packaging>
+
<properties>
<mdsal.version>1.7.0-SNAPSHOT</mdsal.version>
<karaf.distro.groupId>org.opendaylight.odlparent</karaf.distro.groupId>
<karaf.distro.type>zip</karaf.distro.type>
<karaf.keep.unpack>false</karaf.keep.unpack>
</properties>
+
<dependencyManagement>
<dependencies>
<dependency>
</dependencies>
<build>
<plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${maven.surefire.version}</version>
+ <configuration>
+ <systemPropertyVariables>
+ <!-- CONTROLLER-1799: Use the same repository for Pax Exam as is used for Maven -->
+ <org.ops4j.pax.url.mvn.localRepository>${settings.localRepository}</org.ops4j.pax.url.mvn.localRepository>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
Code Review / controller.git / commitdiff