From: Michael Vorburger Date: Tue, 17 Apr 2018 14:30:28 +0000 (+0200) Subject: reduce but keep old archetype and make it point users to the new one X-Git-Tag: release/fluorine~105 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=794172272cbeb85a59b96fbc45f09698d8c3fc2a reduce but keep old archetype and make it point users to the new one see https://jira.linuxfoundation.org/browse/RELENG-891 Change-Id: Ide80da410b60fb621af2a23ef82e7f63319061bb Signed-off-by: Michael Vorburger --- diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/META-INF/maven/archetype-metadata.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/META-INF/maven/archetype-metadata.xml index 4419ac017a..19336c71a1 100644 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -3,137 +3,12 @@ xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - - - - ${artifactId.substring(0,1).toUpperCase()}${artifactId.substring(1)} - - - - - - 2017 - - - - - 0.1.0-SNAPSHOT - - - - - - .gitignore - - - - - - .gitreview - pom.xml - src/** + README.txt - - - - karaf - - pom.xml - - - - - - features - - **/pom.xml - - - - - impl - - pom.xml - - - - impl/src/main/java - - **/*.java - - - - impl/src/test/java - - **/*.java - - - - impl/src/main/resources/org/opendaylight/blueprint - - **/*.xml - - - - - - api - - pom.xml - - - - api/src/main/yang - - **/*.yang - - - - - - artifacts - - pom.xml - - - - - - cli - - pom.xml - - - - cli/src/main/java - - **/*.java - - - - cli/src/main/resources/org/opendaylight/blueprint - - **/*.xml - - - - - - it - - pom.xml - - - - it/src/test/java - - **/*.java - - diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/.gitignore b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/.gitignore deleted file mode 100644 index 4496250cc2..0000000000 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/.gitignore +++ /dev/null @@ -1,18 +0,0 @@ -*.class -**/target -bin/ -dist -**/logs -*~ -target -target-ide -.classpath -.project -.settings -.idea -xtend-gen -yang-gen-config -yang-gen-sal -classes -.DS_STORE -.metadata diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/.gitreview b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/.gitreview deleted file mode 100644 index 2a03e9103a..0000000000 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/.gitreview +++ /dev/null @@ -1,5 +0,0 @@ -[gerrit] -host=git.opendaylight.org -port=29418 -project=${artifactId}.git -defaultbranch=master diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/README.txt b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/README.txt new file mode 100644 index 0000000000..0a546301a6 --- /dev/null +++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/README.txt @@ -0,0 +1,9 @@ +NOTICE + +The org.opendaylight.controller:opendaylight-startup-archetype + +has been replaced by the org.opendaylight.archetypes:opendaylight-startup-archetype + +(note how the archetypeGroupId does not contain "controller" anymore, but ends with ".archetypes"), + +and has a different version now. diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/api/.gitignore b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/api/.gitignore deleted file mode 100644 index b83d22266a..0000000000 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/api/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/api/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/api/pom.xml deleted file mode 100644 index 7268e42931..0000000000 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/api/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - 4.0.0 - - - org.opendaylight.mdsal - binding-parent - 0.13.0-SNAPSHOT - - - - ${groupId} - ${artifactId}-api - ${version} - - ODL :: ${groupId} :: ${project.artifactId} - bundle - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - checkstyle.violationSeverity=error - - - - org.codehaus.mojo - findbugs-maven-plugin - - true - - - - - diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/api/src/main/yang/__artifactId__.yang b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/api/src/main/yang/__artifactId__.yang deleted file mode 100644 index 848cf4831d..0000000000 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/api/src/main/yang/__artifactId__.yang +++ /dev/null @@ -1,12 +0,0 @@ -#set( $ldt = $package.getClass().forName("java.time.LocalDateTime").getMethod("now").invoke(null) ) -#set( $dtf = $package.getClass().forName("java.time.format.DateTimeFormatter").getMethod("ofPattern", $package.getClass()).invoke(null, "yyyy-MM-dd") ) -#set( $date = $ldt.format($dtf) ) -module ${artifactId} { - yang-version 1.1; - namespace "urn:opendaylight:params:xml:ns:yang:${artifactId}"; - prefix "${artifactId}"; - - revision "2017-08-30" { // TODO change revision to date of model creation - description "Initial revision of ${artifactId} model"; - } -} diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/artifacts/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/artifacts/pom.xml deleted file mode 100644 index 4146f73ca8..0000000000 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/artifacts/pom.xml +++ /dev/null @@ -1,52 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) - - - - 4.0.0 - - - org.opendaylight.odlparent - odlparent-lite - 3.1.0 - - - - ${groupId} - ${artifactId}-artifacts - ${version} - - ODL :: ${groupId} :: ${project.artifactId} - pom - - - - - ${symbol_dollar}{project.groupId} - ${artifactId}-api - ${symbol_dollar}{project.version} - - - ${symbol_dollar}{project.groupId} - ${artifactId}-impl - ${symbol_dollar}{project.version} - - - ${symbol_dollar}{project.groupId} - features-${artifactId} - ${symbol_dollar}{project.version} - features - xml - - - - diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/cli/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/cli/pom.xml deleted file mode 100644 index 1725cd259b..0000000000 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/cli/pom.xml +++ /dev/null @@ -1,88 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) - - - - - 4.0.0 - - - org.opendaylight.mdsal - binding-parent - 0.13.0-SNAPSHOT - - - - ${groupId} - ${artifactId}-cli - ${version} - - ODL :: ${groupId} :: ${project.artifactId} - bundle - - - - - org.opendaylight.controller - mdsal-artifacts - 1.8.0-SNAPSHOT - pom - import - - - - - - - - ${symbol_dollar}{project.groupId} - ${artifactId}-api - ${symbol_dollar}{project.version} - - - - org.opendaylight.controller - sal-binding-api - - - - - org.apache.karaf.shell - org.apache.karaf.shell.console - ${karaf.version} - - - org.apache.karaf.shell - org.apache.karaf.shell.table - ${karaf.version} - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - checkstyle.violationSeverity=error - - - - org.codehaus.mojo - findbugs-maven-plugin - - true - - - - - diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/cli/src/main/java/__packageInPathFormat__/cli/api/__classPrefix__CliCommands.java b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/cli/src/main/java/__packageInPathFormat__/cli/api/__classPrefix__CliCommands.java deleted file mode 100644 index b1ec6cea1e..0000000000 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/cli/src/main/java/__packageInPathFormat__/cli/api/__classPrefix__CliCommands.java +++ /dev/null @@ -1,20 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) -/* - * Copyright © ${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 - */ -package ${package}.cli.api; - -public interface ${classPrefix}CliCommands { - - /** - * Define the Karaf command method signatures and the Javadoc for each. - * Below method is just an example - */ - Object testCommand(Object testArgument); -} diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/cli/src/main/java/__packageInPathFormat__/cli/commands/__classPrefix__CliTestCommand.java b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/cli/src/main/java/__packageInPathFormat__/cli/commands/__classPrefix__CliTestCommand.java deleted file mode 100644 index d3adf67446..0000000000 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/cli/src/main/java/__packageInPathFormat__/cli/commands/__classPrefix__CliTestCommand.java +++ /dev/null @@ -1,57 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) -/* - * Copyright © ${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 - */ -package ${package}.cli.commands; - -import org.apache.karaf.shell.commands.Command; -import org.apache.karaf.shell.commands.Option; -import org.apache.karaf.shell.console.AbstractAction; -import ${package}.cli.api.${classPrefix}CliCommands; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * 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") -public class ${classPrefix}CliTestCommand extends AbstractAction { - - private static final Logger LOG = LoggerFactory.getLogger(${classPrefix}CliTestCommand.class); - protected final ${classPrefix}CliCommands service; - - public ${classPrefix}CliTestCommand(final ${classPrefix}CliCommands service) { - this.service = service; - } - - /** - * Add the arguments required by the command. - * Any number of arguments can be added using the Option annotation - * The below argument is just an example and should be changed as per your requirements - */ - @Option(name = "-tA", - aliases = { "--testArgument" }, - description = "test command argument", - required = true, - multiValued = false) - private Object testArgument; - - @Override - protected Object doExecute() throws Exception { - /** - * Invoke commannd implementation here using the service instance. - * Implement how you want the output of the command to be displayed. - * Below is just an example. - */ - final String testMessage = (String) service.testCommand(testArgument); - return testMessage; - } -} diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/cli/src/main/java/__packageInPathFormat__/cli/impl/__classPrefix__CliCommandsImpl.java b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/cli/src/main/java/__packageInPathFormat__/cli/impl/__classPrefix__CliCommandsImpl.java deleted file mode 100644 index b7f50372c1..0000000000 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/cli/src/main/java/__packageInPathFormat__/cli/impl/__classPrefix__CliCommandsImpl.java +++ /dev/null @@ -1,32 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) -/* - * Copyright © ${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 - */ -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; - -public class ${classPrefix}CliCommandsImpl implements ${classPrefix}CliCommands { - - private static final Logger LOG = LoggerFactory.getLogger(${classPrefix}CliCommandsImpl.class); - private final DataBroker dataBroker; - - public ${classPrefix}CliCommandsImpl(final DataBroker db) { - this.dataBroker = db; - LOG.info("${classPrefix}CliCommandImpl initialized"); - } - - @Override - public Object testCommand(Object testArgument) { - return "This is a test implementation of test-command"; - } -} diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/cli/src/main/resources/org/opendaylight/blueprint/cli-blueprint.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/cli/src/main/resources/org/opendaylight/blueprint/cli-blueprint.xml deleted file mode 100644 index c53c19d7af..0000000000 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/cli/src/main/resources/org/opendaylight/blueprint/cli-blueprint.xml +++ /dev/null @@ -1,35 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/features-__artifactId__/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/features-__artifactId__/pom.xml deleted file mode 100644 index 156c16b4c5..0000000000 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/features-__artifactId__/pom.xml +++ /dev/null @@ -1,69 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) - - - - 4.0.0 - - - org.opendaylight.odlparent - feature-repo-parent - 3.1.0 - - - - ${groupId} - features-${artifactId} - ${version} - feature - - ODL :: ${groupId} :: ${project.artifactId} - - - 0.13.0-SNAPSHOT - 1.8.0-SNAPSHOT - 1.8.0-SNAPSHOT - 2.0.3 - etc/opendaylight/karaf - - - - - ${symbol_dollar}{project.groupId} - odl-${artifactId}-api - ${symbol_dollar}{project.version} - xml - features - - - ${symbol_dollar}{project.groupId} - odl-${artifactId} - ${symbol_dollar}{project.version} - xml - features - - - ${symbol_dollar}{project.groupId} - odl-${artifactId}-cli - ${symbol_dollar}{project.version} - xml - features - - - ${symbol_dollar}{project.groupId} - odl-${artifactId}-rest - ${symbol_dollar}{project.version} - xml - features - - - diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-__artifactId__-api/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-__artifactId__-api/pom.xml deleted file mode 100644 index 792cc33edc..0000000000 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-__artifactId__-api/pom.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - 4.0.0 - - - org.opendaylight.odlparent - single-feature-parent - 3.1.0 - - - - ${groupId} - odl-${artifactId}-api - ${version} - feature - - OpenDaylight :: ${artifactId} :: API [Karaf Feature] - - - - - org.opendaylight.mdsal.model - mdsal-model-artifacts - 0.13.0-SNAPSHOT - pom - import - - - org.opendaylight.controller - mdsal-artifacts - 1.8.0-SNAPSHOT - pom - import - - - - - - - org.opendaylight.mdsal.model - odl-mdsal-models - xml - features - - - ${project.groupId} - ${artifactId}-api - ${project.version} - - - - diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-__artifactId__-cli/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-__artifactId__-cli/pom.xml deleted file mode 100644 index 3e319694c1..0000000000 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-__artifactId__-cli/pom.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - 4.0.0 - - - org.opendaylight.odlparent - single-feature-parent - 3.1.0 - - - - ${groupId} - odl-${artifactId}-cli - ${version} - feature - - OpenDaylight :: ${artifactId} :: CLI [Karaf Feature] - - - - - org.opendaylight.mdsal.model - mdsal-model-artifacts - 0.13.0-SNAPSHOT - pom - import - - - org.opendaylight.controller - mdsal-artifacts - 1.8.0-SNAPSHOT - pom - import - - - - - - - ${project.groupId} - odl-${artifactId} - ${project.version} - xml - features - - - ${project.groupId} - ${artifactId}-cli - ${project.version} - - - - diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-__artifactId__-rest/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-__artifactId__-rest/pom.xml deleted file mode 100644 index 1a26a4f8b0..0000000000 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-__artifactId__-rest/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - 4.0.0 - - - org.opendaylight.odlparent - single-feature-parent - 3.1.0 - - - - ${groupId} - odl-${artifactId}-rest - ${version} - feature - - OpenDaylight :: ${artifactId} :: REST [Karaf Feature] - - - - - org.opendaylight.netconf - restconf-artifacts - 1.8.0-SNAPSHOT - pom - import - - - - - - - org.opendaylight.netconf - odl-restconf - xml - features - - - ${project.groupId} - odl-${artifactId}-cli - ${project.version} - xml - features - - - - diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-__artifactId__/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-__artifactId__/pom.xml deleted file mode 100644 index 197e4b8e40..0000000000 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/odl-__artifactId__/pom.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - 4.0.0 - - - org.opendaylight.odlparent - single-feature-parent - 3.1.0 - - - - ${groupId} - odl-${artifactId} - ${version} - feature - - OpenDaylight :: ${artifactId} :: Impl [Karaf Feature] - - - - - org.opendaylight.mdsal.model - mdsal-model-artifacts - 0.13.0-SNAPSHOT - pom - import - - - org.opendaylight.controller - mdsal-artifacts - 1.8.0-SNAPSHOT - pom - import - - - - - - - org.opendaylight.controller - odl-mdsal-broker - xml - features - - - ${project.groupId} - odl-${artifactId}-api - ${project.version} - xml - features - - - ${project.groupId} - ${artifactId}-impl - ${project.version} - - - - diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml deleted file mode 100644 index 1670c420e6..0000000000 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) - - - - 4.0.0 - - - org.opendaylight.odlparent - odlparent-lite - 3.1.0 - - - - ${groupId} - ${artifactId}-features-aggregator - ${version} - pom - ODL :: ${groupId} :: ${project.artifactId} - - - features-${artifactId} - odl-${artifactId}-api - odl-${artifactId} - odl-${artifactId}-rest - odl-${artifactId}-cli - - diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/impl/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/impl/pom.xml deleted file mode 100644 index f0ce871456..0000000000 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/impl/pom.xml +++ /dev/null @@ -1,88 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) - - - - - 4.0.0 - - - org.opendaylight.mdsal - binding-parent - 0.13.0-SNAPSHOT - - - - ${groupId} - ${artifactId}-impl - ${version} - - ODL :: ${groupId} :: ${project.artifactId} - bundle - - - - - org.opendaylight.controller - mdsal-artifacts - 1.8.0-SNAPSHOT - pom - import - - - - - - - ${symbol_dollar}{project.groupId} - ${artifactId}-api - ${symbol_dollar}{project.version} - - - - org.opendaylight.controller - sal-binding-api - - - - - junit - junit - test - - - - org.mockito - mockito-core - test - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - checkstyle.violationSeverity=error - - - - org.codehaus.mojo - findbugs-maven-plugin - - true - - - - - diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/impl/src/main/java/__packageInPathFormat__/impl/__classPrefix__Provider.java b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/impl/src/main/java/__packageInPathFormat__/impl/__classPrefix__Provider.java deleted file mode 100644 index 4d0a820418..0000000000 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/impl/src/main/java/__packageInPathFormat__/impl/__classPrefix__Provider.java +++ /dev/null @@ -1,40 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) -/* - * Copyright © ${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 - */ -package ${package}.impl; - -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class ${classPrefix}Provider { - - private static final Logger LOG = LoggerFactory.getLogger(${classPrefix}Provider.class); - - private final DataBroker dataBroker; - - public ${classPrefix}Provider(final DataBroker dataBroker) { - this.dataBroker = dataBroker; - } - - /** - * Method called when the blueprint container is created. - */ - public void init() { - LOG.info("${classPrefix}Provider Session Initiated"); - } - - /** - * Method called when the blueprint container is destroyed. - */ - public void close() { - LOG.info("${classPrefix}Provider Closed"); - } -} \ No newline at end of file diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/impl/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/impl/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml deleted file mode 100644 index 95682b5d28..0000000000 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/impl/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml +++ /dev/null @@ -1,27 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) - - - - - - - - - - - - diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/pom.xml deleted file mode 100644 index f9687dfa91..0000000000 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - 4.0.0 - - - org.opendaylight.controller - mdsal-it-parent - 1.8.0-SNAPSHOT - - - - ${groupId} - ${artifactId}-it - ${version} - - ODL :: ${groupId} :: ${project.artifactId} - - - false - - - - - ${project.groupId} - features-${artifactId} - ${project.version} - xml - features - - - diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/src/test/java/__packageInPathFormat__/it/__classPrefix__Test.java b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/src/test/java/__packageInPathFormat__/it/__classPrefix__Test.java deleted file mode 100644 index cae79de164..0000000000 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/it/src/test/java/__packageInPathFormat__/it/__classPrefix__Test.java +++ /dev/null @@ -1,64 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) -/* - * Copyright © ${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 - */ -package ${package}.it; - -import static org.ops4j.pax.exam.CoreOptions.composite; -import static org.ops4j.pax.exam.CoreOptions.maven; -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; -import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.PaxExam; -import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel; -import org.ops4j.pax.exam.options.MavenUrlReference; -import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; -import org.ops4j.pax.exam.spi.reactors.PerClass; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -@RunWith(PaxExam.class) -@ExamReactorStrategy(PerClass.class) -public class ${classPrefix}Test extends AbstractMdsalTestBase { - private static final Logger LOG = LoggerFactory.getLogger(${classPrefix}Test.class); - - @Override - public MavenUrlReference getFeatureRepo() { - return maven() - .groupId("${groupId}") - .artifactId("features-${artifactId}") - .classifier("features") - .type("xml") - .versionAsInProject(); - } - - @Override - public String getFeatureName() { - return "odl-${artifactId}"; - } - - @Override - public Option getLoggingOption() { - Option option = editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG, - logConfiguration(${classPrefix}Test.class), - LogLevel.INFO.name()); - option = composite(option, super.getLoggingOption()); - return option; - } - - @Test - public void test${artifactId}FeatureLoad() { - Assert.assertTrue(true); - } -} diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/karaf/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/karaf/pom.xml deleted file mode 100644 index 165bebbf63..0000000000 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/karaf/pom.xml +++ /dev/null @@ -1,75 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) - - - - 4.0.0 - - - org.opendaylight.odlparent - karaf4-parent - 3.1.0 - - - - ${groupId} - ${artifactId}-karaf - ${version} - - ODL :: ${groupId} :: ${project.artifactId} - - - odl-${artifactId}-rest - - - - - - ${symbol_dollar}{project.groupId} - ${artifactId}-artifacts - ${symbol_dollar}{project.version} - pom - import - - - - - - - - org.apache.karaf.features - framework - kar - - - - ${symbol_dollar}{project.groupId} - features-${artifactId} - features - xml - runtime - - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - - diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml index ee7bc0e962..dd577c7a63 100644 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml +++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml @@ -1,16 +1,10 @@ - 4.0.0 org.opendaylight.odlparent - odlparent + odlparent-lite 3.1.0 @@ -18,44 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL ${groupId} ${artifactId}-aggregator ${version} - ${artifactId} + ${artifactId} pom - - scm:git:ssh://git.opendaylight.org:29418/${artifactId}.git - scm:git:ssh://git.opendaylight.org:29418/${artifactId}.git - HEAD - https://wiki.opendaylight.org/view/${artifactId}:Main - - - - api - impl - karaf - features - artifacts - cli - it - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-install-plugin - - true - - - - - diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/src/main/resources/stylesheet.css b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/src/main/resources/stylesheet.css deleted file mode 100644 index 76de82bfe1..0000000000 --- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/src/main/resources/stylesheet.css +++ /dev/null @@ -1,475 +0,0 @@ -/* Javadoc style sheet */ -/* -Overall document style -*/ -body { - background-color:#ffffff; - color:#353833; - font-family:Arial, Helvetica, sans-serif; - font-size:76%; - margin:0; -} -a:link, a:visited { - text-decoration:none; - color:#4c6b87; -} -a:hover, a:focus { - text-decoration:none; - color:#bb7a2a; -} -a:active { - text-decoration:none; - color:#4c6b87; -} -a[name] { - color:#353833; -} -a[name]:hover { - text-decoration:none; - color:#353833; -} -pre { - font-size:1.3em; -} -h1 { - font-size:1.8em; -} -h2 { - font-size:1.5em; -} -h3 { - font-size:1.4em; -} -h4 { - font-size:1.3em; -} -h5 { - font-size:1.2em; -} -h6 { - font-size:1.1em; -} -ul { - list-style-type:disc; -} -code, tt { - font-size:1.2em; -} -dt code { - font-size:1.2em; -} -table tr td dt code { - font-size:1.2em; - vertical-align:top; -} -sup { - font-size:.6em; -} -/* -Document title and Copyright styles -*/ -.clear { - clear:both; - height:0px; - overflow:hidden; -} -.aboutLanguage { - float:right; - padding:0px 21px; - font-size:.8em; - z-index:200; - margin-top:-7px; -} -.legalCopy { - margin-left:.5em; -} -.bar a, .bar a:link, .bar a:visited, .bar a:active { - color:#FFFFFF; - text-decoration:none; -} -.bar a:hover, .bar a:focus { - color:#bb7a2a; -} -.tab { - background-color:#0066FF; - background-image:url(resources/titlebar.gif); - background-position:left top; - background-repeat:no-repeat; - color:#ffffff; - padding:8px; - width:5em; - font-weight:bold; -} -/* -Navigation bar styles -*/ -.bar { - background-image:url(resources/background.gif); - background-repeat:repeat-x; - color:#FFFFFF; - padding:.8em .5em .4em .8em; - height:auto;/*height:1.8em;*/ - font-size:1em; - margin:0; -} -.topNav { - background-image:url(resources/background.gif); - background-repeat:repeat-x; - color:#FFFFFF; - float:left; - padding:0; - width:100%; - clear:right; - height:2.8em; - padding-top:10px; - overflow:hidden; -} -.bottomNav { - margin-top:10px; - background-image:url(resources/background.gif); - background-repeat:repeat-x; - color:#FFFFFF; - float:left; - padding:0; - width:100%; - clear:right; - height:2.8em; - padding-top:10px; - overflow:hidden; -} -.subNav { - background-color:#dee3e9; - border-bottom:1px solid #9eadc0; - float:left; - width:100%; - overflow:hidden; -} -.subNav div { - clear:left; - float:left; - padding:0 0 5px 6px; -} -ul.navList, ul.subNavList { - float:left; - margin:0 25px 0 0; - padding:0; -} -ul.navList li{ - list-style:none; - float:left; - padding:3px 6px; -} -ul.subNavList li{ - list-style:none; - float:left; - font-size:90%; -} -.topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, .bottomNav a:active, .bottomNav a:visited { - color:#FFFFFF; - text-decoration:none; -} -.topNav a:hover, .bottomNav a:hover { - text-decoration:none; - color:#bb7a2a; -} -.navBarCell1Rev { - background-image:url(resources/tab.gif); - background-color:#a88834; - color:#FFFFFF; - margin: auto 5px; - border:1px solid #c9aa44; -} -/* -Page header and footer styles -*/ -.header, .footer { - clear:both; - margin:0 20px; - padding:5px 0 0 0; -} -.indexHeader { - margin:10px; - position:relative; -} -.indexHeader h1 { - font-size:1.3em; -} -.title { - color:#2c4557; - margin:10px 0; -} -.subTitle { - margin:5px 0 0 0; -} -.header ul { - margin:0 0 25px 0; - padding:0; -} -.footer ul { - margin:20px 0 5px 0; -} -.header ul li, .footer ul li { - list-style:none; - font-size:1.2em; -} -/* -Heading styles -*/ -div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 { - background-color:#dee3e9; - border-top:1px solid #9eadc0; - border-bottom:1px solid #9eadc0; - margin:0 0 6px -8px; - padding:2px 5px; -} -ul.blockList ul.blockList ul.blockList li.blockList h3 { - background-color:#dee3e9; - border-top:1px solid #9eadc0; - border-bottom:1px solid #9eadc0; - margin:0 0 6px -8px; - padding:2px 5px; -} -ul.blockList ul.blockList li.blockList h3 { - padding:0; - margin:15px 0; -} -ul.blockList li.blockList h2 { - padding:0px 0 20px 0; -} -/* -Page layout container styles -*/ -.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .constantValuesContainer { - clear:both; - padding:10px 20px; - position:relative; -} -.indexContainer { - margin:10px; - position:relative; - font-size:1.0em; -} -.indexContainer h2 { - font-size:1.1em; - padding:0 0 3px 0; -} -.indexContainer ul { - margin:0; - padding:0; -} -.indexContainer ul li { - list-style:none; -} -.contentContainer .description dl dt, .contentContainer .details dl dt, .serializedFormContainer dl dt { - font-size:1.1em; - font-weight:bold; - margin:10px 0 0 0; - color:#4E4E4E; -} -.contentContainer .description dl dd, .contentContainer .details dl dd, .serializedFormContainer dl dd { - margin:10px 0 10px 20px; -} -.serializedFormContainer dl.nameValue dt { - margin-left:1px; - font-size:1.1em; - display:inline; - font-weight:bold; -} -.serializedFormContainer dl.nameValue dd { - margin:0 0 0 1px; - font-size:1.1em; - display:inline; -} -/* -List styles -*/ -ul.horizontal li { - display:inline; - font-size:0.9em; -} -ul.inheritance { - margin:0; - padding:0; -} -ul.inheritance li { - display:inline; - list-style:none; -} -ul.inheritance li ul.inheritance { - margin-left:15px; - padding-left:15px; - padding-top:1px; -} -ul.blockList, ul.blockListLast { - margin:10px 0 10px 0; - padding:0; -} -ul.blockList li.blockList, ul.blockListLast li.blockList { - list-style:none; - margin-bottom:25px; -} -ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList { - padding:0px 20px 5px 10px; - border:1px solid #9eadc0; - background-color:#f9f9f9; -} -ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList ul.blockListLast li.blockList { - padding:0 0 5px 8px; - background-color:#ffffff; - border:1px solid #9eadc0; - border-top:none; -} -ul.blockList ul.blockList ul.blockList ul.blockList li.blockList { - margin-left:0; - padding-left:0; - padding-bottom:15px; - border:none; - border-bottom:1px solid #9eadc0; -} -ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast { - list-style:none; - border-bottom:none; - padding-bottom:0; -} -table tr td dl, table tr td dl dt, table tr td dl dd { - margin-top:0; - margin-bottom:1px; -} -/* -Table styles -*/ -.contentContainer table, .classUseContainer table, .constantValuesContainer table { - border-bottom:1px solid #9eadc0; - width:100%; -} -.contentContainer ul li table, .classUseContainer ul li table, .constantValuesContainer ul li table { - width:100%; -} -.contentContainer .description table, .contentContainer .details table { - border-bottom:none; -} -.contentContainer ul li table th.colOne, .contentContainer ul li table th.colFirst, .contentContainer ul li table th.colLast, .classUseContainer ul li table th, .constantValuesContainer ul li table th, .contentContainer ul li table td.colOne, .contentContainer ul li table td.colFirst, .contentContainer ul li table td.colLast, .classUseContainer ul li table td, .constantValuesContainer ul li table td{ - vertical-align:top; - padding-right:20px; -} -.contentContainer ul li table th.colLast, .classUseContainer ul li table th.colLast,.constantValuesContainer ul li table th.colLast, -.contentContainer ul li table td.colLast, .classUseContainer ul li table td.colLast,.constantValuesContainer ul li table td.colLast, -.contentContainer ul li table th.colOne, .classUseContainer ul li table th.colOne, -.contentContainer ul li table td.colOne, .classUseContainer ul li table td.colOne { - padding-right:3px; -} -.overviewSummary caption, .packageSummary caption, .contentContainer ul.blockList li.blockList caption, .summary caption, .classUseContainer caption, .constantValuesContainer caption { - position:relative; - text-align:left; - background-repeat:no-repeat; - color:#FFFFFF; - font-weight:bold; - clear:none; - overflow:hidden; - padding:0px; - margin:0px; -} -caption a:link, caption a:hover, caption a:active, caption a:visited { - color:#FFFFFF; -} -.overviewSummary caption span, .packageSummary caption span, .contentContainer ul.blockList li.blockList caption span, .summary caption span, .classUseContainer caption span, .constantValuesContainer caption span { - white-space:nowrap; - padding-top:8px; - padding-left:8px; - display:block; - float:left; - background-image:url(resources/titlebar.gif); - height:18px; -} -.overviewSummary .tabEnd, .packageSummary .tabEnd, .contentContainer ul.blockList li.blockList .tabEnd, .summary .tabEnd, .classUseContainer .tabEnd, .constantValuesContainer .tabEnd { - width:10px; - background-image:url(resources/titlebar_end.gif); - background-repeat:no-repeat; - background-position:top right; - position:relative; - float:left; -} -ul.blockList ul.blockList li.blockList table { - margin:0 0 12px 0px; - width:100%; -} -.tableSubHeadingColor { - background-color: #EEEEFF; -} -.altColor { - background-color:#eeeeef; -} -.rowColor { - background-color:#ffffff; -} -.overviewSummary td, .packageSummary td, .contentContainer ul.blockList li.blockList td, .summary td, .classUseContainer td, .constantValuesContainer td { - text-align:left; - padding:3px 3px 3px 7px; -} -th.colFirst, th.colLast, th.colOne, .constantValuesContainer th { - background:#dee3e9; - border-top:1px solid #9eadc0; - border-bottom:1px solid #9eadc0; - text-align:left; - padding:3px 3px 3px 7px; -} -td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, .constantValuesContainer td a:link, .constantValuesContainer td a:active, .constantValuesContainer td a:visited, .constantValuesContainer td a:hover { - font-weight:bold; -} -td.colFirst, th.colFirst { - border-left:1px solid #9eadc0; - white-space:nowrap; -} -td.colLast, th.colLast { - border-right:1px solid #9eadc0; -} -td.colOne, th.colOne { - border-right:1px solid #9eadc0; - border-left:1px solid #9eadc0; -} -table.overviewSummary { - padding:0px; - margin-left:0px; -} -table.overviewSummary td.colFirst, table.overviewSummary th.colFirst, -table.overviewSummary td.colOne, table.overviewSummary th.colOne { - width:25%; - vertical-align:middle; -} -table.packageSummary td.colFirst, table.overviewSummary th.colFirst { - width:25%; - vertical-align:middle; -} -/* -Content styles -*/ -.description pre { - margin-top:0; -} -.deprecatedContent { - margin:0; - padding:10px 0; -} -.docSummary { - padding:0; -} -/* -Formatting effect styles -*/ -.sourceLineNo { - color:green; - padding:0 30px 0 0; -} -h1.hidden { - visibility:hidden; - overflow:hidden; - font-size:.9em; -} -.block { - display:block; - margin:3px 0 0 0; -} -.strong { - font-weight:bold; -} - diff --git a/opendaylight/archetypes/opendaylight-startup/src/test/resources/projects/basic/archetype.properties b/opendaylight/archetypes/opendaylight-startup/src/test/resources/projects/basic/archetype.properties deleted file mode 100644 index 828f1a57e9..0000000000 --- a/opendaylight/archetypes/opendaylight-startup/src/test/resources/projects/basic/archetype.properties +++ /dev/null @@ -1,8 +0,0 @@ -#Mon Jan 12 13:10:37 CST 2015 -package=it.pkg -version=0.0.1-SNAPSHOT -groupId=archetype.it -artifactId=basic -classPrefix=Basic -copyright=Cisco Systems, Inc. -copyrightYear=2015 \ No newline at end of file diff --git a/opendaylight/archetypes/opendaylight-startup/src/test/resources/projects/basic/goal.txt b/opendaylight/archetypes/opendaylight-startup/src/test/resources/projects/basic/goal.txt deleted file mode 100644 index 7c32f55981..0000000000 --- a/opendaylight/archetypes/opendaylight-startup/src/test/resources/projects/basic/goal.txt +++ /dev/null @@ -1 +0,0 @@ -install diff --git a/opendaylight/archetypes/pom.xml b/opendaylight/archetypes/pom.xml index da318568b8..951b7fd885 100644 --- a/opendaylight/archetypes/pom.xml +++ b/opendaylight/archetypes/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent - odlparent + odlparent-lite 3.1.0 @@ -14,21 +14,6 @@ 0.8.0-SNAPSHOT pom - - true - - - - - - org.opendaylight.odlparent - opendaylight-karaf-empty - 3.1.0 - zip - - - @@ -37,45 +22,6 @@ ${maven.archetype.plugin.version} - - - - org.apache.maven.plugins - maven-resources-plugin - - - false - - - - maven-help-plugin - - ${project.build.directory}/effective-settings.xml - - - - - pre-integration-test - - effective-settings - - - - - - maven-archetype-plugin - - ${project.build.directory}/effective-settings.xml - - - - commons-lang - commons-lang - 2.6 - - - -