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

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

22 Aug '13

Author: echatellier Date: 2013-08-22 22:45:33 +0200 (Thu, 22 Aug 2013) New Revision: 2928 Url: http://chorem.org/projects/jtimer/repository/revisions/2928 Log: Ajout de services restlet pour la syncho app html <> serveur Modified: branches/ng-jtimer/jtimer-server/pom.xml Modified: branches/ng-jtimer/jtimer-server/pom.xml =================================================================== --- branches/ng-jtimer/jtimer-server/pom.xml 2013-08-22 20:44:57 UTC (rev 2927) +++ branches/ng-jtimer/jtimer-server/pom.xml 2013-08-22 20:45:33 UTC (rev 2928) @@ -38,11 +38,6 @@ <version>2.2-M3</version> </dependency> <dependency> - <groupId>org.restlet.jee</groupId> - <artifactId>org.restlet.ext.jackson</artifactId> - <version>2.2-M3</version> - </dependency> - <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-runner</artifactId> <version>9.0.5.v20130815</version>

1 0

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

22 Aug '13

Author: echatellier Date: 2013-08-22 22:44:57 +0200 (Thu, 22 Aug 2013) New Revision: 2927 Url: http://chorem.org/projects/jtimer/repository/revisions/2927 Log: Ajout de services restlet pour la syncho app html <> serveur Removed: branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/entities/TimerProject.java branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/services/ 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 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 Deleted: branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/entities/TimerProject.java =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/entities/TimerProject.java 2013-08-22 19:16:31 UTC (rev 2926) +++ branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/entities/TimerProject.java 2013-08-22 20:44:57 UTC (rev 2927) @@ -1,56 +0,0 @@ -/* - * #%L - * jTimer - * - * $Id$ - * $HeadURL$ - * %% - * 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>. - * #L% - */ - -package org.chorem.jtimer.entities; - -/** - * Represent a project. - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class TimerProject extends TimerTask { - - /** serialVersionUID. */ - private static final long serialVersionUID = -8953488997256237790L; - - /** - * Constructor. - */ - public TimerProject() { - } - - /** - * Constructor with name. - * - * @param name project name - */ - public TimerProject(String name) { - super(name); - } -} 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-22 19:16:31 UTC (rev 2926) +++ branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/entities/TimerTask.java 2013-08-22 20:44:57 UTC (rev 2927) @@ -57,6 +57,12 @@ /** Closed task. */ protected boolean closed; + /** Today time. */ + protected long todayTime; + + /** Total time. */ + protected long totalTime; + /** * Constructor. */ @@ -70,8 +76,9 @@ * * @param name task name */ - public TimerTask(String name) { + public TimerTask(long number, String name) { this(); + this.number = number; this.name = name; } @@ -154,4 +161,20 @@ public void setClosed(boolean closed) { this.closed = closed; } + + public long getTodayTime() { + return todayTime; + } + + public void setTodayTime(long todayTime) { + this.todayTime = todayTime; + } + + public long getTotalTime() { + return totalTime; + } + + public void setTotalTime(long totalTime) { + this.totalTime = totalTime; + } } \ 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-22 19:16:31 UTC (rev 2926) +++ branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/storage/Storage.java 2013-08-22 20:44:57 UTC (rev 2927) @@ -12,7 +12,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.jtimer.entities.TimerProject; import org.chorem.jtimer.entities.TimerTask; /** @@ -146,8 +145,9 @@ statement.executeUpdate("CREATE TABLE " + TABLE_TIME + "(taskid LONG NOT NULL REFERENCES " + TABLE_TASK + "(id)," + " date DATE," + + " uuid varchar(255) unique," + " duration LONG," + - " PRIMARY KEY (taskid, date))"); + " PRIMARY KEY (taskid, date, uuid))"); } catch (SQLException ex) { throw new StorageException("Can't create schema", ex); } finally { @@ -161,90 +161,13 @@ * * @return all projects */ - public int getProjectsCount() { + public int getTasksCount() { int result = 0; - Statement statement = null; - try { - statement = connection.createStatement(); - ResultSet rs = statement.executeQuery("SELECT count(*) FROM " + TABLE_TASK + - " WHERE parent = 0"); - if (rs.next()) { - result = rs.getInt(1); - } - } catch (SQLException ex) { - throw new StorageException("Can't get project count", ex); - } finally { - closeStatement(statement); - } - return result; - } - - /** - * Find all project. (task with no parent, parent = 0). - * - * @return all projects - */ - public List<TimerProject> getProjects() { - List<TimerProject> projects = new ArrayList<TimerProject>(); PreparedStatement statement = null; try { - statement = connection.prepareStatement("SELECT * FROM " + TABLE_TASK + - " WHERE parent = 0 ORDER BY id"); + statement = connection.prepareStatement("SELECT count(*) FROM " + TABLE_TASK); ResultSet rs = statement.executeQuery(); - while (rs.next()) { - TimerProject project = new TimerProject(); - project.setNumber(rs.getInt("id")); - project.setName(rs.getString("name")); - projects.add(project); - } - } catch (SQLException ex) { - throw new StorageException("Can't get project", ex); - } finally { - closeStatement(statement); - } - return projects; - } - - /** - * Find all project. (task with no parent, parent = 0). - * - * @return all projects - */ - public TimerProject getProject(int offset) { - TimerProject project = null; - PreparedStatement statement = null; - try { - statement = connection.prepareStatement("SELECT * FROM " + TABLE_TASK + - " WHERE parent = 0 ORDER BY id LIMIT 1 OFFSET ?"); - statement.setInt(1, offset); - ResultSet rs = statement.executeQuery(); if (rs.next()) { - project = new TimerProject(); - project.setNumber(rs.getInt("id")); - project.setName(rs.getString("name")); - } - } catch (SQLException ex) { - throw new StorageException("Can't get project", ex); - } finally { - closeStatement(statement); - } - return project; - } - - /** - * Find all project. (task with no parent, parent = 0). - * - * @return all projects - */ - public int getTasksCount(TimerTask parent) { - int result = 0; - PreparedStatement statement = null; - try { - statement = connection.prepareStatement("SELECT count(*) FROM " + TABLE_TASK + - " WHERE parent = ?"); - statement.setLong(1, parent.getNumber()); - ResultSet rs = statement.executeQuery(); - if (rs.next()) { result = rs.getInt(1); } } catch (SQLException ex) { @@ -254,81 +177,47 @@ } return result; } - - public TimerTask getTasks(TimerTask parent, int offset) { - TimerTask task = null; + + public List<TimerTask> getTasks() { + List<TimerTask> tasks = new ArrayList<>(); PreparedStatement statement = null; + PreparedStatement statement2 = null; try { - statement = connection.prepareStatement("SELECT * FROM " + TABLE_TASK + - " WHERE parent = ? ORDER BY id LIMIT 1 OFFSET ?"); - statement.setLong(1, parent.getNumber()); - statement.setLong(2, offset); + statement = connection.prepareStatement("SELECT TA.*, sum(TI.duration) AS totalduration FROM " + + TABLE_TASK + " TA, " + TABLE_TIME + " TI" + + " WHERE TA.id = TI.taskid" + + " GROUP BY TA.id"); ResultSet rs = statement.executeQuery(); while (rs.next()) { - task = new TimerTask(); + TimerTask task = new TimerTask(); task.setNumber(rs.getInt("id")); task.setName(rs.getString("name")); + task.setTodayTime(0); + task.setTotalTime(rs.getLong("totalduration")); + tasks.add(task); } - } catch (SQLException ex) { - throw new StorageException("Can't get task", ex); - } finally { - closeStatement(statement); - } - return task; - } - - /** - * Find sub tasks.. - * - * @param parent parent task - * @return all sub tasks - */ - public List<TimerTask> getTasks(TimerTask parent) { - List<TimerTask> tasks = new ArrayList<TimerTask>(); - PreparedStatement statement = null; - try { - statement = connection.prepareStatement("SELECT * FROM " + TABLE_TASK + - " WHERE parent = ? ORDER BY id"); - statement.setLong(1, parent.getNumber()); - ResultSet rs = statement.executeQuery(); + + // not timed tasks + statement2 = connection.prepareStatement("SELECT * FROM " + TABLE_TASK + + " WHERE id not in (SELECT taskid FROM " + TABLE_TIME + ")"); + rs = statement2.executeQuery(); while (rs.next()) { TimerTask task = new TimerTask(); task.setNumber(rs.getInt("id")); task.setName(rs.getString("name")); + task.setTodayTime(0); + task.setTotalTime(0); tasks.add(task); } } catch (SQLException ex) { throw new StorageException("Can't get task", ex); } finally { closeStatement(statement); + closeStatement(statement2); } return tasks; } - public void addProject(TimerProject project) { - PreparedStatement statement = null; - try { - statement = connection.prepareStatement("INSERT INTO " + - TABLE_TASK + "(name, parent, hidden, note)" + - " VALUES (?, ?, ?, ?)", Statement.RETURN_GENERATED_KEYS); - statement.setString(1, project.getName()); - statement.setLong(2, 0); - statement.setBoolean(3, project.isClosed()); - statement.setString(4, null /*project.getNote()*/); - statement.executeUpdate(); - - // get generated id - ResultSet rs = statement.getGeneratedKeys(); - if (rs.next()) { - project.setNumber(rs.getInt(1)); - } - } catch (SQLException ex) { - throw new StorageException("Can't add project", ex); - } finally { - closeStatement(statement); - } - } - public void addTask(TimerTask task) { PreparedStatement statement = null; try { @@ -353,10 +242,6 @@ } } - public void modifyProject(TimerProject project) { - modifyTask(project); - } - public void modifyTask(TimerTask task) { PreparedStatement statement = null; try { @@ -380,39 +265,23 @@ } } - /*protected void saveTaskTimes(TimerTask task) throws SQLException { - - // delete all + public void addTaskTime(TimerTask task, Date date, String uuid, long duration) { PreparedStatement statement = null; try { - statement = connection.prepareStatement("DELETE " + TABLE_TIME + - " WHERE TASKID = ?"); + statement = connection.prepareStatement("INSERT INTO " + TABLE_TIME + + "(taskid, date, uuid, duration)" + + " VALUES(?, ?, ?, ?)"); + statement.setLong(1, task.getNumber()); + statement.setDate(2, new java.sql.Date(date.getTime())); + statement.setString(3, uuid); + statement.setLong(4, duration); statement.executeUpdate(); + } catch (SQLException ex) { + throw new StorageException("Can't add task time", ex); } finally { closeStatement(statement); } - - // add new - try { - statement = connection.prepareStatement("INSERT INTO " + TABLE_TIME + - "(taskid, date, duration)" + - " VALUES(?, ?, ?)"); - SortedMap<Date, Long> taskTimes = task.getAllDaysAndTimes(); - for (Map.Entry<Date, Long> taskTime : taskTimes.entrySet()) { - statement.setLong(1, task.getNumber()); - statement.setDate(2, new java.sql.Date(taskTime.getKey().getTime())); - statement.setLong(3, taskTime.getValue()); - - statement.executeUpdate(); - } - } finally { - closeStatement(statement); - } - }*/ - - public void deleteProject(TimerProject project) { - deleteTask(project); } public void deleteTask(TimerTask task) { @@ -432,13 +301,4 @@ public void setAnnotation(TimerTask task, Date date, String annotation) { } - - /*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 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-22 19:16:31 UTC (rev 2926) +++ branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/RestApplication.java 2013-08-22 20:44:57 UTC (rev 2927) @@ -1,6 +1,12 @@ package org.chorem.jtimer.web; +import java.util.Date; +import java.util.UUID; + +import org.chorem.jtimer.entities.TimerTask; +import org.chorem.jtimer.storage.Storage; import org.restlet.Application; +import org.restlet.Context; import org.restlet.Restlet; import org.restlet.routing.Router; @@ -13,14 +19,39 @@ public synchronized Restlet createInboundRoot() { // Create a router Restlet that routes each call to a // new instance of ProjectsResource. - Router router = new Router(getContext()); + Context context = getContext(); + initContext(context); + Router router = new Router(context); // Defines only one route router.attach("/tasks", TasksResource.class); - router.attach("/task/{task}", TaskResource.class); - router.attach("/task/{task}/time", TimeResource.class); + router.attach("/tasks/{taskId}", TaskResource.class); + router.attach("/tasks/{taskId}/time", TimeResource.class); return router; } + protected void initContext(Context context) { + Storage storage = new Storage(); + + if (storage.getTasksCount() == 0) { + + TimerTask jTimerProject = new TimerTask(1, "jTimer"); + jTimerProject.setNumber(1); + TimerTask jTimerTask1 = new TimerTask(2, "WebService"); + jTimerTask1.setParent(jTimerProject.getNumber()); + storage.addTask(jTimerProject); + storage.addTask(jTimerTask1); + storage.addTaskTime(jTimerTask1, new Date(), UUID.randomUUID().toString(), 4567); + storage.addTaskTime(jTimerTask1, new Date(), UUID.randomUUID().toString(), 20); + + storage.addTask(new TimerTask(3, "Chorem")); + storage.addTask(new TimerTask(4, "Wikitty")); + storage.addTask(new TimerTask(5, "Nuiton-js")); + storage.addTask(new TimerTask(6, "Angular")); + storage.addTask(new TimerTask(7, "Isis-Fish")); + } + + context.getAttributes().put(Storage.class.getName(), storage); + } } \ No newline at end of file Modified: 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 2013-08-22 19:16:31 UTC (rev 2926) +++ branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/TaskResource.java 2013-08-22 20:44:57 UTC (rev 2927) @@ -1,5 +1,6 @@ package org.chorem.jtimer.web; +import org.chorem.jtimer.storage.Storage; import org.restlet.data.MediaType; import org.restlet.representation.Representation; import org.restlet.representation.StringRepresentation; @@ -9,13 +10,16 @@ public class TaskResource extends ServerResource { + protected Storage storage; + @Override protected void doInit() throws ResourceException { - + storage = (Storage)getContext().getAttributes().get(Storage.class.getName()); } @Get("json") public Representation getTask() { - return new StringRepresentation("{}", MediaType.APPLICATION_JSON); + String taskId = (String)getRequest().getAttributes().get("taskId"); + return new StringRepresentation("{args:" + taskId + "}", MediaType.APPLICATION_JSON); } } Modified: 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/TasksResource.java 2013-08-22 19:16:31 UTC (rev 2926) +++ branches/ng-jtimer/jtimer-server/src/main/java/org/chorem/jtimer/web/TasksResource.java 2013-08-22 20:44:57 UTC (rev 2927) @@ -1,32 +1,28 @@ 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.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; +import com.google.gson.Gson; + 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")); - } + @Override + protected void doInit() throws ResourceException { + storage = (Storage)getContext().getAttributes().get(Storage.class.getName()); } @Get("json") public Representation getTasks() { - Representation jsonRep = new JacksonRepresentation<>(storage.getProjects()); - return jsonRep; + Gson gson = new Gson(); + String json = gson.toJson(storage.getTasks()); + return new StringRepresentation(json, MediaType.APPLICATION_JSON); } }

1 0

r2926 - in branches/ng-jtimer: . jtimer-server/src/main/config jtimer-server/src/main/webapp/js jtimer-server/src/main/webapp/partials
by echatellier＠users.chorem.org 22 Aug '13

22 Aug '13

Author: echatellier Date: 2013-08-22 21:16:31 +0200 (Thu, 22 Aug 2013) New Revision: 2926 Url: http://chorem.org/projects/jtimer/repository/revisions/2926 Log: Update to angular 1.2.0-rc1 Modified: branches/ng-jtimer/jtimer-server/src/main/config/wro.xml branches/ng-jtimer/jtimer-server/src/main/webapp/js/app.js branches/ng-jtimer/jtimer-server/src/main/webapp/partials/tasks.html branches/ng-jtimer/pom.xml Modified: branches/ng-jtimer/jtimer-server/src/main/config/wro.xml =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/config/wro.xml 2013-08-22 19:08:36 UTC (rev 2925) +++ branches/ng-jtimer/jtimer-server/src/main/config/wro.xml 2013-08-22 19:16:31 UTC (rev 2926) @@ -1,7 +1,9 @@ <groups xmlns="http://www.isdc.ro/wro"> <group name='jtimer'> + <group-ref>jquery</group-ref> <group-ref>angular</group-ref> - <group-ref>jquery</group-ref> + <group-ref>angular-route</group-ref> + <group-ref>angular-animate</group-ref> <group-ref>bootstrap</group-ref> <group-ref>font-awesome</group-ref> <group-ref>moment</group-ref> Modified: branches/ng-jtimer/jtimer-server/src/main/webapp/js/app.js =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/webapp/js/app.js 2013-08-22 19:08:36 UTC (rev 2925) +++ branches/ng-jtimer/jtimer-server/src/main/webapp/js/app.js 2013-08-22 19:16:31 UTC (rev 2926) @@ -18,25 +18,24 @@ * - $toggleState une fonction qui permet de changer l'etat d'un noeud ('open' <-> 'close') * - * @param {ngAnimator} $animator permet l'ajout, suppression des noeuds dans le DOM + * @param {ngAnimate} $animator permet l'ajout, suppression des noeuds dans le DOM * @param {ngFilter} $filter permet de filtrer les elements de l'arbre a afficher (filtre, tri, ...) * @param {ngParse} $parse permet de parser des expressions qui doivent etre evaluer regulierement sur une scope */ -var wtTreeRepeatDirective = ['$animator', '$filter', '$parse', function($animator, $filter, $parse) { +var wtTreeRepeatDirective = ['$animate', '$filter', '$parse', function($animate, $filter, $parse) { return { transclude: 'element', priority: 1000, terminal: true, compile: function(element, attr, linker) { return function($scope, $element, $attr){ - var animate = $animator($scope, $attr); // use to add/remove element // sert a surveiller les changements sur la donnee ou les filtres // qui engendrerait un besoin de rafraichissement. // (ce tableau contient les fonctions permettant leur desenregistrement) var watchers = []; // element genere HTML et scope du dernier arbre represente - var cache = new Cache(animate); + var cache = new Cache($animate); // indique si l'element root doit etre affiche ou non (faux par defaut) var displayRoot = $parse($attr.wtDisplayRoot || 'false'); // indique si l'arbre doit etre ouvert de facon forcee ou non (faux par defaut) @@ -80,7 +79,7 @@ var update = function(tree) { // les objets HTML et scope utilise durant cette mise a jour // qui pourront etre reutilise durant la mis a jour suivante - var newCache = new Cache(animate); + var newCache = new Cache($animate); // l'index de parcours du noeud, on met dans un tableau // pour avoir une reference lors du passage en argument @@ -141,12 +140,12 @@ }); if (!isNewElement) { - animate.move(cacheEntry.element, null, lastElement); + $animate.move(cacheEntry.element, null, lastElement); lastElement = cacheEntry.element; newCache.put(node, cacheEntry.element, cacheEntry.scope); } else { linker(childScope, function(clone) { - animate.enter(clone, null, lastElement); + $animate.enter(clone, null, lastElement); lastElement = clone; newCache.put(node, clone, childScope); }); @@ -195,7 +194,7 @@ }]; -angular.module('webtimer', ['webtimerFilters']) +angular.module('webtimer', ['webtimerFilters', 'ngRoute', 'ngAnimate']) .config(['$routeProvider', function($routeProvider) { $routeProvider. when('/tasks', {templateUrl: 'partials/tasks.html', controller: TasksCtrl}). Modified: branches/ng-jtimer/jtimer-server/src/main/webapp/partials/tasks.html =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/webapp/partials/tasks.html 2013-08-22 19:08:36 UTC (rev 2925) +++ branches/ng-jtimer/jtimer-server/src/main/webapp/partials/tasks.html 2013-08-22 19:16:31 UTC (rev 2926) @@ -1,49 +1,3 @@ -<script type="text/ng-template" id="tree_item_renderer_details.html"> - <div class="tr" ng-class="{'current-row' : ($node.task === currentTask), 'selected-row' : ($node.task === selectedTask)}" - ng-click="setSelectedTask($node.task)" - ng-dblclick="timeTask($node.task)" - ng-keydown="keyPressed($event)"> - <div class="td" ng-show="showName"> - <span class="spacer level{{$level}}"></span> - <i class="icon-ban-circle" ng-show="$state=='empty'"></i> - <i class="icon-plus-sign" ng-click="$toggleState()" ng-show="$state=='close'"></i> - <i class="icon-minus-sign" ng-click="$toggleState()" ng-show="$state=='open'"></i> - - <form ng-submit="saveTask($node)" ng-show="$node.edit == 'name'"> - <input ng-model="$node.task.name"> - </form> - - <span ng-click="editTask($node, 'name')" ng-show="$node.edit != 'name'">{{$node.task.name}} </span> - - <span class="btn-group action"> - <a class="btn btn-mini" href="" ng-click="timeTask($node.task)"> - <i ng-class="{'icon-play' : ($node.task != currentTask), 'icon-stop' : ($node.task == currentTask)}"></i> - </a> - <a class="btn btn-mini" href="" ng-click="addSubTask($node)"><i class="icon-plus"></i></a> - <a class="btn btn-mini" href="" ng-click="removeTask($node)"><i class="icon-minus"></i></a> - </span> - </div> - - <div class="td today" ng-show="showToday"> - {{$node.getTime().today | time}} - </div> - - <div class="td global" ng-show="showGlobal">{{$node.getTime().global | time}}</div> - - <div class="td tags" ng-show="showTags" ng-click="editTask($node, 'tags')"> - <form ng-submit="saveTask($node)" ng-show="$node.edit == 'tags'"> - <input ng-model="$node.task.tags" ng-list> - </form> - - <span class="label label-info" ng-repeat="tag in $node.task.tags" style="margin-right: 10px;" ng-show="$node.edit != 'tags'"> - {{tag}} - </span> - - <span ng-show="$node.task.tags.length == 0 && $node.edit != 'tags'">No tag</span> - </div> - </div> -</script> - <div id="header"> <span class='left'> <input class='search-query input-small' ng-model="query" placeholder="Search"> @@ -79,10 +33,55 @@ <div class='th global' ng-show="showGlobal">Total</div> <div class='th tags' ng-show="showTags">Tags</div> </div> + <div class="tbody" wt-tree-repeat="tree | filter:query | orderBy:'task.name'" - wt-force-open="query || forceExpanded" - ng-include="'tree_item_renderer_details.html'"></div> + wt-force-open="query || forceExpanded"> + <div class="tr" ng-class="{'current-row' : ($node.task === currentTask), 'selected-row' : ($node.task === selectedTask)}" + ng-click="setSelectedTask($node.task)" + ng-dblclick="timeTask($node.task)" + ng-keydown="keyPressed($event)"> + <div class="td" ng-show="showName"> + <span class="spacer level{{$level}}"></span> + <i class="icon-ban-circle" ng-show="$state=='empty'"></i> + <i class="icon-plus-sign" ng-click="$toggleState()" ng-show="$state=='close'"></i> + <i class="icon-minus-sign" ng-click="$toggleState()" ng-show="$state=='open'"></i> + + <form ng-submit="saveTask($node)" ng-show="$node.edit == 'name'"> + <input ng-model="$node.task.name"> + </form> + + <span ng-click="editTask($node, 'name')" ng-show="$node.edit != 'name'">{{$node.task.name}} </span> + + <span class="btn-group action"> + <a class="btn btn-mini" href="" ng-click="timeTask($node.task)"> + <i ng-class="{'icon-play' : ($node.task != currentTask), 'icon-stop' : ($node.task == currentTask)}"></i> + </a> + <a class="btn btn-mini" href="" ng-click="addSubTask($node)"><i class="icon-plus"></i></a> + <a class="btn btn-mini" href="" ng-click="removeTask($node)"><i class="icon-minus"></i></a> + </span> + </div> + + <div class="td today" ng-show="showToday"> + {{$node.getTime().today | time}} + </div> + + <div class="td global" ng-show="showGlobal">{{$node.getTime().global | time}}</div> + + <div class="td tags" ng-show="showTags" ng-click="editTask($node, 'tags')"> + <form ng-submit="saveTask($node)" ng-show="$node.edit == 'tags'"> + <input ng-model="$node.task.tags" ng-list> + </form> + + <span class="label label-info" ng-repeat="tag in $node.task.tags" style="margin-right: 10px;" ng-show="$node.edit != 'tags'"> + {{tag}} + </span> + + <span ng-show="$node.task.tags.length == 0 && $node.edit != 'tags'">No tag</span> + </div> + </div> + </div> + </div> </div> Modified: branches/ng-jtimer/pom.xml =================================================================== --- branches/ng-jtimer/pom.xml 2013-08-22 19:08:36 UTC (rev 2925) +++ branches/ng-jtimer/pom.xml 2013-08-22 19:16:31 UTC (rev 2926) @@ -53,7 +53,7 @@ <dependency> <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-angular</artifactId> - <version>1.1.5-1</version> + <version>1.2.0-rc1-1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.nuiton.js</groupId>

1 0

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