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 B5C66200B45 for ; Fri, 10 Jun 2016 00:53:00 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id B4740160A58; Thu, 9 Jun 2016 22:53:00 +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 0B6C7160A5D for ; Fri, 10 Jun 2016 00:52:59 +0200 (CEST) Received: (qmail 14995 invoked by uid 500); 9 Jun 2016 22:52:59 -0000 Mailing-List: contact commits-help@zest.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@zest.apache.org Delivered-To: mailing list commits@zest.apache.org Received: (qmail 14921 invoked by uid 99); 9 Jun 2016 22:52:59 -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; Thu, 09 Jun 2016 22:52:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id F34DFE0159; Thu, 9 Jun 2016 22:52:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: niclas@apache.org To: commits@zest.apache.org Date: Thu, 09 Jun 2016 22:52:59 -0000 Message-Id: In-Reply-To: <3bddef7a350345aebf1881d9bb7739c7@git.apache.org> References: <3bddef7a350345aebf1881d9bb7739c7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/4] zest-java git commit: ZEST-143 - Various fixes. archived-at: Thu, 09 Jun 2016 22:53:00 -0000 http://git-wip-us.apache.org/repos/asf/zest-java/blob/fe4932ff/tools/shell/src/main/resources/templates/restapp/project.properties ---------------------------------------------------------------------- diff --git a/tools/shell/src/main/resources/templates/restapp/project.properties b/tools/shell/src/main/resources/templates/restapp/project.properties deleted file mode 100644 index 5e78fd6..0000000 --- a/tools/shell/src/main/resources/templates/restapp/project.properties +++ /dev/null @@ -1,23 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# -# - -creator.class=org.apache.zest.tools.shell.create.project.RestProjectCreator - -template.dir=etc/templates/restapp/files \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/fe4932ff/tools/shell/src/main/resources/templates/singleton/project.properties ---------------------------------------------------------------------- diff --git a/tools/shell/src/main/resources/templates/singleton/project.properties b/tools/shell/src/main/resources/templates/singleton/project.properties deleted file mode 100644 index d504d1d..0000000 --- a/tools/shell/src/main/resources/templates/singleton/project.properties +++ /dev/null @@ -1,24 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# This template create a simple project with a single layer and a single module. -# It is based around the SingletonAssembler. - - -creator.class=org.apache.zest.tools.shell.create.project.SingletonProjectCreator - -template.dir=etc/templates/singleton/files \ No newline at end of file http://git-wip-us.apache.org/repos/asf/zest-java/blob/fe4932ff/tools/shell/src/test/java/org/apache/zest/tools/shell/FileUtilsTest.java ---------------------------------------------------------------------- diff --git a/tools/shell/src/test/java/org/apache/zest/tools/shell/FileUtilsTest.java b/tools/shell/src/test/java/org/apache/zest/tools/shell/FileUtilsTest.java index 2867041..344c8c0 100644 --- a/tools/shell/src/test/java/org/apache/zest/tools/shell/FileUtilsTest.java +++ b/tools/shell/src/test/java/org/apache/zest/tools/shell/FileUtilsTest.java @@ -78,8 +78,8 @@ public class FileUtilsTest @Test public void readPropertiesResourceTest() { - - Map map = FileUtils.readPropertiesResource( "templates/restapp/project.properties" ); + TestHelper.zetZestZome(); + Map map = FileUtils.readTemplateProperties( "restapp" ); assertThat( map, notNullValue() ); assertThat( map.get( "template.dir" ), equalTo( "etc/templates/restapp/files" ) ); }