In order to use the html4j technology in Jersey 2.6 we need to run on JDK6, as Jersey still requires JDK6
1.1 --- a/ko-osgi-test/pom.xml Mon Jan 13 09:29:34 2014 +0100
1.2 +++ b/ko-osgi-test/pom.xml Mon Jan 20 14:09:43 2014 +0100
1.3 @@ -24,8 +24,8 @@
1.4 <artifactId>maven-compiler-plugin</artifactId>
1.5 <version>2.3.2</version>
1.6 <configuration>
1.7 - <source>1.7</source>
1.8 - <target>1.7</target>
1.9 + <source>1.6</source>
1.10 + <target>1.6 </target>
1.11 </configuration>
1.12 </plugin>
1.13 <plugin>
2.1 --- a/ko-osgi-test/src/test/java/org/netbeans/html/ko/osgi/test/KOFx.java Mon Jan 13 09:29:34 2014 +0100
2.2 +++ b/ko-osgi-test/src/test/java/org/netbeans/html/ko/osgi/test/KOFx.java Mon Jan 20 14:09:43 2014 +0100
2.3 @@ -43,8 +43,11 @@
2.4 package org.netbeans.html.ko.osgi.test;
2.5
2.6 import java.io.Closeable;
2.7 +import java.io.IOException;
2.8 import java.lang.reflect.InvocationTargetException;
2.9 import java.lang.reflect.Method;
2.10 +import java.util.logging.Level;
2.11 +import java.util.logging.Logger;
2.12 import javafx.application.Platform;
2.13 import org.apidesign.html.boot.spi.Fn;
2.14 import org.testng.ITest;
2.15 @@ -88,7 +91,9 @@
2.16 @Override
2.17 public synchronized void run() {
2.18 boolean notify = true;
2.19 - try (Closeable a = KnockoutEquinoxIT.activateInOSGi(p)) {
2.20 + Closeable a = null;
2.21 + try {
2.22 + a = KnockoutEquinoxIT.activateInOSGi(p);
2.23 if (inst == null) {
2.24 inst = m.getDeclaringClass().newInstance();
2.25 }
2.26 @@ -112,6 +117,11 @@
2.27 if (notify) {
2.28 notifyAll();
2.29 }
2.30 + try {
2.31 + if (a != null) a.close();
2.32 + } catch (IOException ex) {
2.33 + throw new IllegalStateException(ex);
2.34 + }
2.35 }
2.36 }
2.37
3.1 --- a/ko-osgi-test/src/test/java/org/netbeans/html/ko/osgi/test/KnockoutEquinoxIT.java Mon Jan 13 09:29:34 2014 +0100
3.2 +++ b/ko-osgi-test/src/test/java/org/netbeans/html/ko/osgi/test/KnockoutEquinoxIT.java Mon Jan 20 14:09:43 2014 +0100
3.3 @@ -90,7 +90,7 @@
3.4 dir = new File(target, "osgi");
3.5 dir.mkdirs();
3.6
3.7 - Map<String,String> config = new HashMap<>();
3.8 + Map<String,String> config = new HashMap<String, String>();
3.9 config.put(Constants.FRAMEWORK_STORAGE, dir.getPath());
3.10 config.put(Constants.FRAMEWORK_STORAGE_CLEAN, "true");
3.11 config.put(Constants.FRAMEWORK_SYSTEMPACKAGES_EXTRA, "sun.misc,"
4.1 --- a/ko-ws-tyrus/pom.xml Mon Jan 13 09:29:34 2014 +0100
4.2 +++ b/ko-ws-tyrus/pom.xml Mon Jan 20 14:09:43 2014 +0100
4.3 @@ -19,8 +19,8 @@
4.4 <artifactId>maven-compiler-plugin</artifactId>
4.5 <version>2.3.2</version>
4.6 <configuration>
4.7 - <source>1.7</source>
4.8 - <target>1.7</target>
4.9 + <source>1.6</source>
4.10 + <target>1.6</target>
4.11 </configuration>
4.12 </plugin>
4.13 <plugin>
5.1 --- a/ko-ws-tyrus/src/main/java/org/netbeans/html/wstyrus/TyrusContext.java Mon Jan 13 09:29:34 2014 +0100
5.2 +++ b/ko-ws-tyrus/src/main/java/org/netbeans/html/wstyrus/TyrusContext.java Mon Jan 20 14:09:43 2014 +0100
5.3 @@ -59,7 +59,6 @@
5.4 import net.java.html.json.OnReceive;
5.5 import org.apidesign.html.context.spi.Contexts;
5.6 import org.apidesign.html.json.spi.JSONCall;
5.7 -import org.apidesign.html.json.spi.Technology;
5.8 import org.apidesign.html.json.spi.Transfer;
5.9 import org.apidesign.html.json.spi.WSTransfer;
5.10 import org.netbeans.html.wstyrus.TyrusContext.Comm;
5.11 @@ -149,7 +148,7 @@
5.12 try {
5.13 final WebSocketContainer c = ContainerProvider.getWebSocketContainer();
5.14 c.connectToServer(Comm.this, url);
5.15 - } catch (DeploymentException | IOException ex) {
5.16 + } catch (Exception ex) {
5.17 wasAnError(ex);
5.18 }
5.19 }
6.1 --- a/ko4j/pom.xml Mon Jan 13 09:29:34 2014 +0100
6.2 +++ b/ko4j/pom.xml Mon Jan 20 14:09:43 2014 +0100
6.3 @@ -34,8 +34,8 @@
6.4 <artifactId>maven-compiler-plugin</artifactId>
6.5 <version>2.3.2</version>
6.6 <configuration>
6.7 - <source>1.7</source>
6.8 - <target>1.7</target>
6.9 + <source>1.6</source>
6.10 + <target>1.6</target>
6.11 </configuration>
6.12 </plugin>
6.13 </plugins>
7.1 --- a/ko4j/src/test/java/org/netbeans/html/ko4j/KOFx.java Mon Jan 13 09:29:34 2014 +0100
7.2 +++ b/ko4j/src/test/java/org/netbeans/html/ko4j/KOFx.java Mon Jan 20 14:09:43 2014 +0100
7.3 @@ -43,8 +43,11 @@
7.4 package org.netbeans.html.ko4j;
7.5
7.6 import java.io.Closeable;
7.7 +import java.io.IOException;
7.8 import java.lang.reflect.InvocationTargetException;
7.9 import java.lang.reflect.Method;
7.10 +import java.util.logging.Level;
7.11 +import java.util.logging.Logger;
7.12 import javafx.application.Platform;
7.13 import org.apidesign.html.boot.spi.Fn;
7.14 import org.testng.ITest;
7.15 @@ -88,7 +91,8 @@
7.16 @Override
7.17 public synchronized void run() {
7.18 boolean notify = true;
7.19 - try (Closeable a = Fn.activate(p)) {
7.20 + Closeable a = Fn.activate(p);
7.21 + try {
7.22 if (inst == null) {
7.23 inst = m.getDeclaringClass().newInstance();
7.24 }
7.25 @@ -112,6 +116,11 @@
7.26 if (notify) {
7.27 notifyAll();
7.28 }
7.29 + try {
7.30 + a.close();
7.31 + } catch (IOException ex) {
7.32 + throw new IllegalStateException(ex);
7.33 + }
7.34 }
7.35 }
7.36