From: Martial COULIBALY Date: Wed, 31 Jan 2018 12:30:11 +0000 (+0100) Subject: Remove useless folders X-Git-Tag: v0.2.0~74 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F38%2F73538%2F5;p=transportpce.git Remove useless folders - remove useless folders 'impl', 'it' and 'src' folders. This folders were initially created at project root by maven archetype and they are now useless here. - remove useless folder cli and feature transportpce-cli. Transportpce will not provide a CLI interface. Change-Id: I09129100ca933cc1f7293c8b9c3cefa1506b374e Signed-off-by: Martial COULIBALY Signed-off-by: Olivier RENAIS --- diff --git a/.gitignore b/.gitignore index e8f60411e..154143d97 100644 --- a/.gitignore +++ b/.gitignore @@ -19,4 +19,4 @@ classes .metadata ordmodels/src/main/java tests/config.xml -tests/models +tests/models \ No newline at end of file diff --git a/cli/src/main/java/org/opendaylight/transportpce/cli/api/TransportpceCliCommands.java b/cli/src/main/java/org/opendaylight/transportpce/cli/api/TransportpceCliCommands.java deleted file mode 100644 index 5a9561f66..000000000 --- a/cli/src/main/java/org/opendaylight/transportpce/cli/api/TransportpceCliCommands.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright © 2016 Orange 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 org.opendaylight.transportpce.cli.api; - -public interface TransportpceCliCommands { - - /** - * Define the Karaf command method signatures and the Javadoc for each. - * Below method is just an example - * - * @param testArgument - * testArgument - * - * @return - * returns nothing - */ - Object testCommand(Object testArgument); -} diff --git a/cli/src/main/java/org/opendaylight/transportpce/cli/commands/TransportpceCliTestCommand.java b/cli/src/main/java/org/opendaylight/transportpce/cli/commands/TransportpceCliTestCommand.java deleted file mode 100644 index 3efbab91f..000000000 --- a/cli/src/main/java/org/opendaylight/transportpce/cli/commands/TransportpceCliTestCommand.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright © 2016 Orange 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 org.opendaylight.transportpce.cli.commands; - -import org.apache.karaf.shell.commands.Command; -import org.apache.karaf.shell.commands.Option; -import org.apache.karaf.shell.console.AbstractAction; -import org.opendaylight.transportpce.cli.api.TransportpceCliCommands; -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 TransportpceCliTestCommand extends AbstractAction { - - private static final Logger LOG = LoggerFactory.getLogger(TransportpceCliTestCommand.class); - protected final TransportpceCliCommands service; - - public TransportpceCliTestCommand(final TransportpceCliCommands 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/cli/src/main/java/org/opendaylight/transportpce/cli/impl/TransportpceCliCommandsImpl.java b/cli/src/main/java/org/opendaylight/transportpce/cli/impl/TransportpceCliCommandsImpl.java deleted file mode 100644 index 9da5c6fd2..000000000 --- a/cli/src/main/java/org/opendaylight/transportpce/cli/impl/TransportpceCliCommandsImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright © 2016 Orange 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 org.opendaylight.transportpce.cli.impl; - -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.transportpce.cli.api.TransportpceCliCommands; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class TransportpceCliCommandsImpl implements TransportpceCliCommands { - - private static final Logger LOG = LoggerFactory.getLogger(TransportpceCliCommandsImpl.class); - private final DataBroker dataBroker; - - public TransportpceCliCommandsImpl(final DataBroker db) { - this.dataBroker = db; - LOG.info("TransportpceCliCommandImpl initialized"); - } - - @Override - public Object testCommand(Object testArgument) { - return "This is a test implementation of test-command"; - } -} diff --git a/cli/src/main/resources/org/opendaylight/blueprint/cli-blueprint.xml b/cli/src/main/resources/org/opendaylight/blueprint/cli-blueprint.xml deleted file mode 100644 index a5d732cb7..000000000 --- a/cli/src/main/resources/org/opendaylight/blueprint/cli-blueprint.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/features/pom.xml b/features/pom.xml index 8781d5ad9..d1ab39b02 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -29,7 +29,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL odl-transportpce odl-transportpce-rest odl-transportpce-ui - odl-transportpce-cli diff --git a/impl/src/main/java/org/opendaylight/transportpce/impl/TransportpceProvider.java b/impl/src/main/java/org/opendaylight/transportpce/impl/TransportpceProvider.java deleted file mode 100644 index 18e0f9eff..000000000 --- a/impl/src/main/java/org/opendaylight/transportpce/impl/TransportpceProvider.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright © 2016 Orange 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 org.opendaylight.transportpce.impl; - -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.api.MountPointService; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class TransportpceProvider { - - private static final Logger LOG = LoggerFactory.getLogger(TransportpceProvider.class); - - private final DataBroker dataBroker; - - private final MountPointService mountPointService; - - public TransportpceProvider(final DataBroker dataBroker, final MountPointService mountPointService) { - this.dataBroker = dataBroker; - this.mountPointService = mountPointService; - } - - /** - * Method called when the blueprint container is created. - */ - public void init() { - LOG.info("TransportpceProvider Session Initiated"); - } - - /** - * Method called when the blueprint container is destroyed. - */ - public void close() { - LOG.info("TransportpceProvider Closed"); - } -} diff --git a/impl/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/impl/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml deleted file mode 100644 index f624cc9fc..000000000 --- a/impl/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - diff --git a/it/src/test/java/org/opendaylight/transportpce/it/TransportpceIT.java b/it/src/test/java/org/opendaylight/transportpce/it/TransportpceIT.java deleted file mode 100644 index a67d15607..000000000 --- a/it/src/test/java/org/opendaylight/transportpce/it/TransportpceIT.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright © 2016 Orange 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 org.opendaylight.transportpce.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.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 TransportpceIT extends AbstractMdsalTestBase { - private static final Logger LOG = LoggerFactory.getLogger(TransportpceIT.class); - - @Override - public MavenUrlReference getFeatureRepo() { - return maven() - .groupId("org.opendaylight.transportpce") - .artifactId("transportpce-features") - .classifier("features") - .type("xml") - .versionAsInProject(); - } - - @Override - public String getFeatureName() { - return "odl-transportpce-ui"; - } - - @Override - public Option getLoggingOption() { - Option option = editConfigurationFilePut(ORG_OPS4J_PAX_LOGGING_CFG, - logConfiguration(TransportpceIT.class), - LogLevel.INFO.name()); - option = composite(option, super.getLoggingOption()); - return option; - } - - @Test - public void testtransportpceFeatureLoad() { - Assert.assertTrue(true); - } -} diff --git a/pom.xml b/pom.xml index f1c0a4a3c..38e2d6293 100644 --- a/pom.xml +++ b/pom.xml @@ -32,15 +32,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL artifacts api ordmodels - impl renderer olm tests servicehandler - cli features karaf - it diff --git a/src/main/resources/stylesheet.css b/src/main/resources/stylesheet.css deleted file mode 100644 index 76de82bfe..000000000 --- a/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/src/site/site.xml b/src/site/site.xml deleted file mode 100644 index 7c9dd6048..000000000 --- a/src/site/site.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - -