diff options
-rwxr-xr-x | pom.xml | 4 | ||||
-rw-r--r-- | src/main/resources/webapp/WEB-INF/shiro.ini (renamed from src/main/webapp/WEB-INF/shiro.ini) | 0 | ||||
-rw-r--r-- | src/main/resources/webapp/WEB-INF/tags/common/footer.tagx (renamed from src/main/webapp/WEB-INF/tags/common/footer.tagx) | 0 | ||||
-rwxr-xr-x | src/main/resources/webapp/WEB-INF/tags/common/head.tagx (renamed from src/main/webapp/WEB-INF/tags/common/head.tagx) | 0 | ||||
-rw-r--r-- | src/main/resources/webapp/WEB-INF/tags/common/headjs.tagx (renamed from src/main/webapp/WEB-INF/tags/common/headjs.tagx) | 0 | ||||
-rwxr-xr-x | src/main/resources/webapp/WEB-INF/urlrewrite.xml (renamed from src/main/webapp/WEB-INF/urlrewrite.xml) | 0 | ||||
-rw-r--r-- | src/main/resources/webapp/WEB-INF/web.xml (renamed from src/main/webapp/WEB-INF/web.xml) | 0 | ||||
-rwxr-xr-x | src/main/resources/webapp/apps/app.css (renamed from src/main/webapp/apps/app.css) | 0 | ||||
-rwxr-xr-x | src/main/resources/webapp/apps/app.js (renamed from src/main/webapp/apps/app.js) | 0 | ||||
-rwxr-xr-x | src/main/resources/webapp/apps/buildApp/build.html (renamed from src/main/webapp/apps/buildApp/build.html) | 0 | ||||
-rwxr-xr-x | src/main/resources/webapp/apps/buildApp/buildApp.js (renamed from src/main/webapp/apps/buildApp/buildApp.js) | 0 | ||||
-rw-r--r-- | src/main/resources/webapp/apps/core/CoreResources.js (renamed from src/main/webapp/apps/core/CoreResources.js) | 0 | ||||
-rwxr-xr-x | src/main/resources/webapp/apps/core/PagingTableService.js (renamed from src/main/webapp/apps/core/PagingTableService.js) | 0 | ||||
-rwxr-xr-x | src/main/resources/webapp/apps/core/navbar.html (renamed from src/main/webapp/apps/core/navbar.html) | 0 | ||||
-rwxr-xr-x | src/main/resources/webapp/apps/frontPageApp/badge.html (renamed from src/main/webapp/apps/frontPageApp/badge.html) | 0 | ||||
-rwxr-xr-x | src/main/resources/webapp/apps/frontPageApp/badgeList.html (renamed from src/main/webapp/apps/frontPageApp/badgeList.html) | 0 | ||||
-rwxr-xr-x | src/main/resources/webapp/apps/frontPageApp/buildList.html (renamed from src/main/webapp/apps/frontPageApp/buildList.html) | 0 | ||||
-rwxr-xr-x | src/main/resources/webapp/apps/frontPageApp/frontPage.html (renamed from src/main/webapp/apps/frontPageApp/frontPage.html) | 0 | ||||
-rwxr-xr-x | src/main/resources/webapp/apps/frontPageApp/frontPageApp.js (renamed from src/main/webapp/apps/frontPageApp/frontPageApp.js) | 0 | ||||
-rwxr-xr-x | src/main/resources/webapp/apps/frontPageApp/person.html (renamed from src/main/webapp/apps/frontPageApp/person.html) | 0 | ||||
-rwxr-xr-x | src/main/resources/webapp/apps/frontPageApp/personList.html (renamed from src/main/webapp/apps/frontPageApp/personList.html) | 0 | ||||
-rw-r--r-- | src/main/resources/webapp/apps/jenkinsApp/JenkinsResources.js (renamed from src/main/webapp/apps/jenkinsApp/JenkinsResources.js) | 0 | ||||
-rw-r--r-- | src/main/resources/webapp/apps/jenkinsApp/build.html (renamed from src/main/webapp/apps/jenkinsApp/build.html) | 0 | ||||
-rw-r--r-- | src/main/resources/webapp/apps/jenkinsApp/jenkinsApp.js (renamed from src/main/webapp/apps/jenkinsApp/jenkinsApp.js) | 0 | ||||
-rwxr-xr-x | src/main/resources/webapp/apps/jenkinsApp/job.html (renamed from src/main/webapp/apps/jenkinsApp/job.html) | 0 | ||||
-rw-r--r-- | src/main/resources/webapp/apps/jenkinsApp/server-list.html (renamed from src/main/webapp/apps/jenkinsApp/server-list.html) | 0 | ||||
-rw-r--r-- | src/main/resources/webapp/apps/jenkinsApp/server.html (renamed from src/main/webapp/apps/jenkinsApp/server.html) | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | src/main/resources/webapp/build/build.jspx (renamed from src/main/webapp/build/build.jspx) | 0 | ||||
-rw-r--r-- | src/main/resources/webapp/external/angular-1.0.3/angular-resource.js (renamed from src/main/webapp/external/angular-1.0.3/angular-resource.js) | 0 | ||||
-rw-r--r-- | src/main/resources/webapp/external/angular-1.0.3/angular-resource.min.js (renamed from src/main/webapp/external/angular-1.0.3/angular-resource.min.js) | 0 | ||||
-rw-r--r-- | src/main/resources/webapp/external/angular-1.0.3/angular.js (renamed from src/main/webapp/external/angular-1.0.3/angular.js) | 0 | ||||
-rw-r--r-- | src/main/resources/webapp/external/angular-1.0.3/angular.min.js (renamed from src/main/webapp/external/angular-1.0.3/angular.min.js) | 0 | ||||
-rw-r--r-- | src/main/resources/webapp/external/angular-ui/ng-grid-1.5.0/ng-grid-1.5.0.debug.js (renamed from src/main/webapp/external/angular-ui/ng-grid-1.5.0/ng-grid-1.5.0.debug.js) | 0 | ||||
-rw-r--r-- | src/main/resources/webapp/external/angular-ui/ng-grid-1.5.0/ng-grid-1.5.0.js (renamed from src/main/webapp/external/angular-ui/ng-grid-1.5.0/ng-grid-1.5.0.js) | 0 | ||||
-rw-r--r-- | src/main/resources/webapp/external/angular-ui/ng-grid-1.5.0/ng-grid.css (renamed from src/main/webapp/external/angular-ui/ng-grid-1.5.0/ng-grid.css) | 0 | ||||
-rw-r--r-- | src/main/resources/webapp/external/angular-ui/ng-grid-1.6.0/ng-grid-1.6.0.debug.js (renamed from src/main/webapp/external/angular-ui/ng-grid-1.6.0/ng-grid-1.6.0.debug.js) | 0 | ||||
-rw-r--r-- | src/main/resources/webapp/external/angular-ui/ng-grid-1.6.0/ng-grid-1.6.0.js (renamed from src/main/webapp/external/angular-ui/ng-grid-1.6.0/ng-grid-1.6.0.js) | 0 | ||||
-rw-r--r-- | src/main/resources/webapp/external/angular-ui/ng-grid-1.6.0/ng-grid.css (renamed from src/main/webapp/external/angular-ui/ng-grid-1.6.0/ng-grid.css) | 0 | ||||
-rw-r--r-- | src/main/resources/webapp/external/bootstrap-2.2.1/css/bootstrap-responsive.css (renamed from src/main/webapp/external/bootstrap-2.2.1/css/bootstrap-responsive.css) | 0 | ||||
-rw-r--r-- | src/main/resources/webapp/external/bootstrap-2.2.1/css/bootstrap-responsive.min.css (renamed from src/main/webapp/external/bootstrap-2.2.1/css/bootstrap-responsive.min.css) | 0 | ||||
-rw-r--r-- | src/main/resources/webapp/external/bootstrap-2.2.1/css/bootstrap.css (renamed from src/main/webapp/external/bootstrap-2.2.1/css/bootstrap.css) | 0 | ||||
-rw-r--r-- | src/main/resources/webapp/external/bootstrap-2.2.1/css/bootstrap.min.css (renamed from src/main/webapp/external/bootstrap-2.2.1/css/bootstrap.min.css) | 0 | ||||
-rw-r--r-- | src/main/resources/webapp/external/bootstrap-2.2.1/img/glyphicons-halflings-white.png (renamed from src/main/webapp/external/bootstrap-2.2.1/img/glyphicons-halflings-white.png) | bin | 8777 -> 8777 bytes | |||
-rw-r--r-- | src/main/resources/webapp/external/bootstrap-2.2.1/img/glyphicons-halflings.png (renamed from src/main/webapp/external/bootstrap-2.2.1/img/glyphicons-halflings.png) | bin | 12799 -> 12799 bytes | |||
-rw-r--r-- | src/main/resources/webapp/external/bootstrap-2.2.1/lib/bootstrap.js (renamed from src/main/webapp/external/bootstrap-2.2.1/lib/bootstrap.js) | 0 | ||||
-rw-r--r-- | src/main/resources/webapp/external/bootstrap-2.2.1/lib/bootstrap.min.js (renamed from src/main/webapp/external/bootstrap-2.2.1/lib/bootstrap.min.js) | 0 | ||||
-rw-r--r-- | src/main/resources/webapp/external/bootstrap-2.2.2/css/bootstrap-responsive.css (renamed from src/main/webapp/external/bootstrap-2.2.2/css/bootstrap-responsive.css) | 0 | ||||
-rw-r--r-- | src/main/resources/webapp/external/bootstrap-2.2.2/css/bootstrap-responsive.min.css (renamed from src/main/webapp/external/bootstrap-2.2.2/css/bootstrap-responsive.min.css) | 0 | ||||
-rw-r--r-- | src/main/resources/webapp/external/bootstrap-2.2.2/css/bootstrap.css (renamed from src/main/webapp/external/bootstrap-2.2.2/css/bootstrap.css) | 0 | ||||
-rw-r--r-- | src/main/resources/webapp/external/bootstrap-2.2.2/css/bootstrap.min.css (renamed from src/main/webapp/external/bootstrap-2.2.2/css/bootstrap.min.css) | 0 | ||||
-rw-r--r-- | src/main/resources/webapp/external/bootstrap-2.2.2/img/glyphicons-halflings-white.png (renamed from src/main/webapp/external/bootstrap-2.2.2/img/glyphicons-halflings-white.png) | bin | 8777 -> 8777 bytes | |||
-rw-r--r-- | src/main/resources/webapp/external/bootstrap-2.2.2/img/glyphicons-halflings.png (renamed from src/main/webapp/external/bootstrap-2.2.2/img/glyphicons-halflings.png) | bin | 12799 -> 12799 bytes | |||
-rw-r--r-- | src/main/resources/webapp/external/bootstrap-2.2.2/js/bootstrap.js (renamed from src/main/webapp/external/bootstrap-2.2.2/js/bootstrap.js) | 0 | ||||
-rw-r--r-- | src/main/resources/webapp/external/bootstrap-2.2.2/js/bootstrap.min.js (renamed from src/main/webapp/external/bootstrap-2.2.2/js/bootstrap.min.js) | 0 | ||||
-rw-r--r-- | src/main/resources/webapp/external/datejs-Alpha1/date.js (renamed from src/main/webapp/external/datejs-Alpha1/date.js) | 0 | ||||
-rw-r--r-- | src/main/resources/webapp/external/headjs-0.99/head.js (renamed from src/main/webapp/external/headjs-0.99/head.js) | 0 | ||||
-rw-r--r-- | src/main/resources/webapp/external/headjs-0.99/head.min.js (renamed from src/main/webapp/external/headjs-0.99/head.min.js) | 0 | ||||
-rw-r--r-- | src/main/resources/webapp/external/jquery-1.7.1.js (renamed from src/main/webapp/external/jquery-1.7.1.js) | 0 | ||||
-rw-r--r-- | src/main/resources/webapp/external/jquery-1.7.1.min.js (renamed from src/main/webapp/external/jquery-1.7.1.min.js) | 0 | ||||
-rw-r--r-- | src/main/resources/webapp/external/jquery-1.8.3/jquery-1.8.3.js (renamed from src/main/webapp/external/jquery-1.8.3/jquery-1.8.3.js) | 0 | ||||
-rw-r--r-- | src/main/resources/webapp/external/jquery-1.8.3/jquery-1.8.3.min.js (renamed from src/main/webapp/external/jquery-1.8.3/jquery-1.8.3.min.js) | 0 | ||||
-rw-r--r-- | src/main/resources/webapp/external/underscore-1.4.3/underscore-min.js (renamed from src/main/webapp/external/underscore-1.4.3/underscore-min.js) | 0 | ||||
-rw-r--r-- | src/main/resources/webapp/external/underscore-1.4.3/underscore.js (renamed from src/main/webapp/external/underscore-1.4.3/underscore.js) | 0 | ||||
-rw-r--r-- | src/main/resources/webapp/external/underscore.js (renamed from src/main/webapp/external/underscore.js) | 0 | ||||
-rw-r--r-- | src/main/resources/webapp/idea.js (renamed from src/main/webapp/idea.js) | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | src/main/resources/webapp/index.jspx (renamed from src/main/webapp/index.jspx) | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | src/main/resources/webapp/jenkins/index.jspx (renamed from src/main/webapp/jenkins/index.jspx) | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | src/main/resources/webapp/login.jspx (renamed from src/main/webapp/login.jspx) | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | src/main/resources/webapp/person/person.jspx (renamed from src/main/webapp/person/person.jspx) | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | src/main/resources/webapp/shiro.jspx (renamed from src/main/webapp/shiro.jspx) | 0 | ||||
-rwxr-xr-x | src/main/unix/files/root/etc/booter.properties | 2 | ||||
-rwxr-xr-x | src/main/unix/files/scripts/postinstall | 20 | ||||
-rwxr-xr-x | src/test/java/io/trygvis/esper/testing/web/WebRunner.java | 10 |
73 files changed, 28 insertions, 8 deletions
@@ -214,6 +214,10 @@ <name>unbreakable-poller</name> <mainClass>io.trygvis.esper.testing.core.badge.UnbreakablePoller</mainClass> </program> + <program> + <name>web</name> + <mainClass>io.trygvis.appsh.booter.jetty.Main</mainClass> + </program> </programs> </configuration> </execution> diff --git a/src/main/webapp/WEB-INF/shiro.ini b/src/main/resources/webapp/WEB-INF/shiro.ini index 21015af..21015af 100644 --- a/src/main/webapp/WEB-INF/shiro.ini +++ b/src/main/resources/webapp/WEB-INF/shiro.ini diff --git a/src/main/webapp/WEB-INF/tags/common/footer.tagx b/src/main/resources/webapp/WEB-INF/tags/common/footer.tagx index 7f686ee..7f686ee 100644 --- a/src/main/webapp/WEB-INF/tags/common/footer.tagx +++ b/src/main/resources/webapp/WEB-INF/tags/common/footer.tagx diff --git a/src/main/webapp/WEB-INF/tags/common/head.tagx b/src/main/resources/webapp/WEB-INF/tags/common/head.tagx index f651c2b..f651c2b 100755 --- a/src/main/webapp/WEB-INF/tags/common/head.tagx +++ b/src/main/resources/webapp/WEB-INF/tags/common/head.tagx diff --git a/src/main/webapp/WEB-INF/tags/common/headjs.tagx b/src/main/resources/webapp/WEB-INF/tags/common/headjs.tagx index 4e39e63..4e39e63 100644 --- a/src/main/webapp/WEB-INF/tags/common/headjs.tagx +++ b/src/main/resources/webapp/WEB-INF/tags/common/headjs.tagx diff --git a/src/main/webapp/WEB-INF/urlrewrite.xml b/src/main/resources/webapp/WEB-INF/urlrewrite.xml index cc02ca8..cc02ca8 100755 --- a/src/main/webapp/WEB-INF/urlrewrite.xml +++ b/src/main/resources/webapp/WEB-INF/urlrewrite.xml diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/resources/webapp/WEB-INF/web.xml index ed33a8f..ed33a8f 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/resources/webapp/WEB-INF/web.xml diff --git a/src/main/webapp/apps/app.css b/src/main/resources/webapp/apps/app.css index 3088282..3088282 100755 --- a/src/main/webapp/apps/app.css +++ b/src/main/resources/webapp/apps/app.css diff --git a/src/main/webapp/apps/app.js b/src/main/resources/webapp/apps/app.js index 068f454..068f454 100755 --- a/src/main/webapp/apps/app.js +++ b/src/main/resources/webapp/apps/app.js diff --git a/src/main/webapp/apps/buildApp/build.html b/src/main/resources/webapp/apps/buildApp/build.html index fec38d2..fec38d2 100755 --- a/src/main/webapp/apps/buildApp/build.html +++ b/src/main/resources/webapp/apps/buildApp/build.html diff --git a/src/main/webapp/apps/buildApp/buildApp.js b/src/main/resources/webapp/apps/buildApp/buildApp.js index 170af16..170af16 100755 --- a/src/main/webapp/apps/buildApp/buildApp.js +++ b/src/main/resources/webapp/apps/buildApp/buildApp.js diff --git a/src/main/webapp/apps/core/CoreResources.js b/src/main/resources/webapp/apps/core/CoreResources.js index b258c85..b258c85 100644 --- a/src/main/webapp/apps/core/CoreResources.js +++ b/src/main/resources/webapp/apps/core/CoreResources.js diff --git a/src/main/webapp/apps/core/PagingTableService.js b/src/main/resources/webapp/apps/core/PagingTableService.js index af593df..af593df 100755 --- a/src/main/webapp/apps/core/PagingTableService.js +++ b/src/main/resources/webapp/apps/core/PagingTableService.js diff --git a/src/main/webapp/apps/core/navbar.html b/src/main/resources/webapp/apps/core/navbar.html index 914258e..914258e 100755 --- a/src/main/webapp/apps/core/navbar.html +++ b/src/main/resources/webapp/apps/core/navbar.html diff --git a/src/main/webapp/apps/frontPageApp/badge.html b/src/main/resources/webapp/apps/frontPageApp/badge.html index 92fc7ae..92fc7ae 100755 --- a/src/main/webapp/apps/frontPageApp/badge.html +++ b/src/main/resources/webapp/apps/frontPageApp/badge.html diff --git a/src/main/webapp/apps/frontPageApp/badgeList.html b/src/main/resources/webapp/apps/frontPageApp/badgeList.html index 7671a55..7671a55 100755 --- a/src/main/webapp/apps/frontPageApp/badgeList.html +++ b/src/main/resources/webapp/apps/frontPageApp/badgeList.html diff --git a/src/main/webapp/apps/frontPageApp/buildList.html b/src/main/resources/webapp/apps/frontPageApp/buildList.html index 13a1dc3..13a1dc3 100755 --- a/src/main/webapp/apps/frontPageApp/buildList.html +++ b/src/main/resources/webapp/apps/frontPageApp/buildList.html diff --git a/src/main/webapp/apps/frontPageApp/frontPage.html b/src/main/resources/webapp/apps/frontPageApp/frontPage.html index c3db55c..c3db55c 100755 --- a/src/main/webapp/apps/frontPageApp/frontPage.html +++ b/src/main/resources/webapp/apps/frontPageApp/frontPage.html diff --git a/src/main/webapp/apps/frontPageApp/frontPageApp.js b/src/main/resources/webapp/apps/frontPageApp/frontPageApp.js index 6f80d0f..6f80d0f 100755 --- a/src/main/webapp/apps/frontPageApp/frontPageApp.js +++ b/src/main/resources/webapp/apps/frontPageApp/frontPageApp.js diff --git a/src/main/webapp/apps/frontPageApp/person.html b/src/main/resources/webapp/apps/frontPageApp/person.html index ba5c18d..ba5c18d 100755 --- a/src/main/webapp/apps/frontPageApp/person.html +++ b/src/main/resources/webapp/apps/frontPageApp/person.html diff --git a/src/main/webapp/apps/frontPageApp/personList.html b/src/main/resources/webapp/apps/frontPageApp/personList.html index 5d7d8c6..5d7d8c6 100755 --- a/src/main/webapp/apps/frontPageApp/personList.html +++ b/src/main/resources/webapp/apps/frontPageApp/personList.html diff --git a/src/main/webapp/apps/jenkinsApp/JenkinsResources.js b/src/main/resources/webapp/apps/jenkinsApp/JenkinsResources.js index 89f3139..89f3139 100644 --- a/src/main/webapp/apps/jenkinsApp/JenkinsResources.js +++ b/src/main/resources/webapp/apps/jenkinsApp/JenkinsResources.js diff --git a/src/main/webapp/apps/jenkinsApp/build.html b/src/main/resources/webapp/apps/jenkinsApp/build.html index 7239c90..7239c90 100644 --- a/src/main/webapp/apps/jenkinsApp/build.html +++ b/src/main/resources/webapp/apps/jenkinsApp/build.html diff --git a/src/main/webapp/apps/jenkinsApp/jenkinsApp.js b/src/main/resources/webapp/apps/jenkinsApp/jenkinsApp.js index e42c67b..e42c67b 100644 --- a/src/main/webapp/apps/jenkinsApp/jenkinsApp.js +++ b/src/main/resources/webapp/apps/jenkinsApp/jenkinsApp.js diff --git a/src/main/webapp/apps/jenkinsApp/job.html b/src/main/resources/webapp/apps/jenkinsApp/job.html index 8942ab7..8942ab7 100755 --- a/src/main/webapp/apps/jenkinsApp/job.html +++ b/src/main/resources/webapp/apps/jenkinsApp/job.html diff --git a/src/main/webapp/apps/jenkinsApp/server-list.html b/src/main/resources/webapp/apps/jenkinsApp/server-list.html index 9e297e6..9e297e6 100644 --- a/src/main/webapp/apps/jenkinsApp/server-list.html +++ b/src/main/resources/webapp/apps/jenkinsApp/server-list.html diff --git a/src/main/webapp/apps/jenkinsApp/server.html b/src/main/resources/webapp/apps/jenkinsApp/server.html index 7fbd9f5..7fbd9f5 100644 --- a/src/main/webapp/apps/jenkinsApp/server.html +++ b/src/main/resources/webapp/apps/jenkinsApp/server.html diff --git a/src/main/webapp/build/build.jspx b/src/main/resources/webapp/build/build.jspx index b47e864..b47e864 100644..100755 --- a/src/main/webapp/build/build.jspx +++ b/src/main/resources/webapp/build/build.jspx diff --git a/src/main/webapp/external/angular-1.0.3/angular-resource.js b/src/main/resources/webapp/external/angular-1.0.3/angular-resource.js index 8ebe5c8..8ebe5c8 100644 --- a/src/main/webapp/external/angular-1.0.3/angular-resource.js +++ b/src/main/resources/webapp/external/angular-1.0.3/angular-resource.js diff --git a/src/main/webapp/external/angular-1.0.3/angular-resource.min.js b/src/main/resources/webapp/external/angular-1.0.3/angular-resource.min.js index 816107d..816107d 100644 --- a/src/main/webapp/external/angular-1.0.3/angular-resource.min.js +++ b/src/main/resources/webapp/external/angular-1.0.3/angular-resource.min.js diff --git a/src/main/webapp/external/angular-1.0.3/angular.js b/src/main/resources/webapp/external/angular-1.0.3/angular.js index 9e40471..9e40471 100644 --- a/src/main/webapp/external/angular-1.0.3/angular.js +++ b/src/main/resources/webapp/external/angular-1.0.3/angular.js diff --git a/src/main/webapp/external/angular-1.0.3/angular.min.js b/src/main/resources/webapp/external/angular-1.0.3/angular.min.js index 07f501b..07f501b 100644 --- a/src/main/webapp/external/angular-1.0.3/angular.min.js +++ b/src/main/resources/webapp/external/angular-1.0.3/angular.min.js diff --git a/src/main/webapp/external/angular-ui/ng-grid-1.5.0/ng-grid-1.5.0.debug.js b/src/main/resources/webapp/external/angular-ui/ng-grid-1.5.0/ng-grid-1.5.0.debug.js index 4ceaa00..4ceaa00 100644 --- a/src/main/webapp/external/angular-ui/ng-grid-1.5.0/ng-grid-1.5.0.debug.js +++ b/src/main/resources/webapp/external/angular-ui/ng-grid-1.5.0/ng-grid-1.5.0.debug.js diff --git a/src/main/webapp/external/angular-ui/ng-grid-1.5.0/ng-grid-1.5.0.js b/src/main/resources/webapp/external/angular-ui/ng-grid-1.5.0/ng-grid-1.5.0.js index 858e65f..858e65f 100644 --- a/src/main/webapp/external/angular-ui/ng-grid-1.5.0/ng-grid-1.5.0.js +++ b/src/main/resources/webapp/external/angular-ui/ng-grid-1.5.0/ng-grid-1.5.0.js diff --git a/src/main/webapp/external/angular-ui/ng-grid-1.5.0/ng-grid.css b/src/main/resources/webapp/external/angular-ui/ng-grid-1.5.0/ng-grid.css index a8ab555..a8ab555 100644 --- a/src/main/webapp/external/angular-ui/ng-grid-1.5.0/ng-grid.css +++ b/src/main/resources/webapp/external/angular-ui/ng-grid-1.5.0/ng-grid.css diff --git a/src/main/webapp/external/angular-ui/ng-grid-1.6.0/ng-grid-1.6.0.debug.js b/src/main/resources/webapp/external/angular-ui/ng-grid-1.6.0/ng-grid-1.6.0.debug.js index 636fcf1..636fcf1 100644 --- a/src/main/webapp/external/angular-ui/ng-grid-1.6.0/ng-grid-1.6.0.debug.js +++ b/src/main/resources/webapp/external/angular-ui/ng-grid-1.6.0/ng-grid-1.6.0.debug.js diff --git a/src/main/webapp/external/angular-ui/ng-grid-1.6.0/ng-grid-1.6.0.js b/src/main/resources/webapp/external/angular-ui/ng-grid-1.6.0/ng-grid-1.6.0.js index d833b6f..d833b6f 100644 --- a/src/main/webapp/external/angular-ui/ng-grid-1.6.0/ng-grid-1.6.0.js +++ b/src/main/resources/webapp/external/angular-ui/ng-grid-1.6.0/ng-grid-1.6.0.js diff --git a/src/main/webapp/external/angular-ui/ng-grid-1.6.0/ng-grid.css b/src/main/resources/webapp/external/angular-ui/ng-grid-1.6.0/ng-grid.css index a8ab555..a8ab555 100644 --- a/src/main/webapp/external/angular-ui/ng-grid-1.6.0/ng-grid.css +++ b/src/main/resources/webapp/external/angular-ui/ng-grid-1.6.0/ng-grid.css diff --git a/src/main/webapp/external/bootstrap-2.2.1/css/bootstrap-responsive.css b/src/main/resources/webapp/external/bootstrap-2.2.1/css/bootstrap-responsive.css index 82fa9ca..82fa9ca 100644 --- a/src/main/webapp/external/bootstrap-2.2.1/css/bootstrap-responsive.css +++ b/src/main/resources/webapp/external/bootstrap-2.2.1/css/bootstrap-responsive.css diff --git a/src/main/webapp/external/bootstrap-2.2.1/css/bootstrap-responsive.min.css b/src/main/resources/webapp/external/bootstrap-2.2.1/css/bootstrap-responsive.min.css index 2269019..2269019 100644 --- a/src/main/webapp/external/bootstrap-2.2.1/css/bootstrap-responsive.min.css +++ b/src/main/resources/webapp/external/bootstrap-2.2.1/css/bootstrap-responsive.min.css diff --git a/src/main/webapp/external/bootstrap-2.2.1/css/bootstrap.css b/src/main/resources/webapp/external/bootstrap-2.2.1/css/bootstrap.css index 1b519e2..1b519e2 100644 --- a/src/main/webapp/external/bootstrap-2.2.1/css/bootstrap.css +++ b/src/main/resources/webapp/external/bootstrap-2.2.1/css/bootstrap.css diff --git a/src/main/webapp/external/bootstrap-2.2.1/css/bootstrap.min.css b/src/main/resources/webapp/external/bootstrap-2.2.1/css/bootstrap.min.css index 43e16d7..43e16d7 100644 --- a/src/main/webapp/external/bootstrap-2.2.1/css/bootstrap.min.css +++ b/src/main/resources/webapp/external/bootstrap-2.2.1/css/bootstrap.min.css diff --git a/src/main/webapp/external/bootstrap-2.2.1/img/glyphicons-halflings-white.png b/src/main/resources/webapp/external/bootstrap-2.2.1/img/glyphicons-halflings-white.png Binary files differindex 3bf6484..3bf6484 100644 --- a/src/main/webapp/external/bootstrap-2.2.1/img/glyphicons-halflings-white.png +++ b/src/main/resources/webapp/external/bootstrap-2.2.1/img/glyphicons-halflings-white.png diff --git a/src/main/webapp/external/bootstrap-2.2.1/img/glyphicons-halflings.png b/src/main/resources/webapp/external/bootstrap-2.2.1/img/glyphicons-halflings.png Binary files differindex a996999..a996999 100644 --- a/src/main/webapp/external/bootstrap-2.2.1/img/glyphicons-halflings.png +++ b/src/main/resources/webapp/external/bootstrap-2.2.1/img/glyphicons-halflings.png diff --git a/src/main/webapp/external/bootstrap-2.2.1/lib/bootstrap.js b/src/main/resources/webapp/external/bootstrap-2.2.1/lib/bootstrap.js index c753bd6..c753bd6 100644 --- a/src/main/webapp/external/bootstrap-2.2.1/lib/bootstrap.js +++ b/src/main/resources/webapp/external/bootstrap-2.2.1/lib/bootstrap.js diff --git a/src/main/webapp/external/bootstrap-2.2.1/lib/bootstrap.min.js b/src/main/resources/webapp/external/bootstrap-2.2.1/lib/bootstrap.min.js index 55da8c3..55da8c3 100644 --- a/src/main/webapp/external/bootstrap-2.2.1/lib/bootstrap.min.js +++ b/src/main/resources/webapp/external/bootstrap-2.2.1/lib/bootstrap.min.js diff --git a/src/main/webapp/external/bootstrap-2.2.2/css/bootstrap-responsive.css b/src/main/resources/webapp/external/bootstrap-2.2.2/css/bootstrap-responsive.css index a3352d7..a3352d7 100644 --- a/src/main/webapp/external/bootstrap-2.2.2/css/bootstrap-responsive.css +++ b/src/main/resources/webapp/external/bootstrap-2.2.2/css/bootstrap-responsive.css diff --git a/src/main/webapp/external/bootstrap-2.2.2/css/bootstrap-responsive.min.css b/src/main/resources/webapp/external/bootstrap-2.2.2/css/bootstrap-responsive.min.css index 5cb833f..5cb833f 100644 --- a/src/main/webapp/external/bootstrap-2.2.2/css/bootstrap-responsive.min.css +++ b/src/main/resources/webapp/external/bootstrap-2.2.2/css/bootstrap-responsive.min.css diff --git a/src/main/webapp/external/bootstrap-2.2.2/css/bootstrap.css b/src/main/resources/webapp/external/bootstrap-2.2.2/css/bootstrap.css index 8ab3cef..8ab3cef 100644 --- a/src/main/webapp/external/bootstrap-2.2.2/css/bootstrap.css +++ b/src/main/resources/webapp/external/bootstrap-2.2.2/css/bootstrap.css diff --git a/src/main/webapp/external/bootstrap-2.2.2/css/bootstrap.min.css b/src/main/resources/webapp/external/bootstrap-2.2.2/css/bootstrap.min.css index 140f731..140f731 100644 --- a/src/main/webapp/external/bootstrap-2.2.2/css/bootstrap.min.css +++ b/src/main/resources/webapp/external/bootstrap-2.2.2/css/bootstrap.min.css diff --git a/src/main/webapp/external/bootstrap-2.2.2/img/glyphicons-halflings-white.png b/src/main/resources/webapp/external/bootstrap-2.2.2/img/glyphicons-halflings-white.png Binary files differindex 3bf6484..3bf6484 100644 --- a/src/main/webapp/external/bootstrap-2.2.2/img/glyphicons-halflings-white.png +++ b/src/main/resources/webapp/external/bootstrap-2.2.2/img/glyphicons-halflings-white.png diff --git a/src/main/webapp/external/bootstrap-2.2.2/img/glyphicons-halflings.png b/src/main/resources/webapp/external/bootstrap-2.2.2/img/glyphicons-halflings.png Binary files differindex a996999..a996999 100644 --- a/src/main/webapp/external/bootstrap-2.2.2/img/glyphicons-halflings.png +++ b/src/main/resources/webapp/external/bootstrap-2.2.2/img/glyphicons-halflings.png diff --git a/src/main/webapp/external/bootstrap-2.2.2/js/bootstrap.js b/src/main/resources/webapp/external/bootstrap-2.2.2/js/bootstrap.js index 6c15a58..6c15a58 100644 --- a/src/main/webapp/external/bootstrap-2.2.2/js/bootstrap.js +++ b/src/main/resources/webapp/external/bootstrap-2.2.2/js/bootstrap.js diff --git a/src/main/webapp/external/bootstrap-2.2.2/js/bootstrap.min.js b/src/main/resources/webapp/external/bootstrap-2.2.2/js/bootstrap.min.js index 6eeb15c..6eeb15c 100644 --- a/src/main/webapp/external/bootstrap-2.2.2/js/bootstrap.min.js +++ b/src/main/resources/webapp/external/bootstrap-2.2.2/js/bootstrap.min.js diff --git a/src/main/webapp/external/datejs-Alpha1/date.js b/src/main/resources/webapp/external/datejs-Alpha1/date.js index 2d52e9a..2d52e9a 100644 --- a/src/main/webapp/external/datejs-Alpha1/date.js +++ b/src/main/resources/webapp/external/datejs-Alpha1/date.js diff --git a/src/main/webapp/external/headjs-0.99/head.js b/src/main/resources/webapp/external/headjs-0.99/head.js index b559954..b559954 100644 --- a/src/main/webapp/external/headjs-0.99/head.js +++ b/src/main/resources/webapp/external/headjs-0.99/head.js diff --git a/src/main/webapp/external/headjs-0.99/head.min.js b/src/main/resources/webapp/external/headjs-0.99/head.min.js index fa49b31..fa49b31 100644 --- a/src/main/webapp/external/headjs-0.99/head.min.js +++ b/src/main/resources/webapp/external/headjs-0.99/head.min.js diff --git a/src/main/webapp/external/jquery-1.7.1.js b/src/main/resources/webapp/external/jquery-1.7.1.js index 8ccd0ea..8ccd0ea 100644 --- a/src/main/webapp/external/jquery-1.7.1.js +++ b/src/main/resources/webapp/external/jquery-1.7.1.js diff --git a/src/main/webapp/external/jquery-1.7.1.min.js b/src/main/resources/webapp/external/jquery-1.7.1.min.js index 198b3ff..198b3ff 100644 --- a/src/main/webapp/external/jquery-1.7.1.min.js +++ b/src/main/resources/webapp/external/jquery-1.7.1.min.js diff --git a/src/main/webapp/external/jquery-1.8.3/jquery-1.8.3.js b/src/main/resources/webapp/external/jquery-1.8.3/jquery-1.8.3.js index 8c24ffc..8c24ffc 100644 --- a/src/main/webapp/external/jquery-1.8.3/jquery-1.8.3.js +++ b/src/main/resources/webapp/external/jquery-1.8.3/jquery-1.8.3.js diff --git a/src/main/webapp/external/jquery-1.8.3/jquery-1.8.3.min.js b/src/main/resources/webapp/external/jquery-1.8.3/jquery-1.8.3.min.js index 3883779..3883779 100644 --- a/src/main/webapp/external/jquery-1.8.3/jquery-1.8.3.min.js +++ b/src/main/resources/webapp/external/jquery-1.8.3/jquery-1.8.3.min.js diff --git a/src/main/webapp/external/underscore-1.4.3/underscore-min.js b/src/main/resources/webapp/external/underscore-1.4.3/underscore-min.js index 7ed6e52..7ed6e52 100644 --- a/src/main/webapp/external/underscore-1.4.3/underscore-min.js +++ b/src/main/resources/webapp/external/underscore-1.4.3/underscore-min.js diff --git a/src/main/webapp/external/underscore-1.4.3/underscore.js b/src/main/resources/webapp/external/underscore-1.4.3/underscore.js index 7cc8bc6..7cc8bc6 100644 --- a/src/main/webapp/external/underscore-1.4.3/underscore.js +++ b/src/main/resources/webapp/external/underscore-1.4.3/underscore.js diff --git a/src/main/webapp/external/underscore.js b/src/main/resources/webapp/external/underscore.js index 1ebe267..1ebe267 100644 --- a/src/main/webapp/external/underscore.js +++ b/src/main/resources/webapp/external/underscore.js diff --git a/src/main/webapp/idea.js b/src/main/resources/webapp/idea.js index 3f92104..3f92104 100644 --- a/src/main/webapp/idea.js +++ b/src/main/resources/webapp/idea.js diff --git a/src/main/webapp/index.jspx b/src/main/resources/webapp/index.jspx index adeb687..adeb687 100644..100755 --- a/src/main/webapp/index.jspx +++ b/src/main/resources/webapp/index.jspx diff --git a/src/main/webapp/jenkins/index.jspx b/src/main/resources/webapp/jenkins/index.jspx index 0e8dc22..0e8dc22 100644..100755 --- a/src/main/webapp/jenkins/index.jspx +++ b/src/main/resources/webapp/jenkins/index.jspx diff --git a/src/main/webapp/login.jspx b/src/main/resources/webapp/login.jspx index 858199c..858199c 100644..100755 --- a/src/main/webapp/login.jspx +++ b/src/main/resources/webapp/login.jspx diff --git a/src/main/webapp/person/person.jspx b/src/main/resources/webapp/person/person.jspx index b3b2cbd..b3b2cbd 100644..100755 --- a/src/main/webapp/person/person.jspx +++ b/src/main/resources/webapp/person/person.jspx diff --git a/src/main/webapp/shiro.jspx b/src/main/resources/webapp/shiro.jspx index 59e9f41..59e9f41 100644..100755 --- a/src/main/webapp/shiro.jspx +++ b/src/main/resources/webapp/shiro.jspx diff --git a/src/main/unix/files/root/etc/booter.properties b/src/main/unix/files/root/etc/booter.properties new file mode 100755 index 0000000..8f98408 --- /dev/null +++ b/src/main/unix/files/root/etc/booter.properties @@ -0,0 +1,2 @@ +context./=classpath:/webapp +log=logs/web-stdout.out diff --git a/src/main/unix/files/scripts/postinstall b/src/main/unix/files/scripts/postinstall index a0314dc..37c202e 100755 --- a/src/main/unix/files/scripts/postinstall +++ b/src/main/unix/files/scripts/postinstall @@ -1,10 +1,18 @@ #!/bin/bash -ln -s ../../../../etc/config.properties etc/config.properties +case "`uname -s`" in + CYGWIN*) + cp ../../../etc/config.properties etc/config.properties + mkdir -p logs/ + ;; + *) + ln -s ../../../../etc/config.properties etc/config.properties -if [ ! -d ../../../logs ] -then - mkdir ../../../logs -fi + if [ ! -d ../../../logs ] + then + mkdir ../../../logs + fi -ln -s ../../../logs + ln -s ../../../logs + ;; +esac diff --git a/src/test/java/io/trygvis/esper/testing/web/WebRunner.java b/src/test/java/io/trygvis/esper/testing/web/WebRunner.java index b809cee..7cd2314 100755 --- a/src/test/java/io/trygvis/esper/testing/web/WebRunner.java +++ b/src/test/java/io/trygvis/esper/testing/web/WebRunner.java @@ -2,7 +2,7 @@ package io.trygvis.esper.testing.web; import io.trygvis.appsh.booter.jetty.*; import io.trygvis.esper.testing.*; -import java.io.*; +import java.net.*; public class WebRunner { @@ -12,7 +12,13 @@ public class WebRunner { JettyWebServer server = new JettyWebServer(); server.setHttpPort(1337); - server.addContext("/", new File("src/main/webapp").getAbsoluteFile()); +// server.addContext("/", new File("src/main/resources/webapp").getAbsoluteFile()); + URL resource = WebRunner.class.getResource("/webapp/index.jspx"); + System.out.println("resource = " + resource); + System.out.println("resource.toExternalForm() = " + resource.toExternalForm()); + +// server.addContext("/", new File(resource.toExternalForm())); + server.addContext("/", resource); server.run(); } } |