From df9ec77856fde3d12798d32f0b389e57801b9301 Mon Sep 17 00:00:00 2001 From: Ed Warnicke Date: Sun, 18 May 2014 13:00:33 -0500 Subject: [PATCH 1/1] Bug 1029: Remove dead code: sal-rest-connector-it opendaylight/md-sal/test/sal-rest-connector-it is dead code that is not being built and hasn't for some time. Its complicating keeping versions up to date and verifying that they are up to date. If it needs to be revived in the future it can be retrieved from git. Change-Id: I2ab837c661552022792ff7f02a1c2b68f7928501 Signed-off-by: Ed Warnicke --- opendaylight/md-sal/pom.xml | 4 - .../md-sal/test/sal-rest-connector-it/pom.xml | 683 ------------------ .../it/ServiceProviderController.java | 329 --------- .../src/test/resources/exam.properties | 4 - .../src/test/resources/logback.xml | 13 - .../src/test/resources/tomcat-server.xml | 53 -- 6 files changed, 1086 deletions(-) delete mode 100644 opendaylight/md-sal/test/sal-rest-connector-it/pom.xml delete mode 100644 opendaylight/md-sal/test/sal-rest-connector-it/src/test/java/org/opendaylight/controller/test/restconf/it/ServiceProviderController.java delete mode 100644 opendaylight/md-sal/test/sal-rest-connector-it/src/test/resources/exam.properties delete mode 100644 opendaylight/md-sal/test/sal-rest-connector-it/src/test/resources/logback.xml delete mode 100644 opendaylight/md-sal/test/sal-rest-connector-it/src/test/resources/tomcat-server.xml diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml index a13d2bb06f..2f715b59c6 100644 --- a/opendaylight/md-sal/pom.xml +++ b/opendaylight/md-sal/pom.xml @@ -206,10 +206,6 @@ sal-binding-it sal-binding-dom-it - - - - diff --git a/opendaylight/md-sal/test/sal-rest-connector-it/pom.xml b/opendaylight/md-sal/test/sal-rest-connector-it/pom.xml deleted file mode 100644 index 4a0a02561f..0000000000 --- a/opendaylight/md-sal/test/sal-rest-connector-it/pom.xml +++ /dev/null @@ -1,683 +0,0 @@ - - 4.0.0 - - sal-test-parent - org.opendaylight.controller.tests - 1.0-SNAPSHOT - - sal-rest-connector-it - - scm:git:ssh://git.opendaylight.org:29418/controller.git - scm:git:ssh://git.opendaylight.org:29418/controller.git - https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL - - - - - - org.ops4j.pax.exam - maven-paxexam-plugin - 1.2.4 - - - generate-config - - generate-depends-file - - - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.ops4j.pax.exam - - - maven-paxexam-plugin - - - [1.2.4,) - - - - generate-depends-file - - - - - - - - - - - - - - - - - - org.opendaylight.controller - logging.bridge - 0.4.1-SNAPSHOT - - - org.opendaylight.yangtools.thirdparty - xtend-lib-osgi - 2.4.3 - - - org.opendaylight.controller - bundlescanner.implementation - 0.4.1-SNAPSHOT - - - org.opendaylight.controller - sal-broker-impl - 1.0-SNAPSHOT - test - - - org.opendaylight.controller - sal-rest-connector - 1.0-SNAPSHOT - test - - - org.opendaylight.controller - sal-netconf-connector - 1.0-SNAPSHOT - test - - - org.opendaylight.controller - sal-binding-it - 1.0-SNAPSHOT - test - - - org.ops4j.pax.exam - pax-exam-container-native - ${exam.version} - test - - - org.ops4j.pax.exam - pax-exam-junit4 - ${exam.version} - test - - - io.netty - netty-all - ${netty.version} - test - - - org.ops4j.pax.exam - pax-exam-link-mvn - ${exam.version} - test - - - equinoxSDK381 - org.eclipse.osgi - 3.8.1.v20120830-144521 - test - - - org.slf4j - log4j-over-slf4j - 1.7.2 - - - ch.qos.logback - logback-core - 1.0.9 - - - ch.qos.logback - logback-classic - 1.0.9 - - - org.opendaylight.controller - sal-binding-api - 1.0-SNAPSHOT - - - org.opendaylight.controller - sal-common-util - 1.0-SNAPSHOT - - - org.opendaylight.controller - sal-core-api - 1.0-SNAPSHOT - - - org.opendaylight.controller.model - model-flow-service - 1.0-SNAPSHOT - provided - - - org.opendaylight.controller - config-manager - 0.2.2-SNAPSHOT - - - org.opendaylight.controller.model - model-flow-management - 1.0-SNAPSHOT - provided - - - org.opendaylight.yangtools.thirdparty - antlr4-runtime-osgi-nohead - 4.0 - - - org.opendaylight.yangtools - yang-binding - - - org.opendaylight.yangtools - yang-common - - - org.opendaylight.yangtools - yang-data-api - - - org.opendaylight.controller - commons.northbound - 0.4.1-SNAPSHOT - runtime - - - org.opendaylight.controller - sal-common-util - 1.0-SNAPSHOT - - - org.slf4j - jcl-over-slf4j - 1.7.2 - - - org.slf4j - slf4j-api - - - - org.slf4j - log4j-over-slf4j - 1.7.2 - - - ch.qos.logback - logback-core - 1.0.9 - - - ch.qos.logback - logback-classic - 1.0.9 - - - commons-codec - commons-codec - 1.7 - - - equinoxSDK381 - javax.servlet - 3.0.0.v201112011016 - - - equinoxSDK381 - javax.servlet.jsp - 2.2.0.v201112011158 - - - equinoxSDK381 - org.eclipse.equinox.ds - 1.4.0.v20120522-1841 - - - equinoxSDK381 - org.eclipse.equinox.util - 1.0.400.v20120522-2049 - - - equinoxSDK381 - org.eclipse.osgi.services - 3.3.100.v20120522-1822 - - - equinoxSDK381 - org.eclipse.osgi - 3.8.1.v20120830-144521 - - - equinoxSDK381 - org.apache.felix.gogo.command - 0.8.0.v201108120515 - - - equinoxSDK381 - org.apache.felix.gogo.runtime - 0.8.0.v201108120515 - - - equinoxSDK381 - org.apache.felix.gogo.shell - 0.8.0.v201110170705 - - - equinoxSDK381 - org.eclipse.equinox.cm - 1.0.400.v20120522-1841 - - - equinoxSDK381 - org.eclipse.equinox.console - 1.0.0.v20120522-1841 - - - equinoxSDK381 - org.eclipse.equinox.launcher - 1.3.0.v20120522-1813 - - - - geminiweb - org.eclipse.gemini.web.core - ${geminiweb.version} - - - geminiweb - org.eclipse.gemini.web.extender - ${geminiweb.version} - - - geminiweb - org.eclipse.gemini.web.tomcat - ${geminiweb.version} - - - geminiweb - org.eclipse.virgo.kernel.equinox.extensions - ${virgo.version} - - - geminiweb - org.eclipse.virgo.util.common - ${virgo.version} - - - geminiweb - org.eclipse.virgo.util.io - ${virgo.version} - - - geminiweb - org.eclipse.virgo.util.math - ${virgo.version} - - - geminiweb - org.eclipse.virgo.util.osgi - ${virgo.version} - - - geminiweb - org.eclipse.virgo.util.osgi.manifest - ${virgo.version} - - - geminiweb - org.eclipse.virgo.util.parser.manifest - ${virgo.version} - - - org.apache.felix - org.apache.felix.dependencymanager - 3.1.0 - - - org.apache.felix - org.apache.felix.dependencymanager.shell - 3.0.1 - - - org.jboss.spec.javax.transaction - jboss-transaction-api_1.1_spec - 1.0.1.Final - - - org.apache.felix - org.apache.felix.fileinstall - 3.1.6 - - - org.apache.commons - commons-lang3 - 3.1 - - - virgomirror - org.eclipse.jdt.core.compiler.batch - 3.8.0.I20120518-2145 - - - eclipselink - javax.persistence - 2.0.4.v201112161009 - - - orbit - javax.activation - 1.1.0.v201211130549 - - - orbit - javax.annotation - 1.1.0.v201209060031 - - - orbit - javax.ejb - 3.1.1.v201204261316 - - - orbit - javax.el - 2.2.0.v201108011116 - - - orbit - javax.mail.glassfish - 1.4.1.v201108011116 - - - orbit - javax.xml.rpc - 1.1.0.v201005080400 - - - orbit - org.apache.catalina - 7.0.32.v201211201336 - - - orbit - org.apache.catalina.ha - 7.0.32.v201211201952 - - - orbit - org.apache.catalina.tribes - 7.0.32.v201211201952 - - - orbit - org.apache.coyote - 7.0.32.v201211201952 - - - orbit - org.apache.el - 7.0.32.v201211081135 - - - orbit - org.apache.jasper - 7.0.32.v201211201952 - - - orbit - org.apache.juli.extras - 7.0.32.v201211081135 - - - orbit - org.apache.tomcat.api - 7.0.32.v201211081135 - - - orbit - org.apache.tomcat.util - 7.0.32.v201211201952 - - - orbit - javax.servlet.jsp.jstl - 1.2.0.v201105211821 - - - orbit - javax.servlet.jsp.jstl.impl - 1.2.0.v201210211230 - - - - org.ops4j.pax.exam - pax-exam-container-native - ${exam.version} - test - - - org.ops4j.pax.exam - pax-exam-junit4 - ${exam.version} - test - - - org.ops4j.pax.exam - pax-exam-link-mvn - ${exam.version} - test - - - org.ops4j.pax.url - pax-url-aether - ${url.version} - test - - - org.ow2.asm - asm-all - 4.1 - - - org.springframework - org.springframework.asm - ${spring.version} - - - org.springframework - org.springframework.aop - ${spring.version} - - - org.springframework - org.springframework.context - ${spring.version} - - - org.springframework - org.springframework.context.support - ${spring.version} - - - org.springframework - org.springframework.core - ${spring.version} - - - org.springframework - org.springframework.beans - ${spring.version} - - - org.springframework - org.springframework.expression - ${spring.version} - - - org.springframework - org.springframework.web - ${spring.version} - - - org.aopalliance - com.springsource.org.aopalliance - 1.0.0 - - - org.springframework - org.springframework.web.servlet - ${spring.version} - - - - org.springframework.security - spring-security-config - ${spring-security.version} - - - org.springframework.security - spring-security-core - ${spring-security.version} - - - org.springframework.security - spring-security-web - ${spring-security.version} - - - org.springframework.security - spring-security-taglibs - ${spring-security.version} - - - org.springframework - org.springframework.transaction - ${spring-security.version} - - - - org.ow2.chameleon.management - chameleon-mbeans - 1.0.0 - - - - com.sun.jersey - jersey-core - ${jersey.version} - - - - com.sun.jersey - jersey-server - ${jersey.version} - - - com.sun.jersey - jersey-client - ${jersey.version} - - - - eclipselink - javax.resource - 1.5.0.v200906010428 - - - org.opendaylight.controller.thirdparty - com.sun.jersey.jersey-servlet - 1.17 - - - org.opendaylight.controller.thirdparty - org.apache.catalina.filters.CorsFilter - 7.0.42 - - - - - org.opendaylight.controller - config-api - - - org.opendaylight.controller - config-manager - - - org.opendaylight.controller - config-util - - - org.opendaylight.controller - yang-jmx-generator - - - org.opendaylight.controller - logback-config - - - org.opendaylight.controller - config-persister-api - - - org.opendaylight.controller - config-persister-file-xml-adapter - - - org.opendaylight.controller - netconf-api - - - org.opendaylight.controller - netconf-impl - - - org.opendaylight.controller - netconf-util - - - org.opendaylight.controller - netconf-client - - - org.opendaylight.controller - netconf-mapping-api - - - org.opendaylight.controller - config-netconf-connector - - - org.opendaylight.controller - config-persister-impl - - - diff --git a/opendaylight/md-sal/test/sal-rest-connector-it/src/test/java/org/opendaylight/controller/test/restconf/it/ServiceProviderController.java b/opendaylight/md-sal/test/sal-rest-connector-it/src/test/java/org/opendaylight/controller/test/restconf/it/ServiceProviderController.java deleted file mode 100644 index 4a43e0cf82..0000000000 --- a/opendaylight/md-sal/test/sal-rest-connector-it/src/test/java/org/opendaylight/controller/test/restconf/it/ServiceProviderController.java +++ /dev/null @@ -1,329 +0,0 @@ -/* - * Copyright (c) 2014 Cisco Systems, 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 - */ -package org.opendaylight.controller.test.restconf.it; - -import static junit.framework.Assert.assertEquals; -import static org.junit.Assert.*; -import static org.ops4j.pax.exam.CoreOptions.junitBundles; -import static org.ops4j.pax.exam.CoreOptions.mavenBundle; -import static org.ops4j.pax.exam.CoreOptions.options; -import static org.ops4j.pax.exam.CoreOptions.systemPackages; -import static org.ops4j.pax.exam.CoreOptions.systemProperty; -import static org.ops4j.pax.exam.CoreOptions.maven; - -import java.net.InetSocketAddress; -import java.net.URI; -import java.util.Collection; -import java.util.Collections; -import java.util.Map; - -import javax.inject.Inject; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; -import org.opendaylight.controller.sal.connect.netconf.InventoryUtils; -import org.opendaylight.controller.sal.connect.netconf.NetconfInventoryUtils; -import org.opendaylight.controller.sal.core.api.data.DataBrokerService; -import org.opendaylight.controller.sal.core.api.mount.MountProvisionInstance; -import org.opendaylight.controller.sal.core.api.mount.MountProvisionService; -import org.opendaylight.controller.test.sal.binding.it.TestHelper; -import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.data.api.CompositeNode; -import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.CoreOptions; -import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.PaxExam; -import org.ops4j.pax.exam.util.PathUtils; -import org.osgi.framework.BundleContext; -import org.osgi.framework.InvalidSyntaxException; -import org.osgi.framework.ServiceReference; - -import static org.opendaylight.controller.test.sal.binding.it.TestHelper.*; - -@RunWith(PaxExam.class) -public class ServiceProviderController { - - public static final String ODL = "org.opendaylight.controller"; - public static final String YANG = "org.opendaylight.yangtools"; - public static final String SAMPLE = "org.opendaylight.controller.samples"; - - private static QName CONFIG_MODULES = new QName( - URI.create("urn:opendaylight:params:xml:ns:yang:controller:config"), null, "modules"); - private static QName CONFIG_SERVICES = new QName( - URI.create("urn:opendaylight:params:xml:ns:yang:controller:config"), null, "modules"); - @Inject - BundleContext context; - - @Inject - MountProvisionService mountService; - - @Inject - DataBrokerService dataBroker; - - @Test - public void properInitialized() throws Exception { - - Map arg = Collections.singletonMap(InventoryUtils.INVENTORY_ID, "foo"); - - InstanceIdentifier path = InstanceIdentifier.builder(InventoryUtils.INVENTORY_PATH) - .nodeWithKey(InventoryUtils.INVENTORY_NODE, InventoryUtils.INVENTORY_ID, "foo").toInstance(); - - - InstanceIdentifier mountPointPath = path; - - /** We retrive a mountpoint **/ - MountProvisionInstance mountPoint = mountService.getMountPoint(mountPointPath); - CompositeNode data = mountPoint.readOperationalData(InstanceIdentifier.builder().node(CONFIG_MODULES) - .toInstance()); - assertNotNull(data); - assertEquals(CONFIG_MODULES, data.getNodeType()); - - CompositeNode data2 = mountPoint.readOperationalData(InstanceIdentifier.builder().toInstance()); - assertNotNull(data2); - - InstanceIdentifier fullPath = InstanceIdentifier.builder(mountPointPath).node(CONFIG_MODULES).toInstance(); - - CompositeNode data3 = dataBroker.readOperationalData(fullPath); - assertNotNull(data3); - assertEquals(CONFIG_MODULES, data.getNodeType()); - - //Thread.sleep(30 * 60 * 1000); // Waiting for services to get wired. - //assertTrue(true); - // assertTrue(consumer.createToast(WhiteBread.class, 5)); - } - - @Configuration - public Option[] config() { - return options( - mavenBundle("org.slf4j", "slf4j-api").versionAsInProject(), // - mavenBundle("org.slf4j", "log4j-over-slf4j").versionAsInProject(), // - mavenBundle("ch.qos.logback", "logback-core").versionAsInProject(), // - mavenBundle("ch.qos.logback", "logback-classic").versionAsInProject(), // - - mdSalCoreBundles(), - baseModelBundles(), - flowCapableModelBundles(), - configMinumumBundles(), - - // mavenBundle(ODL, - // "sal-binding-broker-impl").versionAsInProject().update(), // - mavenBundle(ODL, "sal-common").versionAsInProject(), // - mavenBundle(ODL, "sal-common-api").versionAsInProject(),// - mavenBundle(ODL, "sal-common-impl").versionAsInProject(), // - mavenBundle(ODL, "sal-common-util").versionAsInProject(), // - - mavenBundle(ODL, "sal-core-api").versionAsInProject().update(), // - mavenBundle(ODL, "sal-broker-impl").versionAsInProject(), // - mavenBundle(ODL, "sal-core-spi").versionAsInProject().update(), // - - mavenBundle(ODL, "sal-connector-api").versionAsInProject(), // - // mavenBundle(SAMPLE, - // "zeromq-test-provider").versionAsInProject(), // - mavenBundle(ODL, "sal-rest-connector").versionAsInProject(), // - mavenBundle(ODL, "sal-netconf-connector").versionAsInProject(), // - - mavenBundle(YANG, "concepts").versionAsInProject(), - mavenBundle(YANG, "yang-binding").versionAsInProject(), // - mavenBundle(YANG, "yang-common").versionAsInProject(), // - mavenBundle(YANG, "yang-data-api").versionAsInProject(), // - mavenBundle(YANG, "yang-data-impl").versionAsInProject(), // - mavenBundle(YANG, "yang-model-api").versionAsInProject(), // - mavenBundle(YANG, "yang-model-util").versionAsInProject(), // - mavenBundle(YANG, "yang-parser-api").versionAsInProject(), - mavenBundle(YANG, "yang-parser-impl").versionAsInProject(), - - mavenBundle(YANG + ".thirdparty", "xtend-lib-osgi").versionAsInProject(), // - mavenBundle(YANG + ".thirdparty", "antlr4-runtime-osgi-nohead").versionAsInProject(), // - mavenBundle("com.google.guava", "guava").versionAsInProject(), // - - // systemProperty("logback.configurationFile").value( - // "file:" + PathUtils.getBaseDir() + - // "/src/test/resources/logback.xml"), - // To start OSGi console for inspection remotely - systemProperty("osgi.console").value("2401"), - systemProperty("org.eclipse.gemini.web.tomcat.config.path").value( - PathUtils.getBaseDir() + "/src/test/resources/tomcat-server.xml"), - - // setting default level. Jersey bundles will need to be started - // earlier. - systemProperty("osgi.bundles.defaultStartLevel").value("4"), - - systemProperty("netconf.tcp.address").value("127.0.0.1"), - systemProperty("netconf.tcp.port").value("8383"), - - systemProperty("netconf.tcp.client.address").value("127.0.0.1"), - systemProperty("netconf.tcp.client.port").value("8383"), - - // Set the systemPackages (used by clustering) - systemPackages("sun.reflect", "sun.reflect.misc", "sun.misc"), - - mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.xerces", "2.11.0_1"), - mavenBundle("org.eclipse.birt.runtime.3_7_1", "org.apache.xml.resolver", "1.2.0"), - - mavenBundle("org.slf4j", "jcl-over-slf4j").versionAsInProject(), - mavenBundle("org.slf4j", "slf4j-api").versionAsInProject(), - mavenBundle("org.slf4j", "log4j-over-slf4j").versionAsInProject(), - mavenBundle("ch.qos.logback", "logback-core").versionAsInProject(), - mavenBundle("ch.qos.logback", "logback-classic").versionAsInProject(), - mavenBundle("org.apache.commons", "commons-lang3").versionAsInProject(), - mavenBundle("org.apache.felix", "org.apache.felix.dependencymanager").versionAsInProject(), - mavenBundle("org.opendaylight.controller", "clustering.services").versionAsInProject(), - mavenBundle("org.opendaylight.controller", "containermanager").versionAsInProject(), - // List all the opendaylight modules - mavenBundle("org.opendaylight.controller", "configuration").versionAsInProject(), - mavenBundle("org.opendaylight.controller", "sal").versionAsInProject(), - mavenBundle("org.opendaylight.controller", "switchmanager").versionAsInProject(), - mavenBundle("org.opendaylight.controller", "usermanager").versionAsInProject(), - mavenBundle("org.opendaylight.controller", "logging.bridge").versionAsInProject(), - // mavenBundle("org.opendaylight.controller", - // "clustering.test").versionAsInProject(), - mavenBundle("org.opendaylight.controller", "bundlescanner").versionAsInProject(), - mavenBundle("org.opendaylight.controller", "bundlescanner.implementation").versionAsInProject(), - - // Northbound bundles - mavenBundle("org.opendaylight.controller", "commons.northbound").versionAsInProject(), - - mavenBundle("com.fasterxml.jackson.core", "jackson-annotations").versionAsInProject(), - mavenBundle("com.fasterxml.jackson.core", "jackson-core").versionAsInProject(), - mavenBundle("com.fasterxml.jackson.core", "jackson-databind").versionAsInProject(), - mavenBundle("com.fasterxml.jackson.jaxrs", "jackson-jaxrs-json-provider").versionAsInProject(), - mavenBundle("com.fasterxml.jackson.module", "jackson-module-jaxb-annotations").versionAsInProject(), - - mavenBundle("org.codehaus.jettison", "jettison").versionAsInProject(), - - mavenBundle("commons-io", "commons-io").versionAsInProject(), - - // mavenBundle("commons-fileupload", - // "commons-fileupload").versionAsInProject(), - - mavenBundle("io.netty", "netty-handler").versionAsInProject(), - mavenBundle("io.netty", "netty-codec").versionAsInProject(), - mavenBundle("io.netty", "netty-buffer").versionAsInProject(), - mavenBundle("io.netty", "netty-transport").versionAsInProject(), - mavenBundle("io.netty", "netty-common").versionAsInProject(), - - mavenBundle(ODL, "config-api").versionAsInProject(), - mavenBundle(ODL, "config-manager").versionAsInProject(), - mavenBundle(ODL, "config-util").versionAsInProject(), - mavenBundle(ODL, "yang-jmx-generator").versionAsInProject(), - mavenBundle(ODL, "logback-config").versionAsInProject(), - mavenBundle(ODL, "config-persister-api").versionAsInProject(), - // mavenBundle(ODL,"config-persister-file-xml-adapter").versionAsInProject(), - mavenBundle(ODL, "protocol-framework").versionAsInProject(), - mavenBundle(ODL, "netconf-api").versionAsInProject(), - mavenBundle(ODL, "netconf-impl").versionAsInProject(), - mavenBundle(ODL, "netconf-client").versionAsInProject(), - mavenBundle(ODL, "netconf-util").versionAsInProject(), - mavenBundle(ODL + ".thirdparty", "ganymed").versionAsInProject(), - mavenBundle(ODL, "netconf-mapping-api").versionAsInProject(), - mavenBundle(ODL, "config-netconf-connector").versionAsInProject(), - mavenBundle(ODL, "config-persister-impl").versionAsInProject(), - - mavenBundle(YANG, "binding-generator-spi").versionAsInProject(), // - mavenBundle(YANG, "binding-model-api").versionAsInProject(), // - mavenBundle(YANG, "binding-generator-util").versionAsInProject(), - mavenBundle(YANG, "yang-parser-impl").versionAsInProject(), - mavenBundle(YANG, "binding-type-provider").versionAsInProject(), - - mavenBundle("equinoxSDK381", "javax.servlet").versionAsInProject(), - mavenBundle("equinoxSDK381", "javax.servlet.jsp").versionAsInProject(), - mavenBundle("equinoxSDK381", "org.eclipse.equinox.ds").versionAsInProject(), - mavenBundle("orbit", "javax.xml.rpc").versionAsInProject(), - mavenBundle("equinoxSDK381", "org.eclipse.equinox.util").versionAsInProject(), - mavenBundle("equinoxSDK381", "org.eclipse.osgi.services").versionAsInProject(), - mavenBundle("equinoxSDK381", "org.apache.felix.gogo.command").versionAsInProject(), - mavenBundle("equinoxSDK381", "org.apache.felix.gogo.runtime").versionAsInProject(), - mavenBundle("equinoxSDK381", "org.apache.felix.gogo.shell").versionAsInProject(), - mavenBundle("equinoxSDK381", "org.eclipse.equinox.cm").versionAsInProject(), - mavenBundle("equinoxSDK381", "org.eclipse.equinox.console").versionAsInProject(), - mavenBundle("equinoxSDK381", "org.eclipse.equinox.launcher").versionAsInProject(), - - mavenBundle("geminiweb", "org.eclipse.gemini.web.core").versionAsInProject(), - mavenBundle("geminiweb", "org.eclipse.gemini.web.extender").versionAsInProject(), - mavenBundle("geminiweb", "org.eclipse.gemini.web.tomcat").versionAsInProject(), - mavenBundle("geminiweb", "org.eclipse.virgo.kernel.equinox.extensions").versionAsInProject().noStart(), - mavenBundle("geminiweb", "org.eclipse.virgo.util.common").versionAsInProject(), - mavenBundle("geminiweb", "org.eclipse.virgo.util.io").versionAsInProject(), - mavenBundle("geminiweb", "org.eclipse.virgo.util.math").versionAsInProject(), - mavenBundle("geminiweb", "org.eclipse.virgo.util.osgi").versionAsInProject(), - mavenBundle("geminiweb", "org.eclipse.virgo.util.osgi.manifest").versionAsInProject(), - mavenBundle("geminiweb", "org.eclipse.virgo.util.parser.manifest").versionAsInProject(), - - mavenBundle("org.apache.felix", "org.apache.felix.dependencymanager").versionAsInProject(), - mavenBundle("org.apache.felix", "org.apache.felix.dependencymanager.shell").versionAsInProject(), - - mavenBundle("com.google.code.gson", "gson").versionAsInProject(), - mavenBundle("org.jboss.spec.javax.transaction", "jboss-transaction-api_1.1_spec").versionAsInProject(), - mavenBundle("org.apache.felix", "org.apache.felix.fileinstall").versionAsInProject(), - mavenBundle("org.apache.commons", "commons-lang3").versionAsInProject(), - mavenBundle("commons-codec", "commons-codec").versionAsInProject(), - mavenBundle("virgomirror", "org.eclipse.jdt.core.compiler.batch").versionAsInProject(), - mavenBundle("eclipselink", "javax.persistence").versionAsInProject(), - mavenBundle("eclipselink", "javax.resource").versionAsInProject(), - - mavenBundle("orbit", "javax.activation").versionAsInProject(), - mavenBundle("orbit", "javax.annotation").versionAsInProject(), - mavenBundle("orbit", "javax.ejb").versionAsInProject(), - mavenBundle("orbit", "javax.el").versionAsInProject(), - mavenBundle("orbit", "javax.mail.glassfish").versionAsInProject(), - mavenBundle("orbit", "javax.xml.rpc").versionAsInProject(), - mavenBundle("orbit", "org.apache.catalina").versionAsInProject(), - // these are bundle fragments that can't be started on its own - mavenBundle("orbit", "org.apache.catalina.ha").versionAsInProject().noStart(), - mavenBundle("orbit", "org.apache.catalina.tribes").versionAsInProject().noStart(), - mavenBundle("orbit", "org.apache.coyote").versionAsInProject().noStart(), - mavenBundle("orbit", "org.apache.jasper").versionAsInProject().noStart(), - - mavenBundle("orbit", "org.apache.el").versionAsInProject(), - mavenBundle("orbit", "org.apache.juli.extras").versionAsInProject(), - mavenBundle("orbit", "org.apache.tomcat.api").versionAsInProject(), - mavenBundle("orbit", "org.apache.tomcat.util").versionAsInProject().noStart(), - mavenBundle("orbit", "javax.servlet.jsp.jstl").versionAsInProject(), - mavenBundle("orbit", "javax.servlet.jsp.jstl.impl").versionAsInProject(), - - mavenBundle("org.ops4j.pax.exam", "pax-exam-container-native").versionAsInProject(), - mavenBundle("org.ops4j.pax.exam", "pax-exam-junit4").versionAsInProject(), - mavenBundle("org.ops4j.pax.exam", "pax-exam-link-mvn").versionAsInProject(), - mavenBundle("org.ops4j.pax.url", "pax-url-aether").versionAsInProject(), - - mavenBundle("org.ow2.asm", "asm-all").versionAsInProject(), - - mavenBundle("org.springframework", "org.springframework.asm").versionAsInProject(), - mavenBundle("org.springframework", "org.springframework.aop").versionAsInProject(), - mavenBundle("org.springframework", "org.springframework.context").versionAsInProject(), - mavenBundle("org.springframework", "org.springframework.context.support").versionAsInProject(), - mavenBundle("org.springframework", "org.springframework.core").versionAsInProject(), - mavenBundle("org.springframework", "org.springframework.beans").versionAsInProject(), - mavenBundle("org.springframework", "org.springframework.expression").versionAsInProject(), - mavenBundle("org.springframework", "org.springframework.web").versionAsInProject(), - - mavenBundle("org.aopalliance", "com.springsource.org.aopalliance").versionAsInProject(), - mavenBundle("org.springframework", "org.springframework.web.servlet").versionAsInProject(), - mavenBundle("org.springframework.security", "spring-security-config").versionAsInProject(), - mavenBundle("org.springframework.security", "spring-security-core").versionAsInProject(), - mavenBundle("org.springframework.security", "spring-security-web").versionAsInProject(), - mavenBundle("org.springframework.security", "spring-security-taglibs").versionAsInProject(), - mavenBundle("org.springframework", "org.springframework.transaction").versionAsInProject(), - - mavenBundle("org.ow2.chameleon.management", "chameleon-mbeans").versionAsInProject(), - mavenBundle("org.opendaylight.controller.thirdparty", "com.sun.jersey.jersey-servlet") - .versionAsInProject().startLevel(2), - mavenBundle("org.opendaylight.controller.thirdparty", "org.apache.catalina.filters.CorsFilter") - .versionAsInProject().noStart(), - - // Jersey needs to be started before the northbound application - // bundles, using a lower start level - mavenBundle("com.sun.jersey", "jersey-client").versionAsInProject(), - mavenBundle("com.sun.jersey", "jersey-server").versionAsInProject().startLevel(2), - mavenBundle("com.sun.jersey", "jersey-core").versionAsInProject().startLevel(2), - junitBundles()); - } - -} diff --git a/opendaylight/md-sal/test/sal-rest-connector-it/src/test/resources/exam.properties b/opendaylight/md-sal/test/sal-rest-connector-it/src/test/resources/exam.properties deleted file mode 100644 index d5f9ae1fcd..0000000000 --- a/opendaylight/md-sal/test/sal-rest-connector-it/src/test/resources/exam.properties +++ /dev/null @@ -1,4 +0,0 @@ -#pax.exam.system = default -pax.exam.logging = none -pax.exam.service.timeout = 5000 - diff --git a/opendaylight/md-sal/test/sal-rest-connector-it/src/test/resources/logback.xml b/opendaylight/md-sal/test/sal-rest-connector-it/src/test/resources/logback.xml deleted file mode 100644 index 2d63ce5744..0000000000 --- a/opendaylight/md-sal/test/sal-rest-connector-it/src/test/resources/logback.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - diff --git a/opendaylight/md-sal/test/sal-rest-connector-it/src/test/resources/tomcat-server.xml b/opendaylight/md-sal/test/sal-rest-connector-it/src/test/resources/tomcat-server.xml deleted file mode 100644 index d6ef6ed926..0000000000 --- a/opendaylight/md-sal/test/sal-rest-connector-it/src/test/resources/tomcat-server.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- 2.36.6