Merge pull request #849 from wimjongman/master

jantje · web-flow · commit b194b1bd17f8 · 2017-10-19T01:22:41.000+02:00
#655 Update to latest jmdns
diff --git a/io.sloeber.application/.classpath b/io.sloeber.application/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-  	<classpathentry kind="src" path="src"/>
-  	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/io.sloeber.application/build.properties b/io.sloeber.application/build.properties
@@ -1,8 +1,9 @@
-source.. = src/
 output.. = bin/
 bin.includes = plugin.xml,\
                META-INF/,\
                .,\
                icons/,\
                splash.bmp,\
-               introContent.xml
+               introContent.xml,\
+               plugin_customization.ini
+source.. = src/
diff --git a/io.sloeber.application/plugin_customization.ini b/io.sloeber.application/plugin_customization.ini
@@ -0,0 +1,2 @@
+org.eclipse.ui/SHOW_PROGRESS_ON_STARTUP=true
+org.eclipse.ui.workbench/RUN_IN_BACKGROUND=false
diff --git a/io.sloeber.core/.classpath b/io.sloeber.core/.classpath
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry exported="true" kind="lib" path="lib/jsch-0.1.50.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jmdns-3.4.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jssc-2.8.0.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry exported="true" kind="lib" path="lib/jsch-0.1.50.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jssc-2.8.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jmdns-3.5.3.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/io.sloeber.core/.project b/io.sloeber.core/.project
@@ -3,10 +3,6 @@
 	<name>io.sloeber.core</name>
 	<comment></comment>
 	<projects>
-		<project>io.sloeber.core.common</project>
-		<project>io.sloeber.avreclipse.core</project>
-		<project>io.sloeber.avreclipse.core.managedbuildsystem</project>
-		<project>io.sloeber.avreclipse.ui</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/io.sloeber.core/META-INF/MANIFEST.MF b/io.sloeber.core/META-INF/MANIFEST.MF
@@ -6,21 +6,11 @@ Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: Jan Baeyens
 Bundle-ActivationPolicy: lazy
-Import-Package: io.sloeber.core.common,
- org.eclipse.cdt.core,
- org.eclipse.cdt.core.envvar,
- org.eclipse.cdt.core.language.settings.providers,
- org.eclipse.cdt.core.model,
- org.eclipse.cdt.core.settings.model,
- org.eclipse.cdt.core.settings.model.extension,
- org.eclipse.cdt.core.settings.model.util,
- org.eclipse.cdt.utils,
- org.eclipse.ui.dialogs
 Bundle-Activator: io.sloeber.core.Activator
 Bundle-ClassPath: .,
  lib/jsch-0.1.50.jar,
- lib/jmdns-3.4.1.jar,
- lib/jssc-2.8.0.jar
+ lib/jssc-2.8.0.jar,
+ lib/jmdns-3.5.3.jar
 Require-Bundle: org.eclipse.cdt.managedbuilder.core,
  org.eclipse.core.filesystem,
  org.eclipse.cdt.core,
@@ -35,6 +25,7 @@ Require-Bundle: org.eclipse.cdt.managedbuilder.core,
  org.eclipse.debug.ui,
  org.eclipse.ui.console,
  org.eclipse.ui.workbench,
- org.junit;bundle-version="4.12.0"
+ org.junit;bundle-version="4.12.0",
+ org.slf4j.api;bundle-version="1.7.2"
 Export-Package: io.sloeber.core.api,
  io.sloeber.core.common
diff --git a/io.sloeber.core/build.properties b/io.sloeber.core/build.properties
@@ -9,9 +9,10 @@ bin.includes = .,\
                config/,\
                OSGI-INF/,\
                src/io/sloeber/core/templates/sketch.ino,\
-               lib/
-jars.compile.order = .,\
-                     library.jar
+               lib/jmdns-3.5.3.jar,\
+               lib/jsch-0.1.50.jar,\
+               lib/jssc-2.8.0.jar
+jars.compile.order = .
 jars.extra.classpath = lib/jsch-0.1.50.jar,\
-                       lib/jmdns-3.4.1.jar
-src.includes = bin/
+                       lib/jmdns-3.5.3.jar,\
+                       lib/jssc-2.8.0.jar
diff --git a/io.sloeber.core/lib/commons-io-2.5.jar b/io.sloeber.core/lib/commons-io-2.5.jar
diff --git a/io.sloeber.core/lib/commons-lang3-3.6.jar b/io.sloeber.core/lib/commons-lang3-3.6.jar
diff --git a/io.sloeber.core/lib/jmdns-3.4.1.jar b/io.sloeber.core/lib/jmdns-3.4.1.jar
diff --git a/io.sloeber.core/lib/jmdns-3.5.3.jar b/io.sloeber.core/lib/jmdns-3.5.3.jar
diff --git a/io.sloeber.core/src/cc/arduino/packages/discoverers/ArduinoDNSTaskStarter.java b/io.sloeber.core/src/cc/arduino/packages/discoverers/ArduinoDNSTaskStarter.java
@@ -1,5 +1,6 @@
 package cc.arduino.packages.discoverers;
 
+import java.net.InetAddress;
 import java.util.Timer;
 
 import javax.jmdns.impl.DNSIncoming;
@@ -87,10 +88,10 @@ public void startServiceResolver(String type) {
 		delegate.startServiceResolver(type);
 	    }
 
-	    @Override
-	    public void startResponder(DNSIncoming in, int port) {
-		delegate.startResponder(in, port);
-	    }
+		@Override
+		public void startResponder(DNSIncoming pIncoming, InetAddress pAddress, int pPort) {
+			delegate.startResponder(pIncoming,pAddress, pPort);
+		}
 	};
     }
 }
diff --git a/io.sloeber.product/.classpath b/io.sloeber.product/.classpath
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/io.sloeber.product/plugin_customization.ini b/io.sloeber.product/plugin_customization.ini
@@ -1,2 +1,2 @@
-org.eclipse.ui/SHOW_PROGRESS_ON_STARTUP = true
-
+org.eclipse.ui/SHOW_PROGRESS_ON_STARTUP=true
+/instance/org.eclipse.ui.workbench/RUN_IN_BACKGROUND=false
diff --git a/io.sloeber.tests/.gitignore b/io.sloeber.tests/.gitignore
@@ -1 +1,2 @@
 /target/
+/bin/

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+org.eclipse.ui/SHOW_PROGRESS_ON_STARTUP=true`
	`2`	`+org.eclipse.ui.workbench/RUN_IN_BACKGROUND=false`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package cc.arduino.packages.discoverers;`
`2`	`2`
	`3`	`+import java.net.InetAddress;`
`3`	`4`	`import java.util.Timer;`
`4`	`5`
`5`	`6`	`import javax.jmdns.impl.DNSIncoming;`
`@@ -87,10 +88,10 @@ public void startServiceResolver(String type) {`
`87`	`88`	`delegate.startServiceResolver(type);`
`88`	`89`	`}`
`89`	`90`
`90`		`- @Override`
`91`		`- public void startResponder(DNSIncoming in, int port) {`
`92`		`- delegate.startResponder(in, port);`
`93`		`- }`
	`91`	`+ @Override`
	`92`	`+ public void startResponder(DNSIncoming pIncoming, InetAddress pAddress, int pPort) {`
	`93`	`+ delegate.startResponder(pIncoming,pAddress, pPort);`
	`94`	`+ }`
`94`	`95`	`};`
`95`	`96`	`}`
`96`	`97`	`}`