WW-4399 struts2-archetype-angularjs uses absolute paths
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/fbf4113c Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/fbf4113c Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/fbf4113c Branch: refs/heads/master Commit: fbf4113c2e0e256645b1f10a3693111b63e681e8 Parents: b88c5d5 Author: Johannes Geppert <joh...@gmail.com> Authored: Sun Aug 31 14:09:38 2014 +0200 Committer: Johannes Geppert <joh...@gmail.com> Committed: Sun Aug 31 14:09:38 2014 +0200 ---------------------------------------------------------------------- .../archetype-resources/src/main/webapp/js/bootstrap.js | 4 ++-- .../archetype-resources/src/main/webapp/js/controllers.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/fbf4113c/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/bootstrap.js ---------------------------------------------------------------------- diff --git a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/bootstrap.js b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/bootstrap.js index 8983318..501427f 100644 --- a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/bootstrap.js +++ b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/bootstrap.js @@ -24,10 +24,10 @@ var angularStrutsApp = angular.module('angularStrutsApp', ['ngRoute']); angularStrutsApp.config(['$routeProvider', function($routeProvider) { $routeProvider.when('/projects', { - templateUrl: '/partials/projects.html', + templateUrl: 'partials/projects.html', controller: 'ApacheProjectsController' }).when('/home', { - templateUrl: '/partials/home.html', + templateUrl: 'partials/home.html', controller: 'HomeController' }).otherwise({ redirectTo: '/home' }); } http://git-wip-us.apache.org/repos/asf/struts/blob/fbf4113c/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/controllers.js ---------------------------------------------------------------------- diff --git a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/controllers.js b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/controllers.js index 01afe21..9a5b71f 100644 --- a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/controllers.js +++ b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/controllers.js @@ -26,7 +26,7 @@ angularStrutsApp.controller('HomeController', function ($scope) { angularStrutsApp.controller('ApacheProjectsController', function ($scope, $http) { this.init = function() { - $http({method: 'GET', url: '/projects'}). + $http({method: 'GET', url: 'projects'}). success(function(data) { $scope.projects = data.projectNames; }).
