- Jtimer-commits - mailman.cloud.codelutin.com

r2925 - in branches/ng-jtimer: . jtimer-server
by echatellier＠users.chorem.org 22 Aug '13

22 Aug '13

Author: echatellier Date: 2013-08-22 21:08:36 +0200 (Thu, 22 Aug 2013) New Revision: 2925 Url: http://chorem.org/projects/jtimer/repository/revisions/2925 Log: mvn ddu Modified: branches/ng-jtimer/jtimer-server/pom.xml branches/ng-jtimer/pom.xml Modified: branches/ng-jtimer/jtimer-server/pom.xml =================================================================== --- branches/ng-jtimer/jtimer-server/pom.xml 2013-08-22 08:55:39 UTC (rev 2924) +++ branches/ng-jtimer/jtimer-server/pom.xml 2013-08-22 19:08:36 UTC (rev 2925) @@ -30,22 +30,22 @@ <dependency> <groupId>org.restlet.jee</groupId> <artifactId>org.restlet</artifactId> - <version>2.1.2</version> + <version>2.2-M3</version> </dependency> <dependency> <groupId>org.restlet.jee</groupId> <artifactId>org.restlet.ext.servlet</artifactId> - <version>2.1.2</version> + <version>2.2-M3</version> </dependency> <dependency> <groupId>org.restlet.jee</groupId> <artifactId>org.restlet.ext.jackson</artifactId> - <version>2.1.2</version> + <version>2.2-M3</version> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-runner</artifactId> - <version>9.0.4.v20130625</version> + <version>9.0.5.v20130815</version> <scope>provided</scope> </dependency> </dependencies> @@ -55,7 +55,7 @@ <plugin> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> - <version>9.0.4.v20130625</version> + <version>9.0.5.v20130815</version> </plugin> <plugin> <groupId>ro.isdc.wro4j</groupId> @@ -74,7 +74,8 @@ <targetGroups>jtimer</targetGroups> <contextFolder>${basedir}/src/main/webapp/web/</contextFolder>  <cssDestinationFolder>${basedir}/src/main/webapp/css</cssDestinationFolder> <jsDestinationFolder>${basedir}/src/main/webapp/js</jsDestinationFolder> Modified: branches/ng-jtimer/pom.xml =================================================================== --- branches/ng-jtimer/pom.xml 2013-08-22 08:55:39 UTC (rev 2924) +++ branches/ng-jtimer/pom.xml 2013-08-22 19:08:36 UTC (rev 2925) @@ -83,7 +83,7 @@ <dependency> <groupId>com.google.javascript</groupId> <artifactId>closure-compiler</artifactId> - <version>v20130603</version> + <version>v20130722</version> </dependency> </dependencies> </plugin> @@ -96,14 +96,8 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.3.172</version> + <version>1.3.173</version> </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-servlet_3.0_spec</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> </dependencies> </dependencyManagement> @@ -113,4 +107,13 @@ <url>https://oss.sonatype.org/content/groups/public/</url> </repository> </repositories> + <pluginRepositories> + <pluginRepository> + <id>chorem</id> + <url>http://nexus.nuiton.org/nexus/content/groups/public</url> + <releases> + <enabled>false</enabled> + </releases> + </pluginRepository> + </pluginRepositories> </project>

1 0

r2924 - branches/ng-jtimer/jtimer-server/src/main/webapp/js
by echatellier＠users.chorem.org 22 Aug '13

22 Aug '13

Author: echatellier Date: 2013-08-22 10:55:39 +0200 (Thu, 22 Aug 2013) New Revision: 2924 Url: http://chorem.org/projects/jtimer/repository/revisions/2924 Log: Fix error Modified: branches/ng-jtimer/jtimer-server/src/main/webapp/js/controllers.js Modified: branches/ng-jtimer/jtimer-server/src/main/webapp/js/controllers.js =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/webapp/js/controllers.js 2013-08-21 20:02:38 UTC (rev 2923) +++ branches/ng-jtimer/jtimer-server/src/main/webapp/js/controllers.js 2013-08-22 08:55:39 UTC (rev 2924) @@ -119,8 +119,8 @@ $scope.data.tasks.push(newTask); $scope.name = ""; save(); - if (tree) { - tree.addChild($scope.createTreeNode(newTask)); + if ($scope.tree) { + $scope.tree.addChild($scope.createTreeNode(newTask)); } // $scope.createTree(); };

1 0

r2923 - branches/ng-jtimer/jtimer-server/src/main/go
by echatellier＠users.chorem.org 21 Aug '13

21 Aug '13

Author: echatellier Date: 2013-08-21 22:02:38 +0200 (Wed, 21 Aug 2013) New Revision: 2923 Url: http://chorem.org/projects/jtimer/repository/revisions/2923 Log: Fix compilation doc Modified: branches/ng-jtimer/jtimer-server/src/main/go/readme.txt Modified: branches/ng-jtimer/jtimer-server/src/main/go/readme.txt =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/go/readme.txt 2013-08-21 19:36:05 UTC (rev 2922) +++ branches/ng-jtimer/jtimer-server/src/main/go/readme.txt 2013-08-21 20:02:38 UTC (rev 2923) @@ -6,6 +6,7 @@ go get github.com/BurntSushi/xgb/screensaver go get code.google.com/p/go.net/websocket go get github.com/mattn/go-gtk/gtk +go get github.com/BurntSushi/xgbutil Lancement ---------

1 0

r2922 - in branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer: entities storage web
by echatellier＠users.chorem.org 21 Aug '13

21 Aug '13

Author: echatellier Date: 2013-08-21 21:36:05 +0200 (Wed, 21 Aug 2013) New Revision: 2922 Url: http://chorem.org/projects/jtimer/repository/revisions/2922 Log: Begin rest service layer Added: branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/TaskResource.java branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/TasksResource.java branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/TimeResource.java Removed: branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/ProjectsResource.java Modified: branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/entities/TimerTask.java branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/storage/Storage.java branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/RestApplication.java Modified: branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/entities/TimerTask.java =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/entities/TimerTask.java 2013-08-21 19:35:21 UTC (rev 2921) +++ branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/entities/TimerTask.java 2013-08-21 19:36:05 UTC (rev 2922) @@ -26,11 +26,7 @@ package org.chorem.jtimer.entities; import java.io.Serializable; -import java.util.ArrayList; import java.util.Date; -import java.util.List; -import java.util.SortedMap; -import java.util.TreeMap; /** * Represents a task. @@ -62,29 +58,9 @@ protected boolean closed; /** - * Map calendar of day -> time (ms). (ordered on keys) - */ - protected SortedMap<Date, Long> allDaysTimes; - - /** - * Map date -> annotation text. - */ - protected SortedMap<Date, String> allDaysAnnotations; - - /** - * Sub tasks. - */ - protected List<TimerTask> subTasks; - - /** * Constructor. */ public TimerTask() { - //allDaysTimes = new DailySortedMap<Long>(); - // les annoation sont Ã la seconde pres - allDaysAnnotations = new TreeMap<Date, String>(); - subTasks = new ArrayList<TimerTask>(); - // wrong value to detect bug number = -1; } @@ -178,111 +154,4 @@ public void setClosed(boolean closed) { this.closed = closed; } - - /** - * Get task's subtasks. - * - * @return the subTasks - */ - public List<TimerTask> getSubTasks() { - return subTasks; - } - - /** - * Add task's subtask. - * - * Also add parent reference. - * - * @param t the task to add - * @return success flag - */ - public boolean addTask(TimerTask t) { - boolean result = subTasks.add(t); - return result; - } - - /** - * Add time. - * - * @param date date - * @param time time in ms - */ - public void setTime(Date date, Long time) { - allDaysTimes.put(date, time); - } - - /** - * Get time at date. - * - * @param date date - * @return time at specified date in ms - */ - public long getTime(Date date) { - long result = 0; - - Long t = allDaysTimes.get(date); - if (t != null) { - result = t.longValue(); - } - - return result; - } - - /** - * Return all data. Sorted on date. - * - * @return total duration of all projects - */ - public SortedMap<Date, Long> getAllDaysAndTimes() { - return allDaysTimes; - } - - /** - * Add annotation. - * - * @param date date - * @param note note text - */ - public void addAnnotation(Date date, String note) { - allDaysAnnotations.put(date, note); - } - - /** - * Return all annotation, sorted on date. - * - * @return annotations - */ - public SortedMap<Date, String> getAllDaysAnnotations() { - return allDaysAnnotations; - } - - /* - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return name + subTasks.toString(); - } - - /* - * @see java.lang.Object#hashCode() - */ - @Override - public int hashCode() { - int result = (int)(number % 31); - return result; - } - - /* - * @see java.lang.Object#equals(java.lang.Object) - */ - @Override - public boolean equals(Object o) { - - if (!(o instanceof TimerTask)) { - return false; - } - - return number == ((TimerTask)o).getNumber(); - } } \ No newline at end of file Modified: branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/storage/Storage.java =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/storage/Storage.java 2013-08-21 19:35:21 UTC (rev 2921) +++ branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/storage/Storage.java 2013-08-21 19:36:05 UTC (rev 2922) @@ -9,8 +9,6 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.Map; -import java.util.SortedMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -57,13 +55,6 @@ } catch (SQLException ex) { throw new StorageException("Can't open database", ex); } - - if (getProjectsCount() == 0) { - addProject(new TimerProject("Test1")); - addProject(new TimerProject("Test2")); - addProject(new TimerProject("Test3")); - addProject(new TimerProject("Test4")); - } } @Override @@ -389,7 +380,7 @@ } } - protected void saveTaskTimes(TimerTask task) throws SQLException { + /*protected void saveTaskTimes(TimerTask task) throws SQLException { // delete all PreparedStatement statement = null; @@ -418,7 +409,7 @@ } finally { closeStatement(statement); } - } + }*/ public void deleteProject(TimerProject project) { deleteTask(project); @@ -442,12 +433,12 @@ } - public void setTaskTime(TimerTask task, Date date, Long time) { + /*public void setTaskTime(TimerTask task, Date date, Long time) { try { saveTaskTimes(task); } catch (SQLException ex) { throw new StorageException("Can't set task time", ex); } - } + }*/ } \ No newline at end of file Deleted: branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/ProjectsResource.java =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/ProjectsResource.java 2013-08-21 19:35:21 UTC (rev 2921) +++ branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/ProjectsResource.java 2013-08-21 19:36:05 UTC (rev 2922) @@ -1,32 +0,0 @@ -package org.chorem.jtimer.web; - -import org.chorem.jtimer.entities.TimerProject; -import org.chorem.jtimer.storage.Storage; -import org.restlet.ext.jackson.JacksonRepresentation; -import org.restlet.representation.Representation; -import org.restlet.resource.Get; -import org.restlet.resource.ServerResource; - -public class ProjectsResource extends ServerResource { - - protected Storage storage; - - public ProjectsResource() { - storage = new Storage(); - - if (storage.getProjectsCount() == 0) { - storage.addProject(new TimerProject("jTimer")); - storage.addProject(new TimerProject("Chorem")); - storage.addProject(new TimerProject("Wikitty")); - storage.addProject(new TimerProject("Nuiton-js")); - storage.addProject(new TimerProject("Angular")); - storage.addProject(new TimerProject("Isis-Fish")); - } - } - - @Get("json") - public Representation getProjects() { - Representation jsonRep = new JacksonRepresentation<>(storage.getProjects()); - return jsonRep; - } -} Modified: branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/RestApplication.java =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/RestApplication.java 2013-08-21 19:35:21 UTC (rev 2921) +++ branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/RestApplication.java 2013-08-21 19:36:05 UTC (rev 2922) @@ -12,11 +12,13 @@ @Override public synchronized Restlet createInboundRoot() { // Create a router Restlet that routes each call to a - // new instance of HelloWorldResource. + // new instance of ProjectsResource. Router router = new Router(getContext()); // Defines only one route - router.attach("/projects", ProjectsResource.class); + router.attach("/tasks", TasksResource.class); + router.attach("/task/{task}", TaskResource.class); + router.attach("/task/{task}/time", TimeResource.class); return router; } Added: branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/TaskResource.java =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/TaskResource.java (rev 0) +++ branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/TaskResource.java 2013-08-21 19:36:05 UTC (rev 2922) @@ -0,0 +1,21 @@ +package org.chorem.jtimer.web; + +import org.restlet.data.MediaType; +import org.restlet.representation.Representation; +import org.restlet.representation.StringRepresentation; +import org.restlet.resource.Get; +import org.restlet.resource.ResourceException; +import org.restlet.resource.ServerResource; + +public class TaskResource extends ServerResource { + + @Override + protected void doInit() throws ResourceException { + + } + + @Get("json") + public Representation getTask() { + return new StringRepresentation("{}", MediaType.APPLICATION_JSON); + } +} Property changes on: branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/TaskResource.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/TasksResource.java (from rev 2917, branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/ProjectsResource.java) =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/TasksResource.java (rev 0) +++ branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/TasksResource.java 2013-08-21 19:36:05 UTC (rev 2922) @@ -0,0 +1,32 @@ +package org.chorem.jtimer.web; + +import org.chorem.jtimer.entities.TimerProject; +import org.chorem.jtimer.storage.Storage; +import org.restlet.ext.jackson.JacksonRepresentation; +import org.restlet.representation.Representation; +import org.restlet.resource.Get; +import org.restlet.resource.ServerResource; + +public class TasksResource extends ServerResource { + + protected Storage storage; + + public TasksResource() { + storage = new Storage(); + + if (storage.getProjectsCount() == 0) { + storage.addProject(new TimerProject("jTimer")); + storage.addProject(new TimerProject("Chorem")); + storage.addProject(new TimerProject("Wikitty")); + storage.addProject(new TimerProject("Nuiton-js")); + storage.addProject(new TimerProject("Angular")); + storage.addProject(new TimerProject("Isis-Fish")); + } + } + + @Get("json") + public Representation getTasks() { + Representation jsonRep = new JacksonRepresentation<>(storage.getProjects()); + return jsonRep; + } +} Added: branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/TimeResource.java =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/TimeResource.java (rev 0) +++ branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/TimeResource.java 2013-08-21 19:36:05 UTC (rev 2922) @@ -0,0 +1,7 @@ +package org.chorem.jtimer.web; + +import org.restlet.resource.ServerResource; + +public class TimeResource extends ServerResource { + +} Property changes on: branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/TimeResource.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r2921 - branches/ng-jtimer/jtimer-server/src/main/webapp
by echatellier＠users.chorem.org 21 Aug '13

21 Aug '13

Author: echatellier Date: 2013-08-21 21:35:21 +0200 (Wed, 21 Aug 2013) New Revision: 2921 Url: http://chorem.org/projects/jtimer/repository/revisions/2921 Log: Add title Modified: branches/ng-jtimer/jtimer-server/src/main/webapp/index.html Modified: branches/ng-jtimer/jtimer-server/src/main/webapp/index.html =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/webapp/index.html 2013-08-16 15:49:09 UTC (rev 2920) +++ branches/ng-jtimer/jtimer-server/src/main/webapp/index.html 2013-08-21 19:35:21 UTC (rev 2921) @@ -1,7 +1,7 @@ <!DOCTYPE html> <html lang="en" ng-app="webtimer" zmanifest="webtimer.appcache"> <head> - <title></title> + <title>jTimer</title> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <link rel="stylesheet" href="css/jtimer.css">

1 0

r2920 - branches/ng-jtimer/jtimer-server/src/main/resources
by echatellier＠users.chorem.org 16 Aug '13

16 Aug '13

Author: echatellier Date: 2013-08-16 17:49:09 +0200 (Fri, 16 Aug 2013) New Revision: 2920 Url: http://chorem.org/projects/jtimer/repository/revisions/2920 Log: Remove unused files Removed: branches/ng-jtimer/jtimer-server/src/main/resources/mapping Deleted: branches/ng-jtimer/jtimer-server/src/main/resources/mapping =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/resources/mapping 2013-08-16 15:48:11 UTC (rev 2919) +++ branches/ng-jtimer/jtimer-server/src/main/resources/mapping 2013-08-16 15:49:09 UTC (rev 2920) @@ -1,5 +0,0 @@ -[config] -package.base=org.chorem.jtimer.web - -[actions] -GET /rest/projects RestController.getProjects

1 0

r2919 - in branches/ng-jtimer: . jtimer-server jtimer-server/src/main/java/org/chorem/jtimer jtimer-server/src/main/java/org/chorem/jtimer/war
by echatellier＠users.chorem.org 16 Aug '13

16 Aug '13

Author: echatellier Date: 2013-08-16 17:48:11 +0200 (Fri, 16 Aug 2013) New Revision: 2919 Url: http://chorem.org/projects/jtimer/repository/revisions/2919 Log: Add embedded jetty server Added: branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/war/ branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/war/JettyRunner.java Modified: branches/ng-jtimer/jtimer-server/pom.xml branches/ng-jtimer/pom.xml Modified: branches/ng-jtimer/jtimer-server/pom.xml =================================================================== --- branches/ng-jtimer/jtimer-server/pom.xml 2013-08-16 15:43:41 UTC (rev 2918) +++ branches/ng-jtimer/jtimer-server/pom.xml 2013-08-16 15:48:11 UTC (rev 2919) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -27,20 +28,26 @@ <version>2.2.4</version> </dependency> <dependency> - <groupId>org.restlet.jee</groupId> - <artifactId>org.restlet</artifactId> - <version>2.1.2</version> + <groupId>org.restlet.jee</groupId> + <artifactId>org.restlet</artifactId> + <version>2.1.2</version> </dependency> <dependency> - <groupId>org.restlet.jee</groupId> - <artifactId>org.restlet.ext.servlet</artifactId> - <version>2.1.2</version> + <groupId>org.restlet.jee</groupId> + <artifactId>org.restlet.ext.servlet</artifactId> + <version>2.1.2</version> </dependency> <dependency> - <groupId>org.restlet.jee</groupId> - <artifactId>org.restlet.ext.jackson</artifactId> - <version>2.1.2</version> + <groupId>org.restlet.jee</groupId> + <artifactId>org.restlet.ext.jackson</artifactId> + <version>2.1.2</version> </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-runner</artifactId> + <version>9.0.4.v20130625</version> + <scope>provided</scope> + </dependency> </dependencies> <build> @@ -66,26 +73,61 @@ <configuration> <targetGroups>jtimer</targetGroups> <contextFolder>${basedir}/src/main/webapp/web/</contextFolder> - +  <cssDestinationFolder>${basedir}/src/main/webapp/css</cssDestinationFolder> <jsDestinationFolder>${basedir}/src/main/webapp/js</jsDestinationFolder> -  +  <wroManagerFactory>org.nuiton.js.wro.NuitonJsMavenWroManagerFactory</wroManagerFactory> <wroFile>${basedir}/src/main/config/wro.xml</wroFile> <extraConfigFile>${basedir}/src/main/config/wro.properties</extraConfigFile> </configuration> </plugin> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <executions> + <execution> + <id>generate-runnable-war</id> + <goals> + <goal>war</goal> + </goals> + <configuration> + <warName>${project.build.finalName}-standalone</warName> + <archive> + <manifest> + <mainClass>org.chorem.jtimer.war.JettyRunner</mainClass> + </manifest> + </archive> + <webResources> + <resource> + <directory>${project.build.directory}/classes</directory> + <targetPath>WEB-INF/..</targetPath> + <includes> + <include>**/war/*</include> + </includes> + <filtering>false</filtering> + </resource> + </webResources> + <overlays> + <overlay> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-runner</artifactId> + <type>jar</type> + </overlay> + </overlays> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> - + <repositories> - <repository> - <id>maven-restlet</id> - <name>Public online Restlet repository</name> - <url>http://maven.restlet.org</url> + <repository> + <id>maven-restlet</id> + <name>Public online Restlet repository</name> + <url>http://maven.restlet.org</url> </repository> </repositories> </project> Added: branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/war/JettyRunner.java =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/war/JettyRunner.java (rev 0) +++ branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/war/JettyRunner.java 2013-08-16 15:48:11 UTC (rev 2919) @@ -0,0 +1,53 @@ +package org.chorem.jtimer.war; + +import java.io.File; +import java.io.IOException; +import java.net.JarURLConnection; +import java.net.URL; + +import org.eclipse.jetty.runner.Runner; + +/** + * Jetty runner to produce bootable war. + * + * Warning, to class must be java only. + * + * @author Eric Chatellier + */ +public class JettyRunner extends Runner { + + public static void main(String[] args) { + Runner runner = new Runner(); + + try { + if (args.length > 0 && args[0].equalsIgnoreCase("--help")) { + runner.usage(null); + } else if (args.length > 0 && args[0].equalsIgnoreCase("--version")) { + runner.version(); + } else { + + String me = getMe(); + System.out.println("Adding me to args array : " + me); + + // add 'me' at end of args array + String[] args2 = new String[args.length + 1]; + System.arraycopy(args, 0, args2, 0, args.length); + args2[args2.length - 1] = me; + + // continue to jetty launcher + runner.configure(args2); + runner.run(); + } + } catch (Exception e) { + e.printStackTrace(); + runner.usage(null); + } + } + + protected static String getMe() throws IOException { + String fqnLauncherFile = JettyRunner.class.getName().replaceAll("\\.", "/") + ".class"; + URL classFile = JettyRunner.class.getClassLoader().getResource(fqnLauncherFile); + File me = new File(((JarURLConnection) classFile.openConnection()).getJarFile().getName()); + return me.getAbsolutePath(); + } +} Property changes on: branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/war/JettyRunner.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/ng-jtimer/pom.xml =================================================================== --- branches/ng-jtimer/pom.xml 2013-08-16 15:43:41 UTC (rev 2918) +++ branches/ng-jtimer/pom.xml 2013-08-16 15:48:11 UTC (rev 2919) @@ -48,17 +48,17 @@ <dependency> <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-wro</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.1</version> </dependency> <dependency> <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-angular</artifactId> - <version>1.1.5-1-SNAPSHOT</version> + <version>1.1.5-1</version> </dependency> <dependency> <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-jquery</artifactId> - <version>2.0.2-1</version> + <version>2.0.3-1</version> </dependency> <dependency> <groupId>org.nuiton.js</groupId> @@ -68,14 +68,14 @@ <dependency> <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-moment</artifactId> - <version>2.0.0-1</version> + <version>2.1.0-1-SNAPSHOT</version> </dependency> - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-font-awesome</artifactId> - <version>3.2.1-1-SNAPSHOT</version> - </dependency> <dependency> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-font-awesome</artifactId> + <version>3.2.1-1-SNAPSHOT</version> + </dependency> + <dependency> <groupId>ro.isdc.wro4j</groupId> <artifactId>wro4j-extensions</artifactId> <version>1.7.0</version> @@ -94,40 +94,16 @@ <dependencyManagement> <dependencies> <dependency> - <groupId>org.jboss.resteasy</groupId> - <artifactId>tjws</artifactId> - <version>1.104</version> - </dependency> - <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> <version>1.3.172</version> </dependency> <dependency> - <groupId>com.nativelibs4java</groupId> - <artifactId>bridj</artifactId> - <classifier>c-only</classifier> - <version>0.6.2</version> - <exclusions> - <exclusion> - <artifactId>dx</artifactId> - <groupId>com.google.android.tools</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-servlet_3.0_spec</artifactId> <version>1.0</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>com.oracle</groupId> - <artifactId>javafx</artifactId> - <version>2.2.3</version> - <scope>system</scope> - <systemPath>${java.home}/lib/jfxrt.jar</systemPath> - </dependency> </dependencies> </dependencyManagement>

1 0

r2918 - branches/ng-jtimer/jtimer-server/src/main/go
by echatellier＠users.chorem.org 16 Aug '13

16 Aug '13

Author: echatellier Date: 2013-08-16 17:43:41 +0200 (Fri, 16 Aug 2013) New Revision: 2918 Url: http://chorem.org/projects/jtimer/repository/revisions/2918 Log: Add go client with systray support, systray menu and chromium launch Added: branches/ng-jtimer/jtimer-server/src/main/go/jtimer-40-green.png branches/ng-jtimer/jtimer-server/src/main/go/jtimer-40-orange.png Modified: branches/ng-jtimer/jtimer-server/src/main/go/conn.go branches/ng-jtimer/jtimer-server/src/main/go/hub.go branches/ng-jtimer/jtimer-server/src/main/go/jtimer.go branches/ng-jtimer/jtimer-server/src/main/go/systray.go branches/ng-jtimer/jtimer-server/src/main/go/ui.go Modified: branches/ng-jtimer/jtimer-server/src/main/go/conn.go =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/go/conn.go 2013-07-26 21:09:49 UTC (rev 2917) +++ branches/ng-jtimer/jtimer-server/src/main/go/conn.go 2013-08-16 15:43:41 UTC (rev 2918) @@ -6,7 +6,7 @@ type connection struct { // The websocket connection. - ws *websocket.Conn + ws *websocket.Conn // Buffered channel of outbound messages. send chan string @@ -40,4 +40,4 @@ defer func() { h.unregister <- c }() go c.writer() c.reader() -} \ No newline at end of file +} Modified: branches/ng-jtimer/jtimer-server/src/main/go/hub.go =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/go/hub.go 2013-07-26 21:09:49 UTC (rev 2917) +++ branches/ng-jtimer/jtimer-server/src/main/go/hub.go 2013-08-16 15:43:41 UTC (rev 2918) @@ -1,44 +1,44 @@ package main type hub struct { - // Registered connections. - connections map[*connection]bool + // Registered connections. + connections map[*connection]bool - // Inbound messages from the connections. - broadcast chan string + // Inbound messages from the connections. + broadcast chan string - // Register requests from the connections. - register chan *connection + // Register requests from the connections. + register chan *connection - // Unregister requests from connections. - unregister chan *connection + // Unregister requests from connections. + unregister chan *connection } -var h = hub{ - broadcast: make(chan string), - register: make(chan *connection), - unregister: make(chan *connection), - connections: make(map[*connection]bool), +var h = hub { + broadcast: make(chan string), + register: make(chan *connection), + unregister: make(chan *connection), + connections: make(map[*connection]bool), } func (h *hub) run() { - for { - select { - case c := <-h.register: - h.connections[c] = true - case c := <-h.unregister: - delete(h.connections, c) - close(c.send) - case m := <-h.broadcast: - for c := range h.connections { - select { - case c.send <- m: - default: - delete(h.connections, c) - close(c.send) - go c.ws.Close() - } - } - } - } + for { + select { + case c := <-h.register: + h.connections[c] = true + case c := <-h.unregister: + delete(h.connections, c) + close(c.send) + case m := <-h.broadcast: + for c := range h.connections { + select { + case c.send <- m: + default: + delete(h.connections, c) + close(c.send) + go c.ws.Close() + } + } + } + } } Added: branches/ng-jtimer/jtimer-server/src/main/go/jtimer-40-green.png =================================================================== (Binary files differ) Property changes on: branches/ng-jtimer/jtimer-server/src/main/go/jtimer-40-green.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/ng-jtimer/jtimer-server/src/main/go/jtimer-40-orange.png =================================================================== (Binary files differ) Property changes on: branches/ng-jtimer/jtimer-server/src/main/go/jtimer-40-orange.png ___________________________________________________________________ Added: svn:mime-type + image/png Modified: branches/ng-jtimer/jtimer-server/src/main/go/jtimer.go =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/go/jtimer.go 2013-07-26 21:09:49 UTC (rev 2917) +++ branches/ng-jtimer/jtimer-server/src/main/go/jtimer.go 2013-08-16 15:43:41 UTC (rev 2918) @@ -1,17 +1,17 @@ /* * Copyright (C) 2013 CodeLutin, Chatellier Eric - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. */ @@ -26,43 +26,40 @@ */ import ( - "fmt" - "log" - "time" - "os" - "net/http" - "github.com/BurntSushi/xgb" - "github.com/BurntSushi/xgb/xproto" - "github.com/BurntSushi/xgb/screensaver" - "code.google.com/p/go.net/websocket" + "code.google.com/p/go.net/websocket" + "fmt" + "github.com/BurntSushi/xgb" + "github.com/BurntSushi/xgb/screensaver" + "github.com/BurntSushi/xgb/xproto" + "log" + "net/http" + "os" + "time" ) func RunIdleReporting() { - X, err := xgb.NewConn() - if err != nil { - fmt.Println(err) - return - } + X, err := xgb.NewConn() + if err != nil { + fmt.Println(err) + return + } - screen := xproto.Setup(X).DefaultScreen(X) - //wid, err := xproto.NewWindowId(X) - draw := xproto.Drawable(screen.Root) - screensaver.Init(X) + screen := xproto.Setup(X).DefaultScreen(X) + //wid, err := xproto.NewWindowId(X) + draw := xproto.Drawable(screen.Root) + screensaver.Init(X) - // connect to webscocket server - origin := "http://localhost:8080/" - url := "ws://localhost:12345/jtimer" - - for { - time.Sleep(1 * time.Second) - cookie := screensaver.QueryInfo(X, draw) - reply, _ := cookie.Reply() - fmt.Println("Idle since", reply.MsSinceUserInput); - - ws, _ := websocket.Dial(url, "", origin) - msSinceUserInputString := fmt.Sprintf("{idle:%d}", reply.MsSinceUserInput) - websocket.Message.Send(ws, msSinceUserInputString) - } + //lastIdleTime := -1 + for { + time.Sleep(1 * time.Second) + cookie := screensaver.QueryInfo(X, draw) + reply, _ := cookie.Reply() + currentIdleTime := reply.MsSinceUserInput + fmt.Println("Idle since", currentIdleTime) + + msSinceUserInputString := fmt.Sprintf("{idle:%d}", currentIdleTime) + h.broadcast <- msSinceUserInputString + } } func StartWebsocketServer() { @@ -76,8 +73,13 @@ func main() { go StartWebsocketServer() go RunIdleReporting() - cmd := RunClient() - cmd.Start() + cmd := RunBrowser() + err := cmd.Start() + if err != nil { + log.Fatal(err) + } + time.Sleep(5 * time.Second) + ControlWindow() InstallSystray(&os.Args) cmd.Process.Kill() } Modified: branches/ng-jtimer/jtimer-server/src/main/go/systray.go =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/go/systray.go 2013-07-26 21:09:49 UTC (rev 2917) +++ branches/ng-jtimer/jtimer-server/src/main/go/systray.go 2013-08-16 15:43:41 UTC (rev 2918) @@ -1,8 +1,8 @@ package main import ( - "github.com/mattn/go-gtk/gtk" "github.com/mattn/go-gtk/glib" + "github.com/mattn/go-gtk/gtk" ) func InstallSystray(args *[]string) { @@ -16,18 +16,18 @@ // Hide menu item miHide := gtk.NewMenuItemWithLabel("Cacher") miHide.Connect("activate", func() { - + }) popupMenu.Append(miHide) - + // Stop all task popupMenu.Append(gtk.NewSeparatorMenuItem()) miStop := gtk.NewMenuItemWithLabel("Arrêter toutes les tâches") miStop.Connect("activate", func() { - + }) popupMenu.Append(miStop) - + // Quit miQuit := gtk.NewMenuItemWithLabel("Quitter") miQuit.Connect("activate", func() { @@ -45,4 +45,4 @@ }) gtk.Main() -} \ No newline at end of file +} Modified: branches/ng-jtimer/jtimer-server/src/main/go/ui.go =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/go/ui.go 2013-07-26 21:09:49 UTC (rev 2917) +++ branches/ng-jtimer/jtimer-server/src/main/go/ui.go 2013-08-16 15:43:41 UTC (rev 2918) @@ -2,10 +2,70 @@ import ( "os/exec" + "os/user" + "log" + "fmt" + "strings" + + "github.com/BurntSushi/xgb/xproto" + "github.com/BurntSushi/xgbutil" + "github.com/BurntSushi/xgbutil/ewmh" + //"github.com/BurntSushi/xgbutil/icccm" + //"github.com/BurntSushi/xgbutil/xwindow" ) -func RunClient() *exec.Cmd { +func RunBrowser() *exec.Cmd { + + usr, err := user.Current() + if err != nil { + log.Fatal( err ) + } + binary, _ := exec.LookPath("chromium") return exec.Command(binary, "--app=http://localhost:8080", - "--user-data-dir=/tmp/jtimer") + "--user-data-dir=" + usr.HomeDir + "/.jtimer/chromium") } + +func ControlWindow() { + // Connect to the X server using the DISPLAY environment variable. + X, err := xgbutil.NewConn() + if err != nil { + log.Fatal(err) + } + + // Get a list of all client ids. + clientids, err := ewmh.ClientListGet(X) + if err != nil { + log.Fatal(err) + } + + // Iterate through each client, find its name and find its size. + for _, clientid := range clientids { + name, _ := ewmh.WmNameGet(X, clientid) + + if strings.Contains(name, "jTimer") { + fmt.Println("Found jtimer (0x%x)", clientid) + + //win := xwindow.New(X, clientid) + + XConn := X.Conn() + xproto.MapWindow(XConn, clientid) + for { + ev, xerr := XConn.WaitForEvent() + if ev == nil && xerr == nil { + fmt.Println("Both event and error are nil. Exiting...") + return + } + + if ev != nil { + fmt.Printf("Event: %s\n", ev) + } + if xerr != nil { + fmt.Printf("Error: %s\n", xerr) + } + } + } + + //fmt.Printf("%s (0x%x)\n", name, clientid) + } +}

1 0

r2917 - branches/ng-jtimer/jtimer-server/src/main/go
by echatellier＠users.chorem.org 26 Jul '13

26 Jul '13

Author: echatellier Date: 2013-07-26 23:09:49 +0200 (Fri, 26 Jul 2013) New Revision: 2917 Url: http://chorem.org/projects/jtimer/repository/revisions/2917 Log: Start chromium and add systray menu Added: branches/ng-jtimer/jtimer-server/src/main/go/systray.go branches/ng-jtimer/jtimer-server/src/main/go/ui.go Modified: branches/ng-jtimer/jtimer-server/src/main/go/jtimer.go branches/ng-jtimer/jtimer-server/src/main/go/readme.txt Modified: branches/ng-jtimer/jtimer-server/src/main/go/jtimer.go =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/go/jtimer.go 2013-07-26 20:04:45 UTC (rev 2916) +++ branches/ng-jtimer/jtimer-server/src/main/go/jtimer.go 2013-07-26 21:09:49 UTC (rev 2917) @@ -27,13 +27,14 @@ import ( "fmt" + "log" + "time" + "os" "net/http" - "time" "github.com/BurntSushi/xgb" "github.com/BurntSushi/xgb/xproto" "github.com/BurntSushi/xgb/screensaver" "code.google.com/p/go.net/websocket" - "log" ) func RunIdleReporting() { @@ -74,5 +75,9 @@ func main() { go StartWebsocketServer() - RunIdleReporting() + go RunIdleReporting() + cmd := RunClient() + cmd.Start() + InstallSystray(&os.Args) + cmd.Process.Kill() } Modified: branches/ng-jtimer/jtimer-server/src/main/go/readme.txt =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/go/readme.txt 2013-07-26 20:04:45 UTC (rev 2916) +++ branches/ng-jtimer/jtimer-server/src/main/go/readme.txt 2013-07-26 21:09:49 UTC (rev 2917) @@ -5,12 +5,13 @@ -------------------- go get github.com/BurntSushi/xgb/screensaver go get code.google.com/p/go.net/websocket +go get github.com/mattn/go-gtk/gtk Lancement --------- -go run *.go +go run [^j]*.go jtimer.go Compilation ----------- -go build -o jtimer *.go +go build -o jtimer [^j]*.go jtimer.go Added: branches/ng-jtimer/jtimer-server/src/main/go/systray.go =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/go/systray.go (rev 0) +++ branches/ng-jtimer/jtimer-server/src/main/go/systray.go 2013-07-26 21:09:49 UTC (rev 2917) @@ -0,0 +1,48 @@ +package main + +import ( + "github.com/mattn/go-gtk/gtk" + "github.com/mattn/go-gtk/glib" +) + +func InstallSystray(args *[]string) { + gtk.Init(args) + + glib.SetApplicationName("go-gtk-statusicon-example") + + // Popup menu + popupMenu := gtk.NewMenu() + + // Hide menu item + miHide := gtk.NewMenuItemWithLabel("Cacher") + miHide.Connect("activate", func() { + + }) + popupMenu.Append(miHide) + + // Stop all task + popupMenu.Append(gtk.NewSeparatorMenuItem()) + miStop := gtk.NewMenuItemWithLabel("Arrêter toutes les tâches") + miStop.Connect("activate", func() { + + }) + popupMenu.Append(miStop) + + // Quit + miQuit := gtk.NewMenuItemWithLabel("Quitter") + miQuit.Connect("activate", func() { + gtk.MainQuit() + }) + popupMenu.Append(miQuit) + + // install systray with popup menu + popupMenu.ShowAll() + si := gtk.NewStatusIconFromFile("jtimer-40-green.png") + si.SetTitle("jTimer") + si.SetTooltipMarkup("jTimer 2.0") + si.Connect("popup-menu", func(cbx *glib.CallbackContext) { + popupMenu.Popup(nil, nil, gtk.StatusIconPositionMenu, si, uint(cbx.Args(0)), uint32(cbx.Args(1))) + }) + + gtk.Main() +} \ No newline at end of file Added: branches/ng-jtimer/jtimer-server/src/main/go/ui.go =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/go/ui.go (rev 0) +++ branches/ng-jtimer/jtimer-server/src/main/go/ui.go 2013-07-26 21:09:49 UTC (rev 2917) @@ -0,0 +1,11 @@ +package main + +import ( + "os/exec" +) + +func RunClient() *exec.Cmd { + binary, _ := exec.LookPath("chromium") + return exec.Command(binary, "--app=http://localhost:8080", + "--user-data-dir=/tmp/jtimer") +}

1 0

r2916 - in branches/ng-jtimer/jtimer-server/src/main: go webapp/js
by echatellier＠users.chorem.org 26 Jul '13

26 Jul '13

Author: echatellier Date: 2013-07-26 22:04:45 +0200 (Fri, 26 Jul 2013) New Revision: 2916 Url: http://chorem.org/projects/jtimer/repository/revisions/2916 Log: Add go websocket server and js client Added: branches/ng-jtimer/jtimer-server/src/main/go/conn.go branches/ng-jtimer/jtimer-server/src/main/go/hub.go branches/ng-jtimer/jtimer-server/src/main/go/readme.txt Modified: branches/ng-jtimer/jtimer-server/src/main/go/jtimer.go branches/ng-jtimer/jtimer-server/src/main/webapp/js/controllers.js Added: branches/ng-jtimer/jtimer-server/src/main/go/conn.go =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/go/conn.go (rev 0) +++ branches/ng-jtimer/jtimer-server/src/main/go/conn.go 2013-07-26 20:04:45 UTC (rev 2916) @@ -0,0 +1,43 @@ +package main + +import ( + "code.google.com/p/go.net/websocket" +) + +type connection struct { + // The websocket connection. + ws *websocket.Conn + + // Buffered channel of outbound messages. + send chan string +} + +func (c *connection) reader() { + for { + var message string + err := websocket.Message.Receive(c.ws, &message) + if err != nil { + break + } + h.broadcast <- message + } + c.ws.Close() +} + +func (c *connection) writer() { + for message := range c.send { + err := websocket.Message.Send(c.ws, message) + if err != nil { + break + } + } + c.ws.Close() +} + +func wsHandler(ws *websocket.Conn) { + c := &connection{send: make(chan string, 256), ws: ws} + h.register <- c + defer func() { h.unregister <- c }() + go c.writer() + c.reader() +} \ No newline at end of file Added: branches/ng-jtimer/jtimer-server/src/main/go/hub.go =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/go/hub.go (rev 0) +++ branches/ng-jtimer/jtimer-server/src/main/go/hub.go 2013-07-26 20:04:45 UTC (rev 2916) @@ -0,0 +1,44 @@ +package main + +type hub struct { + // Registered connections. + connections map[*connection]bool + + // Inbound messages from the connections. + broadcast chan string + + // Register requests from the connections. + register chan *connection + + // Unregister requests from connections. + unregister chan *connection +} + +var h = hub{ + broadcast: make(chan string), + register: make(chan *connection), + unregister: make(chan *connection), + connections: make(map[*connection]bool), +} + +func (h *hub) run() { + for { + select { + case c := <-h.register: + h.connections[c] = true + case c := <-h.unregister: + delete(h.connections, c) + close(c.send) + case m := <-h.broadcast: + for c := range h.connections { + select { + case c.send <- m: + default: + delete(h.connections, c) + close(c.send) + go c.ws.Close() + } + } + } + } +} Modified: branches/ng-jtimer/jtimer-server/src/main/go/jtimer.go =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/go/jtimer.go 2013-07-26 17:24:01 UTC (rev 2915) +++ branches/ng-jtimer/jtimer-server/src/main/go/jtimer.go 2013-07-26 20:04:45 UTC (rev 2916) @@ -1,35 +1,42 @@ +/* + * Copyright (C) 2013 CodeLutin, Chatellier Eric + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + */ + package main +/** + * Start a web socket server on port 12345. + * Notify idleness on ws://localhost:12345/jtimer + * + * jTimer ui can connect to ws://localhost:12345/jtimer to receive idle activity + */ + import ( "fmt" "net/http" "time" - //"log" - //"strconv" "github.com/BurntSushi/xgb" "github.com/BurntSushi/xgb/xproto" "github.com/BurntSushi/xgb/screensaver" "code.google.com/p/go.net/websocket" + "log" ) - -// echo back the websocket. -func EchoServer(ws *websocket.Conn) { - var message string - websocket.Message.Receive(ws, &message) - fmt.Println("[Received] ", message) -} - -func WebSocketServer() { - http.Handle("/echo", websocket.Handler(EchoServer)); - err := http.ListenAndServe(":12345", nil); - if err != nil { - //panic("ListenAndServe: ", err.String()) - fmt.Println("[Debug] "); - } -} - -func RunTimer() { +func RunIdleReporting() { X, err := xgb.NewConn() if err != nil { fmt.Println(err) @@ -42,8 +49,8 @@ screensaver.Init(X) // connect to webscocket server - origin := "http://localhost:12345/" - url := "ws://localhost:12345/echo" + origin := "http://localhost:8080/" + url := "ws://localhost:12345/jtimer" for { time.Sleep(1 * time.Second) @@ -53,14 +60,19 @@ ws, _ := websocket.Dial(url, "", origin) msSinceUserInputString := fmt.Sprintf("{idle:%d}", reply.MsSinceUserInput) - /*if _, err := ws.Write([]byte(msSinceUserInputString)); err != nil { - log.Fatal(err) - }*/ websocket.Message.Send(ws, msSinceUserInputString) } } +func StartWebsocketServer() { + go h.run() + http.Handle("/jtimer", websocket.Handler(wsHandler)) + if err := http.ListenAndServe(":12345", nil); err != nil { + log.Fatal("ListenAndServe:", err) + } +} + func main() { - go WebSocketServer() - RunTimer() + go StartWebsocketServer() + RunIdleReporting() } Added: branches/ng-jtimer/jtimer-server/src/main/go/readme.txt =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/go/readme.txt (rev 0) +++ branches/ng-jtimer/jtimer-server/src/main/go/readme.txt 2013-07-26 20:04:45 UTC (rev 2916) @@ -0,0 +1,16 @@ +Compilation do client go +======================== + +Packages necessaires +-------------------- +go get github.com/BurntSushi/xgb/screensaver +go get code.google.com/p/go.net/websocket + +Lancement +--------- +go run *.go + + +Compilation +----------- +go build -o jtimer *.go Modified: branches/ng-jtimer/jtimer-server/src/main/webapp/js/controllers.js =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/webapp/js/controllers.js 2013-07-26 17:24:01 UTC (rev 2915) +++ branches/ng-jtimer/jtimer-server/src/main/webapp/js/controllers.js 2013-07-26 20:04:45 UTC (rev 2916) @@ -321,4 +321,12 @@ // force the first tree creation $scope.createTree(); + + var conn = conn = new WebSocket("ws://localhost:12345/jtimer"); + conn.onclose = function(evt) { + console.log("Connection closed."); + }; + conn.onmessage = function(evt) { + console.log("Message", evt.data); + }; }

1 0