[2/4] zest-java git commit: ZEST-143 - Various fixes.

[ni...@apache.org]

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<String, String> map = FileUtils.readPropertiesResource( "templates/restapp/project.properties" );
+        TestHelper.zetZestZome();
+        Map<String, String> map = FileUtils.readTemplateProperties( "restapp" );
         assertThat( map, notNullValue() );
         assertThat( map.get( "template.dir" ), equalTo( "etc/templates/restapp/files" ) );
     }