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 D3E38200C75 for ; Sun, 21 May 2017 16:38:40 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id D2AE1160BA4; Sun, 21 May 2017 14:38:40 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 078BD160BD7 for ; Sun, 21 May 2017 16:38:39 +0200 (CEST) Received: (qmail 88434 invoked by uid 500); 21 May 2017 14:38:39 -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 88425 invoked by uid 99); 21 May 2017 14:38:39 -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; Sun, 21 May 2017 14:38:39 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C8B23E027A; Sun, 21 May 2017 14:38:38 +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: Sun, 21 May 2017 14:38:41 -0000 Message-Id: In-Reply-To: <09c6a7ca21eb44848da15dec84137feb@git.apache.org> References: <09c6a7ca21eb44848da15dec84137feb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/5] polygene-java git commit: Current snapshot for Paul (others) to take a close look if he wants. archived-at: Sun, 21 May 2017 14:38:41 -0000 http://git-wip-us.apache.org/repos/asf/polygene-java/blob/a9de6c65/tools/generator-polygene/app/templates/buildtool/gradle-bootstrap.tmpl ---------------------------------------------------------------------- diff --git a/tools/generator-polygene/app/templates/buildtool/gradle-bootstrap.tmpl b/tools/generator-polygene/app/templates/buildtool/gradle-bootstrap.tmpl index 0d8dab2..9582076 100644 --- a/tools/generator-polygene/app/templates/buildtool/gradle-bootstrap.tmpl +++ b/tools/generator-polygene/app/templates/buildtool/gradle-bootstrap.tmpl @@ -20,25 +20,25 @@ dependencies { compile project( ":model" ) <% if( polygene.applicationtype === 'Rest API' ) { -%> compile project( ":rest" )<% } %> - - compile "org.apache.polygene.core:org.apache.polygene.core.spi:$polygeneVersion" +%> compile project( ":rest" ) +<% } +%> compile "org.apache.polygene.core:org.apache.polygene.core.spi:$polygeneVersion" compile "org.apache.polygene.core:org.apache.polygene.core.bootstrap:$polygeneVersion" - compile "org.apache.polygene.libraries:org.apache.polygene.library.fileconfig:$polygeneVersion" -<% if( polygene.applicationtype === 'Rest API' ) { %> - compile "org.apache.polygene.libraries:org.apache.polygene.library.restlet:$polygeneVersion" -<% } %> - compile "org.apache.polygene.extensions:org.apache.polygene.extension.entitystore-<%= polygene.entitystoremodule.toLowerCase() %>:$polygeneVersion" +<% if( polygene.applicationtype === 'Rest API' ) { + if( polygene.hasFeature('security') ) { +%> compile "org.apache.polygene.libraries:org.apache.polygene.library.shiro-web:$polygeneVersion" +<% } +%> compile "org.apache.polygene.libraries:org.apache.polygene.library.restlet:$polygeneVersion" + compile "org.apache.polygene.libraries:org.apache.polygene.library.http:$polygeneVersion" +<% } +%> compile "org.apache.polygene.extensions:org.apache.polygene.extension.entitystore-<%= polygene.entitystoremodule.toLowerCase() %>:$polygeneVersion" compile "org.apache.polygene.extensions:org.apache.polygene.extension.indexing-<%= polygene.indexing.toLowerCase() %>:$polygeneVersion" compile "org.apache.polygene.extensions:org.apache.polygene.extension.serialization-<%= polygene.serialization.toLowerCase() %>:$polygeneVersion" - -<% if( polygene.caching !== "None" ) { %> - compile "org.apache.polygene.extensions:org.apache.polygene.extension.cache-<%= polygene.caching.toLowerCase() %>:$polygeneVersion" -<% } %> - -<% if( polygene.metrics !== "None" ) { %> - compile "org.apache.polygene.extensions:org.apache.polygene.extension.metrics-<%= polygene.metrics.toLowerCase() %>:$polygeneVersion" -<% } %> - -} \ No newline at end of file +<% if( polygene.caching !== "None" ) { +%> compile "org.apache.polygene.extensions:org.apache.polygene.extension.cache-<%= polygene.caching.toLowerCase() %>:$polygeneVersion" +<% } + if( polygene.metrics !== "None" ) { +%> compile "org.apache.polygene.extensions:org.apache.polygene.extension.metrics-<%= polygene.metrics.toLowerCase() %>:$polygeneVersion" +<% } +%>} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/polygene-java/blob/a9de6c65/tools/generator-polygene/app/templates/buildtool/gradle-root.tmpl ---------------------------------------------------------------------- diff --git a/tools/generator-polygene/app/templates/buildtool/gradle-root.tmpl b/tools/generator-polygene/app/templates/buildtool/gradle-root.tmpl index 52b61d5..a6c1f92 100644 --- a/tools/generator-polygene/app/templates/buildtool/gradle-root.tmpl +++ b/tools/generator-polygene/app/templates/buildtool/gradle-root.tmpl @@ -31,6 +31,7 @@ allprojects() { defaultTasks 'assemble' repositories { + mavenLocal() mavenCentral() maven { name 'restlet-repo'; url 'http://maven.restlet.org/' } <% if( polygene.entitystore == 'Jdbm' ) {