Move BP xml files to standard OSGI-INF/blueprint 64/79964/3
authorTom Pantelis <tompantelis@gmail.com>
Mon, 28 Jan 2019 16:45:00 +0000 (11:45 -0500)
committerTom Pantelis <tompantelis@gmail.com>
Tue, 29 Jan 2019 15:11:13 +0000 (10:11 -0500)
Change-Id: I879cabdb7591fccfbe22d84cd64d4cdae66a9cc8
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
28 files changed:
netconf/aaa-authn-odl-plugin/src/main/resources/OSGI-INF/blueprint/aaa-authn-netconf.xml [moved from netconf/aaa-authn-odl-plugin/src/main/resources/org/opendaylight/blueprint/aaa-authn-netconf.xml with 100% similarity]
netconf/callhome-provider/src/main/resources/OSGI-INF/blueprint/callhome-topology.xml [moved from netconf/callhome-provider/src/main/resources/org/opendaylight/blueprint/callhome-topology.xml with 100% similarity]
netconf/mdsal-netconf-connector/src/main/resources/OSGI-INF/blueprint/mdsal-netconf-connector.xml [moved from netconf/mdsal-netconf-connector/src/main/resources/org/opendaylight/blueprint/mdsal-netconf-connector.xml with 100% similarity]
netconf/mdsal-netconf-impl/src/main/resources/OSGI-INF/blueprint/mdsal-netconf-impl.xml [moved from netconf/mdsal-netconf-impl/src/main/resources/org/opendaylight/blueprint/mdsal-netconf-impl.xml with 97% similarity]
netconf/mdsal-netconf-monitoring/src/main/resources/OSGI-INF/blueprint/mdsal-netconf-monitoring.xml [moved from netconf/mdsal-netconf-monitoring/src/main/resources/org/opendaylight/blueprint/mdsal-netconf-monitoring.xml with 100% similarity]
netconf/mdsal-netconf-notification/src/main/resources/OSGI-INF/blueprint/mdsal-netconf-notification.xml [moved from netconf/mdsal-netconf-notification/src/main/resources/org/opendaylight/blueprint/mdsal-netconf-notification.xml with 100% similarity]
netconf/mdsal-netconf-ssh/src/main/resources/OSGI-INF/blueprint/netconf-ssh.xml [moved from netconf/mdsal-netconf-ssh/src/main/resources/org/opendaylight/blueprint/netconf-ssh.xml with 100% similarity]
netconf/mdsal-netconf-tcp/src/main/resources/OSGI-INF/blueprint/netconf-tcp.xml [moved from netconf/mdsal-netconf-tcp/src/main/resources/org/opendaylight/blueprint/netconf-tcp.xml with 100% similarity]
netconf/mdsal-netconf-yang-library/src/main/resources/OSGI-INF/blueprint/mdsal-netconf-yang-library.xml [moved from netconf/mdsal-netconf-yang-library/src/main/resources/org/opendaylight/blueprint/mdsal-netconf-yang-library.xml with 100% similarity]
netconf/messagebus-netconf/src/main/resources/OSGI-INF/blueprint/messagebus-netconf.xml [moved from netconf/messagebus-netconf/src/main/resources/org/opendaylight/blueprint/messagebus-netconf.xml with 100% similarity]
netconf/netconf-client/src/main/resources/OSGI-INF/blueprint/netconf-client.xml [moved from netconf/netconf-client/src/main/resources/org/opendaylight/blueprint/netconf-client.xml with 100% similarity]
netconf/netconf-config/pom.xml
netconf/netconf-config/src/main/resources/OSGI-INF/blueprint/netconf-config.xml [moved from netconf/netconf-config/src/main/resources/org/opendaylight/blueprint/netconf-config.xml with 100% similarity]
netconf/netconf-console/src/main/resources/OSGI-INF/blueprint/netconf-command.xml [moved from netconf/netconf-console/src/main/resources/org/opendaylight/blueprint/netconf-command.xml with 100% similarity]
netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerDispatcherImpl.java
netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/ServerChannelInitializer.java [new file with mode: 0644]
netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/ConcurrentClientsTest.java
netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/NetconfDispatcherImplTest.java
netconf/netconf-topology-config/src/main/resources/OSGI-INF/blueprint/netconf-topology.xml [moved from netconf/netconf-topology-config/src/main/resources/org/opendaylight/blueprint/netconf-topology.xml with 100% similarity]
netconf/netconf-topology-singleton/src/main/resources/OSGI-INF/blueprint/netconf-topology-singleton.xml [moved from netconf/netconf-topology-singleton/src/main/resources/org/opendaylight/blueprint/netconf-topology-singleton.xml with 100% similarity]
netconf/netconf-util/src/main/resources/OSGI-INF/blueprint/netconf-util-blueprint.xml [moved from netconf/netconf-util/src/main/resources/org/opendaylight/blueprint/netconf-util-blueprint.xml with 91% similarity]
netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/NetconfDeviceSimulator.java
netconf/yanglib/src/main/resources/OSGI-INF/blueprint/yanglib.xml [moved from netconf/yanglib/src/main/resources/org/opendaylight/blueprint/yanglib.xml with 100% similarity]
restconf/restconf-nb-bierman02-auth/src/main/resources/OSGI-INF/blueprint/bierman02-auth.xml [moved from restconf/restconf-nb-bierman02-auth/src/main/resources/org/opendaylight/blueprint/bierman02-auth.xml with 100% similarity]
restconf/restconf-nb-bierman02-noauth/src/main/resources/OSGI-INF/blueprint/bierman02-noauth.xml [moved from restconf/restconf-nb-bierman02-noauth/src/main/resources/org/opendaylight/blueprint/bierman02-noauth.xml with 100% similarity]
restconf/restconf-nb-bierman02/src/main/resources/OSGI-INF/blueprint/restconf-config.xml [moved from restconf/restconf-nb-bierman02/src/main/resources/org/opendaylight/blueprint/restconf-config.xml with 100% similarity]
restconf/restconf-nb-rfc8040/src/main/resources/OSGI-INF/blueprint/restconf-bp.xml [moved from restconf/restconf-nb-rfc8040/src/main/resources/org/opendaylight/blueprint/restconf-bp.xml with 100% similarity]
restconf/sal-rest-docgen/src/main/resources/OSGI-INF/blueprint/blueprint.xml [moved from restconf/sal-rest-docgen/src/main/resources/org/opendaylight/blueprint/blueprint.xml with 100% similarity]

similarity index 97%
rename from netconf/mdsal-netconf-impl/src/main/resources/org/opendaylight/blueprint/mdsal-netconf-impl.xml
rename to netconf/mdsal-netconf-impl/src/main/resources/OSGI-INF/blueprint/mdsal-netconf-impl.xml
index 8f4169752828e5ee4838a5f358de768b18e71d22..999294f0fbc2154373b4292c132196e104513eb4 100755 (executable)
@@ -70,7 +70,7 @@
     </bean>
 
     <bean id="serverChannelInitializer"
-          class="org.opendaylight.netconf.impl.NetconfServerDispatcherImpl.ServerChannelInitializer">
+          class="org.opendaylight.netconf.impl.ServerChannelInitializer">
         <argument ref="netconfServerSessionNegotiatorFactory"/>
     </bean>
 
index 6f2643e92998b72bad3f5227df1d7a6095552b57..b67a2977fd14ccc05db860c809b58542dd0f5008 100644 (file)
   <version>1.6.0-SNAPSHOT</version>
   <description>Configuration files for netconf</description>
   <packaging>bundle</packaging>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Import-Package>
-              org.opendaylight.controller.config.threadpool.util,
-              org.opendaylight.controller.config.threadpool,
-              *
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
index 67fd0208f8f6c87e72d3bfc3fac1dc47973d826d..e740655069fdce168466f2f4c8d4f17b45b647d4 100644 (file)
@@ -7,16 +7,12 @@
  */
 package org.opendaylight.netconf.impl;
 
-import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.EventLoopGroup;
 import io.netty.channel.local.LocalAddress;
 import io.netty.channel.local.LocalServerChannel;
-import io.netty.util.concurrent.Promise;
 import java.net.InetSocketAddress;
 import org.opendaylight.netconf.api.NetconfServerDispatcher;
-import org.opendaylight.netconf.impl.util.DeserializerExceptionHandler;
-import org.opendaylight.netconf.nettyutil.AbstractChannelInitializer;
 import org.opendaylight.netconf.nettyutil.AbstractNetconfDispatcher;
 
 public class NetconfServerDispatcherImpl extends AbstractNetconfDispatcher<NetconfServerSession,
@@ -39,29 +35,4 @@ public class NetconfServerDispatcherImpl extends AbstractNetconfDispatcher<Netco
     public ChannelFuture createLocalServer(LocalAddress address) {
         return super.createServer(address, LocalServerChannel.class, initializer::initialize);
     }
-
-    public static class ServerChannelInitializer extends AbstractChannelInitializer<NetconfServerSession> {
-
-        public static final String DESERIALIZER_EX_HANDLER_KEY = "deserializerExHandler";
-
-        private final NetconfServerSessionNegotiatorFactory negotiatorFactory;
-
-
-        public ServerChannelInitializer(NetconfServerSessionNegotiatorFactory negotiatorFactory) {
-            this.negotiatorFactory = negotiatorFactory;
-
-        }
-
-        @Override
-        protected void initializeMessageDecoder(Channel ch) {
-            super.initializeMessageDecoder(ch);
-            ch.pipeline().addLast(DESERIALIZER_EX_HANDLER_KEY, new DeserializerExceptionHandler());
-        }
-
-        @Override
-        protected void initializeSessionNegotiator(Channel ch, Promise<NetconfServerSession> promise) {
-            ch.pipeline().addAfter(DESERIALIZER_EX_HANDLER_KEY, AbstractChannelInitializer.NETCONF_SESSION_NEGOTIATOR,
-                    negotiatorFactory.getSessionNegotiator(null, ch, promise));
-        }
-    }
 }
diff --git a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/ServerChannelInitializer.java b/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/ServerChannelInitializer.java
new file mode 100644 (file)
index 0000000..df39613
--- /dev/null
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2013 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.netconf.impl;
+
+import io.netty.channel.Channel;
+import io.netty.util.concurrent.Promise;
+import org.opendaylight.netconf.impl.util.DeserializerExceptionHandler;
+import org.opendaylight.netconf.nettyutil.AbstractChannelInitializer;
+
+public class ServerChannelInitializer extends AbstractChannelInitializer<NetconfServerSession> {
+
+    public static final String DESERIALIZER_EX_HANDLER_KEY = "deserializerExHandler";
+
+    private final NetconfServerSessionNegotiatorFactory negotiatorFactory;
+
+
+    public ServerChannelInitializer(NetconfServerSessionNegotiatorFactory negotiatorFactory) {
+        this.negotiatorFactory = negotiatorFactory;
+
+    }
+
+    @Override
+    protected void initializeMessageDecoder(Channel ch) {
+        super.initializeMessageDecoder(ch);
+        ch.pipeline().addLast(DESERIALIZER_EX_HANDLER_KEY, new DeserializerExceptionHandler());
+    }
+
+    @Override
+    protected void initializeSessionNegotiator(Channel ch, Promise<NetconfServerSession> promise) {
+        ch.pipeline().addAfter(DESERIALIZER_EX_HANDLER_KEY, AbstractChannelInitializer.NETCONF_SESSION_NEGOTIATOR,
+                negotiatorFactory.getSessionNegotiator(null, ch, promise));
+    }
+}
index bd9eb070d122b1734920dbfbdafda1a372243678..a1fac6bdc5eacd031714e33b10884c8cce817b0b 100644 (file)
@@ -171,8 +171,8 @@ public class ConcurrentClientsTest {
                 .setBaseCapabilities(serverCaps)
                 .build();
 
-        NetconfServerDispatcherImpl.ServerChannelInitializer serverChannelInitializer =
-                new NetconfServerDispatcherImpl.ServerChannelInitializer(serverNegotiatorFactory);
+        ServerChannelInitializer serverChannelInitializer =
+                new ServerChannelInitializer(serverNegotiatorFactory);
         final NetconfServerDispatcherImpl dispatch =
                 new NetconfServerDispatcherImpl(serverChannelInitializer, nettyGroup, nettyGroup);
 
index c24aaf8cd51a2b501650c456bcb3ba6162396094..2a1540d7d19862f029b6312c43b3aa76464df530 100644 (file)
@@ -43,8 +43,8 @@ public class NetconfDispatcherImplTest {
                         .setConnectionTimeoutMillis(5000)
                         .build();
 
-        NetconfServerDispatcherImpl.ServerChannelInitializer serverChannelInitializer =
-                new NetconfServerDispatcherImpl.ServerChannelInitializer(serverNegotiatorFactory);
+        ServerChannelInitializer serverChannelInitializer =
+                new ServerChannelInitializer(serverNegotiatorFactory);
 
         dispatch = new NetconfServerDispatcherImpl(
                 serverChannelInitializer, nettyGroup, nettyGroup);
similarity index 91%
rename from netconf/netconf-util/src/main/resources/org/opendaylight/blueprint/netconf-util-blueprint.xml
rename to netconf/netconf-util/src/main/resources/OSGI-INF/blueprint/netconf-util-blueprint.xml
index 99cab21ca1409d0b548a86c03e7e09a9d53469ad..3539c4e47b565cdd7d50466ca939208aeba8b7c7 100644 (file)
@@ -7,9 +7,7 @@
  and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-           xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
-           xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0"
-           odl:use-default-for-reference-types="true">
+           xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0">
 
     <!-- The PID "netconf" is used for backwards-compatibility even though it is
          an ambiguous name. -->
index 893582f4332b31672e20cee503187aed0f167559..321b202604968b3a65d4339c71c2475fd03a0a3f 100644 (file)
@@ -46,6 +46,7 @@ import org.opendaylight.netconf.api.capability.YangModuleCapability;
 import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService;
 import org.opendaylight.netconf.impl.NetconfServerDispatcherImpl;
 import org.opendaylight.netconf.impl.NetconfServerSessionNegotiatorFactory;
+import org.opendaylight.netconf.impl.ServerChannelInitializer;
 import org.opendaylight.netconf.impl.SessionIdProvider;
 import org.opendaylight.netconf.impl.osgi.AggregatedNetconfOperationServiceFactory;
 import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory;
@@ -128,8 +129,8 @@ public class NetconfDeviceSimulator implements Closeable {
                 configuration.getGenerateConfigsTimeout(),
                 monitoringService1, serverCapabilities);
 
-        final NetconfServerDispatcherImpl.ServerChannelInitializer serverChannelInitializer =
-            new NetconfServerDispatcherImpl.ServerChannelInitializer(serverNegotiatorFactory);
+        final ServerChannelInitializer serverChannelInitializer =
+            new ServerChannelInitializer(serverNegotiatorFactory);
         return new NetconfServerDispatcherImpl(serverChannelInitializer, nettyThreadgroup, nettyThreadgroup);
     }