Index: trunk/src/nbproject/jax-ws.xml
===================================================================
--- trunk/src/nbproject/jax-ws.xml (revision 0)
+++ trunk/src/nbproject/jax-ws.xml (revision 7)
@@ -0,0 +1,7 @@
+
+
+
+
+
+ false
+
Index: trunk/src/nbproject/ant-deploy.xml
===================================================================
--- trunk/src/nbproject/ant-deploy.xml (revision 0)
+++ trunk/src/nbproject/ant-deploy.xml (revision 7)
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: trunk/src/nbproject/build-impl.xml
===================================================================
--- trunk/src/nbproject/build-impl.xml (revision 0)
+++ trunk/src/nbproject/build-impl.xml (revision 7)
@@ -0,0 +1,984 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must set src.dir
+ Must set test.src.dir
+ Must set build.dir
+ Must set build.web.dir
+ Must set build.generated.dir
+ Must set dist.dir
+ Must set build.classes.dir
+ Must set dist.javadoc.dir
+ Must set build.test.classes.dir
+ Must set build.test.results.dir
+ Must set build.classes.excludes
+ Must set dist.war
+
+
+
+
+
+
+
+
+
+The Java EE server classpath is not correctly set up - server home directory is missing.
+Either open the project in the IDE and assign the server or setup the server classpath manually.
+For example like this:
+ ant -Dj2ee.server.home=<app_server_installation_directory>
+
+
+The Java EE server classpath is not correctly set up. Your active server type is ${j2ee.server.type}.
+Either open the project in the IDE and assign the server or setup the server classpath manually.
+For example like this:
+ ant -Duser.properties.file=<path_to_property_file> (where you put the property "j2ee.platform.classpath" in a .properties file)
+or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties file is used)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must set javac.includes
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+The libs.CopyLibs.classpath property is not set up.
+This property must point to
+org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part
+of NetBeans IDE installation and is usually located at
+<netbeans_installation>/java<version>/ant/extra folder.
+Either open the project in the IDE and make sure CopyLibs library
+exists or setup the property manually. For example like this:
+ ant -Dlibs.CopyLibs.classpath=a/path/to/org-netbeans-modules-java-j2seproject-copylibstask.jar
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must select some files in the IDE or set javac.includes
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must select some files in the IDE or set javac.jsp.includes
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must select a file in the IDE or set jsp.includes
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable.
+
+
+ Launching ${browse.url}
+
+
+
+
+
+ Must select one file in the IDE or set run.class
+
+
+
+ Must select one file in the IDE or set run.class
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must select one file in the IDE or set debug.class
+
+
+
+
+
+
+
+
+
+
+
+ Must select one file in the IDE or set debug.class
+
+
+
+
+ Must set fix.includes
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Must select some files in the IDE or set javac.includes
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Some tests failed; see details above.
+
+
+
+
+
+
+
+
+ Must select some files in the IDE or set test.includes
+
+
+
+ Some tests failed; see details above.
+
+
+
+
+ Must select one file in the IDE or set test.class
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: trunk/src/nbproject/project.properties
===================================================================
--- trunk/src/nbproject/project.properties (revision 0)
+++ trunk/src/nbproject/project.properties (revision 7)
@@ -0,0 +1,98 @@
+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=true
+annotation.processing.processors.list=
+annotation.processing.run.all.processors=true
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+build.classes.dir=${build.web.dir}/WEB-INF/classes
+build.classes.excludes=**/*.java,**/*.form
+build.dir=build
+build.generated.dir=${build.dir}/generated
+build.generated.sources.dir=${build.dir}/generated-sources
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+build.web.dir=${build.dir}/web
+build.web.excludes=${build.classes.excludes}
+client.urlPart=
+compile.jsps=false
+conf.dir=${source.root}/conf
+debug.classpath=${build.classes.dir}:${javac.classpath}
+debug.test.classpath=\
+ ${run.test.classpath}
+display.browser=true
+dist.dir=dist
+dist.ear.war=${dist.dir}/${war.ear.name}
+dist.javadoc.dir=${dist.dir}/javadoc
+dist.war=${dist.dir}/${war.name}
+endorsed.classpath=
+excludes=
+file.reference.commons-collections-3.2.1.jar=/home/cime/Documents/commons-collections-3.2.1/commons-collections-3.2.1.jar
+file.reference.commons-configuration-1.6.jar=/home/cime/Documents/commons-configuration-1.6/commons-configuration-1.6.jar
+file.reference.commons-lang-2.5.jar=/home/cime/Documents/commons-lang-2.5/commons-lang-2.5.jar
+file.reference.gson-1.3.jar=lib/gson-1.3.jar
+file.reference.gson-1.3.jar-1=/home/cime/Documents/gson-1.3.jar
+file.reference.JPam-1.1.jar=/home/cime/Documents/JPam-1.1/JPam-1.1.jar
+file.reference.mysql-connector-java-5.1.6-bin.jar=/home/cime/netbeans-6.9/ide/modules/ext/mysql-connector-java-5.1.6-bin.jar
+includes=**
+j2ee.deploy.on.save=true
+j2ee.platform=1.5
+j2ee.platform.classpath=${j2ee.server.home}/lib/jasper-el.jar:${j2ee.server.home}/lib/catalina-ha.jar:${j2ee.server.home}/lib/el-api.jar:${j2ee.server.home}/lib/tomcat-coyote.jar:${j2ee.server.home}/lib/jasper.jar:${j2ee.server.home}/lib/tomcat-dbcp.jar:${j2ee.server.home}/lib/tomcat-i18n-fr.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/catalina-ant.jar:${j2ee.server.home}/lib/tomcat-i18n-es.jar:${j2ee.server.home}/lib/catalina-tribes.jar:${j2ee.server.home}/lib/tomcat-i18n-ja.jar:${j2ee.server.home}/lib/jsp-api.jar:${j2ee.server.home}/lib/annotations-api.jar:${j2ee.server.home}/lib/servlet-api.jar:${j2ee.server.home}/bin/tomcat-juli.jar
+j2ee.server.type=Tomcat60
+jar.compress=false
+javac.classpath=\
+ ${libs.hibernate-support.classpath}:\
+ ${libs.ejb3-persistence.classpath}:\
+ ${file.reference.mysql-connector-java-5.1.6-bin.jar}:\
+ ${libs.metro.classpath}:\
+ ${file.reference.gson-1.3.jar}:\
+ ${libs.JavaComm.classpath}:\
+ ${file.reference.JPam-1.1.jar}:\
+ ${file.reference.commons-configuration-1.6.jar}:\
+ ${file.reference.commons-lang-2.5.jar}:\
+ ${file.reference.commons-collections-3.2.1.jar}:\
+ ${file.reference.gson-1.3.jar-1}
+# Space-separated list of extra javac options
+javac.compilerargs=
+javac.debug=true
+javac.deprecation=false
+javac.processorpath=\
+ ${javac.classpath}
+javac.source=1.5
+javac.target=1.5
+javac.test.classpath=\
+ ${javac.classpath}:\
+ ${build.classes.dir}:\
+ ${libs.junit.classpath}:\
+ ${libs.junit_4.classpath}
+javac.test.processorpath=\
+ ${javac.test.classpath}
+javadoc.additionalparam=
+javadoc.author=false
+javadoc.encoding=${source.encoding}
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.preview=true
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=
+lib.dir=${web.docbase.dir}/WEB-INF/lib
+persistence.xml.dir=${conf.dir}
+platform.active=default_platform
+resource.dir=setup
+run.test.classpath=\
+ ${javac.test.classpath}:\
+ ${build.test.classes.dir}
+# Space-separated list of JVM arguments used when running a class with a main method or a unit test
+# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value):
+runmain.jvmargs=
+source.encoding=UTF-8
+source.root=src
+src.dir=${source.root}/java
+test.src.dir=test
+war.content.additional=
+war.ear.name=LIDAR_SOAP.war
+war.name=LIDAR_SOAP.war
+web.docbase.dir=web
+webinf.dir=web/WEB-INF
Index: trunk/src/nbproject/project.xml
===================================================================
--- trunk/src/nbproject/project.xml (revision 0)
+++ trunk/src/nbproject/project.xml (revision 7)
@@ -0,0 +1,64 @@
+
+
+ org.netbeans.modules.web.project
+
+
+
+ LIDAR SOAP
+ 1.6.5
+
+
+ ${libs.hibernate-support.classpath}
+ WEB-INF/lib
+
+
+ ${libs.ejb3-persistence.classpath}
+ WEB-INF/lib
+
+
+ ${file.reference.mysql-connector-java-5.1.6-bin.jar}
+ WEB-INF/lib
+
+
+ ${libs.metro.classpath}
+ WEB-INF/lib
+
+
+ ${file.reference.gson-1.3.jar}
+ WEB-INF/lib
+
+
+ ${libs.JavaComm.classpath}
+ WEB-INF/lib
+
+
+ ${file.reference.JPam-1.1.jar}
+ WEB-INF/lib
+
+
+ ${file.reference.commons-configuration-1.6.jar}
+ WEB-INF/lib
+
+
+ ${file.reference.commons-lang-2.5.jar}
+ WEB-INF/lib
+
+
+ ${file.reference.commons-collections-3.2.1.jar}
+ WEB-INF/lib
+
+
+ ${file.reference.gson-1.3.jar-1}
+ WEB-INF/lib
+
+
+
+
+
+
+
+
+
+
+
+
Index: trunk/src/nbproject/genfiles.properties
===================================================================
--- trunk/src/nbproject/genfiles.properties (revision 0)
+++ trunk/src/nbproject/genfiles.properties (revision 7)
@@ -0,0 +1,9 @@
+build.xml.data.CRC32=8d3b9fa6
+build.xml.script.CRC32=6ef1775d
+build.xml.stylesheet.CRC32=651128d4@1.24.1.1
+# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
+# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
+nbproject/build-impl.xml.data.CRC32=8d3b9fa6
+nbproject/build-impl.xml.script.CRC32=6370b77c
+nbproject/build-impl.xml.stylesheet.CRC32=8335d67d@1.24.1.1
+nbproject/jaxws-build.xml.stylesheet.CRC32=b0a0073f
Index: trunk/src/nbproject
===================================================================
--- trunk/src/nbproject (revision 0)
+++ trunk/src/nbproject (revision 7)
Property changes on: trunk/src/nbproject
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+private
Index: trunk/src/src/conf/MANIFEST.MF
===================================================================
--- trunk/src/src/conf/MANIFEST.MF (revision 0)
+++ trunk/src/src/conf/MANIFEST.MF (revision 7)
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+
Index: trunk/src/src/java/hibernate.cfg.xml
===================================================================
--- trunk/src/src/java/hibernate.cfg.xml (revision 0)
+++ trunk/src/src/java/hibernate.cfg.xml (revision 7)
@@ -0,0 +1,17 @@
+
+
+
+
+ org.hibernate.dialect.MySQLDialect
+ com.mysql.jdbc.Driver
+ jdbc:mysql://localhost/lidar
+ root
+ mwd40
+
+ thread
+
+
+
+
+
+
Index: trunk/src/src/java/hibernate.hbm.xml
===================================================================
--- trunk/src/src/java/hibernate.hbm.xml (revision 0)
+++ trunk/src/src/java/hibernate.hbm.xml (revision 7)
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: trunk/src/src/java/org/lidar/Util.java
===================================================================
--- trunk/src/src/java/org/lidar/Util.java (revision 0)
+++ trunk/src/src/java/org/lidar/Util.java (revision 7)
@@ -0,0 +1,57 @@
+package org.lidar;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * Util
+ * @author Andrej Cimpersek
+ */
+public class Util {
+ public static byte CalcXOR(byte[] data, int offset, int count)
+ {
+ byte x = data[offset];
+ for (int i = 1; i < count; i++) x ^= data[offset + i];
+ return x;
+ }
+
+ private static byte CalcXOR(String data)
+ {
+ byte x = (byte)(data.charAt(0));
+ for (int i = 1; i < data.length(); i++) x ^= (byte)(data.charAt(i));
+ return x;
+ }
+
+ public static byte[] GetBytesFromFile(File file) throws IOException {
+ InputStream is = new FileInputStream(file);
+
+ // Get the size of the file
+ long length = file.length();
+
+ if (length > Integer.MAX_VALUE) {
+ throw new IOException("File is too large!");
+ }
+
+ // Create the byte array to hold the data
+ byte[] bytes = new byte[(int)length];
+
+ // Read in the bytes
+ int offset = 0;
+ int numRead = 0;
+ while (offset < bytes.length
+ && (numRead=is.read(bytes, offset, bytes.length-offset)) >= 0) {
+ offset += numRead;
+ }
+
+ // Ensure all the bytes have been read in
+ if (offset < bytes.length) {
+ throw new IOException("Could not completely read file "+file.getName());
+ }
+
+ // Close the input stream and return bytes
+ is.close();
+ return bytes;
+ }
+}
Index: trunk/src/src/java/org/lidar/HibernateUtil.java
===================================================================
--- trunk/src/src/java/org/lidar/HibernateUtil.java (revision 0)
+++ trunk/src/src/java/org/lidar/HibernateUtil.java (revision 7)
@@ -0,0 +1,27 @@
+package org.lidar;
+
+import org.hibernate.SessionFactory;
+import org.hibernate.cfg.AnnotationConfiguration;
+
+/**
+ *
+ * @author Andrej Cimpersek
+ */
+
+public class HibernateUtil {
+ private static final SessionFactory sessionFactory;
+ static {
+ try {
+ // Create the SessionFactory from hibernate.cfg.xml
+ sessionFactory = new AnnotationConfiguration().configure().buildSessionFactory();
+ } catch (Throwable ex) {
+ // Make sure you log the exception, as it might be swallowed
+ System.err.println("Initial SessionFactory creation failed." + ex);
+ throw new ExceptionInInitializerError(ex);
+ }
+ }
+
+ public static SessionFactory getSessionFactory() {
+ return sessionFactory;
+ }
+}
\ No newline at end of file
Index: trunk/src/src/java/org/lidar/Serial.java
===================================================================
--- trunk/src/src/java/org/lidar/Serial.java (revision 0)
+++ trunk/src/src/java/org/lidar/Serial.java (revision 7)
@@ -0,0 +1,162 @@
+package org.lidar;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+import javax.comm.*;
+import java.util.*;
+import org.apache.commons.configuration.XMLConfiguration;
+import org.lidar.api.Management;
+
+/**
+ * Serial port communication
+ * @author Andrej Cimpersek
+ */
+public class Serial {
+ private boolean isOpened = false;
+ private String deviceName;
+ private String portName;
+ private Enumeration portIdentifiers;
+ private CommPortIdentifier portId;
+ private SerialPort port;
+ protected InputStream inputStream;
+ protected OutputStream outputStream;
+ private int baudRate, dataBits, stopBits, parity;
+ private XMLConfiguration configuration;
+
+ public Serial(String deviceName){
+ configuration = Config.getConfiguration();
+ this.portName = configuration.getString(String.format("devices.%s.port", deviceName));
+ this.baudRate = configuration.getInt(String.format("devices.%s.baudRate", deviceName));
+ this.dataBits = configuration.getInt(String.format("devices.%s.dataBits", deviceName));
+ this.stopBits = configuration.getInt(String.format("devices.%s.stopBits", deviceName));
+ this.parity = configuration.getInt(String.format("devices.%s.parity", deviceName));
+ }
+
+ /**
+ * Check each port identifier if
+ * (a) it indicates a serial (not a parallel) port, and
+ * (b) matches the desired name.
+ * @return boolean
+ */
+ protected boolean identfy(){
+ this.portIdentifiers = CommPortIdentifier.getPortIdentifiers();
+ this.portId = null; // will be set if port found
+ while (portIdentifiers.hasMoreElements())
+ {
+ CommPortIdentifier pid = (CommPortIdentifier)portIdentifiers.nextElement();
+ if(pid.getPortType() == CommPortIdentifier.PORT_SERIAL && pid.getName().equals(this.portName)){
+ this.portId = pid;
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Destructor - close port
+ */
+ @Override()
+ protected void finalize() throws Throwable{
+ closePort();
+ }
+
+ public boolean acquirePort(){
+ if(this.portId == null) return false;
+ // Use port identifier for acquiring the port
+ try {
+ this.port = (SerialPort)this.portId.open(
+ this.deviceName, // Name of the application asking for the port
+ 10000 // Wait max. 10 sec. to acquire port
+ );
+ } catch(PortInUseException e) {
+ return false;
+ }
+
+ return true;
+ }
+
+ public boolean openPort(){
+ if(!acquirePort()) return false;
+ closePort();
+ try {
+ this.port.setSerialPortParams(this.baudRate, this.dataBits, this.stopBits, this.parity);
+ this.port.removeEventListener();
+ this.port.addEventListener(new SerialPortEventListener() {
+ public void serialEvent(SerialPortEvent event){
+ switch(event.getEventType()) {
+ case SerialPortEvent.OUTPUT_BUFFER_EMPTY:
+ onOutputBufferEmpty(event);
+ break;
+
+ case SerialPortEvent.DATA_AVAILABLE:
+ onDataAvailable(event);
+ break;
+ }
+ }
+ });
+ this.inputStream = this.port.getInputStream();
+ this.outputStream = this.port.getOutputStream();
+ this.isOpened = true;
+ } catch (Exception e) {
+ this.isOpened = false;
+ } finally {
+ return this.isOpened;
+ }
+ }
+
+ public void closePort(){
+ if(this.port == null) return;
+ try {
+ this.inputStream.close();
+ this.outputStream.close();
+ this.port.close();
+ } catch (Exception e) {
+ } finally {
+ this.isOpened = false;
+ }
+ }
+
+ /**
+ * Write shortcut for string
+ */
+ public boolean sendCommand(String lockToken, String string){
+ return sendCommand(lockToken, string.getBytes());
+ }
+
+ /**
+ * Write shortcut
+ * @param bytes
+ * @return boolean
+ */
+ public boolean sendCommand(String lockToken, byte[] bytes){
+ // TODO: worker, ki odklene po X času brez dostopa
+ if(!Management.locked || lockToken != Management.lockToken) return false;
+ Management.lockAccess = new Date();
+
+ try {
+ outputStream.write(bytes);
+ } catch (Exception e) {
+ return false;
+ }
+
+ return true;
+ }
+
+ /**
+ * Handle output buffer empty events.
+ * NOTE: The reception of this event is optional and not
+ * guaranteed by the API specification.
+ * @param event The output buffer empty event
+ */
+ protected void onOutputBufferEmpty(SerialPortEvent event){
+ //TODO: implement
+ }
+
+ /**
+ * Handle data available events.
+ * @param event The data available event
+ */
+ protected void onDataAvailable(SerialPortEvent event){
+ //TODO: implement
+ }
+}
Index: trunk/src/src/java/org/lidar/auth/LDAPAdapter.java
===================================================================
--- trunk/src/src/java/org/lidar/auth/LDAPAdapter.java (revision 0)
+++ trunk/src/src/java/org/lidar/auth/LDAPAdapter.java (revision 7)
@@ -0,0 +1,36 @@
+package org.lidar.auth;
+
+import java.util.Hashtable;
+import javax.naming.Context;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.InitialDirContext;
+
+public class LDAPAdapter implements IAuthAdapter {
+ private String LDAP_HOST = "ldap://localhost:389/o=JNDITutorial";
+ private String LDAP_O = "UPR.SI";
+ private String LDAP_OU = "FAMNIT";
+
+ public LDAPAdapter(/*String host*/){
+ //HOST = provider;
+ }
+
+ public boolean IsValid(String username, String password) {
+ // Set up the environment for creating the initial context
+ Hashtable env = new Hashtable();
+ env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory");
+ env.put(Context.PROVIDER_URL, LDAP_HOST);
+
+ // Authenticate as S. User and password "mysecret"
+ env.put(Context.SECURITY_AUTHENTICATION, "simple");
+ env.put(Context.SECURITY_PRINCIPAL, "CN=" + username + ", OU=" + LDAP_OU + ", O=" + LDAP_O);
+ env.put(Context.SECURITY_CREDENTIALS, password);
+
+ try {
+ DirContext ctx = new InitialDirContext(env);
+ return true;
+ } catch (Exception e) {
+ return false;
+ }
+ }
+
+}
Index: trunk/src/src/java/org/lidar/auth/DBAdapter.java
===================================================================
--- trunk/src/src/java/org/lidar/auth/DBAdapter.java (revision 0)
+++ trunk/src/src/java/org/lidar/auth/DBAdapter.java (revision 7)
@@ -0,0 +1,27 @@
+package org.lidar.auth;
+
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.Transaction;
+import org.hibernate.cfg.Configuration;
+
+/**
+ *
+ * @author Andrej Cimpersek
+ */
+public class DBAdapter implements IAuthAdapter {
+
+ public boolean IsValid(String username, String password) {
+ SessionFactory sessionFactory = new Configuration().configure().buildSessionFactory();
+ Session session = sessionFactory.openSession();
+ Transaction tx = session.beginTransaction();
+
+
+
+ tx.commit();
+ session.close();
+
+ return true;
+ }
+
+}
Index: trunk/src/src/java/org/lidar/auth/IAuthAdapter.java
===================================================================
--- trunk/src/src/java/org/lidar/auth/IAuthAdapter.java (revision 0)
+++ trunk/src/src/java/org/lidar/auth/IAuthAdapter.java (revision 7)
@@ -0,0 +1,9 @@
+package org.lidar.auth;
+
+/**
+ *
+ * @author Andrej Cimpersek
+ */
+public interface IAuthAdapter {
+ public boolean IsValid(String username, String password);
+}
Index: trunk/src/src/java/org/lidar/auth/DummyAdapter.java
===================================================================
--- trunk/src/src/java/org/lidar/auth/DummyAdapter.java (revision 0)
+++ trunk/src/src/java/org/lidar/auth/DummyAdapter.java (revision 7)
@@ -0,0 +1,13 @@
+package org.lidar.auth;
+
+/**
+ * Dummy authentication adapter that always returns true
+ * @author Andrej Cimpersek
+ */
+public class DummyAdapter implements IAuthAdapter {
+
+ public boolean IsValid(String username, String password) {
+ return true;
+ }
+
+}
Index: trunk/src/src/java/org/lidar/auth/Authentication.java
===================================================================
--- trunk/src/src/java/org/lidar/auth/Authentication.java (revision 0)
+++ trunk/src/src/java/org/lidar/auth/Authentication.java (revision 7)
@@ -0,0 +1,25 @@
+package org.lidar.auth;
+
+/**
+ *
+ * @author Andrej Cimpersek
+ */
+public class Authentication {
+ private IAuthAdapter adapter;
+
+ public Authentication(){
+ this.adapter = new DummyAdapter();
+ }
+
+ public boolean IsValid(String username, String password){
+ return this.adapter.IsValid(username, password);
+ }
+
+ public void SetAdapter(IAuthAdapter adapter){
+ this.adapter = adapter;
+ }
+
+ public IAuthAdapter GetAdapter(){
+ return this.adapter;
+ }
+}
Index: trunk/src/src/java/org/lidar/Position.java
===================================================================
--- trunk/src/src/java/org/lidar/Position.java (revision 0)
+++ trunk/src/src/java/org/lidar/Position.java (revision 7)
@@ -0,0 +1,10 @@
+package org.lidar;
+
+/**
+ * Motors position
+ * @author Andrej Cimpersek
+ */
+public class Position {
+ public int position0;
+ public int position1;
+}
Index: trunk/src/src/java/org/lidar/Config.java
===================================================================
--- trunk/src/src/java/org/lidar/Config.java (revision 0)
+++ trunk/src/src/java/org/lidar/Config.java (revision 7)
@@ -0,0 +1,32 @@
+package org.lidar;
+
+import org.apache.commons.configuration.XMLConfiguration;
+import org.apache.commons.configuration.reloading.FileChangedReloadingStrategy;
+
+/**
+ *
+ * @author Andrej Cimpersek
+ */
+public class Config {
+ private static XMLConfiguration configuration;
+
+ public static XMLConfiguration getConfiguration(){
+ if(configuration == null){
+ try {
+ configuration = new XMLConfiguration("/etc/lidar/config.xml");
+ configuration.setAutoSave(true);
+ configuration.setReloadingStrategy(new FileChangedReloadingStrategy());
+ } catch (Exception e) {
+ }
+ }
+
+ return configuration;
+ }
+
+ public static void save(){
+ try {
+ configuration.save("/etc/lidar/config.xml");
+ } catch (Exception e) {
+ }
+ }
+}
Index: trunk/src/src/java/org/lidar/db/Log.java
===================================================================
--- trunk/src/src/java/org/lidar/db/Log.java (revision 0)
+++ trunk/src/src/java/org/lidar/db/Log.java (revision 7)
@@ -0,0 +1,63 @@
+package org.lidar.db;
+
+import java.io.Serializable;
+import java.util.Date;
+import javax.persistence.*;
+
+/**
+ *
+ * @author Andrej Cimpersek
+ */
+@Entity
+@Table(name="log")
+public class Log implements Serializable {
+ private Integer id;
+ private Date date;
+ private String type;
+ private String message;
+
+ public Log(){
+ }
+
+ public Log(Integer id, Date date, String type, String message){
+ this.id = id;
+ this.date = date;
+ this.type = type;
+ this.message = message;
+ }
+
+ @Id
+ public Integer getId() {
+ return this.id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ @Temporal(javax.persistence.TemporalType.DATE)
+ @Column(name="access")
+ public Date getDate() {
+ return this.date;
+ }
+
+ public void setDate(Date date) {
+ this.date = date;
+ }
+
+ public String getType() {
+ return this.type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getMessage() {
+ return this.message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+}
Index: trunk/src/src/java/org/lidar/db/AuthTokens.java
===================================================================
--- trunk/src/src/java/org/lidar/db/AuthTokens.java (revision 0)
+++ trunk/src/src/java/org/lidar/db/AuthTokens.java (revision 7)
@@ -0,0 +1,57 @@
+package org.lidar.db;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ * @author Andrej Cimpersek
+ */
+public class AuthTokens implements Serializable {
+ private Integer id;
+ private String token;
+ private Date access;
+ private String ip;
+
+ public AuthTokens(){
+ }
+
+ public AuthTokens(Integer id, String token, Date access, String ip){
+ this.id = id;
+ this.token = token;
+ this.access = access;
+ this.ip = ip;
+ }
+
+ public Integer getId() {
+ return this.id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public String getToken() {
+ return this.token;
+ }
+
+ public void setToken(String token) {
+ this.token = token;
+ }
+
+ public Date getAccess() {
+ return this.access;
+ }
+
+ public void setAccess(Date access) {
+ this.access = access;
+ }
+
+ public String getIp() {
+ return this.ip;
+ }
+
+ public void setIp(String ip) {
+ this.ip = ip;
+ }
+}
Index: trunk/src/src/java/org/lidar/db/Client.java
===================================================================
--- trunk/src/src/java/org/lidar/db/Client.java (revision 0)
+++ trunk/src/src/java/org/lidar/db/Client.java (revision 7)
@@ -0,0 +1,53 @@
+package org.lidar.db;
+
+import java.io.Serializable;
+import javax.persistence.*;
+
+/**
+ *
+ * @author Andrej Cimpersek
+ */
+@Entity
+@Table(name="client")
+public class Client implements Serializable {
+ private Integer id;
+ private String apiKey;
+ private String token;
+
+ public Client(){
+ }
+
+ public Client(Integer id, String apiKey, String token){
+ this.id = id;
+ this.apiKey = apiKey;
+ this.token = token;
+ }
+
+ @Id
+ @GeneratedValue(strategy=GenerationType.AUTO)
+ public Integer getId() {
+ return this.id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ @Column(name="apikey")
+ public String getApiKey() {
+ return this.apiKey;
+ }
+
+ public void setApiKey(String apiKey) {
+ this.apiKey = apiKey;
+ }
+
+ public String getToken() {
+ return this.token;
+ }
+
+ public void setToken(String token) {
+ this.token = token;
+ }
+
+}
Index: trunk/src/src/java/org/lidar/LogServlet.java
===================================================================
--- trunk/src/src/java/org/lidar/LogServlet.java (revision 0)
+++ trunk/src/src/java/org/lidar/LogServlet.java (revision 7)
@@ -0,0 +1,116 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package org.lidar;
+
+import com.google.gson.Gson;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.hibernate.Query;
+import org.hibernate.Session;
+import org.hibernate.Transaction;
+import org.lidar.HibernateUtil;
+
+/**
+ *
+ * @author Andrej Cimpersek
+ */
+public class LogServlet extends HttpServlet {
+
+ /**
+ * Processes requests for both HTTP GET and POST methods.
+ * @param request servlet request
+ * @param response servlet response
+ * @throws ServletException if a servlet-specific error occurs
+ * @throws IOException if an I/O error occurs
+ */
+ protected void processRequest(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException {
+ response.setContentType("application/json;charset=UTF-8");
+ PrintWriter out = response.getWriter();
+ Gson gson = new Gson();
+ try {
+ int start = 0;
+ int limit = 15;
+ if(request.getParameter("limit") != null){
+ limit = Integer.parseInt(request.getParameter("limit"));
+ }
+ if(request.getParameter("start") != null){
+ start = Integer.parseInt(request.getParameter("start"));
+ }
+
+ Session session = HibernateUtil.getSessionFactory().getCurrentSession();
+ Transaction tx = session.beginTransaction();
+
+ // FIX: use COUNT instead
+ int total = session.createQuery("from Log as log").list().size();
+ Query query = session.createQuery("from Log as log order by log.date desc");
+ query.setFirstResult(start);
+ query.setMaxResults(limit);
+ JSONResponse resp = new JSONResponse(true, total, (ArrayList)query.list());
+ out.write(gson.toJson(resp));
+ tx.commit();
+ } catch (Exception e) {
+ response.setContentType("text/plain;charset=UTF-8");
+ out.write(e.getMessage());
+ } finally {
+ out.close();
+ }
+ }
+
+ class JSONResponse {
+ private boolean success = true;
+ private int total;
+ private ArrayList rows;
+
+ public JSONResponse(boolean success, int total, ArrayList rows){
+ this.success = success;
+ this.total = total;
+ this.rows = rows;
+ }
+ }
+
+ //
+ /**
+ * Handles the HTTP GET method.
+ * @param request servlet request
+ * @param response servlet response
+ * @throws ServletException if a servlet-specific error occurs
+ * @throws IOException if an I/O error occurs
+ */
+ @Override
+ protected void doGet(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException {
+ processRequest(request, response);
+ }
+
+ /**
+ * Handles the HTTP POST method.
+ * @param request servlet request
+ * @param response servlet response
+ * @throws ServletException if a servlet-specific error occurs
+ * @throws IOException if an I/O error occurs
+ */
+ @Override
+ protected void doPost(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException {
+ processRequest(request, response);
+ }
+
+ /**
+ * Returns a short description of the servlet.
+ * @return a String containing servlet description
+ */
+ @Override
+ public String getServletInfo() {
+ return "Short description";
+ }//
+
+}
Index: trunk/src/src/java/org/lidar/api/Management.java
===================================================================
--- trunk/src/src/java/org/lidar/api/Management.java (revision 0)
+++ trunk/src/src/java/org/lidar/api/Management.java (revision 7)
@@ -0,0 +1,131 @@
+package org.lidar.api;
+
+import java.util.Date;
+import javax.annotation.Resource;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.handler.MessageContext;
+import net.sf.jpam.Pam;
+import org.hibernate.Query;
+import org.hibernate.Session;
+import org.hibernate.Transaction;
+import org.lidar.HibernateUtil;
+import org.lidar.db.Client;
+
+/**
+ * Management service
+ * @author Andrej Cimpersek
+ */
+@WebService()
+public class Management {
+ private final Object lock = new Object();
+ public static Boolean locked = false;
+ public static String lockToken;
+ public static Date lockAccess;
+
+ @Resource
+ private WebServiceContext wsContext;
+
+ /**
+ * Web service operation
+ */
+ @WebMethod()
+ public String getStatus(String authToken) {
+ String status = null;
+ Client c = getClient(String.format("token = '%s'", authToken));
+
+ if(c != null){
+ if(Management.locked){
+ status = "locked";
+ } else {
+ status = "unlocked";
+ }
+ }
+
+ return status;
+ }
+
+ /**
+ * Client helper
+ * @param where
+ * @return Client
+ */
+ private Client getClient(String where){
+ Client c = null;
+ Session session = HibernateUtil.getSessionFactory().getCurrentSession();
+ Transaction tx = null;
+ try {
+ // TODO: check if api_key exists in DB
+ // TODO: generate new auth token and save it to DB
+ tx = session.beginTransaction();
+
+ Query query = session.createQuery(String.format("from Client as client where %s", where));
+ c = (Client)query.list().get(0);
+ tx.commit();
+ } catch (Exception e) {
+ tx.rollback();
+ }
+
+ return c;
+ }
+
+ /**
+ * Get authentication token
+ * @param api_key
+ * @param username
+ * @param password
+ * @return null | authentication token
+ */
+ @WebMethod()
+ public String getAuthenticationToken(String api_key, String username, String password){
+ String token = null;
+ MessageContext mc = wsContext.getMessageContext();
+ Pam pam = new Pam();
+ boolean auth = pam.authenticateSuccessful(username, password);
+
+ if(auth){
+ Session session = HibernateUtil.getSessionFactory().getCurrentSession();
+ Transaction tx = null;
+ try {
+ // TODO: check if api_key exists in DB
+ // TODO: generate new auth token and save it to DB
+ Client c = getClient(String.format("apikey = '%s'", api_key));
+
+ if(c != null){
+ token = c.getToken();
+ }
+ } catch (Exception e) {
+ tx.rollback();
+ }
+ }
+
+ return token;
+ }
+
+ @WebMethod()
+ public String getLockToken(String authToken){
+ synchronized(lock){
+ Client c = getClient(String.format("token = '%s'", authToken));
+ if(Management.locked || c == null) return null;
+
+ Management.locked = true;
+ Management.lockToken = authToken; // TODO: generate token
+ Management.lockAccess = new Date();
+ }
+
+ return Management.lockToken;
+ }
+
+ @WebMethod
+ public boolean unlock(String lockToken){
+ synchronized(lock){
+ if(!Management.locked || Management.lockToken != lockToken) return false;
+ Management.locked = false;
+ Management.lockToken = null;
+ }
+
+ return true;
+ }
+
+}
Index: trunk/src/src/java/org/lidar/api/Motion.java
===================================================================
--- trunk/src/src/java/org/lidar/api/Motion.java (revision 0)
+++ trunk/src/src/java/org/lidar/api/Motion.java (revision 7)
@@ -0,0 +1,270 @@
+package org.lidar.api;
+
+import javax.comm.SerialPort;
+import org.lidar.Position;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import org.lidar.Config;
+import org.lidar.Serial;
+
+/**
+ * Motion API
+ * @author Andrej Cimpersek
+ */
+@WebService()
+public class Motion extends Serial {
+
+ public Motion(){
+ super("motion");
+ openPort();
+ }
+
+ /**
+ * Sets parameters for next motor move
+ * @param steps
+ * @param freq
+ */
+ @WebMethod()
+ public void setMove0(int steps, float freq){
+
+ }
+
+ /**
+ * Sets parameters for next motor move
+ * @param steps
+ * @param freq
+ */
+ @WebMethod()
+ public void setMove1(int steps, float freq){
+
+ }
+
+ /**
+ * Moves motors according to set moves
+ */
+ @WebMethod()
+ public void run(){
+
+ }
+
+ /**
+ * Sets angular velocity in steps / sec
+ * @param omega0
+ */
+ @WebMethod()
+ public void setInitialAngularVel0(float omega0){
+
+ }
+
+ /**
+ * Sets angular velocity in steps / sec
+ * @param omega0
+ */
+ @WebMethod()
+ public void setInitialAngularVel1(float omega0){
+
+ }
+
+ /**
+ * Sets angular acceleration in steps / sec^2
+ * @param accel
+ */
+ @WebMethod()
+ public void setAngularAcceleration0(float accel){
+
+ }
+
+ /**
+ * Sets angular acceleration in steps / sec^2
+ * @param accel
+ */
+ @WebMethod()
+ public void setAngularAcceleration1(float accel){
+
+ }
+
+ /**
+ *
+ * @param steps
+ */
+ @WebMethod()
+ public void setLackCorrection0(short steps){
+
+ }
+
+ /**
+ *
+ * @param steps
+ */
+ @WebMethod()
+ public void setLackCorrection1(short steps){
+
+ }
+
+ /**
+ * Sets angular deceleration in steps / sec^2
+ * @param decel
+ */
+ @WebMethod()
+ public void setAngularDeceleration0(float decel){
+
+ }
+
+ /**
+ * Sets angular deceleration in steps / sec^2
+ * @param decel
+ */
+ @WebMethod()
+ public void setAngularDeceleration1(float decel){
+
+ }
+
+ /**
+ * Sets position for stepper 0
+ * @param position
+ */
+ @WebMethod()
+ public void setPosition0(int position){
+
+ }
+
+ /**
+ * Sets position for stepper 1
+ * @param position
+ */
+ @WebMethod()
+ public void setPosition1(int position){
+
+ }
+
+ /**
+ * Stops motor 0
+ */
+ @WebMethod()
+ public void stopMotor0(){
+
+ }
+
+ /**
+ * Stops motor 1
+ */
+ @WebMethod()
+ public void stopMotor1(){
+
+ }
+
+ /**
+ * Disables current on motor 0
+ */
+ @WebMethod()
+ public void setMotorOff0(){
+
+ }
+
+ /**
+ * Disables current on motor 1
+ */
+ @WebMethod()
+ public void setMotorOff1(){
+
+ }
+
+ /**
+ * Gets positions of both motors
+ * @return Position
+ */
+ @WebMethod()
+ public Position getPosition(){
+ return new Position();
+ }
+
+ /**
+ * Set continuous key movement
+ */
+ @WebMethod()
+ public void setContinuousKeyMovement(){
+
+ }
+
+ /**
+ * Set single step key movement
+ */
+ @WebMethod()
+ public void setSingleStepKeyMovement(){
+
+ }
+
+ /**
+ * Simulate Left Key Press
+ */
+ @WebMethod()
+ public void simulateLeftKeyPress(){
+
+ }
+
+ /**
+ * Simulate Left Key Release
+ */
+ @WebMethod()
+ public void simulateLeftKeyRelease(){
+
+ }
+
+ /**
+ * Simulate Right Key Press
+ */
+ @WebMethod()
+ public void simulateRightKeyPress(){
+
+ }
+
+ /**
+ * Simulate Right Key Release
+ */
+ @WebMethod()
+ public void simulateRightKeyRelease(){
+
+ }
+
+ /**
+ * Simulate Up Key Press
+ */
+ @WebMethod()
+ public void simulateUpKeyPress(){
+
+ }
+
+ /**
+ * Simulate Up Key Release
+ */
+ @WebMethod()
+ public void simulateUpKeyRelease(){
+
+ }
+
+ /**
+ * Simulate Down Key Press
+ */
+ @WebMethod()
+ public void simulateDownKeyPress(){
+
+ }
+
+ /**
+ * Simulate Down Key Release
+ */
+ @WebMethod()
+ public void simulateDownKeyRelease(){
+
+ }
+
+ /**
+ * Sets automatic position reporting.
+ * 0..turns off automatic position reporting, 50..9999 autoreport interval in milliseconds
+ * @param interval
+ */
+ @WebMethod()
+ public void setAutomaticPositionReporting(short interval){
+
+ }
+}
Index: trunk/src/src/java/org/lidar/api/Laser.java
===================================================================
--- trunk/src/src/java/org/lidar/api/Laser.java (revision 0)
+++ trunk/src/src/java/org/lidar/api/Laser.java (revision 7)
@@ -0,0 +1,176 @@
+package org.lidar.api;
+
+import javax.comm.SerialPort;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import org.apache.commons.configuration.XMLConfiguration;
+import org.lidar.Config;
+import org.lidar.Serial;
+
+/**
+ * Laser API
+ * @author Andrej Cimpersek
+ */
+@WebService()
+public class Laser extends Serial {
+ public Laser(){
+ super("laser");
+ openPort();
+ }
+
+ /**
+ * Vkljuci laser, ki zacne delovati v skladu z nastavljenimi parametri.
+ */
+ @WebMethod()
+ public boolean fire(String lockToken){
+ return sendCommand(lockToken, "$FIRE 01\r");
+ }
+
+ /**
+ * Izkljuci laser.
+ */
+ @WebMethod()
+ public boolean stop(String lockToken){
+ return sendCommand(lockToken, "$STOP 00\r");
+ }
+
+ /**
+ * Shrani trenutno konfiguracijo parametrov v interni pomnilnik laserja, ki se bodo nalozili ob naslednjem zagonu napajanja.
+ */
+ @WebMethod()
+ public boolean saveConfig(String lockToken){
+ return sendCommand(lockToken, "$SAVE 01\r");
+ }
+
+ /**
+ * Mnozica vseh nacinov delovanja laserja.
+ */
+ public enum LaserMode { Continuous, Burst, ExternalTrigger};
+
+ /**
+ * Izbere nacin delovanja laserja. Nacini mode so nasteti v mnozici LaserMode.
+ * @param mode Nacin delovanja laserja.
+ */
+ @WebMethod()
+ public boolean setMode(String lockToken, LaserMode mode){
+ switch(mode){
+ case Continuous:
+ return sendCommand(lockToken, "$MODE 01\r");
+ case Burst:
+ return sendCommand(lockToken, "$MODE 02\r");
+ case ExternalTrigger:
+ return sendCommand(lockToken, "$MODE 03\r");
+ }
+
+ return false;
+ }
+
+ /**
+ * Omogoci oz. onemogoci Q-Switch opcijo.
+ * @param enabled Omogoci oz. onemogoci..
+ */
+ @WebMethod()
+ public boolean setQSwitch(String lockToken, boolean enabled){
+ if(enabled){
+ return sendCommand(lockToken, "$QSWITCH 01\r");
+ } else {
+ return sendCommand(lockToken, "$QSWITCH 00\r");
+ }
+ }
+
+ /**
+ * Zaklene oz. odklene tipkovnico na napajalniku laserja.
+ * @param locked Zaklep oz. odklep.
+ */
+ @WebMethod()
+ public boolean setKeypad(String lockToken, boolean enabled){
+ if(enabled){
+ return sendCommand(lockToken, "$KEYPAD 01\r");
+ } else {
+ return sendCommand(lockToken, "$KEYPAD 00\r");
+ }
+ }
+
+ /**
+ * Nastavi stevilo sunkov laserja, pulses, ki se bodo zaporedoma izbvrsili, ce je izbran nacin delovanje LaserMode.Continuous.
+ * Dovoljeno obmocje 0 - 99.
+ * @param pulses Stevilo sunkov laserja.
+ */
+ @WebMethod()
+ public boolean setBurstPulseCount(String lockToken, byte pulses){
+ if(pulses < 0 && pulses > 99){
+ return false;
+ }
+
+ String p = "" + pulses;
+ if (p.length() == 1) p = "0" + p;
+
+ return sendCommand(lockToken, "$BURST " + p + "\r");
+ }
+
+ /**
+ * Zazene Q-Switch na vsakih freq sunkov.
+ * Dovoljeno obmocje je od 1 - 99.
+ * @param freq Frekvenca sunkov.
+ */
+ @WebMethod()
+ public boolean setQSwitchFrequency(String lockToken, byte freq){
+ if(freq < 0 && freq > 99){
+ return false;
+ }
+
+ String f = "" + freq;
+ if (f.length() == 1) f = "0" + f;
+
+ return sendCommand(lockToken, "$QFREQ " + f + "\r");
+ }
+
+ /**
+ * Zakasnitev aktivacije v stevilu sunkov delay.
+ * Dovoljeno obmocje je od 0 - 99.
+ * @param delay Zakasnitev aktivacije.
+ */
+ public boolean setQSwitchDelay(String lockToken, byte delay){
+ if(delay < 0 && delay > 99){
+ return false;
+ }
+
+ String d = "" + delay;
+ if (d.length() == 1) d = "0" + d;
+
+ return sendCommand(lockToken, "$QDLY " + d + "\r");
+ }
+
+ /**
+ * Nastavi energijo laserja, eneryLevel, pri posameznem sunku aktivcaije.
+ * @param energyLevel Energija laserja.
+ */
+ @WebMethod()
+ public boolean setEnergyLevel(String lockToken, byte energyLevel){
+ if(energyLevel < 1 && energyLevel > 20){
+ return false;
+ }
+
+ String e = "" + energyLevel;
+ if (e.length() == 1) e = "0" + e;
+
+ return sendCommand(lockToken, "$EPFN " + e + "\r");
+ }
+
+ /**
+ * Nastavi frekvenco, s katero naj se prozi lase po aktivaciji. Frekvenca je izrazena v sunkih na sekundo, rate.
+ * Dovoljene vrednosti so 1, 2, 5, 10 in 20.
+ * @param rate Frekvenca s katero se prozi laser.
+ */
+ @WebMethod()
+ public boolean setRepetitionRate(String lockToken, byte rate){
+ if (rate == 1 || rate == 2 || rate == 5 || rate == 10 || rate == 20){
+ String r = "" + rate;
+ if (r.length() == 1) r = "0" + r;
+
+ return sendCommand(lockToken, "$LPRF " + r + "\r");
+ }
+
+ return false;
+ }
+}
Index: trunk/src/src/java/org/lidar/api/Video.java
===================================================================
--- trunk/src/src/java/org/lidar/api/Video.java (revision 0)
+++ trunk/src/src/java/org/lidar/api/Video.java (revision 7)
@@ -0,0 +1,26 @@
+package org.lidar.api;
+
+import java.io.File;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import org.lidar.Util;
+
+/**
+ * Video API
+ * @author Andrej Cimpersek
+ */
+@WebService()
+public class Video {
+ /**
+ * Returns image
+ * @return byte[] PNG image
+ */
+ @WebMethod()
+ public byte[] getImage(String lockToken){
+ try {
+ return Util.GetBytesFromFile(new File("capture.png"));
+ } catch (Exception e) {
+ return null;
+ }
+ }
+}
\ No newline at end of file
Index: trunk/src/src/java/org/lidar/api/Sensor.java
===================================================================
--- trunk/src/src/java/org/lidar/api/Sensor.java (revision 0)
+++ trunk/src/src/java/org/lidar/api/Sensor.java (revision 7)
@@ -0,0 +1,87 @@
+package org.lidar.api;
+
+import javax.comm.SerialPort;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import org.lidar.Config;
+import org.lidar.Serial;
+
+/**
+ * Sensor API
+ * @author Andrej Cimpersek
+ */
+@WebService()
+public class Sensor extends Serial {
+
+ public Sensor(){
+ super("sensor");
+ openPort();
+ }
+
+ /**
+ * Kaj natancno naredi ukaz ni znano. Pred zajemom podatkov ga je potrebno izvesti.
+ * TODO: odstranit oz. samodejen klic pred zajemom podatkov.
+ */
+ private void readQuery(){
+
+ }
+
+ /**
+ * Pripravi senzor na zajemanje podatkov. Ob naslednjih prozenjih laserja bodo meritve dostopne preko lastnosti ReceivedMeasurement.
+ * TODO: drugačen dostop do podatkov
+ */
+ @WebMethod()
+ public void runAcqusition(){
+ // TODO: preveri ce je ok
+ readQuery();
+ }
+
+ /**
+ * Ustavi zajemanje podatkov ob prozenju laserja. Z drugimi besadami, ob naslednjih sprozitvah laserja ne bomo dobili podatkov meritev.
+ */
+ @WebMethod()
+ public void stopAcqusition(){
+
+ }
+
+ /**
+ * Podobno kot RunAcqusition, natancnejsi podatki zal niso znani.
+ */
+ @WebMethod()
+ public void forceTrigger(){
+
+ }
+
+ /**
+ * Mnozica doloca vse mozne tipe meritev.
+ */
+ public enum DataType { Data, Background, DataMinusBackground }
+
+ /**
+ * Nastavi tip type meritve.
+ * @param type Tip meritve.
+ */
+ @WebMethod()
+ public void setDataType(DataType type){
+
+ }
+
+ /**
+ * Vrne status senzurja, predstavljen v enem byte-u.
+ * @return byte Status senzorja.
+ */
+ @WebMethod()
+ public byte getStatus(){
+ return (byte)'0';
+ }
+
+ /**
+ * Poslje gain profil gainData v senzor.
+ * @param gainData Gain profil.
+ */
+ @WebMethod()
+ public void sendGain(short[] gainData){
+
+ }
+
+}
Index: trunk/src/build.xml
===================================================================
--- trunk/src/build.xml (revision 0)
+++ trunk/src/build.xml (revision 7)
@@ -0,0 +1,71 @@
+
+
+
+
+
+
+
+
+
+
+ Builds, tests, and runs the project LIDAR SOAP.
+
+
+
Index: trunk/src
===================================================================
--- trunk/src (revision 6)
+++ trunk/src (revision 7)
Property changes on: trunk/src
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+build