Return-Path: X-Original-To: apmail-struts-commits-archive@minotaur.apache.org Delivered-To: apmail-struts-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AF06418D75 for ; Sat, 11 Jul 2015 08:45:47 +0000 (UTC) Received: (qmail 4278 invoked by uid 500); 11 Jul 2015 08:45:47 -0000 Delivered-To: apmail-struts-commits-archive@struts.apache.org Received: (qmail 4241 invoked by uid 500); 11 Jul 2015 08:45:47 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 4218 invoked by uid 99); 11 Jul 2015 08:45:47 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 11 Jul 2015 08:45:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id ACE1EE0967; Sat, 11 Jul 2015 08:45:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jogep@apache.org To: commits@struts.apache.org Date: Sat, 11 Jul 2015 08:45:46 -0000 Message-Id: <194e6515d0244d688a936bd692a90e60@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/3] struts git commit: WW-4522 Support latest stable AngularJS version in maven angularjs archetype WW-4522 Support latest stable AngularJS version in maven angularjs archetype - Rename exposed service object to avoid naming conflict Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/9ef3aba0 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/9ef3aba0 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/9ef3aba0 Branch: refs/heads/master Commit: 9ef3aba047b43411915c591fd9461aecda631b51 Parents: f200a84 Author: Johannes Geppert Authored: Sat Jul 11 10:44:49 2015 +0200 Committer: Johannes Geppert Committed: Sat Jul 11 10:44:49 2015 +0200 ---------------------------------------------------------------------- .../src/main/webapp/js/services/DataService.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/9ef3aba0/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/services/DataService.js ---------------------------------------------------------------------- diff --git a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/services/DataService.js b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/services/DataService.js index 3f9e308..c0034a7 100644 --- a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/services/DataService.js +++ b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/services/DataService.js @@ -33,11 +33,11 @@ }; /** The DataService with all public methods */ - var DataService = { + var service = { getProjects: getProjects }; - return DataService; + return service; /** Get all projects */ function getProjects() {