Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id ECF1D200CEF for ; Sat, 15 Jul 2017 12:15:48 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id EB8D316AE0B; Sat, 15 Jul 2017 10:15:48 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (unknown [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B86AA16AE15 for ; Sat, 15 Jul 2017 12:15:47 +0200 (CEST) Received: (qmail 7683 invoked by uid 500); 15 Jul 2017 10:15:47 -0000 Mailing-List: contact commits-help@polygene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@polygene.apache.org Delivered-To: mailing list commits@polygene.apache.org Received: (qmail 7371 invoked by uid 99); 15 Jul 2017 10:15:46 -0000 Received: from Unknown (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 15 Jul 2017 10:15:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0409DE968B; Sat, 15 Jul 2017 10:15:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: niclas@apache.org To: commits@polygene.apache.org Date: Sat, 15 Jul 2017 10:15:53 -0000 Message-Id: <358f50be3c754bfeb37dcf11ae0ac023@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [10/14] polygene-java git commit: Fix bugs in generator. archived-at: Sat, 15 Jul 2017 10:15:49 -0000 Fix bugs in generator. Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/cdec0e8b Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/cdec0e8b Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/cdec0e8b Branch: refs/heads/develop Commit: cdec0e8b6c82e60aeff6c638348a8acb0cdc7c3d Parents: 047380a Author: niclas Authored: Mon Jul 10 11:32:52 2017 +0800 Committer: niclas Committed: Mon Jul 10 11:32:52 2017 +0800 ---------------------------------------------------------------------- .../templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl | 2 +- .../app/templates/InfrastructureLayer/IndexingModule/module.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cdec0e8b/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl ---------------------------------------------------------------------- diff --git a/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl b/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl index 84c6226..744d8fd 100644 --- a/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl +++ b/tools/generator-polygene/app/templates/ConnectivityLayer/HttpServerModule/bootstrap.tmpl @@ -64,7 +64,7 @@ public class HttpServerModule %> new HttpShiroAssembler() .withConfig( module, Visibility.module ) .assemble( module ); - module.forMixin( ShiroIniConfiguration.class ).declareDefaults().iniResourcePath().set("web-shiro.ini"); + module.forMixin( ShiroIniConfiguration.class ).declareDefaults().iniResourcePath().set("classpath:web-shiro.ini"); new SecureJettyServiceAssembler() .withConfig( module, Visibility.layer ) .visibleIn( Visibility.layer ) http://git-wip-us.apache.org/repos/asf/polygene-java/blob/cdec0e8b/tools/generator-polygene/app/templates/InfrastructureLayer/IndexingModule/module.js ---------------------------------------------------------------------- diff --git a/tools/generator-polygene/app/templates/InfrastructureLayer/IndexingModule/module.js b/tools/generator-polygene/app/templates/InfrastructureLayer/IndexingModule/module.js index bbcfb28..dfefccb 100644 --- a/tools/generator-polygene/app/templates/InfrastructureLayer/IndexingModule/module.js +++ b/tools/generator-polygene/app/templates/InfrastructureLayer/IndexingModule/module.js @@ -35,7 +35,7 @@ module.exports = { 'InfrastructureLayer/IndexingModule/indexing/solrconfig.xml', 'solrconfig.xml' ); - p.copyTemplate( + p.copyToConfig( p.ctx, 'InfrastructureLayer/IndexingModule/indexing/solr-schema.xml', 'schema.xml'