From echatellier@users.chorem.org Fri Jul 19 16:01:19 2013
From: echatellier@users.chorem.org
To: jtimer-commits@list.chorem.org
Subject: [Jtimer-commits] r2906 - in branches/ng-jtimer: . jtimer-server
	jtimer-server/src/main/webapp jtimer-server/src/main/webapp/WEB-INF
	jtimer-server/src/main/webapp/web
Date: Fri, 19 Jul 2013 16:01:19 +0200
Message-ID: <20130719140119.09EEF18D97D@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1134851810421000518=="

--===============1134851810421000518==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: echatellier
Date: 2013-07-19 16:01:18 +0200 (Fri, 19 Jul 2013)
New Revision: 2906

Url: http://chorem.org/projects/jtimer/repository/revisions/2906

Log:
Unbuild client, package server as war.

Added:
   branches/ng-jtimer/jtimer-server/src/main/webapp/WEB-INF/
   branches/ng-jtimer/jtimer-server/src/main/webapp/WEB-INF/web.xml
Modified:
   branches/ng-jtimer/jtimer-server/pom.xml
   branches/ng-jtimer/jtimer-server/src/main/webapp/web/index.html
   branches/ng-jtimer/pom.xml

Modified: branches/ng-jtimer/jtimer-server/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/ng-jtimer/jtimer-server/pom.xml	2013-07-19 13:36:34 UTC (rev 290=
5)
+++ branches/ng-jtimer/jtimer-server/pom.xml	2013-07-19 14:01:18 UTC (rev 290=
6)
@@ -10,7 +10,7 @@
=20
   <groupId>org.chorem.jtimer</groupId>
   <artifactId>jtimer-server</artifactId>
-  <packaging>jar</packaging>
+  <packaging>war</packaging>
=20
   <dependencies>
     <dependency>
@@ -44,6 +44,11 @@
=20
     <plugins>
       <plugin>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-maven-plugin</artifactId>
+        <version>9.0.4.v20130625</version>
+      </plugin>
+      <plugin>
         <groupId>ro.isdc.wro4j</groupId>
         <artifactId>wro4j-maven-plugin</artifactId>
         <executions>

Added: branches/ng-jtimer/jtimer-server/src/main/webapp/WEB-INF/web.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/ng-jtimer/jtimer-server/src/main/webapp/WEB-INF/web.xml	        =
                (rev 0)
+++ branches/ng-jtimer/jtimer-server/src/main/webapp/WEB-INF/web.xml	2013-07-=
19 14:01:18 UTC (rev 2906)
@@ -0,0 +1,4 @@
+<web-app xmlns=3D"http://java.sun.com/xml/ns/javaee"
+      xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation=3D"http://java.sun.com/xml/ns/javaee http://java.su=
n.com/xml/ns/javaee/web-app_3_0.xsd"
+      version=3D"3.0" />
\ No newline at end of file


Property changes on: branches/ng-jtimer/jtimer-server/src/main/webapp/WEB-INF=
/web.xml
___________________________________________________________________
Added: svn:mime-type
   + text/xml
Added: svn:keywords
   + Author Date Id Revision HeadURL
Added: svn:eol-style
   + native

Modified: branches/ng-jtimer/jtimer-server/src/main/webapp/web/index.html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/ng-jtimer/jtimer-server/src/main/webapp/web/index.html	2013-07-1=
9 13:36:34 UTC (rev 2905)
+++ branches/ng-jtimer/jtimer-server/src/main/webapp/web/index.html	2013-07-1=
9 14:01:18 UTC (rev 2906)
@@ -4,15 +4,14 @@
     <title>jTimer (browser)</title>
     <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3Dutf-8">
    =20
-    <!-- <link type=3D"text/css" rel=3D"stylesheet" href=3D"styles/jtimer.cs=
s" />
+    <link type=3D"text/css" rel=3D"stylesheet" href=3D"styles/jtimer.css" />
     <link type=3D"text/css" rel=3D"stylesheet" href=3D"//twitter.github.io/b=
ootstrap/assets/css/bootstrap.css" />
     <script type=3D"text/javascript" src=3D"//code.jquery.com/jquery-2.0.3.m=
in.js"></script>
     <script type=3D"text/javascript" src=3D"//ajax.googleapis.com/ajax/libs/=
angularjs/1.1.5/angular.min.js"></script>
     <script type=3D"text/javascript" src=3D"scripts/app.js"></script>
-    <script type=3D"text/javascript" src=3D"scripts/controllers.js"></script=
> -->
-
-    <link type=3D"text/css" rel=3D"stylesheet" href=3D"css/jtimer.css" />
-    <script type=3D"text/javascript" src=3D"js/jtimer.js"></script>
+    <script type=3D"text/javascript" src=3D"scripts/controllers.js"></script>
+    <!-- <link type=3D"text/css" rel=3D"stylesheet" href=3D"css/jtimer.css" =
/>
+    <script type=3D"text/javascript" src=3D"js/jtimer.js"></script> -->
     <script type=3D"text/javascript" src=3D"//angular-ui.github.io/bootstrap=
/ui-bootstrap-tpls-0.4.0.js"></script>
=20
     <script type=3D"text/ng-template"  id=3D"tree_item_renderer_name.html">

Modified: branches/ng-jtimer/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/ng-jtimer/pom.xml	2013-07-19 13:36:34 UTC (rev 2905)
+++ branches/ng-jtimer/pom.xml	2013-07-19 14:01:18 UTC (rev 2906)
@@ -21,7 +21,6 @@
=20
   <modules>
     <module>jtimer-server</module>
-    <module>jtimer-client</module>
   </modules>
=20
   <licenses>


--===============1134851810421000518==--