From 6b9c404710a4dba952fcf7d9bf5758e1cae57f20 Mon Sep 17 00:00:00 2001
From: Jason Mahdjoub <jason.mahdjoub@distri-mind.fr>
Date: Fri, 4 Feb 2022 15:36:56 +0100
Subject: [PATCH] Begin transition to forked cling

---
 MaDKitLanEdition/.idea/jarRepositories.xml    |  10 ++
 MaDKitLanEdition/.idea/vcs.xml                |   1 +
 MaDKitLanEdition/build.gradle                 |   2 +-
 MaDKitLanEdition/settings.gradle              |   4 +-
 .../kernel/network/LocalNetworkAgent.java     |   6 +-
 .../madkit/kernel/network/UpnpIGDAgent.java   | 102 +++++++++---------
 .../com/distrimind/madkit/kernel/build.txt    |   2 +-
 .../madkit/kernel/network/UPNPIDGTest.java    |   2 +-
 8 files changed, 71 insertions(+), 58 deletions(-)

diff --git a/MaDKitLanEdition/.idea/jarRepositories.xml b/MaDKitLanEdition/.idea/jarRepositories.xml
index 0dd50990..5846d218 100644
--- a/MaDKitLanEdition/.idea/jarRepositories.xml
+++ b/MaDKitLanEdition/.idea/jarRepositories.xml
@@ -21,5 +21,15 @@
       <option name="name" value="Maven Central" />
       <option name="url" value="https://repo.maven.apache.org/maven2" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenRepo" />
+      <option name="name" value="MavenRepo" />
+      <option name="url" value="https://repo.maven.apache.org/maven2/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/MaDKitLanEdition/.idea/vcs.xml b/MaDKitLanEdition/.idea/vcs.xml
index 569bd18b..6b3bfb98 100644
--- a/MaDKitLanEdition/.idea/vcs.xml
+++ b/MaDKitLanEdition/.idea/vcs.xml
@@ -3,6 +3,7 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
     <mapping directory="$PROJECT_DIR$/../../OOD" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/../../UpnpIGD" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/../../Utils" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/MaDKitLanEdition/build.gradle b/MaDKitLanEdition/build.gradle
index c4bb176b..6cef61e0 100644
--- a/MaDKitLanEdition/build.gradle
+++ b/MaDKitLanEdition/build.gradle
@@ -64,7 +64,7 @@ dependencies {
 	testImplementation 'org.testng:testng:7.5'
     //testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.hamcrest:hamcrest-core:2.2'
-    api(group:'com.distrimind.ood', name: 'OOD', version: '3.1.16-STABLE')
+    api(group:'com.distrimind.ood', name: 'OOD', version: '3.1.17-STABLE')
 
     //api project(':OOD')
     api project(':UPnPIGD')
diff --git a/MaDKitLanEdition/settings.gradle b/MaDKitLanEdition/settings.gradle
index cb3e75c3..effd2afc 100644
--- a/MaDKitLanEdition/settings.gradle
+++ b/MaDKitLanEdition/settings.gradle
@@ -19,4 +19,6 @@ rootProject.name = 'MaDKitLanEdition'
 /*include ':OOD'
 project(":OOD").projectDir = file("../../OOD/OOD")*/
 /*include ':Utils'
-project(":Utils").projectDir = file("../../Utils/Utils")*/
\ No newline at end of file
+project(":Utils").projectDir = file("../../Utils/Utils")*/
+include ':UPnPIGD'
+project(":UPnPIGD").projectDir = file("../../UpnpIGD")
\ No newline at end of file
diff --git a/MaDKitLanEdition/src/main/java/com/distrimind/madkit/kernel/network/LocalNetworkAgent.java b/MaDKitLanEdition/src/main/java/com/distrimind/madkit/kernel/network/LocalNetworkAgent.java
index f603ba4e..23237d99 100644
--- a/MaDKitLanEdition/src/main/java/com/distrimind/madkit/kernel/network/LocalNetworkAgent.java
+++ b/MaDKitLanEdition/src/main/java/com/distrimind/madkit/kernel/network/LocalNetworkAgent.java
@@ -49,9 +49,9 @@
 
 import com.distrimind.madkit.kernel.*;
 import com.distrimind.util.Reference;
-import org.fourthline.cling.support.model.Connection.Status;
-import org.fourthline.cling.support.model.Connection.StatusInfo;
-import org.fourthline.cling.support.model.PortMapping.Protocol;
+import com.distrimind.upnp_igd.support.model.Connection.Status;
+import com.distrimind.upnp_igd.support.model.Connection.StatusInfo;
+import com.distrimind.upnp_igd.support.model.PortMapping.Protocol;
 
 import com.distrimind.madkit.agr.LocalCommunity;
 import com.distrimind.madkit.kernel.network.UpnpIGDAgent.AskForRouterDetectionInformation;
diff --git a/MaDKitLanEdition/src/main/java/com/distrimind/madkit/kernel/network/UpnpIGDAgent.java b/MaDKitLanEdition/src/main/java/com/distrimind/madkit/kernel/network/UpnpIGDAgent.java
index 36f89ad0..e8826bd5 100644
--- a/MaDKitLanEdition/src/main/java/com/distrimind/madkit/kernel/network/UpnpIGDAgent.java
+++ b/MaDKitLanEdition/src/main/java/com/distrimind/madkit/kernel/network/UpnpIGDAgent.java
@@ -46,47 +46,47 @@
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
 import com.sun.net.httpserver.HttpServer;
-import org.fourthline.cling.UpnpService;
-import org.fourthline.cling.UpnpServiceImpl;
-import org.fourthline.cling.binding.xml.*;
-import org.fourthline.cling.controlpoint.ControlPoint;
-import org.fourthline.cling.controlpoint.ControlPointImpl;
-import org.fourthline.cling.model.Namespace;
-import org.fourthline.cling.model.UnsupportedDataException;
-import org.fourthline.cling.model.ValidationException;
-import org.fourthline.cling.model.action.ActionInvocation;
-import org.fourthline.cling.model.message.Connection;
-import org.fourthline.cling.model.message.*;
-import org.fourthline.cling.model.message.control.ActionRequestMessage;
-import org.fourthline.cling.model.message.control.ActionResponseMessage;
-import org.fourthline.cling.model.message.gena.OutgoingEventRequestMessage;
-import org.fourthline.cling.model.message.header.CallbackHeader;
-import org.fourthline.cling.model.message.header.HostHeader;
-import org.fourthline.cling.model.message.header.LocationHeader;
-import org.fourthline.cling.model.message.header.UpnpHeader;
-import org.fourthline.cling.model.meta.*;
-import org.fourthline.cling.model.profile.RemoteClientInfo;
-import org.fourthline.cling.model.types.*;
-import org.fourthline.cling.protocol.ProtocolFactory;
-import org.fourthline.cling.protocol.ProtocolFactoryImpl;
-import org.fourthline.cling.protocol.RetrieveRemoteDescriptors;
-import org.fourthline.cling.protocol.async.ReceivingNotification;
-import org.fourthline.cling.protocol.async.ReceivingSearchResponse;
-import org.fourthline.cling.registry.DefaultRegistryListener;
-import org.fourthline.cling.registry.RegistrationException;
-import org.fourthline.cling.registry.Registry;
-import org.fourthline.cling.registry.RegistryImpl;
-import org.fourthline.cling.support.igd.callback.GetExternalIP;
-import org.fourthline.cling.support.igd.callback.GetStatusInfo;
-import org.fourthline.cling.support.igd.callback.PortMappingAdd;
-import org.fourthline.cling.support.igd.callback.PortMappingDelete;
-import org.fourthline.cling.support.model.Connection.Status;
-import org.fourthline.cling.support.model.Connection.StatusInfo;
-import org.fourthline.cling.support.model.PortMapping;
-import org.fourthline.cling.support.model.PortMapping.Protocol;
-import org.fourthline.cling.transport.RouterException;
-import org.fourthline.cling.transport.impl.*;
-import org.fourthline.cling.transport.spi.*;
+import com.distrimind.upnp_igd.UpnpService;
+import com.distrimind.upnp_igd.UpnpServiceImpl;
+import com.distrimind.upnp_igd.binding.xml.*;
+import com.distrimind.upnp_igd.controlpoint.ControlPoint;
+import com.distrimind.upnp_igd.controlpoint.ControlPointImpl;
+import com.distrimind.upnp_igd.model.Namespace;
+import com.distrimind.upnp_igd.model.UnsupportedDataException;
+import com.distrimind.upnp_igd.model.ValidationException;
+import com.distrimind.upnp_igd.model.action.ActionInvocation;
+import com.distrimind.upnp_igd.model.message.Connection;
+import com.distrimind.upnp_igd.model.message.*;
+import com.distrimind.upnp_igd.model.message.control.ActionRequestMessage;
+import com.distrimind.upnp_igd.model.message.control.ActionResponseMessage;
+import com.distrimind.upnp_igd.model.message.gena.OutgoingEventRequestMessage;
+import com.distrimind.upnp_igd.model.message.header.CallbackHeader;
+import com.distrimind.upnp_igd.model.message.header.HostHeader;
+import com.distrimind.upnp_igd.model.message.header.LocationHeader;
+import com.distrimind.upnp_igd.model.message.header.UpnpHeader;
+import com.distrimind.upnp_igd.model.meta.*;
+import com.distrimind.upnp_igd.model.profile.RemoteClientInfo;
+import com.distrimind.upnp_igd.model.types.*;
+import com.distrimind.upnp_igd.protocol.ProtocolFactory;
+import com.distrimind.upnp_igd.protocol.ProtocolFactoryImpl;
+import com.distrimind.upnp_igd.protocol.RetrieveRemoteDescriptors;
+import com.distrimind.upnp_igd.protocol.async.ReceivingNotification;
+import com.distrimind.upnp_igd.protocol.async.ReceivingSearchResponse;
+import com.distrimind.upnp_igd.registry.DefaultRegistryListener;
+import com.distrimind.upnp_igd.registry.RegistrationException;
+import com.distrimind.upnp_igd.registry.Registry;
+import com.distrimind.upnp_igd.registry.RegistryImpl;
+import com.distrimind.upnp_igd.support.igd.callback.GetExternalIP;
+import com.distrimind.upnp_igd.support.igd.callback.GetStatusInfo;
+import com.distrimind.upnp_igd.support.igd.callback.PortMappingAdd;
+import com.distrimind.upnp_igd.support.igd.callback.PortMappingDelete;
+import com.distrimind.upnp_igd.support.model.Connection.Status;
+import com.distrimind.upnp_igd.support.model.Connection.StatusInfo;
+import com.distrimind.upnp_igd.support.model.PortMapping;
+import com.distrimind.upnp_igd.support.model.PortMapping.Protocol;
+import com.distrimind.upnp_igd.transport.RouterException;
+import com.distrimind.upnp_igd.transport.impl.*;
+import com.distrimind.upnp_igd.transport.spi.*;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.xml.sax.InputSource;
@@ -147,10 +147,10 @@
 class UpnpIGDAgent extends AgentFakeThread {
 
 	private static final String[] sub_loggers_names = { Registry.class.getName(), UpnpServiceImpl.class.getName(),
-			org.fourthline.cling.DefaultUpnpServiceConfiguration.class.getName(), DatagramProcessor.class.getName(),
+			com.distrimind.upnp_igd.DefaultUpnpServiceConfiguration.class.getName(), DatagramProcessor.class.getName(),
 			SOAPActionProcessor.class.getName(), GENAEventProcessor.class.getName(),
 			DeviceDescriptorBinder.class.getName(), ServiceDescriptorBinder.class.getName(), Namespace.class.getName(),
-			Registry.class.getName(), org.fourthline.cling.transport.Router.class.getName(),
+			Registry.class.getName(), com.distrimind.upnp_igd.transport.Router.class.getName(),
 			ControlPointImpl.class.getName(), ProtocolFactory.class.getName(), MulticastReceiver.class.getName(),
 			StreamServer.class.getName(), DatagramIO.class.getName() };
 
@@ -315,10 +315,10 @@ public void run() {
 
 	static class RequestHttpHandler implements HttpHandler {
 
-		private final org.fourthline.cling.transport.Router router;
+		private final com.distrimind.upnp_igd.transport.Router router;
 		private final NetworkAddressFactory networkAddressFactory;
 
-		RequestHttpHandler(org.fourthline.cling.transport.Router router, NetworkAddressFactory networkAddressFactory) {
+		RequestHttpHandler(com.distrimind.upnp_igd.transport.Router router, NetworkAddressFactory networkAddressFactory) {
 			this.router = router;
 			this.networkAddressFactory=networkAddressFactory;
 		}
@@ -1348,7 +1348,7 @@ synchronized public boolean notifyDiscoveryStart(final RemoteDevice device) {
 										return false;
 									}
 									RegistryImpl This=this;
-									for (final org.fourthline.cling.registry.RegistryListener listener : getListeners()) {
+									for (final com.distrimind.upnp_igd.registry.RegistryListener listener : getListeners()) {
 										getConfiguration().getRegistryListenerExecutor().execute(
 												() -> listener.remoteDeviceDiscoveryStarted(This, device)
 										);
@@ -2240,7 +2240,7 @@ protected IGDRouterLostMessage(InetAddress _concerned_router) {
 
 }
 
-class NONAndroidUpnpServiceConfiguration extends org.fourthline.cling.DefaultUpnpServiceConfiguration {
+class NONAndroidUpnpServiceConfiguration extends com.distrimind.upnp_igd.DefaultUpnpServiceConfiguration {
 	/**
 	 * Defaults to port '0', ephemeral.
 	 */
@@ -2308,7 +2308,7 @@ public StreamServer<?> createStreamServer(NetworkAddressFactory networkAddressFa
 				)
 		) {
 			@Override
-			synchronized public void init(InetAddress bindAddress, org.fourthline.cling.transport.Router router) throws InitializationException {
+			synchronized public void init(InetAddress bindAddress, com.distrimind.upnp_igd.transport.Router router) throws InitializationException {
 				try {
 					InetSocketAddress socketAddress = new InetSocketAddress(bindAddress, configuration.getListenPort());
 
@@ -2323,7 +2323,7 @@ synchronized public void init(InetAddress bindAddress, org.fourthline.cling.tran
 	}
 }
 
-class AndroidUpnpServiceConfiguration extends org.fourthline.cling.android.AndroidUpnpServiceConfiguration {
+class AndroidUpnpServiceConfiguration extends com.distrimind.upnp_igd.android.AndroidUpnpServiceConfiguration {
 	private final int multicastPort;
 	private NetworkAddressFactory networkAddressFactory=null;
 
@@ -2382,8 +2382,8 @@ public DatagramIO<?> createDatagramIO(NetworkAddressFactory networkAddressFactor
 
 }
 
-class DefaultUpnpServiceConfiguration implements org.fourthline.cling.UpnpServiceConfiguration {
-	private final org.fourthline.cling.UpnpServiceConfiguration usc;
+class DefaultUpnpServiceConfiguration implements com.distrimind.upnp_igd.UpnpServiceConfiguration {
+	private final com.distrimind.upnp_igd.UpnpServiceConfiguration usc;
 
 	/**
 	 * Defaults to port '0', ephemeral.
diff --git a/MaDKitLanEdition/src/main/resources/com/distrimind/madkit/kernel/build.txt b/MaDKitLanEdition/src/main/resources/com/distrimind/madkit/kernel/build.txt
index ddf1f2db..4ad949fb 100644
--- a/MaDKitLanEdition/src/main/resources/com/distrimind/madkit/kernel/build.txt
+++ b/MaDKitLanEdition/src/main/resources/com/distrimind/madkit/kernel/build.txt
@@ -1 +1 @@
-5789
+5864
diff --git a/MaDKitLanEdition/src/test/java/com/distrimind/madkit/kernel/network/UPNPIDGTest.java b/MaDKitLanEdition/src/test/java/com/distrimind/madkit/kernel/network/UPNPIDGTest.java
index 7f71defa..64d1762d 100644
--- a/MaDKitLanEdition/src/test/java/com/distrimind/madkit/kernel/network/UPNPIDGTest.java
+++ b/MaDKitLanEdition/src/test/java/com/distrimind/madkit/kernel/network/UPNPIDGTest.java
@@ -47,7 +47,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Level;
 
-import org.fourthline.cling.support.model.PortMapping.Protocol;
+import com.distrimind.upnp_igd.support.model.PortMapping.Protocol;
 import com.distrimind.madkit.agr.LocalCommunity;
 import com.distrimind.madkit.exceptions.SelfKillException;
 import com.distrimind.madkit.kernel.AbstractAgent;