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 =================================================================== --- branches/ng-jtimer/jtimer-server/pom.xml 2013-07-19 13:36:34 UTC (rev 2905) +++ branches/ng-jtimer/jtimer-server/pom.xml 2013-07-19 14:01:18 UTC (rev 2906) @@ -10,7 +10,7 @@ <groupId>org.chorem.jtimer</groupId> <artifactId>jtimer-server</artifactId> - <packaging>jar</packaging> + <packaging>war</packaging> <dependencies> <dependency> @@ -44,6 +44,11 @@ <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 =================================================================== --- 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="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" + version="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 =================================================================== --- branches/ng-jtimer/jtimer-server/src/main/webapp/web/index.html 2013-07-19 13:36:34 UTC (rev 2905) +++ branches/ng-jtimer/jtimer-server/src/main/webapp/web/index.html 2013-07-19 14:01:18 UTC (rev 2906) @@ -4,15 +4,14 @@ <title>jTimer (browser)</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <!-- <link type="text/css" rel="stylesheet" href="styles/jtimer.css" /> + <link type="text/css" rel="stylesheet" href="styles/jtimer.css" /> <link type="text/css" rel="stylesheet" href="//twitter.github.io/bootstrap/assets/css/bootstrap.css" /> <script type="text/javascript" src="//code.jquery.com/jquery-2.0.3.min.js"></script> <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/angularjs/1.1.5/angular.min.js"></script> <script type="text/javascript" src="scripts/app.js"></script> - <script type="text/javascript" src="scripts/controllers.js"></script> --> - - <link type="text/css" rel="stylesheet" href="css/jtimer.css" /> - <script type="text/javascript" src="js/jtimer.js"></script> + <script type="text/javascript" src="scripts/controllers.js"></script> + <!-- <link type="text/css" rel="stylesheet" href="css/jtimer.css" /> + <script type="text/javascript" src="js/jtimer.js"></script> --> <script type="text/javascript" src="//angular-ui.github.io/bootstrap/ui-bootstrap-tpls-0.4.0.js"></script> <script type="text/ng-template" id="tree_item_renderer_name.html"> Modified: branches/ng-jtimer/pom.xml =================================================================== --- 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 @@ <modules> <module>jtimer-server</module> - <module>jtimer-client</module> </modules> <licenses>