Fixing error that showed up in exhausted testing.
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/2cd936e4 Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/2cd936e4 Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/2cd936e4 Branch: refs/heads/develop Commit: 2cd936e439627ff12744b829b3b1faf539a4fb9d Parents: 96cc60b Author: niclas <[email protected]> Authored: Fri Apr 14 15:46:48 2017 +0800 Committer: niclas <[email protected]> Committed: Fri Apr 14 15:46:48 2017 +0800 ---------------------------------------------------------------------- .../app/templates/CommandLineApplication/app.js | 5 ++++- .../app/templates/ConnectivityLayer/bootstrap.tmpl | 2 -- .../generator-polygene/app/templates/RestAPIApplication/app.js | 3 +-- .../UserInterfaceLayer/CommandLineModule/bootstrap.tmpl | 1 - .../app/templates/UserInterfaceLayer/bootstrap.tmpl | 2 -- 5 files changed, 5 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/polygene-java/blob/2cd936e4/tools/generator-polygene/app/templates/CommandLineApplication/app.js ---------------------------------------------------------------------- diff --git a/tools/generator-polygene/app/templates/CommandLineApplication/app.js b/tools/generator-polygene/app/templates/CommandLineApplication/app.js index 0274517..53658a4 100644 --- a/tools/generator-polygene/app/templates/CommandLineApplication/app.js +++ b/tools/generator-polygene/app/templates/CommandLineApplication/app.js @@ -1,4 +1,3 @@ - module.exports = { write: function (p) { @@ -6,6 +5,10 @@ module.exports = { copyLayer(p, "Infrastructure"); copyLayer(p, "Domain"); copyLayer(p, "UserInterface"); + + + + } }; http://git-wip-us.apache.org/repos/asf/polygene-java/blob/2cd936e4/tools/generator-polygene/app/templates/ConnectivityLayer/bootstrap.tmpl ---------------------------------------------------------------------- diff --git a/tools/generator-polygene/app/templates/ConnectivityLayer/bootstrap.tmpl b/tools/generator-polygene/app/templates/ConnectivityLayer/bootstrap.tmpl index efe2d4d..5623b6f 100644 --- a/tools/generator-polygene/app/templates/ConnectivityLayer/bootstrap.tmpl +++ b/tools/generator-polygene/app/templates/ConnectivityLayer/bootstrap.tmpl @@ -33,9 +33,7 @@ public class ConnectivityLayer extends LayeredLayerAssembler public LayerAssembly assemble( LayerAssembly layer ) throws AssemblyException { -<% if( polygene.applicationtype === 'Rest API' ) { %> createModule( layer, RestApiModule.class ); -<% } -%> return layer; } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/polygene-java/blob/2cd936e4/tools/generator-polygene/app/templates/RestAPIApplication/app.js ---------------------------------------------------------------------- diff --git a/tools/generator-polygene/app/templates/RestAPIApplication/app.js b/tools/generator-polygene/app/templates/RestAPIApplication/app.js index 3a814af..efbcea8 100644 --- a/tools/generator-polygene/app/templates/RestAPIApplication/app.js +++ b/tools/generator-polygene/app/templates/RestAPIApplication/app.js @@ -1,4 +1,3 @@ - module.exports = { write: function (p) { @@ -13,7 +12,7 @@ module.exports = { } }; -function copyLayer( p, layerName ) { +function copyLayer(p, layerName) { var layer = require(__dirname + '/../' + layerName + 'Layer/layer.js'); layer.write(p); } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/2cd936e4/tools/generator-polygene/app/templates/UserInterfaceLayer/CommandLineModule/bootstrap.tmpl ---------------------------------------------------------------------- diff --git a/tools/generator-polygene/app/templates/UserInterfaceLayer/CommandLineModule/bootstrap.tmpl b/tools/generator-polygene/app/templates/UserInterfaceLayer/CommandLineModule/bootstrap.tmpl index 4793bb3..eb158c8 100644 --- a/tools/generator-polygene/app/templates/UserInterfaceLayer/CommandLineModule/bootstrap.tmpl +++ b/tools/generator-polygene/app/templates/UserInterfaceLayer/CommandLineModule/bootstrap.tmpl @@ -24,7 +24,6 @@ import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.LayerAssembly; import org.apache.polygene.bootstrap.ModuleAssembly; import org.apache.polygene.bootstrap.layered.ModuleAssembler; -import org.apache.polygene.entitystore.<%- polygene.entitystore.toLowerCase() %>.assembly.<%- polygene.entitystore %>EntityStoreAssembler; public class CommandLineModule implements ModuleAssembler http://git-wip-us.apache.org/repos/asf/polygene-java/blob/2cd936e4/tools/generator-polygene/app/templates/UserInterfaceLayer/bootstrap.tmpl ---------------------------------------------------------------------- diff --git a/tools/generator-polygene/app/templates/UserInterfaceLayer/bootstrap.tmpl b/tools/generator-polygene/app/templates/UserInterfaceLayer/bootstrap.tmpl index 8d2a72e..a0208b0 100644 --- a/tools/generator-polygene/app/templates/UserInterfaceLayer/bootstrap.tmpl +++ b/tools/generator-polygene/app/templates/UserInterfaceLayer/bootstrap.tmpl @@ -33,9 +33,7 @@ public class UserInterfaceLayer extends LayeredLayerAssembler public LayerAssembly assemble( LayerAssembly layer ) throws AssemblyException { -<% if( polygene.applicationtype === 'Command Line' ) { %> createModule( layer, CommandLineModule.class ); -<% } -%> return layer; } } \ No newline at end of file
