diff --git a/.gitignore b/.gitignore index 6612be7..b25ef05 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,9 @@ bin/** *.swp *.swo +.idea/** +.idea + local.properties .classpath .settings/ diff --git a/onvif-java/pom.xml b/onvif-java/pom.xml index acc408b..3665c74 100644 --- a/onvif-java/pom.xml +++ b/onvif-java/pom.xml @@ -56,6 +56,36 @@ 3.4 + + + com.sun.activation + javax.activation + ${javax.activation.version} + + + + javax.xml.bind + jaxb-api + ${jaxb.api.version} + + + + com.sun.xml.bind + jaxb-core + ${jaxb.api.version} + + + + com.sun.xml.bind + jaxb-impl + ${jaxb.api.version} + + + + + + + \ No newline at end of file diff --git a/onvif-java/src/main/java/de/onvif/soap/OnvifDevice.java b/onvif-java/src/main/java/de/onvif/soap/OnvifDevice.java index 4e16119..6219302 100644 --- a/onvif-java/src/main/java/de/onvif/soap/OnvifDevice.java +++ b/onvif-java/src/main/java/de/onvif/soap/OnvifDevice.java @@ -117,7 +117,7 @@ public class OnvifDevice { Socket socket = null; try { - SocketAddress sockaddr = new InetSocketAddress(ip, new Integer(port)); + SocketAddress sockaddr = new InetSocketAddress(ip, Integer.parseInt(port)); socket = new Socket(); socket.connect(sockaddr, 5000); diff --git a/onvif-java/src/test/java/org/onvif/client/SimpleTest.java b/onvif-java/src/test/java/org/onvif/client/SimpleTest.java index 47bc266..314fc67 100644 --- a/onvif-java/src/test/java/org/onvif/client/SimpleTest.java +++ b/onvif-java/src/test/java/org/onvif/client/SimpleTest.java @@ -1,21 +1,22 @@ package org.onvif.client; +import de.onvif.soap.OnvifDevice; +import org.apache.commons.io.FileUtils; +import org.onvif.ver10.schema.MediaUri; +import org.onvif.ver10.schema.PTZPreset; +import org.onvif.ver20.ptz.wsdl.PTZ; + +import javax.xml.soap.SOAPException; import java.io.File; import java.io.FileInputStream; import java.net.ConnectException; import java.net.URL; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Properties; -import javax.xml.soap.SOAPException; - -import org.apache.commons.io.FileUtils; -import org.onvif.ver10.schema.MediaUri; - -import de.onvif.soap.OnvifDevice; - public class SimpleTest { // This test reads connection params from a properties file and take a @@ -25,7 +26,11 @@ public class SimpleTest { final Map onvifCamerasTokens = new HashMap<>(); final String propFileRelativePath = "src/test/resources/onvif.properties"; final Properties config = new Properties(); - config.load(new FileInputStream(new File(propFileRelativePath))); + final File f = new File(propFileRelativePath); + if (!f.exists()) throw new Exception("fnf: "+f.getAbsolutePath()); + javax.jws.WebService foo=null; + + config.load(new FileInputStream(f)); String firstCamId = null; for (Entry entry : config.entrySet()) { String deviceName = (String) entry.getKey(); @@ -60,6 +65,18 @@ public class SimpleTest { MediaUri sceenshotUri = firstCam.getMedia().getSnapshotUri(profileToken); File tempFile = File.createTempFile("tmp", ".jpg"); FileUtils.copyURLToFile(new URL(sceenshotUri.getUri()), tempFile); + System.out.println("snapshot: "+tempFile.getAbsolutePath()+" length:"+tempFile.length()); + + PTZ ptz = firstCam.getPtz(); + if (ptz!=null) + { + List presets = ptz.getPresets(profileToken); + if (presets!=null && !presets.isEmpty()) + { + System.out.println("Found "+presets.size()+" presets"); + } + } + } diff --git a/onvif-ws-client/pom.xml b/onvif-ws-client/pom.xml index 3d99d4b..024242c 100644 --- a/onvif-ws-client/pom.xml +++ b/onvif-ws-client/pom.xml @@ -24,6 +24,22 @@ cxf-rt-transports-http-jetty ${cxf.version} + + + + + javax.xml.ws + jaxws-api + 2.3.1 + + + + javax.jws + javax.jws-api + 1.1 + + + diff --git a/pom.xml b/pom.xml index 115b087..3417a6c 100644 --- a/pom.xml +++ b/pom.xml @@ -7,10 +7,18 @@ pom - 1.8 + 1.12 3.1.10 + + + 1.2.0 + 2.3.0 + + + + onvif-ws-client onvif-java @@ -29,4 +37,7 @@ + + + \ No newline at end of file