Merge remote-tracking branch 'origin/develop' into yeoman-work # Conflicts: # tools/generator-polygene/app/templates/RestAPIApplication/app.js # tools/generator-polygene/app/templates/buildtool/gradle-app.tmpl
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/5dfe7e3e Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/5dfe7e3e Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/5dfe7e3e Branch: refs/heads/yeoman-work Commit: 5dfe7e3e92067bd3997fd1b9f5ce86f1da187036 Parents: a9de6c6 1a79168 Author: niclas <[email protected]> Authored: Mon May 22 14:02:23 2017 +0800 Committer: niclas <[email protected]> Committed: Mon May 22 14:02:23 2017 +0800 ---------------------------------------------------------------------- .../gradle/code/PublishingPlugin.groovy | 23 +- .../DependenciesDeclarationExtension.groovy | 1 + .../polygene/gradle/structure/RootPlugin.groovy | 23 ++ .../distributions/DistributionsPlugin.groovy | 35 +- .../structure/release/ReleasePlugin.groovy | 1 + core/bootstrap/src/docs/bootstrap.txt | 2 +- .../DefaultIdentityGeneratorAssembler.java | 9 +- .../DefaultSerializationAssembler.java | 6 +- .../unitofwork/DefaultUnitOfWorkAssembler.java | 11 +- .../association/AssociationInstance.java | 6 +- .../runtime/composite/CompositeModel.java | 2 +- .../entity/associations/AssociationTest.java | 10 + .../cache/AbstractEntityStoreWithCacheTest.java | 6 +- .../test/entity/AbstractEntityStoreTest.java | 22 +- dependencies.gradle | 3 + distributions/src/src-dist/README.txt | 16 +- .../gradle/wrapper-install/build.gradle | 25 ++ .../gradle/wrapper-install/settings.gradle | 19 + .../cassandra/CassandraMapEntityStoreTest.java | 10 + .../PreferencesEntityStoreMixin.java | 44 ++- gradle/wrapper/gradle-wrapper.jar | Bin 54227 -> 54416 bytes gradlew | 6 +- libraries/jmx/src/docs/jmx.txt | 2 +- .../docs/tutorials/howto-releasing-apache.txt | 11 +- manual/src/docs/userguide/tools.txt | 9 +- .../src/docs/website/resources/css/polygene.css | 4 + .../docs/website/resources/images/cloudbees.png | Bin 7493 -> 0 bytes .../website/resources/images/library-jmx.png | Bin 36579 -> 244987 bytes .../resources/images/tools-entity-viewer.png | Bin 52322 -> 0 bytes .../images/tools-envisage-stacked-collapsed.png | Bin 30355 -> 211242 bytes .../resources/images/tools-envisage-stacked.png | Bin 36070 -> 225560 bytes .../images/tools-envisage-structure.png | Bin 90145 -> 277222 bytes .../resources/images/tools-envisage-type.png | Bin 88278 -> 279752 bytes tools/envisage/src/docs/envisage.txt | 56 +++ .../envisage/school/EnvisageSchoolSample.java | 10 +- .../envisage/school/SchoolAssembler.java | 8 +- tools/generator-polygene/.gitignore | 1 + .../app/templates/RestAPIApplication/app.js | 5 +- .../RestAPIApplication/bootstrap-test.tmpl | 30 ++ .../app/templates/buildtool/build.js | 8 +- .../app/templates/buildtool/gradle-app.tmpl | 2 + .../app/templates/buildtool/gradle-wrapper.jar_ | Bin 51348 -> 0 bytes .../buildtool/gradle-wrapper.properties_ | 24 -- .../app/templates/buildtool/gradlew-bat.tmpl | 109 ------ .../app/templates/buildtool/gradlew.tmpl | 183 --------- tools/generator-polygene/build.gradle | 24 +- tools/generator-polygene/package.json | 4 +- .../src/docs/yeoman_polygene.txt | 388 +++++++++++++++++++ tools/generator-polygene/test/generator_test.js | 4 +- tools/src/docs/envisage.txt | 55 --- tools/src/docs/yeoman_polygene.txt | 388 ------------------- 51 files changed, 757 insertions(+), 848 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/polygene-java/blob/5dfe7e3e/dependencies.gradle ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/polygene-java/blob/5dfe7e3e/tools/generator-polygene/app/templates/RestAPIApplication/app.js ---------------------------------------------------------------------- diff --cc tools/generator-polygene/app/templates/RestAPIApplication/app.js index e231d11,1ad28d8..142b090 --- a/tools/generator-polygene/app/templates/RestAPIApplication/app.js +++ b/tools/generator-polygene/app/templates/RestAPIApplication/app.js @@@ -25,25 -25,12 +25,29 @@@ module.exports = copyLayer(p, "Connectivity"); p.copyTemplate(p.ctx, - 'RestAPIApplication/web.xml.tmpl', - 'app/src/main/webapp/WEB-INF/web.xml'); + 'RestAPIApplication/application.java.tmpl', + 'rest/src/main/java/' + p.javaPackageDir + '/rest/' + p.name + 'RestApplication.java'); + + p.copyTemplate(p.ctx, + 'RestAPIApplication/Launcher.java.tmpl', + 'app/src/main/java/' + p.javaPackageDir + '/app/' + p.name + 'Launcher.java'); + + if (p.hasFeature('security')) { + p.copyTemplate(p.ctx, + 'RestAPIApplication/DevelopmentKeyManagement.java.tmpl', + 'app/src/main/java/' + p.javaPackageDir + '/app/DevelopmentKeyManagement.java'); + p.copyTemplate(p.ctx, + 'RestAPIApplication/web-shiro.ini.tmpl', + 'app/src/main/resources/web-shiro.ini'); + } p.copyTemplate(p.ctx, + 'RestAPIApplication/bootstrap-test.tmpl', + 'app/src/test/java/'+p.javaPackageDir+'/BootstrapTest.java'); ++ ++ p.copyTemplate(p.ctx, + 'RestAPIApplication/bootstrap.tmpl', + 'bootstrap/src/main/java/' + p.javaPackageDir + '/bootstrap/' + p.name + 'ApplicationAssembler.java'); } }; http://git-wip-us.apache.org/repos/asf/polygene-java/blob/5dfe7e3e/tools/generator-polygene/app/templates/buildtool/gradle-app.tmpl ---------------------------------------------------------------------- diff --cc tools/generator-polygene/app/templates/buildtool/gradle-app.tmpl index 6a830e6,50f99c3..d199285 --- a/tools/generator-polygene/app/templates/buildtool/gradle-app.tmpl +++ b/tools/generator-polygene/app/templates/buildtool/gradle-app.tmpl @@@ -34,9 -38,6 +34,11 @@@ dependencies runtime "org.apache.polygene.core:org.apache.polygene.core.runtime:$polygeneVersion" runtime "org.restlet.jee:org.restlet.ext.servlet:2.3.4" + runtime "org.apache.johnzon:johnzon-core:1.1.0" + runtime "org.apache.johnzon:johnzon-mapper:1.1.0" + runtime "org.apache.geronimo.specs:geronimo-json_1.1_spec:1.0" + runtime "ch.qos.logback:logback-classic:1.2.3" + runtime "ch.qos.logback:logback-core:1.2.3" + + testImplementation "org.apache.polygene.core:org.apache.polygene.core.testsupport:$polygeneVersion" }
